@rivetkit/cloudflare-workers 2.0.2 → 2.0.4

package/src/actor-handler-do.ts

@@ -1,18 +1,9 @@
 import { DurableObject, env } from "cloudflare:workers";
-import type {
-	ActorKey,
-	ActorRouter,
-	Registry,
-	RunConfig,
-} from "@rivetkit/core";
-import {
-	createActorRouter,
-	createClientWithDriver,
-	createInlineClientDriver,
-} from "@rivetkit/core";
-import { serializeEmptyPersistData } from "@rivetkit/core/driver-helpers";
 import type { ExecutionContext } from "hono";
 import invariant from "invariant";
+import type { ActorKey, ActorRouter, Registry, RunConfig } from "rivetkit";
+import { createActorRouter, createClientWithDriver } from "rivetkit";
+import { serializeEmptyPersistData } from "rivetkit/driver-helpers";
 import {
 	CloudflareDurableObjectGlobalState,
 	createCloudflareActorsActorDriverBuilder,
@@ -92,7 +83,7 @@ export function createActorDurableObject(
 						const key = res.get(KEYS.KEY) as ActorKey;
 						if (!key) throw new Error("missing actor key");
 
-						logger().debug("already initialized", { name, key });
+						logger().debug({ msg: "already initialized", name, key });
 
 						this.#initialized = { name, key };
 						this.#initializedPromise.resolve();
@@ -128,9 +119,7 @@ export function createActorDurableObject(
 			);
 
 			// Create inline client
-			const inlineClient = createClientWithDriver(
-				createInlineClientDriver(managerDriver),
-			);
+			const inlineClient = createClientWithDriver(managerDriver);
 
 			// Create actor driver
 			const actorDriver = runConfig.driver.actor(
@@ -169,7 +158,7 @@ export function createActorDurableObject(
 				key: req.key,
 			};
 
-			logger().debug("initialized actor", { key: req.key });
+			logger().debug({ msg: "initialized actor", key: req.key });
 
 			// Preemptively actor so the lifecycle hooks are called
 			await this.#loadActor();
@@ -194,9 +183,7 @@ export function createActorDurableObject(
 				registry.config,
 				runConfig,
 			);
-			const inlineClient = createClientWithDriver(
-				createInlineClientDriver(managerDriver),
-			);
+			const inlineClient = createClientWithDriver(managerDriver);
 			const actorDriver = runConfig.driver.actor(
 				registry.config,
 				runConfig,
@@ -206,7 +193,7 @@ export function createActorDurableObject(
 
 			// Load the actor instance and trigger alarm
 			const actor = await actorDriver.loadActor(actorId);
-			await actor.onAlarm();
+			await actor._onAlarm();
 		}
 	};
 }

package/src/config.ts

@@ -1,5 +1,5 @@
-import { RunConfigSchema } from "@rivetkit/core/driver-helpers";
 import type { Hono } from "hono";
+import { RunConfigSchema } from "rivetkit/driver-helpers";
 import { z } from "zod";
 
 export const ConfigSchema = RunConfigSchema.removeDefault()

package/src/handler.ts

@@ -1,7 +1,7 @@
 import { env } from "cloudflare:workers";
-import type { Registry, RunConfig } from "@rivetkit/core";
-import type { Client } from "@rivetkit/core/client";
 import { Hono } from "hono";
+import type { Registry, RunConfig } from "rivetkit";
+import type { Client } from "rivetkit/client";
 import {
 	type ActorHandlerInterface,
 	createActorDurableObject,
@@ -53,8 +53,6 @@ export function createServer<R extends Registry<any>>(
 	// Create config
 	const runConfig = {
 		...config,
-		// The worker acts as a server and doesn't run actors
-		role: "server",
 		driver: {
 			name: "cloudflare-workers",
 			manager: () => new CloudflareActorsManagerDriver(),

package/src/log.ts

@@ -1,7 +1,5 @@
-import { getLogger } from "@rivetkit/core/log";
-
-export const LOGGER_NAME = "driver-cloudflare-workers";
+import { getLogger } from "rivetkit/log";
 
 export function logger() {
-	return getLogger(LOGGER_NAME);
+	return getLogger("driver-cloudflare-workers");
 }

package/src/manager-driver.ts

@@ -1,4 +1,5 @@
-import type { Encoding } from "@rivetkit/core";
+import type { Context as HonoContext } from "hono";
+import type { Encoding, UniversalWebSocket } from "rivetkit";
 import {
 	type ActorOutput,
 	type CreateInput,
@@ -8,11 +9,10 @@ import {
 	HEADER_AUTH_DATA,
 	HEADER_CONN_PARAMS,
 	HEADER_ENCODING,
-	HEADER_EXPOSE_INTERNAL_ERROR,
+	type ManagerDisplayInformation,
 	type ManagerDriver,
-} from "@rivetkit/core/driver-helpers";
-import { ActorAlreadyExists, InternalError } from "@rivetkit/core/errors";
-import type { Context as HonoContext } from "hono";
+} from "rivetkit/driver-helpers";
+import { ActorAlreadyExists, InternalError } from "rivetkit/errors";
 import { getCloudflareAmbientEnv } from "./handler";
 import { logger } from "./log";
 import type { Bindings } from "./mod";
@@ -24,7 +24,6 @@ interface ActorData {
 	key: string[];
 }
 
-// Key constants similar to Redis implementation
 const KEYS = {
 	ACTOR: {
 		// Combined key for actor metadata (name and key)
@@ -51,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,
@@ -68,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);
@@ -80,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) {
@@ -92,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,
@@ -108,7 +108,8 @@ export class CloudflareActorsManagerDriver implements ManagerDriver {
 			);
 		}
 
-		logger().debug("durable object websocket connection open", {
+		logger().debug({
+			msg: "durable object websocket connection open",
 			actorId,
 		});
 
@@ -123,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(
@@ -131,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,
@@ -151,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,
 		});
@@ -167,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,
 		});
@@ -184,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));
@@ -231,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
@@ -244,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,
@@ -252,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,
@@ -338,4 +343,11 @@ export class CloudflareActorsManagerDriver implements ManagerDriver {
 			key: actorData.key,
 		};
 	}
+
+	displayInformation(): ManagerDisplayInformation {
+		return {
+			name: "Cloudflare Workers",
+			properties: {},
+		};
+	}
 }