wrangler 2.0.23 → 2.0.26

package/README.md

@@ -39,11 +39,25 @@ npm run deploy
 $ npm install wrangler --save-dev
 ```
 
+## Configuration:
+
+Wrangler is configured via a `wrangler.toml` file in the project root. When utilizing the `wrangler init` command, a `wrangler.toml` file will be created for you.
+
+example:
+
+```toml
+main = "./src/index.ts" # init w/ TypeScript
+name = "my-worker"
+compatibility_date = "YYY-MM-DD"
+```
+
+for more detailed information about configuration, see the [documentation](https://developers.cloudflare.com/workers/cli-wrangler/configuration)
+
 ## Commands
 
 ### `wrangler init [name]`
 
-Creates a Worker project. For details on configuration keys and values, refer to the [documentation](https://developers.cloudflare.com/workers/cli-wrangler/configuration).
+Creates a Worker project. For details on configuration keys and values, refer to the [documentation](https://developers.cloudflare.com/workers/wrangler/commands/#init).
 
 ### `wrangler dev`
 
@@ -67,4 +81,8 @@ For more commands and options, refer to the [documentation](https://developers.c
 
 ## Documentation
 
-For the latest Wrangler documentation, [click here](https://6b05b6e1.cloudflare-docs-7ou.pages.dev/workers/wrangler/).
+For the latest Wrangler documentation, [click here](https://developers.cloudflare.com/workers/wrangler/).
+
+```
+
+```

package/bin/wrangler.js

@@ -35,7 +35,7 @@ Consider using a Node.js version manager such as https://volta.sh/ or https://gi
 		// - maybe we can generate a certificate that concatenates with ours?
 		//
 		//  I do think it'll be rare that someone wants to add a cert AND
-		//  use cloudflare WARP, but let's wait till the situation actually
+		//  use Cloudflare WARP, but let's wait till the situation actually
 		//  arises before we do anything about it
 	} else {
 		const osTempDir = os.tmpdir();

package/miniflare-dist/index.mjs

@@ -22,7 +22,10 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target, mod));
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
 
 // ../../node_modules/mime/Mime.js
 var require_Mime = __commonJS({
@@ -50,7 +53,9 @@ var require_Mime = __commonJS({
             continue;
           }
           if (!force && ext in this._types) {
-            throw new Error('Attempt to change mapping for "' + ext + '" extension from "' + this._types[ext] + '" to "' + type + '". Pass `force=true` to allow this, otherwise remove "' + ext + '" from the list of extensions for "' + type + '".');
+            throw new Error(
+              'Attempt to change mapping for "' + ext + '" extension from "' + this._types[ext] + '" to "' + type + '". Pass `force=true` to allow this, otherwise remove "' + ext + '" from the list of extensions for "' + type + '".'
+            );
           }
           this._types[ext] = type;
         }
@@ -100,7 +105,18 @@ var require_mime = __commonJS({
 });
 
 // src/miniflare-cli/index.ts
-import { Log, LogLevel, Miniflare } from "miniflare";
+import { fetch } from "@miniflare/core";
+import {
+  DurableObjectNamespace,
+  DurableObjectStub
+} from "@miniflare/durable-objects";
+import {
+  Log,
+  LogLevel,
+  Miniflare,
+  Response as MiniflareResponse,
+  Request as MiniflareRequest
+} from "miniflare";
 
 // ../../node_modules/yargs/lib/platform-shims/esm.mjs
 import { notStrictEqual, strictEqual } from "assert";
@@ -4909,6 +4925,14 @@ function isYargsInstance(y) {
 var Yargs = YargsFactory(esm_default);
 var yargs_default = Yargs;
 
+// src/errors.ts
+var FatalError = class extends Error {
+  constructor(message, code) {
+    super(message);
+    this.code = code;
+  }
+};
+
 // src/miniflare-cli/assets.ts
 var import_mime = __toESM(require_mime());
 import { existsSync, lstatSync, readFileSync as readFileSync4 } from "node:fs";
@@ -4935,7 +4959,10 @@ async function generateASSETSBinding(options) {
         return await assetsFetch(request);
       } catch (thrown) {
         options.log.error(new Error(`Could not serve static asset: ${thrown}`));
-        return new Response(`[wrangler] Could not serve static asset: ${thrown}`, { status: 502 });
+        return new Response(
+          `[wrangler] Could not serve static asset: ${thrown}`,
+          { status: 502 }
+        );
       }
     }
   };
@@ -4955,7 +4982,9 @@ function generateRulesMatcher(rules, replacerFn = (match) => match) {
   const compiledRules = Object.entries(rules).map(([rule, match]) => {
     const crossHost = rule.startsWith("https://");
     rule = rule.split("*").map(escapeRegex).join("(?<splat>.*)");
-    const host_matches = rule.matchAll(/(?<=^https:\\\/\\\/[^/]*?):([^\\]+)(?=\\)/g);
+    const host_matches = rule.matchAll(
+      /(?<=^https:\\\/\\\/[^/]*?):([^\\]+)(?=\\)/g
+    );
     for (const hostMatch of host_matches) {
       rule = rule.split(hostMatch[0]).join(`(?<${hostMatch[1]}>[^/.]+)`);
     }
@@ -5016,10 +5045,15 @@ function generateHeadersMatcher(headersFile) {
     if (rule && Object.keys(rule.headers).length > 0) {
       rules[rule.path] = rule.headers;
     }
-    const rulesMatcher = generateRulesMatcher(rules, (match, replacements) => Object.fromEntries(Object.entries(match).map(([name, value]) => [
-      name,
-      replacer(value, replacements)
-    ])));
+    const rulesMatcher = generateRulesMatcher(
+      rules,
+      (match, replacements) => Object.fromEntries(
+        Object.entries(match).map(([name, value]) => [
+          name,
+          replacer(value, replacements)
+        ])
+      )
+    );
     return (request) => {
       const matches = rulesMatcher({
         request
@@ -5035,17 +5069,22 @@ function generateRedirectsMatcher(redirectsFile) {
   if (existsSync(redirectsFile)) {
     const contents = readFileSync4(redirectsFile).toString();
     const lines = contents.split("\n").map((line) => line.trim()).filter((line) => !line.startsWith("#") && line !== "");
-    const rules = Object.fromEntries(lines.map((line) => line.split(" ")).filter((tokens) => tokens.length === 2 || tokens.length === 3).map((tokens) => {
-      const from = validateURL(tokens[0], true, false, false);
-      const to = validateURL(tokens[1], false, true, true);
-      let status = parseInt(tokens[2]) || 302;
-      status = [301, 302, 303, 307, 308].includes(status) ? status : void 0;
-      return from && to && status ? [from, { to, status }] : void 0;
-    }).filter((rule) => rule !== void 0));
-    const rulesMatcher = generateRulesMatcher(rules, ({ status, to }, replacements) => ({
-      status,
-      to: replacer(to, replacements)
-    }));
+    const rules = Object.fromEntries(
+      lines.map((line) => line.split(" ")).filter((tokens) => tokens.length === 2 || tokens.length === 3).map((tokens) => {
+        const from = validateURL(tokens[0], true, false, false);
+        const to = validateURL(tokens[1], false, true, true);
+        let status = parseInt(tokens[2]) || 302;
+        status = [301, 302, 303, 307, 308].includes(status) ? status : void 0;
+        return from && to && status ? [from, { to, status }] : void 0;
+      }).filter((rule) => rule !== void 0)
+    );
+    const rulesMatcher = generateRulesMatcher(
+      rules,
+      ({ status, to }, replacements) => ({
+        status,
+        to: replacer(to, replacements)
+      })
+    );
     return (request) => {
       const match = rulesMatcher({
         request
@@ -5068,7 +5107,11 @@ function validateURL(token, onlyRelative = false, includeSearch = false, include
   if (host && host.groups && host.groups.host) {
     if (onlyRelative)
       return;
-    return `https://${host.groups.host}${extractPathname(host.groups.path, includeSearch, includeHash)}`;
+    return `https://${host.groups.host}${extractPathname(
+      host.groups.path,
+      includeSearch,
+      includeHash
+    )}`;
   } else {
     if (!token.startsWith("/") && onlyRelative)
       token = `/${token}`;
@@ -5123,6 +5166,11 @@ async function generateAssetsFetch(directory, log) {
   };
   const generateResponse = (request) => {
     const url = new URL(request.url);
+    let assetName = url.pathname;
+    try {
+      assetName = decodeURIComponent(url.pathname);
+    } catch {
+    }
     const deconstructedResponse = {
       status: 200,
       headers: new Headers(),
@@ -5152,70 +5200,108 @@ async function generateAssetsFetch(directory, log) {
       return deconstructedResponse;
     }
     const notFound = () => {
-      let cwd = url.pathname;
+      let cwd = assetName;
       while (cwd) {
         cwd = cwd.slice(0, cwd.lastIndexOf("/"));
         if (asset = getAsset(`${cwd}/404.html`)) {
           deconstructedResponse.status = 404;
           deconstructedResponse.body = serveAsset(asset);
-          deconstructedResponse.headers.set("Content-Type", (0, import_mime.getType)(asset) || "application/octet-stream");
+          deconstructedResponse.headers.set(
+            "Content-Type",
+            (0, import_mime.getType)(asset) || "application/octet-stream"
+          );
           return deconstructedResponse;
         }
       }
       if (asset = getAsset(`/index.html`)) {
         deconstructedResponse.body = serveAsset(asset);
-        deconstructedResponse.headers.set("Content-Type", (0, import_mime.getType)(asset) || "application/octet-stream");
+        deconstructedResponse.headers.set(
+          "Content-Type",
+          (0, import_mime.getType)(asset) || "application/octet-stream"
+        );
         return deconstructedResponse;
       }
       deconstructedResponse.status = 404;
       return deconstructedResponse;
     };
     let asset;
-    if (url.pathname.endsWith("/")) {
-      if (asset = getAsset(`${url.pathname}/index.html`)) {
+    if (assetName.endsWith("/")) {
+      if (asset = getAsset(`${assetName}/index.html`)) {
         deconstructedResponse.body = serveAsset(asset);
-        deconstructedResponse.headers.set("Content-Type", (0, import_mime.getType)(asset) || "application/octet-stream");
+        deconstructedResponse.headers.set(
+          "Content-Type",
+          (0, import_mime.getType)(asset) || "application/octet-stream"
+        );
         return deconstructedResponse;
-      } else if (asset = getAsset(`${url.pathname.replace(/\/$/, ".html")}`)) {
+      } else if (asset = getAsset(`${assetName.replace(/\/$/, ".html")}`)) {
         deconstructedResponse.status = 301;
-        deconstructedResponse.headers.set("Location", `${url.pathname.slice(0, -1)}${url.search}`);
+        deconstructedResponse.headers.set(
+          "Location",
+          `${assetName.slice(0, -1)}${url.search}`
+        );
         return deconstructedResponse;
       }
     }
-    if (url.pathname.endsWith("/index")) {
+    if (assetName.endsWith("/index")) {
       deconstructedResponse.status = 301;
-      deconstructedResponse.headers.set("Location", `${url.pathname.slice(0, -"index".length)}${url.search}`);
+      deconstructedResponse.headers.set(
+        "Location",
+        `${assetName.slice(0, -"index".length)}${url.search}`
+      );
       return deconstructedResponse;
     }
-    if (asset = getAsset(url.pathname)) {
-      if (url.pathname.endsWith(".html")) {
-        const extensionlessPath = url.pathname.slice(0, -".html".length);
+    if (asset = getAsset(assetName)) {
+      if (assetName.endsWith(".html")) {
+        const extensionlessPath = assetName.slice(0, -".html".length);
         if (getAsset(extensionlessPath) || extensionlessPath === "/") {
           deconstructedResponse.body = serveAsset(asset);
-          deconstructedResponse.headers.set("Content-Type", (0, import_mime.getType)(asset) || "application/octet-stream");
+          deconstructedResponse.headers.set(
+            "Content-Type",
+            (0, import_mime.getType)(asset) || "application/octet-stream"
+          );
           return deconstructedResponse;
         } else {
           deconstructedResponse.status = 301;
-          deconstructedResponse.headers.set("Location", `${extensionlessPath}${url.search}`);
+          deconstructedResponse.headers.set(
+            "Location",
+            `${extensionlessPath}${url.search}`
+          );
           return deconstructedResponse;
         }
       } else {
         deconstructedResponse.body = serveAsset(asset);
-        deconstructedResponse.headers.set("Content-Type", (0, import_mime.getType)(asset) || "application/octet-stream");
+        deconstructedResponse.headers.set(
+          "Content-Type",
+          (0, import_mime.getType)(asset) || "application/octet-stream"
+        );
+        return deconstructedResponse;
+      }
+    } else if (hasFileExtension(assetName)) {
+      if (asset = getAsset(assetName + ".html")) {
+        deconstructedResponse.body = serveAsset(asset);
+        deconstructedResponse.headers.set(
+          "Content-Type",
+          (0, import_mime.getType)(asset) || "application/octet-stream"
+        );
         return deconstructedResponse;
       }
-    } else if (hasFileExtension(url.pathname)) {
       notFound();
       return deconstructedResponse;
     }
-    if (asset = getAsset(`${url.pathname}.html`)) {
+    if (asset = getAsset(`${assetName}.html`)) {
       deconstructedResponse.body = serveAsset(asset);
-      deconstructedResponse.headers.set("Content-Type", (0, import_mime.getType)(asset) || "application/octet-stream");
+      deconstructedResponse.headers.set(
+        "Content-Type",
+        (0, import_mime.getType)(asset) || "application/octet-stream"
+      );
       return deconstructedResponse;
     }
-    if (asset = getAsset(`${url.pathname}/index.html`)) {
+    if (asset = getAsset(`${assetName}/index.html`)) {
       deconstructedResponse.status = 301;
-      deconstructedResponse.headers.set("Location", `${url.pathname}/${url.search}`);
+      deconstructedResponse.headers.set(
+        "Location",
+        `${assetName}/${url.search}`
+      );
       return deconstructedResponse;
     } else {
       notFound();
@@ -5257,13 +5343,17 @@ async function generateAssetsFetch(directory, log) {
   };
 }
 var invalidAssetsFetch = () => {
-  throw new Error("Trying to fetch assets directly when there is no `directory` option specified.");
+  throw new Error(
+    "Trying to fetch assets directly when there is no `directory` option specified."
+  );
 };
 
 // src/miniflare-cli/enum-keys.ts
 var enumObject = (e) => {
   const copy = { ...e };
-  Object.values(e).forEach((value) => typeof value === "number" && delete copy[value]);
+  Object.values(e).forEach(
+    (value) => typeof value === "number" && delete copy[value]
+  );
   return copy;
 };
 var enumKeys = (e) => {
@@ -5311,12 +5401,53 @@ async function main() {
   if (logLevel > LogLevel.INFO) {
     console.log("OPTIONS:\n", JSON.stringify(config, null, 2));
   }
+  config.bindings = {
+    ...config.bindings,
+    ...Object.fromEntries(
+      Object.entries(
+        config.externalDurableObjects
+      ).map(([binding, { name, host, port }]) => {
+        const factory = () => {
+          throw new FatalError(
+            "An external Durable Object instance's state has somehow been attempted to be accessed.",
+            1
+          );
+        };
+        const namespace = new DurableObjectNamespace(name, factory);
+        namespace.get = (id) => {
+          const stub = new DurableObjectStub(factory, id);
+          stub.fetch = (...reqArgs) => {
+            const requestFromArgs = new MiniflareRequest(...reqArgs);
+            const url = new URL(requestFromArgs.url);
+            url.host = host;
+            if (port !== void 0)
+              url.port = port.toString();
+            const request = new MiniflareRequest(
+              url.toString(),
+              requestFromArgs
+            );
+            request.headers.set("x-miniflare-durable-object-name", name);
+            request.headers.set("x-miniflare-durable-object-id", id.toString());
+            return fetch(request);
+          };
+          return stub;
+        };
+        return [binding, namespace];
+      })
+    )
+  };
   let mf;
+  let durableObjectsMf = void 0;
+  let durableObjectsMfPort = void 0;
   try {
     if (args._[1]) {
-      const opts = JSON.parse(args._[1]);
+      const opts = JSON.parse(
+        args._[1]
+      );
       if (isNaN(opts.proxyPort || NaN) && !opts.directory) {
-        throw new Error("MiniflareCLIOptions: built in service bindings set to true, but no port or directory provided");
+        throw new Error(
+          "MiniflareCLIOptions: built in service bindings set to true, but no port or directory provided"
+        );
       }
       const options = {
         log: config.log,
@@ -5331,11 +5462,68 @@ async function main() {
     mf = new Miniflare(config);
     await mf.startServer();
     await mf.startScheduler();
-    process.send && process.send("ready");
+    const internalDurableObjectClassNames = Object.values(
+      config.durableObjects
+    );
+    if (internalDurableObjectClassNames.length > 0) {
+      durableObjectsMf = new Miniflare({
+        host: config.host,
+        port: 0,
+        script: `
+				export default {
+					fetch(request, env) {
+						return env.DO.fetch(request)
+					}
+				}`,
+        serviceBindings: {
+          DO: async (request) => {
+            request = new MiniflareRequest(request);
+            const name = request.headers.get("x-miniflare-durable-object-name");
+            const idString = request.headers.get(
+              "x-miniflare-durable-object-id"
+            );
+            request.headers.delete("x-miniflare-durable-object-name");
+            request.headers.delete("x-miniflare-durable-object-id");
+            if (!name || !idString) {
+              return new MiniflareResponse(
+                "[durable-object-proxy-err] Missing `x-miniflare-durable-object-name` or `x-miniflare-durable-object-id` headers.",
+                { status: 400 }
+              );
+            }
+            const namespace = await mf?.getDurableObjectNamespace(name);
+            const id = namespace?.idFromString(idString);
+            if (!id) {
+              return new MiniflareResponse(
+                "[durable-object-proxy-err] Could not generate an ID. Possibly due to a mismatched DO name and ID?",
+                { status: 500 }
+              );
+            }
+            const stub = namespace?.get(id);
+            if (!stub) {
+              return new MiniflareResponse(
+                "[durable-object-proxy-err] Could not generate a stub. Possibly due to a mismatched DO name and ID?",
+                { status: 500 }
+              );
+            }
+            return stub.fetch(request);
+          }
+        },
+        modules: true
+      });
+      const server = await durableObjectsMf.startServer();
+      durableObjectsMfPort = server.address().port;
+    }
+    process.send && process.send(
+      JSON.stringify({
+        ready: true,
+        durableObjectsPort: durableObjectsMfPort
+      })
+    );
   } catch (e) {
     mf?.log.error(e);
     process.exitCode = 1;
     await mf?.dispose();
+    await durableObjectsMf?.dispose();
   }
 }
 await main();

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "wrangler",
-	"version": "2.0.23",
+	"version": "2.0.26",
 	"description": "Command-line interface for all things Cloudflare Workers",
 	"keywords": [
 		"wrangler",
@@ -52,16 +52,16 @@
 		"build": "npm run clean && npm run bundle && npm run emit-types",
 		"bundle": "node -r esbuild-register scripts/bundle.ts",
 		"check:type": "tsc",
-		"clean": "rm -rf wrangler-dist miniflare-dist emitted-types",
+		"clean": "rimraf wrangler-dist miniflare-dist emitted-types",
 		"dev": "npm run clean && concurrently -c black,blue --kill-others-on-fail false 'npm run bundle -- --watch' 'npm run check:type -- --watch --preserveWatchOutput'",
 		"emit-types": "tsc -p tsconfig.emit.json && node -r esbuild-register scripts/emit-types.ts",
 		"prepublishOnly": "SOURCEMAPS=false npm run build",
-		"start": "npm run bundle && NODE_OPTIONS=--enable-source-maps ./bin/wrangler.js",
+		"start": "npm run bundle && cross-env NODE_OPTIONS=--enable-source-maps ./bin/wrangler.js",
 		"test": "jest --silent=false --verbose=true",
-		"test-watch": "npm run test -- --runInBand --testTimeout=50000 --watch"
+		"test-watch": "npm run test -- --runInBand --testTimeout=50000 --watch",
+		"test:ci": "npm run test -- --verbose=true --coverage"
 	},
 	"jest": {
-		"collectCoverage": true,
 		"coverageReporters": [
 			"json",
 			"html",
@@ -96,17 +96,19 @@
 		"@esbuild-plugins/node-modules-polyfill": "^0.1.4",
 		"blake3-wasm": "^2.1.5",
 		"chokidar": "^3.5.3",
-		"esbuild": "0.14.47",
+		"esbuild": "0.14.51",
 		"miniflare": "^2.6.0",
 		"nanoid": "^3.3.3",
 		"path-to-regexp": "^6.2.0",
 		"selfsigned": "^2.0.1",
+		"source-map": "^0.7.4",
 		"xxhash-wasm": "^1.0.1"
 	},
 	"devDependencies": {
 		"@iarna/toml": "^3.0.0",
 		"@microsoft/api-extractor": "^7.28.3",
 		"@types/command-exists": "^1.2.0",
+		"@types/express": "^4.17.13",
 		"@types/glob-to-regexp": "0.4.1",
 		"@types/mime": "^2.0.3",
 		"@types/prompts": "^2.0.14",
@@ -117,13 +119,16 @@
 		"@types/ws": "^8.5.3",
 		"@types/yargs": "^17.0.10",
 		"@webcontainer/env": "^1.0.1",
+		"body-parser": "^1.20.0",
 		"clipboardy": "^3.0.0",
 		"cmd-shim": "^4.1.0",
 		"command-exists": "^1.2.9",
 		"concurrently": "^7.2.2",
+		"create-cloudflare": "^1.0.0",
 		"devtools-protocol": "^0.0.955664",
 		"dotenv": "^16.0.0",
 		"execa": "^6.1.0",
+		"express": "^4.18.1",
 		"faye-websocket": "^0.11.4",
 		"finalhandler": "^1.2.0",
 		"find-up": "^6.3.0",