rivetkit 2.0.3 → 2.0.4

package/src/drivers/file-system/global-state.ts

@@ -84,6 +84,10 @@ export class FileSystemGlobalState {
 		actorDriver: ActorDriver;
 	};
 
+	get persist(): boolean {
+		return this.#persist;
+	}
+
 	get storagePath() {
 		return this.#storagePath;
 	}
@@ -109,10 +113,11 @@ export class FileSystemGlobalState {
 				const actorIds = fsSync.readdirSync(this.#stateDir);
 				this.#actorCountOnStartup = actorIds.length;
 			} catch (error) {
-				logger().error("failed to count actors", { error });
+				logger().error({ msg: "failed to count actors", error });
 			}
 
-			logger().debug("file system driver ready", {
+			logger().debug({
+				msg: "file system driver ready",
 				dir: this.#storagePath,
 				actorCount: this.#actorCountOnStartup,
 			});
@@ -121,10 +126,10 @@ export class FileSystemGlobalState {
 			try {
 				this.#cleanupTempFilesSync();
 			} catch (err) {
-				logger().error("failed to cleanup temp files", { error: err });
+				logger().error({ msg: "failed to cleanup temp files", error: err });
 			}
 		} else {
-			logger().debug("memory driver ready");
+			logger().debug({ msg: "memory driver ready" });
 		}
 	}
 
@@ -165,7 +170,7 @@ export class FileSystemGlobalState {
 				const state = await this.loadActorStateOrError(actorId);
 				yield state;
 			} catch (error) {
-				logger().error("failed to load actor state", { actorId, error });
+				logger().error({ msg: "failed to load actor state", actorId, error });
 			}
 		}
 	}
@@ -353,7 +358,7 @@ export class FileSystemGlobalState {
 				try {
 					await fs.unlink(tempPath);
 				} catch {}
-				logger().error("failed to write alarm", { actorId, error });
+				logger().error({ msg: "failed to write alarm", actorId, error });
 				throw new Error(`Failed to write alarm: ${error}`);
 			}
 		}
@@ -398,7 +403,7 @@ export class FileSystemGlobalState {
 			} catch {
 				// Ignore cleanup errors
 			}
-			logger().error("failed to save actor state", { actorId, error });
+			logger().error({ msg: "failed to save actor state", actorId, error });
 			throw new Error(`Failed to save actor state: ${error}`);
 		}
 	}
@@ -417,7 +422,6 @@ export class FileSystemGlobalState {
 		actorDriver: ActorDriver,
 	) {
 		if (this.#runnerParams) {
-			logger().warn("already called onRunnerStart");
 			return;
 		}
 
@@ -433,7 +437,7 @@ export class FileSystemGlobalState {
 		try {
 			this.#loadAlarmsSync();
 		} catch (err) {
-			logger().error("failed to load alarms on startup", { error: err });
+			logger().error({ msg: "failed to load alarms on startup", error: err });
 		}
 	}
 
@@ -538,17 +542,18 @@ export class FileSystemGlobalState {
 					if (Number.isFinite(timestamp)) {
 						this.#scheduleAlarmTimeout(alarmData.actorId, timestamp);
 					} else {
-						logger().debug("invalid alarm file contents", { file });
+						logger().debug({ msg: "invalid alarm file contents", file });
 					}
 				} catch (err) {
-					logger().error("failed to read alarm file", {
+					logger().error({
+						msg: "failed to read alarm file",
 						file,
 						error: stringifyError(err),
 					});
 				}
 			}
 		} catch (err) {
-			logger().error("failed to list alarms directory", { error: err });
+			logger().error({ msg: "failed to list alarms directory", error: err });
 		}
 	}
 
@@ -563,7 +568,8 @@ export class FileSystemGlobalState {
 			entry.alarmTimestamp !== undefined &&
 			timestamp >= entry.alarmTimestamp
 		) {
-			logger().debug("skipping alarm schedule (later than existing)", {
+			logger().debug({
+				msg: "skipping alarm schedule (later than existing)",
 				actorId,
 				timestamp,
 				current: entry.alarmTimestamp,
@@ -571,7 +577,7 @@ export class FileSystemGlobalState {
 			return;
 		}
 
-		logger().debug("scheduling alarm", { actorId, timestamp });
+		logger().debug({ msg: "scheduling alarm", actorId, timestamp });
 
 		// Cancel existing timeout and update the current scheduled timestamp
 		entry.alarmTimeout?.abort();
@@ -587,7 +593,8 @@ export class FileSystemGlobalState {
 					await fs.unlink(this.getActorAlarmPath(actorId));
 				} catch (err: any) {
 					if (err?.code !== "ENOENT") {
-						logger().debug("failed to remove alarm file", {
+						logger().debug({
+							msg: "failed to remove alarm file",
 							actorId,
 							error: stringifyError(err),
 						});
@@ -596,7 +603,7 @@ export class FileSystemGlobalState {
 			}
 
 			try {
-				logger().debug("triggering alarm", { actorId, timestamp });
+				logger().debug({ msg: "triggering alarm", actorId, timestamp });
 
 				// Ensure actor state exists and start actor if needed
 				const loaded = await this.loadActor(actorId);
@@ -618,7 +625,8 @@ export class FileSystemGlobalState {
 				invariant(loaded.actor, "actor should be loaded after wake");
 				await loaded.actor._onAlarm();
 			} catch (err) {
-				logger().error("failed to handle alarm", {
+				logger().error({
+					msg: "failed to handle alarm",
 					actorId,
 					error: stringifyError(err),
 				});
@@ -655,17 +663,22 @@ export class FileSystemGlobalState {
 					// Remove if older than 1 hour
 					if (stat.mtimeMs < oneHourAgo) {
 						fsSync.unlinkSync(fullPath);
-						logger().info("cleaned up stale temp file", { file: tempFile });
+						logger().info({
+							msg: "cleaned up stale temp file",
+							file: tempFile,
+						});
 					}
 				} catch (err) {
-					logger().debug("failed to cleanup temp file", {
+					logger().debug({
+						msg: "failed to cleanup temp file",
 						file: tempFile,
 						error: err,
 					});
 				}
 			}
 		} catch (err) {
-			logger().error("failed to read actors directory for cleanup", {
+			logger().error({
+				msg: "failed to read actors directory for cleanup",
 				error: err,
 			});
 		}

package/src/drivers/file-system/log.ts

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

package/src/drivers/file-system/manager.ts

@@ -17,9 +17,9 @@ import type {
 	GetWithKeyInput,
 	ManagerDriver,
 } from "@/driver-helpers/mod";
-import { createInlineClientDriver } from "@/inline-client-driver/mod";
 import { ManagerInspector } from "@/inspector/manager";
 import { type Actor, ActorFeature, type ActorId } from "@/inspector/mod";
+import type { ManagerDisplayInformation } from "@/manager/driver";
 import {
 	type DriverConfig,
 	type Encoding,
@@ -27,6 +27,7 @@ import {
 	PATH_RAW_WEBSOCKET_PREFIX,
 	type RegistryConfig,
 	type RunConfig,
+	type UniversalWebSocket,
 } from "@/mod";
 import type * as schema from "@/schemas/file-system-driver/mod";
 import type { FileSystemGlobalState } from "./global-state";
@@ -119,7 +120,7 @@ export class FileSystemManagerDriver implements ManagerDriver {
 		}
 
 		// Actors run on the same node as the manager, so we create a dummy actor router that we route requests to
-		const inlineClient = createClientWithDriver(createInlineClientDriver(this));
+		const inlineClient = createClientWithDriver(this);
 		this.#actorDriver = this.#driverConfig.actor(
 			registryConfig,
 			runConfig,
@@ -140,7 +141,7 @@ export class FileSystemManagerDriver implements ManagerDriver {
 		actorId: string,
 		encoding: Encoding,
 		params: unknown,
-	): Promise<WebSocket> {
+	): Promise<UniversalWebSocket> {
 		// TODO:
 
 		// Handle raw WebSocket paths
@@ -156,11 +157,17 @@ export class FileSystemManagerDriver implements ManagerDriver {
 				undefined,
 			);
 			return new InlineWebSocketAdapter2(wsHandler);
-		} else if (path.startsWith(PATH_RAW_WEBSOCKET_PREFIX)) {
+		} else if (
+			path.startsWith(PATH_RAW_WEBSOCKET_PREFIX) ||
+			path === "/raw/websocket"
+		) {
 			// Handle websocket proxy
+			// Normalize path to include trailing slash if missing
+			const normalizedPath =
+				path === "/raw/websocket" ? "/raw/websocket/" : path;
 			const wsHandler = await handleRawWebSocketHandler(
 				undefined,
-				path,
+				normalizedPath,
 				this.#actorDriver,
 				actorId,
 				undefined,
@@ -206,11 +213,17 @@ export class FileSystemManagerDriver implements ManagerDriver {
 			);
 
 			return upgradeWebSocket(() => wsHandler)(c, noopNext());
-		} else if (path.startsWith(PATH_RAW_WEBSOCKET_PREFIX)) {
+		} else if (
+			path.startsWith(PATH_RAW_WEBSOCKET_PREFIX) ||
+			path === "/raw/websocket"
+		) {
 			// Handle websocket proxy
+			// Normalize path to include trailing slash if missing
+			const normalizedPath =
+				path === "/raw/websocket" ? "/raw/websocket/" : path;
 			const wsHandler = await handleRawWebSocketHandler(
 				c.req.raw,
-				path,
+				normalizedPath,
 				this.#actorDriver,
 				actorId,
 				authData,
@@ -237,7 +250,7 @@ export class FileSystemManagerDriver implements ManagerDriver {
 				key: actor.state.key as string[],
 			};
 		} catch (error) {
-			logger().error("failed to read actor state", { actorId, error });
+			logger().error({ msg: "failed to read actor state", actorId, error });
 			return undefined;
 		}
 	}
@@ -297,6 +310,16 @@ export class FileSystemManagerDriver implements ManagerDriver {
 		};
 	}
 
+	displayInformation(): ManagerDisplayInformation {
+		return {
+			name: this.#state.persist ? "File System" : "Memory",
+			properties: {
+				...(this.#state.persist ? { Data: this.#state.storagePath } : {}),
+				Instances: this.#state.actorCountOnStartup.toString(),
+			},
+		};
+	}
+
 	extraStartupLog() {
 		return {
 			instances: this.#state.actorCountOnStartup,

package/src/inspector/config.ts

@@ -24,14 +24,16 @@ const defaultEnabled = () => {
 
 const defaultInspectorOrigins = [
 	"http://localhost:43708",
+	"http://localhost:43709",
 	"https://studio.rivet.gg",
+	"https://inspect.rivet.dev",
 ];
 
 const defaultCors: CorsOptions = {
 	origin: (origin) => {
 		if (
 			defaultInspectorOrigins.includes(origin) ||
-			(origin.startsWith("https://") && origin.endsWith("rivet-gg.vercel.app"))
+			(origin.startsWith("https://") && origin.endsWith("rivet-dev.vercel.app"))
 		) {
 			return origin;
 		} else {
@@ -40,10 +42,13 @@ const defaultCors: CorsOptions = {
 	},
 	allowMethods: ["GET", "POST", "PUT", "PATCH", "DELETE", "OPTIONS"],
 	allowHeaders: [
-		"Content-Type",
 		"Authorization",
-		HEADER_ACTOR_QUERY,
-		"last-event-id",
+		"Content-Type",
+		"User-Agent",
+		"baggage",
+		"sentry-trace",
+		"x-rivet-actor",
+		"x-rivet-target",
 	],
 	maxAge: 3600,
 	credentials: true,

package/src/inspector/log.ts

@@ -1,4 +1,4 @@
-import { getLogger } from "@/common//log";
+import { getLogger } from "@/common/log";
 
 export function inspectorLogger() {
 	return getLogger("inspector");

package/src/inspector/manager.ts

@@ -35,7 +35,7 @@ export function createManagerInspectorRouter() {
 				});
 				return c.json(actors, 200);
 			} catch (error) {
-				inspectorLogger().error("Failed to fetch actors", error);
+				inspectorLogger().error({ msg: "Failed to fetch actors", error });
 				return c.json("Failed to fetch actors", 500);
 			}
 		})
@@ -81,6 +81,6 @@ export class ManagerInspector {
 
 	constructor(accessors: () => ManagerInspectorAccessors) {
 		this.accessors = accessors();
-		inspectorLogger().debug("Manager Inspector enabled and ready");
+		inspectorLogger().debug({ msg: "Manager Inspector enabled and ready" });
 	}
 }

package/src/inspector/utils.ts

@@ -64,7 +64,7 @@ export function getInspectorUrl(runConfig: RunConfigInput | undefined) {
 		return "disabled";
 	}
 
-	const url = new URL("https://studio.rivet.gg");
+	const url = new URL("https://inspect.rivet.dev");
 
 	url.searchParams.set("t", accessToken);
 

package/src/manager/driver.ts

@@ -1,5 +1,5 @@
 import type { Env, Hono, Context as HonoContext } from "hono";
-import type { ActorKey, Encoding } from "@/actor/mod";
+import type { ActorKey, Encoding, UniversalWebSocket } from "@/actor/mod";
 import type { ManagerInspector } from "@/inspector/manager";
 import type { RunConfig } from "@/mod";
 import type { RegistryConfig } from "@/registry/config";
@@ -21,7 +21,7 @@ export interface ManagerDriver {
 		actorId: string,
 		encoding: Encoding,
 		params: unknown,
-	): Promise<WebSocket>;
+	): Promise<UniversalWebSocket>;
 	proxyRequest(
 		c: HonoContext,
 		actorRequest: Request,
@@ -36,6 +36,8 @@ export interface ManagerDriver {
 		authData: unknown,
 	): Promise<Response>;
 
+	displayInformation(): ManagerDisplayInformation;
+
 	extraStartupLog?: () => Record<string, unknown>;
 
 	modifyManagerRouter?: (registryConfig: RegistryConfig, router: Hono) => void;
@@ -45,6 +47,12 @@ export interface ManagerDriver {
 	 */
 	readonly inspector?: ManagerInspector;
 }
+
+export interface ManagerDisplayInformation {
+	name: string;
+	properties: Record<string, string>;
+}
+
 export interface GetForIdInput<E extends Env = any> {
 	c?: HonoContext | undefined;
 	name: string;

package/src/manager/hono-websocket-adapter.ts

@@ -70,7 +70,8 @@ export class HonoWebSocketAdapter implements UniversalWebSocket {
 		}
 
 		try {
-			logger().debug("bridge sending data", {
+			logger().debug({
+				msg: "bridge sending data",
 				dataType: typeof data,
 				isString: typeof data === "string",
 				isArrayBuffer: data instanceof ArrayBuffer,
@@ -104,19 +105,23 @@ export class HonoWebSocketAdapter implements UniversalWebSocket {
 						(this.#ws as any).send(buffer);
 					})
 					.catch((error) => {
-						logger().error("failed to convert blob to arraybuffer", { error });
+						logger().error({
+							msg: "failed to convert blob to arraybuffer",
+							error,
+						});
 						this.#fireEvent("error", { type: "error", target: this, error });
 					});
 			} else {
 				// Try to convert to string as a fallback
-				logger().warn("unsupported data type, converting to string", {
+				logger().warn({
+					msg: "unsupported data type, converting to string",
 					dataType: typeof data,
 					data,
 				});
 				(this.#ws as any).send(String(data));
 			}
 		} catch (error) {
-			logger().error("error sending websocket data", { error });
+			logger().error({ msg: "error sending websocket data", error });
 			this.#fireEvent("error", { type: "error", target: this, error });
 			throw error;
 		}
@@ -144,7 +149,7 @@ export class HonoWebSocketAdapter implements UniversalWebSocket {
 				wasClean: code === 1000,
 			});
 		} catch (error) {
-			logger().error("error closing websocket", { error });
+			logger().error({ msg: "error closing websocket", error });
 			this.#readyState = this.CLOSED;
 			this.#fireEvent("close", {
 				type: "close",
@@ -177,7 +182,10 @@ export class HonoWebSocketAdapter implements UniversalWebSocket {
 				try {
 					listener(event);
 				} catch (error) {
-					logger().error(`error in ${event.type} event listener`, { error });
+					logger().error({
+						msg: `error in ${event.type} event listener`,
+						error,
+					});
 				}
 			}
 		}
@@ -201,7 +209,8 @@ export class HonoWebSocketAdapter implements UniversalWebSocket {
 			messageData = String(data);
 		}
 
-		logger().debug("bridge handling message", {
+		logger().debug({
+			msg: "bridge handling message",
 			dataType: typeof messageData,
 			isArrayBuffer: messageData instanceof ArrayBuffer,
 			dataStr: typeof messageData === "string" ? messageData : "<binary>",
@@ -251,7 +260,7 @@ export class HonoWebSocketAdapter implements UniversalWebSocket {
 				try {
 					listener(event);
 				} catch (error) {
-					logger().error(`error in ${type} event listener`, { error });
+					logger().error({ msg: `error in ${type} event listener`, error });
 				}
 			}
 		}
@@ -263,7 +272,7 @@ export class HonoWebSocketAdapter implements UniversalWebSocket {
 					try {
 						this.#onopen(event);
 					} catch (error) {
-						logger().error("error in onopen handler", { error });
+						logger().error({ msg: "error in onopen handler", error });
 					}
 				}
 				break;
@@ -272,7 +281,7 @@ export class HonoWebSocketAdapter implements UniversalWebSocket {
 					try {
 						this.#onclose(event);
 					} catch (error) {
-						logger().error("error in onclose handler", { error });
+						logger().error({ msg: "error in onclose handler", error });
 					}
 				}
 				break;
@@ -281,7 +290,7 @@ export class HonoWebSocketAdapter implements UniversalWebSocket {
 					try {
 						this.#onerror(event);
 					} catch (error) {
-						logger().error("error in onerror handler", { error });
+						logger().error({ msg: "error in onerror handler", error });
 					}
 				}
 				break;
@@ -290,7 +299,7 @@ export class HonoWebSocketAdapter implements UniversalWebSocket {
 					try {
 						this.#onmessage(event);
 					} catch (error) {
-						logger().error("error in onmessage handler", { error });
+						logger().error({ msg: "error in onmessage handler", error });
 					}
 				}
 				break;

package/src/manager/log.ts

@@ -1,7 +1,5 @@
-import { getLogger } from "@/common//log";
-
-export const LOGGER_NAME = "actor-manager";
+import { getLogger } from "@/common/log";
 
 export function logger() {
-	return getLogger(LOGGER_NAME);
+	return getLogger("actor-manager");
 }

package/src/manager/mod.ts

@@ -1,2 +1,2 @@
-export { ManagerDriver } from "./driver";
+export { ManagerDisplayInformation, ManagerDriver } from "./driver";
 export { createManagerRouter } from "./router";