@rpcbase/cli 0.119.0 → 0.121.0

package/package.json

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

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

@@ -0,0 +1,148 @@
+import crypto from "crypto"
+import fs from "fs"
+import os from "os"
+import path from "path"
+import { execSync } from "child_process"
+
+
+export const baseExcludeList = [
+  ".husky/",
+  ".github/",
+  ".git/",
+  ".wireit/",
+  "coverage/",
+  "node_modules/",
+  "infrastructure/data/",
+  ".gitignore",
+  "*.css.map",
+  // "*.env*",
+  // "*.js.map",
+  "*.md",
+]
+
+const hashTree = (rootDir) => {
+  const fileHashes = {}
+
+  const walk = (dir) => {
+    for (const entry of fs.readdirSync(dir, { withFileTypes: true })) {
+      const fullPath = path.join(dir, entry.name)
+      if (entry.isDirectory()) {
+        walk(fullPath)
+      } else {
+        const rel = path.relative(rootDir, fullPath)
+        const content = fs.readFileSync(fullPath)
+        const digest = crypto.createHash("sha256").update(content).digest("hex")
+        fileHashes[rel] = digest
+      }
+    }
+  }
+
+  walk(rootDir)
+
+  const aggregate = crypto.createHash("sha256")
+  Object.keys(fileHashes).sort().forEach((rel) => {
+    aggregate.update(rel)
+    aggregate.update("\0")
+    aggregate.update(fileHashes[rel])
+    aggregate.update("\0")
+  })
+
+  return {
+    treeHash: aggregate.digest("hex"),
+    fileHashes,
+  }
+}
+
+const buildRsyncCmd = ({ includeArgs, excludeArgs, keyPath, source, dest, remote }) => {
+  const parts = [
+    "rsync -az --delete --filter=':- .gitignore'",
+    includeArgs.join(" "),
+    excludeArgs,
+    remote ? `-e "ssh -i '${keyPath}' -o StrictHostKeyChecking=no"` : null,
+    source,
+    dest,
+  ].filter(Boolean)
+
+  return parts.join(" ")
+}
+
+export 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(" ")
+
+  const tempRoot = fs.mkdtempSync(path.join(os.tmpdir(), "rb-compose-"))
+  const remoteDir = path.join(tempRoot, "remote")
+  const localDir = path.join(tempRoot, "local")
+  fs.mkdirSync(remoteDir)
+  fs.mkdirSync(localDir)
+
+  const cleanup = () => {
+    try {
+      fs.rmSync(tempRoot, { recursive: true, force: true })
+    } catch (err) {
+      console.warn(`Cleanup failed for ${tempRoot}: ${err}`)
+    }
+  }
+
+  try {
+    // fetch remote compose files into temp dir
+    const remoteSyncCmd = buildRsyncCmd({
+      includeArgs,
+      excludeArgs,
+      keyPath,
+      source: `${user}@${host}:~/apps/${deployDir}/`,
+      dest: `${remoteDir}/`,
+      remote: true,
+    })
+    log(`Syncing remote compose files: ${remoteSyncCmd}`)
+    execSync(remoteSyncCmd, { stdio: "ignore" })
+
+    // copy local compose files into temp dir (same filters to keep parity)
+    const localSyncCmd = buildRsyncCmd({
+      includeArgs,
+      excludeArgs,
+      keyPath,
+      source: "./",
+      dest: `${localDir}/`,
+      remote: false,
+    })
+    log(`Syncing local compose files: ${localSyncCmd}`)
+    execSync(localSyncCmd, { stdio: "ignore" })
+
+    const remoteHashes = hashTree(remoteDir)
+    const localHashes = hashTree(localDir)
+
+    const remotePaths = new Set(Object.keys(remoteHashes.fileHashes))
+    const localPaths = new Set(Object.keys(localHashes.fileHashes))
+
+    const missingLocal = [...remotePaths].filter((p) => !localPaths.has(p))
+    const missingRemote = [...localPaths].filter((p) => !remotePaths.has(p))
+    const changed = [...remotePaths].filter(
+      (p) => localPaths.has(p) && remoteHashes.fileHashes[p] !== localHashes.fileHashes[p],
+    )
+
+    const hasChanges = (
+      remoteHashes.treeHash !== localHashes.treeHash ||
+      missingLocal.length > 0 ||
+      missingRemote.length > 0 ||
+      changed.length > 0
+    )
+
+    const summary = [
+      `local tree:  ${localHashes.treeHash}`,
+      `remote tree: ${remoteHashes.treeHash}`,
+    ]
+
+    if (missingLocal.length) summary.push(`Only on remote: ${missingLocal.join(", ")}`)
+    if (missingRemote.length) summary.push(`Only on local: ${missingRemote.join(", ")}`)
+    if (changed.length) summary.push(`Content differs: ${changed.join(", ")}`)
+    if (!hasChanges) summary.push("Compose files are identical.")
+
+    return { hasChanges, output: summary.join("\n") }
+  } finally {
+    cleanup()
+  }
+}

package/src/{cmd-deploy.js → cmd-deploy/index.js}

@@ -1,38 +1,12 @@
 import { execSync } from "child_process"
 import fs from "fs"
-import path from "path"
 import os from "os"
+import path from "path"
 
 import validator from "validator"
 
-import { purgeCloudflareCaches } from "./cloudflare-purge.js"
-
-
-const detectComposeChanges = ({ keyPath, user, host, deployDir, log }) => {
-  const includeArgs = ["--include='*/'", "--include='*compose*.yml'", "--exclude='*'"]
-
-  const rsyncCmd = [
-    "rsync -avzn --delete --itemize-changes",
-    includeArgs.join(" "),
-    `-e "ssh -i '${keyPath}' -o StrictHostKeyChecking=no"`,
-    ".",
-    `${user}@${host}:~/apps/${deployDir}/`,
-  ].join(" ")
-
-  log(`Checking compose files (dry-run): ${rsyncCmd}`)
-
-  const out = execSync(rsyncCmd, { stdio: "pipe" }).toString()
-
-  // 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"))
-
-  const hasChanges = changeLines.length > 0
-
-  return { hasChanges, output: out }
-}
+import { purgeCloudflareCaches } from "./purge-cloudflare.js"
+import { baseExcludeList, detectComposeChanges } from "./detect-compose-changes.js"
 
 
 export const deploy = async (argv) => {
@@ -114,28 +88,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(" ")
 

package/src/index.js

@@ -7,7 +7,7 @@ import { hideBin } from "yargs/helpers"
 import dotenv from "dotenv"
 import { expand } from "dotenv-expand"
 
-import { deploy } from "./cmd-deploy.js"
+import { deploy } from "./cmd-deploy/index.js"
 import { ssh } from "./cmd-ssh.js"
 import { waitFor } from "./cmd-wait-for/index.js"