@rivetkit/cloudflare-workers 0.9.1 → 0.9.2

package/src/manager-driver.ts

@@ -1,7 +1,6 @@
 import type { Encoding } from "@rivetkit/core";
 import {
 	type ActorOutput,
-	type ConnRoutingHandler,
 	type CreateInput,
 	type GetForIdInput,
 	type GetOrCreateWithKeyInput,
@@ -13,6 +12,7 @@ import {
 	type ManagerDriver,
 } from "@rivetkit/core/driver-helpers";
 import { ActorAlreadyExists, InternalError } from "@rivetkit/core/errors";
+import type { Context as HonoContext } from "hono";
 import { getCloudflareAmbientEnv } from "./handler";
 import { logger } from "./log";
 import type { Bindings } from "./mod";
@@ -48,149 +48,156 @@ const STANDARD_WEBSOCKET_HEADERS = [
 ];
 
 export class CloudflareActorsManagerDriver implements ManagerDriver {
-	connRoutingHandler: ConnRoutingHandler;
-
-	constructor() {
-		this.connRoutingHandler = {
-			custom: {
-				sendRequest: async (actorId, actorRequest): Promise<Response> => {
-					const env = getCloudflareAmbientEnv();
-
-					logger().debug("sending request to durable object", {
-						actorId,
-						method: actorRequest.method,
-						url: actorRequest.url,
-					});
-
-					const id = env.ACTOR_DO.idFromString(actorId);
-					const stub = env.ACTOR_DO.get(id);
-
-					return await stub.fetch(actorRequest);
-				},
-
-				openWebSocket: async (
-					actorId,
-					encodingKind: Encoding,
-					params: unknown,
-				): Promise<WebSocket> => {
-					const env = getCloudflareAmbientEnv();
-
-					logger().debug("opening websocket to durable object", { actorId });
-
-					// Make a fetch request to the Durable Object with WebSocket upgrade
-					const id = env.ACTOR_DO.idFromString(actorId);
-					const stub = env.ACTOR_DO.get(id);
-
-					const headers: Record<string, string> = {
-						Upgrade: "websocket",
-						Connection: "Upgrade",
-						[HEADER_EXPOSE_INTERNAL_ERROR]: "true",
-						[HEADER_ENCODING]: encodingKind,
-					};
-					if (params) {
-						headers[HEADER_CONN_PARAMS] = JSON.stringify(params);
-					}
-					// HACK: See packages/platforms/cloudflare-workers/src/websocket.ts
-					headers["sec-websocket-protocol"] = "rivetkit";
-
-					const response = await stub.fetch("http://actor/connect/websocket", {
-						headers,
-					});
-					const webSocket = response.webSocket;
-
-					if (!webSocket) {
-						throw new InternalError(
-							"missing websocket connection in response from DO",
-						);
-					}
-
-					logger().debug("durable object websocket connection open", {
-						actorId,
-					});
-
-					webSocket.accept();
-
-					// TODO: Is this still needed?
-					// HACK: Cloudflare does not call onopen automatically, so we need
-					// to call this on the next tick
-					setTimeout(() => {
-						(webSocket as any).onopen?.(new Event("open"));
-					}, 0);
-
-					return webSocket as unknown as WebSocket;
-				},
-
-				proxyRequest: async (c, actorRequest, actorId): Promise<Response> => {
-					logger().debug("forwarding request to durable object", {
-						actorId,
-						method: actorRequest.method,
-						url: actorRequest.url,
-					});
-
-					const id = c.env.ACTOR_DO.idFromString(actorId);
-					const stub = c.env.ACTOR_DO.get(id);
-
-					return await stub.fetch(actorRequest);
-				},
-				proxyWebSocket: async (
-					c,
-					path,
-					actorId,
-					encoding,
-					params,
-					authData,
-				) => {
-					logger().debug("forwarding websocket to durable object", {
-						actorId,
-						path,
-					});
-
-					// Validate upgrade
-					const upgradeHeader = c.req.header("Upgrade");
-					if (!upgradeHeader || upgradeHeader !== "websocket") {
-						return new Response("Expected Upgrade: websocket", {
-							status: 426,
-						});
-					}
-
-					// TODO: strip headers
-					const newUrl = new URL(`http://actor${path}`);
-					const actorRequest = new Request(newUrl, c.req.raw);
-
-					// Always build fresh request to prevent forwarding unwanted headers
-					// HACK: Since we can't build a new request, we need to remove
-					// non-standard headers manually
-					const headerKeys: string[] = [];
-					actorRequest.headers.forEach((v, k) => headerKeys.push(k));
-					for (const k of headerKeys) {
-						if (!STANDARD_WEBSOCKET_HEADERS.includes(k)) {
-							actorRequest.headers.delete(k);
-						}
-					}
-
-					// Add RivetKit headers
-					actorRequest.headers.set(HEADER_EXPOSE_INTERNAL_ERROR, "true");
-					actorRequest.headers.set(HEADER_ENCODING, encoding);
-					if (params) {
-						actorRequest.headers.set(
-							HEADER_CONN_PARAMS,
-							JSON.stringify(params),
-						);
-					}
-					if (authData) {
-						actorRequest.headers.set(
-							HEADER_AUTH_DATA,
-							JSON.stringify(authData),
-						);
-					}
-
-					const id = c.env.ACTOR_DO.idFromString(actorId);
-					const stub = c.env.ACTOR_DO.get(id);
-
-					return await stub.fetch(actorRequest);
-				},
-			},
+	async sendRequest(actorId: string, actorRequest: Request): Promise<Response> {
+		const env = getCloudflareAmbientEnv();
+
+		logger().debug("sending request to durable object", {
+			actorId,
+			method: actorRequest.method,
+			url: actorRequest.url,
+		});
+
+		const id = env.ACTOR_DO.idFromString(actorId);
+		const stub = env.ACTOR_DO.get(id);
+
+		return await stub.fetch(actorRequest);
+	}
+
+	async openWebSocket(
+		path: string,
+		actorId: string,
+		encoding: Encoding,
+		params: unknown,
+	): Promise<WebSocket> {
+		const env = getCloudflareAmbientEnv();
+
+		logger().debug("opening websocket to durable object", { actorId, path });
+
+		// Make a fetch request to the Durable Object with WebSocket upgrade
+		const id = env.ACTOR_DO.idFromString(actorId);
+		const stub = env.ACTOR_DO.get(id);
+
+		const headers: Record<string, string> = {
+			Upgrade: "websocket",
+			Connection: "Upgrade",
+			[HEADER_EXPOSE_INTERNAL_ERROR]: "true",
+			[HEADER_ENCODING]: encoding,
 		};
+		if (params) {
+			headers[HEADER_CONN_PARAMS] = JSON.stringify(params);
+		}
+		// HACK: See packages/drivers/cloudflare-workers/src/websocket.ts
+		headers["sec-websocket-protocol"] = "rivetkit";
+
+		// Use the path parameter to determine the URL
+		const url = `http://actor${path}`;
+
+		logger().debug("rewriting websocket url", {
+			from: path,
+			to: url,
+		});
+
+		const response = await stub.fetch(url, {
+			headers,
+		});
+		const webSocket = response.webSocket;
+
+		if (!webSocket) {
+			throw new InternalError(
+				"missing websocket connection in response from DO",
+			);
+		}
+
+		logger().debug("durable object websocket connection open", {
+			actorId,
+		});
+
+		webSocket.accept();
+
+		// TODO: Is this still needed?
+		// HACK: Cloudflare does not call onopen automatically, so we need
+		// to call this on the next tick
+		setTimeout(() => {
+			const event = new Event("open");
+			(webSocket as any).onopen?.(event);
+			(webSocket as any).dispatchEvent(event);
+		}, 0);
+
+		return webSocket as unknown as WebSocket;
+	}
+
+	async proxyRequest(
+		c: HonoContext<{ Bindings: Bindings }>,
+		actorRequest: Request,
+		actorId: string,
+	): Promise<Response> {
+		logger().debug("forwarding request to durable object", {
+			actorId,
+			method: actorRequest.method,
+			url: actorRequest.url,
+		});
+
+		const id = c.env.ACTOR_DO.idFromString(actorId);
+		const stub = c.env.ACTOR_DO.get(id);
+
+		return await stub.fetch(actorRequest);
+	}
+
+	async proxyWebSocket(
+		c: HonoContext<{ Bindings: Bindings }>,
+		path: string,
+		actorId: string,
+		encoding: Encoding,
+		params: unknown,
+		authData: unknown,
+	): Promise<Response> {
+		logger().debug("forwarding websocket to durable object", {
+			actorId,
+			path,
+		});
+
+		// Validate upgrade
+		const upgradeHeader = c.req.header("Upgrade");
+		if (!upgradeHeader || upgradeHeader !== "websocket") {
+			return new Response("Expected Upgrade: websocket", {
+				status: 426,
+			});
+		}
+
+		// TODO: strip headers
+		const newUrl = new URL(`http://actor${path}`);
+		const actorRequest = new Request(newUrl, c.req.raw);
+
+		logger().debug("rewriting websocket url", {
+			from: c.req.url,
+			to: actorRequest.url,
+		});
+
+		// Always build fresh request to prevent forwarding unwanted headers
+		// HACK: Since we can't build a new request, we need to remove
+		// non-standard headers manually
+		const headerKeys: string[] = [];
+		actorRequest.headers.forEach((v, k) => headerKeys.push(k));
+		for (const k of headerKeys) {
+			if (!STANDARD_WEBSOCKET_HEADERS.includes(k)) {
+				actorRequest.headers.delete(k);
+			}
+		}
+
+		// Add RivetKit headers
+		actorRequest.headers.set(HEADER_EXPOSE_INTERNAL_ERROR, "true");
+		actorRequest.headers.set(HEADER_ENCODING, encoding);
+		if (params) {
+			actorRequest.headers.set(HEADER_CONN_PARAMS, JSON.stringify(params));
+		}
+		if (authData) {
+			actorRequest.headers.set(HEADER_AUTH_DATA, JSON.stringify(authData));
+		}
+
+		const id = c.env.ACTOR_DO.idFromString(actorId);
+		const stub = c.env.ACTOR_DO.get(id);
+
+		return await stub.fetch(actorRequest);
 	}
 
 	async getForId({