@rpcbase/cli 0.119.0 → 0.120.0

package/package.json

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

package/src/cmd-deploy.js

@@ -8,26 +8,65 @@ import validator from "validator"
 import { purgeCloudflareCaches } from "./cloudflare-purge.js"
 
 
-const detectComposeChanges = ({ keyPath, user, host, deployDir, log }) => {
+const baseExcludeList = [
+  ".husky/",
+  ".github/",
+  ".git/",
+  ".wireit/",
+  "coverage/",
+  "node_modules/",
+  "infrastructure/data/",
+  ".gitignore",
+  "*.css.map",
+  // "*.env*",
+  // "*.js.map",
+  "*.md",
+]
+
+
+const detectComposeChanges = ({ keyPath, user, host, deployDir, log, extraExcludes = [] }) => {
   const includeArgs = ["--include='*/'", "--include='*compose*.yml'", "--exclude='*'"]
+  const excludeArgs = baseExcludeList
+    .concat(extraExcludes)
+    .map((p) => `--exclude='${p}'`)
+    .join(" ")
 
+  // keep --delete so remote-only compose files show up as *deleting in dry-run; dropping it hides stale files
   const rsyncCmd = [
-    "rsync -avzn --delete --itemize-changes",
+    "rsync -avzn --delete --itemize-changes --filter=':- .gitignore'",
     includeArgs.join(" "),
+    excludeArgs,
     `-e "ssh -i '${keyPath}' -o StrictHostKeyChecking=no"`,
     ".",
     `${user}@${host}:~/apps/${deployDir}/`,
-  ].join(" ")
+  ].filter(Boolean).join(" ")
 
   log(`Checking compose files (dry-run): ${rsyncCmd}`)
 
-  const out = execSync(rsyncCmd, { stdio: "pipe" }).toString()
+  let out
+  try {
+    out = execSync(rsyncCmd, { stdio: "pipe" }).toString()
+  } catch (error) {
+    const allowedExitCodes = [23, 24]
+    if (allowedExitCodes.includes(error?.status) && error?.stdout) {
+      out = error.stdout.toString()
+    } else {
+      throw error
+    }
+  }
 
   // rsync --itemize-changes prefixes change lines; any line that isn't a summary indicates a diff
   const changeLines = out
     .split("\n")
     .map((line) => line.trim())
-    .filter((line) => line && !line.startsWith("sending ") && !line.startsWith("sent ") && !line.startsWith("total size"))
+    .filter((line) => {
+      if (!line) return false
+      if (line.startsWith("sending ")) return false
+      if (line.startsWith("sent ")) return false
+      if (line.startsWith("total size")) return false
+      if (line.startsWith("receiving incremental file list")) return false
+      return true
+    })
 
   const hasChanges = changeLines.length > 0
 
@@ -114,27 +153,21 @@ export const deploy = async (argv) => {
     console.log(`${user}@${host}`, res)
     await ssh(`mkdir -p ~/apps/${deployDir}`)
 
-    const { hasChanges: infrastructureChanged, output: infrastructureDiff } = detectComposeChanges({ keyPath, user, host, deployDir, log })
+    const { hasChanges: infrastructureChanged, output: infrastructureDiff } = detectComposeChanges({
+      keyPath,
+      user,
+      host,
+      deployDir,
+      log,
+      extraExcludes: argv.ignore || [],
+    })
 
     if (infrastructureChanged) {
       console.log("Infrastructure compose files differ between local and remote (info only; deploy proceeds).")
       if (argv.verbose) console.log(infrastructureDiff)
     }
 
-    const excludeList = [
-      ".husky/",
-      ".github/",
-      ".git/",
-      ".wireit/",
-      "coverage/",
-      "node_modules/",
-      "infrastructure/data/",
-      ".gitignore",
-      "*.css.map",
-      // "*.env*",
-      // "*.js.map",
-      "*.md",
-      ].concat(argv.ignore)
+    const excludeList = baseExcludeList.concat(argv.ignore)
 
 
     const excludeArgs = excludeList.map((p) => `--exclude='${p}'`).join(" ")