@rpcbase/cli 0.121.0 → 0.123.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rpcbase/cli",
-  "version": "0.121.0",
+  "version": "0.123.0",
   "type": "module",
   "main": "./index.js",
   "bin": {

package/src/cmd-deploy/detect-compose-changes.js

@@ -66,9 +66,22 @@ const buildRsyncCmd = ({ includeArgs, excludeArgs, keyPath, source, dest, remote
   return parts.join(" ")
 }
 
-export const detectComposeChanges = ({ keyPath, user, host, deployDir, log, extraExcludes = [] }) => {
+const runRsync = (cmd) => {
+  try {
+    execSync(cmd, { stdio: "ignore" })
+  } catch (err) {
+    const allowed = [23, 24]
+    if (!allowed.includes(err?.status)) throw err
+  }
+}
+
+// Pull remote compose files into a temp dir, mirror local ones into another, then hash trees to detect diffs.
+// Callers await this check; errors bubble up except for benign rsync statuses handled in runRsync.
+export const detectComposeChanges = async ({ keyPath, user, host, deployDir, log, extraExcludes = [] }) => {
   const includeArgs = ["--include='*/'", "--include='*compose*.yml'", "--exclude='*'"]
   const excludeArgs = baseExcludeList
+    // dev compose files are not relevant for prod deploy checks
+    .concat(["compose.dev.yml"])
     .concat(extraExcludes)
     .map((p) => `--exclude='${p}'`)
     .join(" ")
@@ -88,7 +101,6 @@ export const detectComposeChanges = ({ keyPath, user, host, deployDir, log, extr
   }
 
   try {
-    // fetch remote compose files into temp dir
     const remoteSyncCmd = buildRsyncCmd({
       includeArgs,
       excludeArgs,
@@ -97,10 +109,9 @@ export const detectComposeChanges = ({ keyPath, user, host, deployDir, log, extr
       dest: `${remoteDir}/`,
       remote: true,
     })
-    log(`Syncing remote compose files: ${remoteSyncCmd}`)
-    execSync(remoteSyncCmd, { stdio: "ignore" })
+    log?.(`Syncing remote compose files: ${remoteSyncCmd}`)
+    runRsync(remoteSyncCmd)
 
-    // copy local compose files into temp dir (same filters to keep parity)
     const localSyncCmd = buildRsyncCmd({
       includeArgs,
       excludeArgs,
@@ -109,8 +120,8 @@ export const detectComposeChanges = ({ keyPath, user, host, deployDir, log, extr
       dest: `${localDir}/`,
       remote: false,
     })
-    log(`Syncing local compose files: ${localSyncCmd}`)
-    execSync(localSyncCmd, { stdio: "ignore" })
+    log?.(`Syncing local compose files: ${localSyncCmd}`)
+    runRsync(localSyncCmd)
 
     const remoteHashes = hashTree(remoteDir)
     const localHashes = hashTree(localDir)

package/src/cmd-deploy/index.js

@@ -88,7 +88,7 @@ export const deploy = async (argv) => {
     console.log(`${user}@${host}`, res)
     await ssh(`mkdir -p ~/apps/${deployDir}`)
 
-    const { hasChanges: infrastructureChanged, output: infrastructureDiff } = detectComposeChanges({
+    const { hasChanges: infrastructureChanged, output: infrastructureDiff } = await detectComposeChanges({
       keyPath,
       user,
       host,