@wyxos/zephyr 0.2.19 → 0.2.20

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "@wyxos/zephyr",
-  "version": "0.2.19",
+  "version": "0.2.20",
   "description": "A streamlined deployment tool for web applications with intelligent Laravel project detection",
   "type": "module",
-  "main": "./src/main.mjs",
+  "main": "./src/index.mjs",
   "exports": {
-    ".": "./src/main.mjs",
+    ".": "./src/index.mjs",
     "./ssh": "./src/ssh/index.mjs"
   },
   "bin": {

package/src/index.mjs

@@ -0,0 +1,91 @@
+import chalk from 'chalk'
+import inquirer from 'inquirer'
+import { NodeSSH } from 'node-ssh'
+
+import { createChalkLogger } from './utils/output.mjs'
+import { runCommand as runCommandBase, runCommandCapture as runCommandCaptureBase } from './utils/command.mjs'
+import { createLocalCommandRunners } from './runtime/local-command.mjs'
+import { createRunPrompt } from './runtime/prompt.mjs'
+import { createSshClientFactory } from './runtime/ssh-client.mjs'
+import { generateId } from './utils/id.mjs'
+
+import { loadServers as loadServersImpl, saveServers } from './config/servers.mjs'
+import { loadProjectConfig as loadProjectConfigImpl, saveProjectConfig } from './config/project.mjs'
+import * as configFlow from './utils/config-flow.mjs'
+import * as sshKeys from './ssh/keys.mjs'
+import { writeToLogFile } from './utils/log-file.mjs'
+
+export { main, runRemoteTasks } from './main.mjs'
+export { connectToServer, executeRemoteCommand, readRemoteFile, downloadRemoteFile, deleteRemoteFile } from './ssh/index.mjs'
+
+const { logProcessing, logSuccess, logWarning, logError } = createChalkLogger(chalk)
+const runPrompt = createRunPrompt({ inquirer })
+const { runCommand, runCommandCapture } = createLocalCommandRunners({
+  runCommandBase,
+  runCommandCaptureBase
+})
+
+// Keep this aligned with main's test injection behavior
+const createSshClient = createSshClientFactory({ NodeSSH })
+
+export { logProcessing, logSuccess, logWarning, logError, runCommand, runCommandCapture, writeToLogFile, createSshClient }
+
+export async function loadServers() {
+  return await loadServersImpl({ logSuccess, logWarning })
+}
+
+export async function loadProjectConfig(rootDir, servers) {
+  return await loadProjectConfigImpl(rootDir, servers, { logSuccess, logWarning })
+}
+
+export function defaultProjectPath(currentDir) {
+  return configFlow.defaultProjectPath(currentDir)
+}
+
+export async function listGitBranches(currentDir) {
+  return await configFlow.listGitBranches(currentDir, { runCommandCapture, logWarning })
+}
+
+export async function promptSshDetails(currentDir, existing = {}) {
+  return await sshKeys.promptSshDetails(currentDir, existing, { runPrompt })
+}
+
+export async function promptServerDetails(existingServers = []) {
+  return await configFlow.promptServerDetails(existingServers, { runPrompt, generateId })
+}
+
+export async function selectServer(servers) {
+  return await configFlow.selectServer(servers, {
+    runPrompt,
+    logProcessing,
+    logSuccess,
+    saveServers,
+    promptServerDetails
+  })
+}
+
+export async function promptAppDetails(currentDir, existing = {}) {
+  return await configFlow.promptAppDetails(currentDir, existing, {
+    runPrompt,
+    listGitBranches,
+    defaultProjectPath,
+    promptSshDetails
+  })
+}
+
+export async function selectApp(projectConfig, server, currentDir) {
+  return await configFlow.selectApp(projectConfig, server, currentDir, {
+    runPrompt,
+    logWarning,
+    logProcessing,
+    logSuccess,
+    saveProjectConfig,
+    generateId,
+    promptAppDetails
+  })
+}
+
+export async function selectPreset(projectConfig, servers) {
+  return await configFlow.selectPreset(projectConfig, servers, { runPrompt })
+}
+

package/src/ssh/ssh.mjs

@@ -13,6 +13,11 @@ const { logProcessing, logSuccess, logWarning, logError } = createChalkLogger(ch
 
 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
@@ -64,10 +69,11 @@ export async function executeRemoteCommand(ssh, label, command, options = {}) {
 }
 
 export async function readRemoteFile(ssh, filePath, remoteCwd) {
-  const escapedPath = filePath.replace(/'/g, "'\\''")
+  const normalizedPath = normalizeRemotePath(filePath)
+  const escapedPath = normalizedPath.replace(/'/g, "'\\''")
   const command = `cat '${escapedPath}'`
 
-  const result = await ssh.execCommand(command, { cwd: remoteCwd })
+  const result = await ssh.execCommand(command, { cwd: normalizeRemotePath(remoteCwd) })
 
   if (result.code !== 0) {
     throw new Error(`Failed to read remote file ${filePath}: ${result.stderr}`)
@@ -77,9 +83,11 @@ export async function readRemoteFile(ssh, filePath, remoteCwd) {
 }
 
 export async function downloadRemoteFile(ssh, remotePath, localPath, remoteCwd) {
-  const absoluteRemotePath = remotePath.startsWith('/')
-    ? remotePath
-    : `${remoteCwd}/${remotePath}`
+  const normalizedRemotePath = normalizeRemotePath(remotePath)
+  const normalizedCwd = normalizeRemotePath(remoteCwd)
+  const absoluteRemotePath = normalizedRemotePath.startsWith('/')
+    ? normalizedRemotePath
+    : `${normalizedCwd}/${normalizedRemotePath}`
 
   logProcessing(`Downloading ${absoluteRemotePath} to ${localPath}...`)
 
@@ -104,16 +112,18 @@ export async function downloadRemoteFile(ssh, remotePath, localPath, remoteCwd)
 }
 
 export async function deleteRemoteFile(ssh, remotePath, remoteCwd) {
-  const absoluteRemotePath = remotePath.startsWith('/')
-    ? remotePath
-    : `${remoteCwd}/${remotePath}`
+  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: remoteCwd })
+  const result = await ssh.execCommand(command, { cwd: normalizedCwd })
 
   if (result.code !== 0 && result.code !== 1) {
     logWarning(`Failed to delete remote file ${absoluteRemotePath}: ${result.stderr}`)