fix(web): satisfy full app checks

skulidropek · skulidropek · commit c61aaf90f501 · 2026-05-08T11:28:00.000Z
diff --git a/packages/app/src/web/actions-event-payload.ts b/packages/app/src/web/actions-event-payload.ts
@@ -0,0 +1,13 @@
+import type { ApiEvent } from "./api.js"
+
+export const readEventPayloadString = (
+  event: ApiEvent,
+  key: string
+): string | null => {
+  const payload = event.payload
+  if (payload === null || typeof payload !== "object" || Array.isArray(payload)) {
+    return null
+  }
+  const value = Object.entries(payload).find(([name]) => name === key)?.[1]
+  return typeof value === "string" ? value : null
+}
diff --git a/packages/app/src/web/actions-project-create.ts b/packages/app/src/web/actions-project-create.ts
@@ -3,25 +3,14 @@ import { Either } from "effect"
 
 import { createProjectDraftFromInputs } from "../docker-git/menu-create-shared.js"
 import type { CreateInputs } from "../docker-git/menu-types.js"
+import { readEventPayloadString } from "./actions-event-payload.js"
 import { appendOutputLine, appendOutputLineHandler, notifyProjectEventRateLimit } from "./actions-output.js"
 import { type BrowserActionContext, withBusy } from "./actions-shared.js"
 import { ProjectDetailsSchema } from "./api-schema.js"
 import { type ApiEvent, loadProjectDetails, type ProjectDetails, startCreateProject } from "./api.js"
 import { openProjectEventStream } from "./project-events.js"
 import { outputScreen, projectPickerScreen } from "./screen.js"
 
-const readEventPayloadString = (
-  event: ApiEvent,
-  key: string
-): string | null => {
-  const payload = event.payload
-  if (payload === null || typeof payload !== "object" || Array.isArray(payload)) {
-    return null
-  }
-  const value = Object.entries(payload).find(([name]) => name === key)?.[1]
-  return typeof value === "string" ? value : null
-}
-
 const readCreatedProjectId = (event: ApiEvent): string | null =>
   event.type === "project.created" ? readEventPayloadString(event, "projectId") : null
 
diff --git a/packages/app/src/web/actions-projects.ts b/packages/app/src/web/actions-projects.ts
@@ -1,5 +1,6 @@
 import { openSelectedProjectBrowser } from "./actions-browser.js"
 import { openSelectedProjectDatabaseEditor } from "./actions-databases.js"
+import { readEventPayloadString } from "./actions-event-payload.js"
 import { appendOutputLine, appendOutputLineHandler, notifyProjectEventRateLimit } from "./actions-output.js"
 import { openSelectedProjectPort } from "./actions-port-forwards.js"
 import {
@@ -13,9 +14,9 @@ import {
 } from "./actions-shared.js"
 import { loadSelectedProjectTasks } from "./actions-tasks.js"
 import {
+  type ApiEvent,
   applyAllProjects,
   applyProject,
-  type ApiEvent,
   deleteProject,
   downAllProjects,
   downProject,
@@ -78,42 +79,39 @@ const resolveProjectTerminalKey = (
   return null
 }
 
-const randomHex = (bytes: number): string => {
-  const getRandomValues = globalThis.crypto?.getRandomValues
-  if (typeof getRandomValues === "function") {
-    const values = new Uint8Array(bytes)
-    getRandomValues.call(globalThis.crypto, values)
-    return Array.from(values, (value) => value.toString(16).padStart(2, "0")).join("")
-  }
+type ProjectCrypto = Crypto & {
+  readonly randomUUID?: () => string
+}
 
-  let fallback = ""
-  while (fallback.length < bytes * 2) {
-    fallback += Math.floor(Math.random() * 0x1_0000_0000)
-      .toString(16)
-      .padStart(8, "0")
-  }
-  return fallback.slice(0, bytes * 2)
+const randomHex = (bytes: number): string => {
+  const values = new Uint8Array(bytes)
+  globalThis.crypto.getRandomValues(values)
+  return Array.from(values, (value) => value.toString(16).padStart(2, "0")).join("")
 }
 
 const createPendingTerminalSessionId = (): string => {
-  const randomUUID = globalThis.crypto?.randomUUID
-  if (typeof randomUUID === "function") {
-    return randomUUID.call(globalThis.crypto)
+  const crypto = globalThis.crypto as ProjectCrypto
+  if (typeof crypto.randomUUID === "function") {
+    return crypto.randomUUID()
   }
 
   return `pending-${Date.now().toString(16)}-${randomHex(8)}`
 }
 
-const readEventPayloadString = (
-  event: ApiEvent,
-  key: string
-): string | null => {
-  const payload = event.payload
-  if (payload === null || typeof payload !== "object" || Array.isArray(payload)) {
-    return null
-  }
-  const value = Object.entries(payload).find(([name]) => name === key)?.[1]
-  return typeof value === "string" ? value : null
+type ProjectActiveTerminalSessionArgs = Omit<
+  Parameters<typeof buildProjectActiveTerminalSession>[0],
+  "onExit" | "onReady"
+>
+
+const addProjectTerminalSession = (
+  context: BrowserActionContext,
+  args: ProjectActiveTerminalSessionArgs
+) => {
+  context.addTerminalSession(buildProjectActiveTerminalSession({
+    ...args,
+    onExit: context.reloadDashboard,
+    onReady: context.reloadDashboard
+  }))
 }
 
 const readTerminalSessionCreatedId = (
@@ -188,6 +186,11 @@ export const connectProjectById = (
     stream?.close()
     stream = null
   }
+  const showPendingTerminalError = (error: string) => {
+    pendingSessionFinalized = true
+    appendOutputLine(context, `[error] ${error}`)
+    context.addTerminalSession(renderPendingTerminalSession(error, "error"))
+  }
   const attachCreatedSession = (sessionId: string) => {
     if (attachedSessionId !== null) {
       return
@@ -198,23 +201,19 @@ export const connectProjectById = (
       effect: loadProjectTerminalSession(resolvedProjectKey, sessionId),
       label: "Attaching SSH terminal",
       onFailure: (error) => {
-        pendingSessionFinalized = true
-        appendOutputLine(context, `[error] ${error}`)
-        context.addTerminalSession(renderPendingTerminalSession(error, "error"))
+        showPendingTerminalError(error)
         closeStream()
       },
       onSuccess: (session) => {
         pendingSessionFinalized = true
         context.reloadDashboard()
         context.closeTerminalSession(pendingSessionId)
-        context.addTerminalSession(buildProjectActiveTerminalSession({
-          onExit: context.reloadDashboard,
-          onReady: context.reloadDashboard,
+        addProjectTerminalSession(context, {
           projectDisplayName,
           projectId,
           projectKey: resolvedProjectKey,
           session
-        }))
+        })
         context.setMessage(`Project is ready. SSH terminal is connecting for ${projectDisplayName}.`)
         closeStream()
       }
@@ -225,9 +224,7 @@ export const connectProjectById = (
     effect: startProjectTerminalSession(resolvedProjectKey, pendingSessionId),
     label: "Opening SSH terminal",
     onFailure: (error) => {
-      pendingSessionFinalized = true
-      appendOutputLine(context, `[error] ${error}`)
-      context.addTerminalSession(renderPendingTerminalSession(error, "error"))
+      showPendingTerminalError(error)
     },
     onSuccess: (accepted) => {
       appendOutputLine(context, `[ssh.prepare] SSH terminal request accepted (${accepted.requestId})`)
@@ -237,9 +234,7 @@ export const connectProjectById = (
         onEvent: (event) => {
           const failure = readTerminalStartupFailure(event, accepted.requestId)
           if (failure !== null) {
-            pendingSessionFinalized = true
-            appendOutputLine(context, `[error] ${failure}`)
-            context.addTerminalSession(renderPendingTerminalSession(failure, "error"))
+            showPendingTerminalError(failure)
             context.setMessage(failure)
             closeStream()
             return
@@ -306,14 +301,12 @@ export const attachProjectTerminalById = (
     effect: loadProjectTerminalSession(resolvedProjectKey, sessionId),
     label: "Attaching SSH terminal",
     onSuccess: (session) => {
-      context.addTerminalSession(buildProjectActiveTerminalSession({
-        onExit: context.reloadDashboard,
-        onReady: context.reloadDashboard,
+      addProjectTerminalSession(context, {
         projectDisplayName,
         projectId,
         projectKey: resolvedProjectKey,
         session
-      }))
+      })
       context.setMessage(`Attached SSH terminal for ${projectDisplayName}.`)
     }
   })
diff --git a/packages/app/src/web/api-types.ts b/packages/app/src/web/api-types.ts
@@ -23,8 +23,9 @@ import type {
 export type ProjectSummary = Schema.Schema.Type<typeof ProjectSummarySchema>
 export type ProjectDetails = Schema.Schema.Type<typeof ProjectDetailsSchema>
 export type CreateProjectAcceptedResponse = Schema.Schema.Type<typeof CreateProjectAcceptedResponseSchema>
-export type StartProjectTerminalSessionAccepted =
-  Schema.Schema.Type<typeof StartProjectTerminalSessionAcceptedResponseSchema>
+export type StartProjectTerminalSessionAccepted = Schema.Schema.Type<
+  typeof StartProjectTerminalSessionAcceptedResponseSchema
+>
 export type ProjectPortForward = Schema.Schema.Type<typeof ProjectPortForwardSchema>
 export type ProjectBrowserSession = Schema.Schema.Type<typeof ProjectBrowserSessionSchema>
 export type ProjectDatabaseForward = Schema.Schema.Type<typeof ProjectDatabaseForwardSchema>
diff --git a/packages/app/tests/docker-git/actions-projects.test.ts b/packages/app/tests/docker-git/actions-projects.test.ts
@@ -3,16 +3,25 @@ import { Effect } from "effect"
 import { afterEach, beforeEach, vi } from "vitest"
 
 import { applyProjectById, connectProjectById, runApplyAllProjects } from "../../src/web/actions-projects.js"
-import type { ProjectDetails, StartProjectTerminalSessionAccepted, TerminalSession } from "../../src/web/api.js"
+import type {
+  ProjectDetails,
+  startProjectTerminalSession,
+  StartProjectTerminalSessionAccepted,
+  TerminalSession
+} from "../../src/web/api.js"
+import type { openProjectEventStream } from "../../src/web/project-events.js"
 import type { ActiveTerminalSession } from "../../src/web/terminal.js"
 import { makeBrowserActionContext, waitForAssertion } from "./browser-action-context-fixture.js"
 
+type OpenProjectEventStream = typeof openProjectEventStream
+type StartProjectTerminalSession = typeof startProjectTerminalSession
+
 const applyAllProjectsMock = vi.hoisted(() => vi.fn())
 const applyProjectMock = vi.hoisted(() => vi.fn())
 const eventStreamCloseMock = vi.hoisted(() => vi.fn())
 const loadProjectTerminalSessionMock = vi.hoisted(() => vi.fn())
-const openProjectEventStreamMock = vi.hoisted(() => vi.fn())
-const startProjectTerminalSessionMock = vi.hoisted(() => vi.fn())
+const openProjectEventStreamMock = vi.hoisted(() => vi.fn<OpenProjectEventStream>())
+const startProjectTerminalSessionMock = vi.hoisted(() => vi.fn<StartProjectTerminalSession>())
 
 vi.mock("../../src/web/api.js", () => ({
   applyAllProjects: applyAllProjectsMock,
@@ -91,6 +100,15 @@ const startTerminalAccepted = (requestId: string): StartProjectTerminalSessionAc
   requestId
 })
 
+const makeSelectedProjectActionContext = (
+  overrides: Parameters<typeof makeBrowserActionContext>[0] = {}
+) =>
+  makeBrowserActionContext({
+    selectedProjectId: "project-1",
+    selectedProjectKey: "octocat/hello-world",
+    ...overrides
+  })
+
 describe("web project actions", () => {
   beforeEach(() => {
     vi.restoreAllMocks()
@@ -118,11 +136,9 @@ describe("web project actions", () => {
       openProjectEventStreamMock.mockImplementation(() => ({ close: eventStreamCloseMock }))
       const addTerminalSession = vi.fn<(session: ActiveTerminalSession) => void>()
       const closeTerminalSession = vi.fn<(sessionId: string) => void>()
-      const { context, reloadDashboard, setMessage } = makeBrowserActionContext({
+      const { context, reloadDashboard, setMessage } = makeSelectedProjectActionContext({
         addTerminalSession,
-        closeTerminalSession,
-        selectedProjectId: "project-1",
-        selectedProjectKey: "octocat/hello-world"
+        closeTerminalSession
       })
 
       connectProjectById("project-1", context, "octocat/hello-world")
@@ -194,19 +210,20 @@ describe("web project actions", () => {
 
   it.effect("starts SSH terminal creation when randomUUID is unavailable", () =>
     Effect.gen(function*(_) {
-      const dateNowMock = vi.spyOn(Date, "now").mockReturnValue(0x1234)
-      const mathRandomMock = vi.spyOn(Math, "random").mockReturnValue(0.5)
-      vi.stubGlobal("crypto", {})
+      const dateNowMock = vi.spyOn(Date, "now").mockReturnValue(0x12_34)
+      const deterministicBytes = Uint8Array.from([0x80, 0, 0, 0, 0x80, 0, 0, 0])
+      vi.stubGlobal("crypto", {
+        getRandomValues: (values: Uint8Array) => {
+          values.set(deterministicBytes.subarray(0, values.length))
+          return values
+        }
+      })
       startProjectTerminalSessionMock.mockImplementation((_projectKey, requestId: string) =>
         Effect.succeed(startTerminalAccepted(requestId))
       )
       openProjectEventStreamMock.mockImplementation(() => ({ close: eventStreamCloseMock }))
       const addTerminalSession = vi.fn<(session: ActiveTerminalSession) => void>()
-      const { context } = makeBrowserActionContext({
-        addTerminalSession,
-        selectedProjectId: "project-1",
-        selectedProjectKey: "octocat/hello-world"
-      })
+      const { context } = makeSelectedProjectActionContext({ addTerminalSession })
 
       connectProjectById("project-1", context, "octocat/hello-world")
 
@@ -218,7 +235,6 @@ describe("web project actions", () => {
       expect(requestId).toBe("pending-1234-8000000080000000")
       expect(addTerminalSession).toHaveBeenCalledTimes(1)
       expect(openProjectEventStreamMock).toHaveBeenCalledTimes(1)
-      mathRandomMock.mockRestore()
       dateNowMock.mockRestore()
     }))
 
diff --git a/packages/app/tests/docker-git/controller.test.ts b/packages/app/tests/docker-git/controller.test.ts
@@ -71,7 +71,7 @@ describe("controller reachability", () => {
 
   it.effect("detects remote Docker hosts", () =>
     Effect.sync(() => {
-      expect(isRemoteDockerHost()).toBe(false)
+      expect(isRemoteDockerHost("")).toBe(false)
       expect(isRemoteDockerHost("unix:///var/run/docker.sock")).toBe(false)
       expect(isRemoteDockerHost("tcp://docker.example.test:2376")).toBe(true)
       expect(isRemoteDockerHost("ssh://docker@example.test")).toBe(true)
diff --git a/packages/app/tests/docker-git/terminal-inline-images-core.test.ts b/packages/app/tests/docker-git/terminal-inline-images-core.test.ts
@@ -72,25 +72,16 @@ describe("terminal inline image output", () => {
     const cache = new Map<string, string>()
     const blob = new Blob(["image"], { type: "image/png" })
     const imagePath = "/var/data/example.png"
-
-    expect(cacheTerminalInlineImageBlob(cache, imagePath, "https://api/image", blob)).toEqual({
+    const expectedEntry = {
       _tag: "AvailableTerminalInlineImage",
       displayUrl: "blob:terminal-image",
       fetchUrl: "https://api/image",
       path: imagePath
-    })
-    expect(cachedTerminalInlineImageEntry(cache, imagePath, "https://api/image")).toEqual({
-      _tag: "AvailableTerminalInlineImage",
-      displayUrl: "blob:terminal-image",
-      fetchUrl: "https://api/image",
-      path: imagePath
-    })
-    expect(cacheTerminalInlineImageBlob(cache, imagePath, "https://api/image", blob)).toEqual({
-      _tag: "AvailableTerminalInlineImage",
-      displayUrl: "blob:terminal-image",
-      fetchUrl: "https://api/image",
-      path: imagePath
-    })
+    }
+
+    expect(cacheTerminalInlineImageBlob(cache, imagePath, "https://api/image", blob)).toEqual(expectedEntry)
+    expect(cachedTerminalInlineImageEntry(cache, imagePath, "https://api/image")).toEqual(expectedEntry)
+    expect(cacheTerminalInlineImageBlob(cache, imagePath, "https://api/image", blob)).toEqual(expectedEntry)
     expect(createObjectUrl).toHaveBeenCalledTimes(1)
 
     revokeTerminalInlineImageObjectUrlCache(cache)
