@rpcbase/cli 0.80.0 → 0.82.0

package/package.json

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

package/src/cmd-deploy.js

@@ -10,30 +10,30 @@ export const deploy = async (argv) => {
   }
 
   const {
-    RB_DEPLOY_HOST,
-    RB_DEPLOY_USER,
-    RB_DEPLOY_KEY,
+    RB_SSH_HOST,
+    RB_SSH_USER,
+    RB_SSH_KEY,
     RB_DEPLOY_DIR,
   } = argv.env || {};
 
   if (
-    !RB_DEPLOY_HOST ||
-    !validator.isURL(RB_DEPLOY_HOST, { require_tld: false })
+    !RB_SSH_HOST ||
+    !validator.isURL(RB_SSH_HOST, { require_tld: false })
   ) {
     throw new Error(
-      "Missing or invalid required environment variable: RB_DEPLOY_HOST",
+      "Missing or invalid required environment variable: RB_SSH_HOST",
     );
   }
 
-  if (!RB_DEPLOY_USER || !validator.isLength(RB_DEPLOY_USER, { min: 1 })) {
+  if (!RB_SSH_USER || !validator.isLength(RB_SSH_USER, { min: 1 })) {
     throw new Error(
-      "Missing or invalid required environment variable: RB_DEPLOY_USER",
+      "Missing or invalid required environment variable: RB_SSH_USER",
     );
   }
 
-  if (!RB_DEPLOY_KEY || !validator.isLength(RB_DEPLOY_KEY, { min: 1 })) {
+  if (!RB_SSH_KEY || !validator.isLength(RB_SSH_KEY, { min: 1 })) {
     throw new Error(
-      "Missing or invalid required environment variable: RB_DEPLOY_KEY",
+      "Missing or invalid required environment variable: RB_SSH_KEY",
     );
   }
 
@@ -43,10 +43,10 @@ export const deploy = async (argv) => {
     );
   }
 
-  const host = RB_DEPLOY_HOST;
-  const user = RB_DEPLOY_USER;
+  const host = RB_SSH_HOST;
+  const user = RB_SSH_USER;
   const deployDir = RB_DEPLOY_DIR;
-  let keyPath = RB_DEPLOY_KEY;
+  let keyPath = RB_SSH_KEY;
 
   let tempKeyPath = null;
 
@@ -65,8 +65,8 @@ export const deploy = async (argv) => {
     if (keyPath.startsWith("~")) keyPath = keyPath.replace("~", os.homedir());
 
     if (!fs.existsSync(keyPath)) {
-      // try to treat RB_DEPLOY_KEY as base64-encoded key content
-      const keyContent = Buffer.from(RB_DEPLOY_KEY, "base64").toString("utf-8");
+      // try to treat RB_SSH_KEY as base64-encoded key content
+      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",
@@ -136,4 +136,37 @@ export const deploy = async (argv) => {
       }
     }
   }
+
+  // Purge Cloudflare Cache if CLOUDFLARE_ZONE and CLOUDFLARE_TOKEN are set
+  const { CLOUDFLARE_ZONE, CLOUDFLARE_TOKEN } = process.env;
+
+  if (!CLOUDFLARE_ZONE || !CLOUDFLARE_TOKEN) {
+    console.warn("Cloudflare cache purge will not run: missing CLOUDFLARE_ZONE or CLOUDFLARE_TOKEN environment variables");
+  } else {
+    console.log("Purging Cloudflare cache...");
+
+    try {
+      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'
+          }
+        }
+      );
+
+      if (response.data.success) {
+        console.log("Successfully purged Cloudflare cache for zone:", CLOUDFLARE_ZONE);
+      } else {
+        console.warn("Failed to purge Cloudflare cache:", response.data.errors);
+      }
+    } catch (error) {
+      console.error("Error purging Cloudflare cache:", error.message);
+    }
+  }
+
+  console.log("Done.")
 };

package/src/cmd-ssh.js

@@ -10,35 +10,35 @@ export const ssh = async (argv) => {
   }
 
   const {
-    RB_DEPLOY_HOST,
-    RB_DEPLOY_USER,
-    RB_DEPLOY_KEY,
+    RB_SSH_HOST,
+    RB_SSH_USER,
+    RB_SSH_KEY,
   } = argv.env || {};
 
   if (
-    !RB_DEPLOY_HOST ||
-    !validator.isURL(RB_DEPLOY_HOST, { require_tld: false })
+    !RB_SSH_HOST ||
+    !validator.isURL(RB_SSH_HOST, { require_tld: false })
   ) {
     throw new Error(
-      "Missing or invalid required environment variable: RB_DEPLOY_HOST",
+      "Missing or invalid required environment variable: RB_SSH_HOST",
     );
   }
 
-  if (!RB_DEPLOY_USER || !validator.isLength(RB_DEPLOY_USER, { min: 1 })) {
+  if (!RB_SSH_USER || !validator.isLength(RB_SSH_USER, { min: 1 })) {
     throw new Error(
-      "Missing or invalid required environment variable: RB_DEPLOY_USER",
+      "Missing or invalid required environment variable: RB_SSH_USER",
     );
   }
 
-  if (!RB_DEPLOY_KEY || !validator.isLength(RB_DEPLOY_KEY, { min: 1 })) {
+  if (!RB_SSH_KEY || !validator.isLength(RB_SSH_KEY, { min: 1 })) {
     throw new Error(
-      "Missing or invalid required environment variable: RB_DEPLOY_KEY",
+      "Missing or invalid required environment variable: RB_SSH_KEY",
     );
   }
 
-  const host = RB_DEPLOY_HOST;
-  const user = RB_DEPLOY_USER;
-  let keyPath = RB_DEPLOY_KEY;
+  const host = RB_SSH_HOST;
+  const user = RB_SSH_USER;
+  let keyPath = RB_SSH_KEY;
 
   let tempKeyPath = null;
 
@@ -56,8 +56,8 @@ export const ssh = async (argv) => {
     if (keyPath.startsWith("~")) keyPath = keyPath.replace("~", os.homedir());
 
     if (!fs.existsSync(keyPath)) {
-      // try to treat RB_DEPLOY_KEY as base64-encoded key content
-      const keyContent = Buffer.from(RB_DEPLOY_KEY, "base64").toString("utf-8");
+      // try to treat RB_SSH_KEY as base64-encoded key content
+      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",