Support multi-worker Durable Object RPC

fixtures/do-bound/index.ts

@@ -0,0 +1,15 @@
+import { DurableObject } from "cloudflare:workers";
+
+export class ThingObject extends DurableObject {
+	fetch(request) {
+		return new Response("hello world");
+	}
+	get property() {
+		return "property:ping";
+	}
+	method() {
+		return "method:ping";
+	}
+}
+
+export default {}; // Required to treat as modules format worker

fixtures/do-bound/package.json

@@ -0,0 +1,14 @@
+{
+	"name": "do-bound",
+	"private": true,
+	"scripts": {
+		"test:ci": "vitest run",
+		"test:watch": "vitest"
+	},
+	"devDependencies": {
+		"wrangler": "workspace:*"
+	},
+	"volta": {
+		"extends": "../../package.json"
+	}
+}

fixtures/do-bound/wrangler.toml

@@ -0,0 +1,8 @@
+
+name = "do-bound"
+main = "index.ts"
+
+[durable_objects]
+bindings = [
+    { name = "OBJECT", class_name = "ThingObject" }
+]

fixtures/do-entry/index.ts

@@ -0,0 +1,16 @@
+export default {
+	async fetch(request, env, ctx) {
+		const id = env.OBJECT.newUniqueId();
+		const stub = env.OBJECT.get(id);
+
+		const { pathname } = new URL(request.url);
+		if (pathname === "/rpc") {
+			return Response.json(await stub.method());
+		}
+
+		return stub.fetch("https://placeholder:9999/", {
+			method: "POST",
+			cf: { thing: true },
+		});
+	},
+};

fixtures/do-entry/package.json

@@ -0,0 +1,14 @@
+{
+	"name": "do-entry",
+	"private": true,
+	"scripts": {
+		"test:ci": "vitest run",
+		"test:watch": "vitest"
+	},
+	"devDependencies": {
+		"wrangler": "workspace:*"
+	},
+	"volta": {
+		"extends": "../../package.json"
+	}
+}

fixtures/do-entry/wrangler.toml

@@ -0,0 +1,8 @@
+
+name = "do-entry"
+main = "index.ts"
+
+[durable_objects]
+bindings = [
+    { name = "OBJECT", class_name = "ThingObject", script_name = "do-bound" }
+]

fixtures/entrypoints-rpc-tests/tests/entrypoints.spec.ts

@@ -507,7 +507,7 @@ test("should support co-dependent services", async ({ dev }) => {
 	});
 });
 
-test("should support binding to Durable Object in another worker", async ({
+test.only("should support binding to Durable Object in another worker", async ({
 	dev,
 }) => {
 	// RPC isn't supported in this case yet :(
@@ -557,10 +557,7 @@ test("should support binding to Durable Object in another worker", async ({
 
 					const { pathname } = new URL(request.url);
 					if (pathname === "/rpc") {
-						const errors = [];
-						try { await stub.property; } catch (e) { errors.push(e); }
-						try { await stub.method(); } catch (e) { errors.push(e); }
-						return Response.json(errors.map(String));
+						return Response.json(await stub.method());
 					}
 
 					return stub.fetch("https://placeholder:9999/", {
@@ -572,21 +569,32 @@ test("should support binding to Durable Object in another worker", async ({
 		`,
 	});
 
-	await waitFor(async () => {
-		const response = await fetch(url);
+	async function fetchJson(url: string) {
+		const response = await fetch(url, {
+			headers: {
+				"MF-Disable-Pretty-Error": "1",
+			},
+		});
 		const text = await response.text();
-		// Check protocol, host, and cf preserved
-		expect(text).toBe('POST https://placeholder:9999/ {"thing":true}');
-	});
 
-	const rpcResponse = await fetch(new URL("/rpc", url));
-	const errors = await rpcResponse.json();
-	expect(errors).toMatchInlineSnapshot(`
-		[
-		  "Error: Cannot access \`ThingObject#property\` as Durable Object RPC is not yet supported between multiple \`wrangler dev\` sessions.",
-		  "Error: Cannot access \`ThingObject#method\` as Durable Object RPC is not yet supported between multiple \`wrangler dev\` sessions.",
-		]
-	`);
+		try {
+			return JSON.parse(text);
+		} catch (err) {
+			throw new Error(`Couldn't parse JSON:\n\n${text}`);
+		}
+	}
+
+	// await waitFor(async () => {
+	// 	const response = await fetch(url, {
+	// 		headers: { "MF-Disable-Pretty-Error": "1" },
+	// 	});
+	// 	const text = await response.text();
+	// 	// Check protocol, host, and cf preserved
+	// 	expect(text).toBe('POST https://placeholder:9999/ {"thing":true}');
+	// });
+
+	const json = await fetchJson(new URL("/rpc", url).href);
+	expect(json).toBe("method:ping");
 });
 
 test("should support binding to Durable Object in same worker", async ({

fixtures/worker-app/src/index.js

@@ -3,12 +3,12 @@ import { randomBytes } from "isomorphic-random-example";
 import { now } from "./dep";
 import { logErrors } from "./log";
 
-console.log("startup log");
+// console.log("startup log");
 
-console.log("The following error is a fake for testing");
-console.error(
-	"*** Received structured exception #0xc0000005: access violation; stack: 7ffe71872f57 7ff7834b643b 7ff7834b643b"
-);
+// console.log("The following error is a fake for testing");
+// console.error(
+// 	"*** Received structured exception #0xc0000005: access violation; stack: 7ffe71872f57 7ff7834b643b 7ff7834b643b"
+// );
 
 /** @param {Uint8Array} array */
 function hexEncode(array) {
@@ -19,6 +19,8 @@ function hexEncode(array) {
 
 export default {
 	async fetch(request, env) {
+		return Response.json(env.REMOTE_RPC.method());
+
 		console.log("request log");
 
 		const { pathname, origin, hostname, host } = new URL(request.url);

fixtures/worker-app/wrangler.toml

@@ -8,3 +8,8 @@ crons = ["1 * * * *"]
 
 [version_metadata]
 binding = "METADATA"
+
+[durable_objects]
+bindings = [
+    { name = "REMOTE_RPC", class_name = "ThingObject", script_name = "worker-ts" }
+]

fixtures/worker-ts/src/index.ts

@@ -1,3 +1,5 @@
+import { DurableObject } from "cloudflare:workers";
+
 /**
  * Welcome to Cloudflare Workers! This is your first worker.
  *
@@ -32,3 +34,15 @@ export default {
 		return new Response("Hello World!");
 	},
 };
+
+export class ThingObject extends DurableObject {
+	fetch() {
+		return new Response("hello");
+	}
+	get property() {
+		return "property:ping";
+	}
+	method() {
+		return "method:ping";
+	}
+}

fixtures/worker-ts/wrangler.toml

@@ -1,3 +1,8 @@
 name = "worker-ts"
 main = "src/index.ts"
 compatibility_date = "2023-05-04"
+
+[durable_objects]
+bindings = [
+    { name = "OBJECT", class_name = "ThingObject" }
+]