@rpcbase/cli 0.115.0 → 0.116.0

package/package.json

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

package/src/cloudflare-purge.js

@@ -0,0 +1,53 @@
+export const purgeCloudflareCaches = async ({ env = process.env, logger = console } = {}) => {
+  const { CLOUDFLARE_ZONES, CLOUDFLARE_ZONE, CLOUDFLARE_TOKEN } = env
+
+  const zones = (CLOUDFLARE_ZONES || "")
+    .split(",")
+    .map((zone) => zone.trim())
+    .filter(Boolean)
+
+  if (!zones.length && CLOUDFLARE_ZONE) {
+    logger.warn("CLOUDFLARE_ZONE is deprecated; use CLOUDFLARE_ZONES as a comma-separated list of zones")
+    zones.push(CLOUDFLARE_ZONE)
+  }
+
+  logger.log("Cloudflare env", {
+    CLOUDFLARE_ZONES: JSON.stringify(CLOUDFLARE_ZONES),
+    CLOUDFLARE_ZONE: JSON.stringify(CLOUDFLARE_ZONE),
+    CLOUDFLARE_TOKEN: JSON.stringify(CLOUDFLARE_TOKEN),
+  })
+
+  if (!zones.length || !CLOUDFLARE_TOKEN) {
+    logger.warn("Cloudflare cache purge will not run: missing zones or CLOUDFLARE_TOKEN environment variable")
+    return
+  }
+
+  logger.log(`Purging Cloudflare cache for zone${zones.length > 1 ? "s" : ""}: ${zones.join(", ")}`)
+
+  const axios = (await import("axios")).default
+
+  for (const zone of zones) {
+    try {
+      const response = await axios.post(
+        `https://api.cloudflare.com/client/v4/zones/${zone}/purge_cache`,
+        { purge_everything: true },
+        {
+          headers: {
+            "Authorization": `Bearer ${CLOUDFLARE_TOKEN}`,
+            "Content-Type": "application/json",
+          },
+        },
+      )
+
+      if (response.data?.success) {
+        logger.log(`Successfully purged Cloudflare cache for zone: ${zone}`)
+      } else {
+        const errors = response.data?.errors
+        throw new Error(`Failed to purge Cloudflare cache for zone ${zone}${errors ? `: ${JSON.stringify(errors)}` : ""}`)
+      }
+    } catch (error) {
+      logger.error(`Error purging Cloudflare cache for zone ${zone}: ${error?.message || error}`)
+      throw error
+    }
+  }
+}

package/src/cmd-deploy.js

@@ -5,6 +5,8 @@ import os from "os"
 
 import validator from "validator"
 
+import { purgeCloudflareCaches } from "./cloudflare-purge.js"
+
 
 export const deploy = async (argv) => {
   const log = (message) => {
@@ -139,41 +141,11 @@ export const deploy = async (argv) => {
     }
   }
 
-  // Purge Cloudflare Cache if CLOUDFLARE_ZONE and CLOUDFLARE_TOKEN are set
-  const { CLOUDFLARE_ZONE, CLOUDFLARE_TOKEN } = process.env
-
-  console.log("Cloudflare env", {
-    CLOUDFLARE_ZONE: JSON.stringify(CLOUDFLARE_ZONE),
-    CLOUDFLARE_TOKEN: JSON.stringify(CLOUDFLARE_TOKEN),
-  })
-
-  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)
-      process.exit(1)
-    }
+  try {
+    await purgeCloudflareCaches({ env: process.env, logger: console })
+  } catch (error) {
+    console.error(error?.message ? `Error purging Cloudflare cache: ${error.message}` : "Error purging Cloudflare cache")
+    process.exit(1)
   }
 
   console.log("Done.")