wrangler 0.0.0-cfd2e880 → 0.0.0-cffacf5c

package/README.md

@@ -82,7 +82,3 @@ For more commands and options, refer to the [documentation](https://developers.c
 ## Documentation
 
 For the latest Wrangler documentation, [click here](https://developers.cloudflare.com/workers/wrangler/).
-
-```
-
-```

package/bin/wrangler.js

@@ -62,15 +62,21 @@ Consider using a Node.js version manager such as https://volta.sh/ or https://gi
 			...process.argv.slice(2),
 		],
 		{
-			stdio: "inherit",
+			stdio: ["inherit", "inherit", "inherit", "ipc"],
 			env: {
 				...process.env,
 				NODE_EXTRA_CA_CERTS: pathToCACerts,
 			},
 		}
-	).on("exit", (code) =>
-		process.exit(code === undefined || code === null ? 0 : code)
-	);
+	)
+		.on("exit", (code) =>
+			process.exit(code === undefined || code === null ? 0 : code)
+		)
+		.on("message", (message) => {
+			if (process.send) {
+				process.send(message);
+			}
+		});
 }
 
 /**
@@ -87,7 +93,15 @@ function runDelegatedWrangler() {
 	} = JSON.parse(fs.readFileSync(packageJsonPath));
 	const resolvedBinaryPath = path.resolve(packageJsonPath, "..", binaryPath);
 
-	debug(`Delegating to locally-installed version of wrangler @ v${version}`);
+	// Make sure the user knows we're delegating to a different installation
+	const currentPackageJsonPath = path.resolve(__dirname, "..", "package.json");
+	const currentPackage = JSON.parse(fs.readFileSync(currentPackageJsonPath));
+	const argv = process.argv.slice(2).join(" ");
+	console.log(
+		`Delegating to locally-installed wrangler@${version} over global wrangler@${currentPackage.version}...
+Run \`npx wrangler ${argv}\` to use the local version directly.
+`
+	);
 
 	// this call to `spawn` is simpler because the delegated version will do all
 	// of the other work.
@@ -95,11 +109,17 @@ function runDelegatedWrangler() {
 		process.execPath,
 		[resolvedBinaryPath, ...process.argv.slice(2)],
 		{
-			stdio: "inherit",
+			stdio: ["inherit", "inherit", "inherit", "ipc"],
 		}
-	).on("exit", (code) =>
-		process.exit(code === undefined || code === null ? 0 : code)
-	);
+	)
+		.on("exit", (code) =>
+			process.exit(code === undefined || code === null ? 0 : code)
+		)
+		.on("message", (message) => {
+			if (process.send) {
+				process.send(message);
+			}
+		});
 }
 
 /**

package/miniflare-dist/index.mjs

@@ -111,10 +111,10 @@ var require_mime = __commonJS({
   }
 });
 
-// ../pages-shared/src/environment-polyfills/index.ts
+// ../pages-shared/environment-polyfills/index.ts
 var polyfill;
 var init_environment_polyfills = __esm({
-  "../pages-shared/src/environment-polyfills/index.ts"() {
+  "../pages-shared/environment-polyfills/index.ts"() {
     polyfill = (environment) => {
       Object.entries(environment).map(([name, value]) => {
         Object.defineProperty(globalThis, name, {
@@ -128,27 +128,49 @@ var init_environment_polyfills = __esm({
   }
 });
 
-// ../pages-shared/src/environment-polyfills/miniflare.ts
+// ../pages-shared/environment-polyfills/miniflare-tre.ts
+var miniflare_tre_exports = {};
+__export(miniflare_tre_exports, {
+  default: () => miniflare_tre_default
+});
+var miniflare_tre_default;
+var init_miniflare_tre = __esm({
+  "../pages-shared/environment-polyfills/miniflare-tre.ts"() {
+    init_environment_polyfills();
+    miniflare_tre_default = async () => {
+      const mf = await import("@miniflare/tre");
+      polyfill({
+        fetch: mf.fetch,
+        Headers: mf.Headers,
+        Request: mf.Request,
+        Response: mf.Response
+      });
+    };
+  }
+});
+
+// ../pages-shared/environment-polyfills/miniflare.ts
 var miniflare_exports = {};
-import {
-  fetch as miniflareFetch,
-  Headers as MiniflareHeaders,
-  Request as MiniflareRequest,
-  Response as MiniflareResponse
-} from "@miniflare/core";
+__export(miniflare_exports, {
+  default: () => miniflare_default
+});
+var miniflare_default;
 var init_miniflare = __esm({
-  "../pages-shared/src/environment-polyfills/miniflare.ts"() {
+  "../pages-shared/environment-polyfills/miniflare.ts"() {
     init_environment_polyfills();
-    polyfill({
-      fetch: miniflareFetch,
-      Headers: MiniflareHeaders,
-      Request: MiniflareRequest,
-      Response: MiniflareResponse
-    });
+    miniflare_default = async () => {
+      const mf = await import("@miniflare/core");
+      polyfill({
+        fetch: mf.fetch,
+        Headers: mf.Headers,
+        Request: mf.Request,
+        Response: mf.Response
+      });
+    };
   }
 });
 
-// ../pages-shared/src/asset-server/responses.ts
+// ../pages-shared/asset-server/responses.ts
 function mergeHeaders(base, extra) {
   base = new Headers(base ?? {});
   extra = new Headers(extra ?? {});
@@ -159,7 +181,7 @@ function mergeHeaders(base, extra) {
 }
 var OkResponse, MovedPermanentlyResponse, FoundResponse, NotModifiedResponse, PermanentRedirectResponse, NotFoundResponse, MethodNotAllowedResponse, NotAcceptableResponse, InternalServerErrorResponse, SeeOtherResponse, TemporaryRedirectResponse;
 var init_responses = __esm({
-  "../pages-shared/src/asset-server/responses.ts"() {
+  "../pages-shared/asset-server/responses.ts"() {
     OkResponse = class extends Response {
       constructor(...[body, init]) {
         super(body, {
@@ -278,10 +300,10 @@ ${err.stack}`;
   }
 });
 
-// ../pages-shared/src/asset-server/rulesEngine.ts
+// ../pages-shared/asset-server/rulesEngine.ts
 var ESCAPE_REGEX_CHARACTERS, escapeRegex, HOST_PLACEHOLDER_REGEX, PLACEHOLDER_REGEX2, replacer, generateRulesMatcher;
 var init_rulesEngine = __esm({
-  "../pages-shared/src/asset-server/rulesEngine.ts"() {
+  "../pages-shared/asset-server/rulesEngine.ts"() {
     ESCAPE_REGEX_CHARACTERS = /[-/\\^$*+?.()|[\]{}]/g;
     escapeRegex = (str) => {
       return str.replace(ESCAPE_REGEX_CHARACTERS, "\\$&");
@@ -329,7 +351,16 @@ var init_rulesEngine = __esm({
   }
 });
 
-// ../pages-shared/src/asset-server/handler.ts
+// ../pages-shared/asset-server/url.ts
+function stringifyURLToRootRelativePathname(url) {
+  return `${url.pathname}${url.search}${url.hash}`;
+}
+var init_url = __esm({
+  "../pages-shared/asset-server/url.ts"() {
+  }
+});
+
+// ../pages-shared/asset-server/handler.ts
 var handler_exports = {};
 __export(handler_exports, {
   ANALYTICS_VERSION: () => ANALYTICS_VERSION2,
@@ -339,6 +370,7 @@ __export(handler_exports, {
   HEADERS_VERSION_V1: () => HEADERS_VERSION_V1,
   REDIRECTS_VERSION: () => REDIRECTS_VERSION2,
   generateHandler: () => generateHandler,
+  getResponseFromMatch: () => getResponseFromMatch,
   normaliseHeaders: () => normaliseHeaders,
   parseQualityWeightedList: () => parseQualityWeightedList
 });
@@ -409,22 +441,7 @@ async function generateHandler({
   async function generateResponse() {
     const match = staticRedirectsMatcher() || generateRedirectsMatcher()({ request })[0];
     if (match) {
-      const { status, to } = match;
-      const destination = new URL(to, request.url);
-      const location = destination.origin === new URL(request.url).origin ? `${destination.pathname}${destination.search || search}${destination.hash}` : `${destination.href}${destination.search ? "" : search}${destination.hash}`;
-      switch (status) {
-        case 301:
-          return new MovedPermanentlyResponse(location);
-        case 303:
-          return new SeeOtherResponse(location);
-        case 307:
-          return new TemporaryRedirectResponse(location);
-        case 308:
-          return new PermanentRedirectResponse(location);
-        case 302:
-        default:
-          return new FoundResponse(location);
-      }
+      return getResponseFromMatch(match, url);
     }
     if (!request.method.match(/^(get|head)$/i)) {
       return new MethodNotAllowedResponse();
@@ -491,34 +508,6 @@ async function generateHandler({
       ...Object.fromEntries(existingHeaders.entries()),
       ...Object.fromEntries(extraHeaders.entries())
     });
-    const headersMatcher = generateRulesMatcher(
-      headerRules,
-      ({ set = {}, unset = [] }, replacements) => {
-        const replacedSet = {};
-        Object.keys(set).forEach((key) => {
-          replacedSet[key] = replacer(set[key], replacements);
-        });
-        return {
-          set: replacedSet,
-          unset
-        };
-      }
-    );
-    const matches = headersMatcher({ request });
-    const setMap = /* @__PURE__ */ new Set();
-    matches.forEach(({ set = {}, unset = [] }) => {
-      Object.keys(set).forEach((key) => {
-        if (setMap.has(key.toLowerCase())) {
-          headers.append(key, set[key]);
-        } else {
-          headers.set(key, set[key]);
-          setMap.add(key.toLowerCase());
-        }
-      });
-      unset.forEach((key) => {
-        headers.delete(key);
-      });
-    });
     if (earlyHintsCache) {
       const preEarlyHintsHeaders = new Headers(headers);
       const earlyHintsCacheKey = `${protocol}//${host}${pathname}`;
@@ -537,8 +526,15 @@ async function generateHandler({
           (async () => {
             try {
               const links = [];
-              const transformedResponse = new HTMLRewriter().on("link[rel=preconnect],link[rel=preload]", {
+              const transformedResponse = new HTMLRewriter().on("link[rel~=preconnect],link[rel~=preload]", {
                 element(element) {
+                  for (const [attributeName] of element.attributes) {
+                    if (!ALLOWED_EARLY_HINT_LINK_ATTRIBUTES.includes(
+                      attributeName.toLowerCase()
+                    )) {
+                      return;
+                    }
+                  }
                   const href = element.getAttribute("href") || void 0;
                   const rel = element.getAttribute("rel") || void 0;
                   const as = element.getAttribute("as") || void 0;
@@ -568,6 +564,34 @@ async function generateHandler({
         );
       }
     }
+    const headersMatcher = generateRulesMatcher(
+      headerRules,
+      ({ set = {}, unset = [] }, replacements) => {
+        const replacedSet = {};
+        Object.keys(set).forEach((key) => {
+          replacedSet[key] = replacer(set[key], replacements);
+        });
+        return {
+          set: replacedSet,
+          unset
+        };
+      }
+    );
+    const matches = headersMatcher({ request });
+    const setMap = /* @__PURE__ */ new Set();
+    matches.forEach(({ set = {}, unset = [] }) => {
+      unset.forEach((key) => {
+        headers.delete(key);
+      });
+      Object.keys(set).forEach((key) => {
+        if (setMap.has(key.toLowerCase())) {
+          headers.append(key, set[key]);
+        } else {
+          headers.set(key, set[key]);
+          setMap.add(key.toLowerCase());
+        }
+      });
+    });
     return new Response(
       [101, 204, 205, 304].includes(response.status) ? null : response.body,
       {
@@ -696,6 +720,27 @@ async function generateHandler({
     );
   }
 }
+function getResponseFromMatch({
+  status,
+  to
+}, requestUrl) {
+  const destination = new URL(to, requestUrl);
+  destination.search = destination.search || requestUrl.search;
+  const location = destination.origin === requestUrl.origin ? stringifyURLToRootRelativePathname(destination) : destination.toString();
+  switch (status) {
+    case 301:
+      return new MovedPermanentlyResponse(location);
+    case 303:
+      return new SeeOtherResponse(location);
+    case 307:
+      return new TemporaryRedirectResponse(location);
+    case 308:
+      return new PermanentRedirectResponse(location);
+    case 302:
+    default:
+      return new FoundResponse(location);
+  }
+}
 function parseQualityWeightedList(list = "") {
   const items = {};
   list.replace(/\s/g, "").split(",").forEach((el) => {
@@ -716,11 +761,12 @@ function isPreview(url) {
   }
   return false;
 }
-var ASSET_PRESERVATION_CACHE, CACHE_CONTROL_PRESERVATION, CACHE_CONTROL_BROWSER, REDIRECTS_VERSION2, HEADERS_VERSION2, HEADERS_VERSION_V1, ANALYTICS_VERSION2;
+var ASSET_PRESERVATION_CACHE, CACHE_CONTROL_PRESERVATION, CACHE_CONTROL_BROWSER, REDIRECTS_VERSION2, HEADERS_VERSION2, HEADERS_VERSION_V1, ANALYTICS_VERSION2, ALLOWED_EARLY_HINT_LINK_ATTRIBUTES;
 var init_handler = __esm({
-  "../pages-shared/src/asset-server/handler.ts"() {
+  "../pages-shared/asset-server/handler.ts"() {
     init_responses();
     init_rulesEngine();
+    init_url();
     ASSET_PRESERVATION_CACHE = "assetPreservationCache";
     CACHE_CONTROL_PRESERVATION = "public, s-maxage=604800";
     CACHE_CONTROL_BROWSER = "public, max-age=0, must-revalidate";
@@ -728,6 +774,7 @@ var init_handler = __esm({
     HEADERS_VERSION2 = 2;
     HEADERS_VERSION_V1 = 1;
     ANALYTICS_VERSION2 = 1;
+    ALLOWED_EARLY_HINT_LINK_ATTRIBUTES = ["rel", "as", "href"];
   }
 });
 
@@ -738,11 +785,11 @@ import {
   DurableObjectStub
 } from "@miniflare/durable-objects";
 import {
-  Log,
-  LogLevel,
+  Log as MiniflareLog,
+  LogLevel as MiniflareLogLevel,
   Miniflare,
-  Response as MiniflareResponse3,
-  Request as MiniflareRequest3
+  Request as MiniflareRequest,
+  Response as MiniflareResponse
 } from "miniflare";
 
 // ../../node_modules/yargs/lib/platform-shims/esm.mjs
@@ -5564,7 +5611,7 @@ var FatalError = class extends Error {
 import { existsSync, lstatSync, readFileSync as readFileSync5 } from "node:fs";
 import { join } from "node:path";
 
-// ../pages-shared/src/metadata-generator/constants.ts
+// ../pages-shared/metadata-generator/constants.ts
 var REDIRECTS_VERSION = 1;
 var HEADERS_VERSION = 2;
 var ANALYTICS_VERSION = 1;
@@ -5578,12 +5625,13 @@ var UNSET_OPERATOR = "! ";
 var SPLAT_REGEX = /\*/g;
 var PLACEHOLDER_REGEX = /:\w+/g;
 
-// ../pages-shared/src/metadata-generator/createMetadataObject.ts
+// ../pages-shared/metadata-generator/createMetadataObject.ts
 function createMetadataObject({
   redirects,
   headers,
   webAnalyticsToken,
   deploymentId,
+  failOpen,
   logger = (_message) => {
   }
 }) {
@@ -5591,7 +5639,8 @@ function createMetadataObject({
     ...constructRedirects({ redirects, logger }),
     ...constructHeaders({ headers, logger }),
     ...constructWebAnalytics({ webAnalyticsToken, logger }),
-    deploymentId
+    deploymentId,
+    failOpen
   };
 }
 function constructRedirects({
@@ -5622,7 +5671,11 @@ function constructRedirects({
   for (const rule of redirects.rules) {
     if (!rule.from.match(SPLAT_REGEX) && !rule.from.match(PLACEHOLDER_REGEX)) {
       if (canCreateStaticRule) {
-        staticRedirects[rule.from] = { status: rule.status, to: rule.to };
+        staticRedirects[rule.from] = {
+          status: rule.status,
+          to: rule.to,
+          lineNumber: rule.lineNumber
+        };
         continue;
       } else {
         logger(
@@ -5691,7 +5744,7 @@ function constructWebAnalytics({
   };
 }
 
-// ../pages-shared/src/metadata-generator/validateURL.ts
+// ../pages-shared/metadata-generator/validateURL.ts
 var extractPathname = (path = "/", includeSearch, includeHash) => {
   if (!path.startsWith("/"))
     path = `/${path}`;
@@ -5734,7 +5787,7 @@ var validateUrl = (token, onlyRelative = false, includeSearch = false, includeHa
   ];
 };
 
-// ../pages-shared/src/metadata-generator/parseHeaders.ts
+// ../pages-shared/metadata-generator/parseHeaders.ts
 var LINE_IS_PROBABLY_A_PATH = new RegExp(/^([^\s]+:\/\/|^\/)/);
 function parseHeaders(input) {
   const lines = input.split("\n");
@@ -5869,7 +5922,7 @@ function isValidRule(rule) {
   return Object.keys(rule.headers).length > 0 || rule.unsetHeaders.length > 0;
 }
 
-// ../pages-shared/src/metadata-generator/parseRedirects.ts
+// ../pages-shared/metadata-generator/parseRedirects.ts
 function parseRedirects(input) {
   const lines = input.split("\n");
   const rules = [];
@@ -5964,11 +6017,6 @@ function parseRedirects(input) {
 
 // src/miniflare-cli/assets.ts
 var import_mime = __toESM(require_mime());
-import { fetch as miniflareFetch2 } from "@miniflare/core";
-import {
-  Response as MiniflareResponse2,
-  Request as MiniflareRequest2
-} from "@miniflare/core";
 import { watch } from "chokidar";
 
 // src/pages/hash.tsx
@@ -5984,28 +6032,34 @@ var hashFile = (filepath) => {
 
 // src/miniflare-cli/assets.ts
 async function generateASSETSBinding(options) {
-  const assetsFetch = options.directory !== void 0 ? await generateAssetsFetch(options.directory, options.log) : invalidAssetsFetch;
+  const assetsFetch = options.directory !== void 0 ? await generateAssetsFetch(options.directory, options.log, options.tre) : invalidAssetsFetch;
+  const miniflare = options.tre ? await import("@miniflare/tre") : await import("@miniflare/core");
+  const Request = miniflare.Request;
+  const Response2 = miniflare.Response;
+  const fetch2 = options.tre ? miniflare.fetch : (await import("@miniflare/web-sockets")).upgradingFetch;
   return async function(miniflareRequest) {
     if (options.proxyPort) {
       try {
         const url = new URL(miniflareRequest.url);
         url.host = `localhost:${options.proxyPort}`;
-        return await miniflareFetch2(url, miniflareRequest);
+        const proxyRequest = new Request(url, miniflareRequest);
+        if (proxyRequest.headers.get("Upgrade") === "websocket") {
+          proxyRequest.headers.delete("Sec-WebSocket-Accept");
+          proxyRequest.headers.delete("Sec-WebSocket-Key");
+        }
+        return await fetch2(proxyRequest);
       } catch (thrown) {
         options.log.error(new Error(`Could not proxy request: ${thrown}`));
-        return new MiniflareResponse2(
-          `[wrangler] Could not proxy request: ${thrown}`,
-          {
-            status: 502
-          }
-        );
+        return new Response2(`[wrangler] Could not proxy request: ${thrown}`, {
+          status: 502
+        });
       }
     } else {
       try {
         return await assetsFetch(miniflareRequest);
       } catch (thrown) {
         options.log.error(new Error(`Could not serve static asset: ${thrown}`));
-        return new MiniflareResponse2(
+        return new Response2(
           `[wrangler] Could not serve static asset: ${thrown}`,
           { status: 502 }
         );
@@ -6013,8 +6067,11 @@ async function generateASSETSBinding(options) {
     }
   };
 }
-async function generateAssetsFetch(directory, log) {
-  await Promise.resolve().then(() => (init_miniflare(), miniflare_exports));
+async function generateAssetsFetch(directory, log, tre) {
+  const polyfill2 = tre ? (await Promise.resolve().then(() => (init_miniflare_tre(), miniflare_tre_exports))).default : (await Promise.resolve().then(() => (init_miniflare(), miniflare_exports))).default;
+  await polyfill2();
+  const miniflare = tre ? await import("@miniflare/tre") : await import("@miniflare/core");
+  const Request = miniflare.Request;
   const { generateHandler: generateHandler2, parseQualityWeightedList: parseQualityWeightedList2 } = await Promise.resolve().then(() => (init_handler(), handler_exports));
   const headersFile = join(directory, "_headers");
   const redirectsFile = join(directory, "_redirects");
@@ -6099,13 +6156,16 @@ async function generateAssetsFetch(directory, log) {
           );
         }
         const body = readFileSync5(filepath);
-        const contentType = (0, import_mime.getType)(filepath) || "application/octet-stream";
+        let contentType = (0, import_mime.getType)(filepath) || "application/octet-stream";
+        if (contentType.startsWith("text/") && !contentType.includes("charset")) {
+          contentType = `${contentType}; charset=utf-8`;
+        }
         return { body, contentType };
       }
     });
   };
   return async (input, init) => {
-    const request = new MiniflareRequest2(input, init);
+    const request = new Request(input, init);
     return await generateResponse(request);
   };
 }
@@ -6115,18 +6175,6 @@ var invalidAssetsFetch = () => {
   );
 };
 
-// src/miniflare-cli/enum-keys.ts
-var enumObject = (e) => {
-  const copy = { ...e };
-  Object.values(e).forEach(
-    (value) => typeof value === "number" && delete copy[value]
-  );
-  return copy;
-};
-var enumKeys = (e) => {
-  return Object.keys(enumObject(e));
-};
-
 // src/miniflare-cli/request-context.ts
 var getRequestContextCheckOptions = async () => {
   let hasAsyncLocalStorage = true;
@@ -6147,7 +6195,7 @@ var getRequestContextCheckOptions = async () => {
 };
 
 // src/miniflare-cli/index.ts
-var NoOpLog = class extends Log {
+var MiniflareNoOpLog = class extends MiniflareLog {
   log() {
   }
   error(message) {
@@ -6155,18 +6203,19 @@ var NoOpLog = class extends Log {
   }
 };
 async function main() {
-  const args = await yargs_default(hideBin(process.argv)).help(false).version(false).option("log", {
-    choices: enumKeys(LogLevel)
-  }).argv;
-  const logLevel = LogLevel[args.log ?? "INFO"];
+  const args = await yargs_default(hideBin(process.argv)).help(false).version(false).argv;
   const requestContextCheckOptions = await getRequestContextCheckOptions();
   const config = {
     ...JSON.parse(args._[0] ?? "{}"),
     ...requestContextCheckOptions
   };
-  config.log = config.disableLogs ? new NoOpLog() : new Log(logLevel, config.logOptions);
-  if (logLevel > LogLevel.INFO) {
-    console.log("OPTIONS:\n", JSON.stringify(config, null, 2));
+  let logLevelString = config.logLevel.toUpperCase();
+  if (logLevelString === "LOG")
+    logLevelString = "INFO";
+  const logLevel = MiniflareLogLevel[logLevelString];
+  config.log = logLevel === MiniflareLogLevel.NONE ? new MiniflareNoOpLog() : new MiniflareLog(logLevel, config.logOptions);
+  if (logLevel === MiniflareLogLevel.DEBUG) {
+    console.log("MINIFLARE OPTIONS:\n", JSON.stringify(config, null, 2));
   }
   config.bindings = {
     ...config.bindings,
@@ -6184,12 +6233,12 @@ async function main() {
         namespace.get = (id) => {
           const stub = new DurableObjectStub(factory, id);
           stub.fetch = (...reqArgs) => {
-            const requestFromArgs = new MiniflareRequest3(...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 MiniflareRequest3(
+            const request = new MiniflareRequest(
               url.toString(),
               requestFromArgs
             );
@@ -6222,7 +6271,8 @@ async function main() {
       const options = {
         log: config.log,
         proxyPort: opts.proxyPort,
-        directory: opts.directory
+        directory: opts.directory,
+        tre: false
       };
       config.serviceBindings = {
         ...config.serviceBindings,
@@ -6248,7 +6298,7 @@ async function main() {
 				}`,
         serviceBindings: {
           DO: async (request) => {
-            request = new MiniflareRequest3(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"
@@ -6256,7 +6306,7 @@ async function main() {
             request.headers.delete("x-miniflare-durable-object-name");
             request.headers.delete("x-miniflare-durable-object-id");
             if (!name || !idString) {
-              return new MiniflareResponse3(
+              return new MiniflareResponse(
                 "[durable-object-proxy-err] Missing `x-miniflare-durable-object-name` or `x-miniflare-durable-object-id` headers.",
                 { status: 400 }
               );
@@ -6264,14 +6314,14 @@ async function main() {
             const namespace = await mf?.getDurableObjectNamespace(name);
             const id = namespace?.idFromString(idString);
             if (!id) {
-              return new MiniflareResponse3(
+              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 MiniflareResponse3(
+              return new MiniflareResponse(
                 "[durable-object-proxy-err] Could not generate a stub. Possibly due to a mismatched DO name and ID?",
                 { status: 500 }
               );
@@ -6286,7 +6336,7 @@ async function main() {
     }
     process.send && process.send(
       JSON.stringify({
-        mfPort,
+        port: mfPort,
         ready: true,
         durableObjectsPort: durableObjectsMfPort
       })