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

package/src/stringify.ts

@@ -40,8 +40,6 @@ export function stringifyToServerTunnelMessageKind(
 	kind: protocol.ToServerTunnelMessageKind,
 ): string {
 	switch (kind.tag) {
-		case "DeprecatedTunnelAck":
-			return "DeprecatedTunnelAck";
 		case "ToServerResponseStart": {
 			const { status, headers, body, stream } = kind.val;
 			const bodyStr = body === null ? "null" : stringifyArrayBuffer(body);
@@ -82,8 +80,6 @@ export function stringifyToClientTunnelMessageKind(
 	kind: protocol.ToClientTunnelMessageKind,
 ): string {
 	switch (kind.tag) {
-		case "DeprecatedTunnelAck":
-			return "DeprecatedTunnelAck";
 		case "ToClientRequestStart": {
 			const { actorId, method, path, headers, body, stream } = kind.val;
 			const bodyStr = body === null ? "null" : stringifyArrayBuffer(body);
@@ -119,7 +115,7 @@ export function stringifyToClientTunnelMessageKind(
 export function stringifyCommand(command: protocol.Command): string {
 	switch (command.tag) {
 		case "CommandStartActor": {
-			const { actorId, generation, config, hibernatingRequests } =
+			const { generation, config, hibernatingRequests } =
 				command.val;
 			const keyStr = config.key === null ? "null" : `"${config.key}"`;
 			const inputStr =
@@ -130,11 +126,11 @@ export function stringifyCommand(command: protocol.Command): string {
 				hibernatingRequests.length > 0
 					? `[${hibernatingRequests.map((hr) => `{gatewayId: ${idToStr(hr.gatewayId)}, requestId: ${idToStr(hr.requestId)}}`).join(", ")}]`
 					: "[]";
-			return `CommandStartActor{actorId: "${actorId}", generation: ${generation}, config: {name: "${config.name}", key: ${keyStr}, createTs: ${stringifyBigInt(config.createTs)}, input: ${inputStr}}, hibernatingRequests: ${hibernatingRequestsStr}}`;
+			return `CommandStartActor{generation: ${generation}, config: {name: "${config.name}", key: ${keyStr}, createTs: ${stringifyBigInt(config.createTs)}, input: ${inputStr}}, hibernatingRequests: ${hibernatingRequestsStr}}`;
 		}
 		case "CommandStopActor": {
-			const { actorId, generation } = command.val;
-			return `CommandStopActor{actorId: "${actorId}", generation: ${generation}}`;
+			const { generation } = command.val;
+			return `CommandStopActor{generation: ${generation}}`;
 		}
 	}
 }
@@ -146,7 +142,7 @@ export function stringifyCommand(command: protocol.Command): string {
 export function stringifyCommandWrapper(
 	wrapper: protocol.CommandWrapper,
 ): string {
-	return `CommandWrapper{index: ${stringifyBigInt(wrapper.index)}, inner: ${stringifyCommand(wrapper.inner)}}`;
+	return `CommandWrapper{actorId: "${wrapper.checkpoint.actorId}", index: ${stringifyBigInt(wrapper.checkpoint.index)}, inner: ${stringifyCommand(wrapper.inner)}}`;
 }
 
 /**
@@ -193,7 +189,7 @@ export function stringifyEvent(event: protocol.Event): string {
  * Handles ArrayBuffers, BigInts, and Maps that can't be JSON.stringified
  */
 export function stringifyEventWrapper(wrapper: protocol.EventWrapper): string {
-	return `EventWrapper{index: ${stringifyBigInt(wrapper.index)}, inner: ${stringifyEvent(wrapper.inner)}}`;
+	return `EventWrapper{actorId: ${wrapper.checkpoint.actorId}, index: ${stringifyBigInt(wrapper.checkpoint.index)}, inner: ${stringifyEvent(wrapper.inner)}}`;
 }
 
 /**
@@ -207,34 +203,33 @@ export function stringifyToServer(message: protocol.ToServer): string {
 				name,
 				version,
 				totalSlots,
-				lastCommandIdx,
 				prepopulateActorNames,
 				metadata,
 			} = message.val;
-			const lastCommandIdxStr =
-				lastCommandIdx === null
-					? "null"
-					: stringifyBigInt(lastCommandIdx);
 			const prepopulateActorNamesStr =
 				prepopulateActorNames === null
 					? "null"
 					: `Map(${prepopulateActorNames.size})`;
 			const metadataStr = metadata === null ? "null" : `"${metadata}"`;
-			return `ToServerInit{name: "${name}", version: ${version}, totalSlots: ${totalSlots}, lastCommandIdx: ${lastCommandIdxStr}, prepopulateActorNames: ${prepopulateActorNamesStr}, metadata: ${metadataStr}}`;
+			return `ToServerInit{name: "${name}", version: ${version}, totalSlots: ${totalSlots}, prepopulateActorNames: ${prepopulateActorNamesStr}, metadata: ${metadataStr}}`;
 		}
 		case "ToServerEvents": {
 			const events = message.val;
 			return `ToServerEvents{count: ${events.length}, events: [${events.map((e) => stringifyEventWrapper(e)).join(", ")}]}`;
 		}
 		case "ToServerAckCommands": {
-			const { lastCommandIdx } = message.val;
-			return `ToServerAckCommands{lastCommandIdx: ${stringifyBigInt(lastCommandIdx)}}`;
+			const { lastCommandCheckpoints } = message.val;
+			const checkpointsStr =
+				lastCommandCheckpoints.length > 0
+					? `[${lastCommandCheckpoints.map((cp) => `{actorId: "${cp.actorId}", index: ${stringifyBigInt(cp.index)}}`).join(", ")}]`
+					: "[]";
+			return `ToServerAckCommands{lastCommandCheckpoints: ${checkpointsStr}}`;
 		}
 		case "ToServerStopping":
 			return "ToServerStopping";
-		case "ToServerPing": {
+		case "ToServerPong": {
 			const { ts } = message.val;
-			return `ToServerPing{ts: ${stringifyBigInt(ts)}}`;
+			return `ToServerPong{ts: ${stringifyBigInt(ts)}}`;
 		}
 		case "ToServerKvRequest": {
 			const { actorId, requestId, data } = message.val;
@@ -255,19 +250,24 @@ export function stringifyToServer(message: protocol.ToServer): string {
 export function stringifyToClient(message: protocol.ToClient): string {
 	switch (message.tag) {
 		case "ToClientInit": {
-			const { runnerId, lastEventIdx, metadata } = message.val;
+			const { runnerId, metadata } = message.val;
 			const metadataStr = `{runnerLostThreshold: ${stringifyBigInt(metadata.runnerLostThreshold)}}`;
-			return `ToClientInit{runnerId: "${runnerId}", lastEventIdx: ${stringifyBigInt(lastEventIdx)}, metadata: ${metadataStr}}`;
+			return `ToClientInit{runnerId: "${runnerId}", metadata: ${metadataStr}}`;
 		}
-		case "ToClientClose":
-			return "ToClientClose";
+		case "ToClientPing":
+			const { ts } = message.val;
+			return `ToClientPing{ts: ${stringifyBigInt(ts)}}`;
 		case "ToClientCommands": {
 			const commands = message.val;
 			return `ToClientCommands{count: ${commands.length}, commands: [${commands.map((c) => stringifyCommandWrapper(c)).join(", ")}]}`;
 		}
 		case "ToClientAckEvents": {
-			const { lastEventIdx } = message.val;
-			return `ToClientAckEvents{lastEventIdx: ${stringifyBigInt(lastEventIdx)}}`;
+			const { lastEventCheckpoints } = message.val;
+			const checkpointsStr =
+				lastEventCheckpoints.length > 0
+					? `[${lastEventCheckpoints.map((cp) => `{actorId: "${cp.actorId}", index: ${stringifyBigInt(cp.index)}}`).join(", ")}]`
+					: "[]";
+			return `ToClientAckEvents{lastEventCheckpoints: ${checkpointsStr}}`;
 		}
 		case "ToClientKvResponse": {
 			const { requestId, data } = message.val;

package/src/tunnel.ts

@@ -10,12 +10,12 @@ import {
 	stringify as uuidstringify,
 	v4 as uuidv4,
 } from "uuid";
-import type { Runner, RunnerActor } from "./mod";
+import { RunnerShutdownError, type Runner, type RunnerActor } from "./mod";
 import {
 	stringifyToClientTunnelMessageKind,
 	stringifyToServerTunnelMessageKind,
 } from "./stringify";
-import { arraysEqual, idToStr, unreachable } from "./utils";
+import { arraysEqual, idToStr, stringifyError, unreachable } from "./utils";
 import {
 	HIBERNATABLE_SYMBOL,
 	WebSocketTunnelAdapter,
@@ -41,12 +41,6 @@ export interface HibernatingWebSocketMetadata {
 	headers: Record<string, string>;
 }
 
-class RunnerShutdownError extends Error {
-	constructor() {
-		super("Runner shut down");
-	}
-}
-
 export class Tunnel {
 	#runner: Runner;
 
@@ -226,7 +220,7 @@ export class Tunnel {
 						this.log?.error({
 							msg: "error creating websocket during restore",
 							requestId: requestIdStr,
-							err,
+							error: stringifyError(err),
 						});
 
 						// Close the WebSocket on error
@@ -291,7 +285,7 @@ export class Tunnel {
 						this.log?.error({
 							msg: "error creating stale websocket during restore",
 							requestId: requestIdStr,
-							err,
+							error: stringifyError(err),
 						});
 					});
 
@@ -671,9 +665,6 @@ export class Tunnel {
 					message.messageKind.val,
 				);
 				break;
-			case "DeprecatedTunnelAck":
-				// Ignore deprecated tunnel ack messages
-				break;
 			default:
 				unreachable(message.messageKind);
 		}

package/src/utils.ts

@@ -157,3 +157,19 @@ export function idToStr(id: ArrayBuffer): string {
 		.map((byte) => byte.toString(16).padStart(2, "0"))
 		.join("");
 }
+
+export function stringifyError(error: unknown): string {
+	if (error instanceof Error) {
+		return `${error.name}: ${error.message}${error.stack ? `\n${error.stack}` : ""}`;
+	} else if (typeof error === "string") {
+		return error;
+	} else if (typeof error === "object" && error !== null) {
+		try {
+			return `${JSON.stringify(error)}`;
+		} catch {
+			return `[object ${error.constructor?.name || "Object"}]`;
+		}
+	} else {
+		return String(error);
+	}
+}