@rpcbase/cli 0.185.0 → 0.187.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rpcbase/cli",
-  "version": "0.185.0",
+  "version": "0.187.0",
   "type": "module",
   "files": [
     "src"

package/src/cmd-deploy/index.js

@@ -31,18 +31,18 @@ const getInstanceDeployDir = (baseDeployDir, instance) => `${baseDeployDir}-${in
 const sleep = async (ms) => new Promise((resolve) => setTimeout(resolve, ms))
 
 const sharedInfrastructureIncludePatterns = [
-  "infrastructure/compose.yml",
-  "infrastructure/compose.instances.yml",
-  "infrastructure/package.json",
-  "infrastructure/package-lock.json",
-  "infrastructure/ensure-*",
-  "infrastructure/mongot/***",
-  ".env",
-  ".env.*",
+  "/infrastructure/compose.yml",
+  "/infrastructure/compose.instances.yml",
+  "/infrastructure/package.json",
+  "/infrastructure/package-lock.json",
+  "/infrastructure/ensure-*",
+  "/infrastructure/mongot/***",
+  "/.env",
+  "/.env.*",
 ]
 
 const sharedInfrastructureExcludePatterns = [
-  "infrastructure/data/***",
+  "/infrastructure/data/***",
 ]
 
 const toArray = (value) => {
@@ -58,6 +58,8 @@ const resolveFrom = (baseDir, value) => (
   path.isAbsolute(value) ? value : path.resolve(baseDir, value)
 )
 
+const installCommand = "if [ -f package-lock.json ] || [ -f npm-shrinkwrap.json ]; then npm ci; elif [ -f package.json ]; then npm install --package-lock=false --no-audit --no-fund; fi"
+
 const toRelativePattern = (baseDir, value) => {
   const resolved = resolveFrom(baseDir, value)
   const relative = path.relative(baseDir, resolved)
@@ -382,17 +384,18 @@ export const deploy = async (argv) => {
             ? sharedInfrastructureExcludePatterns.concat(deployExcludePatterns)
             : deployExcludePatterns,
           includePatterns: useBlueGreen
-            ? sharedInfrastructureIncludePatterns.concat(preparedDeploy.sharedEnvFileNames)
+            ? sharedInfrastructureIncludePatterns.concat(preparedDeploy.sharedEnvFileNames.map((name) => `/${name}`))
             : undefined,
         })
 
         if (infrastructureChanged) {
           if (useBlueGreen) {
             if (argv.verbose) console.log(infrastructureDiff)
-            throw new Error("Shared infrastructure files changed. Deploy or restart the shared infrastructure explicitly before running a blue/green app deploy.")
+            console.log("Shared infrastructure files changed; refreshing shared infrastructure before deploying the inactive app instance.")
+          } else {
+            console.log("Infrastructure compose files differ between local and remote (info only; deploy proceeds).")
+            if (argv.verbose) console.log(infrastructureDiff)
           }
-          console.log("Infrastructure compose files differ between local and remote (info only; deploy proceeds).")
-          if (argv.verbose) console.log(infrastructureDiff)
         }
       }
 
@@ -415,7 +418,9 @@ export const deploy = async (argv) => {
 
         log(`Running: ${infrastructureRsyncCmd}`)
         execSync(infrastructureRsyncCmd, { stdio: argv.verbose ? "inherit" : "ignore" })
-        await ssh(`cd ~/apps/${baseDeployDir}/infrastructure && [ -f package.json ] && npm ci || true`)
+        await ssh(`cd ~/apps/${baseDeployDir}/infrastructure && ${installCommand}`)
+        console.log("Refreshing shared infrastructure before deploying the inactive app instance.")
+        await ssh(`cd ~/apps/${baseDeployDir}/infrastructure && for f in ensure-*.js; do [ -f "$f" ] || continue; node "$f"; done && node ctrl.js up-infra prod`, true)
       }
 
       const excludeList = baseExcludeList
@@ -449,7 +454,7 @@ export const deploy = async (argv) => {
         }
         await runInstanceAction("down", activeInstance)
       } else {
-        await ssh(`cd ~/apps/${deployDir}/infrastructure && [ -f package.json ] && npm ci || true`)
+        await ssh(`cd ~/apps/${deployDir}/infrastructure && ${installCommand}`)
         log("Restarting application...")
         await ssh(`cd ~/apps/${deployDir}/infrastructure && node ctrl.js down prod`, true)
         log("Application stopped. Starting it up again...")