wrangler 0.0.0-e1c615f → 0.0.0-e5d3690

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wrangler",
-  "version": "0.0.0-e1c615f",
+  "version": "0.0.0-e5d3690",
   "author": "wrangler@cloudflare.com",
   "description": "Command-line interface for all things Cloudflare Workers",
   "bin": {
@@ -37,9 +37,10 @@
   ],
   "dependencies": {
     "esbuild": "0.14.1",
-    "miniflare": "2.0.0-rc.5",
+    "miniflare": "2.2.0",
     "path-to-regexp": "^6.2.0",
-    "semiver": "^1.1.0"
+    "semiver": "^1.1.0",
+    "xxhash-addon": "^1.4.0"
   },
   "optionalDependencies": {
     "fsevents": "~2.3.2"
@@ -59,18 +60,20 @@
     "chokidar": "^3.5.2",
     "clipboardy": "^3.0.0",
     "command-exists": "^1.2.9",
+    "devtools-protocol": "^0.0.955664",
     "execa": "^6.0.0",
     "faye-websocket": "^0.11.4",
     "finalhandler": "^1.1.2",
     "find-up": "^6.2.0",
     "formdata-node": "^4.3.1",
+    "ignore": "^5.2.0",
     "ink": "^3.2.0",
     "ink-select-input": "^4.2.1",
     "ink-table": "^3.0.0",
     "ink-testing-library": "^2.1.0",
     "ink-text-input": "^4.0.2",
     "mime": "^3.0.0",
-    "node-fetch": "^3.1.0",
+    "node-fetch": "3.1.1",
     "open": "^8.4.0",
     "react": "^17.0.2",
     "react-error-boundary": "^3.1.4",
@@ -96,7 +99,8 @@
     "bundle": "node -r esbuild-register scripts/bundle.ts",
     "build": "npm run clean && npm run bundle",
     "start": "npm run bundle && NODE_OPTIONS=--enable-source-maps ./bin/wrangler.js",
-    "test": "CF_API_TOKEN=some-api-token CF_ACCOUNT_ID=some-account-id jest --silent=false --verbose=true"
+    "test": "CF_API_TOKEN=some-api-token CF_ACCOUNT_ID=some-account-id jest --silent=false --verbose=true",
+    "test-watch": "npm run test -- --runInBand --testTimeout=50000 --watch"
   },
   "engines": {
     "node": ">=16.7.0"

package/pages/functions/buildWorker.ts

@@ -6,6 +6,7 @@ type Options = {
   outfile: string;
   minify?: boolean;
   sourcemap?: boolean;
+  fallbackService?: string;
   watch?: boolean;
   onEnd?: () => void;
 };
@@ -15,6 +16,7 @@ export function buildWorker({
   outfile = "bundle.js",
   minify = false,
   sourcemap = false,
+  fallbackService = "ASSETS",
   watch = false,
   onEnd = () => {},
 }: Options) {
@@ -31,6 +33,9 @@ export function buildWorker({
     sourcemap,
     watch,
     allowOverwrite: true,
+    define: {
+      __FALLBACK_SERVICE__: JSON.stringify(fallbackService),
+    },
     plugins: [
       {
         name: "wrangler notifier and monitor",

package/pages/functions/filepath-routing.ts

@@ -52,7 +52,7 @@ export async function generateConfigFromFileTree({
             const declaration = node.declaration;
 
             // `export async function onRequest() {...}`
-            if (declaration.type === "FunctionDeclaration") {
+            if (declaration.type === "FunctionDeclaration" && declaration.id) {
               exportNames.push(declaration.id.name);
             }
 
@@ -155,12 +155,12 @@ export async function generateConfigFromFileTree({
 // more specific routes aren't occluded from matching due to
 // less specific routes appearing first in the route list.
 export function compareRoutes(a: string, b: string) {
-  function parseRoutePath(routePath: string) {
-    let [method, segmentedPath] = routePath.split(" ");
-    if (!segmentedPath) {
-      segmentedPath = method;
-      method = null;
-    }
+  function parseRoutePath(routePath: string): [string | null, string[]] {
+    const parts = routePath.split(" ", 2);
+    // split() will guarantee at least one element.
+    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+    const segmentedPath = parts.pop()!;
+    const method = parts.pop() ?? null;
 
     const segments = segmentedPath.slice(1).split("/").filter(Boolean);
     return [method, segments];
@@ -204,7 +204,7 @@ async function forEachFile<T>(
   const searchPaths = [baseDir];
   const returnValues: T[] = [];
 
-  while (searchPaths.length) {
+  while (isNotEmpty(searchPaths)) {
     const cwd = searchPaths.shift();
     const dir = await fs.readdir(cwd, { withFileTypes: true });
     for (const entry of dir) {
@@ -219,3 +219,10 @@ async function forEachFile<T>(
 
   return returnValues;
 }
+
+interface NonEmptyArray<T> extends Array<T> {
+  shift(): T;
+}
+function isNotEmpty<T>(array: T[]): array is NonEmptyArray<T> {
+  return array.length > 0;
+}

package/pages/functions/routes.ts

@@ -114,7 +114,7 @@ export function parseConfig(config: Config, baseDir: string) {
     });
   }
 
-  for (const [route, props] of Object.entries(config.routes)) {
+  for (const [route, props] of Object.entries(config.routes ?? {})) {
     let [_methods, routePath] = route.split(" ");
     if (!routePath) {
       routePath = _methods;

package/pages/functions/template-worker.ts

@@ -29,18 +29,20 @@ type RouteHandler = {
 
 // inject `routes` via ESBuild
 declare const routes: RouteHandler[];
+// define `__FALLBACK_SERVICE__` via ESBuild
+declare const __FALLBACK_SERVICE__: string;
 
 // expect an ASSETS fetcher binding pointing to the asset-server stage
-type Env = {
-  [name: string]: unknown;
-  ASSETS: { fetch(url: string, init: RequestInit): Promise<Response> };
+type FetchEnv = {
+  [name: string]: { fetch: typeof fetch };
+  ASSETS: { fetch: typeof fetch };
 };
 
 type WorkerContext = {
   waitUntil: (promise: Promise<unknown>) => void;
 };
 
-function* executeRequest(request: Request, env: Env) {
+function* executeRequest(request: Request, _env: FetchEnv) {
   const requestPath = new URL(request.url).pathname;
 
   // First, iterate through the routes (backwards) and execute "middlewares" on partial route matches
@@ -85,16 +87,10 @@ function* executeRequest(request: Request, env: Env) {
       break;
     }
   }
-
-  // Finally, yield to the asset-server
-  return {
-    handler: () => env.ASSETS.fetch(request.url, request),
-    params: {} as Params,
-  };
 }
 
 export default {
-  async fetch(request: Request, env: Env, workerContext: WorkerContext) {
+  async fetch(request: Request, env: FetchEnv, workerContext: WorkerContext) {
     const handlerIterator = executeRequest(request, env);
     const data = {}; // arbitrary data the user can set between functions
     const next = async (input?: RequestInfo, init?: RequestInit) => {
@@ -102,14 +98,11 @@ export default {
         request = new Request(input, init);
       }
 
-      const { value } = handlerIterator.next();
-      if (value) {
-        const { handler, params } = value;
-        const context: EventContext<
-          unknown,
-          string,
-          Record<string, unknown>
-        > = {
+      const result = handlerIterator.next();
+      // Note we can't use `!result.done` because this doesn't narrow to the correct type
+      if (result.done == false) {
+        const { handler, params } = result.value;
+        const context = {
           request: new Request(request.clone()),
           next,
           params,
@@ -125,6 +118,12 @@ export default {
           [101, 204, 205, 304].includes(response.status) ? null : response.body,
           response
         );
+      } else if (__FALLBACK_SERVICE__) {
+        // There are no more handlers so finish with the fallback service (`env.ASSETS.fetch` in Pages' case)
+        return env[__FALLBACK_SERVICE__].fetch(request);
+      } else {
+        // There was not fallback service so actually make the request to the origin.
+        return fetch(request);
       }
     };
 

package/src/__tests__/dev.test.tsx

@@ -15,9 +15,10 @@ describe("Dev component", () => {
       accountId: "some-account-id",
       public: "some/public/path",
     });
-    expect(lastFrame()).toMatchInlineSnapshot(`
+    expect(lastFrame()?.split("\n").slice(0, 2).join("\n"))
+      .toMatchInlineSnapshot(`
       "Something went wrong:
-      You cannot use the service worker format with a \`public\` directory."
+      Error: You cannot use the service worker format with a \`public\` directory."
     `);
   });
 });
@@ -38,7 +39,7 @@ function renderDev({
   jsxFragment,
   bindings = {},
   public: publicDir,
-  site,
+  assetPaths,
   compatibilityDate,
   compatibilityFlags,
   usageModel,
@@ -55,7 +56,7 @@ function renderDev({
       jsxFactory={jsxFactory}
       jsxFragment={jsxFragment}
       accountId={accountId}
-      site={site}
+      assetPaths={assetPaths}
       public={publicDir}
       compatibilityDate={compatibilityDate}
       compatibilityFlags={compatibilityFlags}

package/src/__tests__/index.test.ts

@@ -17,6 +17,7 @@ describe("wrangler", () => {
 
         Commands:
           wrangler init [name]       📥 Create a wrangler.toml configuration file
+          wrangler whoami            🕵️  Retrieve your user info and test your auth config
           wrangler dev <filename>    👂 Start a local server for developing your worker
           wrangler publish [script]  🆙 Publish your Worker to Cloudflare.
           wrangler tail [name]       🦚 Starts a log tailing session for a deployed Worker.
@@ -49,6 +50,7 @@ describe("wrangler", () => {
 
         Commands:
           wrangler init [name]       📥 Create a wrangler.toml configuration file
+          wrangler whoami            🕵️  Retrieve your user info and test your auth config
           wrangler dev <filename>    👂 Start a local server for developing your worker
           wrangler publish [script]  🆙 Publish your Worker to Cloudflare.
           wrangler tail [name]       🦚 Starts a log tailing session for a deployed Worker.

package/src/__tests__/kv.test.ts

@@ -1,4 +1,5 @@
 import { writeFileSync } from "fs";
+import type { KVNamespaceInfo } from "../kv";
 import {
   setMockResponse,
   setMockRawResponse,
@@ -196,30 +197,30 @@ describe("wrangler", () => {
       }
 
       it("should list namespaces", async () => {
-        const KVNamespaces = [
+        const kvNamespaces: KVNamespaceInfo[] = [
           { title: "title-1", id: "id-1" },
           { title: "title-2", id: "id-2" },
         ];
-        mockListRequest(KVNamespaces);
+        mockListRequest(kvNamespaces);
         const { error, stdout, stderr } = await runWrangler(
           "kv:namespace list"
         );
         expect(error).toMatchInlineSnapshot(`undefined`);
         expect(stderr).toMatchInlineSnapshot(`""`);
         const namespaces = JSON.parse(stdout);
-        expect(namespaces).toEqual(KVNamespaces);
+        expect(namespaces).toEqual(kvNamespaces);
       });
 
       it("should make multiple requests for paginated results", async () => {
         // Create a lot of mock namespaces, so that the fetch requests will be paginated
-        const KVNamespaces = [];
+        const kvNamespaces: KVNamespaceInfo[] = [];
         for (let i = 0; i < 550; i++) {
-          KVNamespaces.push({ title: "title-" + i, id: "id-" + i });
+          kvNamespaces.push({ title: "title-" + i, id: "id-" + i });
         }
-        const requests = mockListRequest(KVNamespaces);
+        const requests = mockListRequest(kvNamespaces);
         const { stdout } = await runWrangler("kv:namespace list");
         const namespaces = JSON.parse(stdout);
-        expect(namespaces).toEqual(KVNamespaces);
+        expect(namespaces).toEqual(kvNamespaces);
         expect(requests.count).toEqual(6);
       });
     });
@@ -335,8 +336,16 @@ describe("wrangler", () => {
             expect(namespaceId).toEqual(expectedNamespaceId);
             expect(key).toEqual(expectedKey);
             expect(body).toEqual(expectedValue);
-            expect(query.get("expiration")).toEqual(`${expiration}`);
-            expect(query.get("expiration_ttl")).toEqual(`${expirationTtl}`);
+            if (expiration !== undefined) {
+              expect(query.get("expiration")).toEqual(`${expiration}`);
+            } else {
+              expect(query.has("expiration")).toBe(false);
+            }
+            if (expirationTtl) {
+              expect(query.get("expiration_ttl")).toEqual(`${expirationTtl}`);
+            } else {
+              expect(query.has("expiration_ttl")).toBe(false);
+            }
             return null;
           }
         );
@@ -636,9 +645,12 @@ describe("wrangler", () => {
           `kv:key put key value --binding otherBinding`
         );
         expect(stdout).toMatchInlineSnapshot(`""`);
-        expect(stderr).toMatchInlineSnapshot(
-          `"A namespace with binding name \\"otherBinding\\" was not found in the configured \\"kv_namespaces\\"."`
-        );
+        expect(stderr).toMatchInlineSnapshot(`
+          "A namespace with binding name \\"otherBinding\\" was not found in the configured \\"kv_namespaces\\".
+
+          %s
+          If you think this is a bug then please create an issue at https://github.com/cloudflare/wrangler2/issues/new."
+        `);
         expect(error).toMatchInlineSnapshot(
           `[Error: A namespace with binding name "otherBinding" was not found in the configured "kv_namespaces".]`
         );
@@ -655,9 +667,12 @@ describe("wrangler", () => {
           "kv:key put my-key my-value --binding someBinding"
         );
         expect(stdout).toMatchInlineSnapshot(`""`);
-        expect(stderr).toMatchInlineSnapshot(
-          `"someBinding has both a namespace ID and a preview ID. Specify \\"--preview\\" or \\"--preview false\\" to avoid writing data to the wrong namespace."`
-        );
+        expect(stderr).toMatchInlineSnapshot(`
+          "someBinding has both a namespace ID and a preview ID. Specify \\"--preview\\" or \\"--preview false\\" to avoid writing data to the wrong namespace.
+
+          %s
+          If you think this is a bug then please create an issue at https://github.com/cloudflare/wrangler2/issues/new."
+        `);
         expect(error).toMatchInlineSnapshot(
           `[Error: someBinding has both a namespace ID and a preview ID. Specify "--preview" or "--preview false" to avoid writing data to the wrong namespace.]`
         );
@@ -666,37 +681,6 @@ describe("wrangler", () => {
     });
 
     describe("list", () => {
-      function mockKeyListRequest(
-        expectedNamespaceId: string,
-        expectedKeys: string[],
-        keysPerRequest = 1000
-      ) {
-        const requests = { count: 0 };
-        setMockRawResponse(
-          "/accounts/:accountId/storage/kv/namespaces/:namespaceId/keys",
-          ([_url, accountId, namespaceId], _init, query) => {
-            requests.count++;
-            expect(accountId).toEqual("some-account-id");
-            expect(namespaceId).toEqual(expectedNamespaceId);
-            if (expectedKeys.length <= keysPerRequest) {
-              return createFetchResult(expectedKeys);
-            } else {
-              const start = parseInt(query.get("cursor")) || 0;
-              const end = start + keysPerRequest;
-              const cursor = end < expectedKeys.length ? end : undefined;
-              return createFetchResult(
-                expectedKeys.slice(start, end),
-                true,
-                [],
-                [],
-                { cursor }
-              );
-            }
-          }
-        );
-        return requests;
-      }
-
       it("should list the keys of a namespace specified by namespace-id", async () => {
         const keys = ["key-1", "key-2", "key-3"];
         mockKeyListRequest("some-namespace-id", keys);
@@ -706,9 +690,23 @@ describe("wrangler", () => {
         expect(error).toMatchInlineSnapshot(`undefined`);
         expect(stderr).toMatchInlineSnapshot(`""`);
         expect(stdout).toMatchInlineSnapshot(`
-          "key-1
-          key-2
-          key-3"
+          "[
+            {
+              \\"name\\": \\"key-1\\",
+              \\"expiration\\": 123456789,
+              \\"metadata\\": {}
+            },
+            {
+              \\"name\\": \\"key-2\\",
+              \\"expiration\\": 123456789,
+              \\"metadata\\": {}
+            },
+            {
+              \\"name\\": \\"key-3\\",
+              \\"expiration\\": 123456789,
+              \\"metadata\\": {}
+            }
+          ]"
         `);
       });
 
@@ -722,9 +720,23 @@ describe("wrangler", () => {
         expect(error).toMatchInlineSnapshot(`undefined`);
         expect(stderr).toMatchInlineSnapshot(`""`);
         expect(stdout).toMatchInlineSnapshot(`
-          "key-1
-          key-2
-          key-3"
+          "[
+            {
+              \\"name\\": \\"key-1\\",
+              \\"expiration\\": 123456789,
+              \\"metadata\\": {}
+            },
+            {
+              \\"name\\": \\"key-2\\",
+              \\"expiration\\": 123456789,
+              \\"metadata\\": {}
+            },
+            {
+              \\"name\\": \\"key-3\\",
+              \\"expiration\\": 123456789,
+              \\"metadata\\": {}
+            }
+          ]"
         `);
       });
 
@@ -738,9 +750,23 @@ describe("wrangler", () => {
         expect(error).toMatchInlineSnapshot(`undefined`);
         expect(stderr).toMatchInlineSnapshot(`""`);
         expect(stdout).toMatchInlineSnapshot(`
-          "key-1
-          key-2
-          key-3"
+          "[
+            {
+              \\"name\\": \\"key-1\\",
+              \\"expiration\\": 123456789,
+              \\"metadata\\": {}
+            },
+            {
+              \\"name\\": \\"key-2\\",
+              \\"expiration\\": 123456789,
+              \\"metadata\\": {}
+            },
+            {
+              \\"name\\": \\"key-3\\",
+              \\"expiration\\": 123456789,
+              \\"metadata\\": {}
+            }
+          ]"
         `);
       });
 
@@ -754,9 +780,23 @@ describe("wrangler", () => {
         expect(error).toMatchInlineSnapshot(`undefined`);
         expect(stderr).toMatchInlineSnapshot(`""`);
         expect(stdout).toMatchInlineSnapshot(`
-          "key-1
-          key-2
-          key-3"
+          "[
+            {
+              \\"name\\": \\"key-1\\",
+              \\"expiration\\": 123456789,
+              \\"metadata\\": {}
+            },
+            {
+              \\"name\\": \\"key-2\\",
+              \\"expiration\\": 123456789,
+              \\"metadata\\": {}
+            },
+            {
+              \\"name\\": \\"key-3\\",
+              \\"expiration\\": 123456789,
+              \\"metadata\\": {}
+            }
+          ]"
         `);
       });
 
@@ -770,15 +810,29 @@ describe("wrangler", () => {
         expect(error).toMatchInlineSnapshot(`undefined`);
         expect(stderr).toMatchInlineSnapshot(`""`);
         expect(stdout).toMatchInlineSnapshot(`
-          "key-1
-          key-2
-          key-3"
+          "[
+            {
+              \\"name\\": \\"key-1\\",
+              \\"expiration\\": 123456789,
+              \\"metadata\\": {}
+            },
+            {
+              \\"name\\": \\"key-2\\",
+              \\"expiration\\": 123456789,
+              \\"metadata\\": {}
+            },
+            {
+              \\"name\\": \\"key-3\\",
+              \\"expiration\\": 123456789,
+              \\"metadata\\": {}
+            }
+          ]"
         `);
       });
 
       it("should make multiple requests for paginated results", async () => {
         // Create a lot of mock keys, so that the fetch requests will be paginated
-        const keys = [];
+        const keys: string[] = [];
         for (let i = 0; i < 550; i++) {
           keys.push("key-" + i);
         }
@@ -789,7 +843,7 @@ describe("wrangler", () => {
         );
         expect(error).toMatchInlineSnapshot(`undefined`);
         expect(stderr).toMatchInlineSnapshot(`""`);
-        expect(stdout).toEqual(keys.join("\n"));
+        expect(JSON.parse(stdout).map((k) => k.name)).toEqual(keys);
         expect(requests.count).toEqual(6);
       });
 
@@ -801,9 +855,12 @@ describe("wrangler", () => {
         expect(error).toMatchInlineSnapshot(
           `[Error: A namespace with binding name "otherBinding" was not found in the configured "kv_namespaces".]`
         );
-        expect(stderr).toMatchInlineSnapshot(
-          `"A namespace with binding name \\"otherBinding\\" was not found in the configured \\"kv_namespaces\\"."`
-        );
+        expect(stderr).toMatchInlineSnapshot(`
+          "A namespace with binding name \\"otherBinding\\" was not found in the configured \\"kv_namespaces\\".
+
+          %s
+          If you think this is a bug then please create an issue at https://github.com/cloudflare/wrangler2/issues/new."
+        `);
         expect(stdout).toMatchInlineSnapshot(`""`);
       });
     });
@@ -988,9 +1045,12 @@ describe("wrangler", () => {
           `kv:key get key --binding otherBinding`
         );
         expect(stdout).toMatchInlineSnapshot(`""`);
-        expect(stderr).toMatchInlineSnapshot(
-          `"A namespace with binding name \\"otherBinding\\" was not found in the configured \\"kv_namespaces\\"."`
-        );
+        expect(stderr).toMatchInlineSnapshot(`
+          "A namespace with binding name \\"otherBinding\\" was not found in the configured \\"kv_namespaces\\".
+
+          %s
+          If you think this is a bug then please create an issue at https://github.com/cloudflare/wrangler2/issues/new."
+        `);
         expect(error).toMatchInlineSnapshot(
           `[Error: A namespace with binding name "otherBinding" was not found in the configured "kv_namespaces".]`
         );
@@ -1048,9 +1108,12 @@ describe("wrangler", () => {
         const { stderr } = await runWrangler(
           `kv:key delete --binding otherBinding someKey`
         );
-        expect(stderr).toMatchInlineSnapshot(
-          `"A namespace with binding name \\"otherBinding\\" was not found in the configured \\"kv_namespaces\\"."`
-        );
+        expect(stderr).toMatchInlineSnapshot(`
+          "A namespace with binding name \\"otherBinding\\" was not found in the configured \\"kv_namespaces\\".
+
+          %s
+          If you think this is a bug then please create an issue at https://github.com/cloudflare/wrangler2/issues/new."
+        `);
       });
 
       it("should delete a key in a namespace specified by binding name in a given environment", async () => {
@@ -1096,3 +1159,41 @@ function writeWranglerConfig() {
     "utf-8"
   );
 }
+
+export function mockKeyListRequest(
+  expectedNamespaceId: string,
+  expectedKeys: string[],
+  keysPerRequest = 1000
+) {
+  const requests = { count: 0 };
+  // See https://api.cloudflare.com/#workers-kv-namespace-list-a-namespace-s-keys
+  const expectedKeyObjects = expectedKeys.map((name) => ({
+    name,
+    expiration: 123456789,
+    metadata: {},
+  }));
+  setMockRawResponse(
+    "/accounts/:accountId/storage/kv/namespaces/:namespaceId/keys",
+    "GET",
+    ([_url, accountId, namespaceId], _init, query) => {
+      requests.count++;
+      expect(accountId).toEqual("some-account-id");
+      expect(namespaceId).toEqual(expectedNamespaceId);
+      if (expectedKeyObjects.length <= keysPerRequest) {
+        return createFetchResult(expectedKeyObjects);
+      } else {
+        const start = parseInt(query.get("cursor") ?? "0") || 0;
+        const end = start + keysPerRequest;
+        const cursor = end < expectedKeyObjects.length ? end : undefined;
+        return createFetchResult(
+          expectedKeyObjects.slice(start, end),
+          true,
+          [],
+          [],
+          { cursor }
+        );
+      }
+    }
+  );
+  return requests;
+}

package/src/__tests__/mock-cfetch.ts

@@ -1,5 +1,5 @@
 import type { RequestInit } from "node-fetch";
-import type { URLSearchParams } from "node:url";
+import { URLSearchParams } from "node:url";
 import { pathToRegexp } from "path-to-regexp";
 import { CF_API_BASE_URL } from "../cfetch";
 import type { FetchResult } from "../cfetch";
@@ -9,8 +9,8 @@ import type { FetchResult } from "../cfetch";
  */
 export type MockHandler<ResponseType> = (
   uri: RegExpExecArray,
-  init?: RequestInit,
-  queryParams?: URLSearchParams
+  init: RequestInit,
+  queryParams: URLSearchParams
 ) => ResponseType;
 
 type RemoveMockFn = () => void;
@@ -32,19 +32,21 @@ const mocks: MockFetch<unknown>[] = [];
 export async function mockFetchInternal(
   resource: string,
   init: RequestInit = {},
-  queryParams?: URLSearchParams
+  queryParams: URLSearchParams = new URLSearchParams()
 ) {
   for (const { regexp, method, handler } of mocks) {
     const resourcePath = new URL(resource, CF_API_BASE_URL).pathname;
     const uri = regexp.exec(resourcePath);
     // Do the resource path and (if specified) the HTTP method match?
-    if (uri !== null && (!method || method === init.method)) {
+    if (uri !== null && (!method || method === (init.method ?? "GET"))) {
       // The `resource` regular expression will extract the labelled groups from the URL.
       // These are passed through to the `handler` call, to allow it to do additional checks or behaviour.
       return handler(uri, init, queryParams); // TODO: should we have some kind of fallthrough system? we'll see.
     }
   }
-  throw new Error(`no mocks found for ${init.method}: ${resource}`);
+  throw new Error(
+    `no mocks found for ${init.method ?? "any HTTP"} request to ${resource}`
+  );
 }
 
 /**