wrangler 3.30.0 → 3.31.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wrangler",
-  "version": "3.30.0",
+  "version": "3.31.0",
   "description": "Command-line interface for all things Cloudflare Workers",
   "keywords": [
     "wrangler",
@@ -95,8 +95,8 @@
     "selfsigned": "^2.0.1",
     "source-map": "0.6.1",
     "xxhash-wasm": "^1.0.1",
-    "@cloudflare/kv-asset-handler": "0.3.1",
-    "miniflare": "3.20240223.0"
+    "miniflare": "3.20240223.1",
+    "@cloudflare/kv-asset-handler": "0.3.1"
   },
   "devDependencies": {
     "@cloudflare/ai": "^1.0.35",
@@ -187,7 +187,7 @@
     "yargs": "^17.7.2",
     "yoga-layout": "file:../../vendor/yoga-layout-2.0.0-beta.1.tgz",
     "@cloudflare/cli": "1.1.1",
-    "@cloudflare/pages-shared": "^0.11.15",
+    "@cloudflare/pages-shared": "^0.11.16",
     "@cloudflare/workers-tsconfig": "0.0.0"
   },
   "optionalDependencies": {
@@ -220,7 +220,7 @@
     "test": "pnpm run assert-git-version && jest",
     "test:ci": "pnpm run test --coverage",
     "test:debug": "pnpm run test --silent=false --verbose=true",
-    "test:e2e": "vitest --test-timeout 240000 --poolOptions.threads.singleThread --dir ./e2e --retry 2 run",
+    "test:e2e": "vitest -c ./e2e/vitest.config.ts",
     "test:watch": "pnpm run test --testTimeout=50000 --watch",
     "type:tests": "tsc -p ./src/__tests__/tsconfig.json && tsc -p ./e2e/tsconfig.json"
   }

package/templates/gitignore

@@ -165,8 +165,3 @@ dist
 .yarn/build-state.yml
 .yarn/install-state.gz
 .pnp.\*
-
-# wrangler project
-
-.dev.vars
-.wrangler/

package/templates/middleware/middleware-ensure-req-body-drained.ts

@@ -0,0 +1,19 @@
+import type { Middleware } from "./common";
+
+const drainBody: Middleware = async (request, env, _ctx, middlewareCtx) => {
+	try {
+		return await middlewareCtx.next(request, env);
+	} finally {
+		try {
+			if (request.body !== null && !request.bodyUsed) {
+				const reader = request.body.getReader();
+				while (!(await reader.read()).done) {}
+			}
+		} catch (e) {
+			console.error("Failed to drain the unused request body.", e);
+		}
+	}
+};
+
+export default drainBody;
+export const wrap = undefined;

package/wrangler-dist/cli.js

@@ -11370,7 +11370,7 @@ var require_headers = __commonJS({
       }
     };
     __name(HeadersList, "HeadersList");
-    var Headers4 = class {
+    var Headers5 = class {
       constructor(init2 = void 0) {
         if (init2 === kConstruct) {
           return;
@@ -11384,7 +11384,7 @@ var require_headers = __commonJS({
       }
       // https://fetch.spec.whatwg.org/#dom-headers-append
       append(name, value) {
-        webidl.brandCheck(this, Headers4);
+        webidl.brandCheck(this, Headers5);
         webidl.argumentLengthCheck(arguments, 2, { header: "Headers.append" });
         name = webidl.converters.ByteString(name);
         value = webidl.converters.ByteString(value);
@@ -11392,7 +11392,7 @@ var require_headers = __commonJS({
       }
       // https://fetch.spec.whatwg.org/#dom-headers-delete
       delete(name) {
-        webidl.brandCheck(this, Headers4);
+        webidl.brandCheck(this, Headers5);
         webidl.argumentLengthCheck(arguments, 1, { header: "Headers.delete" });
         name = webidl.converters.ByteString(name);
         if (!isValidHeaderName(name)) {
@@ -11413,7 +11413,7 @@ var require_headers = __commonJS({
       }
       // https://fetch.spec.whatwg.org/#dom-headers-get
       get(name) {
-        webidl.brandCheck(this, Headers4);
+        webidl.brandCheck(this, Headers5);
         webidl.argumentLengthCheck(arguments, 1, { header: "Headers.get" });
         name = webidl.converters.ByteString(name);
         if (!isValidHeaderName(name)) {
@@ -11427,7 +11427,7 @@ var require_headers = __commonJS({
       }
       // https://fetch.spec.whatwg.org/#dom-headers-has
       has(name) {
-        webidl.brandCheck(this, Headers4);
+        webidl.brandCheck(this, Headers5);
         webidl.argumentLengthCheck(arguments, 1, { header: "Headers.has" });
         name = webidl.converters.ByteString(name);
         if (!isValidHeaderName(name)) {
@@ -11441,7 +11441,7 @@ var require_headers = __commonJS({
       }
       // https://fetch.spec.whatwg.org/#dom-headers-set
       set(name, value) {
-        webidl.brandCheck(this, Headers4);
+        webidl.brandCheck(this, Headers5);
         webidl.argumentLengthCheck(arguments, 2, { header: "Headers.set" });
         name = webidl.converters.ByteString(name);
         value = webidl.converters.ByteString(value);
@@ -11467,7 +11467,7 @@ var require_headers = __commonJS({
       }
       // https://fetch.spec.whatwg.org/#dom-headers-getsetcookie
       getSetCookie() {
-        webidl.brandCheck(this, Headers4);
+        webidl.brandCheck(this, Headers5);
         const list = this[kHeadersList].cookies;
         if (list) {
           return [...list];
@@ -11497,7 +11497,7 @@ var require_headers = __commonJS({
         return headers;
       }
       keys() {
-        webidl.brandCheck(this, Headers4);
+        webidl.brandCheck(this, Headers5);
         if (this[kGuard] === "immutable") {
           const value = this[kHeadersSortedMap];
           return makeIterator(
@@ -11513,7 +11513,7 @@ var require_headers = __commonJS({
         );
       }
       values() {
-        webidl.brandCheck(this, Headers4);
+        webidl.brandCheck(this, Headers5);
         if (this[kGuard] === "immutable") {
           const value = this[kHeadersSortedMap];
           return makeIterator(
@@ -11529,7 +11529,7 @@ var require_headers = __commonJS({
         );
       }
       entries() {
-        webidl.brandCheck(this, Headers4);
+        webidl.brandCheck(this, Headers5);
         if (this[kGuard] === "immutable") {
           const value = this[kHeadersSortedMap];
           return makeIterator(
@@ -11549,7 +11549,7 @@ var require_headers = __commonJS({
        * @param {unknown} thisArg
        */
       forEach(callbackFn, thisArg = globalThis) {
-        webidl.brandCheck(this, Headers4);
+        webidl.brandCheck(this, Headers5);
         webidl.argumentLengthCheck(arguments, 1, { header: "Headers.forEach" });
         if (typeof callbackFn !== "function") {
           throw new TypeError(
@@ -11561,13 +11561,13 @@ var require_headers = __commonJS({
         }
       }
       [Symbol.for("nodejs.util.inspect.custom")]() {
-        webidl.brandCheck(this, Headers4);
+        webidl.brandCheck(this, Headers5);
         return this[kHeadersList];
       }
     };
-    __name(Headers4, "Headers");
-    Headers4.prototype[Symbol.iterator] = Headers4.prototype.entries;
-    Object.defineProperties(Headers4.prototype, {
+    __name(Headers5, "Headers");
+    Headers5.prototype[Symbol.iterator] = Headers5.prototype.entries;
+    Object.defineProperties(Headers5.prototype, {
       append: kEnumerableProperty,
       delete: kEnumerableProperty,
       get: kEnumerableProperty,
@@ -11599,7 +11599,7 @@ var require_headers = __commonJS({
     };
     module3.exports = {
       fill: fill2,
-      Headers: Headers4,
+      Headers: Headers5,
       HeadersList
     };
   }
@@ -11610,7 +11610,7 @@ var require_response = __commonJS({
   "../../node_modules/.pnpm/undici@5.28.3/node_modules/undici/lib/fetch/response.js"(exports2, module3) {
     "use strict";
     init_import_meta_url();
-    var { Headers: Headers4, HeadersList, fill: fill2 } = require_headers();
+    var { Headers: Headers5, HeadersList, fill: fill2 } = require_headers();
     var { extractBody, cloneBody, mixinBody } = require_body();
     var util4 = require_util();
     var { kEnumerableProperty } = util4;
@@ -11702,7 +11702,7 @@ var require_response = __commonJS({
         init2 = webidl.converters.ResponseInit(init2);
         this[kRealm] = { settingsObject: {} };
         this[kState] = makeResponse({});
-        this[kHeaders] = new Headers4(kConstruct);
+        this[kHeaders] = new Headers5(kConstruct);
         this[kHeaders][kGuard] = "response";
         this[kHeaders][kHeadersList] = this[kState].headersList;
         this[kHeaders][kRealm] = this[kRealm];
@@ -11999,7 +11999,7 @@ var require_request2 = __commonJS({
     "use strict";
     init_import_meta_url();
     var { extractBody, mixinBody, cloneBody } = require_body();
-    var { Headers: Headers4, fill: fillHeaders, HeadersList } = require_headers();
+    var { Headers: Headers5, fill: fillHeaders, HeadersList } = require_headers();
     var { FinalizationRegistry: FinalizationRegistry2 } = require_dispatcher_weakref()();
     var util4 = require_util();
     var {
@@ -12243,7 +12243,7 @@ var require_request2 = __commonJS({
             requestFinalizer.register(ac, { signal, abort });
           }
         }
-        this[kHeaders] = new Headers4(kConstruct);
+        this[kHeaders] = new Headers5(kConstruct);
         this[kHeaders][kHeadersList] = request3.headersList;
         this[kHeaders][kGuard] = "request";
         this[kHeaders][kRealm] = this[kRealm];
@@ -12442,7 +12442,7 @@ var require_request2 = __commonJS({
         const clonedRequestObject = new Request3(kConstruct);
         clonedRequestObject[kState] = clonedRequest;
         clonedRequestObject[kRealm] = this[kRealm];
-        clonedRequestObject[kHeaders] = new Headers4(kConstruct);
+        clonedRequestObject[kHeaders] = new Headers5(kConstruct);
         clonedRequestObject[kHeaders][kHeadersList] = clonedRequest.headersList;
         clonedRequestObject[kHeaders][kGuard] = this[kHeaders][kGuard];
         clonedRequestObject[kHeaders][kRealm] = this[kHeaders][kRealm];
@@ -12648,7 +12648,7 @@ var require_fetch = __commonJS({
       filterResponse,
       makeResponse
     } = require_response();
-    var { Headers: Headers4 } = require_headers();
+    var { Headers: Headers5 } = require_headers();
     var { Request: Request3, makeRequest } = require_request2();
     var zlib = require("zlib");
     var {
@@ -13575,7 +13575,7 @@ var require_fetch = __commonJS({
               }
               let codings = [];
               let location = "";
-              const headers = new Headers4();
+              const headers = new Headers5();
               if (Array.isArray(headersList)) {
                 for (let n2 = 0; n2 < headersList.length; n2 += 2) {
                   const key = headersList[n2 + 0].toString("latin1");
@@ -13660,7 +13660,7 @@ var require_fetch = __commonJS({
               if (status2 !== 101) {
                 return;
               }
-              const headers = new Headers4();
+              const headers = new Headers5();
               for (let n2 = 0; n2 < headersList.length; n2 += 2) {
                 const key = headersList[n2 + 0].toString("latin1");
                 const val = headersList[n2 + 1].toString("latin1");
@@ -15542,10 +15542,10 @@ var require_cookies = __commonJS({
     var { parseSetCookie } = require_parse();
     var { stringify, getHeadersList } = require_util6();
     var { webidl } = require_webidl();
-    var { Headers: Headers4 } = require_headers();
+    var { Headers: Headers5 } = require_headers();
     function getCookies(headers) {
       webidl.argumentLengthCheck(arguments, 1, { header: "getCookies" });
-      webidl.brandCheck(headers, Headers4, { strict: false });
+      webidl.brandCheck(headers, Headers5, { strict: false });
       const cookie = headers.get("cookie");
       const out = {};
       if (!cookie) {
@@ -15560,7 +15560,7 @@ var require_cookies = __commonJS({
     __name(getCookies, "getCookies");
     function deleteCookie(headers, name, attributes) {
       webidl.argumentLengthCheck(arguments, 2, { header: "deleteCookie" });
-      webidl.brandCheck(headers, Headers4, { strict: false });
+      webidl.brandCheck(headers, Headers5, { strict: false });
       name = webidl.converters.DOMString(name);
       attributes = webidl.converters.DeleteCookieAttributes(attributes);
       setCookie(headers, {
@@ -15573,7 +15573,7 @@ var require_cookies = __commonJS({
     __name(deleteCookie, "deleteCookie");
     function getSetCookies(headers) {
       webidl.argumentLengthCheck(arguments, 1, { header: "getSetCookies" });
-      webidl.brandCheck(headers, Headers4, { strict: false });
+      webidl.brandCheck(headers, Headers5, { strict: false });
       const cookies = getHeadersList(headers).cookies;
       if (!cookies) {
         return [];
@@ -15583,7 +15583,7 @@ var require_cookies = __commonJS({
     __name(getSetCookies, "getSetCookies");
     function setCookie(headers, cookie) {
       webidl.argumentLengthCheck(arguments, 2, { header: "setCookie" });
-      webidl.brandCheck(headers, Headers4, { strict: false });
+      webidl.brandCheck(headers, Headers5, { strict: false });
       cookie = webidl.converters.Cookie(cookie);
       const str = stringify(cookie);
       if (str) {
@@ -16093,7 +16093,7 @@ var require_connection = __commonJS({
     var { CloseEvent } = require_events();
     var { makeRequest } = require_request2();
     var { fetching } = require_fetch();
-    var { Headers: Headers4 } = require_headers();
+    var { Headers: Headers5 } = require_headers();
     var { getGlobalDispatcher: getGlobalDispatcher2 } = require_global2();
     var { kHeadersList } = require_symbols();
     var channels = {};
@@ -16118,7 +16118,7 @@ var require_connection = __commonJS({
         redirect: "error"
       });
       if (options25.headers) {
-        const headersList = new Headers4(options25.headers)[kHeadersList];
+        const headersList = new Headers5(options25.headers)[kHeadersList];
         request3.headersList = headersList;
       }
       const keyValue = crypto5.randomBytes(16).toString("base64");
@@ -118285,7 +118285,7 @@ __name(getEnvironmentVariableFactory, "getEnvironmentVariableFactory");
 init_import_meta_url();
 var getC3CommandFromEnv = getEnvironmentVariableFactory({
   variableName: "WRANGLER_C3_COMMAND",
-  defaultValue: () => "create cloudflare@2"
+  defaultValue: () => "create cloudflare@2.5.0"
 });
 var getWranglerSendMetricsFromEnv = getEnvironmentVariableFactory({
   variableName: "WRANGLER_SEND_METRICS"
@@ -119643,7 +119643,7 @@ var import_node_assert2 = __toESM(require("node:assert"));
 var import_undici3 = __toESM(require_undici());
 
 // package.json
-var version = "3.30.0";
+var version = "3.31.0";
 var package_default = {
   name: "wrangler",
   version,
@@ -119709,7 +119709,7 @@ var package_default = {
     test: "pnpm run assert-git-version && jest",
     "test:ci": "pnpm run test --coverage",
     "test:debug": "pnpm run test --silent=false --verbose=true",
-    "test:e2e": "vitest --test-timeout 240000 --poolOptions.threads.singleThread --dir ./e2e --retry 2 run",
+    "test:e2e": "vitest -c ./e2e/vitest.config.ts",
     "test:watch": "pnpm run test --testTimeout=50000 --watch",
     "type:tests": "tsc -p ./src/__tests__/tsconfig.json && tsc -p ./e2e/tsconfig.json"
   },
@@ -125161,6 +125161,11 @@ async function* getFiles(root, relativeTo) {
   }
 }
 __name(getFiles, "getFiles");
+function isValidPythonPackageName(name) {
+  const regex2 = /^([A-Z0-9]|[A-Z0-9][A-Z0-9._-]*[A-Z0-9])$/i;
+  return regex2.test(name);
+}
+__name(isValidPythonPackageName, "isValidPythonPackageName");
 async function findAdditionalModules(entry, rules) {
   const files = getFiles(entry.moduleRoot, entry.moduleRoot);
   const relativeEntryPoint = import_node_path10.default.relative(entry.moduleRoot, entry.file).replaceAll("\\", "/");
@@ -125172,27 +125177,32 @@ async function findAdditionalModules(entry, rules) {
   }));
   const isPythonEntrypoint = getBundleType(entry.format, entry.file) === "python";
   if (isPythonEntrypoint) {
+    let pythonRequirements = "";
     try {
-      const pythonRequirements = await (0, import_promises3.readFile)(
+      pythonRequirements = await (0, import_promises3.readFile)(
         import_node_path10.default.resolve(entry.directory, "requirements.txt"),
         "utf-8"
       );
-      for (const requirement of pythonRequirements.split("\n")) {
-        const packageName = requirement.match(/^[^\d\W]\w*/);
-        if (typeof packageName?.[0] === "string") {
-          modules.push({
-            type: "python-requirement",
-            name: packageName?.[0],
-            content: "",
-            filePath: void 0
-          });
-        }
-      }
     } catch (e3) {
       logger.debug(
         "Python entrypoint detected, but no requirements.txt file found."
       );
     }
+    for (const requirement of pythonRequirements.split("\n")) {
+      if (requirement === "")
+        continue;
+      if (!isValidPythonPackageName(requirement)) {
+        throw new UserError(
+          `Invalid Python package name "${requirement}" found in requirements.txt. Note that requirements.txt should contain package names only, not version specifiers.`
+        );
+      }
+      modules.push({
+        type: "python-requirement",
+        name: requirement,
+        content: "",
+        filePath: void 0
+      });
+    }
   }
   if (modules.length > 0) {
     logger.info(`Attaching additional modules:`);
@@ -125320,6 +125330,13 @@ async function bundleWorker(entry, destination, {
   const tmpDir = getWranglerTmpDir(projectRoot, "bundle");
   const entryFile = entry.file;
   const middlewareToLoad = [];
+  if (targetConsumer === "dev" && !process.env.WRANGLER_DISABLE_REQUEST_BODY_DRAINING) {
+    middlewareToLoad.push({
+      name: "ensure-req-body-drained",
+      path: "templates/middleware/middleware-ensure-req-body-drained.ts",
+      supports: ["modules", "service-worker"]
+    });
+  }
   if (targetConsumer === "dev" && !!testScheduled) {
     middlewareToLoad.push({
       name: "scheduled",
@@ -127776,7 +127793,10 @@ async function AIFetcher(request3) {
     body: request3.body,
     duplex: "half"
   });
-  return new import_miniflare3.Response(res.body, { status: res.status });
+  const respHeaders = new import_miniflare3.Headers(res.headers);
+  respHeaders.delete("Host");
+  respHeaders.delete("Content-Length");
+  return new import_miniflare3.Response(res.body, { status: res.status, headers: respHeaders });
 }
 __name(AIFetcher, "AIFetcher");
 
@@ -127791,7 +127811,9 @@ function withSourceURL(source, sourcePath) {
 __name(withSourceURL, "withSourceURL");
 function withSourceURLs(entrypointPath, modules) {
   let entrypointSource = import_node_fs10.default.readFileSync(entrypointPath, "utf8");
-  entrypointSource = withSourceURL(entrypointSource, entrypointPath);
+  if (!entrypointPath.endsWith(".py")) {
+    entrypointSource = withSourceURL(entrypointSource, entrypointPath);
+  }
   modules = modules.map((module3) => {
     if (module3.filePath !== void 0 && (module3.type === "esm" || module3.type === "commonjs")) {
       let newContent = module3.content.toString();
@@ -161305,6 +161327,21 @@ function getHostFromUrl(urlLike) {
   }
 }
 __name(getHostFromUrl, "getHostFromUrl");
+async function getZoneIdForPreview(host, routes) {
+  let zoneId;
+  if (host) {
+    zoneId = await getZoneIdFromHost(host);
+  }
+  if (!zoneId && routes) {
+    const firstRoute = routes[0];
+    const zone = await getZoneForRoute(firstRoute);
+    if (zone) {
+      zoneId = zone.id;
+    }
+  }
+  return zoneId;
+}
+__name(getZoneIdForPreview, "getZoneIdForPreview");
 async function getZoneIdFromHost(host) {
   const hostPieces = host.split(".");
   while (hostPieces.length > 1) {
@@ -161318,7 +161355,10 @@ async function getZoneIdFromHost(host) {
     }
     hostPieces.shift();
   }
-  throw new UserError(`Could not find zone for ${host}`);
+  throw new UserError(
+    `Could not find zone for \`${host}\`. Make sure the domain is set up to be proxied by Cloudflare.
+For more details, refer to https://developers.cloudflare.com/workers/configuration/routing/routes/#set-up-a-route`
+  );
 }
 __name(getZoneIdFromHost, "getZoneIdFromHost");
 async function getRoutesForZone(zone) {
@@ -161766,8 +161806,8 @@ function writeDTSFile({
   }
   let combinedTypeStrings = "";
   if (formatType === "modules") {
-    combinedTypeStrings += `interface ${envInterface} {
-${envTypeStructure.map((value) => `	${value}`).join("\n")}
+    combinedTypeStrings += `interface ${envInterface} {${envTypeStructure.map((value) => `
+	${value}`).join("")}
 }
 ${modulesTypeStructure.join("\n")}`;
   } else {
@@ -161778,7 +161818,8 @@ ${envTypeStructure.map((value) => `	const ${value}`).join("\n")}
 ${modulesTypeStructure.join("\n")}`;
   }
   const wranglerCommandUsed = ["wrangler", ...process.argv.slice(2)].join(" ");
-  if (envTypeStructure.length || modulesTypeStructure.length) {
+  const typesHaveBeenFound = envTypeStructure.length || modulesTypeStructure.length;
+  if (formatType === "modules" || typesHaveBeenFound) {
     fs21.writeFileSync(
       path58,
       [
@@ -162440,7 +162481,7 @@ See https://developers.cloudflare.com/workers/platform/compatibility-dates for m
     const migrations = !props.dryRun ? await getMigrationsToUpload(scriptName, {
       accountId,
       config,
-      legacyEnv: false,
+      legacyEnv: props.legacyEnv,
       env: props.env
     }) : void 0;
     const bindings = {
@@ -162798,6 +162839,7 @@ async function versionsUploadHandler(args) {
     name: getScriptName(args, config),
     rules: getRules(config),
     entry,
+    legacyEnv: isLegacyEnv(config),
     env: args.env,
     compatibilityDate: args.latest ? (/* @__PURE__ */ new Date()).toISOString().substring(0, 10) : args.compatibilityDate,
     compatibilityFlags: args.compatibilityFlags,
@@ -163550,8 +163592,6 @@ async function initHandler(args) {
       ...yesFlag && isNpm(packageManager) ? ["-y"] : [],
       // --yes arg for npx
       ...isNpm(packageManager) ? ["--"] : [],
-      "--type",
-      "pre-existing",
       "--existing-script",
       fromDashWorkerName
     ];
@@ -165532,9 +165572,9 @@ function randomId() {
   });
 }
 __name(randomId, "randomId");
-function switchHost(originalUrl, host) {
+function switchHost(originalUrl, host, zonePreview) {
   const url4 = new import_node_url14.URL(originalUrl);
-  url4.hostname = host ?? url4.hostname;
+  url4.hostname = zonePreview ? host ?? url4.hostname : url4.hostname;
   return url4;
 }
 __name(switchHost, "switchHost");
@@ -165547,7 +165587,11 @@ async function createPreviewSession(account, ctx, abortSignal) {
     void 0,
     abortSignal
   );
-  const switchedExchangeUrl = switchHost(exchange_url, ctx.host).toString();
+  const switchedExchangeUrl = switchHost(
+    exchange_url,
+    ctx.host,
+    !!ctx.zone
+  ).toString();
   logger.debugWithSanitization(
     "-- START EXCHANGE API REQUEST:",
     ` GET ${switchedExchangeUrl}`
@@ -165565,16 +165609,26 @@ async function createPreviewSession(account, ctx, abortSignal) {
   logger.debug("HEADERS:", JSON.stringify(exchangeResponse.headers, null, 2));
   logger.debugWithSanitization("RESPONSE:", bodyText);
   logger.debug("-- END EXCHANGE API RESPONSE");
-  const { inspector_websocket, prewarm, token } = parseJSON(bodyText);
-  const inspector = new import_node_url14.URL(inspector_websocket);
-  inspector.searchParams.append("cf_workers_preview_token", token);
-  return {
-    id: randomId(),
-    value: token,
-    host: ctx.host ?? inspector.host,
-    inspectorUrl: switchHost(inspector.href, ctx.host),
-    prewarmUrl: switchHost(prewarm, ctx.host)
-  };
+  try {
+    const { inspector_websocket, prewarm, token } = parseJSON(bodyText);
+    const inspector = new import_node_url14.URL(inspector_websocket);
+    inspector.searchParams.append("cf_workers_preview_token", token);
+    return {
+      id: randomId(),
+      value: token,
+      host: ctx.host ?? inspector.host,
+      inspectorUrl: switchHost(inspector.href, ctx.host, !!ctx.zone),
+      prewarmUrl: switchHost(prewarm, ctx.host, !!ctx.zone)
+    };
+  } catch (e3) {
+    if (!(e3 instanceof ParseError)) {
+      throw e3;
+    } else {
+      throw new UserError(
+        `Could not create remote preview session on ${ctx.zone ? ` host \`${ctx.host}\` on zone \`${ctx.zone}\`` : `your account`}.`
+      );
+    }
+  }
 }
 __name(createPreviewSession, "createPreviewSession");
 async function createPreviewToken(account, worker, ctx, session, abortSignal) {
@@ -166063,7 +166117,6 @@ function Remote(props) {
     usageModel: props.usageModel,
     env: props.env,
     legacyEnv: props.legacyEnv,
-    zone: props.zone,
     host: props.host,
     routes: props.routes,
     onReady: props.onReady,
@@ -166118,15 +166171,16 @@ function useWorker(props) {
       if (props.accountId === void 0) {
         return;
       }
-      const { workerAccount, workerContext } = getWorkerAccountAndContext({
-        accountId: props.accountId,
-        env: props.env,
-        legacyEnv: props.legacyEnv,
-        zone: props.zone,
-        host: props.host,
-        routes: props.routes,
-        sendMetrics: props.sendMetrics
-      });
+      const { workerAccount, workerContext } = await getWorkerAccountAndContext(
+        {
+          accountId: props.accountId,
+          env: props.env,
+          legacyEnv: props.legacyEnv,
+          host: props.host,
+          routes: props.routes,
+          sendMetrics: props.sendMetrics
+        }
+      );
       setSession(
         await createPreviewSession(
           workerAccount,
@@ -166144,6 +166198,13 @@ function useWorker(props) {
         logger.error(`${errorMessage}
 ${solutionMessage}
 ${onboardingLink}`);
+      } else if (err.cause?.code === "ENOTFOUND") {
+        logger.error(
+          `Could not access \`${err.cause.hostname}\`. Make sure the domain is set up to be proxied by Cloudflare.
+For more details, refer to https://developers.cloudflare.com/workers/configuration/routing/routes/#set-up-a-route`
+        );
+      } else if (err instanceof UserError) {
+        logger.error(err.message);
       } else if (err.code !== "ABORT_ERR") {
         logger.error("Error while creating remote dev session:", err);
       }
@@ -166157,7 +166218,6 @@ ${onboardingLink}`);
     props.host,
     props.legacyEnv,
     props.routes,
-    props.zone,
     props.sendMetrics,
     restartCounter
   ]);
@@ -166193,15 +166253,16 @@ ${onboardingLink}`);
         compatibilityFlags: props.compatibilityFlags,
         usageModel: props.usageModel
       });
-      const { workerAccount, workerContext } = getWorkerAccountAndContext({
-        accountId: props.accountId,
-        env: props.env,
-        legacyEnv: props.legacyEnv,
-        zone: props.zone,
-        host: props.host,
-        routes: props.routes,
-        sendMetrics: props.sendMetrics
-      });
+      const { workerAccount, workerContext } = await getWorkerAccountAndContext(
+        {
+          accountId: props.accountId,
+          env: props.env,
+          legacyEnv: props.legacyEnv,
+          host: props.host,
+          routes: props.routes,
+          sendMetrics: props.sendMetrics
+        }
+      );
       const workerPreviewToken = await createWorkerPreview(
         init2,
         workerAccount,
@@ -166224,7 +166285,7 @@ ${onboardingLink}`);
           pathname: workerPreviewToken.inspectorUrl.pathname
         },
         userWorkerInnerUrlOverrides: {
-          hostname: props.host,
+          hostname: props.host ?? getInferredHost(props.routes),
           port: props.port.toString()
         },
         headers: {
@@ -166235,7 +166296,11 @@ ${onboardingLink}`);
         // liveReload currently disabled in remote-mode, but will be supported with startDevWorker
         proxyLogsToController: true
       };
-      onReady?.(props.host || "localhost", props.port, proxyData);
+      onReady?.(
+        props.host ?? getInferredHost(props.routes) ?? "localhost",
+        props.port,
+        proxyData
+      );
     }
     __name(start, "start");
     start().catch((err) => {
@@ -166265,7 +166330,6 @@ ${onboardingLink}`);
     props.modules,
     props.env,
     props.legacyEnv,
-    props.zone,
     props.host,
     props.routes,
     session,
@@ -166356,11 +166420,10 @@ async function getRemotePreviewToken(props) {
       throw error2;
     }
     const abortController = new AbortController();
-    const { workerAccount, workerContext } = getWorkerAccountAndContext({
+    const { workerAccount, workerContext } = await getWorkerAccountAndContext({
       accountId: props.accountId,
       env: props.env,
       legacyEnv: props.legacyEnv,
-      zone: props.zone,
       host: props.host,
       routes: props.routes,
       sendMetrics: props.sendMetrics
@@ -166448,7 +166511,7 @@ async function createRemoteWorkerInit(props) {
     main: {
       name: import_node_path50.default.basename(props.bundle.path),
       filePath: props.bundle.path,
-      type: getBundleType(props.format),
+      type: getBundleType(props.format, import_node_path50.default.basename(props.bundle.path)),
       content
     },
     modules,
@@ -166481,16 +166544,17 @@ async function createRemoteWorkerInit(props) {
   return init2;
 }
 __name(createRemoteWorkerInit, "createRemoteWorkerInit");
-function getWorkerAccountAndContext(props) {
+async function getWorkerAccountAndContext(props) {
   const workerAccount = {
     accountId: props.accountId,
     apiToken: requireApiToken()
   };
+  const zoneId = await getZoneIdForPreview(props.host, props.routes);
   const workerContext = {
     env: props.env,
     legacyEnv: props.legacyEnv,
-    zone: props.zone,
-    host: props.host,
+    zone: zoneId,
+    host: props.host ?? getInferredHost(props.routes),
     routes: props.routes,
     sendMetrics: props.sendMetrics
   };
@@ -167074,7 +167138,6 @@ function DevSession(props) {
       usageModel: props.usageModel,
       env: props.env,
       legacyEnv: props.legacyEnv,
-      zone: props.zone,
       host: props.host,
       routes: props.routes,
       onReady: announceAndOnReady,
@@ -167446,7 +167509,6 @@ async function startDevServer(props) {
       usageModel: props.usageModel,
       env: props.env,
       legacyEnv: props.legacyEnv,
-      zone: props.zone,
       host: props.host,
       routes: props.routes,
       onReady: async (ip2, port2, proxyData) => {
@@ -167885,7 +167947,6 @@ async function startDev(args) {
       legacyNodeCompat,
       nodejsCompat,
       upstreamProtocol,
-      zoneId,
       host,
       routes,
       getLocalPort,
@@ -167917,7 +167978,6 @@ async function startDev(args) {
           findAdditionalModules: configParam.find_additional_modules,
           entry,
           env: args.env,
-          zone: zoneId,
           host,
           routes,
           processEntrypoint,
@@ -167937,7 +167997,7 @@ async function startDev(args) {
           localProtocol: args.localProtocol || configParam.dev.local_protocol,
           httpsKeyPath: args.httpsKeyPath,
           httpsCertPath: args.httpsCertPath,
-          localUpstream: args.localUpstream ?? host,
+          localUpstream: args.localUpstream ?? host ?? getInferredHost(routes),
           localPersistencePath,
           liveReload: args.liveReload || false,
           accountId: args.accountId ?? configParam.account_id ?? getAccountFromCache()?.id,
@@ -167999,7 +168059,6 @@ async function startApiDev(args) {
     legacyNodeCompat,
     nodejsCompat,
     upstreamProtocol,
-    zoneId,
     host,
     routes,
     getLocalPort,
@@ -168027,7 +168086,6 @@ async function startApiDev(args) {
       findAdditionalModules: configParam.find_additional_modules,
       entry,
       env: args.env,
-      zone: zoneId,
       host,
       routes,
       processEntrypoint,
@@ -168047,7 +168105,7 @@ async function startApiDev(args) {
       localProtocol: args.localProtocol ?? configParam.dev.local_protocol,
       httpsKeyPath: args.httpsKeyPath,
       httpsCertPath: args.httpsCertPath,
-      localUpstream: args.localUpstream ?? host,
+      localUpstream: args.localUpstream ?? host ?? getInferredHost(routes),
       localPersistencePath,
       liveReload: args.liveReload ?? false,
       accountId: args.accountId ?? configParam.account_id ?? getAccountFromCache()?.id,
@@ -168114,31 +168172,21 @@ function maskVars(bindings, configParam) {
   return maskedVars;
 }
 __name(maskVars, "maskVars");
-async function getZoneIdHostAndRoutes(args, config) {
-  let host = args.host || config.dev.host;
-  let zoneId;
+async function getHostAndRoutes(args, config) {
+  const host = args.host || config.dev.host;
   const routes = args.routes || config.route && [config.route] || config.routes;
-  if (args.remote) {
-    if (host) {
-      zoneId = await getZoneIdFromHost(host);
-    }
-    if (!zoneId && routes) {
-      const firstRoute = routes[0];
-      const zone = await getZoneForRoute(firstRoute);
-      if (zone) {
-        zoneId = zone.id;
-        host = zone.host;
-      }
-    }
-  } else if (!host) {
-    if (routes) {
-      const firstRoute = routes[0];
-      host = getHostFromRoute(firstRoute);
-      if (host === void 0) {
-        throw new UserError(
-          `Cannot infer host from first route: ${JSON.stringify(
-            firstRoute
-          )}.
+  return { host, routes };
+}
+__name(getHostAndRoutes, "getHostAndRoutes");
+function getInferredHost(routes) {
+  if (routes) {
+    const firstRoute = routes[0];
+    const host = getHostFromRoute(firstRoute);
+    if (host === void 0) {
+      throw new UserError(
+        `Cannot infer host from first route: ${JSON.stringify(
+          firstRoute
+        )}.
 You can explicitly set the \`dev.host\` configuration in your wrangler.toml file, for example:
 
 	\`\`\`
@@ -168146,20 +168194,21 @@ You can explicitly set the \`dev.host\` configuration in your wrangler.toml file
 	host = "example.com"
 	\`\`\`
 `
-        );
-      }
+      );
     }
+    return host;
   }
-  return { host, routes, zoneId };
 }
-__name(getZoneIdHostAndRoutes, "getZoneIdHostAndRoutes");
+__name(getInferredHost, "getInferredHost");
 async function validateDevServerSettings(args, config) {
   const entry = await getEntry(
     { assets: args.assets, script: args.script, moduleRoot: args.moduleRoot },
     config,
     "dev"
   );
-  const { zoneId, host, routes } = await getZoneIdHostAndRoutes(args, config);
+  const { host, routes } = await getHostAndRoutes(args, config);
+  if (args.remote)
+    await getZoneIdForPreview(host, routes);
   const initialIp = args.ip || config.dev.ip;
   const initialIpListenCheck = initialIp === "*" ? "0.0.0.0" : initialIp;
   const getLocalPort = memoizeGetPort(DEFAULT_LOCAL_PORT, initialIpListenCheck);
@@ -168234,7 +168283,6 @@ use --persist-to=./wrangler-local-state to keep using the old path.`
     getLocalPort,
     getInspectorPort,
     getRuntimeInspectorPort,
-    zoneId,
     host,
     routes,
     cliDefines,
@@ -168424,7 +168472,7 @@ unstable_dev()'s behaviour will likely change in future releases`
   const readyPromise = new Promise((resolve19) => {
     readyResolve = resolve19;
   });
-  const defaultLogLevel = testMode ? "none" : "log";
+  const defaultLogLevel = testMode ? "warn" : "log";
   const local = options25?.local ?? true;
   const devOptions2 = {
     script,