wrangler 4.30.0 → 4.32.0

package/config-schema.json

@@ -605,11 +605,7 @@
               },
               "service": {
                 "type": "string",
-                "description": "The name of the service."
-              },
-              "environment": {
-                "type": "string",
-                "description": "The environment of the service (e.g. production, staging, etc)."
+                "description": "The name of the service. To bind to a worker in a specific environment, you should use the format `<worker_name>-<environment_name>`."
               },
               "entrypoint": {
                 "type": "string",
@@ -1611,11 +1607,7 @@
               },
               "service": {
                 "type": "string",
-                "description": "The name of the service."
-              },
-              "environment": {
-                "type": "string",
-                "description": "The environment of the service (e.g. production, staging, etc)."
+                "description": "The name of the service. To bind to a worker in a specific environment, you should use the format `<worker_name>-<environment_name>`."
               },
               "entrypoint": {
                 "type": "string",
@@ -2390,19 +2382,22 @@
           "default": "dev"
         },
         "rollout_step_percentage": {
-          "type": "number",
-          "description": "How a rollout should be done, defining the size of it",
-          "default": 25
-        },
-        "rollout_kind": {
-          "type": "string",
-          "enum": [
-            "full_auto",
-            "none",
-            "full_manual"
+          "anyOf": [
+            {
+              "type": "number"
+            },
+            {
+              "type": "array",
+              "items": {
+                "type": "number"
+              }
+            }
           ],
-          "description": "How a rollout should be created. It supports the following modes:  - full_auto: The container application will be rolled out fully automatically.  - none: The container application won't have a roll out or update.  - manual: The container application will be rollout fully by manually actioning progress steps.",
-          "default": "full_auto"
+          "description": "Configures what percentage of instances should be updated at each step of a rollout. You can specify this as a single number, or an array of numbers.\n\nIf this is a single number, each step will progress by that percentage. The options are 5, 10, 20, 25, 50 or 100.\n\nIf this is an array, each step specifies the cumulative rollout progress. The final step must be 100.\n\nThis can be overridden adhoc by deploying with the `--containers-rollout=immediate` flag, which will roll out to 100% of instances in one step.",
+          "default": [
+            10,
+            100
+          ]
         },
         "rollout_active_grace_period": {
           "type": "number",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wrangler",
-  "version": "4.30.0",
+  "version": "4.32.0",
   "description": "Command-line interface for all things Cloudflare Workers",
   "keywords": [
     "wrangler",
@@ -54,15 +54,16 @@
     "esbuild": "0.25.4",
     "path-to-regexp": "6.3.0",
     "unenv": "2.0.0-rc.19",
-    "workerd": "1.20250813.0",
+    "workerd": "1.20250816.0",
     "@cloudflare/kv-asset-handler": "0.4.0",
-    "@cloudflare/unenv-preset": "2.6.1",
-    "miniflare": "4.20250813.1"
+    "@cloudflare/unenv-preset": "2.6.2",
+    "miniflare": "4.20250816.1"
   },
   "devDependencies": {
     "@aws-sdk/client-s3": "^3.721.0",
+    "@cloudflare/jsrpc": "link:../../vendor/jsrpc",
     "@cloudflare/types": "6.18.4",
-    "@cloudflare/workers-types": "^4.20250813.0",
+    "@cloudflare/workers-types": "^4.20250816.0",
     "@cspotcode/source-map-support": "0.8.1",
     "@iarna/toml": "^3.0.0",
     "@sentry/node": "^7.86.0",
@@ -137,14 +138,14 @@
     "xxhash-wasm": "^1.0.1",
     "yargs": "^17.7.2",
     "@cloudflare/cli": "1.1.1",
-    "@cloudflare/containers-shared": "0.2.10",
-    "@cloudflare/pages-shared": "^0.13.63",
-    "@cloudflare/workers-shared": "0.18.5",
     "@cloudflare/workers-tsconfig": "0.0.0",
-    "@cloudflare/eslint-config-worker": "1.1.0"
+    "@cloudflare/eslint-config-worker": "1.1.0",
+    "@cloudflare/pages-shared": "^0.13.65",
+    "@cloudflare/workers-shared": "0.18.6",
+    "@cloudflare/containers-shared": "0.2.10"
   },
   "peerDependencies": {
-    "@cloudflare/workers-types": "^4.20250813.0"
+    "@cloudflare/workers-types": "^4.20250816.0"
   },
   "peerDependenciesMeta": {
     "@cloudflare/workers-types": {

package/templates/remoteBindings/ProxyServerWorker.ts

@@ -0,0 +1,133 @@
+import { newWorkersRpcResponse } from "@cloudflare/jsrpc";
+import { EmailMessage } from "cloudflare:email";
+
+interface Env extends Record<string, unknown> {}
+
+class BindingNotFoundError extends Error {
+	constructor(name?: string) {
+		super(`Binding ${name ? `"${name}"` : ""} not found`);
+	}
+}
+
+/**
+ * For most bindings, we expose them as
+ *  - RPC stubs directly to @cloudflare/jsrpc, or
+ *  - HTTP based fetchers
+ * However, there are some special cases:
+ *  - SendEmail bindings need to take EmailMessage as their first parameter,
+ *    which is not serialisable. As such, we reconstruct it before sending it
+ *    on to the binding. See packages/miniflare/src/workers/email/email.worker.ts
+ *  - Dispatch Namespace bindings have a synchronous .get() method. Since we
+ *    can't emulate that over an async boundary, we mock it locally and _actually_
+ *    perform the .get() remotely at the first appropriate async point. See
+ *    packages/miniflare/src/workers/dispatch-namespace/dispatch-namespace.worker.ts
+ *
+ * getExposedJSRPCBinding() and getExposedFetcher() perform the logic for figuring out
+ * which binding is being accessed, dependending on the request. Note: Both have logic
+ * for dispatch namespaces, because dispatch namespaces can use both fetch or RPC depending
+ * on context.
+ */
+
+function getExposedJSRPCBinding(request: Request, env: Env) {
+	const url = new URL(request.url);
+	const bindingName = url.searchParams.get("MF-Binding");
+	if (!bindingName) {
+		throw new BindingNotFoundError();
+	}
+
+	const targetBinding = env[bindingName];
+	if (!targetBinding) {
+		throw new BindingNotFoundError(bindingName);
+	}
+
+	if (targetBinding.constructor.name === "SendEmail") {
+		return {
+			async send(e: ForwardableEmailMessage) {
+				// @ts-expect-error EmailMessage::raw is defined in packages/miniflare/src/workers/email/email.worker.ts
+				const message = new EmailMessage(e.from, e.to, e["EmailMessage::raw"]);
+				return (targetBinding as SendEmail).send(message);
+			},
+		};
+	}
+
+	if (url.searchParams.has("MF-Dispatch-Namespace-Options")) {
+		const { name, args, options } = JSON.parse(
+			url.searchParams.get("MF-Dispatch-Namespace-Options")!
+		);
+		return (targetBinding as DispatchNamespace).get(name, args, options);
+	}
+
+	return targetBinding;
+}
+
+function getExposedFetcher(request: Request, env: Env) {
+	const bindingName = request.headers.get("MF-Binding");
+	if (!bindingName) {
+		throw new BindingNotFoundError();
+	}
+
+	const targetBinding = env[bindingName];
+	if (!targetBinding) {
+		throw new BindingNotFoundError(bindingName);
+	}
+
+	// Special case the Dispatch Namespace binding because it has a top-level synchronous .get() call
+	const dispatchNamespaceOptions = request.headers.get(
+		"MF-Dispatch-Namespace-Options"
+	);
+	if (dispatchNamespaceOptions) {
+		const { name, args, options } = JSON.parse(dispatchNamespaceOptions);
+		return (targetBinding as DispatchNamespace).get(name, args, options);
+	}
+	return targetBinding as Fetcher;
+}
+
+/**
+ * This Worker can proxy two types of remote binding:
+ *  1. "raw" bindings, where this Worker has been configured to pass through the raw
+ *     fetch from a local workerd instance to the relevant binding
+ *  2. JSRPC bindings, where this Worker uses @cloudflare/jsrpc to proxy RPC
+ *     communication in userland. This is always over a WebSocket connection
+ */
+function isJSRPCBinding(request: Request): boolean {
+	const url = new URL(request.url);
+	return request.headers.has("Upgrade") && url.searchParams.has("MF-Binding");
+}
+
+export default {
+	async fetch(request, env) {
+		try {
+			if (isJSRPCBinding(request)) {
+				return newWorkersRpcResponse(
+					request,
+					getExposedJSRPCBinding(request, env)
+				);
+			} else {
+				const fetcher = getExposedFetcher(request, env);
+				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);
+					}
+				}
+
+				return fetcher.fetch(
+					request.headers.get("MF-URL") ?? "http://example.com",
+					new Request(request, {
+						redirect: "manual",
+						headers: originalHeaders,
+					})
+				);
+			}
+		} catch (e) {
+			if (e instanceof BindingNotFoundError) {
+				return new Response(e.message, { status: 400 });
+			}
+			return new Response((e as Error).message, { status: 500 });
+		}
+	},
+} satisfies ExportedHandler<Env>;

package/templates/remoteBindings/{proxyServerWorker/wrangler.jsonc → wrangler.jsonc}

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