Use Cap'n Web in workers-sdk (#10724)

* Use Capnpweb in workers-sdk

* fix build

* Correct spelling of 'Capnpweb' to 'Cap'n Web'

Author: penalosa

.changeset/odd-trains-hear.md

@@ -0,0 +1,6 @@
+---
+"miniflare": patch
+"wrangler": patch
+---
+
+Use Cap'n Web in `workers-sdk`

.gitignore

@@ -230,4 +230,3 @@ dist/**
 .env*
 !.env.example
 .node-cache/
-!vendor/jsrpc/dist

.prettierignore

@@ -49,5 +49,3 @@ fixtures/redirected-config-worker/build/*
 fixtures/redirected-config-worker-with-environments/build/*
 
 packages/vite-plugin-cloudflare/playground/**/*.d.ts
-
-vendor/jsrpc

packages/miniflare/package.json

@@ -60,7 +60,6 @@
 		"@ava/typescript": "^4.1.0",
 		"@cloudflare/cli": "workspace:*",
 		"@cloudflare/containers-shared": "workspace:*",
-		"@cloudflare/jsrpc": "link:../../vendor/jsrpc",
 		"@cloudflare/kv-asset-handler": "workspace:*",
 		"@cloudflare/workers-shared": "workspace:*",
 		"@cloudflare/workers-types": "catalog:default",
@@ -80,6 +79,7 @@
 		"@typescript-eslint/parser": "catalog:default",
 		"ava": "^6.0.1",
 		"capnp-es": "^0.0.11",
+		"capnweb": "^0.1.0",
 		"chokidar": "^4.0.1",
 		"concurrently": "^8.2.2",
 		"devalue": "^5.3.2",

packages/miniflare/src/workers/dispatch-namespace/dispatch-namespace.worker.ts

@@ -1,4 +1,4 @@
-import { newWebSocketRpcSession } from "@cloudflare/jsrpc";
+import { newWebSocketRpcSession } from "capnweb";
 import { makeFetch } from "../shared/remote-bindings-utils";
 
 interface Env {
@@ -20,9 +20,14 @@ export default function (env: Env) {
 				"MF-Dispatch-Namespace-Options",
 				JSON.stringify({ name, args, options })
 			);
-			const stub = newWebSocketRpcSession(url.href);
 
-			return new Proxy(stub, {
+			type ProxiedService = Omit<Service, "connect" | "fetch"> & {
+				fetch: typeof fetch;
+				connect: never;
+			};
+			const stub = newWebSocketRpcSession<ProxiedService>(url.href);
+
+			return new Proxy<ProxiedService>(stub, {
 				get(_, p) {
 					// We don't want to wrap direct .fetch() calls on a customer worker in a JSRPC layer
 					// Instead, intercept accesses to the specific `fetch` key, and send them directly
@@ -42,7 +47,7 @@ export default function (env: Env) {
 
 					return Reflect.get(stub, p);
 				},
-			}) as Service;
+			});
 		},
 	} satisfies DispatchNamespace;
 }

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

@@ -1,4 +1,4 @@
-import { newWebSocketRpcSession } from "@cloudflare/jsrpc";
+import { newWebSocketRpcSession } from "capnweb";
 import { WorkerEntrypoint } from "cloudflare:workers";
 import { makeFetch } from "./remote-bindings-utils";
 

packages/miniflare/src/workers/shared/timers.worker.ts

@@ -27,7 +27,7 @@ export class Timers {
 		...args: Args
 	): TimerHandle {
 		if (this.#fakeTimestamp === undefined) {
-			return setTimeout(closure, delay, ...args);
+			return setTimeout(closure, delay, ...args) as unknown as TimerHandle;
 		}
 
 		const handle = this.#fakeNextTimerHandle++;

packages/miniflare/src/workers/tsconfig.json

@@ -7,8 +7,9 @@
 		"moduleResolution": "bundler",
 		"isolatedModules": true,
 		"noEmit": true,
-		"types": ["@cloudflare/workers-types/experimental"],
+		"types": ["@cloudflare/workers-types/experimental", "@types/node"],
 		"experimentalDecorators": true,
+		"skipLibCheck": true,
 		"paths": {
 			"miniflare:shared": ["./shared/index.worker.ts"],
 			"miniflare:zod": ["./shared/zod.worker.ts"]

packages/wrangler/package.json

@@ -80,7 +80,6 @@
 		"@cloudflare/cli": "workspace:*",
 		"@cloudflare/containers-shared": "workspace:*",
 		"@cloudflare/eslint-config-shared": "workspace:*",
-		"@cloudflare/jsrpc": "link:../../vendor/jsrpc",
 		"@cloudflare/pages-shared": "workspace:^",
 		"@cloudflare/types": "6.18.4",
 		"@cloudflare/workers-shared": "workspace:*",
@@ -108,6 +107,7 @@
 		"@types/yargs": "^17.0.22",
 		"@vitest/ui": "catalog:default",
 		"@webcontainer/env": "^1.1.0",
+		"capnweb": "^0.1.0",
 		"chalk": "^5.2.0",
 		"chokidar": "^4.0.1",
 		"cli-table3": "^0.6.3",

packages/wrangler/templates/remoteBindings/ProxyServerWorker.ts

@@ -1,4 +1,4 @@
-import { newWorkersRpcResponse } from "@cloudflare/jsrpc";
+import { newWorkersRpcResponse } from "capnweb";
 import { EmailMessage } from "cloudflare:email";
 
 interface Env extends Record<string, unknown> {}
@@ -11,7 +11,7 @@ class BindingNotFoundError extends Error {
 
 /**
  * For most bindings, we expose them as
- *  - RPC stubs directly to @cloudflare/jsrpc, or
+ *  - RPC stubs directly to capnweb, or
  *  - HTTP based fetchers
  * However, there are some special cases:
  *  - SendEmail bindings need to take EmailMessage as their first parameter,
@@ -86,7 +86,7 @@ function getExposedFetcher(request: Request, env: Env) {
  * 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
+ *  2. JSRPC bindings, where this Worker uses capnweb to proxy RPC
  *     communication in userland. This is always over a WebSocket connection
  */
 function isJSRPCBinding(request: Request): boolean {