@wyxos/zephyr 0.2.21 → 0.2.22

package/src/ssh/keys.mjs

@@ -1,146 +1,146 @@
-import fs from 'node:fs/promises'
-import os from 'node:os'
-import path from 'node:path'
-import inquirer from 'inquirer'
-
-export async function isPrivateKeyFile(filePath) {
-  try {
-    const content = await fs.readFile(filePath, 'utf8')
-    return /-----BEGIN [A-Z ]*PRIVATE KEY-----/.test(content)
-  } catch (_error) {
-    return false
-  }
-}
-
-export async function listSshKeys() {
-  const sshDir = path.join(os.homedir(), '.ssh')
-
-  try {
-    const entries = await fs.readdir(sshDir, { withFileTypes: true })
-
-    const candidates = entries
-      .filter((entry) => entry.isFile())
-      .map((entry) => entry.name)
-      .filter((name) => {
-        if (!name) return false
-        if (name.startsWith('.')) return false
-        if (name.endsWith('.pub')) return false
-        if (name.startsWith('known_hosts')) return false
-        if (name === 'config') return false
-        return name.trim().length > 0
-      })
-
-    const keys = []
-
-    for (const name of candidates) {
-      const filePath = path.join(sshDir, name)
-      if (await isPrivateKeyFile(filePath)) {
-        keys.push(name)
-      }
-    }
-
-    return { sshDir, keys }
-  } catch (error) {
-    if (error.code === 'ENOENT') {
-      return { sshDir, keys: [] }
-    }
-
-    throw error
-  }
-}
-
-export async function promptSshDetails(currentDir, existing = {}, { runPrompt } = {}) {
-  if (!runPrompt) {
-    throw new Error('promptSshDetails requires runPrompt')
-  }
-
-  const { sshDir, keys: sshKeys } = await listSshKeys()
-  const defaultUser = existing.sshUser || os.userInfo().username
-  const fallbackKey = path.join(sshDir, 'id_rsa')
-  const preselectedKey = existing.sshKey || (sshKeys.length ? path.join(sshDir, sshKeys[0]) : fallbackKey)
-
-  const sshKeyPrompt = sshKeys.length
-    ? {
-      type: 'list',
-      name: 'sshKeySelection',
-      message: 'SSH key',
-      choices: [
-        ...sshKeys.map((key) => ({ name: key, value: path.join(sshDir, key) })),
-        new inquirer.Separator(),
-        { name: 'Enter custom SSH key path…', value: '__custom' }
-      ],
-      default: preselectedKey
-    }
-    : {
-      type: 'input',
-      name: 'sshKeySelection',
-      message: 'SSH key path',
-      default: preselectedKey
-    }
-
-  const answers = await runPrompt([
-    {
-      type: 'input',
-      name: 'sshUser',
-      message: 'SSH user',
-      default: defaultUser
-    },
-    sshKeyPrompt
-  ])
-
-  let sshKey = answers.sshKeySelection
-
-  if (sshKey === '__custom') {
-    const { customSshKey } = await runPrompt([
-      {
-        type: 'input',
-        name: 'customSshKey',
-        message: 'SSH key path',
-        default: preselectedKey
-      }
-    ])
-
-    sshKey = customSshKey.trim() || preselectedKey
-  }
-
-  return {
-    sshUser: answers.sshUser.trim() || defaultUser,
-    sshKey: sshKey.trim() || preselectedKey
-  }
-}
-
-export async function ensureSshDetails(config, currentDir, { runPrompt, logProcessing } = {}) {
-  if (config.sshUser && config.sshKey) {
-    return false
-  }
-
-  logProcessing?.('SSH details missing. Please provide them now.')
-  const details = await promptSshDetails(currentDir, config, { runPrompt })
-  Object.assign(config, details)
-  return true
-}
-
-export function expandHomePath(targetPath) {
-  if (!targetPath) {
-    return targetPath
-  }
-
-  if (targetPath.startsWith('~')) {
-    return path.join(os.homedir(), targetPath.slice(1))
-  }
-
-  return targetPath
-}
-
-export async function resolveSshKeyPath(targetPath) {
-  const expanded = expandHomePath(targetPath)
-
-  try {
-    await fs.access(expanded)
-  } catch (_error) {
-    throw new Error(`SSH key not accessible at ${expanded}`)
-  }
-
-  return expanded
-}
-
+import fs from 'node:fs/promises'
+import os from 'node:os'
+import path from 'node:path'
+import inquirer from 'inquirer'
+
+export async function isPrivateKeyFile(filePath) {
+  try {
+    const content = await fs.readFile(filePath, 'utf8')
+    return /-----BEGIN [A-Z ]*PRIVATE KEY-----/.test(content)
+  } catch (_error) {
+    return false
+  }
+}
+
+export async function listSshKeys() {
+  const sshDir = path.join(os.homedir(), '.ssh')
+
+  try {
+    const entries = await fs.readdir(sshDir, { withFileTypes: true })
+
+    const candidates = entries
+      .filter((entry) => entry.isFile())
+      .map((entry) => entry.name)
+      .filter((name) => {
+        if (!name) return false
+        if (name.startsWith('.')) return false
+        if (name.endsWith('.pub')) return false
+        if (name.startsWith('known_hosts')) return false
+        if (name === 'config') return false
+        return name.trim().length > 0
+      })
+
+    const keys = []
+
+    for (const name of candidates) {
+      const filePath = path.join(sshDir, name)
+      if (await isPrivateKeyFile(filePath)) {
+        keys.push(name)
+      }
+    }
+
+    return { sshDir, keys }
+  } catch (error) {
+    if (error.code === 'ENOENT') {
+      return { sshDir, keys: [] }
+    }
+
+    throw error
+  }
+}
+
+export async function promptSshDetails(currentDir, existing = {}, { runPrompt } = {}) {
+  if (!runPrompt) {
+    throw new Error('promptSshDetails requires runPrompt')
+  }
+
+  const { sshDir, keys: sshKeys } = await listSshKeys()
+  const defaultUser = existing.sshUser || os.userInfo().username
+  const fallbackKey = path.join(sshDir, 'id_rsa')
+  const preselectedKey = existing.sshKey || (sshKeys.length ? path.join(sshDir, sshKeys[0]) : fallbackKey)
+
+  const sshKeyPrompt = sshKeys.length
+    ? {
+      type: 'list',
+      name: 'sshKeySelection',
+      message: 'SSH key',
+      choices: [
+        ...sshKeys.map((key) => ({ name: key, value: path.join(sshDir, key) })),
+        new inquirer.Separator(),
+        { name: 'Enter custom SSH key path…', value: '__custom' }
+      ],
+      default: preselectedKey
+    }
+    : {
+      type: 'input',
+      name: 'sshKeySelection',
+      message: 'SSH key path',
+      default: preselectedKey
+    }
+
+  const answers = await runPrompt([
+    {
+      type: 'input',
+      name: 'sshUser',
+      message: 'SSH user',
+      default: defaultUser
+    },
+    sshKeyPrompt
+  ])
+
+  let sshKey = answers.sshKeySelection
+
+  if (sshKey === '__custom') {
+    const { customSshKey } = await runPrompt([
+      {
+        type: 'input',
+        name: 'customSshKey',
+        message: 'SSH key path',
+        default: preselectedKey
+      }
+    ])
+
+    sshKey = customSshKey.trim() || preselectedKey
+  }
+
+  return {
+    sshUser: answers.sshUser.trim() || defaultUser,
+    sshKey: sshKey.trim() || preselectedKey
+  }
+}
+
+export async function ensureSshDetails(config, currentDir, { runPrompt, logProcessing } = {}) {
+  if (config.sshUser && config.sshKey) {
+    return false
+  }
+
+  logProcessing?.('SSH details missing. Please provide them now.')
+  const details = await promptSshDetails(currentDir, config, { runPrompt })
+  Object.assign(config, details)
+  return true
+}
+
+export function expandHomePath(targetPath) {
+  if (!targetPath) {
+    return targetPath
+  }
+
+  if (targetPath.startsWith('~')) {
+    return path.join(os.homedir(), targetPath.slice(1))
+  }
+
+  return targetPath
+}
+
+export async function resolveSshKeyPath(targetPath) {
+  const expanded = expandHomePath(targetPath)
+
+  try {
+    await fs.access(expanded)
+  } catch (_error) {
+    throw new Error(`SSH key not accessible at ${expanded}`)
+  }
+
+  return expanded
+}
+

package/src/ssh/ssh.mjs

@@ -1,134 +1,134 @@
-import fs from 'node:fs/promises'
-import os from 'node:os'
-import chalk from 'chalk'
-import process from 'node:process'
-import { NodeSSH } from 'node-ssh'
-import { createChalkLogger } from '../utils/output.mjs'
-import { resolveRemotePath } from '../utils/remote-path.mjs'
-import { resolveSshKeyPath } from './keys.mjs'
-import { createRemoteExecutor } from '../deploy/remote-exec.mjs'
-import { createSshClientFactory } from '../runtime/ssh-client.mjs'
-
-const { logProcessing, logSuccess, logWarning, logError } = createChalkLogger(chalk)
-
-const createSshClient = createSshClientFactory({ NodeSSH })
-
-function normalizeRemotePath(value) {
-  if (value == null) return value
-  return String(value).replace(/\\/g, '/')
-}
-
-export async function connectToServer(config) {
-  const ssh = createSshClient()
-  const sshUser = config.sshUser || os.userInfo().username
-  const privateKeyPath = await resolveSshKeyPath(config.sshKey)
-  const privateKey = await fs.readFile(privateKeyPath, 'utf8')
-
-  logProcessing(`\nConnecting to ${config.serverIp} as ${sshUser}...`)
-
-  await ssh.connect({
-    host: config.serverIp,
-    username: sshUser,
-    privateKey
-  })
-
-  const remoteHomeResult = await ssh.execCommand('printf "%s" "$HOME"')
-  const remoteHome = remoteHomeResult.stdout.trim() || `/home/${sshUser}`
-  const remoteCwd = resolveRemotePath(config.projectPath, remoteHome)
-
-  logSuccess(`Connected to ${config.serverIp}. Working directory: ${remoteCwd}`)
-
-  return { ssh, remoteCwd, remoteHome }
-}
-
-export async function executeRemoteCommand(ssh, label, command, options = {}) {
-  const {
-    cwd,
-    allowFailure = false,
-    bootstrapEnv = true,
-    rootDir = null,
-    writeToLogFile = null,
-    env = {}
-    // printStdout: legacy option, intentionally ignored (we log to file)
-  } = options
-
-  const rootDirForLogging = rootDir ?? process.cwd()
-  const writeToLogFileFn = writeToLogFile ?? (async () => {})
-
-  const executeRemote = createRemoteExecutor({
-    ssh,
-    rootDir: rootDirForLogging,
-    remoteCwd: cwd,
-    writeToLogFile: writeToLogFileFn,
-    logProcessing,
-    logSuccess,
-    logError
-  })
-
-  return await executeRemote(label, command, { cwd, allowFailure, bootstrapEnv, env })
-}
-
-export async function readRemoteFile(ssh, filePath, remoteCwd) {
-  const normalizedPath = normalizeRemotePath(filePath)
-  const escapedPath = normalizedPath.replace(/'/g, "'\\''")
-  const command = `cat '${escapedPath}'`
-
-  const result = await ssh.execCommand(command, { cwd: normalizeRemotePath(remoteCwd) })
-
-  if (result.code !== 0) {
-    throw new Error(`Failed to read remote file ${filePath}: ${result.stderr}`)
-  }
-
-  return result.stdout
-}
-
-export async function downloadRemoteFile(ssh, remotePath, localPath, remoteCwd) {
-  const normalizedRemotePath = normalizeRemotePath(remotePath)
-  const normalizedCwd = normalizeRemotePath(remoteCwd)
-  const absoluteRemotePath = normalizedRemotePath.startsWith('/')
-    ? normalizedRemotePath
-    : `${normalizedCwd}/${normalizedRemotePath}`
-
-  logProcessing(`Downloading ${absoluteRemotePath} to ${localPath}...`)
-
-  let transferred = 0
-  const startTime = Date.now()
-
-  await ssh.getFile(localPath, absoluteRemotePath, null, {
-    step: (totalTransferred, _chunk, total) => {
-      transferred = totalTransferred
-      const percent = total > 0 ? Math.round((transferred / total) * 100) : 0
-      const elapsed = (Date.now() - startTime) / 1000
-      const speed = elapsed > 0 ? (transferred / elapsed / 1024 / 1024).toFixed(2) : 0
-      const sizeMB = (transferred / 1024 / 1024).toFixed(2)
-      const totalMB = total > 0 ? (total / 1024 / 1024).toFixed(2) : '?'
-
-      process.stdout.write(`\r  Progress: ${percent}% (${sizeMB}MB / ${totalMB}MB) - ${speed} MB/s`)
-    }
-  })
-
-  process.stdout.write('\r' + ' '.repeat(80) + '\r')
-  logSuccess(`Downloaded ${absoluteRemotePath} to ${localPath}`)
-}
-
-export async function deleteRemoteFile(ssh, remotePath, remoteCwd) {
-  const normalizedRemotePath = normalizeRemotePath(remotePath)
-  const normalizedCwd = normalizeRemotePath(remoteCwd)
-  const absoluteRemotePath = normalizedRemotePath.startsWith('/')
-    ? normalizedRemotePath
-    : `${normalizedCwd}/${normalizedRemotePath}`
-
-  const escapedPath = absoluteRemotePath.replace(/'/g, "'\\''")
-  const command = `rm -f '${escapedPath}'`
-
-  logProcessing(`Deleting remote file: ${absoluteRemotePath}...`)
-
-  const result = await ssh.execCommand(command, { cwd: normalizedCwd })
-
-  if (result.code !== 0 && result.code !== 1) {
-    logWarning(`Failed to delete remote file ${absoluteRemotePath}: ${result.stderr}`)
-  } else {
-    logSuccess(`Deleted remote file: ${absoluteRemotePath}`)
-  }
-}
-
+import fs from 'node:fs/promises'
+import os from 'node:os'
+import chalk from 'chalk'
+import process from 'node:process'
+import { NodeSSH } from 'node-ssh'
+import { createChalkLogger } from '../utils/output.mjs'
+import { resolveRemotePath } from '../utils/remote-path.mjs'
+import { resolveSshKeyPath } from './keys.mjs'
+import { createRemoteExecutor } from '../deploy/remote-exec.mjs'
+import { createSshClientFactory } from '../runtime/ssh-client.mjs'
+
+const { logProcessing, logSuccess, logWarning, logError } = createChalkLogger(chalk)
+
+const createSshClient = createSshClientFactory({ NodeSSH })
+
+function normalizeRemotePath(value) {
+  if (value == null) return value
+  return String(value).replace(/\\/g, '/')
+}
+
+export async function connectToServer(config) {
+  const ssh = createSshClient()
+  const sshUser = config.sshUser || os.userInfo().username
+  const privateKeyPath = await resolveSshKeyPath(config.sshKey)
+  const privateKey = await fs.readFile(privateKeyPath, 'utf8')
+
+  logProcessing(`\nConnecting to ${config.serverIp} as ${sshUser}...`)
+
+  await ssh.connect({
+    host: config.serverIp,
+    username: sshUser,
+    privateKey
+  })
+
+  const remoteHomeResult = await ssh.execCommand('printf "%s" "$HOME"')
+  const remoteHome = remoteHomeResult.stdout.trim() || `/home/${sshUser}`
+  const remoteCwd = resolveRemotePath(config.projectPath, remoteHome)
+
+  logSuccess(`Connected to ${config.serverIp}. Working directory: ${remoteCwd}`)
+
+  return { ssh, remoteCwd, remoteHome }
+}
+
+export async function executeRemoteCommand(ssh, label, command, options = {}) {
+  const {
+    cwd,
+    allowFailure = false,
+    bootstrapEnv = true,
+    rootDir = null,
+    writeToLogFile = null,
+    env = {}
+    // printStdout: legacy option, intentionally ignored (we log to file)
+  } = options
+
+  const rootDirForLogging = rootDir ?? process.cwd()
+  const writeToLogFileFn = writeToLogFile ?? (async () => {})
+
+  const executeRemote = createRemoteExecutor({
+    ssh,
+    rootDir: rootDirForLogging,
+    remoteCwd: cwd,
+    writeToLogFile: writeToLogFileFn,
+    logProcessing,
+    logSuccess,
+    logError
+  })
+
+  return await executeRemote(label, command, { cwd, allowFailure, bootstrapEnv, env })
+}
+
+export async function readRemoteFile(ssh, filePath, remoteCwd) {
+  const normalizedPath = normalizeRemotePath(filePath)
+  const escapedPath = normalizedPath.replace(/'/g, "'\\''")
+  const command = `cat '${escapedPath}'`
+
+  const result = await ssh.execCommand(command, { cwd: normalizeRemotePath(remoteCwd) })
+
+  if (result.code !== 0) {
+    throw new Error(`Failed to read remote file ${filePath}: ${result.stderr}`)
+  }
+
+  return result.stdout
+}
+
+export async function downloadRemoteFile(ssh, remotePath, localPath, remoteCwd) {
+  const normalizedRemotePath = normalizeRemotePath(remotePath)
+  const normalizedCwd = normalizeRemotePath(remoteCwd)
+  const absoluteRemotePath = normalizedRemotePath.startsWith('/')
+    ? normalizedRemotePath
+    : `${normalizedCwd}/${normalizedRemotePath}`
+
+  logProcessing(`Downloading ${absoluteRemotePath} to ${localPath}...`)
+
+  let transferred = 0
+  const startTime = Date.now()
+
+  await ssh.getFile(localPath, absoluteRemotePath, null, {
+    step: (totalTransferred, _chunk, total) => {
+      transferred = totalTransferred
+      const percent = total > 0 ? Math.round((transferred / total) * 100) : 0
+      const elapsed = (Date.now() - startTime) / 1000
+      const speed = elapsed > 0 ? (transferred / elapsed / 1024 / 1024).toFixed(2) : 0
+      const sizeMB = (transferred / 1024 / 1024).toFixed(2)
+      const totalMB = total > 0 ? (total / 1024 / 1024).toFixed(2) : '?'
+
+      process.stdout.write(`\r  Progress: ${percent}% (${sizeMB}MB / ${totalMB}MB) - ${speed} MB/s`)
+    }
+  })
+
+  process.stdout.write('\r' + ' '.repeat(80) + '\r')
+  logSuccess(`Downloaded ${absoluteRemotePath} to ${localPath}`)
+}
+
+export async function deleteRemoteFile(ssh, remotePath, remoteCwd) {
+  const normalizedRemotePath = normalizeRemotePath(remotePath)
+  const normalizedCwd = normalizeRemotePath(remoteCwd)
+  const absoluteRemotePath = normalizedRemotePath.startsWith('/')
+    ? normalizedRemotePath
+    : `${normalizedCwd}/${normalizedRemotePath}`
+
+  const escapedPath = absoluteRemotePath.replace(/'/g, "'\\''")
+  const command = `rm -f '${escapedPath}'`
+
+  logProcessing(`Deleting remote file: ${absoluteRemotePath}...`)
+
+  const result = await ssh.execCommand(command, { cwd: normalizedCwd })
+
+  if (result.code !== 0 && result.code !== 1) {
+    logWarning(`Failed to delete remote file ${absoluteRemotePath}: ${result.stderr}`)
+  } else {
+    logSuccess(`Deleted remote file: ${absoluteRemotePath}`)
+  }
+}
+