wrangler 0.0.0-fd084bc0 → 0.0.0-fd0fb230

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wrangler",
-  "version": "0.0.0-fd084bc0",
+  "version": "0.0.0-fd0fb230",
   "description": "Command-line interface for all things Cloudflare Workers",
   "keywords": [
     "wrangler",
@@ -83,7 +83,6 @@
     }
   },
   "dependencies": {
-    "@cloudflare/kv-asset-handler": "^0.2.0",
     "@esbuild-plugins/node-globals-polyfill": "^0.2.3",
     "@esbuild-plugins/node-modules-polyfill": "^0.2.2",
     "blake3-wasm": "^2.1.5",
@@ -96,7 +95,8 @@
     "selfsigned": "^2.0.1",
     "source-map": "0.6.1",
     "xxhash-wasm": "^1.0.1",
-    "miniflare": "3.20231218.4"
+    "@cloudflare/kv-asset-handler": "0.3.1",
+    "miniflare": "3.20240129.3"
   },
   "devDependencies": {
     "@cloudflare/ai": "^1.0.35",
@@ -187,12 +187,20 @@
     "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.9",
+    "@cloudflare/pages-shared": "^0.11.13",
     "@cloudflare/workers-tsconfig": "0.0.0"
   },
   "optionalDependencies": {
     "fsevents": "~2.3.2"
   },
+  "peerDependencies": {
+    "@cloudflare/workers-types": "^4.20230914.0"
+  },
+  "peerDependenciesMeta": {
+    "@cloudflare/workers-types": {
+      "optional": true
+    }
+  },
   "engines": {
     "node": ">=16.17.0"
   },
@@ -212,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 --single-thread --dir ./e2e --retry 2 run",
+    "test:e2e": "vitest --test-timeout 240000 --poolOptions.threads.singleThread --dir ./e2e --retry 2 run",
     "test:watch": "pnpm run test --testTimeout=50000 --watch",
     "type:tests": "tsc -p ./src/__tests__/tsconfig.json && tsc -p ./e2e/tsconfig.json"
   }

package/templates/startDevWorker/ProxyWorker.ts

@@ -1,7 +1,7 @@
-import assert from "node:assert";
 import {
 	createDeferred,
 	DeferredPromise,
+	urlFromParts,
 } from "../../src/api/startDevWorker/utils";
 import type {
 	ProxyData,
@@ -37,6 +37,7 @@ export class ProxyWorker implements DurableObject {
 
 	proxyData?: ProxyData;
 	requestQueue = new Map<Request, DeferredPromise<Response>>();
+	requestRetryQueue = new Map<Request, DeferredPromise<Response>>();
 
 	fetch(request: Request) {
 		if (isRequestForLiveReloadWebsocket(request)) {
@@ -94,17 +95,29 @@ export class ProxyWorker implements DurableObject {
 		return new Response(null, { status: 204 });
 	}
 
+	/**
+	 * Process requests that are being retried first, then process newer requests.
+	 * Requests that are being retried are, by definition, older than requests which haven't been processed yet.
+	 * We don't need to be more accurate than this re ordering, since the requests are being fired off synchronously.
+	 */
+	*getOrderedQueue() {
+		yield* this.requestRetryQueue;
+		yield* this.requestQueue;
+	}
+
 	processQueue() {
-		const { proxyData } = this; // destructuring is required to keep the type-narrowing (not undefined) in the .then callback and to ensure the same proxyData is used throughout each request
+		const { proxyData } = this; // store proxyData at the moment this function was called
 		if (proxyData === undefined) return;
 
-		for (const [request, deferredResponse] of this.requestQueue) {
+		for (const [request, deferredResponse] of this.getOrderedQueue()) {
+			this.requestRetryQueue.delete(request);
 			this.requestQueue.delete(request);
 
-			const userWorkerUrl = new URL(request.url);
+			const outerUrl = new URL(request.url);
 			const headers = new Headers(request.headers);
 
 			// override url parts for proxying
+			const userWorkerUrl = new URL(request.url);
 			Object.assign(userWorkerUrl, proxyData.userWorkerUrl);
 
 			// set request.url in the UserWorker
@@ -113,8 +126,12 @@ export class ProxyWorker implements DurableObject {
 			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
 
+			rewriteUrlRelatedHeaders(headers, outerUrl, innerUrl);
+
 			// merge proxyData headers with the request headers
 			for (const [key, value] of Object.entries(proxyData.headers ?? {})) {
+				if (value === undefined) continue;
+
 				if (key.toLowerCase() === "cookie") {
 					const existing = request.headers.get("cookie") ?? "";
 					headers.set("cookie", `${existing};${value}`);
@@ -123,10 +140,12 @@ export class ProxyWorker implements DurableObject {
 				}
 			}
 
-			// explicitly NOT await-ing this promise, we are in a loop and want to process the whole queue quickly
-			// if we decide to await, we should include a timeout (~100ms) in case the user worker has long-running/parellel requests
+			// explicitly NOT await-ing this promise, we are in a loop and want to process the whole queue quickly + synchronously
 			void fetch(userWorkerUrl, new Request(request, { headers }))
 				.then((res) => {
+					res = new Response(res.body, res);
+					rewriteUrlRelatedHeaders(res.headers, innerUrl, outerUrl);
+
 					if (isHtmlResponse(res)) {
 						res = insertLiveReloadScript(request, res, this.env, proxyData);
 					}
@@ -137,17 +156,55 @@ export class ProxyWorker implements DurableObject {
 					// errors here are network errors or from response post-processing
 					// to catch only network errors, use the 2nd param of the fetch.then()
 
-					void sendMessageToProxyController(this.env, {
-						type: "error",
-						error: {
-							name: error.name,
-							message: error.message,
-							stack: error.stack,
-							cause: error.cause,
-						},
-					});
-
-					deferredResponse.reject(error);
+					// we have crossed an async boundary, so proxyData may have changed
+					// if proxyData.userWorkerUrl has changed, it means there is a new downstream UserWorker
+					// and that this error is stale since it was for a request to the old UserWorker
+					// so here we construct a newUserWorkerUrl so we can compare it to the (old) userWorkerUrl
+					const newUserWorkerUrl =
+						this.proxyData && urlFromParts(this.proxyData.userWorkerUrl);
+
+					// only report errors if the downstream proxy has NOT changed
+					if (userWorkerUrl.href === newUserWorkerUrl?.href) {
+						void sendMessageToProxyController(this.env, {
+							type: "error",
+							error: {
+								name: error.name,
+								message: error.message,
+								stack: error.stack,
+								cause: error.cause,
+							},
+						});
+
+						deferredResponse.reject(error);
+					}
+
+					// if the request can be retried (subset of idempotent requests which have no body), requeue it
+					else if (request.method === "GET" || request.method === "HEAD") {
+						this.requestRetryQueue.set(request, deferredResponse);
+						// we would only end up here if the downstream UserWorker is chang*ing*
+						// i.e. we are in a `pause`d state and expecting a `play` message soon
+						// this request will be processed (retried) when the `play` message arrives
+						// for that reason, we do not need to call `this.processQueue` here
+						// (but, also, it can't hurt to call it since it bails when
+						// in a `pause`d state i.e. `this.proxyData` is undefined)
+					}
+
+					// if the request cannot be retried, respond with 503 Service Unavailable
+					// important to note, this is not an (unexpected) error -- it is an acceptable flow of local development
+					// it would be incorrect to retry non-idempotent requests
+					// and would require cloning all body streams to avoid stream reuse (which is inefficient but not out of the question in the future)
+					// this is a good enough UX for now since it solves the most common GET use-case
+					else {
+						deferredResponse.resolve(
+							new Response(
+								"Your worker restarted mid-request. Please try sending the request again. Only GET or HEAD requests are retried automatically.",
+								{
+									status: 503,
+									headers: { "Retry-After": "0" },
+								}
+							)
+						);
+					}
 				});
 		}
 	}
@@ -166,25 +223,14 @@ function isRequestForLiveReloadWebsocket(req: Request): boolean {
 	return isWebSocketUpgrade && websocketProtocol === LIVE_RELOAD_PROTOCOL;
 }
 
-async function sendMessageToProxyController(
+function sendMessageToProxyController(
 	env: Env,
-	message: ProxyWorkerOutgoingRequestBody,
-	retries = 3
+	message: ProxyWorkerOutgoingRequestBody
 ) {
-	try {
-		await env.PROXY_CONTROLLER.fetch("http://dummy", {
-			method: "POST",
-			body: JSON.stringify(message),
-		});
-	} catch (cause) {
-		if (retries > 0) {
-			return sendMessageToProxyController(env, message, retries - 1);
-		}
-
-		// no point sending an error message if we can't send this message
-
-		throw cause;
-	}
+	return env.PROXY_CONTROLLER.fetch("http://dummy", {
+		method: "POST",
+		body: JSON.stringify(message),
+	});
 }
 
 function insertLiveReloadScript(
@@ -250,3 +296,20 @@ function insertLiveReloadScript(
 
 	return htmlRewriter.transform(response);
 }
+
+/**
+ * Rewrite references to URLs in request/response headers.
+ *
+ * This function is used to map the URLs in headers like Origin and Access-Control-Allow-Origin
+ * so that this proxy is transparent to the Client Browser and User Worker.
+ */
+function rewriteUrlRelatedHeaders(headers: Headers, from: URL, to: URL) {
+	headers.forEach((value, key) => {
+		if (typeof value === "string" && value.includes(from.host)) {
+			headers.set(
+				key,
+				value.replaceAll(from.origin, to.origin).replaceAll(from.host, to.host)
+			);
+		}
+	});
+}

package/wrangler-dist/ProxyWorker.js

@@ -15,6 +15,11 @@ function createDeferred(previousDeferred) {
     reject
   };
 }
+function urlFromParts(parts, base = "http://localhost") {
+  const url = new URL(base);
+  Object.assign(url, parts);
+  return url;
+}
 
 // templates/startDevWorker/ProxyWorker.ts
 var LIVE_RELOAD_PROTOCOL = "WRANGLER_PROXYWORKER_LIVE_RELOAD_PROTOCOL";
@@ -32,6 +37,7 @@ var ProxyWorker = class {
   }
   proxyData;
   requestQueue = /* @__PURE__ */ new Map();
+  requestRetryQueue = /* @__PURE__ */ new Map();
   fetch(request) {
     if (isRequestForLiveReloadWebsocket(request)) {
       return this.handleLiveReloadWebSocket(request);
@@ -68,20 +74,34 @@ var ProxyWorker = class {
     }
     return new Response(null, { status: 204 });
   }
+  /**
+   * Process requests that are being retried first, then process newer requests.
+   * Requests that are being retried are, by definition, older than requests which haven't been processed yet.
+   * We don't need to be more accurate than this re ordering, since the requests are being fired off synchronously.
+   */
+  *getOrderedQueue() {
+    yield* this.requestRetryQueue;
+    yield* this.requestQueue;
+  }
   processQueue() {
     const { proxyData } = this;
     if (proxyData === void 0)
       return;
-    for (const [request, deferredResponse] of this.requestQueue) {
+    for (const [request, deferredResponse] of this.getOrderedQueue()) {
+      this.requestRetryQueue.delete(request);
       this.requestQueue.delete(request);
-      const userWorkerUrl = new URL(request.url);
+      const outerUrl = new URL(request.url);
       const headers = new Headers(request.headers);
+      const userWorkerUrl = new URL(request.url);
       Object.assign(userWorkerUrl, proxyData.userWorkerUrl);
       const innerUrl = new URL(request.url);
       Object.assign(innerUrl, proxyData.userWorkerInnerUrlOverrides);
       headers.set("MF-Original-URL", innerUrl.href);
       headers.set("MF-Disable-Pretty-Error", "true");
+      rewriteUrlRelatedHeaders(headers, outerUrl, innerUrl);
       for (const [key, value] of Object.entries(proxyData.headers ?? {})) {
+        if (value === void 0)
+          continue;
         if (key.toLowerCase() === "cookie") {
           const existing = request.headers.get("cookie") ?? "";
           headers.set("cookie", `${existing};${value}`);
@@ -90,21 +110,38 @@ var ProxyWorker = class {
         }
       }
       void fetch(userWorkerUrl, new Request(request, { headers })).then((res) => {
+        res = new Response(res.body, res);
+        rewriteUrlRelatedHeaders(res.headers, innerUrl, outerUrl);
         if (isHtmlResponse(res)) {
           res = insertLiveReloadScript(request, res, this.env, proxyData);
         }
         deferredResponse.resolve(res);
       }).catch((error) => {
-        void sendMessageToProxyController(this.env, {
-          type: "error",
-          error: {
-            name: error.name,
-            message: error.message,
-            stack: error.stack,
-            cause: error.cause
-          }
-        });
-        deferredResponse.reject(error);
+        const newUserWorkerUrl = this.proxyData && urlFromParts(this.proxyData.userWorkerUrl);
+        if (userWorkerUrl.href === newUserWorkerUrl?.href) {
+          void sendMessageToProxyController(this.env, {
+            type: "error",
+            error: {
+              name: error.name,
+              message: error.message,
+              stack: error.stack,
+              cause: error.cause
+            }
+          });
+          deferredResponse.reject(error);
+        } else if (request.method === "GET" || request.method === "HEAD") {
+          this.requestRetryQueue.set(request, deferredResponse);
+        } else {
+          deferredResponse.resolve(
+            new Response(
+              "Your worker restarted mid-request. Please try sending the request again. Only GET or HEAD requests are retried automatically.",
+              {
+                status: 503,
+                headers: { "Retry-After": "0" }
+              }
+            )
+          );
+        }
       });
     }
   }
@@ -120,18 +157,11 @@ function isRequestForLiveReloadWebsocket(req) {
   const isWebSocketUpgrade = req.headers.get("Upgrade") === "websocket";
   return isWebSocketUpgrade && websocketProtocol === LIVE_RELOAD_PROTOCOL;
 }
-async function sendMessageToProxyController(env, message, retries = 3) {
-  try {
-    await env.PROXY_CONTROLLER.fetch("http://dummy", {
-      method: "POST",
-      body: JSON.stringify(message)
-    });
-  } catch (cause) {
-    if (retries > 0) {
-      return sendMessageToProxyController(env, message, retries - 1);
-    }
-    throw cause;
-  }
+function sendMessageToProxyController(env, message) {
+  return env.PROXY_CONTROLLER.fetch("http://dummy", {
+    method: "POST",
+    body: JSON.stringify(message)
+  });
 }
 function insertLiveReloadScript(request, response, env, proxyData) {
   const htmlRewriter = new HTMLRewriter();
@@ -179,6 +209,16 @@ function insertLiveReloadScript(request, response, env, proxyData) {
   });
   return htmlRewriter.transform(response);
 }
+function rewriteUrlRelatedHeaders(headers, from, to) {
+  headers.forEach((value, key) => {
+    if (typeof value === "string" && value.includes(from.host)) {
+      headers.set(
+        key,
+        value.replaceAll(from.origin, to.origin).replaceAll(from.host, to.host)
+      );
+    }
+  });
+}
 export {
   ProxyWorker,
   ProxyWorker_default as default

package/wrangler-dist/ProxyWorker.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../src/api/startDevWorker/utils.ts", "../templates/startDevWorker/ProxyWorker.ts"],
-  "mappings": ";AAAA,OAAO,YAAY;AASZ,SAAS,eACf,kBACqB;AACrB,MAAI,SAAS;AACb,QAAM,aAAa,IAAI,QAAW,CAAC,UAAU,YAAY;AACxD,cAAU;AACV,aAAS;AAAA,EACV,CAAC;AACD,SAAO,OAAO;AACd,SAAO,MAAM;AAIb,oBAAkB,QAAQ,UAAU;AAEpC,SAAO;AAAA,IACN,SAAS;AAAA,IACT;AAAA,IACA;AAAA,EACD;AACD;;;ACLA,IAAM,uBAAuB;AAC7B,IAAO,sBAAQ;AAAA,EACd,MAAM,KAAK,KAAK;AACf,UAAM,YAAY,IAAI,eAAe,WAAW,EAAE;AAClD,UAAM,iBAAiB,IAAI,eAAe,IAAI,SAAS;AAEvD,WAAO,eAAe,MAAM,GAAG;AAAA,EAChC;AACD;AAEO,IAAM,cAAN,MAA2C;AAAA,EACjD,YAAqB,OAAoC,KAAU;AAA9C;AAAoC;AAAA,EAAW;AAAA,EAEpE;AAAA,EACA,eAAe,oBAAI,IAAwC;AAAA,EAE3D,MAAM,SAAkB;AACvB,QAAI,gCAAgC,OAAO,GAAG;AAG7C,aAAO,KAAK,0BAA0B,OAAO;AAAA,IAC9C;AAEA,QAAI,6BAA6B,SAAS,KAAK,GAAG,GAAG;AAGpD,aAAO,KAAK,8BAA8B,OAAO;AAAA,IAClD;AAGA,UAAM,WAAW,eAAyB;AAE1C,SAAK,aAAa,IAAI,SAAS,QAAQ;AACvC,SAAK,aAAa;AAElB,WAAO,SAAS;AAAA,EACjB;AAAA,EAEA,0BAA0B,SAAkB;AAC3C,UAAM,EAAE,GAAG,UAAU,GAAG,WAAW,IAAI,IAAI,cAAc;AACzD,UAAM,oBACL,QAAQ,QAAQ,IAAI,wBAAwB,KAAK;AAElD,SAAK,MAAM,gBAAgB,YAAY,CAAC,aAAa,CAAC;AAEtD,WAAO,IAAI,SAAS,MAAM;AAAA,MACzB,QAAQ;AAAA,MACR,WAAW;AAAA,MACX,SAAS,EAAE,0BAA0B,kBAAkB;AAAA,IACxD,CAAC;AAAA,EACF;AAAA,EAEA,8BAA8B,SAAkB;AAC/C,UAAM,QAAQ,QAAQ,IAAI;AAC1B,YAAQ,OAAO,MAAM;AAAA,MACpB,KAAK;AACJ,aAAK,YAAY;AACjB;AAAA,MAED,KAAK;AACJ,aAAK,YAAY,MAAM;AACvB,aAAK,aAAa;AAClB,aAAK,MACH,cAAc,aAAa,EAC3B,QAAQ,CAAC,OAAO,GAAG,KAAK,QAAQ,CAAC;AAEnC;AAAA,IACF;AAEA,WAAO,IAAI,SAAS,MAAM,EAAE,QAAQ,IAAI,CAAC;AAAA,EAC1C;AAAA,EAEA,eAAe;AACd,UAAM,EAAE,UAAU,IAAI;AACtB,QAAI,cAAc;AAAW;AAE7B,eAAW,CAAC,SAAS,gBAAgB,KAAK,KAAK,cAAc;AAC5D,WAAK,aAAa,OAAO,OAAO;AAEhC,YAAM,gBAAgB,IAAI,IAAI,QAAQ,GAAG;AACzC,YAAM,UAAU,IAAI,QAAQ,QAAQ,OAAO;AAG3C,aAAO,OAAO,eAAe,UAAU,aAAa;AAGpD,YAAM,WAAW,IAAI,IAAI,QAAQ,GAAG;AACpC,aAAO,OAAO,UAAU,UAAU,2BAA2B;AAC7D,cAAQ,IAAI,mBAAmB,SAAS,IAAI;AAC5C,cAAQ,IAAI,2BAA2B,MAAM;AAG7C,iBAAW,CAAC,KAAK,KAAK,KAAK,OAAO,QAAQ,UAAU,WAAW,CAAC,CAAC,GAAG;AACnE,YAAI,IAAI,YAAY,MAAM,UAAU;AACnC,gBAAM,WAAW,QAAQ,QAAQ,IAAI,QAAQ,KAAK;AAClD,kBAAQ,IAAI,UAAU,GAAG,YAAY,OAAO;AAAA,QAC7C,OAAO;AACN,kBAAQ,IAAI,KAAK,KAAK;AAAA,QACvB;AAAA,MACD;AAIA,WAAK,MAAM,eAAe,IAAI,QAAQ,SAAS,EAAE,QAAQ,CAAC,CAAC,EACzD,KAAK,CAAC,QAAQ;AACd,YAAI,eAAe,GAAG,GAAG;AACxB,gBAAM,uBAAuB,SAAS,KAAK,KAAK,KAAK,SAAS;AAAA,QAC/D;AAEA,yBAAiB,QAAQ,GAAG;AAAA,MAC7B,CAAC,EACA,MAAM,CAAC,UAAiB;AAIxB,aAAK,6BAA6B,KAAK,KAAK;AAAA,UAC3C,MAAM;AAAA,UACN,OAAO;AAAA,YACN,MAAM,MAAM;AAAA,YACZ,SAAS,MAAM;AAAA,YACf,OAAO,MAAM;AAAA,YACb,OAAO,MAAM;AAAA,UACd;AAAA,QACD,CAAC;AAED,yBAAiB,OAAO,KAAK;AAAA,MAC9B,CAAC;AAAA,IACH;AAAA,EACD;AACD;AAEA,SAAS,6BAA6B,KAAc,KAAmB;AACtE,SAAO,IAAI,QAAQ,IAAI,eAAe,MAAM,IAAI;AACjD;AACA,SAAS,eAAe,KAAwB;AAC/C,SAAO,IAAI,QAAQ,IAAI,cAAc,GAAG,WAAW,WAAW,KAAK;AACpE;AACA,SAAS,gCAAgC,KAAuB;AAC/D,QAAM,oBAAoB,IAAI,QAAQ,IAAI,wBAAwB;AAClE,QAAM,qBAAqB,IAAI,QAAQ,IAAI,SAAS,MAAM;AAE1D,SAAO,sBAAsB,sBAAsB;AACpD;AAEA,eAAe,6BACd,KACA,SACA,UAAU,GACT;AACD,MAAI;AACH,UAAM,IAAI,iBAAiB,MAAM,gBAAgB;AAAA,MAChD,QAAQ;AAAA,MACR,MAAM,KAAK,UAAU,OAAO;AAAA,IAC7B,CAAC;AAAA,EACF,SAAS,OAAP;AACD,QAAI,UAAU,GAAG;AAChB,aAAO,6BAA6B,KAAK,SAAS,UAAU,CAAC;AAAA,IAC9D;AAIA,UAAM;AAAA,EACP;AACD;AAEA,SAAS,uBACR,SACA,UACA,KACA,WACC;AACD,QAAM,eAAe,IAAI,aAAa;AAGtC,MAAI,eAAe;AACnB,eAAa,GAAG,qBAAqB;AAAA,IACpC,KAAK,SAAS;AACb,sBAAgB,QAAQ;AAAA,IACzB;AAAA,EACD,CAAC;AAED,eAAa,WAAW;AAAA,IACvB,IAAI,KAAK;AACR,UACC,SAAS,WAAW,OACpB,aAAa,SAAS,uCAAuC,GAC5D;AACD,aAAK,6BAA6B,KAAK;AAAA,UACtC,MAAM;AAAA,UACN;AAAA,QACD,CAAC;AAAA,MACF;AAIA,UAAI,UAAU,YAAY;AACzB,cAAM,eAAe,IAAI,IAAI,QAAQ,GAAG;AACxC,qBAAa,WACZ,aAAa,aAAa,UAAU,QAAQ;AAE7C,YAAI;AAAA,UACH;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,+DAW0D;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,UAQ1D,EAAE,MAAM,KAAK;AAAA,QACd;AAAA,MACD;AAAA,IACD;AAAA,EACD,CAAC;AAED,SAAO,aAAa,UAAU,QAAQ;AACvC;",
+  "mappings": "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",
   "names": []
 }

package/wrangler-dist/cli.d.ts

@@ -6,6 +6,7 @@ import type { DispatchFetch } from 'miniflare';
 import { Duplex } from 'stream';
 import { EventEmitter } from 'events';
 import { EventEmitter as EventEmitter_2 } from 'node:events';
+import type { IncomingRequestCfProperties as IncomingRequestCfProperties_2 } from '@cloudflare/workers-types/experimental';
 import { IpcNetConnectOpts } from 'net';
 import type { Json } from 'miniflare';
 import type { MessagePort as MessagePort_2 } from 'worker_threads';
@@ -136,19 +137,11 @@ declare type Binding = {
 /**
  * Result of the `getBindingsProxy` utility
  */
-export declare type BindingsProxy<Bindings = Record<string, unknown>> = {
+export declare type BindingsProxy<Bindings = Record<string, unknown>, CfProperties extends Record<string, unknown> = IncomingRequestCfProperties_2> = Omit<PlatformProxy<Bindings, CfProperties>, "env"> & {
     /**
      * Object containing the various proxies
      */
     bindings: Bindings;
-    /**
-     * Caches object emulating the Workers Cache runtime API
-     */
-    caches: CacheStorage_3;
-    /**
-     * Function used to dispose of the child process providing the bindings implementation
-     */
-    dispose: () => Promise<void>;
 };
 
 declare interface BlobPropertyBag {
@@ -317,9 +310,9 @@ declare type CacheQueryOptions_3 = {
     ignoreMethod?: boolean;
 };
 
-declare type CacheRequest = unknown;
+declare type CacheRequest = any;
 
-declare type CacheResponse = unknown;
+declare type CacheResponse = any;
 
 declare const caches_2: CacheStorage_2;
 
@@ -344,7 +337,7 @@ declare const CacheStorage_2: {
  *
  * We are not using miniflare's implementation because that would require the user to provide
  * miniflare-specific Request objects and they would receive back miniflare-specific Response
- * objects, this (in particular the Request part) is not really suitable for `getBindingsProxy`
+ * objects, this (in particular the Request part) is not really suitable for `getPlatformProxy`
  * as people would ideally interact with their bindings in a very production-like manner and
  * requiring them to deal with miniflare-specific classes defeats a bit the purpose of the utility.
  *
@@ -359,6 +352,7 @@ declare const CacheStorage_2: {
  * No-op implementation of CacheStorage
  */
 declare class CacheStorage_3 {
+    constructor();
     open(cacheName: string): Promise<Cache_3>;
     get default(): Cache_3;
 }
@@ -431,7 +425,7 @@ declare interface CfModule {
 /**
  * A module type.
  */
-declare type CfModuleType = "esm" | "commonjs" | "compiled-wasm" | "text" | "buffer";
+declare type CfModuleType = "esm" | "commonjs" | "compiled-wasm" | "text" | "buffer" | "python" | "python-requirement";
 
 /**
  * The type of Worker
@@ -700,7 +694,7 @@ declare interface ConfigFields<Dev extends RawDevConfig> {
 /**
  * The possible types for a `Rule`.
  */
-declare type ConfigModuleRuleType = "ESModule" | "CommonJS" | "CompiledWasm" | "Text" | "Data";
+declare type ConfigModuleRuleType = "ESModule" | "CommonJS" | "CompiledWasm" | "Text" | "Data" | "PythonModule" | "PythonRequirement";
 
 declare type ConfigUpdateEvent = {
     type: "configUpdate";
@@ -2083,6 +2077,11 @@ declare type EventTarget_2 = typeof globalThis extends { EventTarget: infer T }
     ): void
 }
 
+declare class ExecutionContext_2 {
+    waitUntil(promise: Promise<any>): void;
+    passThroughOnException(): void;
+}
+
 declare function fetch_2 (
 input: RequestInfo_2,
 init?: RequestInit_2
@@ -2266,15 +2265,36 @@ declare type FormDataEntryValue = string | File_2
  * By reading from a `wrangler.toml` file this function generates proxy binding objects that can be
  * used to simulate the interaction with bindings during local development in a Node.js environment
  *
+ * @deprecated use `getPlatformProxy` instead
+ *
+ * @param options The various options that can tweak this function's behavior
+ * @returns An Object containing the generated proxies alongside other related utilities
+ */
+export declare function getBindingsProxy<Bindings = Record<string, unknown>, CfProperties extends Record<string, unknown> = IncomingRequestCfProperties_2>(options?: GetBindingsProxyOptions): Promise<BindingsProxy<Bindings, CfProperties>>;
+
+/** Options for the `getBindingsProxy` utility */
+export declare type GetBindingsProxyOptions = GetPlatformProxyOptions;
+
+declare function getCookies (headers: Headers_2): Record<string, string>
+
+declare function getGlobalDispatcher(): Dispatcher;
+
+declare function getGlobalOrigin(): URL | undefined;
+
+/**
+ * By reading from a `wrangler.toml` file this function generates proxy objects that can be
+ * used to simulate the interaction with the Cloudflare platform during local development
+ * in a Node.js environment
+ *
  * @param options The various options that can tweak this function's behavior
  * @returns An Object containing the generated proxies alongside other related utilities
  */
-export declare function getBindingsProxy<Bindings = Record<string, unknown>>(options?: GetBindingsProxyOptions): Promise<BindingsProxy<Bindings>>;
+export declare function getPlatformProxy<Env = Record<string, unknown>, CfProperties extends Record<string, unknown> = IncomingRequestCfProperties_2>(options?: GetPlatformProxyOptions): Promise<PlatformProxy<Env, CfProperties>>;
 
 /**
- * Options for the `getBindingsProxy` utility
+ * Options for the `getPlatformProxy` utility
  */
-export declare type GetBindingsProxyOptions = {
+export declare type GetPlatformProxyOptions = {
     /**
      * The path to the config object to use (default `wrangler.toml`)
      */
@@ -2296,12 +2316,6 @@ export declare type GetBindingsProxyOptions = {
     };
 };
 
-declare function getCookies (headers: Headers_2): Record<string, string>
-
-declare function getGlobalDispatcher(): Dispatcher;
-
-declare function getGlobalOrigin(): URL | undefined;
-
 declare function getSetCookies (headers: Headers_2): Cookie[]
 
 declare class Headers_2 implements SpecIterable<[string, string]> {
@@ -2646,6 +2660,32 @@ options: { dispatcher?: Dispatcher } & Omit<Dispatcher.PipelineOptions, 'origin'
 handler: Dispatcher.PipelineHandler
 ): Duplex;
 
+/**
+ * Result of the `getPlatformProxy` utility
+ */
+export declare type PlatformProxy<Env = Record<string, unknown>, CfProperties extends Record<string, unknown> = IncomingRequestCfProperties_2> = {
+    /**
+     * Environment object containing the various Cloudflare bindings
+     */
+    env: Env;
+    /**
+     * Mock of the context object that Workers received in their request handler, all the object's methods are no-op
+     */
+    cf: CfProperties;
+    /**
+     * Mock of the context object that Workers received in their request handler, all the object's methods are no-op
+     */
+    ctx: ExecutionContext_2;
+    /**
+     * Caches object emulating the Workers Cache runtime API
+     */
+    caches: CacheStorage_3;
+    /**
+     * Function used to dispose of the child process providing the bindings implementation
+     */
+    dispose: () => Promise<void>;
+};
+
 declare class Pool extends Dispatcher {
     constructor(url: string | URL_2, options?: Pool.Options)
     /** `true` after `pool.close()` has been called. */
@@ -23004,7 +23044,7 @@ declare type ProxyData = {
     userWorkerUrl: UrlOriginParts;
     userWorkerInspectorUrl: UrlOriginAndPathnameParts;
     userWorkerInnerUrlOverrides: Partial<UrlOriginParts>;
-    headers: Record<string, string | undefined>;
+    headers: Record<string, string>;
     liveReload?: boolean;
     proxyLogsToController?: boolean;
     internalDurableObjects?: CfDurableObject[];
@@ -23469,6 +23509,8 @@ declare interface StartDevWorkerOptions {
             hostname?: string;
             port?: number;
             secure?: boolean;
+            httpsKeyPath?: string;
+            httpsCertPath?: string;
         };
         /** Controls what request.url looks like inside the worker. */
         urlOverrides?: {
@@ -23678,6 +23720,8 @@ export declare interface UnstableDevOptions {
     bundle?: boolean;
     inspectorPort?: number;
     localProtocol?: "http" | "https";
+    httpsKeyPath?: string;
+    httpsCertPath?: string;
     assets?: string;
     site?: string;
     siteInclude?: string[];