Merge pull request #2 from skulidropek/pr-refs-pull-150-head

fix: support direct container IP for SSH access when running inside D…

Author: skulidropek

packages/lib/src/usecases/actions/create-project.ts

@@ -23,7 +23,10 @@ import { renderError } from "../errors.js"
 import { applyGithubForkConfig } from "../github-fork.js"
 import { defaultProjectsRoot } from "../menu-helpers.js"
 import { findSshPrivateKey } from "../path-helpers.js"
-import { buildSshCommand } from "../projects-core.js"
+import {
+  buildSshCommand,
+  getContainerIpIfInsideContainer
+} from "../projects-core.js"
 import { resolveTemplateResourceLimits } from "../resource-limits.js"
 import { autoSyncState } from "../state-repo.js"
 import { ensureTerminalCursorVisible } from "../terminal-cursor.js"
@@ -97,8 +100,11 @@ const isInteractiveTty = (): boolean => process.stdin.isTTY && process.stdout.is
 const buildSshArgs = (
   config: CreateCommand["config"],
   sshKeyPath: string | null,
-  remoteCommand?: string
+  remoteCommand?: string,
+  ipAddress?: string
 ): ReadonlyArray<string> => {
+  const host = ipAddress ?? "localhost"
+  const port = ipAddress ? 22 : config.sshPort
   const args: Array<string> = []
   if (sshKeyPath !== null) {
     args.push("-i", sshKeyPath)
@@ -113,8 +119,8 @@ const buildSshArgs = (
     "-o",
     "UserKnownHostsFile=/dev/null",
     "-p",
-    String(config.sshPort),
-    `${config.sshUser}@localhost`
+    String(port),
+    `${config.sshUser}@${host}`
   )
   if (remoteCommand !== undefined) {
     args.push(remoteCommand)
@@ -140,8 +146,14 @@ const openSshBestEffort = (
     const fs = yield* _(FileSystem.FileSystem)
     const path = yield* _(Path.Path)
 
+    const ipAddress = yield* _(
+      getContainerIpIfInsideContainer(fs, process.cwd(), template.containerName).pipe(
+        Effect.catchAll(() => Effect.succeed(undefined))
+      )
+    )
+
     const sshKey = yield* _(findSshPrivateKey(fs, path, process.cwd()))
-    const sshCommand = buildSshCommand(template, sshKey)
+    const sshCommand = buildSshCommand(template, sshKey, ipAddress)
 
     const remoteCommandLabel = remoteCommand === undefined ? "" : ` (${remoteCommand})`
 
@@ -152,7 +164,7 @@ const openSshBestEffort = (
         {
           cwd: process.cwd(),
           command: "ssh",
-          args: buildSshArgs(template, sshKey, remoteCommand)
+          args: buildSshArgs(template, sshKey, remoteCommand, ipAddress)
         },
         [0, 130],
         (exitCode) => new CommandFailedError({ command: "ssh", exitCode })

packages/lib/src/usecases/actions/docker-up.ts

@@ -12,6 +12,7 @@ import {
   runDockerComposeUpRecreate,
   runDockerExecExitCode,
   runDockerInspectContainerBridgeIp,
+  runDockerInspectContainerIp,
   runDockerNetworkConnectBridge
 } from "../../shell/docker.js"
 import type { DockerCommandError } from "../../shell/errors.js"
@@ -31,14 +32,29 @@ const agentFailPath = "/run/docker-git/agent.failed"
 const logSshAccess = (
   baseDir: string,
   config: CreateCommand["config"]
-): Effect.Effect<void, PlatformError, FileSystem.FileSystem | Path.Path> =>
+): Effect.Effect<void, PlatformError, FileSystem.FileSystem | Path.Path | CommandExecutor.CommandExecutor> =>
   Effect.gen(function*(_) {
     const fs = yield* _(FileSystem.FileSystem)
     const path = yield* _(Path.Path)
+
+    const isInsideContainer = yield* _(fs.exists("/.dockerenv"))
+    let ipAddress: string | undefined = undefined
+
+    if (isInsideContainer) {
+      const containerIp = yield* _(
+        runDockerInspectContainerIp(baseDir, config.containerName).pipe(
+          Effect.catchAll(() => Effect.succeed(""))
+        )
+      )
+      if (containerIp.length > 0) {
+        ipAddress = containerIp
+      }
+    }
+
     const resolvedAuthorizedKeys = resolveAuthorizedKeysPath(path, baseDir, config.authorizedKeysPath)
     const authExists = yield* _(fs.exists(resolvedAuthorizedKeys))
     const sshKey = yield* _(findSshPrivateKey(fs, path, process.cwd()))
-    const sshCommand = buildSshCommand(config, sshKey)
+    const sshCommand = buildSshCommand(config, sshKey, ipAddress)
 
     yield* _(Effect.log(`SSH access: ${sshCommand}`))
     if (!authExists) {

packages/lib/src/usecases/projects-core.ts

@@ -1,10 +1,12 @@
+import type * as CommandExecutor from "@effect/platform/CommandExecutor"
 import type { PlatformError } from "@effect/platform/Error"
 import * as FileSystem from "@effect/platform/FileSystem"
 import * as Path from "@effect/platform/Path"
 import { Effect, pipe } from "effect"
 
 import type { ProjectConfig, TemplateConfig } from "../core/domain.js"
 import { deriveRepoPathParts } from "../core/domain.js"
+import { runDockerInspectContainerIp } from "../shell/docker.js"
 import { readProjectConfig } from "../shell/config.js"
 import type { ConfigDecodeError, ConfigNotFoundError } from "../shell/errors.js"
 import { resolveBaseDir } from "../shell/paths.js"
@@ -20,16 +22,21 @@ export type ProjectLoadError = PlatformError | ConfigNotFoundError | ConfigDecod
 
 export const buildSshCommand = (
   config: TemplateConfig,
-  sshKey: string | null
-): string =>
-  sshKey === null
-    ? `ssh ${sshOptions} -p ${config.sshPort} ${config.sshUser}@localhost`
-    : `ssh -i ${sshKey} ${sshOptions} -p ${config.sshPort} ${config.sshUser}@localhost`
+  sshKey: string | null,
+  ipAddress?: string
+): string => {
+  const host = ipAddress ?? "localhost"
+  const port = ipAddress ? 22 : config.sshPort
+  return sshKey === null
+    ? `ssh ${sshOptions} -p ${port} ${config.sshUser}@${host}`
+    : `ssh -i ${sshKey} ${sshOptions} -p ${port} ${config.sshUser}@${host}`
+}
 
 export type ProjectSummary = {
   readonly projectDir: string
   readonly config: ProjectConfig
   readonly sshCommand: string
+  readonly ipAddress?: string | undefined
   readonly authorizedKeysPath: string
   readonly authorizedKeysExists: boolean
 }
@@ -45,6 +52,7 @@ export type ProjectItem = {
   readonly sshPort: number
   readonly targetDir: string
   readonly sshCommand: string
+  readonly ipAddress?: string | undefined
   readonly sshKeyPath: string | null
   readonly authorizedKeysPath: string
   readonly authorizedKeysExists: boolean
@@ -73,6 +81,24 @@ type ProjectBase = {
   readonly config: ProjectConfig
 }
 
+export const getContainerIpIfInsideContainer = (
+  fs: FileSystem.FileSystem,
+  projectDir: string,
+  containerName: string
+): Effect.Effect<string | undefined, PlatformError, CommandExecutor.CommandExecutor> =>
+  Effect.gen(function*(_) {
+    const isInsideContainer = yield* _(fs.exists("/.dockerenv"))
+    if (!isInsideContainer) {
+      return undefined
+    }
+    return yield* _(
+      runDockerInspectContainerIp(projectDir, containerName).pipe(
+        Effect.map((ip) => (ip.length > 0 ? ip : undefined)),
+        Effect.catchAll(() => Effect.succeed(undefined))
+      )
+    )
+  })
+
 const loadProjectBase = (
   configPath: string
 ): Effect.Effect<ProjectBase, ProjectLoadError, FileSystem.FileSystem | Path.Path> =>
@@ -91,21 +117,25 @@ const findProjectConfigPaths = (
 export const loadProjectSummary = (
   configPath: string,
   sshKey: string | null
-): Effect.Effect<ProjectSummary, ProjectLoadError, FileSystem.FileSystem | Path.Path> =>
+): Effect.Effect<ProjectSummary, ProjectLoadError, FileSystem.FileSystem | Path.Path | CommandExecutor.CommandExecutor> =>
   Effect.gen(function*(_) {
     const { config, fs, path, projectDir } = yield* _(loadProjectBase(configPath))
+
+    const ipAddress = yield* _(getContainerIpIfInsideContainer(fs, projectDir, config.template.containerName))
+
     const resolvedAuthorizedKeys = resolveAuthorizedKeysPath(
       path,
       projectDir,
       config.template.authorizedKeysPath
     )
     const authExists = yield* _(fs.exists(resolvedAuthorizedKeys))
-    const sshCommand = buildSshCommand(config.template, sshKey)
+    const sshCommand = buildSshCommand(config.template, sshKey, ipAddress)
 
     return {
       projectDir,
       config,
       sshCommand,
+      ipAddress,
       authorizedKeysPath: resolvedAuthorizedKeys,
       authorizedKeysExists: authExists
     }
@@ -139,13 +169,16 @@ const formatDisplayName = (repoUrl: string): string => {
 export const loadProjectItem = (
   configPath: string,
   sshKey: string | null
-): Effect.Effect<ProjectItem, ProjectLoadError, FileSystem.FileSystem | Path.Path> =>
+): Effect.Effect<ProjectItem, ProjectLoadError, FileSystem.FileSystem | Path.Path | CommandExecutor.CommandExecutor> =>
   Effect.gen(function*(_) {
     const { config, fs, path, projectDir } = yield* _(loadProjectBase(configPath))
     const template = config.template
+
+    const ipAddress = yield* _(getContainerIpIfInsideContainer(fs, projectDir, template.containerName))
+
     const resolvedAuthorizedKeys = resolveAuthorizedKeysPath(path, projectDir, template.authorizedKeysPath)
     const authExists = yield* _(fs.exists(resolvedAuthorizedKeys))
-    const sshCommand = buildSshCommand(template, sshKey)
+    const sshCommand = buildSshCommand(template, sshKey, ipAddress)
     const displayName = formatDisplayName(template.repoUrl)
 
     return {
@@ -159,6 +192,7 @@ export const loadProjectItem = (
       sshPort: template.sshPort,
       targetDir: template.targetDir,
       sshCommand,
+      ipAddress,
       sshKeyPath: sshKey,
       authorizedKeysPath: resolvedAuthorizedKeys,
       authorizedKeysExists: authExists,

packages/lib/src/usecases/projects-list.ts

@@ -29,7 +29,7 @@ import {
 export const listProjects: Effect.Effect<
   void,
   PlatformError,
-  FileSystem.FileSystem | Path.Path
+  FileSystem.FileSystem | Path.Path | CommandExecutor.CommandExecutor
 > = pipe(
   withProjectIndexAndSsh((index, sshKey) =>
     Effect.gen(function*(_) {
@@ -78,9 +78,9 @@ const emptyItems = (): ReadonlyArray<ProjectItem> => []
 const collectProjectValues = <A, B, E>(
   configPaths: ReadonlyArray<string>,
   sshKey: string | null,
-  load: (configPath: string, sshKey: string | null) => Effect.Effect<A, E, FileSystem.FileSystem | Path.Path>,
+  load: (configPath: string, sshKey: string | null) => Effect.Effect<A, E, FileSystem.FileSystem | Path.Path | CommandExecutor.CommandExecutor>,
   toValue: (value: A) => B
-): Effect.Effect<ReadonlyArray<B>, never, FileSystem.FileSystem | Path.Path> =>
+): Effect.Effect<ReadonlyArray<B>, never, FileSystem.FileSystem | Path.Path | CommandExecutor.CommandExecutor> =>
   Effect.gen(function*(_) {
     const available: Array<B> = []
 
@@ -102,10 +102,10 @@ const collectProjectValues = <A, B, E>(
   })
 
 const listProjectValues = <A, B, E>(
-  load: (configPath: string, sshKey: string | null) => Effect.Effect<A, E, FileSystem.FileSystem | Path.Path>,
+  load: (configPath: string, sshKey: string | null) => Effect.Effect<A, E, FileSystem.FileSystem | Path.Path | CommandExecutor.CommandExecutor>,
   toValue: (value: A) => B,
   empty: () => ReadonlyArray<B>
-): Effect.Effect<ReadonlyArray<B>, PlatformError, FileSystem.FileSystem | Path.Path> =>
+): Effect.Effect<ReadonlyArray<B>, PlatformError, FileSystem.FileSystem | Path.Path | CommandExecutor.CommandExecutor> =>
   pipe(
     withProjectIndexAndSsh((index, sshKey) => collectProjectValues(index.configPaths, sshKey, load, toValue)),
     Effect.map((values) => values ?? empty())
@@ -114,7 +114,7 @@ const listProjectValues = <A, B, E>(
 export const listProjectSummaries: Effect.Effect<
   ReadonlyArray<string>,
   PlatformError,
-  FileSystem.FileSystem | Path.Path
+  FileSystem.FileSystem | Path.Path | CommandExecutor.CommandExecutor
 > = listProjectValues(loadProjectSummary, renderProjectSummary, emptySummaries)
 
 // CHANGE: load docker-git projects for TUI selection
@@ -130,7 +130,7 @@ export const listProjectSummaries: Effect.Effect<
 export const listProjectItems: Effect.Effect<
   ReadonlyArray<ProjectItem>,
   PlatformError,
-  FileSystem.FileSystem | Path.Path
+  FileSystem.FileSystem | Path.Path | CommandExecutor.CommandExecutor
 > = listProjectValues(loadProjectItem, (value) => value, emptyItems)
 
 // CHANGE: list only running docker-git projects (for "Stop container" UI)