wrangler 3.21.0 → 3.22.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wrangler",
-  "version": "3.21.0",
+  "version": "3.22.0",
   "description": "Command-line interface for all things Cloudflare Workers",
   "keywords": [
     "wrangler",

package/wrangler-dist/cli.js

@@ -118004,7 +118004,7 @@ var import_undici3 = __toESM(require_undici());
 var import_undici4 = __toESM(require_undici());
 
 // package.json
-var version = "3.21.0";
+var version = "3.22.0";
 var package_default = {
   name: "wrangler",
   version,
@@ -122852,7 +122852,7 @@ function rewriteNodeCompatBuildFailure(errors, forPages = false) {
     const match = nodeBuiltinResolveErrorText.exec(error.text);
     if (match !== null) {
       const issue = `The package "${match[1]}" wasn't found on the file system but is built into node.`;
-      const instructionForUser = `${forPages ? 'Add the "nodejs_compat" compatibility flag to your Pages project' : 'Add "node_compat = true" to your wrangler.toml file'} to enable Node.js compatibility.`;
+      const instructionForUser = `${forPages ? 'Add the "nodejs_compat" compatibility flag to your Pages project' : 'Add "node_compat = true" to your wrangler.toml file'} and make sure to prefix the module name with "node:" to enable Node.js compatibility.`;
       error.notes = [
         {
           location: null,
@@ -131117,6 +131117,9 @@ var handler10 = withConfig(
 
 // src/constellation/index.ts
 function constellation(yargs) {
+  logger.warn(
+    "`wrangler constellation` is deprecated and will be removed in the next major version.\nPlease migrate to Workers AI, learn more here https://developers.cloudflare.com/workers-ai/."
+  );
   return yargs.command("project", "Manage your projects", (constProjYargs) => {
     return constProjYargs.command(
       "list",
@@ -134973,6 +134976,8 @@ var Handler5 = withConfig(
 											sum {
 												readQueries
 												writeQueries
+												rowsRead
+												rowsWritten
 										}
 										dimensions {
 												datetimeHour
@@ -134999,16 +135004,25 @@ var Handler5 = withConfig(
           "Content-Type": "application/json"
         }
       });
-      const metrics = { readQueries: 0, writeQueries: 0 };
+      const metrics = {
+        readQueries: 0,
+        writeQueries: 0,
+        rowsRead: 0,
+        rowsWritten: 0
+      };
       if (graphqlResult) {
         graphqlResult.data?.viewer?.accounts[0]?.d1AnalyticsAdaptiveGroups?.forEach(
           (row) => {
             metrics.readQueries += row?.sum?.readQueries ?? 0;
             metrics.writeQueries += row?.sum?.writeQueries ?? 0;
+            metrics.rowsRead += row?.sum?.rowsRead ?? 0;
+            metrics.rowsWritten += row?.sum?.rowsWritten ?? 0;
           }
         );
         output.read_queries_24h = metrics.readQueries;
         output.write_queries_24h = metrics.writeQueries;
+        output.rows_read_24h = metrics.rowsRead;
+        output.rows_written_24h = metrics.rowsWritten;
       }
     }
     if (json) {
@@ -135019,7 +135033,7 @@ var Handler5 = withConfig(
         let value;
         if (k === "database_size") {
           value = prettyBytes(Number(v));
-        } else if (k === "read_queries_24h" || k === "write_queries_24h") {
+        } else if (k === "read_queries_24h" || k === "write_queries_24h" || k === "rows_read_24h" || k === "rows_written_24h") {
           value = v.toLocaleString();
         } else {
           value = v;
@@ -144030,7 +144044,16 @@ __name(options19, "options");
 async function handler20(args) {
   const config = readConfig(args.config, args);
   const queues2 = await listQueues(config, args.page);
-  logger.log(JSON.stringify(queues2));
+  logger.table(
+    queues2.map((queue) => ({
+      id: queue.queue_id,
+      name: queue.queue_name,
+      created_on: queue.created_on,
+      modified_on: queue.modified_on,
+      producers: queue.producers_total_count.toString(),
+      consumers: queue.consumers_total_count.toString()
+    }))
+  );
 }
 __name(handler20, "handler");
 
@@ -144217,6 +144240,39 @@ async function usingLocalBucket(persistTo, configPath, bucketName, closure) {
   }
 }
 __name(usingLocalBucket, "usingLocalBucket");
+async function getR2Sippy(accountId, bucketName, jurisdiction) {
+  const headers = {};
+  if (jurisdiction !== void 0) {
+    headers["cf-r2-jurisdiction"] = jurisdiction;
+  }
+  return await fetchResult(
+    `/accounts/${accountId}/r2/buckets/${bucketName}/sippy`,
+    { method: "GET", headers }
+  );
+}
+__name(getR2Sippy, "getR2Sippy");
+async function deleteR2Sippy(accountId, bucketName, jurisdiction) {
+  const headers = {};
+  if (jurisdiction !== void 0) {
+    headers["cf-r2-jurisdiction"] = jurisdiction;
+  }
+  return await fetchResult(
+    `/accounts/${accountId}/r2/buckets/${bucketName}/sippy`,
+    { method: "DELETE", headers }
+  );
+}
+__name(deleteR2Sippy, "deleteR2Sippy");
+async function putR2Sippy(accountId, bucketName, config, jurisdiction) {
+  const headers = {};
+  if (jurisdiction !== void 0) {
+    headers["cf-r2-jurisdiction"] = jurisdiction;
+  }
+  return await fetchResult(
+    `/accounts/${accountId}/r2/buckets/${bucketName}/sippy`,
+    { method: "PUT", body: JSON.stringify(config), headers }
+  );
+}
+__name(putR2Sippy, "putR2Sippy");
 
 // src/r2/index.ts
 var CHUNK_SIZE = 1024;
@@ -144629,6 +144685,113 @@ ${key} is ${prettyBytes(objectSize, {
         });
       }
     );
+    r2BucketYargs.command(
+      "sippy",
+      "Manage Sippy incremental migration on an R2 bucket",
+      (sippyYargs) => {
+        return sippyYargs.command(
+          "enable <name>",
+          "Enable Sippy on an R2 bucket",
+          (yargs) => yargs.positional("name", {
+            describe: "The name of the bucket",
+            type: "string",
+            demandOption: true
+          }).option("jurisdiction", {
+            describe: "The jurisdiction where the bucket exists",
+            alias: "J",
+            requiresArg: true,
+            type: "string"
+          }).option("provider", {
+            choices: ["AWS"],
+            default: "AWS",
+            implies: [
+              "bucket",
+              "key-id",
+              "secret-access-key",
+              "r2-key-id",
+              "r2-secret-access-key"
+            ]
+          }).option("bucket", {
+            description: "The name of the upstream bucket",
+            string: true
+          }).option("region", {
+            description: "The region of the upstream bucket",
+            string: true
+          }).option("key-id", {
+            description: "The secret access key id for the upstream bucket",
+            string: true
+          }).option("secret-access-key", {
+            description: "The secret access key for the upstream bucket",
+            string: true
+          }).option("r2-key-id", {
+            description: "The secret access key id for this R2 bucket",
+            string: true
+          }).option("r2-secret-access-key", {
+            description: "The secret access key for this R2 bucket",
+            string: true
+          }),
+          async (args) => {
+            const config = readConfig(args.config, args);
+            const accountId = await requireAuth(config);
+            await putR2Sippy(
+              accountId,
+              args.name,
+              {
+                provider: "AWS",
+                zone: args["region"],
+                bucket: args.bucket ?? "",
+                key_id: args["key-id"] ?? "",
+                access_key: args["secret-access-key"] ?? "",
+                r2_key_id: args["r2-key-id"] ?? "",
+                r2_access_key: args["r2-secret-access-key"] ?? ""
+              },
+              args.jurisdiction
+            );
+          }
+        ).command(
+          "disable <name>",
+          "Disable Sippy on an R2 bucket",
+          (yargs) => yargs.positional("name", {
+            describe: "The name of the bucket",
+            type: "string",
+            demandOption: true
+          }).option("jurisdiction", {
+            describe: "The jurisdiction where the bucket exists",
+            alias: "J",
+            requiresArg: true,
+            type: "string"
+          }),
+          async (args) => {
+            const config = readConfig(args.config, args);
+            const accountId = await requireAuth(config);
+            await deleteR2Sippy(accountId, args.name, args.jurisdiction);
+          }
+        ).command(
+          "get <name>",
+          "Check the status of Sippy on an R2 bucket",
+          (yargs) => yargs.positional("name", {
+            describe: "The name of the bucket",
+            type: "string",
+            demandOption: true
+          }).option("jurisdiction", {
+            describe: "The jurisdiction where the bucket exists",
+            alias: "J",
+            requiresArg: true,
+            type: "string"
+          }),
+          async (args) => {
+            const config = readConfig(args.config, args);
+            const accountId = await requireAuth(config);
+            const sippyBucket = await getR2Sippy(
+              accountId,
+              args.name,
+              args.jurisdiction
+            );
+            logger.log(`Sippy upstream bucket: ${sippyBucket}.`);
+          }
+        );
+      }
+    );
     return r2BucketYargs;
   });
 }
@@ -155188,13 +155351,9 @@ function createCLIParser(argv) {
   wrangler.command("ai", "\u{1F916} Interact with AI models", (aiYargs) => {
     return ai(aiYargs.command(subHelp));
   });
-  wrangler.command(
-    "constellation",
-    "\u{1F916} Interact with Constellation models",
-    (aiYargs) => {
-      return constellation(aiYargs.command(subHelp));
-    }
-  );
+  wrangler.command("constellation", false, (aiYargs) => {
+    return constellation(aiYargs.command(subHelp));
+  });
   wrangler.command(
     "vectorize",
     "\u{1F9EE} Interact with Vectorize indexes",
@@ -160287,6 +160446,11 @@ function getBindings(configParam, env5, local, args) {
       return hyperdrive2;
     })
   };
+  if (bindings.constellation && bindings.constellation.length > 0) {
+    logger.warn(
+      "`constellation` is deprecated and will be removed in the next major version.\nPlease migrate to Workers AI, learn more here https://developers.cloudflare.com/workers-ai/."
+    );
+  }
   return bindings;
 }
 __name(getBindings, "getBindings");