@rivetkit/engine-runner 0.0.0-pr.4880.c7bfbc5 → 0.0.0-pr.4881.2dba543

package/package.json

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

package/src/mod.ts

@@ -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();
 				}