fix(core): update websocket to use event listeners

NathanFlurry · jog1t · commit ea576927c5c9 · 2025-06-26T15:59:47.000+02:00
diff --git a/docs/concepts/cors.mdx b/docs/concepts/cors.mdx
@@ -18,7 +18,7 @@ import { setup } from "rivetkit";
 import counter from "./counter";
 
 const registry = setup({
-  actors: { counter },
+  use: { counter },
   // Change this to match your frontend's origin
   cors: { origin: "https://yourdomain.com" }
 });
diff --git a/docs/concepts/overview.mdx b/docs/concepts/overview.mdx
@@ -58,7 +58,7 @@ import chatRoom from "./chat_room";
 
 // Create the application
 const registry = setup({
-  actors: { chatRoom }
+  use: { chatRoom }
 });
 
 // Start serving on default port
diff --git a/docs/concepts/testing.mdx b/docs/concepts/testing.mdx
@@ -59,7 +59,7 @@ const myActor = actor({
 });
 
 export const registry = setup({
-  actors: { myActor }
+  use: { myActor }
 });
 
 export type Registry = typeof registry;
@@ -109,7 +109,7 @@ const counter = actor({
 });
 
 export const registry = setup({
-  actors: { counter }
+  use: { counter }
 });
 
 export type Registry = typeof registry;
@@ -164,7 +164,7 @@ export const chatRoom = actor({
 
 // Create and export the app
 export const registry = setup({
-  actors: { chatRoom }
+  use: { chatRoom }
 });
 
 // Export type for client type checking
@@ -225,7 +225,7 @@ const scheduler = actor({
 });
 
 export const registry = setup({
-  actors: { scheduler }
+  use: { scheduler }
 });
 
 export type Registry = typeof registry;
diff --git a/docs/integrations/better-auth.mdx b/docs/integrations/better-auth.mdx
@@ -81,7 +81,7 @@ export const counter = actor({
 });
 
 export const registry = setup({
-	actors: { counter },
+	use: { counter },
 });
 ```
 
diff --git a/docs/integrations/hono.mdx b/docs/integrations/hono.mdx
@@ -11,7 +11,7 @@ When mounting the RivetKit router at a custom path, you **must** specify the sam
 ```typescript
 // Setup the RivetKit app
 const registry = setup({
-  actors: { counter },
+  use: { counter },
   // IMPORTANT: Must specify the same basePath where your router is mounted
   basePath: "/my-path"
 });
@@ -46,7 +46,7 @@ honoApp.get("/hello", (c) => c.text("Hello, world!"));
 
 // Setup the RivetKit app
 const registry = setup({
-  actors: { counter },
+  use: { counter },
   // IMPORTANT: Must specify the same basePath where your router is mounted
   basePath: "/my-path"
 });
@@ -122,7 +122,7 @@ honoApp.get("/hello", (c) => c.text("Hello, world!"));
 
 // Setup the RivetKit app
 const registry = setup({
-  actors: { counter },
+  use: { counter },
   // IMPORTANT: Must specify the same basePath where your router is mounted
   basePath: "/my-path"
 });
@@ -174,7 +174,7 @@ honoApp.get("/hello", (c) => c.text("Hello, world!"));
 
 // Setup the RivetKit app
 const registry = setup({
-  actors: { counter },
+  use: { counter },
   // IMPORTANT: Must specify the same basePath where your router is mounted
   basePath: "/my-path"
 });
diff --git a/docs/integrations/resend.mdx b/docs/integrations/resend.mdx
@@ -51,7 +51,7 @@ const user = actor({
   },
 });
 
-export const registry = setup({ actors: { user } });
+export const registry = setup({ use: { user } });
 export type Registry = typeof registry;
 ```
 </Step>
diff --git a/docs/llm/prompt.mdx b/docs/llm/prompt.mdx
@@ -134,7 +134,7 @@ When importing from workspace packages, always check the package's `package.json
 
 ## Actor Management
 
-- App is configured with actors using `setup({ actors: { actorName }})` followed by `serve(registry)`
+- App is configured with actors using `setup({ use: { actorName }})` followed by `serve(registry)`
 - Actors are accessed by client using `client.actorName.get()`
 - Actors can pass an ID parameter or object with `client.actorName.get(id)` or `client.actorName.get({key: value})`
 - Actors can be shut down with `c.shutdown()` from within the actor
diff --git a/docs/snippets/setup-actor.mdx b/docs/snippets/setup-actor.mdx
@@ -15,7 +15,7 @@ const counter = actor({
 
 // Create the application
 export const registry = setup({
-  actors: { counter },
+  use: { counter },
   cors: { origin: "http://localhost:8080" }
 });
 
diff --git a/docs/snippets/step-define-actor.mdx b/docs/snippets/step-define-actor.mdx
@@ -18,7 +18,7 @@
 
   // Create the application
   export const registry = setup({
-	actors: { counter },
+	use: { counter },
 	cors: { origin: "*" } // Configure CORS for your production domains in production
   });
 
diff --git a/docs/workers/actions.mdx b/docs/workers/actions.mdx
@@ -104,7 +104,7 @@ const counter = actor({
 
 // Create and export the app
 const registry = setup({
-  actors: { counter }
+  use: { counter }
 });
 
 export type Registry = typeof registry;
diff --git a/docs/workers/overview.mdx b/docs/workers/overview.mdx
@@ -78,7 +78,7 @@ import chatRoom from "./chat_room";
 
 // Create the application
 const registry = setup({
-  actors: { chatRoom }
+  use: { chatRoom }
 });
 
 // Start serving on default port
diff --git a/docs/workers/quickstart-frontend.mdx b/docs/workers/quickstart-frontend.mdx
@@ -27,7 +27,7 @@ export const counter = actor({
 });
 
 export const registry = setup({
-	actors: { counter },
+	use: { counter },
 });
 ```
 
diff --git a/docs/workers/quickstart.mdx b/docs/workers/quickstart.mdx
@@ -27,7 +27,7 @@ export const counter = actor({
 });
 
 export const registry = setup({
-	actors: { counter },
+	use: { counter },
 });
 ```
 
diff --git a/examples/better-auth/src/backend/registry.ts b/examples/better-auth/src/backend/registry.ts
@@ -42,7 +42,7 @@
 // });
 //
 // export const registry = setup({
-// 	actors: { chatRoom },
+// 	use: { chatRoom },
 // });
 //
 // export type Registry = typeof registry;
diff --git a/examples/chat-room/src/workers/registry.ts b/examples/chat-room/src/workers/registry.ts
@@ -28,7 +28,7 @@ export const chatRoom = actor({
 
 // Create and export the app
 export const registry = setup({
-	actors: { chatRoom },
+	use: { chatRoom },
 });
 
 // Export type for client type checking
diff --git a/examples/cloudflare-workers/src/registry.ts b/examples/cloudflare-workers/src/registry.ts
@@ -14,7 +14,7 @@ export const counter = actor({
 });
 
 export const registry = setup({
-	actors: { counter },
+	use: { counter },
 });
 
 export type Registry = typeof registry;
diff --git a/examples/counter/src/workers/registry.ts b/examples/counter/src/workers/registry.ts
@@ -15,7 +15,7 @@ const counter = actor({
 });
 
 export const registry = setup({
-	actors: { counter },
+	use: { counter },
 });
 
 export type Registry = typeof registry;
diff --git a/examples/drizzle/src/registry.ts b/examples/drizzle/src/registry.ts
@@ -21,7 +21,7 @@
 // });
 
 // export const registry = setup({
-// 	actors: { counter },
+// 	use: { counter },
 // });
 
 // export type Registry = typeof registry;
diff --git a/examples/elysia/src/registry.ts b/examples/elysia/src/registry.ts
@@ -14,7 +14,7 @@ export const counter = actor({
 });
 
 export const registry = setup({
-	actors: { counter },
+	use: { counter },
 });
 
 export type Registry = typeof registry;
diff --git a/examples/express/src/registry.ts b/examples/express/src/registry.ts
@@ -14,7 +14,7 @@ export const counter = actor({
 });
 
 export const registry = setup({
-	actors: { counter },
+	use: { counter },
 });
 
 export type Registry = typeof registry;
diff --git a/examples/hono-react/src/backend/registry.ts b/examples/hono-react/src/backend/registry.ts
@@ -15,7 +15,7 @@ export const counter = actor({
 });
 
 export const registry = setup({
-	actors: { counter },
+	use: { counter },
 });
 
 export type Registry = typeof registry;
diff --git a/examples/hono/src/registry.ts b/examples/hono/src/registry.ts
@@ -14,7 +14,7 @@ export const counter = actor({
 });
 
 export const registry = setup({
-	actors: { counter },
+	use: { counter },
 });
 
 export type Registry = typeof registry;
diff --git a/examples/react/src/backend/registry.ts b/examples/react/src/backend/registry.ts
@@ -15,7 +15,7 @@ export const counter = actor({
 });
 
 export const registry = setup({
-	actors: { counter },
+	use: { counter },
 });
 
 export type Registry = typeof registry;
diff --git a/examples/rivet/package.json b/examples/rivet/package.json
@@ -14,7 +14,7 @@
     "typescript": "^5.5.2"
   },
   "dependencies": {
-    "@rivetkit/actor": "workspace:*"
+    "@rivetkit/actor": "https://pkg.pr.new/rivet-gg/rivetkit/@rivetkit/actor@cb1e6d4"
   },
   "stableVersion": "0.8.0"
 }
diff --git a/examples/rivet/src/server.ts b/examples/rivet/src/server.ts
@@ -1,3 +1,4 @@
 import { registry } from "./registry";
 
+console.log("new version");
 registry.runServer();
diff --git a/examples/trpc/src/registry.ts b/examples/trpc/src/registry.ts
@@ -14,7 +14,7 @@ export const counter = actor({
 });
 
 export const registry = setup({
-	actors: { counter },
+	use: { counter },
 });
 
 export type Registry = typeof registry;
diff --git a/packages/core/fixtures/driver-test-suite/registry.ts b/packages/core/fixtures/driver-test-suite/registry.ts
@@ -38,7 +38,7 @@ import {
 
 // Consolidated setup with all actors
 export const registry = setup({
-	actors: {
+	use: {
 		// From counter.ts
 		counter,
 		// From lifecycle.ts
diff --git a/packages/core/scripts/dump-openapi.ts b/packages/core/scripts/dump-openapi.ts
@@ -14,7 +14,7 @@ import { VERSION } from "@/utils";
 
 function main() {
 	const registryConfig: RegistryConfig = RegistryConfigSchema.parse({
-		actors: {},
+		use: {},
 	});
 	const registry = setup(registryConfig);
 
diff --git a/packages/core/src/client/actor-conn.ts b/packages/core/src/client/actor-conn.ts
@@ -255,18 +255,18 @@ enc
 			signal ? { signal } : undefined,
 		);
 		this.#transport = { websocket: ws };
-		ws.onopen = () => {
+		ws.addEventListener("open", () => {
 			logger().debug("websocket open");
-		};
-		ws.onmessage = async (ev) => {
+		});
+		ws.addEventListener("message", async (ev) => {
 			this.#handleOnMessage(ev.data);
-		};
-		ws.onclose = (ev) => {
+		});
+		ws.addEventListener("close", (ev) => {
 			this.#handleOnClose(ev);
-		};
-		ws.onerror = (ev) => {
+		});
+		ws.addEventListener("error", (ev) => {
 			this.#handleOnError();
-		};
+		});
 	}
 
 	async #connectSse({ signal }: { signal?: AbortSignal } = {}) {
diff --git a/packages/core/src/drivers/rivet/ws-proxy.ts b/packages/core/src/drivers/rivet/ws-proxy.ts
@@ -26,7 +26,7 @@ export async function createWebSocketProxy(
 			targetWs = new WebSocket(targetUrl, { headers });
 
 			// Set up target websocket handlers
-			targetWs.onopen = () => {
+			targetWs.addEventListener("open", () => {
 				invariant(targetWs, "targetWs does not exist");
 
 				// Process any queued messages once connected
@@ -37,13 +37,13 @@ export async function createWebSocketProxy(
 					// Clear the queue after sending
 					messageQueue.length = 0;
 				}
-			};
+			});
 
-			targetWs.onmessage = (event: any) => {
+			targetWs.addEventListener("message", (event: any) => {
 				wsContext.send(event.data as any);
-			};
+			});
 
-			targetWs.onclose = (event: any) => {
+			targetWs.addEventListener("close", (event: any) => {
 				logger().debug("target websocket closed", {
 					code: event.code,
 					reason: event.reason,
@@ -53,17 +53,17 @@ export async function createWebSocketProxy(
 					// Forward the close code and reason from target to client
 					wsContext.close(event.code, event.reason);
 				}
-			};
+			});
 
-			targetWs.onerror = () => {
+			targetWs.addEventListener("error", () => {
 				logger().warn("target websocket error");
 
 				if (wsContext.readyState === WebSocket.OPEN) {
 					// Use standard WebSocket error code: 1006 - Abnormal Closure
 					// The connection was closed abnormally, e.g., without sending or receiving a Close control frame
 					wsContext.close(1006, "Error in target connection");
 				}
-			};
+			});
 		},
 
 		// Handle messages from client to target
diff --git a/packages/core/src/inline-client-driver/fake-websocket.ts b/packages/core/src/inline-client-driver/fake-websocket.ts
diff --git a/packages/core/src/manager/auth.ts b/packages/core/src/manager/auth.ts
diff --git a/packages/core/src/manager/router.ts b/packages/core/src/manager/router.ts
diff --git a/packages/core/src/registry/config.ts b/packages/core/src/registry/config.ts
diff --git a/packages/core/src/registry/run-config.ts b/packages/core/src/registry/run-config.ts
diff --git a/packages/core/src/topologies/coordinate/actor-peer.ts b/packages/core/src/topologies/coordinate/actor-peer.ts
diff --git a/packages/core/src/topologies/partition/topology.ts b/packages/core/src/topologies/partition/topology.ts
diff --git a/packages/core/src/topologies/standalone/topology.ts b/packages/core/src/topologies/standalone/topology.ts
diff --git a/packages/core/src/utils.ts b/packages/core/src/utils.ts
diff --git a/packages/core/tests/rivet/deployment.test.ts.old b/packages/core/tests/rivet/deployment.test.ts.old
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
