[miniflare/wrangler] Revert AI Search RPC workaround (#12691)

Author: penalosa

.changeset/remove-ai-search-workaround.md

@@ -0,0 +1,6 @@
+---
+"miniflare": patch
+"wrangler": patch
+---
+
+Remove temporary AI Search RPC workaround (no user-facing changes)

packages/miniflare/src/plugins/ai/index.ts

@@ -70,8 +70,7 @@ export const AI_PLUGIN: Plugin<typeof AIOptionsSchema> = {
 				),
 				worker: remoteProxyClientWorker(
 					options.ai.remoteProxyConnectionString,
-					options.ai.binding,
-					"ai"
+					options.ai.binding
 				),
 			},
 		];

packages/miniflare/src/plugins/dispatch-namespace/index.ts

@@ -90,7 +90,6 @@ export const DISPATCH_NAMESPACE_PLUGIN: Plugin<
 			worker: remoteProxyClientWorker(
 				config.remoteProxyConnectionString,
 				name,
-				undefined,
 				SCRIPT_DISPATCH_NAMESPACE_PROXY
 			),
 		}));

packages/miniflare/src/plugins/shared/constants.ts

@@ -76,7 +76,6 @@ export function objectEntryWorker(
 export function remoteProxyClientWorker(
 	remoteProxyConnectionString: RemoteProxyConnectionString | undefined,
 	binding: string,
-	bindingType?: string,
 	script?: () => string
 ) {
 	return {
@@ -100,14 +99,6 @@ export function remoteProxyClientWorker(
 				name: "binding",
 				text: binding,
 			},
-			...(bindingType
-				? [
-						{
-							name: "bindingType",
-							text: bindingType,
-						},
-					]
-				: []),
 		],
 	};
 }

packages/miniflare/src/workers/shared/remote-bindings-utils.ts

@@ -6,12 +6,10 @@ import { newWebSocketRpcSession } from "capnweb";
 export type RemoteBindingEnv = {
 	remoteProxyConnectionString?: string;
 	binding: string;
-	bindingType?: string;
 };
 
 /** Headers sent alongside proxy requests to provide additional context. */
 export type ProxyMetadata = {
-	"MF-Binding-Type"?: string;
 	"MF-Dispatch-Namespace-Options"?: string;
 };
 

packages/miniflare/src/workers/shared/remote-proxy-client.worker.ts

@@ -19,11 +19,7 @@ export default class Client extends WorkerEntrypoint<RemoteBindingEnv> {
 		super(ctx, env);
 
 		const stub = env.remoteProxyConnectionString
-			? makeRemoteProxyStub(
-					env.remoteProxyConnectionString,
-					env.binding,
-					env.bindingType ? { "MF-Binding-Type": env.bindingType } : undefined
-				)
+			? makeRemoteProxyStub(env.remoteProxyConnectionString, env.binding)
 			: undefined;
 
 		return new Proxy(this, {

packages/wrangler/src/__tests__/dev/proxy-server-ai-rpc.test.ts

@@ -3,18 +3,6 @@ import { EmailMessage } from "cloudflare:email";
 
 interface Env extends Record<string, unknown> {}
 
-/**
- * List of RPC methods exposed by the raw AI binding that need proxying
- * through a plain-object wrapper. The raw AI binding (deployed with raw:true)
- * has a non-standard prototype that capnweb's typeForRpc() doesn't recognise,
- * causing "RPC stub points at a non-serializable type". By wrapping only the
- * allowed RPC methods in a plain object we give capnweb an Object.prototype
- * target it can navigate.
- *
- * Add new AI RPC method names here as they are introduced.
- */
-const AI_RPC_METHODS = ["aiSearch"] as const;
-
 class BindingNotFoundError extends Error {
 	constructor(name?: string) {
 		super(`Binding ${name ? `"${name}"` : ""} not found`);
@@ -33,11 +21,6 @@ class BindingNotFoundError extends Error {
  *    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
- *  - AI bindings (raw:true / minimal_mode) have a workerd-internal prototype
- *    that capnweb's typeForRpc() classifies as "unsupported", causing
- *    "RPC stub points at a non-serializable type". We wrap the binding in a
- *    plain object that delegates only the allowed RPC methods (AI_RPC_METHODS)
- *    so capnweb gets an Object.prototype target it can navigate.
  *
  * getExposedJSRPCBinding() and getExposedFetcher() perform the logic for figuring out
  * which binding is being accessed, dependending on the request. Note: Both have logic
@@ -77,19 +60,6 @@ function getExposedJSRPCBinding(request: Request, env: Env) {
 		};
 	}
 
-	if (url.searchParams.get("MF-Binding-Type") === "ai") {
-		const wrapper: Record<string, (...args: unknown[]) => unknown> = {};
-		for (const method of AI_RPC_METHODS) {
-			if (typeof (targetBinding as any)[method] === "function") {
-				wrapper[method] = (...args: unknown[]) =>
-					(targetBinding as any)[method](...args);
-			}
-		}
-		if (Object.keys(wrapper).length > 0) {
-			return wrapper;
-		}
-	}
-
 	if (url.searchParams.has("MF-Dispatch-Namespace-Options")) {
 		const { name, args, options } = JSON.parse(
 			url.searchParams.get("MF-Dispatch-Namespace-Options")!