@rivetkit/cloudflare-workers 2.0.33 → 2.0.34-rc.2

package/src/handler.ts

@@ -1,5 +1,7 @@
 import { env } from "cloudflare:workers";
-import type { Client, Registry, RunConfig } from "rivetkit";
+import type { Client, Registry } from "rivetkit";
+import { createClientWithDriver } from "rivetkit";
+import { buildManagerRouter } from "rivetkit/driver-helpers";
 import {
 	type ActorHandlerInterface,
 	createActorDurableObject,
@@ -46,7 +48,7 @@ export interface HandlerOutput {
  *
  * If you want to expose a public manager API, either:
  *
- * - Use `createHandler` to expose the Rivet API on `/rivet`
+ * - Use `createHandler` to expose the Rivet API on `/api/rivet`
  * - Forward Rivet API requests to `InlineOutput::fetch`
  */
 export function createInlineClient<R extends Registry<any>>(
@@ -61,31 +63,43 @@ export function createInlineClient<R extends Registry<any>>(
 	// Parse config
 	const config = ConfigSchema.parse(inputConfig);
 
-	// Create config
-	const runConfig = {
-		...config,
-		driver: {
-			name: "cloudflare-workers",
-			manager: () => new CloudflareActorsManagerDriver(),
-			// HACK: We can't build the actor driver until we're inside the Durable Object
-			actor: undefined as any,
-		},
-		getUpgradeWebSocket: () => upgradeWebSocket,
-	} satisfies RunConfig;
-
 	// Create Durable Object
-	const ActorHandler = createActorDurableObject(registry, runConfig);
+	const ActorHandler = createActorDurableObject(
+		registry,
+		() => upgradeWebSocket,
+	);
+
+	// Configure registry for cloudflare-workers
+	registry.config.noWelcome = true;
+	// Disable inspector since it's not supported on Cloudflare Workers
+	registry.config.inspector = {
+		enabled: false,
+		token: () => "",
+	};
+	// Set manager base path to "/" since the cloudflare handler strips the /api/rivet prefix
+	registry.config.managerBasePath = "/";
+	const parsedConfig = registry.parseConfig();
+
+	// Create manager driver
+	const managerDriver = new CloudflareActorsManagerDriver();
+
+	// Build the manager router (has actor management endpoints like /actors)
+	const { router } = buildManagerRouter(
+		parsedConfig,
+		managerDriver,
+		() => upgradeWebSocket,
+	);
 
-	// Create server
-	const { client, fetch } = registry.start(runConfig);
+	// Create client using the manager driver
+	const client = createClientWithDriver<R>(managerDriver);
 
-	return { client, fetch, config, ActorHandler };
+	return { client, fetch: router.fetch.bind(router), config, ActorHandler };
 }
 
 /**
  * Creates a handler to be exported from a Cloudflare Worker.
  *
- * This will automatically expose the Rivet manager API on `/rivet`.
+ * This will automatically expose the Rivet manager API on `/api/rivet`.
  *
  * This includes a `fetch` handler and `ActorHandler` Durable Object.
  */
@@ -120,7 +134,7 @@ export function createHandler<R extends Registry<any>>(
 				return config.fetch(request, env, ctx);
 			} else {
 				return new Response(
-					"This is a RivetKit server.\n\nLearn more at https://rivetkit.org\n",
+					"This is a RivetKit server.\n\nLearn more at https://rivet.dev\n",
 					{ status: 200 },
 				);
 			}

package/src/manager-driver.ts

@@ -1,12 +1,11 @@
-import type { Context as HonoContext } from "hono";
-import type { Encoding, UniversalWebSocket } from "rivetkit";
+import type { Hono, Context as HonoContext } from "hono";
+import type { Encoding, RegistryConfig, UniversalWebSocket } from "rivetkit";
 import {
 	type ActorOutput,
 	type CreateInput,
 	type GetForIdInput,
 	type GetOrCreateWithKeyInput,
 	type GetWithKeyInput,
-	generateRandomString,
 	type ListActorsInput,
 	type ManagerDisplayInformation,
 	type ManagerDriver,
@@ -141,6 +140,8 @@ export class CloudflareActorsManagerDriver implements ManagerDriver {
 		actorRequest: Request,
 		actorId: string,
 	): Promise<Response> {
+		const env = getCloudflareAmbientEnv();
+
 		// Parse actor ID to get DO ID
 		const [doId] = parseActorId(actorId);
 
@@ -152,8 +153,8 @@ export class CloudflareActorsManagerDriver implements ManagerDriver {
 			url: actorRequest.url,
 		});
 
-		const id = c.env.ACTOR_DO.idFromString(doId);
-		const stub = c.env.ACTOR_DO.get(id);
+		const id = env.ACTOR_DO.idFromString(doId);
+		const stub = env.ACTOR_DO.get(id);
 
 		return await stub.fetch(actorRequest);
 	}
@@ -218,15 +219,17 @@ export class CloudflareActorsManagerDriver implements ManagerDriver {
 		);
 
 		// Parse actor ID to get DO ID
+		const env = getCloudflareAmbientEnv();
 		const [doId] = parseActorId(actorId);
-		const id = c.env.ACTOR_DO.idFromString(doId);
-		const stub = c.env.ACTOR_DO.get(id);
+		const id = env.ACTOR_DO.idFromString(doId);
+		const stub = env.ACTOR_DO.get(id);
 
 		return await stub.fetch(actorRequest);
 	}
 
 	async getForId({
 		c,
+		name,
 		actorId,
 	}: GetForIdInput<{ Bindings: Bindings }>): Promise<
 		ActorOutput | undefined
@@ -412,12 +415,26 @@ export class CloudflareActorsManagerDriver implements ManagerDriver {
 
 	displayInformation(): ManagerDisplayInformation {
 		return {
-			name: "Cloudflare Workers",
-			properties: {},
+			properties: {
+				Driver: "Cloudflare Workers",
+			},
 		};
 	}
 
-	getOrCreateInspectorAccessToken() {
-		return generateRandomString();
+	setGetUpgradeWebSocket(): void {
+		// No-op for Cloudflare Workers - WebSocket upgrades are handled by the DO
+	}
+
+	async kvGet(actorId: string, key: Uint8Array): Promise<string | null> {
+		const env = getCloudflareAmbientEnv();
+
+		// Parse actor ID to get DO ID
+		const [doId] = parseActorId(actorId);
+
+		const id = env.ACTOR_DO.idFromString(doId);
+		const stub = env.ACTOR_DO.get(id);
+
+		const value = await stub.managerKvGet(key);
+		return value !== null ? new TextDecoder().decode(value) : null;
 	}
 }