fix: resolve project SSH through shared Docker network

Author: skulidropek

packages/api/src/services/terminal-sessions.ts

@@ -10,7 +10,9 @@ import { Effect, Either } from "effect"
 import { Buffer } from "node:buffer"
 import { spawn } from "node:child_process"
 import { randomUUID } from "node:crypto"
+import { existsSync } from "node:fs"
 import type { IncomingMessage, Server as HttpServer } from "node:http"
+import os from "node:os"
 import type { Duplex } from "node:stream"
 import { WebSocket, WebSocketServer, type RawData } from "ws"
 
@@ -140,7 +142,13 @@ type ContainerNetworkEntry = {
   readonly name: string
 }
 
-const dockerGitApiContainerName = (): string => process.env["DOCKER_GIT_API_CONTAINER_NAME"]?.trim() || "docker-git-api"
+const dockerGitApiContainerName = (): string =>
+  process.env["DOCKER_GIT_API_CONTAINER_NAME"]?.trim() || os.hostname().trim() || "docker-git-api"
+
+const isContainerizedController = (): boolean => {
+  const configuredName = process.env["DOCKER_GIT_API_CONTAINER_NAME"]?.trim()
+  return (configuredName !== undefined && configuredName.length > 0) || existsSync("/.dockerenv")
+}
 
 const parseContainerNetworkEntries = (output: string): ReadonlyArray<ContainerNetworkEntry> =>
   output
@@ -150,9 +158,23 @@ const parseContainerNetworkEntries = (output: string): ReadonlyArray<ContainerNe
     .map(([name, ipAddress]) => ({ name, ipAddress }))
 
 const selectReachableProjectNetwork = (
+  projectEntries: ReadonlyArray<ContainerNetworkEntry>,
+  controllerEntries: ReadonlyArray<ContainerNetworkEntry>
+): ContainerNetworkEntry | null =>
+  projectEntries.find((entry) =>
+    entry.name !== "bridge" && controllerEntries.some((controllerEntry) => controllerEntry.name === entry.name)
+  ) ??
+    projectEntries.find((entry) =>
+      controllerEntries.some((controllerEntry) => controllerEntry.name === entry.name)
+    ) ??
+    null
+
+const selectFallbackProjectNetwork = (
   entries: ReadonlyArray<ContainerNetworkEntry>
 ): ContainerNetworkEntry | null =>
-  entries.find((entry) => entry.name !== "bridge") ?? entries[0] ?? null
+  isContainerizedController()
+    ? entries.find((entry) => entry.name === "bridge") ?? entries[0] ?? null
+    : null
 
 const inspectContainerNetworks = (
   containerName: string
@@ -177,7 +199,7 @@ const connectContainerToNetwork = (
   containerName: string
 ) =>
   networkName === "bridge"
-    ? Effect.void
+    ? Effect.succeed(true)
     : runCommandCapture(
       {
         cwd: process.cwd(),
@@ -187,23 +209,36 @@ const connectContainerToNetwork = (
       [0],
       (exitCode) => new CommandFailedError({ command: `docker network connect ${networkName}`, exitCode })
     ).pipe(
-      Effect.asVoid,
-      Effect.orElseSucceed(() => void 0)
+      Effect.as(true),
+      Effect.orElseSucceed(() => false)
     )
 
 const resolveControllerReachableProject = (
   projectItem: ProjectItem
 ) =>
   Effect.gen(function*(_) {
+    const controllerContainer = dockerGitApiContainerName()
     const networkEntries = yield* _(inspectContainerNetworks(projectItem.containerName).pipe(Effect.orElseSucceed(() => [])))
+    const controllerNetworks = yield* _(inspectContainerNetworks(controllerContainer).pipe(Effect.orElseSucceed(() => [])))
+    const alreadyReachable = selectReachableProjectNetwork(networkEntries, controllerNetworks)
+    if (alreadyReachable !== null) {
+      return {
+        ...projectItem,
+        ipAddress: alreadyReachable.ipAddress
+      }
+    }
     yield* _(
       Effect.forEach(
         networkEntries.filter((entry) => entry.name !== "bridge"),
-        (entry) => connectContainerToNetwork(entry.name, dockerGitApiContainerName()),
+        (entry) => connectContainerToNetwork(entry.name, controllerContainer),
         { discard: true }
       )
     )
-    const preferredNetwork = selectReachableProjectNetwork(networkEntries)
+    const refreshedControllerNetworks = yield* _(
+      inspectContainerNetworks(controllerContainer).pipe(Effect.orElseSucceed(() => []))
+    )
+    const preferredNetwork = selectReachableProjectNetwork(networkEntries, refreshedControllerNetworks) ??
+      selectFallbackProjectNetwork(networkEntries)
     if (preferredNetwork === null) {
       return projectItem
     }