@rivetkit/cloudflare-workers 2.0.3 → 2.0.4

package/src/manager-driver.ts

@@ -1,5 +1,5 @@
 import type { Context as HonoContext } from "hono";
-import type { Encoding } from "rivetkit";
+import type { Encoding, UniversalWebSocket } from "rivetkit";
 import {
 	type ActorOutput,
 	type CreateInput,
@@ -9,7 +9,7 @@ import {
 	HEADER_AUTH_DATA,
 	HEADER_CONN_PARAMS,
 	HEADER_ENCODING,
-	HEADER_EXPOSE_INTERNAL_ERROR,
+	type ManagerDisplayInformation,
 	type ManagerDriver,
 } from "rivetkit/driver-helpers";
 import { ActorAlreadyExists, InternalError } from "rivetkit/errors";
@@ -50,7 +50,8 @@ export class CloudflareActorsManagerDriver implements ManagerDriver {
 	async sendRequest(actorId: string, actorRequest: Request): Promise<Response> {
 		const env = getCloudflareAmbientEnv();
 
-		logger().debug("sending request to durable object", {
+		logger().debug({
+			msg: "sending request to durable object",
 			actorId,
 			method: actorRequest.method,
 			url: actorRequest.url,
@@ -67,10 +68,14 @@ export class CloudflareActorsManagerDriver implements ManagerDriver {
 		actorId: string,
 		encoding: Encoding,
 		params: unknown,
-	): Promise<WebSocket> {
+	): Promise<UniversalWebSocket> {
 		const env = getCloudflareAmbientEnv();
 
-		logger().debug("opening websocket to durable object", { actorId, path });
+		logger().debug({
+			msg: "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);
@@ -79,7 +84,6 @@ export class CloudflareActorsManagerDriver implements ManagerDriver {
 		const headers: Record<string, string> = {
 			Upgrade: "websocket",
 			Connection: "Upgrade",
-			[HEADER_EXPOSE_INTERNAL_ERROR]: "true",
 			[HEADER_ENCODING]: encoding,
 		};
 		if (params) {
@@ -91,10 +95,7 @@ export class CloudflareActorsManagerDriver implements ManagerDriver {
 		// Use the path parameter to determine the URL
 		const url = `http://actor${path}`;
 
-		logger().debug("rewriting websocket url", {
-			from: path,
-			to: url,
-		});
+		logger().debug({ msg: "rewriting websocket url", from: path, to: url });
 
 		const response = await stub.fetch(url, {
 			headers,
@@ -107,7 +108,8 @@ export class CloudflareActorsManagerDriver implements ManagerDriver {
 			);
 		}
 
-		logger().debug("durable object websocket connection open", {
+		logger().debug({
+			msg: "durable object websocket connection open",
 			actorId,
 		});
 
@@ -122,7 +124,7 @@ export class CloudflareActorsManagerDriver implements ManagerDriver {
 			(webSocket as any).dispatchEvent(event);
 		}, 0);
 
-		return webSocket as unknown as WebSocket;
+		return webSocket as unknown as UniversalWebSocket;
 	}
 
 	async proxyRequest(
@@ -130,7 +132,8 @@ export class CloudflareActorsManagerDriver implements ManagerDriver {
 		actorRequest: Request,
 		actorId: string,
 	): Promise<Response> {
-		logger().debug("forwarding request to durable object", {
+		logger().debug({
+			msg: "forwarding request to durable object",
 			actorId,
 			method: actorRequest.method,
 			url: actorRequest.url,
@@ -150,7 +153,8 @@ export class CloudflareActorsManagerDriver implements ManagerDriver {
 		params: unknown,
 		authData: unknown,
 	): Promise<Response> {
-		logger().debug("forwarding websocket to durable object", {
+		logger().debug({
+			msg: "forwarding websocket to durable object",
 			actorId,
 			path,
 		});
@@ -166,7 +170,8 @@ export class CloudflareActorsManagerDriver implements ManagerDriver {
 		const newUrl = new URL(`http://actor${path}`);
 		const actorRequest = new Request(newUrl, c.req.raw);
 
-		logger().debug("rewriting websocket url", {
+		logger().debug({
+			msg: "rewriting websocket url",
 			from: c.req.url,
 			to: actorRequest.url,
 		});
@@ -183,7 +188,6 @@ export class CloudflareActorsManagerDriver implements ManagerDriver {
 		}
 
 		// 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));
@@ -230,7 +234,7 @@ export class CloudflareActorsManagerDriver implements ManagerDriver {
 	> {
 		const env = getCloudflareAmbientEnv();
 
-		logger().debug("getWithKey: searching for actor", { name, key });
+		logger().debug({ msg: "getWithKey: searching for actor", name, key });
 
 		// Generate deterministic ID from the name and key
 		// This is aligned with how createActor generates IDs
@@ -243,7 +247,8 @@ export class CloudflareActorsManagerDriver implements ManagerDriver {
 		});
 
 		if (!actorData) {
-			logger().debug("getWithKey: no actor found with matching name and key", {
+			logger().debug({
+				msg: "getWithKey: no actor found with matching name and key",
 				name,
 				key,
 				actorId,
@@ -251,7 +256,8 @@ export class CloudflareActorsManagerDriver implements ManagerDriver {
 			return undefined;
 		}
 
-		logger().debug("getWithKey: found actor with matching name and key", {
+		logger().debug({
+			msg: "getWithKey: found actor with matching name and key",
 			actorId,
 			name,
 			key,
@@ -337,4 +343,11 @@ export class CloudflareActorsManagerDriver implements ManagerDriver {
 			key: actorData.key,
 		};
 	}
+
+	displayInformation(): ManagerDisplayInformation {
+		return {
+			name: "Cloudflare Workers",
+			properties: {},
+		};
+	}
 }