@rivetkit/engine-runner-protocol 2.0.24-rc.1 → 2.0.24

package/dist/index.d.ts

@@ -10,6 +10,15 @@ declare function writeId(bc: bare.ByteCursor, x: Id): void;
 type Json = string;
 declare function readJson(bc: bare.ByteCursor): Json;
 declare function writeJson(bc: bare.ByteCursor, x: Json): void;
+type GatewayId = ArrayBuffer;
+declare function readGatewayId(bc: bare.ByteCursor): GatewayId;
+declare function writeGatewayId(bc: bare.ByteCursor, x: GatewayId): void;
+type RequestId = ArrayBuffer;
+declare function readRequestId(bc: bare.ByteCursor): RequestId;
+declare function writeRequestId(bc: bare.ByteCursor, x: RequestId): void;
+type MessageIndex = u16;
+declare function readMessageIndex(bc: bare.ByteCursor): MessageIndex;
+declare function writeMessageIndex(bc: bare.ByteCursor, x: MessageIndex): void;
 /**
  * Basic types
  */
@@ -21,6 +30,9 @@ declare function readKvValue(bc: bare.ByteCursor): KvValue;
 declare function writeKvValue(bc: bare.ByteCursor, x: KvValue): void;
 type KvMetadata = {
     readonly version: ArrayBuffer;
+    /**
+     * TODO: Rename to update_ts
+     */
     readonly createTs: i64;
 };
 declare function readKvMetadata(bc: bare.ByteCursor): KvMetadata;
@@ -244,10 +256,17 @@ type EventWrapper = {
 };
 declare function readEventWrapper(bc: bare.ByteCursor): EventWrapper;
 declare function writeEventWrapper(bc: bare.ByteCursor, x: EventWrapper): void;
+type HibernatingRequest = {
+    readonly gatewayId: GatewayId;
+    readonly requestId: RequestId;
+};
+declare function readHibernatingRequest(bc: bare.ByteCursor): HibernatingRequest;
+declare function writeHibernatingRequest(bc: bare.ByteCursor, x: HibernatingRequest): void;
 type CommandStartActor = {
     readonly actorId: Id;
     readonly generation: u32;
     readonly config: ActorConfig;
+    readonly hibernatingRequests: readonly HibernatingRequest[];
 };
 declare function readCommandStartActor(bc: bare.ByteCursor): CommandStartActor;
 declare function writeCommandStartActor(bc: bare.ByteCursor, x: CommandStartActor): void;
@@ -272,19 +291,23 @@ type CommandWrapper = {
 };
 declare function readCommandWrapper(bc: bare.ByteCursor): CommandWrapper;
 declare function writeCommandWrapper(bc: bare.ByteCursor, x: CommandWrapper): void;
-type RequestId = ArrayBuffer;
-declare function readRequestId(bc: bare.ByteCursor): RequestId;
-declare function writeRequestId(bc: bare.ByteCursor, x: RequestId): void;
-/**
- * UUIDv4
- */
-type MessageId = ArrayBuffer;
+type MessageId = {
+    /**
+     * Globally unique ID
+     */
+    readonly gatewayId: GatewayId;
+    /**
+     * Unique ID to the gateway
+     */
+    readonly requestId: RequestId;
+    /**
+     * Unique ID to the request
+     */
+    readonly messageIndex: MessageIndex;
+};
 declare function readMessageId(bc: bare.ByteCursor): MessageId;
 declare function writeMessageId(bc: bare.ByteCursor, x: MessageId): void;
-/**
- * Ack
- */
-type TunnelAck = null;
+type DeprecatedTunnelAck = null;
 /**
  * HTTP
  */
@@ -331,7 +354,6 @@ type ToClientWebSocketOpen = {
 declare function readToClientWebSocketOpen(bc: bare.ByteCursor): ToClientWebSocketOpen;
 declare function writeToClientWebSocketOpen(bc: bare.ByteCursor, x: ToClientWebSocketOpen): void;
 type ToClientWebSocketMessage = {
-    readonly index: u16;
     readonly data: ArrayBuffer;
     readonly binary: boolean;
 };
@@ -345,7 +367,6 @@ declare function readToClientWebSocketClose(bc: bare.ByteCursor): ToClientWebSoc
 declare function writeToClientWebSocketClose(bc: bare.ByteCursor, x: ToClientWebSocketClose): void;
 type ToServerWebSocketOpen = {
     readonly canHibernate: boolean;
-    readonly lastMsgIndex: i64;
 };
 declare function readToServerWebSocketOpen(bc: bare.ByteCursor): ToServerWebSocketOpen;
 declare function writeToServerWebSocketOpen(bc: bare.ByteCursor, x: ToServerWebSocketOpen): void;
@@ -356,14 +377,14 @@ type ToServerWebSocketMessage = {
 declare function readToServerWebSocketMessage(bc: bare.ByteCursor): ToServerWebSocketMessage;
 declare function writeToServerWebSocketMessage(bc: bare.ByteCursor, x: ToServerWebSocketMessage): void;
 type ToServerWebSocketMessageAck = {
-    readonly index: u16;
+    readonly index: MessageIndex;
 };
 declare function readToServerWebSocketMessageAck(bc: bare.ByteCursor): ToServerWebSocketMessageAck;
 declare function writeToServerWebSocketMessageAck(bc: bare.ByteCursor, x: ToServerWebSocketMessageAck): void;
 type ToServerWebSocketClose = {
     readonly code: u16 | null;
     readonly reason: string | null;
-    readonly retry: boolean;
+    readonly hibernate: boolean;
 };
 declare function readToServerWebSocketClose(bc: bare.ByteCursor): ToServerWebSocketClose;
 declare function writeToServerWebSocketClose(bc: bare.ByteCursor, x: ToServerWebSocketClose): void;
@@ -371,8 +392,8 @@ declare function writeToServerWebSocketClose(bc: bare.ByteCursor, x: ToServerWeb
  * To Server
  */
 type ToServerTunnelMessageKind = {
-    readonly tag: "TunnelAck";
-    readonly val: TunnelAck;
+    readonly tag: "DeprecatedTunnelAck";
+    readonly val: DeprecatedTunnelAck;
 }
 /**
  * HTTP
@@ -406,7 +427,6 @@ type ToServerTunnelMessageKind = {
 declare function readToServerTunnelMessageKind(bc: bare.ByteCursor): ToServerTunnelMessageKind;
 declare function writeToServerTunnelMessageKind(bc: bare.ByteCursor, x: ToServerTunnelMessageKind): void;
 type ToServerTunnelMessage = {
-    readonly requestId: RequestId;
     readonly messageId: MessageId;
     readonly messageKind: ToServerTunnelMessageKind;
 };
@@ -416,8 +436,8 @@ declare function writeToServerTunnelMessage(bc: bare.ByteCursor, x: ToServerTunn
  * To Client
  */
 type ToClientTunnelMessageKind = {
-    readonly tag: "TunnelAck";
-    readonly val: TunnelAck;
+    readonly tag: "DeprecatedTunnelAck";
+    readonly val: DeprecatedTunnelAck;
 }
 /**
  * HTTP
@@ -448,13 +468,8 @@ type ToClientTunnelMessageKind = {
 declare function readToClientTunnelMessageKind(bc: bare.ByteCursor): ToClientTunnelMessageKind;
 declare function writeToClientTunnelMessageKind(bc: bare.ByteCursor, x: ToClientTunnelMessageKind): void;
 type ToClientTunnelMessage = {
-    readonly requestId: RequestId;
     readonly messageId: MessageId;
     readonly messageKind: ToClientTunnelMessageKind;
-    /**
-     * Should be stripped before sending to the runner.
-     */
-    readonly gatewayReplyTo: string | null;
 };
 declare function readToClientTunnelMessage(bc: bare.ByteCursor): ToClientTunnelMessage;
 declare function writeToClientTunnelMessage(bc: bare.ByteCursor, x: ToClientTunnelMessage): void;
@@ -571,11 +586,61 @@ declare function readToClient(bc: bare.ByteCursor): ToClient;
 declare function writeToClient(bc: bare.ByteCursor, x: ToClient): void;
 declare function encodeToClient(x: ToClient, config?: Partial<bare.Config>): Uint8Array;
 declare function decodeToClient(bytes: Uint8Array): ToClient;
+/**
+ * MARK: To Runner
+ */
+type ToRunnerPing = {
+    readonly gatewayId: GatewayId;
+    readonly requestId: RequestId;
+    readonly ts: i64;
+};
+declare function readToRunnerPing(bc: bare.ByteCursor): ToRunnerPing;
+declare function writeToRunnerPing(bc: bare.ByteCursor, x: ToRunnerPing): void;
+/**
+ * We have to re-declare the entire union since BARE will not generate the
+ * ser/de for ToClient if it's not a top-level type
+ */
+type ToRunner = {
+    readonly tag: "ToRunnerPing";
+    readonly val: ToRunnerPing;
+} | {
+    readonly tag: "ToClientInit";
+    readonly val: ToClientInit;
+} | {
+    readonly tag: "ToClientClose";
+    readonly val: ToClientClose;
+} | {
+    readonly tag: "ToClientCommands";
+    readonly val: ToClientCommands;
+} | {
+    readonly tag: "ToClientAckEvents";
+    readonly val: ToClientAckEvents;
+} | {
+    readonly tag: "ToClientKvResponse";
+    readonly val: ToClientKvResponse;
+} | {
+    readonly tag: "ToClientTunnelMessage";
+    readonly val: ToClientTunnelMessage;
+};
+declare function readToRunner(bc: bare.ByteCursor): ToRunner;
+declare function writeToRunner(bc: bare.ByteCursor, x: ToRunner): void;
+declare function encodeToRunner(x: ToRunner, config?: Partial<bare.Config>): Uint8Array;
+declare function decodeToRunner(bytes: Uint8Array): ToRunner;
 /**
  * MARK: To Gateway
  */
+type ToGatewayPong = {
+    readonly requestId: RequestId;
+    readonly ts: i64;
+};
+declare function readToGatewayPong(bc: bare.ByteCursor): ToGatewayPong;
+declare function writeToGatewayPong(bc: bare.ByteCursor, x: ToGatewayPong): void;
 type ToGateway = {
-    readonly message: ToServerTunnelMessage;
+    readonly tag: "ToGatewayPong";
+    readonly val: ToGatewayPong;
+} | {
+    readonly tag: "ToServerTunnelMessage";
+    readonly val: ToServerTunnelMessage;
 };
 declare function readToGateway(bc: bare.ByteCursor): ToGateway;
 declare function writeToGateway(bc: bare.ByteCursor, x: ToGateway): void;
@@ -598,4 +663,4 @@ declare function writeToServerlessServer(bc: bare.ByteCursor, x: ToServerlessSer
 declare function encodeToServerlessServer(x: ToServerlessServer, config?: Partial<bare.Config>): Uint8Array;
 declare function decodeToServerlessServer(bytes: Uint8Array): ToServerlessServer;
 
-export { type ActorConfig, type ActorIntent, type ActorIntentSleep, type ActorIntentStop, type ActorName, type ActorState, type ActorStateRunning, type ActorStateStopped, type Command, type CommandStartActor, type CommandStopActor, type CommandWrapper, type Event, type EventActorIntent, type EventActorSetAlarm, type EventActorStateUpdate, type EventWrapper, type Id, type Json, type KvDeleteRequest, type KvDeleteResponse, type KvDropRequest, type KvDropResponse, type KvErrorResponse, type KvGetRequest, type KvGetResponse, type KvKey, type KvListAllQuery, type KvListPrefixQuery, type KvListQuery, type KvListRangeQuery, type KvListRequest, type KvListResponse, type KvMetadata, type KvPutRequest, type KvPutResponse, type KvRequestData, type KvResponseData, type KvValue, type MessageId, type ProtocolMetadata, type RequestId, StopCode, type ToClient, type ToClientAckEvents, type ToClientClose, type ToClientCommands, type ToClientInit, type ToClientKvResponse, type ToClientRequestAbort, type ToClientRequestChunk, type ToClientRequestStart, type ToClientTunnelMessage, type ToClientTunnelMessageKind, type ToClientWebSocketClose, type ToClientWebSocketMessage, type ToClientWebSocketOpen, type ToGateway, type ToServer, type ToServerAckCommands, type ToServerEvents, type ToServerInit, type ToServerKvRequest, type ToServerPing, type ToServerResponseAbort, type ToServerResponseChunk, type ToServerResponseStart, type ToServerStopping, type ToServerTunnelMessage, type ToServerTunnelMessageKind, type ToServerWebSocketClose, type ToServerWebSocketMessage, type ToServerWebSocketMessageAck, type ToServerWebSocketOpen, type ToServerlessServer, type ToServerlessServerInit, type TunnelAck, decodeToClient, decodeToGateway, decodeToServer, decodeToServerlessServer, encodeToClient, encodeToGateway, encodeToServer, encodeToServerlessServer, type i64, readActorConfig, readActorIntent, readActorName, readActorState, readActorStateStopped, readCommand, readCommandStartActor, readCommandStopActor, readCommandWrapper, readEvent, readEventActorIntent, readEventActorSetAlarm, readEventActorStateUpdate, readEventWrapper, readId, readJson, readKvDeleteRequest, readKvErrorResponse, readKvGetRequest, readKvGetResponse, readKvKey, readKvListPrefixQuery, readKvListQuery, readKvListRangeQuery, readKvListRequest, readKvListResponse, readKvMetadata, readKvPutRequest, readKvRequestData, readKvResponseData, readKvValue, readMessageId, readProtocolMetadata, readRequestId, readStopCode, readToClient, readToClientAckEvents, readToClientCommands, readToClientInit, readToClientKvResponse, readToClientRequestChunk, readToClientRequestStart, readToClientTunnelMessage, readToClientTunnelMessageKind, readToClientWebSocketClose, readToClientWebSocketMessage, readToClientWebSocketOpen, readToGateway, readToServer, readToServerAckCommands, readToServerEvents, readToServerInit, readToServerKvRequest, readToServerPing, readToServerResponseChunk, readToServerResponseStart, readToServerTunnelMessage, readToServerTunnelMessageKind, readToServerWebSocketClose, readToServerWebSocketMessage, readToServerWebSocketMessageAck, readToServerWebSocketOpen, readToServerlessServer, readToServerlessServerInit, type u16, type u32, type u64, writeActorConfig, writeActorIntent, writeActorName, writeActorState, writeActorStateStopped, writeCommand, writeCommandStartActor, writeCommandStopActor, writeCommandWrapper, writeEvent, writeEventActorIntent, writeEventActorSetAlarm, writeEventActorStateUpdate, writeEventWrapper, writeId, writeJson, writeKvDeleteRequest, writeKvErrorResponse, writeKvGetRequest, writeKvGetResponse, writeKvKey, writeKvListPrefixQuery, writeKvListQuery, writeKvListRangeQuery, writeKvListRequest, writeKvListResponse, writeKvMetadata, writeKvPutRequest, writeKvRequestData, writeKvResponseData, writeKvValue, writeMessageId, writeProtocolMetadata, writeRequestId, writeStopCode, writeToClient, writeToClientAckEvents, writeToClientCommands, writeToClientInit, writeToClientKvResponse, writeToClientRequestChunk, writeToClientRequestStart, writeToClientTunnelMessage, writeToClientTunnelMessageKind, writeToClientWebSocketClose, writeToClientWebSocketMessage, writeToClientWebSocketOpen, writeToGateway, writeToServer, writeToServerAckCommands, writeToServerEvents, writeToServerInit, writeToServerKvRequest, writeToServerPing, writeToServerResponseChunk, writeToServerResponseStart, writeToServerTunnelMessage, writeToServerTunnelMessageKind, writeToServerWebSocketClose, writeToServerWebSocketMessage, writeToServerWebSocketMessageAck, writeToServerWebSocketOpen, writeToServerlessServer, writeToServerlessServerInit };
+export { type ActorConfig, type ActorIntent, type ActorIntentSleep, type ActorIntentStop, type ActorName, type ActorState, type ActorStateRunning, type ActorStateStopped, type Command, type CommandStartActor, type CommandStopActor, type CommandWrapper, type DeprecatedTunnelAck, type Event, type EventActorIntent, type EventActorSetAlarm, type EventActorStateUpdate, type EventWrapper, type GatewayId, type HibernatingRequest, type Id, type Json, type KvDeleteRequest, type KvDeleteResponse, type KvDropRequest, type KvDropResponse, type KvErrorResponse, type KvGetRequest, type KvGetResponse, type KvKey, type KvListAllQuery, type KvListPrefixQuery, type KvListQuery, type KvListRangeQuery, type KvListRequest, type KvListResponse, type KvMetadata, type KvPutRequest, type KvPutResponse, type KvRequestData, type KvResponseData, type KvValue, type MessageId, type MessageIndex, type ProtocolMetadata, type RequestId, StopCode, type ToClient, type ToClientAckEvents, type ToClientClose, type ToClientCommands, type ToClientInit, type ToClientKvResponse, type ToClientRequestAbort, type ToClientRequestChunk, type ToClientRequestStart, type ToClientTunnelMessage, type ToClientTunnelMessageKind, type ToClientWebSocketClose, type ToClientWebSocketMessage, type ToClientWebSocketOpen, type ToGateway, type ToGatewayPong, type ToRunner, type ToRunnerPing, type ToServer, type ToServerAckCommands, type ToServerEvents, type ToServerInit, type ToServerKvRequest, type ToServerPing, type ToServerResponseAbort, type ToServerResponseChunk, type ToServerResponseStart, type ToServerStopping, type ToServerTunnelMessage, type ToServerTunnelMessageKind, type ToServerWebSocketClose, type ToServerWebSocketMessage, type ToServerWebSocketMessageAck, type ToServerWebSocketOpen, type ToServerlessServer, type ToServerlessServerInit, decodeToClient, decodeToGateway, decodeToRunner, decodeToServer, decodeToServerlessServer, encodeToClient, encodeToGateway, encodeToRunner, encodeToServer, encodeToServerlessServer, type i64, readActorConfig, readActorIntent, readActorName, readActorState, readActorStateStopped, readCommand, readCommandStartActor, readCommandStopActor, readCommandWrapper, readEvent, readEventActorIntent, readEventActorSetAlarm, readEventActorStateUpdate, readEventWrapper, readGatewayId, readHibernatingRequest, readId, readJson, readKvDeleteRequest, readKvErrorResponse, readKvGetRequest, readKvGetResponse, readKvKey, readKvListPrefixQuery, readKvListQuery, readKvListRangeQuery, readKvListRequest, readKvListResponse, readKvMetadata, readKvPutRequest, readKvRequestData, readKvResponseData, readKvValue, readMessageId, readMessageIndex, readProtocolMetadata, readRequestId, readStopCode, readToClient, readToClientAckEvents, readToClientCommands, readToClientInit, readToClientKvResponse, readToClientRequestChunk, readToClientRequestStart, readToClientTunnelMessage, readToClientTunnelMessageKind, readToClientWebSocketClose, readToClientWebSocketMessage, readToClientWebSocketOpen, readToGateway, readToGatewayPong, readToRunner, readToRunnerPing, readToServer, readToServerAckCommands, readToServerEvents, readToServerInit, readToServerKvRequest, readToServerPing, readToServerResponseChunk, readToServerResponseStart, readToServerTunnelMessage, readToServerTunnelMessageKind, readToServerWebSocketClose, readToServerWebSocketMessage, readToServerWebSocketMessageAck, readToServerWebSocketOpen, readToServerlessServer, readToServerlessServerInit, type u16, type u32, type u64, writeActorConfig, writeActorIntent, writeActorName, writeActorState, writeActorStateStopped, writeCommand, writeCommandStartActor, writeCommandStopActor, writeCommandWrapper, writeEvent, writeEventActorIntent, writeEventActorSetAlarm, writeEventActorStateUpdate, writeEventWrapper, writeGatewayId, writeHibernatingRequest, writeId, writeJson, writeKvDeleteRequest, writeKvErrorResponse, writeKvGetRequest, writeKvGetResponse, writeKvKey, writeKvListPrefixQuery, writeKvListQuery, writeKvListRangeQuery, writeKvListRequest, writeKvListResponse, writeKvMetadata, writeKvPutRequest, writeKvRequestData, writeKvResponseData, writeKvValue, writeMessageId, writeMessageIndex, writeProtocolMetadata, writeRequestId, writeStopCode, writeToClient, writeToClientAckEvents, writeToClientCommands, writeToClientInit, writeToClientKvResponse, writeToClientRequestChunk, writeToClientRequestStart, writeToClientTunnelMessage, writeToClientTunnelMessageKind, writeToClientWebSocketClose, writeToClientWebSocketMessage, writeToClientWebSocketOpen, writeToGateway, writeToGatewayPong, writeToRunner, writeToRunnerPing, writeToServer, writeToServerAckCommands, writeToServerEvents, writeToServerInit, writeToServerKvRequest, writeToServerPing, writeToServerResponseChunk, writeToServerResponseStart, writeToServerTunnelMessage, writeToServerTunnelMessageKind, writeToServerWebSocketClose, writeToServerWebSocketMessage, writeToServerWebSocketMessageAck, writeToServerWebSocketOpen, writeToServerlessServer, writeToServerlessServerInit };

package/dist/index.js

@@ -14,6 +14,26 @@ function readJson(bc) {
 function writeJson(bc, x) {
   bare.writeString(bc, x);
 }
+function readGatewayId(bc) {
+  return bare.readFixedData(bc, 4);
+}
+function writeGatewayId(bc, x) {
+  assert(x.byteLength === 4);
+  bare.writeFixedData(bc, x);
+}
+function readRequestId(bc) {
+  return bare.readFixedData(bc, 4);
+}
+function writeRequestId(bc, x) {
+  assert(x.byteLength === 4);
+  bare.writeFixedData(bc, x);
+}
+function readMessageIndex(bc) {
+  return bare.readU16(bc);
+}
+function writeMessageIndex(bc, x) {
+  bare.writeU16(bc, x);
+}
 function readKvKey(bc) {
   return bare.readData(bc);
 }
@@ -554,17 +574,46 @@ function writeEventWrapper(bc, x) {
   bare.writeI64(bc, x.index);
   writeEvent(bc, x.inner);
 }
+function readHibernatingRequest(bc) {
+  return {
+    gatewayId: readGatewayId(bc),
+    requestId: readRequestId(bc)
+  };
+}
+function writeHibernatingRequest(bc, x) {
+  writeGatewayId(bc, x.gatewayId);
+  writeRequestId(bc, x.requestId);
+}
+function read8(bc) {
+  const len = bare.readUintSafe(bc);
+  if (len === 0) {
+    return [];
+  }
+  const result = [readHibernatingRequest(bc)];
+  for (let i = 1; i < len; i++) {
+    result[i] = readHibernatingRequest(bc);
+  }
+  return result;
+}
+function write8(bc, x) {
+  bare.writeUintSafe(bc, x.length);
+  for (let i = 0; i < x.length; i++) {
+    writeHibernatingRequest(bc, x[i]);
+  }
+}
 function readCommandStartActor(bc) {
   return {
     actorId: readId(bc),
     generation: bare.readU32(bc),
-    config: readActorConfig(bc)
+    config: readActorConfig(bc),
+    hibernatingRequests: read8(bc)
   };
 }
 function writeCommandStartActor(bc, x) {
   writeId(bc, x.actorId);
   bare.writeU32(bc, x.generation);
   writeActorConfig(bc, x.config);
+  write8(bc, x.hibernatingRequests);
 }
 function readCommandStopActor(bc) {
   return {
@@ -614,21 +663,19 @@ function writeCommandWrapper(bc, x) {
   bare.writeI64(bc, x.index);
   writeCommand(bc, x.inner);
 }
-function readRequestId(bc) {
-  return bare.readFixedData(bc, 16);
-}
-function writeRequestId(bc, x) {
-  assert(x.byteLength === 16);
-  bare.writeFixedData(bc, x);
-}
 function readMessageId(bc) {
-  return bare.readFixedData(bc, 16);
+  return {
+    gatewayId: readGatewayId(bc),
+    requestId: readRequestId(bc),
+    messageIndex: readMessageIndex(bc)
+  };
 }
 function writeMessageId(bc, x) {
-  assert(x.byteLength === 16);
-  bare.writeFixedData(bc, x);
+  writeGatewayId(bc, x.gatewayId);
+  writeRequestId(bc, x.requestId);
+  writeMessageIndex(bc, x.messageIndex);
 }
-function read8(bc) {
+function read9(bc) {
   const len = bare.readUintSafe(bc);
   const result = /* @__PURE__ */ new Map();
   for (let i = 0; i < len; i++) {
@@ -642,7 +689,7 @@ function read8(bc) {
   }
   return result;
 }
-function write8(bc, x) {
+function write9(bc, x) {
   bare.writeUintSafe(bc, x.size);
   for (const kv of x) {
     bare.writeString(bc, kv[0]);
@@ -654,7 +701,7 @@ function readToClientRequestStart(bc) {
     actorId: readId(bc),
     method: bare.readString(bc),
     path: bare.readString(bc),
-    headers: read8(bc),
+    headers: read9(bc),
     body: read6(bc),
     stream: bare.readBool(bc)
   };
@@ -663,7 +710,7 @@ function writeToClientRequestStart(bc, x) {
   writeId(bc, x.actorId);
   bare.writeString(bc, x.method);
   bare.writeString(bc, x.path);
-  write8(bc, x.headers);
+  write9(bc, x.headers);
   write6(bc, x.body);
   bare.writeBool(bc, x.stream);
 }
@@ -680,14 +727,14 @@ function writeToClientRequestChunk(bc, x) {
 function readToServerResponseStart(bc) {
   return {
     status: bare.readU16(bc),
-    headers: read8(bc),
+    headers: read9(bc),
     body: read6(bc),
     stream: bare.readBool(bc)
   };
 }
 function writeToServerResponseStart(bc, x) {
   bare.writeU16(bc, x.status);
-  write8(bc, x.headers);
+  write9(bc, x.headers);
   write6(bc, x.body);
   bare.writeBool(bc, x.stream);
 }
@@ -705,30 +752,28 @@ function readToClientWebSocketOpen(bc) {
   return {
     actorId: readId(bc),
     path: bare.readString(bc),
-    headers: read8(bc)
+    headers: read9(bc)
   };
 }
 function writeToClientWebSocketOpen(bc, x) {
   writeId(bc, x.actorId);
   bare.writeString(bc, x.path);
-  write8(bc, x.headers);
+  write9(bc, x.headers);
 }
 function readToClientWebSocketMessage(bc) {
   return {
-    index: bare.readU16(bc),
     data: bare.readData(bc),
     binary: bare.readBool(bc)
   };
 }
 function writeToClientWebSocketMessage(bc, x) {
-  bare.writeU16(bc, x.index);
   bare.writeData(bc, x.data);
   bare.writeBool(bc, x.binary);
 }
-function read9(bc) {
+function read10(bc) {
   return bare.readBool(bc) ? bare.readU16(bc) : null;
 }
-function write9(bc, x) {
+function write10(bc, x) {
   bare.writeBool(bc, x != null);
   if (x != null) {
     bare.writeU16(bc, x);
@@ -736,23 +781,21 @@ function write9(bc, x) {
 }
 function readToClientWebSocketClose(bc) {
   return {
-    code: read9(bc),
+    code: read10(bc),
     reason: read5(bc)
   };
 }
 function writeToClientWebSocketClose(bc, x) {
-  write9(bc, x.code);
+  write10(bc, x.code);
   write5(bc, x.reason);
 }
 function readToServerWebSocketOpen(bc) {
   return {
-    canHibernate: bare.readBool(bc),
-    lastMsgIndex: bare.readI64(bc)
+    canHibernate: bare.readBool(bc)
   };
 }
 function writeToServerWebSocketOpen(bc, x) {
   bare.writeBool(bc, x.canHibernate);
-  bare.writeI64(bc, x.lastMsgIndex);
 }
 function readToServerWebSocketMessage(bc) {
   return {
@@ -766,30 +809,30 @@ function writeToServerWebSocketMessage(bc, x) {
 }
 function readToServerWebSocketMessageAck(bc) {
   return {
-    index: bare.readU16(bc)
+    index: readMessageIndex(bc)
   };
 }
 function writeToServerWebSocketMessageAck(bc, x) {
-  bare.writeU16(bc, x.index);
+  writeMessageIndex(bc, x.index);
 }
 function readToServerWebSocketClose(bc) {
   return {
-    code: read9(bc),
+    code: read10(bc),
     reason: read5(bc),
-    retry: bare.readBool(bc)
+    hibernate: bare.readBool(bc)
   };
 }
 function writeToServerWebSocketClose(bc, x) {
-  write9(bc, x.code);
+  write10(bc, x.code);
   write5(bc, x.reason);
-  bare.writeBool(bc, x.retry);
+  bare.writeBool(bc, x.hibernate);
 }
 function readToServerTunnelMessageKind(bc) {
   const offset = bc.offset;
   const tag = bare.readU8(bc);
   switch (tag) {
     case 0:
-      return { tag: "TunnelAck", val: null };
+      return { tag: "DeprecatedTunnelAck", val: null };
     case 1:
       return { tag: "ToServerResponseStart", val: readToServerResponseStart(bc) };
     case 2:
@@ -812,7 +855,7 @@ function readToServerTunnelMessageKind(bc) {
 }
 function writeToServerTunnelMessageKind(bc, x) {
   switch (x.tag) {
-    case "TunnelAck": {
+    case "DeprecatedTunnelAck": {
       bare.writeU8(bc, 0);
       break;
     }
@@ -854,13 +897,11 @@ function writeToServerTunnelMessageKind(bc, x) {
 }
 function readToServerTunnelMessage(bc) {
   return {
-    requestId: readRequestId(bc),
     messageId: readMessageId(bc),
     messageKind: readToServerTunnelMessageKind(bc)
   };
 }
 function writeToServerTunnelMessage(bc, x) {
-  writeRequestId(bc, x.requestId);
   writeMessageId(bc, x.messageId);
   writeToServerTunnelMessageKind(bc, x.messageKind);
 }
@@ -869,7 +910,7 @@ function readToClientTunnelMessageKind(bc) {
   const tag = bare.readU8(bc);
   switch (tag) {
     case 0:
-      return { tag: "TunnelAck", val: null };
+      return { tag: "DeprecatedTunnelAck", val: null };
     case 1:
       return { tag: "ToClientRequestStart", val: readToClientRequestStart(bc) };
     case 2:
@@ -890,7 +931,7 @@ function readToClientTunnelMessageKind(bc) {
 }
 function writeToClientTunnelMessageKind(bc, x) {
   switch (x.tag) {
-    case "TunnelAck": {
+    case "DeprecatedTunnelAck": {
       bare.writeU8(bc, 0);
       break;
     }
@@ -927,19 +968,15 @@ function writeToClientTunnelMessageKind(bc, x) {
 }
 function readToClientTunnelMessage(bc) {
   return {
-    requestId: readRequestId(bc),
     messageId: readMessageId(bc),
-    messageKind: readToClientTunnelMessageKind(bc),
-    gatewayReplyTo: read5(bc)
+    messageKind: readToClientTunnelMessageKind(bc)
   };
 }
 function writeToClientTunnelMessage(bc, x) {
-  writeRequestId(bc, x.requestId);
   writeMessageId(bc, x.messageId);
   writeToClientTunnelMessageKind(bc, x.messageKind);
-  write5(bc, x.gatewayReplyTo);
 }
-function read10(bc) {
+function read11(bc) {
   const len = bare.readUintSafe(bc);
   const result = /* @__PURE__ */ new Map();
   for (let i = 0; i < len; i++) {
@@ -953,26 +990,26 @@ function read10(bc) {
   }
   return result;
 }
-function write10(bc, x) {
+function write11(bc, x) {
   bare.writeUintSafe(bc, x.size);
   for (const kv of x) {
     bare.writeString(bc, kv[0]);
     writeActorName(bc, kv[1]);
   }
 }
-function read11(bc) {
-  return bare.readBool(bc) ? read10(bc) : null;
+function read12(bc) {
+  return bare.readBool(bc) ? read11(bc) : null;
 }
-function write11(bc, x) {
+function write12(bc, x) {
   bare.writeBool(bc, x != null);
   if (x != null) {
-    write10(bc, x);
+    write11(bc, x);
   }
 }
-function read12(bc) {
+function read13(bc) {
   return bare.readBool(bc) ? readJson(bc) : null;
 }
-function write12(bc, x) {
+function write13(bc, x) {
   bare.writeBool(bc, x != null);
   if (x != null) {
     writeJson(bc, x);
@@ -984,8 +1021,8 @@ function readToServerInit(bc) {
     version: bare.readU32(bc),
     totalSlots: bare.readU32(bc),
     lastCommandIdx: read7(bc),
-    prepopulateActorNames: read11(bc),
-    metadata: read12(bc)
+    prepopulateActorNames: read12(bc),
+    metadata: read13(bc)
   };
 }
 function writeToServerInit(bc, x) {
@@ -993,8 +1030,8 @@ function writeToServerInit(bc, x) {
   bare.writeU32(bc, x.version);
   bare.writeU32(bc, x.totalSlots);
   write7(bc, x.lastCommandIdx);
-  write11(bc, x.prepopulateActorNames);
-  write12(bc, x.metadata);
+  write12(bc, x.prepopulateActorNames);
+  write13(bc, x.metadata);
 }
 function readToServerEvents(bc) {
   const len = bare.readUintSafe(bc);
@@ -1247,13 +1284,134 @@ function decodeToClient(bytes) {
   }
   return result;
 }
-function readToGateway(bc) {
+function readToRunnerPing(bc) {
+  return {
+    gatewayId: readGatewayId(bc),
+    requestId: readRequestId(bc),
+    ts: bare.readI64(bc)
+  };
+}
+function writeToRunnerPing(bc, x) {
+  writeGatewayId(bc, x.gatewayId);
+  writeRequestId(bc, x.requestId);
+  bare.writeI64(bc, x.ts);
+}
+function readToRunner(bc) {
+  const offset = bc.offset;
+  const tag = bare.readU8(bc);
+  switch (tag) {
+    case 0:
+      return { tag: "ToRunnerPing", val: readToRunnerPing(bc) };
+    case 1:
+      return { tag: "ToClientInit", val: readToClientInit(bc) };
+    case 2:
+      return { tag: "ToClientClose", val: null };
+    case 3:
+      return { tag: "ToClientCommands", val: readToClientCommands(bc) };
+    case 4:
+      return { tag: "ToClientAckEvents", val: readToClientAckEvents(bc) };
+    case 5:
+      return { tag: "ToClientKvResponse", val: readToClientKvResponse(bc) };
+    case 6:
+      return { tag: "ToClientTunnelMessage", val: readToClientTunnelMessage(bc) };
+    default: {
+      bc.offset = offset;
+      throw new bare.BareError(offset, "invalid tag");
+    }
+  }
+}
+function writeToRunner(bc, x) {
+  switch (x.tag) {
+    case "ToRunnerPing": {
+      bare.writeU8(bc, 0);
+      writeToRunnerPing(bc, x.val);
+      break;
+    }
+    case "ToClientInit": {
+      bare.writeU8(bc, 1);
+      writeToClientInit(bc, x.val);
+      break;
+    }
+    case "ToClientClose": {
+      bare.writeU8(bc, 2);
+      break;
+    }
+    case "ToClientCommands": {
+      bare.writeU8(bc, 3);
+      writeToClientCommands(bc, x.val);
+      break;
+    }
+    case "ToClientAckEvents": {
+      bare.writeU8(bc, 4);
+      writeToClientAckEvents(bc, x.val);
+      break;
+    }
+    case "ToClientKvResponse": {
+      bare.writeU8(bc, 5);
+      writeToClientKvResponse(bc, x.val);
+      break;
+    }
+    case "ToClientTunnelMessage": {
+      bare.writeU8(bc, 6);
+      writeToClientTunnelMessage(bc, x.val);
+      break;
+    }
+  }
+}
+function encodeToRunner(x, config) {
+  const fullConfig = config != null ? bare.Config(config) : DEFAULT_CONFIG;
+  const bc = new bare.ByteCursor(
+    new Uint8Array(fullConfig.initialBufferLength),
+    fullConfig
+  );
+  writeToRunner(bc, x);
+  return new Uint8Array(bc.view.buffer, bc.view.byteOffset, bc.offset);
+}
+function decodeToRunner(bytes) {
+  const bc = new bare.ByteCursor(bytes, DEFAULT_CONFIG);
+  const result = readToRunner(bc);
+  if (bc.offset < bc.view.byteLength) {
+    throw new bare.BareError(bc.offset, "remaining bytes");
+  }
+  return result;
+}
+function readToGatewayPong(bc) {
   return {
-    message: readToServerTunnelMessage(bc)
+    requestId: readRequestId(bc),
+    ts: bare.readI64(bc)
   };
 }
+function writeToGatewayPong(bc, x) {
+  writeRequestId(bc, x.requestId);
+  bare.writeI64(bc, x.ts);
+}
+function readToGateway(bc) {
+  const offset = bc.offset;
+  const tag = bare.readU8(bc);
+  switch (tag) {
+    case 0:
+      return { tag: "ToGatewayPong", val: readToGatewayPong(bc) };
+    case 1:
+      return { tag: "ToServerTunnelMessage", val: readToServerTunnelMessage(bc) };
+    default: {
+      bc.offset = offset;
+      throw new bare.BareError(offset, "invalid tag");
+    }
+  }
+}
 function writeToGateway(bc, x) {
-  writeToServerTunnelMessage(bc, x.message);
+  switch (x.tag) {
+    case "ToGatewayPong": {
+      bare.writeU8(bc, 0);
+      writeToGatewayPong(bc, x.val);
+      break;
+    }
+    case "ToServerTunnelMessage": {
+      bare.writeU8(bc, 1);
+      writeToServerTunnelMessage(bc, x.val);
+      break;
+    }
+  }
 }
 function encodeToGateway(x, config) {
   const fullConfig = config != null ? bare.Config(config) : DEFAULT_CONFIG;
@@ -1322,10 +1480,12 @@ export {
   StopCode,
   decodeToClient,
   decodeToGateway,
+  decodeToRunner,
   decodeToServer,
   decodeToServerlessServer,
   encodeToClient,
   encodeToGateway,
+  encodeToRunner,
   encodeToServer,
   encodeToServerlessServer,
   readActorConfig,
@@ -1342,6 +1502,8 @@ export {
   readEventActorSetAlarm,
   readEventActorStateUpdate,
   readEventWrapper,
+  readGatewayId,
+  readHibernatingRequest,
   readId,
   readJson,
   readKvDeleteRequest,
@@ -1360,6 +1522,7 @@ export {
   readKvResponseData,
   readKvValue,
   readMessageId,
+  readMessageIndex,
   readProtocolMetadata,
   readRequestId,
   readStopCode,
@@ -1376,6 +1539,9 @@ export {
   readToClientWebSocketMessage,
   readToClientWebSocketOpen,
   readToGateway,
+  readToGatewayPong,
+  readToRunner,
+  readToRunnerPing,
   readToServer,
   readToServerAckCommands,
   readToServerEvents,
@@ -1406,6 +1572,8 @@ export {
   writeEventActorSetAlarm,
   writeEventActorStateUpdate,
   writeEventWrapper,
+  writeGatewayId,
+  writeHibernatingRequest,
   writeId,
   writeJson,
   writeKvDeleteRequest,
@@ -1424,6 +1592,7 @@ export {
   writeKvResponseData,
   writeKvValue,
   writeMessageId,
+  writeMessageIndex,
   writeProtocolMetadata,
   writeRequestId,
   writeStopCode,
@@ -1440,6 +1609,9 @@ export {
   writeToClientWebSocketMessage,
   writeToClientWebSocketOpen,
   writeToGateway,
+  writeToGatewayPong,
+  writeToRunner,
+  writeToRunnerPing,
   writeToServer,
   writeToServerAckCommands,
   writeToServerEvents,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rivetkit/engine-runner-protocol",
-  "version": "2.0.24-rc.1",
+  "version": "2.0.24",
   "license": "Apache-2.0",
   "type": "module",
   "exports": {