wrangler 3.85.0 → 3.86.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wrangler",
-  "version": "3.85.0",
+  "version": "3.86.0",
   "description": "Command-line interface for all things Cloudflare Workers",
   "keywords": [
     "wrangler",
@@ -64,15 +64,15 @@
     "selfsigned": "^2.0.1",
     "source-map": "^0.6.1",
     "unenv": "npm:unenv-nightly@2.0.0-20241024-111401-d4156ac",
-    "workerd": "1.20241022.0",
+    "workerd": "1.20241106.1",
     "xxhash-wasm": "^1.0.1",
     "@cloudflare/kv-asset-handler": "0.3.4",
-    "miniflare": "3.20241022.0",
-    "@cloudflare/workers-shared": "0.7.0"
+    "@cloudflare/workers-shared": "0.7.1",
+    "miniflare": "3.20241106.0"
   },
   "devDependencies": {
     "@cloudflare/types": "6.18.4",
-    "@cloudflare/workers-types": "^4.20241022.0",
+    "@cloudflare/workers-types": "^4.20241106.0",
     "@cspotcode/source-map-support": "0.8.1",
     "@iarna/toml": "^3.0.0",
     "@microsoft/api-extractor": "^7.47.0",
@@ -154,11 +154,11 @@
     "yoga-layout": "file:../../vendor/yoga-layout-2.0.0-beta.1.tgz",
     "@cloudflare/cli": "1.1.1",
     "@cloudflare/eslint-config-worker": "1.1.0",
-    "@cloudflare/pages-shared": "^0.11.67",
+    "@cloudflare/pages-shared": "^0.11.68",
     "@cloudflare/workers-tsconfig": "0.0.0"
   },
   "peerDependencies": {
-    "@cloudflare/workers-types": "^4.20241022.0"
+    "@cloudflare/workers-types": "^4.20241106.0"
   },
   "peerDependenciesMeta": {
     "@cloudflare/workers-types": {

package/wrangler-dist/cli.d.ts

@@ -2691,14 +2691,31 @@ declare class Logger {
     error: (...args: unknown[]) => void;
     table<Keys extends string>(data: TableRow<Keys>[]): void;
     console<M extends Exclude<keyof Console, "Console">>(method: M, ...args: Parameters<Console[M]>): void;
-    static warnOnceHistory: Set<unknown>;
-    warnOnce(message: string): void;
+    static onceHistory: Set<unknown>;
+    get once(): {
+        info: (...args: unknown[]) => void;
+        log: (...args: unknown[]) => void;
+        warn: (...args: unknown[]) => void;
+        error: (...args: unknown[]) => void;
+    };
+    doLogOnce(messageLevel: Exclude<LoggerLevel, "none">, args: unknown[]): void;
     private doLog;
     static registerBeforeLogHook(callback: (() => void) | undefined): void;
     static registerAfterLogHook(callback: (() => void) | undefined): void;
     private formatMessage;
 }
 
+declare const LOGGER_LEVELS: {
+    readonly none: -1;
+    readonly error: 0;
+    readonly warn: 1;
+    readonly info: 2;
+    readonly log: 3;
+    readonly debug: 4;
+};
+
+declare type LoggerLevel = keyof typeof LOGGER_LEVELS;
+
 declare type LogLevel = "debug" | "info" | "log" | "warn" | "error" | "none";
 
 declare type MaybePromise<T> = T | Promise<T>;

package/wrangler-dist/cli.js

@@ -154577,7 +154577,7 @@ function getLoggerLevel() {
       return fromEnv;
     }
     const expected = Object.keys(LOGGER_LEVELS).map((level) => `"${level}"`).join(" | ");
-    logger.warnOnce(
+    logger.once.warn(
       `Unrecognised WRANGLER_LOG value ${JSON.stringify(
         fromEnv
       )}, expected ${expected}, defaulting to "log"...`
@@ -154634,11 +154634,20 @@ var _Logger = class {
     console[method].apply(console, args);
     (_b2 = __privateGet(_Logger, _afterLogHook)) == null ? void 0 : _b2.call(_Logger);
   }
-  warnOnce(message) {
-    const { warnOnceHistory } = this.constructor;
-    if (!warnOnceHistory.has(message)) {
-      warnOnceHistory.add(message);
-      this.warn(message);
+  get once() {
+    return {
+      info: (...args) => this.doLogOnce("info", args),
+      log: (...args) => this.doLogOnce("log", args),
+      warn: (...args) => this.doLogOnce("warn", args),
+      error: (...args) => this.doLogOnce("error", args)
+    };
+  }
+  doLogOnce(messageLevel, args) {
+    const { onceHistory } = this.constructor;
+    const cacheKey = `${messageLevel}: ${args.join(" ")}`;
+    if (!onceHistory.has(cacheKey)) {
+      onceHistory.add(cacheKey);
+      this.doLog(messageLevel, args);
     }
   }
   doLog(messageLevel, args) {
@@ -154679,7 +154688,7 @@ var Logger = _Logger;
 __name(Logger, "Logger");
 _beforeLogHook = new WeakMap();
 _afterLogHook = new WeakMap();
-__publicField(Logger, "warnOnceHistory", /* @__PURE__ */ new Set());
+__publicField(Logger, "onceHistory", /* @__PURE__ */ new Set());
 __privateAdd(Logger, _beforeLogHook, void 0);
 __privateAdd(Logger, _afterLogHook, void 0);
 var logger = new Logger();
@@ -155898,7 +155907,7 @@ var import_undici3 = __toESM(require_undici());
 
 // package.json
 var name = "wrangler";
-var version = "3.85.0";
+var version = "3.86.0";
 
 // src/user/index.ts
 init_import_meta_url();
@@ -161471,6 +161480,7 @@ var friendlyBindingNames = {
   assets: "Assets"
 };
 function printBindings(bindings, context2 = {}) {
+  let hasConnectionStatus = false;
   const truncate4 = /* @__PURE__ */ __name((item) => {
     const s = typeof item === "string" ? item : JSON.stringify(item);
     const maxLength = 40;
@@ -161523,12 +161533,13 @@ function printBindings(bindings, context2 = {}) {
           if (script_name) {
             if (context2.local) {
               const registryDefinition = context2.registry?.[script_name];
+              hasConnectionStatus = true;
               if (registryDefinition && registryDefinition.durableObjects.some(
                 (d2) => d2.className === class_name
               )) {
-                value += ` (defined in \u{1F7E2} ${script_name})`;
+                value += ` (defined in ${script_name} ${source_default.green("[connected]")})`;
               } else {
-                value += ` (defined in \u{1F534} ${script_name})`;
+                value += ` (defined in ${script_name} ${source_default.red("[not connected]")})`;
               }
             } else {
               value += ` (defined in ${script_name})`;
@@ -161669,10 +161680,11 @@ function printBindings(bindings, context2 = {}) {
         }
         if (context2.local) {
           const registryDefinition = context2.registry?.[service];
+          hasConnectionStatus = true;
           if (registryDefinition && (!entrypoint || registryDefinition.entrypointAddresses?.[entrypoint])) {
-            value = `\u{1F7E2} ` + value;
+            value = value + " " + source_default.green("[connected]");
           } else {
-            value = `\u{1F534} ` + value;
+            value = value + " " + source_default.red("[not connected]");
           }
         }
         return {
@@ -161816,6 +161828,13 @@ function printBindings(bindings, context2 = {}) {
     }).flat(2)
   ].join("\n");
   logger.log(message);
+  if (hasConnectionStatus) {
+    logger.once.info(
+      `
+Service bindings & durable object bindings connect to other \`wrangler dev\` processes running locally, with their connection status indicated by ${source_default.green("[connected]")} or ${source_default.red("[not connected]")}. For more details, refer to https://developers.cloudflare.com/workers/runtime-apis/bindings/service-bindings/#local-development
+`
+    );
+  }
 }
 __name(printBindings, "printBindings");
 function withConfig(handler30) {
@@ -166924,7 +166943,7 @@ ${dashLink}`);
     deployments2.push(...updateConsumers);
   }
   if (config.workflows?.length) {
-    logger.warnOnce("Workflows is currently in open beta.");
+    logger.once.warn("Workflows is currently in open beta.");
     for (const workflow of config.workflows) {
       deployments2.push(
         fetchResult(`/accounts/${accountId}/workflows/${workflow.name}`, {
@@ -168904,7 +168923,7 @@ async function versionsDeployHandler(args) {
     );
   }
   if (config.workflows?.length) {
-    logger.warnOnce("Workflows is currently in open beta.");
+    logger.once.warn("Workflows is currently in open beta.");
   }
   const versionCache = /* @__PURE__ */ new Map();
   const optionalVersionTraffic = parseVersionSpecs(args);
@@ -188057,7 +188076,7 @@ To learn more about Workers with assets, visit our documentation at https://deve
     );
   }
   if (config.workflows?.length) {
-    logger.warnOnce("Workflows is currently in open beta.");
+    logger.once.warn("Workflows is currently in open beta.");
   }
   validateAssetsArgsAndConfig(args, config);
   const assetsOptions = processAssetsArg(args, config);
@@ -199311,9 +199330,22 @@ async function handler14(args) {
   const config = readConfig(args.config, args);
   const body = createBody3(args);
   try {
-    logger.log(`Creating queue ${args.name}.`);
+    logger.log(`\u{1F300} Creating queue '${args.name}'`);
     await createQueue(config, body);
-    logger.log(`Created queue ${args.name}.`);
+    logger.log(
+      `\u2705 Created queue '${args.name}'
+
+Configure your Worker to send messages to this queue:
+
+[[queues.producers]]
+queue = "${args.name}"
+binding = "${getValidBindingName(args.name, "queue")}"
+
+Configure your Worker to consume messages from this queue:
+
+[[queues.consumers]]
+queue = "${args.name}"`
+    );
   } catch (e4) {
     handleFetchError(e4);
   }
@@ -199821,6 +199853,39 @@ async function configureCustomDomainSettings(accountId, bucketName, domainName,
   );
 }
 __name(configureCustomDomainSettings, "configureCustomDomainSettings");
+async function getR2DevDomain(accountId, bucketName, jurisdiction) {
+  const headers = {};
+  if (jurisdiction) {
+    headers["cf-r2-jurisdiction"] = jurisdiction;
+  }
+  const result = await fetchResult(
+    `/accounts/${accountId}/r2/buckets/${bucketName}/domains/managed`,
+    {
+      method: "GET",
+      headers
+    }
+  );
+  return result;
+}
+__name(getR2DevDomain, "getR2DevDomain");
+async function updateR2DevDomain(accountId, bucketName, enabled, jurisdiction) {
+  const headers = {
+    "Content-Type": "application/json"
+  };
+  if (jurisdiction) {
+    headers["cf-r2-jurisdiction"] = jurisdiction;
+  }
+  const result = await fetchResult(
+    `/accounts/${accountId}/r2/buckets/${bucketName}/domains/managed`,
+    {
+      method: "PUT",
+      headers,
+      body: JSON.stringify({ enabled })
+    }
+  );
+  return result;
+}
+__name(updateR2DevDomain, "updateR2DevDomain");
 function isValidR2BucketName(name2) {
   return typeof name2 === "string" && /^[a-zA-Z][a-zA-Z0-9-]*$/.test(name2);
 }
@@ -199872,7 +199937,13 @@ async function Handler16(args) {
   logger.log(`Creating bucket '${fullBucketName}'...`);
   await createR2Bucket(accountId, name2, location, jurisdiction, storageClass);
   logger.log(
-    `\u2705 Created bucket '${fullBucketName}' with${location ? ` location hint ${location} and` : ``} default storage class of ${storageClass ? storageClass : `Standard`}.`
+    `\u2705 Created bucket '${fullBucketName}' with${location ? ` location hint ${location} and` : ``} default storage class of ${storageClass ? storageClass : `Standard`}.
+
+Configure your Worker to write objects to this bucket:
+
+[[r2_buckets]]
+bucket_name = "${args.name}"
+binding = "${getValidBindingName(args.name, "r2")}"`
   );
   await sendMetricsEvent("create r2 bucket", {
     sendMetrics: config.send_metrics
@@ -200195,11 +200266,124 @@ async function DeleteHandler2(args) {
 }
 __name(DeleteHandler2, "DeleteHandler");
 
+// src/r2/public-dev-url.ts
+init_import_meta_url();
+function GetOptions(yargs) {
+  return yargs.positional("bucket", {
+    describe: "The name of the R2 bucket whose r2.dev URL status to retrieve",
+    type: "string",
+    demandOption: true
+  }).option("jurisdiction", {
+    describe: "The jurisdiction where the bucket exists",
+    alias: "J",
+    requiresArg: true,
+    type: "string"
+  });
+}
+__name(GetOptions, "GetOptions");
+async function GetHandler(args) {
+  await printWranglerBanner();
+  const config = readConfig(args.config, args);
+  const accountId = await requireAuth(config);
+  const { bucket, jurisdiction } = args;
+  const devDomain = await getR2DevDomain(accountId, bucket, jurisdiction);
+  if (devDomain.enabled) {
+    logger.log(`Public access is enabled at 'https://${devDomain.domain}'.`);
+  } else {
+    logger.log(`Public access via the r2.dev URL is disabled.`);
+  }
+}
+__name(GetHandler, "GetHandler");
+function EnableOptions(yargs) {
+  return yargs.positional("bucket", {
+    describe: "The name of the R2 bucket to enable public access via its r2.dev URL",
+    type: "string",
+    demandOption: true
+  }).option("jurisdiction", {
+    describe: "The jurisdiction where the bucket exists",
+    alias: "J",
+    requiresArg: true,
+    type: "string"
+  }).option("force", {
+    describe: "Skip confirmation",
+    type: "boolean",
+    alias: "y",
+    default: false
+  });
+}
+__name(EnableOptions, "EnableOptions");
+async function EnableHandler(args) {
+  await printWranglerBanner();
+  const config = readConfig(args.config, args);
+  const accountId = await requireAuth(config);
+  const { bucket, jurisdiction, force } = args;
+  if (!force) {
+    const confirmedAdd = await confirm(
+      `Are you sure you enable public access for bucket '${bucket}'? The contents of your bucket will be made publicly available at its r2.dev URL`
+    );
+    if (!confirmedAdd) {
+      logger.log("Enable cancelled.");
+      return;
+    }
+  }
+  logger.log(`Enabling public access for bucket '${bucket}'...`);
+  const devDomain = await updateR2DevDomain(
+    accountId,
+    bucket,
+    true,
+    jurisdiction
+  );
+  logger.log(`\u2728 Public access enabled at 'https://${devDomain.domain}'.`);
+}
+__name(EnableHandler, "EnableHandler");
+function DisableOptions(yargs) {
+  return yargs.positional("bucket", {
+    describe: "The name of the R2 bucket to disable public access via its r2.dev URL",
+    type: "string",
+    demandOption: true
+  }).option("jurisdiction", {
+    describe: "The jurisdiction where the bucket exists",
+    alias: "J",
+    requiresArg: true,
+    type: "string"
+  }).option("force", {
+    describe: "Skip confirmation",
+    type: "boolean",
+    alias: "y",
+    default: false
+  });
+}
+__name(DisableOptions, "DisableOptions");
+async function DisableHandler(args) {
+  await printWranglerBanner();
+  const config = readConfig(args.config, args);
+  const accountId = await requireAuth(config);
+  const { bucket, jurisdiction, force } = args;
+  if (!force) {
+    const confirmedAdd = await confirm(
+      `Are you sure you disable public access for bucket '${bucket}'? The contents of your bucket will no longer be publicly available at its r2.dev URL`
+    );
+    if (!confirmedAdd) {
+      logger.log("Disable cancelled.");
+      return;
+    }
+  }
+  logger.log(`Disabling public access for bucket '${bucket}'...`);
+  const devDomain = await updateR2DevDomain(
+    accountId,
+    bucket,
+    false,
+    jurisdiction
+  );
+  logger.log(`Public access disabled at 'https://${devDomain.domain}'.`);
+}
+__name(DisableHandler, "DisableHandler");
+
 // src/r2/sippy.ts
 init_import_meta_url();
 var NO_SUCH_OBJECT_KEY = 10007;
 var SIPPY_PROVIDER_CHOICES = ["AWS", "GCS"];
-function EnableOptions(yargs) {
+function EnableOptions2(yargs) {
   return yargs.positional("name", {
     describe: "The name of the bucket",
     type: "string",
@@ -200240,8 +200424,8 @@ function EnableOptions(yargs) {
     string: true
   });
 }
-__name(EnableOptions, "EnableOptions");
-async function EnableHandler(args) {
+__name(EnableOptions2, "EnableOptions");
+async function EnableHandler2(args) {
   const isInteractive3 = process.stdin.isTTY;
   const config = readConfig(args.config, args);
   const accountId = await requireAuth(config);
@@ -200388,8 +200572,8 @@ async function EnableHandler(args) {
   await putR2Sippy(accountId, args.name, sippyConfig, args.jurisdiction);
   logger.log(`\u2728 Successfully enabled Sippy on the '${args.name}' bucket.`);
 }
-__name(EnableHandler, "EnableHandler");
-function GetOptions(yargs) {
+__name(EnableHandler2, "EnableHandler");
+function GetOptions2(yargs) {
   return yargs.positional("name", {
     describe: "The name of the bucket",
     type: "string",
@@ -200401,8 +200585,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 {
@@ -200420,8 +200604,8 @@ async function GetHandler(args) {
     }
   }
 }
-__name(GetHandler, "GetHandler");
-function DisableOptions(yargs) {
+__name(GetHandler2, "GetHandler");
+function DisableOptions2(yargs) {
   return yargs.positional("name", {
     describe: "The name of the bucket",
     type: "string",
@@ -200433,14 +200617,14 @@ function DisableOptions(yargs) {
     type: "string"
   });
 }
-__name(DisableOptions, "DisableOptions");
-async function DisableHandler(args) {
+__name(DisableOptions2, "DisableOptions");
+async function DisableHandler2(args) {
   const config = readConfig(args.config, args);
   const accountId = await requireAuth(config);
   await deleteR2Sippy(accountId, args.name, args.jurisdiction);
   logger.log(`\u2728 Successfully disabled Sippy on the '${args.name}' bucket.`);
 }
-__name(DisableHandler, "DisableHandler");
+__name(DisableHandler2, "DisableHandler");
 
 // src/r2/index.ts
 var CHUNK_SIZE = 1024;
@@ -200902,18 +201086,18 @@ ${key} is ${prettyBytes(objectSize, {
         return sippyYargs.command(
           "enable <name>",
           "Enable Sippy on an R2 bucket",
-          EnableOptions,
-          EnableHandler
+          EnableOptions2,
+          EnableHandler2
         ).command(
           "disable <name>",
           "Disable Sippy on an R2 bucket",
-          DisableOptions,
-          DisableHandler
+          DisableOptions2,
+          DisableHandler2
         ).command(
           "get <name>",
           "Check the status of Sippy on an R2 bucket",
-          GetOptions,
-          GetHandler
+          GetOptions2,
+          GetHandler2
         );
       }
     );
@@ -200966,6 +201150,28 @@ ${key} is ${prettyBytes(objectSize, {
         );
       }
     );
+    r2BucketYargs.command(
+      "dev-url",
+      "Manage public access via the r2.dev URL for an R2 bucket",
+      (devUrlYargs) => {
+        return devUrlYargs.command(
+          "enable <bucket>",
+          "Enable public access via the r2.dev URL for an R2 bucket",
+          EnableOptions,
+          EnableHandler
+        ).command(
+          "disable <bucket>",
+          "Disable public access via the r2.dev URL for an R2 bucket",
+          DisableOptions,
+          DisableHandler
+        ).command(
+          "get <bucket>",
+          "Get the r2.dev URL and status for an R2 bucket",
+          GetOptions,
+          GetHandler
+        );
+      }
+    );
     return r2BucketYargs;
   });
 }
@@ -213705,7 +213911,7 @@ async function versionsUploadHandler(args) {
     );
   }
   if (config.workflows?.length) {
-    logger.warnOnce("Workflows is currently in open beta.");
+    logger.once.warn("Workflows is currently in open beta.");
   }
   validateAssetsArgsAndConfig(
     {
@@ -216647,7 +216853,7 @@ async function resolveConfig(config, input) {
   }
   validateAssetsArgsAndConfig(resolved);
   const services = extractBindingsOfType("service", resolved.bindings);
-  if (services && services.length > 0) {
+  if (services && services.length > 0 && resolved.dev?.remote) {
     logger.warn(
       `This worker is bound to live services: ${services.map(
         (service) => `${service.name} (${service.service}${service.environment ? `@${service.environment}` : ""}${service.entrypoint ? `#${service.entrypoint}` : ""})`
@@ -217116,7 +217322,9 @@ var ProxyController = class extends Controller {
     this.proxyWorkerOptions = proxyWorkerOptions;
     if (proxyWorkerOptionsChanged) {
       logger.debug("ProxyWorker miniflare options changed, reinstantiating...");
-      void this.proxyWorker.setOptions(proxyWorkerOptions);
+      void this.proxyWorker.setOptions(proxyWorkerOptions).catch((error2) => {
+        this.emitErrorEvent("Failed to start ProxyWorker", error2);
+      });
       this.ready = createDeferred(this.ready);
     }
     const { proxyWorker } = this;
@@ -217217,7 +217425,6 @@ var ProxyController = class extends Controller {
         `Failed to send message to ProxyWorker: ${JSON.stringify(message)}`,
         error2
       );
-      throw error2;
     }
   }
   async sendMessageToInspectorProxyWorker(message, retries = 3) {
@@ -217242,7 +217449,6 @@ var ProxyController = class extends Controller {
         )}`,
         error2
       );
-      throw error2;
     }
   }
   // ******************
@@ -217739,25 +217945,7 @@ var DevEnv = class extends import_node_events6.EventEmitter {
     logger.debug("DevEnv teardown complete");
   }
   emitErrorEvent(ev) {
-    if (ev.source === "ProxyController" && ev.reason === "Failed to start ProxyWorker or InspectorProxyWorker") {
-      (0, import_node_assert28.default)(ev.data.config);
-      const { config } = ev.data;
-      const port2 = config.dev?.server?.port;
-      const inspectorPort = config.dev?.inspector?.port;
-      const randomPorts = [0, void 0];
-      if (!randomPorts.includes(port2) || !randomPorts.includes(inspectorPort)) {
-        this.config.emitConfigUpdateEvent({
-          ...config,
-          dev: {
-            ...config.dev,
-            server: { ...config.dev?.server, port: 0 },
-            // override port
-            inspector: { ...config.dev?.inspector, port: 0 }
-            // override port
-          }
-        });
-      }
-    } else if (ev.source === "ProxyController" && (ev.reason.startsWith("Failed to send message to") || ev.reason.startsWith("Could not connect to InspectorProxyWorker"))) {
+    if (ev.source === "ProxyController" && (ev.reason.startsWith("Failed to send message to") || ev.reason.startsWith("Could not connect to InspectorProxyWorker"))) {
       logger.debug(`Error in ${ev.source}: ${ev.reason}
 `, ev.cause);
       logger.debug("=> Error contextual data:", ev.data);