@wyxos/zephyr 0.4.0 → 0.4.1

package/package.json

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

package/src/application/deploy/build-remote-deployment-plan.mjs

@@ -338,11 +338,43 @@ async function resolveMaintenanceModePlan({
     })
 }
 
+export async function resolveRemoteDeploymentState({
+                                                       snapshot,
+                                                       executionMode = {},
+                                                       ssh,
+                                                       remoteCwd,
+                                                       runPrompt,
+                                                       logSuccess,
+                                                       logWarning
+                                                   } = {}) {
+    const remoteIsLaravel = await detectRemoteLaravelProject(ssh, remoteCwd)
+
+    if (remoteIsLaravel) {
+        logSuccess?.('Laravel project detected.')
+    } else {
+        logWarning?.('Laravel project not detected; skipping Laravel-specific maintenance tasks.')
+    }
+
+    const maintenanceModeEnabled = await resolveMaintenanceMode({
+        snapshot,
+        remoteIsLaravel,
+        runPrompt,
+        executionMode
+    })
+
+    return {
+        remoteIsLaravel,
+        maintenanceModeEnabled
+    }
+}
+
 export async function buildRemoteDeploymentPlan({
                                                     config,
                                                     snapshot = null,
                                                     requiredPhpVersion = null,
                                                     executionMode = {},
+                                                    remoteIsLaravel = null,
+                                                    maintenanceModeEnabled = null,
                                                     ssh,
                                                     remoteCwd,
                                                     executeRemote,
@@ -351,18 +383,26 @@ export async function buildRemoteDeploymentPlan({
                                                     logWarning,
                                                     runPrompt
                                                 } = {}) {
-    const remoteIsLaravel = await detectRemoteLaravelProject(ssh, remoteCwd)
-
-    if (remoteIsLaravel) {
-        logSuccess?.('Laravel project detected.')
-    } else {
-        logWarning?.('Laravel project not detected; skipping Laravel-specific maintenance tasks.')
-    }
+    const remoteState = typeof remoteIsLaravel === 'boolean' &&
+    (remoteIsLaravel === false || typeof maintenanceModeEnabled === 'boolean')
+        ? {
+            remoteIsLaravel,
+            maintenanceModeEnabled: remoteIsLaravel ? maintenanceModeEnabled : false
+        }
+        : await resolveRemoteDeploymentState({
+            snapshot,
+            executionMode,
+            ssh,
+            remoteCwd,
+            runPrompt,
+            logSuccess,
+            logWarning
+        })
 
     const changedFiles = await collectChangedFiles({
         config,
         snapshot,
-        remoteIsLaravel,
+        remoteIsLaravel: remoteState.remoteIsLaravel,
         executeRemote,
         logProcessing
     })
@@ -370,7 +410,7 @@ export async function buildRemoteDeploymentPlan({
     const horizonConfigured = await detectHorizonConfiguration({
         ssh,
         remoteCwd,
-        remoteIsLaravel,
+        remoteIsLaravel: remoteState.remoteIsLaravel,
         changedFiles
     })
 
@@ -382,18 +422,11 @@ export async function buildRemoteDeploymentPlan({
         logWarning
     })
 
-    const maintenanceModeEnabled = await resolveMaintenanceMode({
-        snapshot,
-        remoteIsLaravel,
-        runPrompt,
-        executionMode
-    })
-
     const maintenanceModePlan = await resolveMaintenanceModePlan({
         snapshot,
-        remoteIsLaravel,
+        remoteIsLaravel: remoteState.remoteIsLaravel,
         remoteCwd,
-        maintenanceModeEnabled,
+        maintenanceModeEnabled: remoteState.maintenanceModeEnabled,
         phpCommand,
         ssh,
         executeRemote,
@@ -403,7 +436,7 @@ export async function buildRemoteDeploymentPlan({
 
     const steps = planLaravelDeploymentTasks({
         branch: config.branch,
-        isLaravel: remoteIsLaravel,
+        isLaravel: remoteState.remoteIsLaravel,
         changedFiles,
         horizonConfigured,
         phpCommand,
@@ -438,7 +471,7 @@ export async function buildRemoteDeploymentPlan({
     }
 
     return {
-        remoteIsLaravel,
+        remoteIsLaravel: remoteState.remoteIsLaravel,
         changedFiles,
         horizonConfigured,
         phpCommand,

package/src/application/deploy/run-deployment.mjs

@@ -12,7 +12,7 @@ import {createRemoteExecutor} from '../../deploy/remote-exec.mjs'
 import {resolveSshKeyPath} from '../../ssh/keys.mjs'
 import {cleanupOldLogs, closeLogFile, getLogFilePath, writeToLogFile} from '../../utils/log-file.mjs'
 import {resolveRemotePath} from '../../utils/remote-path.mjs'
-import {buildRemoteDeploymentPlan} from './build-remote-deployment-plan.mjs'
+import {buildRemoteDeploymentPlan, resolveRemoteDeploymentState} from './build-remote-deployment-plan.mjs'
 import {executeRemoteDeploymentPlan} from './execute-remote-deployment-plan.mjs'
 import {prepareLocalDeployment} from './prepare-local-deployment.mjs'
 
@@ -21,6 +21,37 @@ async function resolveRemoteHome(ssh, sshUser) {
     return remoteHomeResult.stdout.trim() || `/home/${sshUser}`
 }
 
+async function connectToRemoteDeploymentTarget({
+                                                   config,
+                                                   createSshClient,
+                                                   sshUser,
+                                                   privateKey,
+                                                   remoteCwd = null,
+                                                   logProcessing,
+                                                   message
+                                               } = {}) {
+    const ssh = createSshClient()
+
+    logProcessing?.(`\n${message ?? `Connecting to ${config.serverIp} as ${sshUser}...`}`)
+
+    await ssh.connect({
+        host: config.serverIp,
+        username: sshUser,
+        privateKey
+    })
+
+    if (remoteCwd) {
+        return {ssh, remoteCwd}
+    }
+
+    const remoteHome = await resolveRemoteHome(ssh, sshUser)
+
+    return {
+        ssh,
+        remoteCwd: resolveRemotePath(config.projectPath, remoteHome)
+    }
+}
+
 async function maybeRecoverLaravelMaintenanceMode({
     remotePlan,
     executionState,
@@ -105,43 +136,66 @@ export async function runDeployment(config, options = {}) {
 
     await cleanupOldLogs(rootDir)
 
-    const {requiredPhpVersion} = await prepareLocalDeployment(config, {
-        snapshot,
-        rootDir,
-        versionArg,
-        runPrompt,
-        runCommand,
-        runCommandCapture: context.runCommandCapture,
-        logProcessing,
-        logSuccess,
-        logWarning
-    })
-
-    const ssh = createSshClient()
     const sshUser = config.sshUser || os.userInfo().username
     const privateKeyPath = await resolveSshKeyPath(config.sshKey)
     const privateKey = await fs.readFile(privateKeyPath, 'utf8')
+    let ssh = null
     let remoteCwd = null
     let executeRemote = null
     let remotePlan = null
+    let remoteState = null
     const executionState = {
         enteredMaintenanceMode: false,
         exitedMaintenanceMode: false
     }
 
-    logProcessing(`\nConnecting to ${config.serverIp} as ${sshUser}...`)
-
     let lockAcquired = false
 
     try {
-        await ssh.connect({
-            host: config.serverIp,
-            username: sshUser,
-            privateKey
+        ({ssh, remoteCwd} = await connectToRemoteDeploymentTarget({
+            config,
+            createSshClient,
+            sshUser,
+            privateKey,
+            logProcessing,
+            message: `Connecting to ${config.serverIp} as ${sshUser} to inspect remote deployment state...`
+        }))
+
+        remoteState = await resolveRemoteDeploymentState({
+            snapshot,
+            executionMode,
+            ssh,
+            remoteCwd,
+            runPrompt,
+            logSuccess,
+            logWarning
+        })
+
+        // Reconnect after local checks so long-running validation does not hold a stale SSH session open.
+        await ssh.dispose()
+        ssh = null
+
+        const {requiredPhpVersion} = await prepareLocalDeployment(config, {
+            snapshot,
+            rootDir,
+            versionArg,
+            runPrompt,
+            runCommand,
+            runCommandCapture: context.runCommandCapture,
+            logProcessing,
+            logSuccess,
+            logWarning
         })
 
-        const remoteHome = await resolveRemoteHome(ssh, sshUser)
-        remoteCwd = resolveRemotePath(config.projectPath, remoteHome)
+        ;({ssh} = await connectToRemoteDeploymentTarget({
+            config,
+            createSshClient,
+            sshUser,
+            privateKey,
+            remoteCwd,
+            logProcessing,
+            message: `Reconnecting to ${config.serverIp} as ${sshUser}...`
+        }))
 
         logProcessing('Connection established. Acquiring deployment lock on server...')
         await acquireRemoteLock(ssh, remoteCwd, rootDir, {
@@ -168,6 +222,8 @@ export async function runDeployment(config, options = {}) {
             rootDir,
             requiredPhpVersion,
             executionMode,
+            remoteIsLaravel: remoteState?.remoteIsLaravel,
+            maintenanceModeEnabled: remoteState?.maintenanceModeEnabled,
             ssh,
             remoteCwd,
             executeRemote,