fix(web): satisfy ci lint for ssh terminal flow

skulidropek · skulidropek · commit e1aef591296c · 2026-05-09T10:16:07.000Z
diff --git a/packages/app/src/web/actions-project-create.ts b/packages/app/src/web/actions-project-create.ts
@@ -7,21 +7,10 @@ import { appendOutputLine, appendOutputLineHandler, notifyProjectEventRateLimit
 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 { readEventPayloadString } from "./project-event-payload.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
@@ -13,25 +13,34 @@ import {
 } from "./actions-shared.js"
 import { loadSelectedProjectTasks } from "./actions-tasks.js"
 import {
+  type ApiEvent,
   applyAllProjects,
   applyProject,
-  type ApiEvent,
   deleteProject,
   downAllProjects,
   downProject,
   loadProjectDetails,
   loadProjectLogs,
   loadProjectPs,
   loadProjectTerminalSession,
-  startProjectTerminalSession
+  startProjectTerminalSession,
+  type TerminalSession
 } from "./api.js"
 import type { BrowserMenuTag } from "./menu.js"
+import { readEventPayloadString } from "./project-event-payload.js"
 import { openProjectEventStream } from "./project-events.js"
 import { outputScreen } from "./screen.js"
 import { buildPendingProjectActiveTerminalSession, buildProjectActiveTerminalSession } from "./terminal.js"
 
 export { submitCreateInputs } from "./actions-project-create.js"
 
+type BrowserRandomSource = {
+  readonly getRandomValues: (values: Uint8Array) => Uint8Array
+  readonly randomUUID?: () => string
+}
+
+const browserRandomSource = (): BrowserRandomSource => globalThis.crypto
+
 export const loadSelectedProjectInfo = (
   context: BrowserActionContext,
   options?: {
@@ -79,43 +88,20 @@ const resolveProjectTerminalKey = (
 }
 
 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("")
-  }
-
-  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 values = new Uint8Array(bytes)
+  browserRandomSource().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 source = browserRandomSource()
+  if (source.randomUUID !== undefined) {
+    return source.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
-}
-
 const readTerminalSessionCreatedId = (
   event: ApiEvent,
   requestId: string
@@ -148,6 +134,31 @@ const readTerminalStartupFailure = (
   return readEventPayloadString(event, "message") ?? "SSH session startup failed."
 }
 
+const addAttachedProjectTerminalSession = (
+  {
+    context,
+    projectDisplayName,
+    projectId,
+    projectKey,
+    session
+  }: {
+    readonly context: BrowserActionContext
+    readonly projectDisplayName: string
+    readonly projectId: string
+    readonly projectKey: string
+    readonly session: TerminalSession
+  }
+): void => {
+  context.addTerminalSession(buildProjectActiveTerminalSession({
+    onExit: context.reloadDashboard,
+    onReady: context.reloadDashboard,
+    projectDisplayName,
+    projectId,
+    projectKey,
+    session
+  }))
+}
+
 export const connectProjectById = (
   projectId: string,
   context: BrowserActionContext,
@@ -188,6 +199,11 @@ export const connectProjectById = (
     stream?.close()
     stream = null
   }
+  const failPendingTerminalSession = (error: string) => {
+    pendingSessionFinalized = true
+    appendOutputLine(context, `[error] ${error}`)
+    context.addTerminalSession(renderPendingTerminalSession(error, "error"))
+  }
   const attachCreatedSession = (sessionId: string) => {
     if (attachedSessionId !== null) {
       return
@@ -198,23 +214,20 @@ export const connectProjectById = (
       effect: loadProjectTerminalSession(resolvedProjectKey, sessionId),
       label: "Attaching SSH terminal",
       onFailure: (error) => {
-        pendingSessionFinalized = true
-        appendOutputLine(context, `[error] ${error}`)
-        context.addTerminalSession(renderPendingTerminalSession(error, "error"))
+        failPendingTerminalSession(error)
         closeStream()
       },
       onSuccess: (session) => {
         pendingSessionFinalized = true
         context.reloadDashboard()
         context.closeTerminalSession(pendingSessionId)
-        context.addTerminalSession(buildProjectActiveTerminalSession({
-          onExit: context.reloadDashboard,
-          onReady: context.reloadDashboard,
+        addAttachedProjectTerminalSession({
+          context,
           projectDisplayName,
           projectId,
           projectKey: resolvedProjectKey,
           session
-        }))
+        })
         context.setMessage(`Project is ready. SSH terminal is connecting for ${projectDisplayName}.`)
         closeStream()
       }
@@ -225,9 +238,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"))
+      failPendingTerminalSession(error)
     },
     onSuccess: (accepted) => {
       appendOutputLine(context, `[ssh.prepare] SSH terminal request accepted (${accepted.requestId})`)
@@ -237,9 +248,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"))
+            failPendingTerminalSession(failure)
             context.setMessage(failure)
             closeStream()
             return
@@ -306,14 +315,13 @@ export const attachProjectTerminalById = (
     effect: loadProjectTerminalSession(resolvedProjectKey, sessionId),
     label: "Attaching SSH terminal",
     onSuccess: (session) => {
-      context.addTerminalSession(buildProjectActiveTerminalSession({
-        onExit: context.reloadDashboard,
-        onReady: context.reloadDashboard,
+      addAttachedProjectTerminalSession({
+        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/src/web/project-event-payload.ts b/packages/app/src/web/project-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/tests/docker-git/actions-projects.test.ts b/packages/app/tests/docker-git/actions-projects.test.ts
@@ -3,16 +3,26 @@ 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 { BrowserActionContext } from "../../src/web/actions-shared.js"
+import type {
+  applyAllProjects,
+  applyProject,
+  loadProjectTerminalSession,
+  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"
 
-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 applyAllProjectsMock = vi.hoisted(() => vi.fn<typeof applyAllProjects>())
+const applyProjectMock = vi.hoisted(() => vi.fn<typeof applyProject>())
+const eventStreamCloseMock = vi.hoisted(() => vi.fn<() => void>())
+const loadProjectTerminalSessionMock = vi.hoisted(() => vi.fn<typeof loadProjectTerminalSession>())
+const openProjectEventStreamMock = vi.hoisted(() => vi.fn<typeof openProjectEventStream>())
+const startProjectTerminalSessionMock = vi.hoisted(() => vi.fn<typeof startProjectTerminalSession>())
 
 vi.mock("../../src/web/api.js", () => ({
   applyAllProjects: applyAllProjectsMock,
@@ -91,6 +101,30 @@ const startTerminalAccepted = (requestId: string): StartProjectTerminalSessionAc
   requestId
 })
 
+const makeSelectedProjectContext = (overrides: Partial<BrowserActionContext>) =>
+  makeBrowserActionContext({
+    ...overrides,
+    selectedProjectId: "project-1",
+    selectedProjectKey: "octocat/hello-world"
+  })
+
+const connectProjectAndWaitForStream = (context: BrowserActionContext) =>
+  Effect.gen(function*(_) {
+    connectProjectById("project-1", context, "octocat/hello-world")
+
+    yield* _(waitForAssertion(() => {
+      expect(openProjectEventStreamMock).toHaveBeenCalledTimes(1)
+    }))
+  })
+
+const readFirstProjectEventHandler = () => {
+  const handlers = openProjectEventStreamMock.mock.calls[0]?.[1]
+  if (handlers?.onEvent === undefined) {
+    throw new Error("missing event handlers")
+  }
+  return handlers.onEvent
+}
+
 describe("web project actions", () => {
   beforeEach(() => {
     vi.restoreAllMocks()
@@ -118,25 +152,13 @@ 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 } = makeSelectedProjectContext({
         addTerminalSession,
-        closeTerminalSession,
-        selectedProjectId: "project-1",
-        selectedProjectKey: "octocat/hello-world"
+        closeTerminalSession
       })
 
-      connectProjectById("project-1", context, "octocat/hello-world")
-
-      yield* _(waitForAssertion(() => {
-        expect(openProjectEventStreamMock).toHaveBeenCalledTimes(1)
-      }))
-
-      const handlers = openProjectEventStreamMock.mock.calls[0]?.[1]
-      if (handlers === undefined || typeof handlers.onEvent !== "function") {
-        throw new Error("missing event handlers")
-      }
-
-      handlers.onEvent({
+      yield* _(connectProjectAndWaitForStream(context))
+      readFirstProjectEventHandler()({
         at: "2026-04-21T10:00:01.000Z",
         payload: {
           phase: "created",
@@ -194,31 +216,28 @@ 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)
+      vi.stubGlobal("crypto", {
+        getRandomValues: (values: Uint8Array): Uint8Array => {
+          values.set([0x80, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00])
+          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 } = makeSelectedProjectContext({
+        addTerminalSession
       })
 
-      connectProjectById("project-1", context, "octocat/hello-world")
-
-      yield* _(waitForAssertion(() => {
-        expect(startProjectTerminalSessionMock).toHaveBeenCalledTimes(1)
-      }))
-
+      yield* _(connectProjectAndWaitForStream(context))
+      expect(startProjectTerminalSessionMock).toHaveBeenCalledTimes(1)
       const requestId = startProjectTerminalSessionMock.mock.calls[0]?.[1]
       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)
