@rivetkit/engine-runner 0.0.0-main.41efcce → 0.0.0-main.4994268

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@rivetkit/engine-runner",
-	"version": "0.0.0-main.41efcce",
+	"version": "0.0.0-main.4994268",
 	"type": "module",
 	"files": [
 		"dist",
@@ -25,8 +25,8 @@
 		"bench": "tsx benches/actor-lifecycle.bench.ts"
 	},
 	"dependencies": {
-		"@rivetkit/virtual-websocket": "0.0.0-main.41efcce",
-		"@rivetkit/engine-runner-protocol": "0.0.0-main.41efcce",
+		"@rivetkit/virtual-websocket": "0.0.0-main.4994268",
+		"@rivetkit/engine-runner-protocol": "0.0.0-main.4994268",
 		"uuid": "^12.0.0",
 		"pino": "^9.9.5",
 		"ws": "^8.18.3"

package/src/mod.ts

@@ -1,5 +1,6 @@
 import * as protocol from "@rivetkit/engine-runner-protocol";
 import type { Logger } from "pino";
+import { v4 as uuidv4 } from "uuid";
 import type WebSocket from "ws";
 import { type ActorConfig, RunnerActor } from "./actor";
 import { logger, setLogger } from "./log.js";
@@ -12,7 +13,6 @@ import {
 	unreachable,
 } from "./utils";
 import { importWebSocket } from "./websocket.js";
-import { v4 as uuidv4 } from "uuid";
 
 export type { HibernatingWebSocketMetadata };
 export { RunnerActor, type ActorConfig };
@@ -560,9 +560,18 @@ export class Runner {
 		this.#kvRequests.clear();
 
 		// Close WebSocket
-		const pegboardWebSocket = this.getPegboardWebSocketIfReady();
-		if (pegboardWebSocket) {
-			if (immediate) {
+		//
+		// A CONNECTING socket cannot send graceful stopping messages, so
+		// it is always closed directly. Without this, a shutdown that
+		// races with a reconnect leaves the in-flight WebSocket alive
+		// while the rest of the runner state (tunnel, intervals) has been
+		// torn down.
+		const pegboardWebSocket = this.#pegboardWebSocket;
+		const readyState = pegboardWebSocket?.readyState;
+		const isOpen = readyState === 1;
+		const isConnecting = readyState === 0;
+		if (pegboardWebSocket && (isOpen || isConnecting)) {
+			if (immediate || isConnecting) {
 				// Stop immediately
 				pegboardWebSocket.close(1000, "pegboard.runner_shutdown");
 			} else {
@@ -874,6 +883,10 @@ export class Runner {
 				if (this.runnerId !== init.runnerId) {
 					this.runnerId = init.runnerId;
 
+					// Invalidate cached child logger so subsequent log
+					// lines pick up the new runnerId.
+					this.#logCached = undefined;
+
 					// Clear actors if runner id changed
 					this.#stopAllActors();
 				}
@@ -1044,7 +1057,7 @@ export class Runner {
 
 		for (const [_, actor] of this.#actors) {
 			const checkpoint = ack.lastEventCheckpoints.find(
-				(x) => x.actorId == actor.actorId,
+				(x) => x.actorId === actor.actorId,
 			);
 
 			if (checkpoint) actor.handleAckEvents(checkpoint.index);
@@ -1165,14 +1178,14 @@ export class Runner {
 			await this.#config.onActorStart(actorId, generation, actorConfig);
 
 			instance.actorStartPromise.resolve();
-		} catch (err) {
+		} catch (error) {
 			this.log?.error({
 				msg: "error starting runner actor",
 				actorId,
-				err,
+				error,
 			});
 
-			instance.actorStartPromise.reject(err);
+			instance.actorStartPromise.reject(error);
 
 			// TODO: Mark as crashed
 			// Send stopped state update if start failed
@@ -1181,7 +1194,7 @@ export class Runner {
 	}
 
 	async #handleCommandStopActor(commandWrapper: protocol.CommandWrapper) {
-		const stopCommand = commandWrapper.inner
+		const _stopCommand = commandWrapper.inner
 			.val as protocol.CommandStopActor;
 
 		const actorId = commandWrapper.checkpoint.actorId;

package/src/tunnel.ts

@@ -1,9 +1,5 @@
 import type * as protocol from "@rivetkit/engine-runner-protocol";
-import type {
-	GatewayId,
-	MessageId,
-	RequestId,
-} from "@rivetkit/engine-runner-protocol";
+import type { GatewayId, RequestId } from "@rivetkit/engine-runner-protocol";
 import type { Logger } from "pino";
 import { type Runner, type RunnerActor, RunnerShutdownError } from "./mod";
 import {

package/src/websocket-tunnel-adapter.ts

@@ -1,9 +1,9 @@
-import type { Logger } from "pino";
 import {
-	VirtualWebSocket,
-	type UniversalWebSocket,
 	type RivetMessageEvent,
+	type UniversalWebSocket,
+	VirtualWebSocket,
 } from "@rivetkit/virtual-websocket";
+import type { Logger } from "pino";
 import type { Tunnel } from "./tunnel";
 import {
 	MAX_PAYLOAD_SIZE,