@rpcbase/cli 0.91.0 → 0.93.0

package/package.json

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

package/src/cmd-deploy.js

@@ -1,12 +1,14 @@
-import { execSync } from "child_process";
-import fs from "fs";
-import path from "path";
-import os from "os";
-import validator from "validator";
+import { execSync } from "child_process"
+import fs from "fs"
+import path from "path"
+import os from "os"
+
+import validator from "validator"
+
 
 export const deploy = async (argv) => {
   const log = (message) => {
-    if (argv.verbose) console.log(message);
+    if (argv.verbose) console.log(message)
   }
 
   const {
@@ -14,7 +16,7 @@ export const deploy = async (argv) => {
     RB_SSH_USER,
     RB_SSH_KEY,
     RB_DEPLOY_DIR,
-  } = argv.env || {};
+  } = argv.env || {}
 
   if (
     !RB_SSH_HOST ||
@@ -22,66 +24,66 @@ export const deploy = async (argv) => {
   ) {
     throw new Error(
       "Missing or invalid required environment variable: RB_SSH_HOST",
-    );
+    )
   }
 
   if (!RB_SSH_USER || !validator.isLength(RB_SSH_USER, { min: 1 })) {
     throw new Error(
       "Missing or invalid required environment variable: RB_SSH_USER",
-    );
+    )
   }
 
   if (!RB_SSH_KEY || !validator.isLength(RB_SSH_KEY, { min: 1 })) {
     throw new Error(
       "Missing or invalid required environment variable: RB_SSH_KEY",
-    );
+    )
   }
 
   if (!RB_DEPLOY_DIR || !validator.isLength(RB_DEPLOY_DIR, { min: 1 })) {
     throw new Error(
       "Missing or invalid required environment variable: RB_DEPLOY_DIR",
-    );
+    )
   }
 
-  const host = RB_SSH_HOST;
-  const user = RB_SSH_USER;
-  const deployDir = RB_DEPLOY_DIR;
-  let keyPath = RB_SSH_KEY;
+  const host = RB_SSH_HOST
+  const user = RB_SSH_USER
+  const deployDir = RB_DEPLOY_DIR
+  let keyPath = RB_SSH_KEY
 
-  let tempKeyPath = null;
+  let tempKeyPath = null
 
   // Create an SSH function that can be reused
   const ssh = async (command, stdioInherit = false) => {
-    const sshCommand = `ssh -i "${keyPath}" -o StrictHostKeyChecking=no ${user}@${host} "${command}"`;
-    log(`${command}`);
+    const sshCommand = `ssh -i "${keyPath}" -o StrictHostKeyChecking=no ${user}@${host} "${command}"`
+    log(`${command}`)
     const out = execSync(sshCommand, {
       stdio: (argv.verbose || stdioInherit) ? "inherit" : "pipe",
     })
     const res = out?.toString()?.trim() || ""
     return res
-  };
+  }
 
   try {
-    if (keyPath.startsWith("~")) keyPath = keyPath.replace("~", os.homedir());
+    if (keyPath.startsWith("~")) keyPath = keyPath.replace("~", os.homedir())
 
     if (!fs.existsSync(keyPath)) {
       // try to treat RB_SSH_KEY as base64-encoded key content
-      const keyContent = Buffer.from(RB_SSH_KEY, "base64").toString("utf-8");
+      const keyContent = Buffer.from(RB_SSH_KEY, "base64").toString("utf-8")
       if (!keyContent.includes("-----BEGIN")) {
         throw new Error(
           "Decoded content does not appear to be a valid SSH key",
-        );
+        )
       }
-      tempKeyPath = path.join(os.tmpdir(), `deploy-key-${Date.now()}`);
-      fs.writeFileSync(tempKeyPath, keyContent);
-      fs.chmodSync(tempKeyPath, "400");
-      keyPath = tempKeyPath;
+      tempKeyPath = path.join(os.tmpdir(), `deploy-key-${Date.now()}`)
+      fs.writeFileSync(tempKeyPath, keyContent)
+      fs.chmodSync(tempKeyPath, "400")
+      keyPath = tempKeyPath
     }
 
-    log(`Connecting to ${host} as ${user} using key at ${keyPath}`);
-    const res = await ssh("echo connection-ok");
+    log(`Connecting to ${host} as ${user} using key at ${keyPath}`)
+    const res = await ssh("echo connection-ok")
     console.log(`${user}@${host}`, res)
-    await ssh(`mkdir -p ~/apps/${deployDir}`);
+    await ssh(`mkdir -p ~/apps/${deployDir}`)
 
     const excludeList = [
       ".aider*",
@@ -100,7 +102,7 @@ export const deploy = async (argv) => {
       ].concat(argv.ignore)
 
 
-    const excludeArgs = excludeList.map((p) => `--exclude='${p}'`).join(" ");
+    const excludeArgs = excludeList.map((p) => `--exclude='${p}'`).join(" ")
     const rsyncCmd = [
       "rsync -avz -C",
       excludeArgs,
@@ -108,37 +110,37 @@ export const deploy = async (argv) => {
       `-e "ssh -i '${keyPath}' -o StrictHostKeyChecking=no"`,
       ".",
       `${user}@${host}:~/apps/${deployDir}/`,
-    ].join(" ");
+    ].join(" ")
 
-    log(`Running: ${rsyncCmd}`);
-    execSync(rsyncCmd, { stdio: argv.verbose ? "inherit" : "ignore" });
+    log(`Running: ${rsyncCmd}`)
+    execSync(rsyncCmd, { stdio: argv.verbose ? "inherit" : "ignore" })
 
-    await ssh(`cd ~/apps/${deployDir}/infrastructure && [ -f package.json ] && yarn || true`);
+    await ssh(`cd ~/apps/${deployDir}/infrastructure && [ -f package.json ] && yarn || true`)
 
-    log("Restarting application...");
-    await ssh(`cd ~/apps/${deployDir}/infrastructure && node ctrl.js down prod`, true);
-    log("Application stopped. Starting it up again...");
-    await ssh(`cd ~/apps/${deployDir}/infrastructure && node ctrl.js up prod`, true);
+    log("Restarting application...")
+    await ssh(`cd ~/apps/${deployDir}/infrastructure && node ctrl.js down prod`, true)
+    log("Application stopped. Starting it up again...")
+    await ssh(`cd ~/apps/${deployDir}/infrastructure && node ctrl.js up prod`, true)
 
-    log("Deployment complete ✅");
+    log("Deployment complete ✅")
   } catch (error) {
     console.error(
       `Deployment failed: ${error instanceof Error ? error.message : error}`,
-    );
-    throw error;
+    )
+    throw error
   } finally {
     if (tempKeyPath) {
       try {
-        fs.unlinkSync(tempKeyPath);
-        log(`Removed temporary key file: ${tempKeyPath}`);
+        fs.unlinkSync(tempKeyPath)
+        log(`Removed temporary key file: ${tempKeyPath}`)
       } catch (cleanupError) {
-        console.warn(`Failed to remove temporary key file: ${cleanupError}`);
+        console.warn(`Failed to remove temporary key file: ${cleanupError}`)
       }
     }
   }
 
   // Purge Cloudflare Cache if CLOUDFLARE_ZONE and CLOUDFLARE_TOKEN are set
-  const { CLOUDFLARE_ZONE, CLOUDFLARE_TOKEN } = process.env;
+  const { CLOUDFLARE_ZONE, CLOUDFLARE_TOKEN } = process.env
 
   console.log("Cloudflare env", {
     CLOUDFLARE_ZONE: JSON.stringify(CLOUDFLARE_ZONE),
@@ -146,33 +148,33 @@ export const deploy = async (argv) => {
   })
 
   if (!CLOUDFLARE_ZONE || !CLOUDFLARE_TOKEN) {
-    console.warn("Cloudflare cache purge will not run: missing CLOUDFLARE_ZONE or CLOUDFLARE_TOKEN environment variables");
+    console.warn("Cloudflare cache purge will not run: missing CLOUDFLARE_ZONE or CLOUDFLARE_TOKEN environment variables")
   } else {
-    console.log("Purging Cloudflare cache...");
+    console.log("Purging Cloudflare cache...")
 
     try {
-      const axios = (await import('axios')).default;
+      const axios = (await import("axios")).default
       const response = await axios.post(
         `https://api.cloudflare.com/client/v4/zones/${CLOUDFLARE_ZONE}/purge_cache`,
         { purge_everything: true },
         {
           headers: {
-            'Authorization': `Bearer ${CLOUDFLARE_TOKEN}`,
-            'Content-Type': 'application/json'
+            "Authorization": `Bearer ${CLOUDFLARE_TOKEN}`,
+            "Content-Type": "application/json"
           }
         }
-      );
+      )
 
       if (response.data.success) {
-        console.log("Successfully purged Cloudflare cache for zone:", CLOUDFLARE_ZONE);
+        console.log("Successfully purged Cloudflare cache for zone:", CLOUDFLARE_ZONE)
       } else {
-        console.warn("Failed to purge Cloudflare cache:", response.data.errors);
+        console.warn("Failed to purge Cloudflare cache:", response.data.errors)
       }
     } catch (error) {
-      console.error("Error purging Cloudflare cache:", error.message);
+      console.error("Error purging Cloudflare cache:", error.message)
       process.exit(1)
     }
   }
 
   console.log("Done.")
-};
+}

package/src/cmd-ssh.js

@@ -1,19 +1,21 @@
-import { execSync } from "child_process";
-import fs from "fs";
-import path from "path";
-import os from "os";
-import validator from "validator";
+import { execSync } from "child_process"
+import fs from "fs"
+import path from "path"
+import os from "os"
+
+import validator from "validator"
+
 
 export const ssh = async (argv) => {
   const log = (message) => {
-    if (argv.verbose) console.log(message);
+    if (argv.verbose) console.log(message)
   }
 
   const {
     RB_SSH_HOST,
     RB_SSH_USER,
     RB_SSH_KEY,
-  } = argv.env || {};
+  } = argv.env || {}
 
   if (
     !RB_SSH_HOST ||
@@ -21,71 +23,71 @@ export const ssh = async (argv) => {
   ) {
     throw new Error(
       "Missing or invalid required environment variable: RB_SSH_HOST",
-    );
+    )
   }
 
   if (!RB_SSH_USER || !validator.isLength(RB_SSH_USER, { min: 1 })) {
     throw new Error(
       "Missing or invalid required environment variable: RB_SSH_USER",
-    );
+    )
   }
 
   if (!RB_SSH_KEY || !validator.isLength(RB_SSH_KEY, { min: 1 })) {
     throw new Error(
       "Missing or invalid required environment variable: RB_SSH_KEY",
-    );
+    )
   }
 
-  const host = RB_SSH_HOST;
-  const user = RB_SSH_USER;
-  let keyPath = RB_SSH_KEY;
+  const host = RB_SSH_HOST
+  const user = RB_SSH_USER
+  let keyPath = RB_SSH_KEY
 
-  let tempKeyPath = null;
+  let tempKeyPath = null
 
   const execSsh = async (command, stdioInherit = true) => {
-    const sshCommand = `ssh -i "${keyPath}" -o StrictHostKeyChecking=no ${user}@${host} "${command}"`;
-    log(`${command}`);
+    const sshCommand = `ssh -i "${keyPath}" -o StrictHostKeyChecking=no ${user}@${host} "${command}"`
+    log(`${command}`)
     const out = execSync(sshCommand, {
       stdio: (argv.verbose || stdioInherit) ? "inherit" : "pipe",
     })
     const res = out?.toString()?.trim() || ""
     return res
-  };
+  }
 
   try {
-    if (keyPath.startsWith("~")) keyPath = keyPath.replace("~", os.homedir());
+    if (keyPath.startsWith("~")) keyPath = keyPath.replace("~", os.homedir())
 
     if (!fs.existsSync(keyPath)) {
       // try to treat RB_SSH_KEY as base64-encoded key content
-      const keyContent = Buffer.from(RB_SSH_KEY, "base64").toString("utf-8");
+      const keyContent = Buffer.from(RB_SSH_KEY, "base64").toString("utf-8")
       if (!keyContent.includes("-----BEGIN")) {
         throw new Error(
           "Decoded content does not appear to be a valid SSH key",
-        );
+        )
       }
-      tempKeyPath = path.join(os.tmpdir(), `deploy-key-${Date.now()}`);
-      fs.writeFileSync(tempKeyPath, keyContent);
-      fs.chmodSync(tempKeyPath, "400");
-      keyPath = tempKeyPath;
+      tempKeyPath = path.join(os.tmpdir(), `deploy-key-${Date.now()}`)
+      fs.writeFileSync(tempKeyPath, keyContent)
+      fs.chmodSync(tempKeyPath, "400")
+      keyPath = tempKeyPath
     }
 
-    await execSsh("echo connection-ok", false);
+    await execSsh("echo connection-ok", false)
 
     await execSsh(argv.command, true)
 
   } catch (error) {
     console.error(
       `Command failed: ${error instanceof Error ? error.message : error}`,
-    );
-    throw error;
+    )
+    throw error
   } finally {
     if (tempKeyPath) {
       try {
-        fs.unlinkSync(tempKeyPath);
-        log(`Removed temporary key file: ${tempKeyPath}`);
+        fs.unlinkSync(tempKeyPath)
+        log(`Removed temporary key file: ${tempKeyPath}`)
       } catch (cleanupError) {
-        console.warn(`Failed to remove temporary key file: ${cleanupError}`);
+        console.warn(`Failed to remove temporary key file: ${cleanupError}`)
       }
     }
   }
-};
+}

package/src/cmd-wait-for/index.js

@@ -1,5 +1,5 @@
-import path from "path";
-import { execSync } from "child_process";
+import path from "path"
+import { execSync } from "child_process"
 import { fileURLToPath } from "url"
 
 

package/src/index.js

@@ -1,14 +1,17 @@
 #!/usr/bin/env node
 
+import fs from "fs"
+
 import yargs from "yargs/yargs"
 import { hideBin } from "yargs/helpers"
 import dotenv from "dotenv"
 import { expand } from "dotenv-expand"
-import fs from "fs"
+
 import { deploy } from "./cmd-deploy.js"
 import { ssh } from "./cmd-ssh.js"
 import { waitFor } from "./cmd-wait-for/index.js"
 
+
 yargs(hideBin(process.argv))
   .option("env", {
     describe: "Path to environment file",