summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/SomhairlesDream.Frontend/App.fs50
-rw-r--r--src/SomhairlesDream.Frontend/Bindings.fs13
-rw-r--r--src/SomhairlesDream.Server/ArtifactRunApi.fs16
-rw-r--r--src/SomhairlesDream.Server/ArtifactRunCoordinator.fs15
-rw-r--r--src/SomhairlesDream.Server/Store.fs3
-rw-r--r--src/SomhairlesDream.Shared/Artifact.fs1
6 files changed, 95 insertions, 3 deletions
diff --git a/src/SomhairlesDream.Frontend/App.fs b/src/SomhairlesDream.Frontend/App.fs
index 835dfa9..fa52a9f 100644
--- a/src/SomhairlesDream.Frontend/App.fs
+++ b/src/SomhairlesDream.Frontend/App.fs
@@ -15,6 +15,7 @@ type SnapshotPayload =
abstract status: string with get
abstract currentStepIndex: int with get
abstract totalSteps: int with get
+ abstract completedSteps: string array with get
abstract lastHeartbeatAt: string with get
abstract updatedAt: string with get
abstract message: string with get
@@ -42,6 +43,10 @@ let mutable selectedFrame = frames[0]
let mutable replayTimer: int option = None
let mutable replayIndex = 0
let mutable eventSource: EventSource option = None
+let mutable currentProjectId = ""
+let mutable currentRunId = ""
+let mutable loadedStepPath: string option = None
+let mutable freezeRotation = false
let element id = document.getElementById(id)
@@ -155,11 +160,14 @@ let initializeView () =
Canvas = canvas }
viewState <- Some view
+ freezeRotation <- (queryParam "freeze") = "1"
renderFrame selectedFrame
window.addEventListener("resize", fun _ -> resizeView view)
let rec animate (_: float) =
- group.rotation.y <- group.rotation.y + 0.003
+ if not freezeRotation then
+ group.rotation.y <- group.rotation.y + 0.003
+
renderer.render(scene, camera)
requestAnimationFrame animate |> ignore
@@ -184,6 +192,21 @@ let setManifestLink (payload: SnapshotPayload) =
link.setAttribute("href", value)
link.classList.remove("is-hidden")
+let loadStepArtifact (view: ViewState) (stepPath: string) =
+ loadedStepPath <- Some stepPath
+ let loader = createGLTFLoader ()
+ let projectId = JS.encodeURIComponent currentProjectId
+ let runId = JS.encodeURIComponent currentRunId
+ let url = sprintf "/api/artifacts/steps?projectId=%s&runId=%s&path=%s" projectId runId (JS.encodeURIComponent stepPath)
+ setText "viewport-note" (sprintf "管线几何加载中 · %s" stepPath)
+
+ loadGLTF loader url
+ (fun gltf ->
+ view.Group.clear()
+ view.Group.add gltf.scene
+ setText "viewport-note" (sprintf "管线几何 · %s" stepPath))
+ (fun _ -> setText "viewport-note" (sprintf "管线几何加载失败 · %s" stepPath))
+
let updateState (payload: SnapshotPayload) =
let status = statusName payload
setStatusClass status
@@ -198,6 +221,8 @@ let updateState (payload: SnapshotPayload) =
setText "run-message" message
setText "project-id" payload.projectId
setText "run-id" payload.runId
+ currentProjectId <- payload.projectId
+ currentRunId <- payload.runId
let currentVersion = max 0 (payload.currentStepIndex + 1)
setText "target-version" (sprintf "V%02d" payload.totalSteps)
@@ -217,8 +242,27 @@ let updateState (payload: SnapshotPayload) =
|> Option.defaultValue selectedFrame
setManifestLink payload
- showFrameMetadata frame
- renderFrame frame
+
+ let completedSteps =
+ if isNull (box payload.completedSteps) then [||] else payload.completedSteps
+
+ match viewState, completedSteps with
+ | Some view, steps ->
+ if steps.Length = 0 then
+ showFrameMetadata frame
+ renderFrame frame
+ else
+ let latest = steps[steps.Length - 1]
+
+ if loadedStepPath <> Some latest then
+ loadStepArtifact view latest
+
+ setText "mesh-label" latest
+ | None, steps ->
+ if steps.Length > 0 then
+ setText "mesh-label" steps[steps.Length - 1]
+ else
+ showFrameMetadata frame
let updateStreamState message =
setText "stream-state" message
diff --git a/src/SomhairlesDream.Frontend/Bindings.fs b/src/SomhairlesDream.Frontend/Bindings.fs
index dc75d7d..9dbfa00 100644
--- a/src/SomhairlesDream.Frontend/Bindings.fs
+++ b/src/SomhairlesDream.Frontend/Bindings.fs
@@ -35,6 +35,19 @@ type ServerEvent =
abstract data: string with get
[<Erase>]
+type GLTFScene =
+ abstract scene: ThreeNode with get
+
+[<Emit("new GLTFLoader()")>]
+let createGLTFLoader () : obj = jsNative
+
+[<Emit("$0.load($1, $2, null, $3)")>]
+let loadGLTF (loader: obj) (url: string) (onLoad: GLTFScene -> unit) (onError: obj -> unit) : unit = jsNative
+
+[<Emit("new URLSearchParams(window.location.search).get($0)")>]
+let queryParam (name: string) : string = jsNative
+
+[<Erase>]
type EventSource =
abstract onerror: (obj -> unit) with get, set
abstract onmessage: (ServerEvent -> unit) with get, set
diff --git a/src/SomhairlesDream.Server/ArtifactRunApi.fs b/src/SomhairlesDream.Server/ArtifactRunApi.fs
index 8d76ffc..8f63b99 100644
--- a/src/SomhairlesDream.Server/ArtifactRunApi.fs
+++ b/src/SomhairlesDream.Server/ArtifactRunApi.fs
@@ -115,6 +115,19 @@ module ArtifactRunApi =
| Error ArtifactNotFound -> error options 404 "artifact not found"
| Error(InvalidManifest message) -> error options 500 message
+ let private stepArtifact options (context: HttpContext) =
+ match selector context, queryValue context "path" with
+ | Error message, _ -> error options 400 message
+ | _, None -> error options 400 "missing query parameter 'path'"
+ | Ok(projectId, runId), Some relativePath ->
+ match options.Coordinator.StepArtifact(projectId, runId, relativePath) with
+ | Ok path -> Results.File(path, artifactContentType path)
+ | Error RunNotFound -> error options 404 "run not found"
+ | Error(RunNotComplete snapshot) -> jsonWithStatus options 409 snapshot
+ | Error(InvalidArtifactPath message) -> error options 400 message
+ | Error ArtifactNotFound -> error options 404 "artifact not found"
+ | Error(InvalidManifest message) -> error options 500 message
+
let private writeError options (context: HttpContext) statusCode message =
task {
context.Response.StatusCode <- statusCode
@@ -159,3 +172,6 @@ module ArtifactRunApi =
app.MapGet("/api/artifacts/file", Func<HttpContext, IResult>(fun context -> artifact options context))
|> ignore
+
+ app.MapGet("/api/artifacts/steps", Func<HttpContext, IResult>(fun context -> stepArtifact options context))
+ |> ignore
diff --git a/src/SomhairlesDream.Server/ArtifactRunCoordinator.fs b/src/SomhairlesDream.Server/ArtifactRunCoordinator.fs
index 78d5dee..dbf87df 100644
--- a/src/SomhairlesDream.Server/ArtifactRunCoordinator.fs
+++ b/src/SomhairlesDream.Server/ArtifactRunCoordinator.fs
@@ -139,3 +139,18 @@ type ArtifactRunCoordinator(
| Error message -> Error(InvalidArtifactPath message)
| Ok path when not (File.Exists(path)) -> Error ArtifactNotFound
| Ok path -> Ok path
+
+ member _.StepArtifact(projectId: string, runId: string, relativePath: string) : Result<string, ArtifactLookupError> =
+ match registry.TryFind(projectId, runId) with
+ | None -> Error RunNotFound
+ | Some _ ->
+ let directory = runDirectory projectId runId
+
+ match safeArtifactPath directory relativePath with
+ | Error message -> Error(InvalidArtifactPath message)
+ | Ok path when not (path.EndsWith(".glb", StringComparison.OrdinalIgnoreCase)) ->
+ Error(InvalidArtifactPath "step artifacts must be .glb files")
+ | Ok path when not (path.StartsWith(Path.Combine(directory, "steps") + string Path.DirectorySeparatorChar, StringComparison.Ordinal)) ->
+ Error(InvalidArtifactPath "step artifacts must live under steps/")
+ | Ok path when not (File.Exists(path)) -> Error ArtifactNotFound
+ | Ok path -> Ok path
diff --git a/src/SomhairlesDream.Server/Store.fs b/src/SomhairlesDream.Server/Store.fs
index b4a2293..e1ee814 100644
--- a/src/SomhairlesDream.Server/Store.fs
+++ b/src/SomhairlesDream.Server/Store.fs
@@ -60,6 +60,7 @@ type ArtifactRunStore(ids: RunIds, staleAfter: TimeSpan, initialAt: DateTimeOffs
CurrentStepId = None
CurrentStepIndex = -1
TotalSteps = 0
+ CompletedSteps = [||]
LastHeartbeatAt = None
UpdatedAt = initialAt
Message = "waiting for design run"
@@ -120,6 +121,7 @@ type ArtifactRunStore(ids: RunIds, staleAfter: TimeSpan, initialAt: DateTimeOffs
TotalSteps = value.TotalSteps
CurrentStepId = None
CurrentStepIndex = -1
+ CompletedSteps = [||]
LastHeartbeatAt = Some value.At
UpdatedAt = value.At
Message = "design run started"
@@ -149,6 +151,7 @@ type ArtifactRunStore(ids: RunIds, staleAfter: TimeSpan, initialAt: DateTimeOffs
{ state with
CurrentStepId = Some value.StepId
CurrentStepIndex = value.StepIndex
+ CompletedSteps = Array.append state.CompletedSteps [| value.ArtifactPath |]
LastHeartbeatAt = Some value.At
UpdatedAt = value.At
Message = value.Message
diff --git a/src/SomhairlesDream.Shared/Artifact.fs b/src/SomhairlesDream.Shared/Artifact.fs
index d1cb4f0..3603af4 100644
--- a/src/SomhairlesDream.Shared/Artifact.fs
+++ b/src/SomhairlesDream.Shared/Artifact.fs
@@ -209,6 +209,7 @@ type RunSnapshot =
CurrentStepId: string option
CurrentStepIndex: int
TotalSteps: int
+ CompletedSteps: string array
LastHeartbeatAt: DateTimeOffset option
UpdatedAt: DateTimeOffset
Message: string
generated by cgit v1.2.3 (git 2.39.1) at 2026-10-04 18:24:03 +0000