@rivetkit/engine-runner 25.7.2-rc.1 → 25.7.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rivetkit/engine-runner",
-  "version": "25.7.2-rc.1",
+  "version": "25.7.3",
   "type": "module",
   "exports": {
     "import": {
@@ -16,16 +16,16 @@
     "uuid": "^12.0.0",
     "pino": "^9.9.5",
     "ws": "^8.18.3",
-    "@rivetkit/engine-runner-protocol": "25.7.2-rc.1"
+    "@rivetkit/engine-runner-protocol": "25.7.3"
   },
   "devDependencies": {
-    "@types/node": "^22.13.9",
+    "@types/node": "^22.18.1",
     "@types/ws": "^8.18.1",
-    "tinybench": "^5.0.0",
+    "tinybench": "^5.0.1",
     "tsup": "^8.5.0",
-    "tsx": "^4.19.3",
-    "typescript": "^5.3.3",
-    "vitest": "^1.6.0"
+    "tsx": "^4.20.5",
+    "typescript": "^5.9.2",
+    "vitest": "^1.6.1"
   },
   "scripts": {
     "build": "tsup src/mod.ts",

package/src/mod.ts

@@ -8,6 +8,7 @@ import type { Logger } from "pino";
 import { setLogger, logger } from "./log.js";
 
 const KV_EXPIRE: number = 30_000;
+const PROTOCOL_VERSION: number = 1;
 
 export interface ActorInstance {
 	actorId: string;
@@ -28,6 +29,7 @@ export interface RunnerConfig {
 	logger?: Logger;
 	version: number;
 	endpoint: string;
+	token?: string;
 	pegboardEndpoint?: string;
 	pegboardRelayEndpoint?: string;
 	namespace: string;
@@ -393,7 +395,7 @@ export class Runner {
 		const wsEndpoint = endpoint
 			.replace("http://", "ws://")
 			.replace("https://", "wss://");
-		return `${wsEndpoint}?protocol_version=1&namespace=${encodeURIComponent(this.#config.namespace)}&runner_key=${encodeURIComponent(this.#config.runnerKey)}`;
+		return `${wsEndpoint}?protocol_version=${PROTOCOL_VERSION}&namespace=${encodeURIComponent(this.#config.namespace)}&runner_key=${encodeURIComponent(this.#config.runnerKey)}`;
 	}
 
 	get pegboardTunnelUrl() {
@@ -404,17 +406,16 @@ export class Runner {
 		const wsEndpoint = endpoint
 			.replace("http://", "ws://")
 			.replace("https://", "wss://");
-		return `${wsEndpoint}?protocol_version=1&namespace=${encodeURIComponent(this.#config.namespace)}&runner_name=${encodeURIComponent(this.#config.runnerName)}&runner_key=${encodeURIComponent(this.#config.runnerKey)}`;
+		return `${wsEndpoint}?protocol_version=${PROTOCOL_VERSION}&namespace=${encodeURIComponent(this.#config.namespace)}&runner_name=${encodeURIComponent(this.#config.runnerName)}&runner_key=${encodeURIComponent(this.#config.runnerKey)}`;
 	}
 
 	// MARK: Runner protocol
 	async #openPegboardWebSocket() {
+		const protocols = ["rivet", `rivet_target.runner`];
+		if (this.config.token) protocols.push(`rivet_token.${this.config.token}`);
+
 		const WS = await importWebSocket();
-		const ws = new WS(this.pegboardUrl, {
-			headers: {
-				"x-rivet-target": "runner",
-			},
-		}) as any as WebSocket;
+		const ws = new WS(this.pegboardUrl, protocols) as any as WebSocket;
 		this.#pegboardWebSocket = ws;
 
 		ws.addEventListener("open", () => {
@@ -538,14 +539,35 @@ export class Runner {
 			} else if (message.tag === "ToClientTunnelMessage") {
 				this.#tunnel?.handleTunnelMessage(message.val);
 			} else if (message.tag === "ToClientClose") {
-				// TODO: Close ws
+				this.#tunnel.shutdown();
+				ws.close(1000, "manual closure");
 			} else {
 				unreachable(message);
 			}
 		});
 
 		ws.addEventListener("error", (ev) => {
-			logger()?.error("WebSocket error:", ev.error);
+			logger()?.error(`WebSocket error: ${ev.error}`);
+
+			if (!this.#shutdown) {
+				// Start runner lost timeout if we have a threshold and are not shutting down
+				if (
+					!this.#runnerLostTimeout &&
+					this.#runnerLostThreshold &&
+					this.#runnerLostThreshold > 0
+				) {
+					logger()?.info({
+						msg: "starting runner lost timeout",
+						seconds: this.#runnerLostThreshold / 1000,
+					});
+					this.#runnerLostTimeout = setTimeout(() => {
+						this.#stopAllActors();
+					}, this.#runnerLostThreshold);
+				}
+
+				// Attempt to reconnect if not stopped
+				this.#scheduleReconnect();
+			}
 		});
 
 		ws.addEventListener("close", (ev) => {
@@ -572,6 +594,7 @@ export class Runner {
 			if (!this.#shutdown) {
 				// Start runner lost timeout if we have a threshold and are not shutting down
 				if (
+					!this.#runnerLostTimeout &&
 					this.#runnerLostThreshold &&
 					this.#runnerLostThreshold > 0
 				) {
@@ -1242,9 +1265,27 @@ export class Runner {
 		}
 	}
 
+	getServerlessInitPacket(): string | undefined {
+		if (!this.runnerId) return undefined;
+
+		let data = protocol.encodeToServerlessServer({
+			tag: "ToServerlessServerInit",
+			val: {
+				runnerId: this.runnerId,
+			}
+		});
+
+		// Embed version
+		const buffer = Buffer.alloc(data.length + 2);
+		buffer.writeUInt16LE(PROTOCOL_VERSION, 0);
+		Buffer.from(data).copy(buffer, 2);
+
+		return buffer.toString('base64');
+	}
+
 	#scheduleReconnect() {
 		if (this.#shutdown) {
-			//logger()?.log("Runner is shut down, not attempting reconnect");
+			logger()?.debug("Runner is shut down, not attempting reconnect");
 			return;
 		}
 
@@ -1255,16 +1296,16 @@ export class Runner {
 			jitter: true,
 		});
 
-		//logger()?.log(
-		//	`Scheduling reconnect attempt ${this.#reconnectAttempt + 1} in ${delay}ms`,
-		//);
+		logger()?.debug(
+			`Scheduling reconnect attempt ${this.#reconnectAttempt + 1} in ${delay}ms`,
+		);
 
 		this.#reconnectTimeout = setTimeout(async () => {
 			if (!this.#shutdown) {
 				this.#reconnectAttempt++;
-				//logger()?.log(
-				//	`Attempting to reconnect (attempt ${this.#reconnectAttempt})...`,
-				//);
+				logger()?.debug(
+					`Attempting to reconnect (attempt ${this.#reconnectAttempt})...`,
+				);
 				await this.#openPegboardWebSocket();
 			}
 		}, delay);

package/.turbo/turbo-build.log

@@ -1,23 +0,0 @@
-
-
-> @rivetkit/engine-runner@25.7.1 build /Users/nathan/engine/sdks/typescript/runner
-> tsup src/mod.ts
-
-CLI Building entry: src/mod.ts
-CLI Using tsconfig: tsconfig.json
-CLI tsup v8.5.0
-CLI Using tsup config: /Users/nathan/engine/sdks/typescript/runner/tsup.config.ts
-CLI Target: node16
-CLI Cleaning output folder
-CJS Build start
-ESM Build start
-ESM dist/mod.js     53.27 KB
-ESM dist/mod.js.map 103.94 KB
-ESM ⚡️ Build success in 113ms
-CJS dist/mod.cjs     54.16 KB
-CJS dist/mod.cjs.map 88.80 KB
-CJS ⚡️ Build success in 115ms
-DTS Build start
-DTS ⚡️ Build success in 781ms
-DTS dist/mod.d.cts 2.71 KB
-DTS dist/mod.d.ts  2.71 KB

package/.turbo/turbo-check-types.log

@@ -1,5 +0,0 @@
-
-
-> @rivetkit/engine-runner@25.6.1 check-types /Users/nathan/engine/sdks/typescript/runner
-> tsc --noEmit
-