wrangler 3.29.0 → 3.30.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wrangler",
-  "version": "3.29.0",
+  "version": "3.30.1",
   "description": "Command-line interface for all things Cloudflare Workers",
   "keywords": [
     "wrangler",
@@ -96,7 +96,7 @@
     "source-map": "0.6.1",
     "xxhash-wasm": "^1.0.1",
     "@cloudflare/kv-asset-handler": "0.3.1",
-    "miniflare": "3.20240208.0"
+    "miniflare": "3.20240223.0"
   },
   "devDependencies": {
     "@cloudflare/ai": "^1.0.35",
@@ -187,8 +187,8 @@
     "yargs": "^17.7.2",
     "yoga-layout": "file:../../vendor/yoga-layout-2.0.0-beta.1.tgz",
     "@cloudflare/cli": "1.1.1",
-    "@cloudflare/workers-tsconfig": "0.0.0",
-    "@cloudflare/pages-shared": "^0.11.14"
+    "@cloudflare/pages-shared": "^0.11.15",
+    "@cloudflare/workers-tsconfig": "0.0.0"
   },
   "optionalDependencies": {
     "fsevents": "~2.3.2"
@@ -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/middleware/middleware-ensure-req-body-drained.ts

@@ -0,0 +1,18 @@
+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;

package/wrangler-dist/cli.d.ts

@@ -1360,6 +1360,13 @@ declare interface EnvironmentInheritable {
      * @inheritable
      */
     find_additional_modules: boolean | undefined;
+    /**
+     * Determines whether Wrangler will preserve bundled file names.
+     * Defaults to false.
+     * If left unset, files will be named using the pattern ${fileHash}-${basename},
+     * for example, `34de60b44167af5c5a709e62a4e20c4f18c9e3b6-favicon.ico`.
+     */
+    preserve_file_names: boolean | undefined;
     /**
      * The directory in which module rules should be evaluated when including additional files into a worker deployment.
      * This defaults to the directory containing the `main` entry point of the worker if not specified.

package/wrangler-dist/cli.js

@@ -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.29.0";
+var version = "3.30.1";
 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"
   },
@@ -122557,6 +122557,14 @@ function normalizeAndValidateEnvironment(diagnostics, configPath, rawEnv, envNam
       isBoolean,
       void 0
     ),
+    preserve_file_names: inheritable(
+      diagnostics,
+      topLevelEnv,
+      rawEnv,
+      "preserve_file_names",
+      isBoolean,
+      void 0
+    ),
     base_dir: normalizeAndValidateBaseDirField(
       configPath,
       inheritable(
@@ -124991,7 +124999,7 @@ function createModuleCollector(props) {
               );
               const fileContent = await (0, import_promises2.readFile)(filePath);
               const fileHash = import_node_crypto3.default.createHash("sha1").update(fileContent).digest("hex");
-              const fileName = `./${fileHash}-${import_node_path9.default.basename(args.path)}`;
+              const fileName = props.preserveFileNames ? args.path : `./${fileHash}-${import_node_path9.default.basename(args.path)}`;
               const { rule } = rulesMatchers.find(({ regex: regex2 }) => regex2.test(fileName)) || {};
               if (rule) {
                 modules.push({
@@ -125072,7 +125080,7 @@ function createModuleCollector(props) {
                 }
                 const fileContent = await (0, import_promises2.readFile)(filePath);
                 const fileHash = import_node_crypto3.default.createHash("sha1").update(fileContent).digest("hex");
-                const fileName = props.preserveFileNames ? filePath : `./${fileHash}-${import_node_path9.default.basename(args.path)}`;
+                const fileName = props.preserveFileNames ? args.path : `./${fileHash}-${import_node_path9.default.basename(args.path)}`;
                 modules.push({
                   name: fileName,
                   filePath,
@@ -125312,6 +125320,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",
@@ -161297,6 +161312,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) {
@@ -161310,7 +161340,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) {
@@ -163542,8 +163575,6 @@ async function initHandler(args) {
       ...yesFlag && isNpm(packageManager) ? ["-y"] : [],
       // --yes arg for npx
       ...isNpm(packageManager) ? ["--"] : [],
-      "--type",
-      "pre-existing",
       "--existing-script",
       fromDashWorkerName
     ];
@@ -164983,7 +165014,8 @@ See https://developers.cloudflare.com/workers/platform/compatibility-dates for m
       // `moduleCollector` doesn't get used when `props.noBundle` is set, so
       // `findAdditionalModules` always defaults to `false`
       findAdditionalModules: config.find_additional_modules ?? false,
-      rules: props.rules
+      rules: props.rules,
+      preserveFileNames: config.preserve_file_names ?? false
     });
     const { modules, dependencies, resolvedEntryPointPath, bundleType } = props.noBundle ? await noBundleWorker2(props.entry, props.rules, props.outDir) : await bundleWorker(
       props.entry,
@@ -165523,9 +165555,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");
@@ -165538,7 +165570,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}`
@@ -165556,16 +165592,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) {
@@ -166054,7 +166100,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,
@@ -166109,15 +166154,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,
@@ -166135,6 +166181,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);
       }
@@ -166148,7 +166201,6 @@ ${onboardingLink}`);
     props.host,
     props.legacyEnv,
     props.routes,
-    props.zone,
     props.sendMetrics,
     restartCounter
   ]);
@@ -166184,15 +166236,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,
@@ -166215,7 +166268,7 @@ ${onboardingLink}`);
           pathname: workerPreviewToken.inspectorUrl.pathname
         },
         userWorkerInnerUrlOverrides: {
-          hostname: props.host,
+          hostname: props.host ?? getInferredHost(props.routes),
           port: props.port.toString()
         },
         headers: {
@@ -166226,7 +166279,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) => {
@@ -166256,7 +166313,6 @@ ${onboardingLink}`);
     props.modules,
     props.env,
     props.legacyEnv,
-    props.zone,
     props.host,
     props.routes,
     session,
@@ -166347,11 +166403,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
@@ -166472,16 +166527,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
   };
@@ -167065,7 +167121,6 @@ function DevSession(props) {
       usageModel: props.usageModel,
       env: props.env,
       legacyEnv: props.legacyEnv,
-      zone: props.zone,
       host: props.host,
       routes: props.routes,
       onReady: announceAndOnReady,
@@ -167437,7 +167492,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) => {
@@ -167876,7 +167930,6 @@ async function startDev(args) {
       legacyNodeCompat,
       nodejsCompat,
       upstreamProtocol,
-      zoneId,
       host,
       routes,
       getLocalPort,
@@ -167908,7 +167961,6 @@ async function startDev(args) {
           findAdditionalModules: configParam.find_additional_modules,
           entry,
           env: args.env,
-          zone: zoneId,
           host,
           routes,
           processEntrypoint,
@@ -167928,7 +167980,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,
@@ -167990,7 +168042,6 @@ async function startApiDev(args) {
     legacyNodeCompat,
     nodejsCompat,
     upstreamProtocol,
-    zoneId,
     host,
     routes,
     getLocalPort,
@@ -168018,7 +168069,6 @@ async function startApiDev(args) {
       findAdditionalModules: configParam.find_additional_modules,
       entry,
       env: args.env,
-      zone: zoneId,
       host,
       routes,
       processEntrypoint,
@@ -168038,7 +168088,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,
@@ -168105,31 +168155,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:
 
 	\`\`\`
@@ -168137,20 +168177,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);
@@ -168225,7 +168266,6 @@ use --persist-to=./wrangler-local-state to keep using the old path.`
     getLocalPort,
     getInspectorPort,
     getRuntimeInspectorPort,
-    zoneId,
     host,
     routes,
     cliDefines,