wrangler 3.43.0 → 3.44.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wrangler",
-  "version": "3.43.0",
+  "version": "3.44.0",
   "description": "Command-line interface for all things Cloudflare Workers",
   "keywords": [
     "wrangler",
@@ -95,8 +95,8 @@
     "selfsigned": "^2.0.1",
     "source-map": "0.6.1",
     "xxhash-wasm": "^1.0.1",
-    "miniflare": "3.20240329.0",
-    "@cloudflare/kv-asset-handler": "0.3.1"
+    "@cloudflare/kv-asset-handler": "0.3.1",
+    "miniflare": "3.20240329.0"
   },
   "devDependencies": {
     "@cloudflare/ai": "^1.0.35",

package/wrangler-dist/cli.js

@@ -118532,7 +118532,7 @@ init_import_meta_url();
 init_import_meta_url();
 
 // package.json
-var version = "3.43.0";
+var version = "3.44.0";
 var package_default = {
   name: "wrangler",
   version,
@@ -125245,6 +125245,42 @@ ${importers.map(
   }
 }), "nodejsCompatPlugin");
 
+// src/deployment-bundle/esbuild-plugins/standard-url.ts
+init_import_meta_url();
+var standardURLPlugin = /* @__PURE__ */ __name(() => ({
+  name: "standard URL plugin",
+  setup(pluginBuild) {
+    pluginBuild.onResolve({ filter: /^node:url$|^url$/ }, ({ importer }) => {
+      if (importer === "standard-url-plugin")
+        return;
+      return {
+        path: "wrangler-url-polyfill",
+        namespace: "wrangler-url"
+      };
+    });
+    pluginBuild.onResolve(
+      { filter: /^wrangler:url$/ },
+      async ({ kind, resolveDir }) => {
+        const result = await pluginBuild.resolve("url", {
+          kind,
+          resolveDir,
+          importer: "standard-url-plugin"
+        });
+        return result;
+      }
+    );
+    pluginBuild.onLoad(
+      { filter: /^wrangler-url-polyfill$/, namespace: "wrangler-url" },
+      () => {
+        return {
+          loader: "js",
+          contents: `export * from "wrangler:url"; export const URL = globalThis.URL`
+        };
+      }
+    );
+  }
+}), "standardURLPlugin");
+
 // src/deployment-bundle/find-additional-modules.ts
 init_import_meta_url();
 var import_promises3 = require("node:fs/promises");
@@ -125973,7 +126009,11 @@ async function bundleWorker(entry, destination, {
     },
     plugins: [
       moduleCollector.plugin,
-      ...legacyNodeCompat ? [(0, import_node_globals_polyfill.default)({ buffer: true }), (0, import_node_modules_polyfill.default)()] : [],
+      ...legacyNodeCompat ? [
+        (0, import_node_globals_polyfill.default)({ buffer: true }),
+        standardURLPlugin(),
+        (0, import_node_modules_polyfill.default)()
+      ] : [],
       nodejsCompatPlugin(!!nodejsCompat),
       cloudflareInternalPlugin,
       buildResultPlugin,
@@ -135465,6 +135505,9 @@ var OpenAPI = {
   ENCODE_PATH: void 0
 };
 
+// src/cloudchamber/client/models/AssignIPv4.ts
+init_import_meta_url();
+
 // src/cloudchamber/client/models/BadRequestWithCodeError.ts
 init_import_meta_url();
 var BadRequestWithCodeError;
@@ -135539,6 +135582,9 @@ init_import_meta_url();
 // src/cloudchamber/client/models/NodeGroup.ts
 init_import_meta_url();
 
+// src/cloudchamber/client/models/SchedulingPolicy.ts
+init_import_meta_url();
+
 // src/cloudchamber/client/models/State.ts
 init_import_meta_url();
 
@@ -135911,10 +135957,11 @@ var DeploymentsService = class {
    * @param image Filter deployments by image
    * @param state Filter deployments by deployment state
    * @param ipv4 Filter deployments by ipv4 address
+   * @param label Filter deployments by label
    * @returns ListDeploymentsV2 List of deployments with their corresponding placements
    * @throws ApiError
    */
-  static listDeploymentsV2(location, image, state, ipv4) {
+  static listDeploymentsV2(location, image, state, ipv4, label) {
     return request(OpenAPI, {
       method: "GET",
       url: "/deployments/v2",
@@ -135922,7 +135969,8 @@ var DeploymentsService = class {
         location,
         image,
         state,
-        ipv4
+        ipv4,
+        label
       },
       errors: {
         400: `Unknown account`,
@@ -136132,7 +136180,7 @@ var ImageRegistriesService = class {
    * Delete a registry from the account
    * Delete a registry from the account, this will make Cloudchamber unable to pull images from the registry
    * @param domain
-   * @returns any Deleted successfully
+   * @returns EmptyResponse The image registry is deleted
    * @throws ApiError
    */
   static deleteImageRegistry(domain2) {
@@ -136187,9 +136235,6 @@ var ImageRegistriesService = class {
 };
 __name(ImageRegistriesService, "ImageRegistriesService");
 
-// src/cloudchamber/client/services/IntrospectService.ts
-init_import_meta_url();
-
 // src/cloudchamber/client/services/IPsService.ts
 init_import_meta_url();
 
@@ -137032,7 +137077,7 @@ async function getNetworkInput(args) {
     type: "confirm"
   });
   return {
-    assign_ipv4: ipv4 ? "predefined" : "none"
+    assign_ipv4: ipv4 ? "predefined" /* PREDEFINED */ : "none" /* NONE */
   };
 }
 __name(getNetworkInput, "getNetworkInput");
@@ -147844,7 +147889,15 @@ var Handler9 = /* @__PURE__ */ __name(async (args) => {
   const textVars = Object.fromEntries(
     Object.entries(config.vars).filter(([_3, v2]) => typeof v2 === "string")
   );
-  logger.log(JSON.stringify(textVars));
+  logger.log(
+    JSON.stringify({
+      vars: textVars,
+      pages_build_output_dir: import_node_path40.default.relative(
+        args.projectDir,
+        config.pages_build_output_dir
+      )
+    })
+  );
 }, "Handler");
 
 // src/pages/deploy.tsx
@@ -151873,6 +151926,11 @@ async function getQueue(config, queueName) {
   );
 }
 __name(getQueue, "getQueue");
+async function getQueueByID(config, queueID) {
+  const accountId = await requireAuth(config);
+  return await fetchResult(`/accounts/${accountId}/queues/${queueID}`, {});
+}
+__name(getQueueByID, "getQueueByID");
 async function postConsumer(config, queueName, body) {
   const accountId = await requireAuth(config);
   return fetchResult(
@@ -152495,6 +152553,12 @@ var actionsForEventCategories = {
   "object-create": ["PutObject", "CompleteMultipartUpload", "CopyObject"],
   "object-delete": ["DeleteObject"]
 };
+var eventCategoryByAction = {
+  PutObject: "object-create",
+  CompleteMultipartUpload: "object-create",
+  CopyObject: "object-create",
+  DeleteObject: "object-delete"
+};
 function eventNotificationHeaders(apiCredentials) {
   const headers = {
     "Content-Type": "application/json"
@@ -152508,6 +152572,42 @@ function eventNotificationHeaders(apiCredentials) {
   return headers;
 }
 __name(eventNotificationHeaders, "eventNotificationHeaders");
+async function tableFromNotificationGetResponse(config, response, queueIdentifier) {
+  const reducer = /* @__PURE__ */ __name(async ([_3, { queue, rules }]) => {
+    const queueResp = await queueIdentifier(config, queue);
+    const rows = [];
+    for (const { prefix = "", suffix = "", actions } of rules) {
+      rows.push({
+        queue_name: queueResp.queue_name,
+        prefix,
+        suffix,
+        event_type: Array.from(
+          actions.reduce((acc, action) => {
+            acc.add(eventCategoryByAction[action]);
+            return acc;
+          }, /* @__PURE__ */ new Set())
+        ).join(",")
+      });
+    }
+    return rows;
+  }, "reducer");
+  let tableOutput = [];
+  for (const entry of Object.entries(response)) {
+    const result = await reducer(entry);
+    tableOutput = tableOutput.concat(...result);
+  }
+  return tableOutput;
+}
+__name(tableFromNotificationGetResponse, "tableFromNotificationGetResponse");
+async function getEventNotificationConfig(apiCredentials, accountId, bucketName) {
+  const headers = eventNotificationHeaders(apiCredentials);
+  logger.log(`Fetching notification configuration for bucket ${bucketName}...`);
+  return await fetchResult(
+    `/accounts/${accountId}/event_notifications/r2/${bucketName}/configuration`,
+    { method: "GET", headers }
+  );
+}
+__name(getEventNotificationConfig, "getEventNotificationConfig");
 async function putEventNotificationConfig(config, apiCredentials, accountId, bucketName, queueName, eventTypes, prefix, suffix) {
   const queue = await getQueue(config, queueName);
   const headers = eventNotificationHeaders(apiCredentials);
@@ -152518,9 +152618,13 @@ async function putEventNotificationConfig(config, apiCredentials, accountId, buc
   const body = {
     rules: [{ prefix, suffix, actions }]
   };
+  const ruleFor = eventTypes.map(
+    (et) => et === "object-create" ? "creation" : "deletion"
+  );
   logger.log(
-    `Sending this configuration to "${bucketName}":
-${JSON.stringify(body)}`
+    `Creating event notification rule for object ${ruleFor.join(
+      " and "
+    )} (${actions.join(",")})`
   );
   return await fetchResult(
     `/accounts/${accountId}/event_notifications/r2/${bucketName}/configuration/queues/${queue.queue_id}`,
@@ -152541,6 +152645,110 @@ async function deleteEventNotificationConfig(config, apiCredentials, accountId,
 }
 __name(deleteEventNotificationConfig, "deleteEventNotificationConfig");
 
+// src/r2/notification.ts
+init_import_meta_url();
+function GetOptions(yargs) {
+  return yargs.positional("bucket", {
+    describe: "The name of the bucket for which notifications will be emitted",
+    type: "string",
+    demandOption: true
+  });
+}
+__name(GetOptions, "GetOptions");
+async function GetHandler(args) {
+  await printWranglerBanner();
+  const config = readConfig(args.config, args);
+  const accountId = await requireAuth(config);
+  const apiCreds = requireApiToken();
+  const resp = await getEventNotificationConfig(
+    apiCreds,
+    accountId,
+    `${args.bucket}`
+  );
+  const tableOutput = await tableFromNotificationGetResponse(
+    config,
+    resp[args.bucket],
+    getQueueByID
+  );
+  logger.table(tableOutput);
+}
+__name(GetHandler, "GetHandler");
+function CreateOptions4(yargs) {
+  return yargs.positional("bucket", {
+    describe: "The name of the bucket for which notifications will be emitted",
+    type: "string",
+    demandOption: true
+  }).option("event-types", {
+    describe: "Specify the kinds of object events to emit notifications for. ex. '--event-types object-create object-delete'",
+    alias: "event-type",
+    choices: Object.keys(actionsForEventCategories),
+    demandOption: true,
+    requiresArg: true,
+    type: "array"
+  }).option("prefix", {
+    describe: "only actions on objects with this prefix will emit notifications",
+    requiresArg: false,
+    type: "string"
+  }).option("suffix", {
+    describe: "only actions on objects with this suffix will emit notifications",
+    type: "string"
+  }).option("queue", {
+    describe: "The name of the queue to which event notifications will be sent. ex '--queue my-queue'",
+    demandOption: true,
+    requiresArg: true,
+    type: "string"
+  });
+}
+__name(CreateOptions4, "CreateOptions");
+async function CreateHandler4(args) {
+  await printWranglerBanner();
+  const config = readConfig(args.config, args);
+  const accountId = await requireAuth(config);
+  const apiCreds = requireApiToken();
+  const { bucket, queue, eventTypes, prefix = "", suffix = "" } = args;
+  await putEventNotificationConfig(
+    config,
+    apiCreds,
+    accountId,
+    `${bucket}`,
+    `${queue}`,
+    eventTypes,
+    `${prefix}`,
+    `${suffix}`
+  );
+  logger.log("Configuration created successfully!");
+}
+__name(CreateHandler4, "CreateHandler");
+function DeleteOptions2(yargs) {
+  return yargs.positional("bucket", {
+    describe: "The name of the bucket for which notifications will be emitted",
+    type: "string",
+    demandOption: true
+  }).option("queue", {
+    describe: "The name of the queue that is configured to receive notifications. ex '--queue my-queue'",
+    demandOption: true,
+    requiresArg: true,
+    type: "string"
+  });
+}
+__name(DeleteOptions2, "DeleteOptions");
+async function DeleteHandler2(args) {
+  await printWranglerBanner();
+  const config = readConfig(args.config, args);
+  const accountId = await requireAuth(config);
+  const apiCreds = requireApiToken();
+  const { bucket, queue } = args;
+  await deleteEventNotificationConfig(
+    config,
+    apiCreds,
+    accountId,
+    `${bucket}`,
+    `${queue}`
+  );
+  logger.log("Configuration deleted successfully!");
+}
+__name(DeleteHandler2, "DeleteHandler");
+
 // src/r2/sippy.ts
 init_import_meta_url();
 var NO_SUCH_OBJECT_KEY = 10007;
@@ -152724,7 +152932,7 @@ async function EnableHandler(args) {
   logger.log(`\u2728 Successfully enabled Sippy on the '${args.name}' bucket.`);
 }
 __name(EnableHandler, "EnableHandler");
-function GetOptions(yargs) {
+function GetOptions2(yargs) {
   return yargs.positional("name", {
     describe: "The name of the bucket",
     type: "string",
@@ -152736,8 +152944,8 @@ function GetOptions(yargs) {
     type: "string"
   });
 }
-__name(GetOptions, "GetOptions");
-async function GetHandler(args) {
+__name(GetOptions2, "GetOptions");
+async function GetHandler2(args) {
   const config = readConfig(args.config, args);
   const accountId = await requireAuth(config);
   try {
@@ -152755,7 +152963,7 @@ async function GetHandler(args) {
     }
   }
 }
-__name(GetHandler, "GetHandler");
+__name(GetHandler2, "GetHandler");
 function DisableOptions(yargs) {
   return yargs.positional("name", {
     describe: "The name of the bucket",
@@ -153214,8 +153422,8 @@ ${key} is ${prettyBytes(objectSize, {
         ).command(
           "get <name>",
           "Check the status of Sippy on an R2 bucket",
-          GetOptions,
-          GetHandler
+          GetOptions2,
+          GetHandler2
         );
       }
     );
@@ -153224,88 +153432,20 @@ ${key} is ${prettyBytes(objectSize, {
       "Manage event notifications for an R2 bucket",
       (r2EvNotifyYargs) => {
         return r2EvNotifyYargs.command(
+          "get <bucket>",
+          "Get event notification configuration for a bucket",
+          GetOptions,
+          GetHandler
+        ).command(
           "create <bucket>",
           "Create new event notification configuration for an R2 bucket",
-          (yargs) => {
-            return yargs.positional("bucket", {
-              describe: "The name of the bucket for which notifications will be emitted",
-              type: "string",
-              demandOption: true
-            }).option("event-types", {
-              describe: "Specify the kinds of object events to emit notifications for. ex. '--event-types object-create object-delete'",
-              alias: "event-type",
-              choices: Object.keys(actionsForEventCategories),
-              demandOption: true,
-              requiresArg: true,
-              type: "array"
-            }).option("prefix", {
-              describe: "only actions on objects with this prefix will emit notifications",
-              requiresArg: false,
-              type: "string"
-            }).option("suffix", {
-              describe: "only actions on objects with this suffix will emit notifications",
-              type: "string"
-            }).option("queue", {
-              describe: "The name of the queue to which event notifications will be sent. ex '--queue my-queue'",
-              demandOption: true,
-              requiresArg: true,
-              type: "string"
-            });
-          },
-          async (args) => {
-            await printWranglerBanner();
-            const config = readConfig(args.config, args);
-            const accountId = await requireAuth(config);
-            const apiCreds = requireApiToken();
-            const {
-              bucket,
-              queue,
-              eventTypes,
-              prefix = "",
-              suffix = ""
-            } = args;
-            await putEventNotificationConfig(
-              config,
-              apiCreds,
-              accountId,
-              `${bucket}`,
-              `${queue}`,
-              eventTypes,
-              `${prefix}`,
-              `${suffix}`
-            );
-            logger.log("Configuration created successfully!");
-          }
+          CreateOptions4,
+          CreateHandler4
         ).command(
           "delete <bucket>",
           "Delete event notification configuration for an R2 bucket and queue",
-          (yargs) => {
-            return yargs.positional("bucket", {
-              describe: "The name of the bucket for which notifications will be emitted",
-              type: "string",
-              demandOption: true
-            }).option("queue", {
-              describe: "The name of the queue that is configured to receive notifications. ex '--queue my-queue'",
-              demandOption: true,
-              requiresArg: true,
-              type: "string"
-            });
-          },
-          async (args) => {
-            await printWranglerBanner();
-            const config = readConfig(args.config, args);
-            const accountId = await requireAuth(config);
-            const apiCreds = requireApiToken();
-            const { bucket, queue } = args;
-            await deleteEventNotificationConfig(
-              config,
-              apiCreds,
-              accountId,
-              `${bucket}`,
-              `${queue}`
-            );
-            logger.log("Configuration deleted successfully!");
-          }
+          DeleteOptions2,
+          DeleteHandler2
         );
       }
     );