@wyxos/zephyr 0.9.7 → 0.9.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wyxos/zephyr",
-  "version": "0.9.7",
+  "version": "0.9.9",
   "description": "A streamlined deployment tool for web applications with intelligent Laravel project detection",
   "type": "module",
   "main": "./src/index.mjs",

package/src/application/configuration/select-deployment-target.mjs

@@ -28,7 +28,10 @@ function createPresetState(rootDir, projectConfig, preset, {
         async saveOptions(nextOptions, {
             message = null
         } = {}) {
-            const normalizedOptions = normalizePresetOptions(nextOptions)
+            const normalizedOptions = normalizePresetOptions({
+                ...preset.options,
+                ...nextOptions
+            })
 
             if (presetOptionsEqual(preset.options, normalizedOptions)) {
                 return false

package/src/runtime/app-context.mjs

@@ -54,7 +54,7 @@ export function createAppContext({
         workflow: normalizedExecutionMode.workflow
     })
     const hasInteractiveTerminal = Boolean(processInstance?.stdin?.isTTY && processInstance?.stdout?.isTTY)
-    const createSshClient = createSshClientFactory({NodeSSH: NodeSSHClass})
+    const createSshClient = createSshClientFactory({NodeSSH: NodeSSHClass, logWarning})
     const {runCommand, runCommandCapture} = createLocalCommandRunners({
         runCommandBase: runCommandImpl,
         runCommandCaptureBase: runCommandCaptureImpl

package/src/runtime/ssh-client.mjs

@@ -1,14 +1,69 @@
-export function createSshClientFactory({ NodeSSH }) {
+const connectionErrorHandlerSymbol = Symbol('zephyrSshConnectionErrorHandler')
+const connectWrapperSymbol = Symbol('zephyrSshConnectWrapper')
+
+function getErrorMessage(error) {
+  if (error instanceof Error && error.message) {
+    return error.message
+  }
+
+  return String(error ?? 'Unknown SSH connection error')
+}
+
+export function attachSshConnectionErrorHandler(ssh, { logWarning } = {}) {
+  const connection = ssh?.connection
+
+  if (!connection || typeof connection.on !== 'function') {
+    return false
+  }
+
+  if (connection[connectionErrorHandlerSymbol]) {
+    return false
+  }
+
+  let hasLogged = false
+  const handler = (error) => {
+    if (hasLogged) {
+      return
+    }
+
+    hasLogged = true
+    logWarning?.(`SSH connection emitted a background error after connect: ${getErrorMessage(error)}`)
+  }
+
+  connection.on('error', handler)
+  connection[connectionErrorHandlerSymbol] = handler
+
+  return true
+}
+
+function wrapSshConnect(ssh, { logWarning } = {}) {
+  if (!ssh || typeof ssh.connect !== 'function' || ssh[connectWrapperSymbol]) {
+    return ssh
+  }
+
+  const originalConnect = ssh.connect
+
+  ssh.connect = async function connectWithBackgroundErrorHandler(...args) {
+    const result = await originalConnect.apply(this, args)
+    attachSshConnectionErrorHandler(this, { logWarning })
+
+    return result
+  }
+  ssh[connectWrapperSymbol] = true
+
+  return ssh
+}
+
+export function createSshClientFactory({ NodeSSH, logWarning }) {
   if (!NodeSSH) {
     throw new Error('createSshClientFactory requires NodeSSH')
   }
 
   return function createSshClient() {
     if (typeof globalThis !== 'undefined' && globalThis.__zephyrSSHFactory) {
-      return globalThis.__zephyrSSHFactory()
+      return wrapSshConnect(globalThis.__zephyrSSHFactory(), { logWarning })
     }
 
-    return new NodeSSH()
+    return wrapSshConnect(new NodeSSH(), { logWarning })
   }
 }
-

package/src/ssh/ssh.mjs

@@ -11,7 +11,7 @@ import { createSshClientFactory } from '../runtime/ssh-client.mjs'
 
 const { logProcessing, logSuccess, logWarning, logError } = createChalkLogger(chalk)
 
-const createSshClient = createSshClientFactory({ NodeSSH })
+const createSshClient = createSshClientFactory({ NodeSSH, logWarning })
 
 function normalizeRemotePath(value) {
   if (value == null) return value
@@ -136,4 +136,3 @@ export async function deleteRemoteFile(ssh, remotePath, remoteCwd) {
     logSuccess(`Deleted remote file: ${absoluteRemotePath}`)
   }
 }
-