wrangler 2.17.0 → 2.18.0

package/wrangler-dist/cli.js

@@ -17960,14 +17960,14 @@ var require_templates = __commonJS({
       return results;
     }
     __name(parseStyle, "parseStyle");
-    function buildStyle(chalk14, styles) {
+    function buildStyle(chalk15, styles) {
       const enabled = {};
       for (const layer of styles) {
         for (const style of layer.styles) {
           enabled[style[0]] = layer.inverse ? null : style.slice(1);
         }
       }
-      let current = chalk14;
+      let current = chalk15;
       for (const styleName of Object.keys(enabled)) {
         if (Array.isArray(enabled[styleName])) {
           if (!(styleName in current)) {
@@ -17983,7 +17983,7 @@ var require_templates = __commonJS({
       return current;
     }
     __name(buildStyle, "buildStyle");
-    module2.exports = (chalk14, tmp5) => {
+    module2.exports = (chalk15, tmp5) => {
       const styles = [];
       const chunks = [];
       let chunk = [];
@@ -17993,13 +17993,13 @@ var require_templates = __commonJS({
         } else if (style) {
           const str = chunk.join("");
           chunk = [];
-          chunks.push(styles.length === 0 ? str : buildStyle(chalk14, styles)(str));
+          chunks.push(styles.length === 0 ? str : buildStyle(chalk15, styles)(str));
           styles.push({ inverse, styles: parseStyle(style) });
         } else if (close) {
           if (styles.length === 0) {
             throw new Error("Found extraneous } in Chalk template literal");
           }
-          chunks.push(buildStyle(chalk14, styles)(chunk.join("")));
+          chunks.push(buildStyle(chalk15, styles)(chunk.join("")));
           chunk = [];
           styles.pop();
         } else {
@@ -18038,16 +18038,16 @@ var require_chalk = __commonJS({
     __name(applyOptions, "applyOptions");
     function Chalk(options6) {
       if (!this || !(this instanceof Chalk) || this.template) {
-        const chalk14 = {};
-        applyOptions(chalk14, options6);
-        chalk14.template = function() {
+        const chalk15 = {};
+        applyOptions(chalk15, options6);
+        chalk15.template = function() {
           const args = [].slice.call(arguments);
-          return chalkTag.apply(null, [chalk14.template].concat(args));
+          return chalkTag.apply(null, [chalk15.template].concat(args));
         };
-        Object.setPrototypeOf(chalk14, Chalk.prototype);
-        Object.setPrototypeOf(chalk14.template, chalk14);
-        chalk14.template.constructor = Chalk;
-        return chalk14.template;
+        Object.setPrototypeOf(chalk15, Chalk.prototype);
+        Object.setPrototypeOf(chalk15.template, chalk15);
+        chalk15.template.constructor = Chalk;
+        return chalk15.template;
       }
       applyOptions(this, options6);
     }
@@ -18169,7 +18169,7 @@ var require_chalk = __commonJS({
       return str;
     }
     __name(applyStyle, "applyStyle");
-    function chalkTag(chalk14, strings) {
+    function chalkTag(chalk15, strings) {
       if (!Array.isArray(strings)) {
         return [].slice.call(arguments, 1).join(" ");
       }
@@ -18179,7 +18179,7 @@ var require_chalk = __commonJS({
         parts.push(String(args[i - 1]).replace(/[{}\\]/g, "\\$&"));
         parts.push(String(strings.raw[i]));
       }
-      return template(chalk14, parts.join(""));
+      return template(chalk15, parts.join(""));
     }
     __name(chalkTag, "chalkTag");
     Object.defineProperties(Chalk.prototype, styles);
@@ -53345,14 +53345,14 @@ var require_templates2 = __commonJS({
       return results;
     }
     __name(parseStyle, "parseStyle");
-    function buildStyle(chalk14, styles) {
+    function buildStyle(chalk15, styles) {
       const enabled = {};
       for (const layer of styles) {
         for (const style of layer.styles) {
           enabled[style[0]] = layer.inverse ? null : style.slice(1);
         }
       }
-      let current = chalk14;
+      let current = chalk15;
       for (const [styleName, styles2] of Object.entries(enabled)) {
         if (!Array.isArray(styles2)) {
           continue;
@@ -53365,7 +53365,7 @@ var require_templates2 = __commonJS({
       return current;
     }
     __name(buildStyle, "buildStyle");
-    module2.exports = (chalk14, temporary) => {
+    module2.exports = (chalk15, temporary) => {
       const styles = [];
       const chunks = [];
       let chunk = [];
@@ -53375,13 +53375,13 @@ var require_templates2 = __commonJS({
         } else if (style) {
           const string = chunk.join("");
           chunk = [];
-          chunks.push(styles.length === 0 ? string : buildStyle(chalk14, styles)(string));
+          chunks.push(styles.length === 0 ? string : buildStyle(chalk15, styles)(string));
           styles.push({ inverse, styles: parseStyle(style) });
         } else if (close) {
           if (styles.length === 0) {
             throw new Error("Found extraneous } in Chalk template literal");
           }
-          chunks.push(buildStyle(chalk14, styles)(chunk.join("")));
+          chunks.push(buildStyle(chalk15, styles)(chunk.join("")));
           chunk = [];
           styles.pop();
         } else {
@@ -53431,16 +53431,16 @@ var require_source = __commonJS({
     };
     __name(ChalkClass, "ChalkClass");
     var chalkFactory = /* @__PURE__ */ __name((options6) => {
-      const chalk15 = {};
-      applyOptions(chalk15, options6);
-      chalk15.template = (...arguments_) => chalkTag(chalk15.template, ...arguments_);
-      Object.setPrototypeOf(chalk15, Chalk.prototype);
-      Object.setPrototypeOf(chalk15.template, chalk15);
-      chalk15.template.constructor = () => {
+      const chalk16 = {};
+      applyOptions(chalk16, options6);
+      chalk16.template = (...arguments_) => chalkTag(chalk16.template, ...arguments_);
+      Object.setPrototypeOf(chalk16, Chalk.prototype);
+      Object.setPrototypeOf(chalk16.template, chalk16);
+      chalk16.template.constructor = () => {
         throw new Error("`chalk.constructor()` is deprecated. Use `new chalk.Instance()` instead.");
       };
-      chalk15.template.Instance = ChalkClass;
-      return chalk15.template;
+      chalk16.template.Instance = ChalkClass;
+      return chalk16.template;
     }, "chalkFactory");
     function Chalk(options6) {
       return chalkFactory(options6);
@@ -53552,7 +53552,7 @@ var require_source = __commonJS({
       return openAll + string + closeAll;
     }, "applyStyle");
     var template;
-    var chalkTag = /* @__PURE__ */ __name((chalk15, ...strings) => {
+    var chalkTag = /* @__PURE__ */ __name((chalk16, ...strings) => {
       const [firstString] = strings;
       if (!isArray(firstString) || !isArray(firstString.raw)) {
         return strings.join(" ");
@@ -53568,14 +53568,14 @@ var require_source = __commonJS({
       if (template === void 0) {
         template = require_templates2();
       }
-      return template(chalk15, parts.join(""));
+      return template(chalk16, parts.join(""));
     }, "chalkTag");
     Object.defineProperties(Chalk.prototype, styles);
-    var chalk14 = Chalk();
-    chalk14.supportsColor = stdoutColor;
-    chalk14.stderr = Chalk({ level: stderrColor ? stderrColor.level : 0 });
-    chalk14.stderr.supportsColor = stderrColor;
-    module2.exports = chalk14;
+    var chalk15 = Chalk();
+    chalk15.supportsColor = stdoutColor;
+    chalk15.stderr = Chalk({ level: stderrColor ? stderrColor.level : 0 });
+    chalk15.stderr.supportsColor = stderrColor;
+    module2.exports = chalk15;
   }
 });
 
@@ -122132,7 +122132,7 @@ var import_undici16 = __toESM(require_undici());
 // src/dev.tsx
 init_import_meta_url();
 var import_node_path42 = __toESM(require("node:path"));
-var import_chalk13 = __toESM(require_chalk());
+var import_chalk14 = __toESM(require_chalk());
 var import_chokidar5 = require("chokidar");
 
 // ../../node_modules/get-port/index.js
@@ -128747,7 +128747,7 @@ var import_websocket_server = __toESM(require_websocket_server2(), 1);
 var wrapper_default = import_websocket.default;
 
 // package.json
-var version = "2.17.0";
+var version = "2.18.0";
 var package_default = {
   name: "wrangler",
   version,
@@ -132683,14 +132683,14 @@ var import_node_assert11 = __toESM(require("node:assert"));
 var import_node_fs24 = require("node:fs");
 var import_node_path40 = __toESM(require("node:path"));
 var import_node_url12 = require("node:url");
-var import_chalk12 = __toESM(require_chalk());
+var import_chalk13 = __toESM(require_chalk());
 var import_tmp_promise2 = __toESM(require_tmp_promise());
 
 // src/deployments.ts
 init_import_meta_url();
 var import_url2 = require("url");
 var import_toml6 = __toESM(require_toml());
-var import_chalk9 = __toESM(require_chalk());
+var import_chalk10 = __toESM(require_chalk());
 var import_undici14 = __toESM(require_undici());
 
 // src/init.ts
@@ -132965,7 +132965,7 @@ __name(sniffUserAgent, "sniffUserAgent");
 init_import_meta_url();
 var import_node_os14 = __toESM(require("node:os"));
 var import_toml4 = __toESM(require_toml());
-var import_chalk8 = __toESM(require_chalk());
+var import_chalk9 = __toESM(require_chalk());
 
 // node_modules/supports-color/index.js
 init_import_meta_url();
@@ -140521,7 +140521,7 @@ function logBulkProgress(operation, index, total) {
   );
 }
 __name(logBulkProgress, "logBulkProgress");
-async function putKVBulkKeyValue(accountId, namespaceId, keyValues, quiet = false) {
+async function putKVBulkKeyValue(accountId, namespaceId, keyValues, quiet = false, abortSignal) {
   for (let index = 0; index < keyValues.length; index += BATCH_KEY_MAX) {
     if (!quiet && keyValues.length > BATCH_KEY_MAX) {
       logBulkProgress("put", index, keyValues.length);
@@ -140532,7 +140532,9 @@ async function putKVBulkKeyValue(accountId, namespaceId, keyValues, quiet = fals
         method: "PUT",
         body: JSON.stringify(keyValues.slice(index, index + BATCH_KEY_MAX)),
         headers: { "Content-Type": "application/json" }
-      }
+      },
+      void 0,
+      abortSignal
     );
   }
   if (!quiet && keyValues.length > BATCH_KEY_MAX) {
@@ -146179,6 +146181,7 @@ init_import_meta_url();
 var import_node_assert9 = __toESM(require("node:assert"));
 var import_promises12 = require("node:fs/promises");
 var path32 = __toESM(require("node:path"));
+var import_chalk6 = __toESM(require_chalk());
 var import_ignore = __toESM(require_ignore());
 
 // ../../node_modules/xxhash-wasm/esm/xxhash-wasm.js
@@ -146289,6 +146292,14 @@ async function createKVNamespaceIfNotAlreadyExisting(title, accountId) {
   };
 }
 __name(createKVNamespaceIfNotAlreadyExisting, "createKVNamespaceIfNotAlreadyExisting");
+var MAX_DIFF_LINES = 100;
+var MAX_BUCKET_SIZE2 = 98 * 1e3 * 1e3;
+var MAX_BUCKET_KEYS = BATCH_KEY_MAX;
+var MAX_BATCH_OPERATIONS = 5;
+function pluralise(count) {
+  return count === 1 ? "" : "s";
+}
+__name(pluralise, "pluralise");
 async function syncAssets(accountId, scriptName, siteAssets, preview, dryRun) {
   if (siteAssets === void 0) {
     return { manifest: void 0, namespace: void 0 };
@@ -146303,62 +146314,133 @@ async function syncAssets(accountId, scriptName, siteAssets, preview, dryRun) {
     title,
     accountId
   );
+  logger.info("Fetching list of already uploaded assets...");
   const namespaceKeysResponse = await listKVNamespaceKeys(accountId, namespace);
   const namespaceKeys = new Set(namespaceKeysResponse.map((x) => x.name));
-  const manifest = {};
-  const uploadBuckets = [];
-  let uploadBucket = [];
-  let uploadBucketSize = 0;
-  const include = createPatternMatcher(siteAssets.includePatterns, false);
-  const exclude = createPatternMatcher(siteAssets.excludePatterns, true);
-  const hasher = await e();
   const assetDirectory = path32.join(
     siteAssets.baseDirectory,
     siteAssets.assetDirectory
   );
+  const include = createPatternMatcher(siteAssets.includePatterns, false);
+  const exclude = createPatternMatcher(siteAssets.excludePatterns, true);
+  const hasher = await e();
+  const manifest = {};
+  const uploadBuckets = [];
+  let uploadBucket = [];
+  let uploadBucketSize = 0;
+  let uploadCount = 0;
+  let skipCount = 0;
+  let diffCount = 0;
+  function logDiff(line) {
+    const level = logger.loggerLevel;
+    if (LOGGER_LEVELS[level] >= LOGGER_LEVELS.debug) {
+      logger.debug(line);
+    } else if (diffCount < MAX_DIFF_LINES) {
+      logger.info(line);
+    } else if (diffCount === MAX_DIFF_LINES) {
+      const msg = "   (truncating changed assets log, set `WRANGLER_LOG=debug` environment variable to see full diff)";
+      logger.info(import_chalk6.default.dim(msg));
+    }
+    diffCount++;
+  }
+  __name(logDiff, "logDiff");
+  logger.info("Building list of assets to upload...");
   for await (const absAssetFile of getFilesInFolder(assetDirectory)) {
     const assetFile = path32.relative(assetDirectory, absAssetFile);
-    if (!include(assetFile)) {
-      continue;
-    }
-    if (exclude(assetFile)) {
+    if (!include(assetFile) || exclude(assetFile))
       continue;
-    }
-    logger.log(`Reading ${assetFile}...`);
     const content = await (0, import_promises12.readFile)(absAssetFile, "base64");
+    const assetSize = Buffer.byteLength(content);
     await validateAssetSize(absAssetFile, assetFile);
-    const assetSize = Buffer.from(content).length;
     const assetKey = hashAsset(hasher, assetFile, content);
     validateAssetKey(assetKey);
     if (!namespaceKeys.has(assetKey)) {
-      logger.log(`Uploading as ${assetKey}...`);
-      if (uploadBucketSize + assetSize > 98 * 1e3 * 1e3) {
+      logDiff(
+        import_chalk6.default.green(` + ${assetKey} (uploading new version of ${assetFile})`)
+      );
+      if (uploadBucketSize + assetSize > MAX_BUCKET_SIZE2 || uploadBucket.length + 1 > MAX_BUCKET_KEYS) {
         uploadBuckets.push(uploadBucket);
         uploadBucketSize = 0;
         uploadBucket = [];
       }
       uploadBucketSize += assetSize;
-      uploadBucket.push({
-        key: assetKey,
-        value: content,
-        base64: true
-      });
+      uploadBucket.push([absAssetFile, assetKey]);
+      uploadCount++;
     } else {
-      logger.log(`Skipping - already uploaded.`);
+      logDiff(import_chalk6.default.dim(` = ${assetKey} (already uploaded ${assetFile})`));
+      skipCount++;
     }
     namespaceKeys.delete(assetKey);
     const manifestKey = urlSafe(path32.relative(assetDirectory, absAssetFile));
     manifest[manifestKey] = assetKey;
   }
-  uploadBuckets.push(uploadBucket);
+  if (uploadBucket.length > 0)
+    uploadBuckets.push(uploadBucket);
   for (const key of namespaceKeys) {
-    logger.log(`Deleting ${key} from the asset store...`);
+    logDiff(import_chalk6.default.red(` - ${key} (removing as stale)`));
   }
-  const bucketsToPut = [];
-  for (const bucket of uploadBuckets) {
-    bucketsToPut.push(putKVBulkKeyValue(accountId, namespace, bucket));
+  if (uploadCount > 0) {
+    const s = pluralise(uploadCount);
+    logger.info(`Uploading ${formatNumber(uploadCount)} new asset${s}...`);
+  }
+  if (skipCount > 0) {
+    const s = pluralise(skipCount);
+    logger.info(
+      `Skipped uploading ${formatNumber(skipCount)} existing asset${s}.`
+    );
+  }
+  let uploadedCount = 0;
+  const controller = new AbortController();
+  const uploaders = Array.from(Array(MAX_BATCH_OPERATIONS)).map(async () => {
+    while (!controller.signal.aborted) {
+      const nextBucket = uploadBuckets.shift();
+      if (nextBucket === void 0)
+        break;
+      const bucket = [];
+      for (const [absAssetFile, assetKey] of nextBucket) {
+        bucket.push({
+          key: assetKey,
+          value: await (0, import_promises12.readFile)(absAssetFile, "base64"),
+          base64: true
+        });
+        if (controller.signal.aborted)
+          break;
+      }
+      try {
+        await putKVBulkKeyValue(
+          accountId,
+          namespace,
+          bucket,
+          true,
+          controller.signal
+        );
+      } catch (e2) {
+        if (typeof e2 === "object" && e2 !== null && "name" in e2 && e2.name === "AbortError") {
+          break;
+        }
+        throw e2;
+      }
+      uploadedCount += nextBucket.length;
+      const percent = Math.floor(100 * uploadedCount / uploadCount);
+      logger.info(
+        `Uploaded ${percent}% [${formatNumber(
+          uploadedCount
+        )} out of ${formatNumber(uploadCount)}]`
+      );
+    }
+  });
+  try {
+    await Promise.all(uploaders);
+  } catch (e2) {
+    logger.info(`Upload failed, aborting...`);
+    controller.abort();
+    throw e2;
+  }
+  const deleteCount = namespaceKeys.size;
+  if (deleteCount > 0) {
+    const s = pluralise(deleteCount);
+    logger.info(`Removing ${formatNumber(deleteCount)} stale asset${s}...`);
   }
-  await Promise.all(bucketsToPut);
   await deleteKVBulkKeyValue(accountId, namespace, Array.from(namespaceKeys));
   logger.log("\u2197\uFE0F  Done syncing assets");
   return { manifest, namespace };
@@ -148512,7 +148594,7 @@ __name(writeDTSFile, "writeDTSFile");
 
 // src/update-check.ts
 init_import_meta_url();
-var import_chalk6 = __toESM(require_chalk());
+var import_chalk7 = __toESM(require_chalk());
 var import_update_check = __toESM(require_update_check());
 async function updateCheck() {
   let update = null;
@@ -148523,14 +148605,14 @@ async function updateCheck() {
   } catch (err) {
   }
   if (update)
-    return `(update available ${import_chalk6.default.green(update.latest)})`;
+    return `(update available ${import_chalk7.default.green(update.latest)})`;
   return "";
 }
 __name(updateCheck, "updateCheck");
 
 // src/whoami.ts
 init_import_meta_url();
-var import_chalk7 = __toESM(require_chalk());
+var import_chalk8 = __toESM(require_chalk());
 async function whoami() {
   logger.log("Getting User settings...");
   const user = await getUserInfo();
@@ -148541,7 +148623,7 @@ async function whoami() {
   }
   if (user.email !== void 0) {
     logger.log(
-      `\u{1F44B} You are logged in with an ${user.authType}, associated with the email ${import_chalk7.default.blue(user.email)}!`
+      `\u{1F44B} You are logged in with an ${user.authType}, associated with the email ${import_chalk8.default.blue(user.email)}!`
     );
   } else {
     logger.log(
@@ -148642,7 +148724,7 @@ async function printWranglerBanner() {
   }
   const text = ` \u26C5\uFE0F wrangler ${version} ${await updateCheck()}`;
   logger.log(
-    text + "\n" + (supports_color_default.stdout ? import_chalk8.default.hex("#FF8800")("-".repeat(text.length)) : "-".repeat(text.length))
+    text + "\n" + (supports_color_default.stdout ? import_chalk9.default.hex("#FF8800")("-".repeat(text.length)) : "-".repeat(text.length))
   );
 }
 __name(printWranglerBanner, "printWranglerBanner");
@@ -149980,9 +150062,9 @@ async function rollbackDeployment(accountId, scriptName, { send_metrics: sendMet
     rollbackMessage = message;
   } else {
     if (!await confirm(
-      `This deployment ${import_chalk9.default.underline(
+      `This deployment ${import_chalk10.default.underline(
         firstHash
-      )} will immediately replace the current deployment and become the active deployment across all your deployed routes and domains. However, your local development environment will not be affected by this rollback. ${import_chalk9.default.blue.bold(
+      )} will immediately replace the current deployment and become the active deployment across all your deployed routes and domains. However, your local development environment will not be affected by this rollback. ${import_chalk10.default.blue.bold(
         "Note:"
       )} Rolling back to a previous deployment will not rollback any of the bound resources (Durable Object, R2, KV, etc.).`
     )) {
@@ -150182,7 +150264,7 @@ __name(getMigrationsToUpload, "getMigrationsToUpload");
 
 // src/routes.ts
 init_import_meta_url();
-var import_chalk10 = __toESM(require_chalk());
+var import_chalk11 = __toESM(require_chalk());
 async function getWorkersDevSubdomain(accountId) {
   try {
     const { subdomain } = await fetchResult(
@@ -150243,8 +150325,8 @@ async function registerSubdomain(accountId) {
       }
     }
     const ok = await confirm(
-      `Creating a workers.dev subdomain for your account at ${import_chalk10.default.blue(
-        import_chalk10.default.underline(`https://${potentialName}.workers.dev`)
+      `Creating a workers.dev subdomain for your account at ${import_chalk11.default.blue(
+        import_chalk11.default.underline(`https://${potentialName}.workers.dev`)
       )}. Ok to proceed?`
     );
     if (!ok) {
@@ -150280,8 +150362,8 @@ ${onboardingLink}`);
   }
   logger.log("Success! It may take a few minutes for DNS records to update.");
   logger.log(
-    `Visit ${import_chalk10.default.blue(
-      import_chalk10.default.underline(
+    `Visit ${import_chalk11.default.blue(
+      import_chalk11.default.underline(
         `https://dash.cloudflare.com/${accountId}/workers/subdomain`
       )
     )} to edit your workers.dev subdomain`
@@ -150294,7 +150376,7 @@ __name(registerSubdomain, "registerSubdomain");
 init_import_meta_url();
 var import_promises15 = require("node:fs/promises");
 var import_node_path39 = __toESM(require("node:path"));
-var import_chalk11 = __toESM(require_chalk());
+var import_chalk12 = __toESM(require_chalk());
 async function getFiles(root, relativeTo) {
   const files = [];
   for (const file of await (0, import_promises15.readdir)(root, { withFileTypes: true })) {
@@ -150318,7 +150400,7 @@ async function traverseModuleGraph(entry, rules) {
   if (modules.length > 0) {
     logger.info(`Uploading additional modules:`);
     modules.forEach(({ name, type }) => {
-      logger.info(`- ${import_chalk11.default.blue(name)} (${import_chalk11.default.green(type ?? "")})`);
+      logger.info(`- ${import_chalk12.default.blue(name)} (${import_chalk12.default.green(type ?? "")})`);
     });
   }
   return {
@@ -150812,13 +150894,13 @@ See https://developers.cloudflare.com/workers/platform/compatibility-dates for m
           const assignedRoutes = routesWithOtherBindings[worker];
           errorMessage += `"${worker}" is already assigned to routes:
 ${assignedRoutes.map(
-            (r) => `  - ${import_chalk12.default.underline(r)}
+            (r) => `  - ${import_chalk13.default.underline(r)}
 `
           )}`;
         }
         const resolution = "Unassign other workers from the routes you want to publish to, and then try again.";
-        const dashLink = `Visit ${import_chalk12.default.blue(
-          import_chalk12.default.underline(
+        const dashLink = `Visit ${import_chalk13.default.blue(
+          import_chalk13.default.underline(
             `https://dash.cloudflare.com/${accountId}/workers/overview`
           )
         )} to unassign a worker from a route.`;
@@ -152702,9 +152784,9 @@ async function startDev(args) {
     await printWranglerBanner();
     if (args.local && process.platform !== "win32") {
       logger.info(
-        import_chalk13.default.magenta(
+        import_chalk14.default.magenta(
           `Want to try out the next version of local mode using the open-source Workers runtime?
-Switch out --local for ${import_chalk13.default.bold(
+Switch out --local for ${import_chalk14.default.bold(
             "--experimental-local"
           )} and let us know what you think at https://discord.gg/cloudflaredev !`
         )