@rivetkit/engine-runner 2.0.25-rc.2 → 2.0.26

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rivetkit/engine-runner",
-  "version": "2.0.25-rc.2",
+  "version": "2.0.26",
   "type": "module",
   "exports": {
     "import": {
@@ -16,7 +16,7 @@
     "uuid": "^12.0.0",
     "pino": "^9.9.5",
     "ws": "^8.18.3",
-    "@rivetkit/engine-runner-protocol": "2.0.25-rc.2"
+    "@rivetkit/engine-runner-protocol": "2.0.26"
   },
   "devDependencies": {
     "@types/node": "^22.18.1",

package/src/actor.ts

@@ -27,6 +27,10 @@ export class RunnerActor {
 	}> = [];
 	actorStartPromise: ReturnType<typeof promiseWithResolvers<void>>;
 
+	lastCommandIdx: bigint = -1n;
+	nextEventIdx: bigint = 0n;
+	eventHistory: protocol.EventWrapper[] = [];
+
 	/**
 	 * If restoreHibernatingRequests has been called. This is used to assert
 	 * that the caller is implemented correctly.
@@ -81,8 +85,8 @@ export class RunnerActor {
 			gatewayId,
 			requestId,
 			request: {
-				resolve: () => {},
-				reject: () => {},
+				resolve: () => { },
+				reject: () => { },
 				actorId: this.actorId,
 				gatewayId: gatewayId,
 				requestId: requestId,
@@ -118,8 +122,8 @@ export class RunnerActor {
 			gatewayId,
 			requestId,
 			request: {
-				resolve: () => {},
-				reject: () => {},
+				resolve: () => { },
+				reject: () => { },
 				actorId: this.actorId,
 				gatewayId: gatewayId,
 				requestId: requestId,
@@ -193,4 +197,14 @@ export class RunnerActor {
 			this.webSockets.splice(index, 1);
 		}
 	}
+
+	handleAckEvents(lastEventIdx: bigint) {
+		this.eventHistory = this.eventHistory.filter(
+			(event) => event.checkpoint.index > lastEventIdx,
+		);
+	}
+
+	recordEvent(eventWrapper: protocol.EventWrapper) {
+		this.eventHistory.push(eventWrapper);
+	}
 }

package/src/mod.ts

@@ -8,6 +8,7 @@ import { type HibernatingWebSocketMetadata, Tunnel } from "./tunnel";
 import {
 	calculateBackoff,
 	parseWebSocketCloseReason,
+	stringifyError,
 	unreachable,
 } from "./utils";
 import { importWebSocket } from "./websocket.js";
@@ -17,13 +18,18 @@ export { RunnerActor, type ActorConfig };
 export { idToStr } from "./utils";
 
 const KV_EXPIRE: number = 30_000;
-const PROTOCOL_VERSION: number = 3;
-const RUNNER_PING_INTERVAL = 3_000;
+const PROTOCOL_VERSION: number = 4;
 
 /** Warn once the backlog significantly exceeds the server's ack batch size. */
 const EVENT_BACKLOG_WARN_THRESHOLD = 10_000;
 const SIGNAL_HANDLERS: (() => void | Promise<void>)[] = [];
 
+export class RunnerShutdownError extends Error {
+	constructor() {
+		super("Runner shut down");
+	}
+}
+
 export interface RunnerConfig {
 	logger?: Logger;
 	version: number;
@@ -197,9 +203,6 @@ export class Runner {
 	// WebSocket
 	__pegboardWebSocket?: WebSocket;
 	runnerId?: string;
-	#lastCommandIdx: number = -1;
-	#pingLoop?: NodeJS.Timeout;
-	#nextEventIdx: bigint = 0n;
 	#started: boolean = false;
 	#shutdown: boolean = false;
 	#shuttingDown: boolean = false;
@@ -211,7 +214,6 @@ export class Runner {
 	#runnerLostTimeout?: NodeJS.Timeout;
 
 	// Event storage for resending
-	#eventHistory: protocol.EventWrapper[] = [];
 	#eventBacklogWarned: boolean = false;
 
 	// Command acknowledgment
@@ -255,7 +257,14 @@ export class Runner {
 
 		// Start cleaning up old unsent KV requests every 15 seconds
 		this.#kvCleanupInterval = setInterval(() => {
-			this.#cleanupOldKvRequests();
+			try {
+				this.#cleanupOldKvRequests();
+			} catch (err) {
+				this.log?.error({
+					msg: "error cleaning up kv requests",
+					error: stringifyError(err),
+				});
+			}
 		}, 15000); // Run every 15 seconds
 	}
 
@@ -307,14 +316,31 @@ export class Runner {
 		this.#sendActorStateUpdate(actorId, actor.generation, "stopped");
 	}
 
-	#stopAllActors() {
+	#handleLost() {
 		this.log?.info({
-			msg: "stopping all actors due to runner lost threshold exceeded",
+			msg: "stopping all actors due to runner lost threshold",
 		});
 
+		// Remove all remaining kv requests
+		for (const [_, request] of this.#kvRequests.entries()) {
+			request.reject(new RunnerShutdownError());
+		}
+
+		this.#kvRequests.clear();
+
+		this.#stopAllActors();
+	}
+
+	#stopAllActors() {
 		const actorIds = Array.from(this.#actors.keys());
 		for (const actorId of actorIds) {
-			this.forceStopActor(actorId);
+			this.forceStopActor(actorId).catch((err) => {
+				this.log?.error({
+					msg: "error stopping actor",
+					actorId,
+					error: stringifyError(err),
+				});
+			});
 		}
 	}
 
@@ -477,12 +503,6 @@ export class Runner {
 			this.#runnerLostTimeout = undefined;
 		}
 
-		// Clear ping loop
-		if (this.#pingLoop) {
-			clearInterval(this.#pingLoop);
-			this.#pingLoop = undefined;
-		}
-
 		// Clear ack interval
 		if (this.#ackInterval) {
 			clearInterval(this.#ackInterval);
@@ -738,10 +758,6 @@ export class Runner {
 				name: this.#config.runnerName,
 				version: this.#config.version,
 				totalSlots: this.#config.totalSlots,
-				lastCommandIdx:
-					this.#lastCommandIdx >= 0
-						? BigInt(this.#lastCommandIdx)
-						: null,
 				prepopulateActorNames: new Map(
 					Object.entries(this.#config.prepopulateActorNames).map(
 						([name, data]) => [
@@ -758,33 +774,22 @@ export class Runner {
 				val: init,
 			});
 
-			// Start ping interval
-			const pingLoop = setInterval(() => {
-				if (ws.readyState === 1) {
-					this.__sendToServer({
-						tag: "ToServerPing",
-						val: {
-							ts: BigInt(Date.now()),
-						},
-					});
-				} else {
-					clearInterval(pingLoop);
-					this.log?.info({
-						msg: "WebSocket not open, stopping ping loop",
-					});
-				}
-			}, RUNNER_PING_INTERVAL);
-			this.#pingLoop = pingLoop;
-
 			// Start command acknowledgment interval (5 minutes)
 			const ackInterval = 5 * 60 * 1000; // 5 minutes in milliseconds
 			const ackLoop = setInterval(() => {
-				if (ws.readyState === 1) {
-					this.#sendCommandAcknowledgment();
-				} else {
-					clearInterval(ackLoop);
-					this.log?.info({
-						msg: "WebSocket not open, stopping ack loop",
+				try {
+					if (ws.readyState === 1) {
+						this.#sendCommandAcknowledgment();
+					} else {
+						clearInterval(ackLoop);
+						this.log?.info({
+							msg: "WebSocket not open, stopping ack loop",
+						});
+					}
+				} catch (err) {
+					this.log?.error({
+						msg: "error in command acknowledgment loop",
+						error: stringifyError(err),
 					});
 				}
 			}, ackInterval);
@@ -815,8 +820,8 @@ export class Runner {
 				if (this.runnerId !== init.runnerId) {
 					this.runnerId = init.runnerId;
 
-					// Clear history if runner id changed
-					this.#eventHistory.length = 0;
+					// Clear actors if runner id changed
+					this.#stopAllActors();
 				}
 
 				// Store the runner lost threshold from metadata
@@ -826,13 +831,12 @@ export class Runner {
 
 				this.log?.info({
 					msg: "received init",
-					lastEventIdx: init.lastEventIdx,
 					runnerLostThreshold: this.#runnerLostThreshold,
 				});
 
 				// Resend pending events
 				this.#processUnsentKvRequests();
-				this.#resendUnacknowledgedEvents(init.lastEventIdx);
+				this.#resendUnacknowledgedEvents();
 				this.#tunnel?.resendBufferedEvents();
 
 				this.#config.onConnected();
@@ -845,10 +849,19 @@ export class Runner {
 				const kvResponse = message.val;
 				this.#handleKvResponse(kvResponse);
 			} else if (message.tag === "ToClientTunnelMessage") {
-				this.#tunnel?.handleTunnelMessage(message.val);
-			} else if (message.tag === "ToClientClose") {
-				this.#tunnel?.shutdown();
-				ws.close(1000, "manual closure");
+				this.#tunnel?.handleTunnelMessage(message.val).catch((err) => {
+					this.log?.error({
+						msg: "error handling tunnel message",
+						error: stringifyError(err),
+					});
+				});
+			} else if (message.tag === "ToClientPing") {
+				this.__sendToServer({
+					tag: "ToServerPong",
+					val: {
+						ts: message.val.ts,
+					},
+				});
 			} else {
 				unreachable(message);
 			}
@@ -871,7 +884,14 @@ export class Runner {
 						seconds: this.#runnerLostThreshold / 1000,
 					});
 					this.#runnerLostTimeout = setTimeout(() => {
-						this.#stopAllActors();
+						try {
+							this.#handleLost();
+						} catch (err) {
+							this.log?.error({
+								msg: "error handling runner lost",
+								error: stringifyError(err),
+							});
+						}
 					}, this.#runnerLostThreshold);
 				}
 
@@ -909,12 +929,6 @@ export class Runner {
 				this.#config.onDisconnected(ev.code, ev.reason);
 			}
 
-			// Clear ping loop on close
-			if (this.#pingLoop) {
-				clearInterval(this.#pingLoop);
-				this.#pingLoop = undefined;
-			}
-
 			// Clear ack interval on close
 			if (this.#ackInterval) {
 				clearInterval(this.#ackInterval);
@@ -933,7 +947,14 @@ export class Runner {
 						seconds: this.#runnerLostThreshold / 1000,
 					});
 					this.#runnerLostTimeout = setTimeout(() => {
-						this.#stopAllActors();
+						try {
+							this.#handleLost();
+						} catch (err) {
+							this.log?.error({
+								msg: "error handling runner lost",
+								error: stringifyError(err),
+							});
+						}
 					}, this.#runnerLostThreshold);
 				}
 
@@ -952,52 +973,86 @@ export class Runner {
 		for (const commandWrapper of commands) {
 			if (commandWrapper.inner.tag === "CommandStartActor") {
 				// Spawn background promise
-				this.#handleCommandStartActor(commandWrapper);
+				this.#handleCommandStartActor(commandWrapper).catch((err) => {
+					this.log?.error({
+						msg: "error handling start actor command",
+						actorId: commandWrapper.checkpoint.actorId,
+						error: stringifyError(err),
+					});
+				});
 			} else if (commandWrapper.inner.tag === "CommandStopActor") {
 				// Spawn background promise
-				this.#handleCommandStopActor(commandWrapper);
+				this.#handleCommandStopActor(commandWrapper).catch((err) => {
+					this.log?.error({
+						msg: "error handling stop actor command",
+						actorId: commandWrapper.checkpoint.actorId,
+						error: stringifyError(err),
+					});
+				});
 			} else {
 				unreachable(commandWrapper.inner);
 			}
 
-			this.#lastCommandIdx = Number(commandWrapper.index);
+			const actor = this.getActor(
+				commandWrapper.checkpoint.actorId,
+				commandWrapper.inner.val.generation,
+			);
+			if (actor) actor.lastCommandIdx = commandWrapper.checkpoint.index;
 		}
 	}
 
 	#handleAckEvents(ack: protocol.ToClientAckEvents) {
-		const lastAckedIdx = ack.lastEventIdx;
+		let originalTotalEvents = Array.from(this.#actors).reduce(
+			(s, [_, actor]) => s + actor.eventHistory.length,
+			0,
+		);
+
+		for (const [_, actor] of this.#actors) {
+			let checkpoint = ack.lastEventCheckpoints.find(
+				(x) => x.actorId == actor.actorId,
+			);
+
+			if (checkpoint) actor.handleAckEvents(checkpoint.index);
+		}
 
-		const originalLength = this.#eventHistory.length;
-		this.#eventHistory = this.#eventHistory.filter(
-			(event) => event.index > lastAckedIdx,
+		const totalEvents = Array.from(this.#actors).reduce(
+			(s, [_, actor]) => s + actor.eventHistory.length,
+			0,
 		);
+		const prunedCount = originalTotalEvents - totalEvents;
 
-		const prunedCount = originalLength - this.#eventHistory.length;
 		if (prunedCount > 0) {
 			this.log?.info({
 				msg: "pruned acknowledged events",
-				lastAckedIdx: lastAckedIdx.toString(),
 				prunedCount,
 			});
 		}
 
-		if (this.#eventHistory.length <= EVENT_BACKLOG_WARN_THRESHOLD) {
+		if (totalEvents <= EVENT_BACKLOG_WARN_THRESHOLD) {
 			this.#eventBacklogWarned = false;
 		}
 	}
 
 	/** Track events to send to the server in case we need to resend it on disconnect. */
 	#recordEvent(eventWrapper: protocol.EventWrapper) {
-		this.#eventHistory.push(eventWrapper);
+		const actor = this.getActor(eventWrapper.checkpoint.actorId);
+		if (!actor) return;
+
+		actor.recordEvent(eventWrapper);
+
+		let totalEvents = Array.from(this.#actors).reduce(
+			(s, [_, actor]) => s + actor.eventHistory.length,
+			0,
+		);
 
 		if (
-			this.#eventHistory.length > EVENT_BACKLOG_WARN_THRESHOLD &&
+			totalEvents > EVENT_BACKLOG_WARN_THRESHOLD &&
 			!this.#eventBacklogWarned
 		) {
 			this.#eventBacklogWarned = true;
 			this.log?.warn({
 				msg: "unacknowledged event backlog exceeds threshold",
-				backlogSize: this.#eventHistory.length,
+				backlogSize: totalEvents,
 				threshold: EVENT_BACKLOG_WARN_THRESHOLD,
 			});
 		}
@@ -1013,7 +1068,7 @@ export class Runner {
 		const startCommand = commandWrapper.inner
 			.val as protocol.CommandStartActor;
 
-		const actorId = startCommand.actorId;
+		const actorId = commandWrapper.checkpoint.actorId;
 		const generation = startCommand.generation;
 		const config = startCommand.config;
 
@@ -1094,7 +1149,7 @@ export class Runner {
 		const stopCommand = commandWrapper.inner
 			.val as protocol.CommandStopActor;
 
-		const actorId = stopCommand.actorId;
+		const actorId = commandWrapper.checkpoint.actorId;
 		const generation = stopCommand.generation;
 
 		await this.forceStopActor(actorId, generation);
@@ -1105,6 +1160,9 @@ export class Runner {
 		generation: number,
 		intentType: "sleep" | "stop",
 	) {
+		const actor = this.getActor(actorId, generation);
+		if (!actor) return;
+
 		let actorIntent: protocol.ActorIntent;
 
 		if (intentType === "sleep") {
@@ -1124,9 +1182,11 @@ export class Runner {
 			intent: actorIntent,
 		};
 
-		const eventIndex = this.#nextEventIdx++;
 		const eventWrapper: protocol.EventWrapper = {
-			index: eventIndex,
+			checkpoint: {
+				actorId,
+				index: actor.nextEventIdx++,
+			},
 			inner: {
 				tag: "EventActorIntent",
 				val: intentEvent,
@@ -1146,6 +1206,9 @@ export class Runner {
 		generation: number,
 		stateType: "running" | "stopped",
 	) {
+		const actor = this.getActor(actorId, generation);
+		if (!actor) return;
+
 		let actorState: protocol.ActorState;
 
 		if (stateType === "running") {
@@ -1168,9 +1231,11 @@ export class Runner {
 			state: actorState,
 		};
 
-		const eventIndex = this.#nextEventIdx++;
 		const eventWrapper: protocol.EventWrapper = {
-			index: eventIndex,
+			checkpoint: {
+				actorId,
+				index: actor.nextEventIdx++,
+			},
 			inner: {
 				tag: "EventActorStateUpdate",
 				val: stateUpdateEvent,
@@ -1186,9 +1251,18 @@ export class Runner {
 	}
 
 	#sendCommandAcknowledgment() {
-		if (this.#lastCommandIdx < 0) {
-			// No commands received yet, nothing to acknowledge
-			return;
+		const lastCommandCheckpoints = [];
+
+		for (const [_, actor] of this.#actors) {
+			if (actor.lastCommandIdx < 0) {
+				// No commands received yet, nothing to acknowledge
+				continue;
+			}
+
+			lastCommandCheckpoints.push({
+				actorId: actor.actorId,
+				index: actor.lastCommandIdx,
+			});
 		}
 
 		//this.#log?.log("Sending command acknowledgment", this.#lastCommandIdx);
@@ -1196,7 +1270,7 @@ export class Runner {
 		this.__sendToServer({
 			tag: "ToServerAckCommands",
 			val: {
-				lastCommandIdx: BigInt(this.#lastCommandIdx),
+				lastCommandCheckpoints,
 			},
 		});
 	}
@@ -1500,9 +1574,11 @@ export class Runner {
 			alarmTs: alarmTs !== null ? BigInt(alarmTs) : null,
 		};
 
-		const eventIndex = this.#nextEventIdx++;
 		const eventWrapper: protocol.EventWrapper = {
-			index: eventIndex,
+			checkpoint: {
+				actorId,
+				index: actor.nextEventIdx++,
+			},
 			inner: {
 				tag: "EventActorSetAlarm",
 				val: alarmEvent,
@@ -1669,6 +1745,7 @@ export class Runner {
 			tag: "ToServerlessServerInit",
 			val: {
 				runnerId: this.runnerId,
+				runnerProtocolVersion: PROTOCOL_VERSION,
 			},
 		});
 
@@ -1699,27 +1776,34 @@ export class Runner {
 			msg: `Scheduling reconnect attempt ${this.#reconnectAttempt + 1} in ${delay}ms`,
 		});
 
-		this.#reconnectTimeout = setTimeout(async () => {
+		this.#reconnectTimeout = setTimeout(() => {
 			if (!this.#shutdown) {
 				this.#reconnectAttempt++;
 				this.log?.debug({
 					msg: `Attempting to reconnect (attempt ${this.#reconnectAttempt})...`,
 				});
-				await this.#openPegboardWebSocket();
+				this.#openPegboardWebSocket().catch((err) => {
+					this.log?.error({
+						msg: "error during websocket reconnection",
+						error: stringifyError(err),
+					});
+				});
 			}
 		}, delay);
 	}
 
-	#resendUnacknowledgedEvents(lastEventIdx: bigint) {
-		const eventsToResend = this.#eventHistory.filter(
-			(event) => event.index > lastEventIdx,
-		);
+	#resendUnacknowledgedEvents() {
+		const eventsToResend = [];
+
+		for (const [_, actor] of this.#actors) {
+			eventsToResend.push(...actor.eventHistory);
+		}
 
 		if (eventsToResend.length === 0) return;
 
 		this.log?.info({
 			msg: "resending unacknowledged events",
-			fromIndex: lastEventIdx + 1n,
+			count: eventsToResend.length,
 		});
 
 		// Resend events in batches