rivetkit 2.0.24-rc.1 → 2.0.25-rc.1

package/src/actor/instance/state-manager.ts

@@ -0,0 +1,502 @@
+import { idToStr } from "@rivetkit/engine-runner";
+import onChange from "on-change";
+import { isCborSerializable, stringifyError } from "@/common/utils";
+import {
+	ACTOR_VERSIONED,
+	CONN_VERSIONED,
+} from "@/schemas/actor-persist/versioned";
+import { promiseWithResolvers, SinglePromiseQueue } from "@/utils";
+import { type AnyConn, CONN_STATE_MANAGER_SYMBOL } from "../conn/mod";
+import { convertConnToBarePersistedConn } from "../conn/persisted";
+import type { ActorDriver } from "../driver";
+import * as errors from "../errors";
+import { isConnStatePath, isStatePath } from "../utils";
+import { KEYS, makeConnKey } from "./kv";
+import type { ActorInstance } from "./mod";
+import { convertActorToBarePersisted, type PersistedActor } from "./persisted";
+
+export interface SaveStateOptions {
+	/**
+	 * Forces the state to be saved immediately. This function will return when the state has saved successfully.
+	 */
+	immediate?: boolean;
+	/** Bypass ready check for stopping. */
+	allowStoppingState?: boolean;
+	/**
+	 * Maximum time in milliseconds to wait before forcing a save.
+	 *
+	 * If a save is already scheduled to occur later than this deadline, it will be rescheduled earlier.
+	 */
+	maxWait?: number;
+}
+
+/**
+ * Manages actor state persistence, proxying, and synchronization.
+ * Handles automatic state change detection and throttled persistence to KV storage.
+ */
+export class StateManager<S, CP, CS, I> {
+	#actor: ActorInstance<S, CP, CS, any, I, any>;
+	#actorDriver: ActorDriver;
+
+	// State tracking
+	#persist!: PersistedActor<S, I>;
+	#persistRaw!: PersistedActor<S, I>;
+	#persistChanged = false;
+	#isInOnStateChange = false;
+
+	// Save management
+	#persistWriteQueue = new SinglePromiseQueue();
+	#lastSaveTime = 0;
+	#pendingSaveTimeout?: NodeJS.Timeout;
+	#pendingSaveScheduledTimestamp?: number;
+	#onPersistSavedPromise?: ReturnType<typeof promiseWithResolvers<void>>;
+
+	// Configuration
+	#config: any; // ActorConfig type
+	#stateSaveInterval: number;
+
+	constructor(
+		actor: ActorInstance<S, CP, CS, any, I, any>,
+		actorDriver: ActorDriver,
+		config: any,
+	) {
+		this.#actor = actor;
+		this.#actorDriver = actorDriver;
+		this.#config = config;
+		this.#stateSaveInterval = config.options.stateSaveInterval || 100;
+	}
+
+	// MARK: - Public API
+
+	get persist(): PersistedActor<S, I> {
+		return this.#persist;
+	}
+
+	get persistRaw(): PersistedActor<S, I> {
+		return this.#persistRaw;
+	}
+
+	get persistChanged(): boolean {
+		return this.#persistChanged;
+	}
+
+	get state(): S {
+		this.#validateStateEnabled();
+		return this.#persist.state;
+	}
+
+	set state(value: S) {
+		this.#validateStateEnabled();
+		this.#persist.state = value;
+	}
+
+	get stateEnabled(): boolean {
+		return "createState" in this.#config || "state" in this.#config;
+	}
+
+	// MARK: - Initialization
+
+	/**
+	 * Initializes state from persisted data or creates new state.
+	 */
+	async initializeState(persistData: PersistedActor<S, I>): Promise<void> {
+		if (!persistData.hasInitialized) {
+			// Create initial state
+			let stateData: unknown;
+			if (this.stateEnabled) {
+				this.#actor.rLog.info({ msg: "actor state initializing" });
+
+				if ("createState" in this.#config) {
+					stateData = await this.#config.createState(
+						this.#actor.actorContext,
+						persistData.input!,
+					);
+				} else if ("state" in this.#config) {
+					stateData = structuredClone(this.#config.state);
+				} else {
+					throw new Error(
+						"Both 'createState' or 'state' were not defined",
+					);
+				}
+			} else {
+				this.#actor.rLog.debug({ msg: "state not enabled" });
+			}
+
+			// Update persisted data
+			persistData.state = stateData as S;
+			persistData.hasInitialized = true;
+
+			// Save initial state
+			//
+			// We don't use #savePersistInner because the actor is not fully
+			// initialized yet
+			const bareData = convertActorToBarePersisted<S, I>(persistData);
+			await this.#actorDriver.kvBatchPut(this.#actor.id, [
+				[
+					KEYS.PERSIST_DATA,
+					ACTOR_VERSIONED.serializeWithEmbeddedVersion(bareData),
+				],
+			]);
+		}
+
+		// Initialize proxy
+		this.initPersistProxy(persistData);
+	}
+
+	/**
+	 * Creates proxy for persist object that handles automatic state change detection.
+	 */
+	initPersistProxy(target: PersistedActor<S, I>) {
+		// Set raw persist object
+		this.#persistRaw = target;
+
+		// Validate serializability
+		if (target === null || typeof target !== "object") {
+			let invalidPath = "";
+			if (
+				!isCborSerializable(
+					target,
+					(path) => {
+						invalidPath = path;
+					},
+					"",
+				)
+			) {
+				throw new errors.InvalidStateType({ path: invalidPath });
+			}
+			return target;
+		}
+
+		// Unsubscribe from old state
+		if (this.#persist) {
+			onChange.unsubscribe(this.#persist);
+		}
+
+		// Listen for changes to automatically write state
+		this.#persist = onChange(
+			target,
+			(
+				path: string,
+				value: any,
+				_previousValue: any,
+				_applyData: any,
+			) => {
+				this.#handleStateChange(path, value);
+			},
+			{ ignoreDetached: true },
+		);
+	}
+
+	// MARK: - State Persistence
+
+	/**
+	 * Forces the state to get saved.
+	 */
+	async saveState(opts: SaveStateOptions): Promise<void> {
+		this.#actor.assertReady(opts.allowStoppingState);
+
+		if (this.#persistChanged) {
+			if (opts.immediate) {
+				await this.#savePersistInner();
+			} else {
+				// Create promise for waiting
+				if (!this.#onPersistSavedPromise) {
+					this.#onPersistSavedPromise = promiseWithResolvers();
+				}
+
+				// Save throttled
+				this.savePersistThrottled(opts.maxWait);
+
+				// Wait for save
+				await this.#onPersistSavedPromise?.promise;
+			}
+		}
+	}
+
+	/**
+	 * Throttled save state method. Used to write to KV at a reasonable cadence.
+	 *
+	 * Passing a maxWait will override the stateSaveInterval with the min
+	 * between that and the maxWait.
+	 */
+	savePersistThrottled(maxWait?: number) {
+		const now = Date.now();
+		const timeSinceLastSave = now - this.#lastSaveTime;
+
+		// Calculate when the save should happen based on throttle interval
+		let saveDelay = Math.max(
+			0,
+			this.#stateSaveInterval - timeSinceLastSave,
+		);
+		if (maxWait !== undefined) {
+			saveDelay = Math.min(saveDelay, maxWait);
+		}
+
+		// Check if we need to reschedule the same timeout
+		if (
+			this.#pendingSaveTimeout !== undefined &&
+			this.#pendingSaveScheduledTimestamp !== undefined
+		) {
+			// Check if we have an earlier save deadline
+			const newScheduledTimestamp = now + saveDelay;
+			if (newScheduledTimestamp < this.#pendingSaveScheduledTimestamp) {
+				// Cancel existing timeout and reschedule
+				clearTimeout(this.#pendingSaveTimeout);
+				this.#pendingSaveTimeout = undefined;
+				this.#pendingSaveScheduledTimestamp = undefined;
+			} else {
+				// Current schedule is fine, don't reschedule
+				return;
+			}
+		}
+
+		if (saveDelay > 0) {
+			// Schedule save
+			this.#pendingSaveScheduledTimestamp = now + saveDelay;
+			this.#pendingSaveTimeout = setTimeout(() => {
+				this.#pendingSaveTimeout = undefined;
+				this.#pendingSaveScheduledTimestamp = undefined;
+				this.#savePersistInner();
+			}, saveDelay);
+		} else {
+			// Save immediately
+			this.#savePersistInner();
+		}
+	}
+
+	/**
+	 * Clears any pending save timeout.
+	 */
+	clearPendingSaveTimeout() {
+		if (this.#pendingSaveTimeout) {
+			clearTimeout(this.#pendingSaveTimeout);
+			this.#pendingSaveTimeout = undefined;
+			this.#pendingSaveScheduledTimestamp = undefined;
+		}
+	}
+
+	/**
+	 * Waits for any pending write operations to complete.
+	 */
+	async waitForPendingWrites(): Promise<void> {
+		if (this.#persistWriteQueue.runningDrainLoop) {
+			await this.#persistWriteQueue.runningDrainLoop;
+		}
+	}
+
+	// MARK: - Private Helpers
+
+	#validateStateEnabled() {
+		if (!this.stateEnabled) {
+			throw new errors.StateNotEnabled();
+		}
+	}
+
+	#handleStateChange(path: string, value: any) {
+		const actorStatePath = isStatePath(path);
+		const connStatePath = isConnStatePath(path);
+
+		// Validate CBOR serializability
+		if (actorStatePath || connStatePath) {
+			let invalidPath = "";
+			if (
+				!isCborSerializable(
+					value,
+					(invalidPathPart) => {
+						invalidPath = invalidPathPart;
+					},
+					"",
+				)
+			) {
+				throw new errors.InvalidStateType({
+					path: path + (invalidPath ? `.${invalidPath}` : ""),
+				});
+			}
+		}
+
+		this.#actor.rLog.debug({
+			msg: "onChange triggered, setting persistChanged=true",
+			path,
+		});
+		this.#persistChanged = true;
+
+		// Inform inspector about state changes
+		if (actorStatePath) {
+			this.#actor.inspector.emitter.emit(
+				"stateUpdated",
+				this.#persist.state,
+			);
+		}
+
+		// Call onStateChange lifecycle hook
+		if (
+			actorStatePath &&
+			this.#config.onStateChange &&
+			this.#actor.isReady() &&
+			!this.#isInOnStateChange
+		) {
+			try {
+				this.#isInOnStateChange = true;
+				this.#config.onStateChange(
+					this.#actor.actorContext,
+					this.#persistRaw.state,
+				);
+			} catch (error) {
+				this.#actor.rLog.error({
+					msg: "error in `_onStateChange`",
+					error: stringifyError(error),
+				});
+			} finally {
+				this.#isInOnStateChange = false;
+			}
+		}
+	}
+
+	async #savePersistInner() {
+		this.#actor.rLog.info({
+			msg: "savePersistInner called",
+			persistChanged: this.#persistChanged,
+			connsWithPersistChangedSize:
+				this.#actor.connectionManager.connsWithPersistChanged.size,
+			connsWithPersistChangedIds: Array.from(
+				this.#actor.connectionManager.connsWithPersistChanged,
+			),
+		});
+
+		try {
+			this.#lastSaveTime = Date.now();
+
+			// Check if either actor state or connections have changed
+			const hasChanges =
+				this.#persistChanged ||
+				this.#actor.connectionManager.connsWithPersistChanged.size > 0;
+
+			if (hasChanges) {
+				await this.#persistWriteQueue.enqueue(async () => {
+					this.#actor.rLog.debug({
+						msg: "saving persist",
+						actorChanged: this.#persistChanged,
+						connectionsChanged:
+							this.#actor.connectionManager
+								.connsWithPersistChanged.size,
+					});
+
+					const entries: Array<[Uint8Array, Uint8Array]> = [];
+
+					// Build actor entries
+					if (this.#persistChanged) {
+						this.#persistChanged = false;
+						const bareData = convertActorToBarePersisted<S, I>(
+							this.#persistRaw,
+						);
+						entries.push([
+							KEYS.PERSIST_DATA,
+							ACTOR_VERSIONED.serializeWithEmbeddedVersion(
+								bareData,
+							),
+						]);
+					}
+
+					// Build connection entries
+					const connections: Array<AnyConn> = [];
+					for (const connId of this.#actor.connectionManager
+						.connsWithPersistChanged) {
+						const conn = this.#actor.conns.get(connId);
+						if (!conn) {
+							this.#actor.rLog.warn({
+								msg: "connection not found in conns map",
+								connId,
+							});
+							continue;
+						}
+
+						const connStateManager =
+							conn[CONN_STATE_MANAGER_SYMBOL];
+						const hibernatableDataRaw =
+							connStateManager.hibernatableDataRaw;
+						if (!hibernatableDataRaw) {
+							this.#actor.log.warn({
+								msg: "missing raw hibernatable data for conn in getChangedConnectionsData",
+								connId: conn.id,
+							});
+							continue;
+						}
+
+						this.#actor.rLog.info({
+							msg: "persisting connection",
+							connId,
+							gatewayId: idToStr(hibernatableDataRaw.requestId),
+							requestId: idToStr(hibernatableDataRaw.requestId),
+							serverMessageIndex:
+								hibernatableDataRaw.serverMessageIndex,
+							clientMessageIndex:
+								hibernatableDataRaw.clientMessageIndex,
+							hasState: hibernatableDataRaw.state !== undefined,
+						});
+
+						const bareData = convertConnToBarePersistedConn<CP, CS>(
+							hibernatableDataRaw,
+						);
+						const connData =
+							CONN_VERSIONED.serializeWithEmbeddedVersion(
+								bareData,
+							);
+
+						entries.push([makeConnKey(connId), connData]);
+						connections.push(conn);
+					}
+
+					this.#actor.rLog.info({
+						msg: "prepared entries for kvBatchPut",
+						totalEntries: entries.length,
+						connectionEntries: connections.length,
+						connectionIds: connections.map((c) => c.id),
+					});
+
+					// Notify driver before persisting connections
+					if (this.#actorDriver.onBeforePersistConn) {
+						for (const conn of connections) {
+							this.#actorDriver.onBeforePersistConn(conn);
+						}
+					}
+
+					// Clear changed connections
+					this.#actor.connectionManager.clearConnWithPersistChanged();
+
+					// Write data
+					this.#actor.rLog.info({
+						msg: "calling kvBatchPut",
+						actorId: this.#actor.id,
+						entriesCount: entries.length,
+					});
+					await this.#actorDriver.kvBatchPut(this.#actor.id, entries);
+					this.#actor.rLog.info({
+						msg: "kvBatchPut completed successfully",
+					});
+
+					// Notify driver after persisting connections
+					if (this.#actorDriver.onAfterPersistConn) {
+						for (const conn of connections) {
+							this.#actorDriver.onAfterPersistConn(conn);
+						}
+					}
+
+					this.#actor.rLog.debug({ msg: "persist saved" });
+				});
+			} else {
+				this.#actor.rLog.info({
+					msg: "savePersistInner skipped - no changes",
+				});
+			}
+
+			this.#onPersistSavedPromise?.resolve();
+		} catch (error) {
+			this.#actor.rLog.error({
+				msg: "error saving persist",
+				error: stringifyError(error),
+			});
+			this.#onPersistSavedPromise?.reject(error);
+			throw error;
+		}
+	}
+}

package/src/actor/mod.ts

@@ -55,8 +55,8 @@ export function actor<
 export type { Encoding } from "@/actor/protocol/serde";
 export {
 	ALLOWED_PUBLIC_HEADERS,
-	PATH_CONNECT_WEBSOCKET,
-	PATH_RAW_WEBSOCKET_PREFIX,
+	PATH_CONNECT,
+	PATH_WEBSOCKET_PREFIX,
 } from "@/common/actor-router-consts";
 export type {
 	UniversalErrorEvent,
@@ -64,7 +64,6 @@ export type {
 	UniversalEventSource,
 	UniversalMessageEvent,
 } from "@/common/eventsource-interface";
-export type { UpgradeWebSocketArgs } from "@/common/inline-websocket-adapter2";
 export type {
 	RivetCloseEvent,
 	RivetEvent,
@@ -72,15 +71,16 @@ export type {
 	UniversalWebSocket,
 } from "@/common/websocket-interface";
 export type { ActorKey } from "@/manager/protocol/query";
-export type { ActionContext } from "./action";
 export type * from "./config";
-export type {
-	Conn,
-	ConnectionStatus,
-	generateConnId,
-	generateConnToken,
-} from "./conn";
-export type { ActorContext } from "./context";
+export type { AnyConn, Conn } from "./conn/mod";
+export type { ActionContext } from "./contexts/action";
+export type { ActorContext } from "./contexts/actor";
+export type { ConnInitContext } from "./contexts/conn-init";
+export type { CreateConnStateContext } from "./contexts/create-conn-state";
+export type { OnBeforeConnectContext } from "./contexts/on-before-connect";
+export type { OnConnectContext } from "./contexts/on-connect";
+export type { RequestContext } from "./contexts/request";
+export type { WebSocketContext } from "./contexts/websocket";
 export type {
 	ActionContextOf,
 	ActorContextOf,
@@ -89,12 +89,9 @@ export type {
 } from "./definition";
 export { lookupInRegistry } from "./definition";
 export { UserError, type UserErrorOptions } from "./errors";
-export type { AnyActorInstance } from "./instance";
+export type { AnyActorInstance } from "./instance/mod";
 export {
 	type ActorRouter,
 	createActorRouter,
 } from "./router";
-export {
-	handleRawWebSocketHandler,
-	handleWebSocketConnect,
-} from "./router-endpoints";
+export { routeWebSocket } from "./router-websocket-endpoints";