wrangler 2.0.9 → 2.0.11

package/wrangler-dist/cli.js

@@ -116942,7 +116942,7 @@ var yargs_default = Yargs;
 
 // package.json
 var name = "wrangler";
-var version = "2.0.9";
+var version = "2.0.11";
 var author = "wrangler@cloudflare.com";
 var description = "Command-line interface for all things Cloudflare Workers";
 var bin = {
@@ -118217,9 +118217,13 @@ var isStringArray = (diagnostics, field, value) => {
 };
 var isObjectWith = (...properties) => (diagnostics, field, value) => {
   if (value !== void 0 && (typeof value !== "object" || value === null || !properties.every((prop) => prop in value))) {
-    diagnostics.errors.push(`Expected "${field}" to be of type object, containing properties ${properties}, but got ${JSON.stringify(value)}.`);
+    diagnostics.errors.push(`Expected "${field}" to be of type object, containing only properties ${properties}, but got ${JSON.stringify(value)}.`);
     return false;
   }
+  if (value !== void 0) {
+    const restFields = Object.keys(value).filter((key2) => !properties.includes(key2));
+    validateAdditionalProperties(diagnostics, field, restFields, []);
+  }
   return true;
 };
 var isOneOf = (...choices) => (diagnostics, field, value) => {
@@ -118392,8 +118396,8 @@ Consider adding an environment configuration section to the wrangler.toml file:
   return { config, diagnostics };
 }
 function normalizeAndValidateBuild(diagnostics, rawEnv, rawBuild, configPath) {
-  const { command: command2, cwd: cwd2, watch_dir, upload, ...rest } = rawBuild;
-  const deprecatedUpload = { ...upload };
+  const { command: command2, cwd: cwd2, watch_dir, upload: upload2, ...rest } = rawBuild;
+  const deprecatedUpload = { ...upload2 };
   validateAdditionalProperties(diagnostics, "build", Object.keys(rest), []);
   validateOptionalProperty(diagnostics, "build", "command", command2, "string");
   validateOptionalProperty(diagnostics, "build", "cwd", cwd2, "string");
@@ -120999,27 +121003,36 @@ async function syncAssets(accountId, scriptName, siteAssets, preview, dryRun) {
   const namespaceKeysResponse = await listKVNamespaceKeys(accountId, namespace);
   const namespaceKeys = new Set(namespaceKeysResponse.map((x) => x.name));
   const manifest = {};
-  const toUpload = [];
+  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 = path13.join(siteAssets.baseDirectory, siteAssets.assetDirectory);
   for await (const absAssetFile of getFilesInFolder(assetDirectory)) {
-    const assetFile = path13.relative(siteAssets.baseDirectory, absAssetFile);
+    const assetFile = path13.relative(assetDirectory, absAssetFile);
     if (!include(assetFile)) {
       continue;
     }
     if (exclude(assetFile)) {
       continue;
     }
-    await validateAssetSize(absAssetFile, assetFile);
     logger.log(`Reading ${assetFile}...`);
     const content = await (0, import_promises3.readFile)(absAssetFile, "base64");
+    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}...`);
-      toUpload.push({
+      if (uploadBucketSize + assetSize > 100 * 1024 * 1024) {
+        uploadBuckets.push(uploadBucket);
+        uploadBucketSize = 0;
+        uploadBucket = [];
+      }
+      uploadBucketSize += assetSize;
+      uploadBucket.push({
         key: assetKey,
         value: content,
         base64: true
@@ -121028,16 +121041,19 @@ async function syncAssets(accountId, scriptName, siteAssets, preview, dryRun) {
       logger.log(`Skipping - already uploaded.`);
     }
     namespaceKeys.delete(assetKey);
-    const maifestKey = urlSafe(path13.relative(siteAssets.assetDirectory, absAssetFile));
-    manifest[maifestKey] = assetKey;
+    const manifestKey = urlSafe(path13.relative(siteAssets.assetDirectory, absAssetFile));
+    manifest[manifestKey] = assetKey;
   }
+  uploadBuckets.push(uploadBucket);
   for (const key2 of namespaceKeys) {
     logger.log(`Deleting ${key2} from the asset store...`);
   }
-  await Promise.all([
-    putKVBulkKeyValue(accountId, namespace, toUpload),
-    deleteKVBulkKeyValue(accountId, namespace, Array.from(namespaceKeys))
-  ]);
+  const bucketsToPut = [];
+  for (const bucket of uploadBuckets) {
+    bucketsToPut.push(putKVBulkKeyValue(accountId, namespace, bucket));
+  }
+  await Promise.all(bucketsToPut);
+  await deleteKVBulkKeyValue(accountId, namespace, Array.from(namespaceKeys));
   logger.log("\u2197\uFE0F  Done syncing assets");
   return { manifest, namespace };
 }
@@ -123393,6 +123409,197 @@ async function buildFunctions({
     }));
   }
 }
+var upload = async ({
+  directory,
+  accountId,
+  projectName
+}) => {
+  const IGNORE_LIST = [
+    "_worker.js",
+    "_redirects",
+    "_headers",
+    ".DS_Store",
+    "node_modules",
+    ".git"
+  ];
+  const walk = async (dir, fileMap2 = /* @__PURE__ */ new Map(), depth = 0) => {
+    const files3 = await (0, import_promises9.readdir)(dir);
+    await Promise.all(files3.map(async (file) => {
+      const filepath = (0, import_node_path19.join)(dir, file);
+      const filestat = await (0, import_promises9.stat)(filepath);
+      if (IGNORE_LIST.includes(file)) {
+        return;
+      }
+      if (filestat.isSymbolicLink()) {
+        return;
+      }
+      if (filestat.isDirectory()) {
+        fileMap2 = await walk(filepath, fileMap2, depth + 1);
+      } else {
+        let name2;
+        if (depth) {
+          name2 = filepath.split(import_node_path19.sep).slice(1).join("/");
+        } else {
+          name2 = file;
+        }
+        const fileContent = await (0, import_promises9.readFile)(filepath);
+        const base64Content = fileContent.toString("base64");
+        const extension = (0, import_node_path19.extname)((0, import_node_path19.basename)(name2)).substring(1);
+        if (filestat.size > 25 * 1024 * 1024) {
+          throw new Error(`Error: Pages only supports files up to ${prettyBytes(25 * 1024 * 1024)} in size
+${name2} is ${prettyBytes(filestat.size)} in size`);
+        }
+        fileMap2.set(name2, {
+          content: base64Content,
+          contentType: (0, import_mime.getType)(name2) || "application/octet-stream",
+          sizeInBytes: filestat.size,
+          hash: (0, import_blake3_wasm.hash)(base64Content + extension).toString("hex").slice(0, 32)
+        });
+      }
+    }));
+    return fileMap2;
+  };
+  const fileMap = await walk(directory);
+  if (fileMap.size > 2e4) {
+    throw new FatalError(`Error: Pages only supports up to 20,000 files in a deployment. Ensure you have specified your build output directory correctly.`, 1);
+  }
+  const files2 = [...fileMap.values()];
+  async function fetchJwt() {
+    return (await fetchResult(`/accounts/${accountId}/pages/projects/${projectName}/upload-token`)).jwt;
+  }
+  let jwt = await fetchJwt();
+  const start = Date.now();
+  const missingHashes = await fetchResult(`/pages/assets/check-missing`, {
+    method: "POST",
+    headers: {
+      "Content-Type": "application/json",
+      Authorization: `Bearer ${jwt}`
+    },
+    body: JSON.stringify({
+      hashes: files2.map(({ hash: hash2 }) => hash2)
+    })
+  });
+  const sortedFiles = files2.filter((file) => missingHashes.includes(file.hash)).sort((a, b) => b.sizeInBytes - a.sizeInBytes);
+  const buckets = new Array(BULK_UPLOAD_CONCURRENCY).fill(null).map(() => ({
+    files: [],
+    remainingSize: MAX_BUCKET_SIZE
+  }));
+  let bucketOffset = 0;
+  for (const file of sortedFiles) {
+    let inserted = false;
+    for (let i2 = 0; i2 < buckets.length; i2++) {
+      const bucket = buckets[(i2 + bucketOffset) % buckets.length];
+      if (bucket.remainingSize >= file.sizeInBytes && bucket.files.length < MAX_BUCKET_FILE_COUNT) {
+        bucket.files.push(file);
+        bucket.remainingSize -= file.sizeInBytes;
+        inserted = true;
+        break;
+      }
+    }
+    if (!inserted) {
+      buckets.push({
+        files: [file],
+        remainingSize: MAX_BUCKET_SIZE - file.sizeInBytes
+      });
+    }
+    bucketOffset++;
+  }
+  let counter = fileMap.size - sortedFiles.length;
+  const { rerender, unmount } = (0, import_ink5.render)(/* @__PURE__ */ import_react9.default.createElement(Progress, {
+    done: counter,
+    total: fileMap.size
+  }));
+  const queue = new PQueue({ concurrency: BULK_UPLOAD_CONCURRENCY });
+  for (const bucket of buckets) {
+    if (bucket.files.length === 0)
+      continue;
+    const payload = bucket.files.map((file) => ({
+      key: file.hash,
+      value: file.content,
+      metadata: {
+        contentType: file.contentType
+      },
+      base64: true
+    }));
+    let attempts = 0;
+    const doUpload = async () => {
+      try {
+        return await fetchResult(`/pages/assets/upload`, {
+          method: "POST",
+          headers: {
+            "Content-Type": "application/json",
+            Authorization: `Bearer ${jwt}`
+          },
+          body: JSON.stringify(payload)
+        });
+      } catch (e2) {
+        if (attempts < MAX_UPLOAD_ATTEMPTS) {
+          await new Promise((resolve11) => setTimeout(resolve11, attempts++ * 1e3));
+          if (e2.code === 8000013) {
+            jwt = await fetchJwt();
+          }
+          return doUpload();
+        } else {
+          throw e2;
+        }
+      }
+    };
+    queue.add(() => doUpload().then(() => {
+      counter += bucket.files.length;
+      rerender(/* @__PURE__ */ import_react9.default.createElement(Progress, {
+        done: counter,
+        total: fileMap.size
+      }));
+    }, (error) => {
+      return Promise.reject(new FatalError("Failed to upload files. Please try again.", error.code || 1));
+    }));
+  }
+  await queue.onIdle();
+  unmount();
+  const uploadMs = Date.now() - start;
+  const skipped = fileMap.size - missingHashes.length;
+  const skippedMessage = skipped > 0 ? `(${skipped} already uploaded) ` : "";
+  logger.log(`\u2728 Success! Uploaded ${sortedFiles.length} files ${skippedMessage}${formatTime(uploadMs)}
+`);
+  const doUpsertHashes = async () => {
+    try {
+      return await fetchResult(`/pages/assets/upsert-hashes`, {
+        method: "POST",
+        headers: {
+          "Content-Type": "application/json",
+          Authorization: `Bearer ${jwt}`
+        },
+        body: JSON.stringify({
+          hashes: files2.map(({ hash: hash2 }) => hash2)
+        })
+      });
+    } catch (e2) {
+      await new Promise((resolve11) => setTimeout(resolve11, 1e3));
+      if (e2.code === 8000013) {
+        jwt = await fetchJwt();
+      }
+      return await fetchResult(`/pages/assets/upsert-hashes`, {
+        method: "POST",
+        headers: {
+          "Content-Type": "application/json",
+          Authorization: `Bearer ${jwt}`
+        },
+        body: JSON.stringify({
+          hashes: files2.map(({ hash: hash2 }) => hash2)
+        })
+      });
+    }
+  };
+  try {
+    await doUpsertHashes();
+  } catch {
+    logger.warn("Failed to update file hashes. Every upload appeared to succeed for this deployment, but you might need to re-upload for future deployments. This shouldn't have any impact other than slowing the upload speed of your next deployment.");
+  }
+  return Object.fromEntries([...fileMap.entries()].map(([fileName, file]) => [
+    `/${fileName}`,
+    file.hash
+  ]));
+};
 var createDeployment = {
   describe: "\u{1F199} Publish a directory of static assets as a Pages deployment",
   builder: (yargs) => {
@@ -123443,7 +123650,7 @@ var createDeployment = {
       let existingOrNew = "new";
       if (projects.length > 0) {
         existingOrNew = await new Promise((resolve11) => {
-          const { unmount: unmount2 } = (0, import_ink5.render)(/* @__PURE__ */ import_react9.default.createElement(import_react9.default.Fragment, null, /* @__PURE__ */ import_react9.default.createElement(import_ink5.Text, null, "No project selected. Would you like to create one or use an existing project?"), /* @__PURE__ */ import_react9.default.createElement(import_ink_select_input3.default, {
+          const { unmount } = (0, import_ink5.render)(/* @__PURE__ */ import_react9.default.createElement(import_react9.default.Fragment, null, /* @__PURE__ */ import_react9.default.createElement(import_ink5.Text, null, "No project selected. Would you like to create one or use an existing project?"), /* @__PURE__ */ import_react9.default.createElement(import_ink_select_input3.default, {
             items: [
               {
                 key: "new",
@@ -123458,7 +123665,7 @@ var createDeployment = {
             ],
             onSelect: async (selected) => {
               resolve11(selected.value);
-              unmount2();
+              unmount();
             }
           })));
         });
@@ -123466,7 +123673,7 @@ var createDeployment = {
       switch (existingOrNew) {
         case "existing": {
           projectName = await new Promise((resolve11) => {
-            const { unmount: unmount2 } = (0, import_ink5.render)(/* @__PURE__ */ import_react9.default.createElement(import_react9.default.Fragment, null, /* @__PURE__ */ import_react9.default.createElement(import_ink5.Text, null, "Select a project:"), /* @__PURE__ */ import_react9.default.createElement(import_ink_select_input3.default, {
+            const { unmount } = (0, import_ink5.render)(/* @__PURE__ */ import_react9.default.createElement(import_react9.default.Fragment, null, /* @__PURE__ */ import_react9.default.createElement(import_ink5.Text, null, "Select a project:"), /* @__PURE__ */ import_react9.default.createElement(import_ink_select_input3.default, {
               items: projects.map((project) => ({
                 key: project.name,
                 label: project.name,
@@ -123474,7 +123681,7 @@ var createDeployment = {
               })),
               onSelect: async (selected) => {
                 resolve11(selected.value.name);
-                unmount2();
+                unmount();
               }
             })));
           });
@@ -123559,156 +123766,9 @@ To silence this warning, pass in --commit-dirty=true`);
       }));
       builtFunctions = (0, import_node_fs7.readFileSync)(outfile, "utf-8");
     }
-    const IGNORE_LIST = [
-      "_worker.js",
-      "_redirects",
-      "_headers",
-      ".DS_Store",
-      "node_modules",
-      ".git"
-    ];
-    const walk = async (dir, fileMap2 = /* @__PURE__ */ new Map(), depth = 0) => {
-      const files3 = await (0, import_promises9.readdir)(dir);
-      await Promise.all(files3.map(async (file) => {
-        const filepath = (0, import_node_path19.join)(dir, file);
-        const filestat = await (0, import_promises9.stat)(filepath);
-        if (IGNORE_LIST.includes(file)) {
-          return;
-        }
-        if (filestat.isSymbolicLink()) {
-          return;
-        }
-        if (filestat.isDirectory()) {
-          fileMap2 = await walk(filepath, fileMap2, depth + 1);
-        } else {
-          let name2;
-          if (depth) {
-            name2 = filepath.split(import_node_path19.sep).slice(1).join("/");
-          } else {
-            name2 = file;
-          }
-          const fileContent = await (0, import_promises9.readFile)(filepath);
-          const base64Content = fileContent.toString("base64");
-          const extension = (0, import_node_path19.extname)((0, import_node_path19.basename)(name2)).substring(1);
-          if (filestat.size > 25 * 1024 * 1024) {
-            throw new Error(`Error: Pages only supports files up to ${prettyBytes(25 * 1024 * 1024)} in size
-${name2} is ${prettyBytes(filestat.size)} in size`);
-          }
-          fileMap2.set(name2, {
-            content: base64Content,
-            contentType: (0, import_mime.getType)(name2) || "application/octet-stream",
-            sizeInBytes: filestat.size,
-            hash: (0, import_blake3_wasm.hash)(base64Content + extension).toString("hex").slice(0, 32)
-          });
-        }
-      }));
-      return fileMap2;
-    };
-    const fileMap = await walk(directory);
-    if (fileMap.size > 2e4) {
-      throw new FatalError(`Error: Pages only supports up to 20,000 files in a deployment. Ensure you have specified your build output directory correctly.`, 1);
-    }
-    const files2 = [...fileMap.values()];
-    async function fetchJwt() {
-      return (await fetchResult(`/accounts/${accountId}/pages/projects/${projectName}/upload-token`)).jwt;
-    }
-    let jwt = await fetchJwt();
-    const start = Date.now();
-    const missingHashes = await fetchResult(`/pages/assets/check-missing`, {
-      method: "POST",
-      headers: {
-        "Content-Type": "application/json",
-        Authorization: `Bearer ${jwt}`
-      },
-      body: JSON.stringify({
-        hashes: files2.map(({ hash: hash2 }) => hash2)
-      })
-    });
-    const sortedFiles = files2.filter((file) => missingHashes.includes(file.hash)).sort((a, b) => b.sizeInBytes - a.sizeInBytes);
-    const buckets = new Array(BULK_UPLOAD_CONCURRENCY).fill(null).map(() => ({
-      files: [],
-      remainingSize: MAX_BUCKET_SIZE
-    }));
-    let bucketOffset = 0;
-    for (const file of sortedFiles) {
-      let inserted = false;
-      for (let i2 = 0; i2 < buckets.length; i2++) {
-        const bucket = buckets[(i2 + bucketOffset) % buckets.length];
-        if (bucket.remainingSize >= file.sizeInBytes && bucket.files.length < MAX_BUCKET_FILE_COUNT) {
-          bucket.files.push(file);
-          bucket.remainingSize -= file.sizeInBytes;
-          inserted = true;
-          break;
-        }
-      }
-      if (!inserted) {
-        buckets.push({
-          files: [file],
-          remainingSize: MAX_BUCKET_SIZE - file.sizeInBytes
-        });
-      }
-      bucketOffset++;
-    }
-    let counter = fileMap.size - sortedFiles.length;
-    const { rerender, unmount } = (0, import_ink5.render)(/* @__PURE__ */ import_react9.default.createElement(Progress, {
-      done: counter,
-      total: fileMap.size
-    }));
-    const queue = new PQueue({ concurrency: BULK_UPLOAD_CONCURRENCY });
-    for (const bucket of buckets) {
-      if (bucket.files.length === 0)
-        continue;
-      const payload = bucket.files.map((file) => ({
-        key: file.hash,
-        value: file.content,
-        metadata: {
-          contentType: file.contentType
-        },
-        base64: true
-      }));
-      let attempts = 0;
-      const doUpload = async () => {
-        try {
-          return await fetchResult(`/pages/assets/upload`, {
-            method: "POST",
-            headers: {
-              "Content-Type": "application/json",
-              Authorization: `Bearer ${jwt}`
-            },
-            body: JSON.stringify(payload)
-          });
-        } catch (e2) {
-          if (attempts < MAX_UPLOAD_ATTEMPTS) {
-            await new Promise((resolve11) => setTimeout(resolve11, attempts++ * 1e3));
-            if (e2.code === 8000013) {
-              jwt = await fetchJwt();
-            }
-            return doUpload();
-          } else {
-            throw e2;
-          }
-        }
-      };
-      queue.add(() => doUpload().then(() => {
-        counter += bucket.files.length;
-        rerender(/* @__PURE__ */ import_react9.default.createElement(Progress, {
-          done: counter,
-          total: fileMap.size
-        }));
-      }, (error) => {
-        return Promise.reject(new FatalError("Failed to upload files. Please try again.", error.code || 1));
-      }));
-    }
-    await queue.onIdle();
-    unmount();
-    const uploadMs = Date.now() - start;
-    logger.log(`\u2728 Success! Uploaded ${fileMap.size} files ${formatTime(uploadMs)}
-`);
+    const manifest = await upload({ directory, accountId, projectName });
     const formData = new import_undici6.FormData();
-    formData.append("manifest", JSON.stringify(Object.fromEntries([...fileMap.entries()].map(([fileName, file]) => [
-      `/${fileName}`,
-      file.hash
-    ]))));
+    formData.append("manifest", JSON.stringify(manifest));
     if (branch) {
       formData.append("branch", branch);
     }