cloudflare · petebacondarwin · Mar 20, 2026 · Mar 16, 2026 · Mar 17, 2026 · Mar 17, 2026
@@ -0,0 +1,7 @@
+---
+"wrangler": patch
+---
+
+fix: Add retry and timeout protection to remote preview API calls
+
+Remote preview sessions (`wrangler dev --remote`) now automatically retry transient 5xx API errors (up to 3 attempts with linear backoff) and enforce a 30-second per-request timeout. Previously, a single hung or failed API response during session creation or worker upload could block the dev session reload indefinitely.
@@ -19,6 +19,9 @@ import type { DispatchFetch, Response } from "miniflare";
 
 type Fetcher = { fetch: DispatchFetch };
 
+const workersDomain =
+	process.env.E2E_ACCOUNT_WORKERS_DEV_DOMAIN ??
+	"devprod-testing7928.workers.dev";
 const auth = getAuthenticatedEnv();
 const execOptions = {
 	encoding: "utf8",
@@ -35,8 +38,7 @@ if (auth) {
 		let remoteKvId: string;
 
 		beforeAll(async () => {
-			const deployedUrl =
-				"https://preserve-e2e-get-platform-proxy-remote.devprod-testing7928.workers.dev/";
+			const deployedUrl = `https://preserve-e2e-get-platform-proxy-remote.${workersDomain}/`;
 
 			try {
 				assert((await fetch(deployedUrl)).status !== 404);
@@ -54,8 +56,7 @@ if (auth) {
 				);
 			}
 
-			const stagingDeployedUrl =
-				"https://preserve-e2e-get-platform-proxy-remote-staging.devprod-testing7928.workers.dev/";
+			const stagingDeployedUrl = `https://preserve-e2e-get-platform-proxy-remote-staging.${workersDomain}/`;
 			try {
 				assert((await fetch(stagingDeployedUrl)).status !== 404);
 			} catch {

@@ -15,6 +15,9 @@ import { recreateLogFolder } from "../../helpers/log-stream";
 import { runC3 } from "../../helpers/run-c3";
 
 const { name: pm } = detectPackageManager();
+const workersDomain =
+	process.env.E2E_ACCOUNT_WORKERS_DEV_DOMAIN ??
+	"devprod-testing7928.workers.dev";
 
 describe("Create Cloudflare CLI", () => {
 	beforeAll((ctx) => {
@@ -497,7 +500,7 @@ describe("Create Cloudflare CLI", () => {
 					if (
 						(
 							await fetch(
-								"https://existing-script-test-do-not-delete.devprod-testing7928.workers.dev/"
+								`https://existing-script-test-do-not-delete.${workersDomain}/`
 							)
 						).status === 404
 					) {

@@ -307,7 +307,9 @@ export async function fetchJson(url: string, info?: RequestInit) {
 export async function waitForReady(proc: Process) {
 	const match = await vi.waitUntil(
 		() => proc.stdout.match(/Local:\s+(http:\/\/localhost:\d+)/),
-		{ interval: 100, timeout: 20_000 }
+		// buildAndPreview does a full build before starting the server,
+		// so allow more time than the default.
+		{ interval: 100, timeout: 30_000 }
 	);
 	return match[1];
 }

@@ -12,6 +12,9 @@ import {
 
 const commands = ["dev", "buildAndPreview"] as const;
 const isWindows = process.platform === "win32";
+const workersDomain =
+	process.env.E2E_ACCOUNT_WORKERS_DEV_DOMAIN ??
+	"devprod-testing7928.workers.dev";
 
 // Remote bindings tests are skipped on Windows due to slow/unreliable remote proxy
 // session initialization times in CI, which causes intermittent timeout failures.
@@ -38,11 +41,8 @@ if (isWindows) {
 		beforeAll(async () => {
 			try {
 				assert(
-					(
-						await fetch(
-							"https://preserve-e2e-vite-remote.devprod-testing7928.workers.dev/"
-						)
-					).status !== 404
+					(await fetch(`https://preserve-e2e-vite-remote.${workersDomain}/`))
+						.status !== 404
 				);
 			} catch {
 				runCommand(`npx wrangler deploy`, `${projectPath}/remote-worker`);
@@ -51,7 +51,7 @@ if (isWindows) {
 				assert(
 					(
 						await fetch(
-							"https://preserve-e2e-vite-remote-alt.devprod-testing7928.workers.dev/"
+							`https://preserve-e2e-vite-remote-alt.${workersDomain}/`
 						)
 					).status !== 404
 				);

@@ -39,16 +39,33 @@ pnpm test:e2e:wrangler -- -u --bail=1
 ### Cloudflare Credentials
 
 Cloudflare credentials are provided to the tests by setting `CLOUDFLARE_ACCOUNT_ID` and `CLOUDFLARE_API_TOKEN`.
+If you don't provide these then only the local e2e tests are executed.
 
-- If you don't provide these then only the local e2e tests are executed.
-- If you don't provide the "DevProd Testing" Cloudflare account (as `CLOUDFLARE_ACCOUNT_ID=8d783f274e1f82dc46744c297b015a2f`), tests that require that specific account are not executed.
+#### Running against the CI account
 
-To fully run the tests you should generate an API token for the "DevProd Testing" account:
+The default configuration targets the "DevProd Testing" account. To fully run the tests, generate an API token for that account:
 
 ```zsh
 CLOUDFLARE_ACCOUNT_ID=8d783f274e1f82dc46744c297b015a2f CLOUDFLARE_API_TOKEN=<cloudflare-testing-api-token> pnpm test:e2e:wrangler
 ```
 
+#### Running against your own account
+
+You can run the e2e tests against any Cloudflare account. Some tests rely on
+pre-deployed `preserve-e2e-*` workers whose URL includes the account's
+`workers.dev` subdomain. Set `E2E_ACCOUNT_WORKERS_DEV_DOMAIN` so these tests
+can locate (and, on first run, deploy) those workers on your account:
+
+```zsh
+CLOUDFLARE_ACCOUNT_ID=<your-account-id> \
+CLOUDFLARE_API_TOKEN=<your-api-token> \
+E2E_ACCOUNT_WORKERS_DEV_DOMAIN=<your-subdomain>.workers.dev \
+pnpm test:e2e:wrangler
+```
+
+> You can find your subdomain in the Cloudflare dashboard under **Workers & Pages**.
+> It defaults to `devprod-testing7928.workers.dev` (the CI account).
+
 ### Focusing on a single e2e test file
 
 If you want to run a subset of tests (e.g. just one) while retaining the turborepo cache for the builds of the dependencies, you can provide the list of test files via the `WRANGLER_E2E_TEST_FILE` environment variable.