wrangler 0.0.0-e57758f8 → 0.0.0-e5ae13ade

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wrangler",
-  "version": "0.0.0-e57758f8",
+  "version": "0.0.0-e5ae13ade",
   "description": "Command-line interface for all things Cloudflare Workers",
   "keywords": [
     "wrangler",
@@ -47,152 +47,116 @@
     "wrangler-dist",
     "templates",
     "kv-asset-handler.js",
-    "Cloudflare_CA.pem",
     "config-schema.json"
   ],
-  "jest": {
-    "moduleNameMapper": {
-      "clipboardy": "<rootDir>/src/__tests__/helpers/clipboardy-mock.js",
-      "miniflare/cli": "<rootDir>/../../node_modules/miniflare/dist/src/cli.js"
-    },
-    "restoreMocks": true,
-    "setupFilesAfterEnv": [
-      "<rootDir>/src/__tests__/jest.setup.ts"
-    ],
-    "testRegex": "src/__tests__/.*\\.(test|spec)\\.[jt]sx?$",
-    "testTimeout": 50000,
-    "transform": {
-      "^.+\\.c?(t|j)sx?$": [
-        "esbuild-jest",
-        {
-          "sourcemap": true
-        }
-      ]
-    },
-    "transformIgnorePatterns": [
-      "node_modules/.pnpm/(?!find-up|locate-path|p-locate|p-limit|p-timeout|p-queue|yocto-queue|path-exists|execa|strip-final-newline|npm-run-path|path-key|onetime|mimic-fn|human-signals|is-stream|get-port|supports-color|pretty-bytes|strip-ansi|ansi-regex)"
-    ],
-    "snapshotFormat": {
-      "escapeString": true,
-      "printBasicPrototype": true
-    }
-  },
   "dependencies": {
-    "@esbuild-plugins/node-globals-polyfill": "^0.2.3",
-    "@esbuild-plugins/node-modules-polyfill": "^0.2.2",
-    "blake3-wasm": "^2.1.5",
-    "chokidar": "^3.5.3",
-    "esbuild": "0.17.19",
-    "nanoid": "^3.3.3",
-    "path-to-regexp": "^6.2.0",
-    "resolve": "^1.22.8",
-    "resolve.exports": "^2.0.2",
-    "selfsigned": "^2.0.1",
-    "source-map": "0.6.1",
-    "xxhash-wasm": "^1.0.1",
-    "@cloudflare/kv-asset-handler": "0.3.2",
-    "miniflare": "3.20240419.0"
+    "@cloudflare/unenv-preset": "2.3.2",
+    "blake3-wasm": "2.1.5",
+    "esbuild": "0.25.4",
+    "path-to-regexp": "6.3.0",
+    "unenv": "2.0.0-rc.17",
+    "workerd": "1.20250508.0",
+    "@cloudflare/kv-asset-handler": "0.4.0",
+    "miniflare": "0.0.0-e5ae13ade"
   },
   "devDependencies": {
-    "@cloudflare/eslint-config-worker": "*",
-    "@cloudflare/types": "^6.18.4",
-    "@cloudflare/workers-types": "^4.20240419.0",
+    "@aws-sdk/client-s3": "^3.721.0",
+    "@cloudflare/types": "6.18.4",
+    "@cloudflare/workers-types": "^4.20250508.0",
     "@cspotcode/source-map-support": "0.8.1",
     "@iarna/toml": "^3.0.0",
-    "@microsoft/api-extractor": "^7.28.3",
+    "@microsoft/api-extractor": "^7.47.0",
     "@sentry/node": "^7.86.0",
     "@sentry/types": "^7.86.0",
     "@sentry/utils": "^7.86.0",
-    "@types/body-parser": "^1.19.2",
     "@types/command-exists": "^1.2.0",
-    "@types/express": "^4.17.13",
-    "@types/glob-to-regexp": "0.4.1",
+    "@types/glob-to-regexp": "^0.4.1",
     "@types/is-ci": "^3.0.0",
     "@types/javascript-time-ago": "^2.0.3",
-    "@types/jest": "^29.5.5",
-    "@types/mime": "^2.0.3",
+    "@types/mime": "^3.0.4",
     "@types/minimatch": "^5.1.2",
+    "@types/node": "^20.17.32",
+    "@types/node-forge": "^1.3.11",
     "@types/prompts": "^2.0.14",
-    "@types/react": "^17.0.37",
     "@types/resolve": "^1.20.6",
-    "@types/serve-static": "^1.13.10",
     "@types/shell-quote": "^1.7.2",
     "@types/signal-exit": "^3.0.1",
     "@types/supports-color": "^8.1.1",
-    "@types/ws": "^8.5.3",
-    "@types/yargs": "^17.0.10",
+    "@types/ws": "^8.5.7",
+    "@types/yargs": "^17.0.22",
+    "@vitest/ui": "~3.1.1",
     "@webcontainer/env": "^1.1.0",
-    "body-parser": "^1.20.0",
-    "chalk": "^2.4.2",
+    "chalk": "^5.2.0",
+    "chokidar": "^4.0.1",
     "cli-table3": "^0.6.3",
-    "clipboardy": "^3.0.0",
     "cmd-shim": "^4.1.0",
     "command-exists": "^1.2.9",
-    "concurrently": "^7.2.2",
-    "devtools-protocol": "^0.0.955664",
-    "dotenv": "^16.0.0",
-    "es-module-lexer": "^1.3.0",
-    "esbuild-jest": "0.5.0",
+    "concurrently": "^8.2.2",
+    "date-fns": "^4.1.0",
+    "devtools-protocol": "^0.0.1182435",
+    "dotenv": "^16.3.1",
     "execa": "^6.1.0",
-    "express": "^4.18.1",
     "find-up": "^6.3.0",
-    "get-port": "^6.1.2",
-    "glob-to-regexp": "0.4.1",
-    "http-terminator": "^3.2.0",
+    "get-port": "^7.0.0",
+    "glob-to-regexp": "^0.4.1",
     "https-proxy-agent": "7.0.2",
-    "ignore": "^5.2.0",
-    "ink": "^3.2.0",
-    "ink-select-input": "^4.2.1",
-    "ink-spinner": "^4.0.3",
-    "ink-table": "^3.0.0",
     "is-ci": "^3.0.1",
+    "itty-time": "^1.0.6",
     "javascript-time-ago": "^2.5.4",
-    "jest": "^29.7.0",
-    "jest-fetch-mock": "^3.0.3",
-    "jest-websocket-mock": "^2.5.0",
+    "md5-file": "5.0.0",
     "mime": "^3.0.0",
     "minimatch": "^5.1.0",
-    "msw": "^0.49.1",
+    "mock-socket": "^9.3.1",
+    "msw": "2.4.3",
+    "node-forge": "^1.3.1",
     "open": "^8.4.0",
     "p-queue": "^7.2.0",
     "patch-console": "^1.0.0",
     "pretty-bytes": "^6.0.0",
     "prompts": "^2.4.2",
-    "react": "^17.0.2",
-    "react-error-boundary": "^3.1.4",
+    "resolve": "^1.22.8",
+    "rimraf": "^6.0.1",
+    "selfsigned": "^2.0.1",
     "semiver": "^1.1.0",
-    "serve-static": "^1.15.0",
     "shell-quote": "^1.8.1",
-    "shellac": "^0.8.0",
     "signal-exit": "^3.0.7",
-    "strip-ansi": "^7.0.1",
+    "source-map": "^0.6.1",
+    "strip-ansi": "^7.1.0",
     "supports-color": "^9.2.2",
     "timeago.js": "^4.0.2",
     "ts-dedent": "^2.2.0",
     "ts-json-schema-generator": "^1.5.0",
-    "undici": "5.28.3",
+    "typescript": "^5.7.2",
+    "undici": "^5.28.5",
     "update-check": "^1.5.4",
-    "ws": "^8.5.0",
+    "vitest": "~3.1.1",
+    "vitest-websocket-mock": "^0.4.0",
+    "ws": "8.18.0",
     "xdg-app-paths": "^8.3.0",
+    "xxhash-wasm": "^1.0.1",
     "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.33",
-    "@cloudflare/workers-tsconfig": "0.0.0"
-  },
-  "optionalDependencies": {
-    "fsevents": "~2.3.2"
+    "@cloudflare/eslint-config-worker": "1.1.0",
+    "@cloudflare/workers-shared": "0.0.0-e5ae13ade",
+    "@cloudflare/workers-tsconfig": "0.0.0",
+    "@cloudflare/pages-shared": "^0.13.40"
   },
   "peerDependencies": {
-    "@cloudflare/workers-types": "^4.20240419.0"
+    "@cloudflare/workers-types": "^4.20250508.0"
   },
   "peerDependenciesMeta": {
     "@cloudflare/workers-types": {
       "optional": true
     }
   },
+  "optionalDependencies": {
+    "fsevents": "~2.3.2"
+  },
   "engines": {
-    "node": ">=16.17.0"
+    "node": ">=18.0.0"
+  },
+  "volta": {
+    "extends": "../../package.json"
   },
   "workers-sdk": {
     "prerelease": true
@@ -201,17 +165,17 @@
     "assert-git-version": "node -r esbuild-register scripts/assert-git-version.ts",
     "build": "pnpm run clean && pnpm run bundle && pnpm run emit-types && pnpm run generate-json-schema",
     "bundle": "node -r esbuild-register scripts/bundle.ts",
-    "check:lint": "eslint .",
-    "check:type": "tsc",
+    "check:lint": "eslint . --max-warnings=0",
+    "check:type": "tsc -p ./tsconfig.json && tsc -p ./templates/tsconfig.json",
     "clean": "rimraf wrangler-dist miniflare-dist emitted-types",
     "dev": "pnpm run clean && concurrently -c black,blue --kill-others-on-fail false \"pnpm run bundle --watch\" \"pnpm run check:type --watch --preserveWatchOutput\"",
     "emit-types": "tsc -p tsconfig.emit.json && node -r esbuild-register scripts/emit-types.ts",
-    "generate-json-schema": "pnpm exec ts-json-schema-generator --no-type-check --path src/config/config.ts --type RawConfig --out config-schema.json",
+    "generate-json-schema": "node -r esbuild-register scripts/generate-json-schema.ts",
     "start": "pnpm run bundle && cross-env NODE_OPTIONS=--enable-source-maps ./bin/wrangler.js",
-    "test": "pnpm run assert-git-version && jest",
-    "test:ci": "pnpm run test",
+    "test": "dotenv -- pnpm run assert-git-version && dotenv -- vitest",
+    "test:ci": "pnpm run test run",
     "test:debug": "pnpm run test --silent=false --verbose=true",
-    "test:e2e": "vitest -c ./e2e/vitest.config.ts",
+    "test:e2e": "dotenv -- vitest run -c ./e2e/vitest.config.mts",
     "test:watch": "pnpm run test --testTimeout=50000 --watch",
     "type:tests": "tsc -p ./src/__tests__/tsconfig.json && tsc -p ./e2e/tsconfig.json"
   }

package/templates/checked-fetch.js

@@ -9,7 +9,7 @@ function checkURL(request, init) {
 						? new Request(request, init)
 						: request
 					).url
-			  );
+				);
 	if (url.port && url.port !== "443" && url.protocol === "https:") {
 		if (!urls.has(url.toString())) {
 			urls.add(url.toString());

package/templates/facade.d.ts

@@ -3,10 +3,10 @@ declare module "__ENTRY_POINT__" {
 	import { WorkerEntrypoint } from "cloudflare:workers";
 
 	export type WorkerEntrypointConstructor = typeof WorkerEntrypoint;
-	export type WithMiddleware<T> = T & { middleware?: Middleware[] };
 
-	const worker: WithMiddleware<ExportedHandler | WorkerEntrypointConstructor>;
+	const worker: ExportedHandler | WorkerEntrypointConstructor;
 	export default worker;
+	export const __INTERNAL_WRANGLER_MIDDLEWARE__: Middleware[];
 }
 
 declare module "__KV_ASSET_HANDLER__" {

package/templates/gitignore

@@ -165,3 +165,6 @@ dist
 .yarn/build-state.yml
 .yarn/install-state.gz
 .pnp.\*
+
+.wrangler
+.DS_Store

package/templates/init-tests/test-vitest-new-worker.ts

@@ -1,9 +1,9 @@
 import { afterAll, beforeAll, describe, expect, it } from "vitest";
 import { unstable_dev } from "wrangler";
-import type { UnstableDevWorker } from "wrangler";
+import type { Unstable_DevWorker } from "wrangler";
 
 describe("Worker", () => {
-	let worker: UnstableDevWorker;
+	let worker: Unstable_DevWorker;
 
 	beforeAll(async () => {
 		worker = await unstable_dev("src/index.ts", {

package/templates/middleware/loader-modules.ts

@@ -3,12 +3,9 @@
 // export dynamically through wrangler, or we can potentially let users directly
 // add them as a sort of "plugin" system.
 
-import ENTRY from "__ENTRY_POINT__";
+import ENTRY, { __INTERNAL_WRANGLER_MIDDLEWARE__ } from "__ENTRY_POINT__";
 import { __facade_invoke__, __facade_register__, Dispatcher } from "./common";
-import type {
-	WithMiddleware,
-	WorkerEntrypointConstructor,
-} from "__ENTRY_POINT__";
+import type { WorkerEntrypointConstructor } from "__ENTRY_POINT__";
 
 // Preserve all the exports from the worker
 export * from "__ENTRY_POINT__";
@@ -33,15 +30,16 @@ class __Facade_ScheduledController__ implements ScheduledController {
 	}
 }
 
-function wrapExportedHandler(
-	worker: WithMiddleware<ExportedHandler>
-): ExportedHandler {
+function wrapExportedHandler(worker: ExportedHandler): ExportedHandler {
 	// If we don't have any middleware defined, just return the handler as is
-	if (worker.middleware === undefined || worker.middleware.length === 0) {
+	if (
+		__INTERNAL_WRANGLER_MIDDLEWARE__ === undefined ||
+		__INTERNAL_WRANGLER_MIDDLEWARE__.length === 0
+	) {
 		return worker;
 	}
 	// Otherwise, register all middleware once
-	for (const middleware of worker.middleware) {
+	for (const middleware of __INTERNAL_WRANGLER_MIDDLEWARE__) {
 		__facade_register__(middleware);
 	}
 
@@ -75,14 +73,17 @@ function wrapExportedHandler(
 }
 
 function wrapWorkerEntrypoint(
-	klass: WithMiddleware<WorkerEntrypointConstructor>
+	klass: WorkerEntrypointConstructor
 ): WorkerEntrypointConstructor {
 	// If we don't have any middleware defined, just return the handler as is
-	if (klass.middleware === undefined || klass.middleware.length === 0) {
+	if (
+		__INTERNAL_WRANGLER_MIDDLEWARE__ === undefined ||
+		__INTERNAL_WRANGLER_MIDDLEWARE__.length === 0
+	) {
 		return klass;
 	}
 	// Otherwise, register all middleware once
-	for (const middleware of klass.middleware) {
+	for (const middleware of __INTERNAL_WRANGLER_MIDDLEWARE__) {
 		__facade_register__(middleware);
 	}
 

package/templates/middleware/middleware-patch-console-prefix.d.ts

@@ -0,0 +1,3 @@
+declare module "config:middleware/patch-console-prefix" {
+	export const prefix: string;
+}

package/templates/middleware/middleware-patch-console-prefix.ts

@@ -0,0 +1,21 @@
+/// <reference path="middleware-patch-console-prefix.d.ts"/>
+
+import { prefix } from "config:middleware/patch-console-prefix";
+import type { Middleware } from "./common";
+
+// @ts-expect-error globalThis.console _does_ exist
+globalThis.console = new Proxy(globalThis.console, {
+	get(target, p, receiver) {
+		if (p === "log" || p === "debug" || p === "info") {
+			return (...args: unknown[]) =>
+				Reflect.get(target, p, receiver)(prefix, ...args);
+		}
+		return Reflect.get(target, p, receiver);
+	},
+});
+
+const passthrough: Middleware = (request, env, _ctx, middlewareCtx) => {
+	return middlewareCtx.next(request, env);
+};
+
+export default passthrough;

package/templates/middleware/middleware-scheduled.ts

@@ -9,7 +9,21 @@ const scheduled: Middleware = async (request, env, _ctx, middlewareCtx) => {
 
 		return new Response("Ran scheduled event");
 	}
-	return middlewareCtx.next(request, env);
+
+	const resp = await middlewareCtx.next(request, env);
+
+	// If you open the `/__scheduled` page in a browser, the browser will automatically make a request to `/favicon.ico`.
+	// For scheduled Workers _without_ a fetch handler, this will result in a 500 response that clutters the log with unhelpful error messages.
+	// To avoid this, inject a 404 response to favicon.ico loads on the `/__scheduled` page
+	if (
+		request.headers.get("referer")?.endsWith("/__scheduled") &&
+		url.pathname === "/favicon.ico" &&
+		resp.status === 500
+	) {
+		return new Response(null, { status: 404 });
+	}
+
+	return resp;
 };
 
 export default scheduled;

package/templates/mixedMode/proxyServerWorker/index.ts

@@ -0,0 +1,40 @@
+export default {
+	async fetch(request, env) {
+		const targetBinding = request.headers.get("MF-Binding");
+
+		if (targetBinding) {
+			const originalHeaders = new Headers();
+			for (const [name, value] of request.headers) {
+				if (name.startsWith("mf-header-")) {
+					originalHeaders.set(name.slice("mf-header-".length), value);
+				} else if (name === "upgrade") {
+					// The `Upgrade` header needs to be special-cased to prevent:
+					//   TypeError: Worker tried to return a WebSocket in a response to a request which did not contain the header "Upgrade: websocket"
+					originalHeaders.set(name, value);
+				}
+			}
+			let fetcher = env[targetBinding];
+
+			// Special case the Dispatch Namespace binding because it has a top-level synchronous .get() call
+			const dispatchNamespaceOptions = originalHeaders.get(
+				"MF-Dispatch-Namespace-Options"
+			);
+			if (dispatchNamespaceOptions) {
+				const { name, args, options } = JSON.parse(dispatchNamespaceOptions);
+				fetcher = (env[targetBinding] as DispatchNamespace).get(
+					name,
+					args,
+					options
+				);
+			}
+			return (fetcher as Fetcher).fetch(
+				request.headers.get("MF-URL")!,
+				new Request(request, {
+					redirect: "manual",
+					headers: originalHeaders,
+				})
+			);
+		}
+		return new Response("Provide a binding", { status: 400 });
+	},
+} satisfies ExportedHandler<Record<string, Fetcher | DispatchNamespace>>;

package/templates/mixedMode/proxyServerWorker/wrangler.jsonc

@@ -0,0 +1,4 @@
+{
+	"main": "./index.ts",
+	"compatibility_date": "2025-04-28",
+}

package/templates/pages-dev-pipeline.ts

@@ -20,10 +20,11 @@ export default <ExportedHandler<{ ASSETS: Fetcher }>>{
 
 		for (const include of routes.include) {
 			if (isRoutingRuleMatch(pathname, include)) {
-				if (worker.fetch === undefined) {
+				const workerAsHandler = worker as ExportedHandler;
+				if (workerAsHandler.fetch === undefined) {
 					throw new TypeError("Entry point missing `fetch` handler");
 				}
-				return worker.fetch(request, env, context);
+				return workerAsHandler.fetch(request, env, context);
 			}
 		}
 

package/templates/pages-template-plugin.ts

@@ -41,14 +41,14 @@ type EventPluginContext<Env, P extends string, Data, PluginArgs> = {
 declare type PagesFunction<
 	Env = unknown,
 	P extends string = string,
-	Data extends Record<string, unknown> = Record<string, unknown>
+	Data extends Record<string, unknown> = Record<string, unknown>,
 > = (context: EventContext<Env, P, Data>) => Response | Promise<Response>;
 
 declare type PagesPluginFunction<
 	Env = unknown,
 	P extends string = string,
 	Data extends Record<string, unknown> = Record<string, unknown>,
-	PluginArgs = unknown
+	PluginArgs = unknown,
 > = (
 	context: EventPluginContext<Env, P, Data, PluginArgs>
 ) => Response | Promise<Response>;

package/templates/pages-template-worker.ts

@@ -29,7 +29,7 @@ type EventContext<Env, P extends string, Data> = {
 declare type PagesFunction<
 	Env = unknown,
 	P extends string = string,
-	Data extends Record<string, unknown> = Record<string, unknown>
+	Data extends Record<string, unknown> = Record<string, unknown>,
 > = (context: EventContext<Env, P, Data>) => Response | Promise<Response>;
 /* end @cloudflare/workers-types */
 

package/templates/startDevWorker/InspectorProxyWorker.ts

@@ -60,7 +60,10 @@ function isDevToolsEvent<Method extends DevToolsEvents["method"]>(
 }
 
 export class InspectorProxyWorker implements DurableObject {
-	constructor(_state: DurableObjectState, readonly env: Env) {}
+	constructor(
+		_state: DurableObjectState,
+		readonly env: Env
+	) {}
 
 	websockets: {
 		proxyController?: WebSocket;
@@ -82,6 +85,9 @@ export class InspectorProxyWorker implements DurableObject {
 	proxyData?: ProxyData;
 	runtimeMessageBuffer: (DevToolsCommandResponses | DevToolsEvents)[] = [];
 
+	// Only allow a limited number of error-based reconnections, so as not to infinite loop
+	reconnectionsRemaining = 3;
+
 	async fetch(req: Request) {
 		if (
 			req.headers.get("Authorization") === this.env.PROXY_CONTROLLER_AUTH_SECRET
@@ -314,6 +320,17 @@ export class InspectorProxyWorker implements DurableObject {
 				`Failed to establish the WebSocket connection: expected server to reply with HTTP status code 101 (switching protocols), but received ${upgrade.status} instead.`
 			);
 
+			// Sometimes the backend will fail to connect the runtime websocket with a 502 error. These are usually transient, so try and reconnect
+			if (upgrade.status === 502 && this.reconnectionsRemaining >= 0) {
+				await scheduler.wait((3 - this.reconnectionsRemaining) * 1000);
+				this.sendDebugLog(
+					"RECONNECTING RUNTIME WEBSOCKET after 502. Reconnections remaining:",
+					this.reconnectionsRemaining
+				);
+
+				return this.reconnectRuntimeWebSocket();
+			}
+
 			this.websockets.runtimeDeferred.reject(error);
 			this.sendProxyControllerRequest({
 				type: "runtime-websocket-error",
@@ -374,6 +391,7 @@ export class InspectorProxyWorker implements DurableObject {
 	}
 	handleRuntimeWebSocketOpen(runtime: WebSocket) {
 		this.sendDebugLog("RUNTIME WEBSOCKET OPENED");
+		this.reconnectionsRemaining = 3;
 
 		this.sendRuntimeMessage(
 			{ method: "Runtime.enable", id: this.nextCounter() },

package/templates/startDevWorker/ProxyWorker.ts

@@ -33,7 +33,10 @@ export default {
 } as ExportedHandler<Env, unknown, ProxyWorkerIncomingRequestBody>;
 
 export class ProxyWorker implements DurableObject {
-	constructor(readonly state: DurableObjectState, readonly env: Env) {}
+	constructor(
+		readonly state: DurableObjectState,
+		readonly env: Env
+	) {}
 
 	proxyData?: ProxyData;
 	requestQueue = new Map<Request, DeferredPromise<Response>>();
@@ -121,8 +124,10 @@ export class ProxyWorker implements DurableObject {
 			Object.assign(userWorkerUrl, proxyData.userWorkerUrl);
 
 			// set request.url in the UserWorker
-			const innerUrl = new URL(request.url);
-			Object.assign(innerUrl, proxyData.userWorkerInnerUrlOverrides);
+			const innerUrl = urlFromParts(
+				proxyData.userWorkerInnerUrlOverrides ?? {},
+				request.url
+			);
 			headers.set("MF-Original-URL", innerUrl.href);
 			headers.set("MF-Disable-Pretty-Error", "true"); // disables the UserWorker miniflare instance from rendering the pretty error -- instead the ProxyWorker miniflare instance will intercept the json error response and render the pretty error page
 
@@ -273,28 +278,7 @@ function insertLiveReloadScript(
 				websocketUrl.protocol =
 					websocketUrl.protocol === "http:" ? "ws:" : "wss:";
 
-				end.append(
-					`
-					<script>
-						(function() {
-							var ws;
-							function recover() {
-								ws = null;
-								setTimeout(initLiveReload, 100);
-							}
-							function initLiveReload() {
-								if (ws) return;
-                var origin = (location.protocol === "http:" ? "ws://" : "wss://") + location.host;
-								ws = new WebSocket(origin + "/cdn-cgi/live-reload", "${LIVE_RELOAD_PROTOCOL}");
-								ws.onclose = recover;
-								ws.onerror = recover;
-								ws.onmessage = location.reload.bind(location);
-							}
-						})();
-					</script>
-				`,
-					{ html: true }
-				);
+				end.append(liveReloadScript, { html: true });
 			}
 		},
 	});
@@ -302,6 +286,27 @@ function insertLiveReloadScript(
 	return htmlRewriter.transform(response);
 }
 
+const liveReloadScript = `
+<script defer type="application/javascript">
+	(function() {
+		var ws;
+		function recover() {
+			ws = null;
+			setTimeout(initLiveReload, 100);
+		}
+		function initLiveReload() {
+			if (ws) return;
+			var origin = (location.protocol === "http:" ? "ws://" : "wss://") + location.host;
+			ws = new WebSocket(origin + "/cdn-cgi/live-reload", "${LIVE_RELOAD_PROTOCOL}");
+			ws.onclose = recover;
+			ws.onerror = recover;
+			ws.onmessage = location.reload.bind(location);
+		}
+		initLiveReload();
+	})();
+</script>
+`;
+
 /**
  * Rewrite references to URLs in request/response headers.
  *

package/templates/strip-cf-connecting-ip-header.js

@@ -0,0 +1,13 @@
+function stripCfConnectingIPHeader(input, init) {
+	const request = new Request(input, init);
+	request.headers.delete("CF-Connecting-IP");
+	return request;
+}
+
+globalThis.fetch = new Proxy(globalThis.fetch, {
+	apply(target, thisArg, argArray) {
+		return Reflect.apply(target, thisArg, [
+			stripCfConnectingIPHeader.apply(null, argArray),
+		]);
+	},
+});