@rivetkit/engine-runner 2.1.3 → 2.1.5

package/dist/mod.cjs

@@ -11,6 +11,7 @@ function logger() {
 }
 
 // src/utils.ts
+var MAX_PAYLOAD_SIZE = 20 * 1024 * 1024;
 function unreachable(x) {
   throw `Unreachable: ${x}`;
 }
@@ -553,11 +554,17 @@ var WebSocketTunnelAdapter = class {
     let isBinary = false;
     let messageData;
     if (typeof data === "string") {
+      const encoder = new TextEncoder();
+      if (encoder.encode(data).byteLength > MAX_PAYLOAD_SIZE) {
+        throw new Error("WebSocket message too large");
+      }
       messageData = data;
     } else if (data instanceof ArrayBuffer) {
+      if (data.byteLength > MAX_PAYLOAD_SIZE) throw new Error("WebSocket message too large");
       isBinary = true;
       messageData = data;
     } else if (ArrayBuffer.isView(data)) {
+      if (data.byteLength > MAX_PAYLOAD_SIZE) throw new Error("WebSocket message too large");
       isBinary = true;
       const view = data;
       const buffer = view.buffer instanceof SharedArrayBuffer ? new Uint8Array(view.buffer, view.byteOffset, view.byteLength).slice().buffer : view.buffer.slice(view.byteOffset, view.byteOffset + view.byteLength);
@@ -1255,6 +1262,9 @@ var Tunnel = class {
       return;
     }
     const body = response.body ? await response.arrayBuffer() : null;
+    if (body && body.byteLength > MAX_PAYLOAD_SIZE) {
+      throw new Error("Response body too large");
+    }
     const headers = /* @__PURE__ */ new Map();
     response.headers.forEach((value, key) => {
       headers.set(key, value);
@@ -1402,7 +1412,7 @@ var Tunnel = class {
       index: clientMessageIndex
     });
     if (clientMessageIndex < 0 || clientMessageIndex > 65535)
-      throw new Error("invalid websocket ack index");
+      throw new Error("Invalid websocket ack index");
     const actor = this.getRequestActor(gatewayId, requestId);
     if (!actor) {
       (_b = this.log) == null ? void 0 : _b.warn({
@@ -1453,7 +1463,7 @@ function buildRequestForWebSocket(path, headers) {
     Connection: "Upgrade"
   };
   if (!path.startsWith("/")) {
-    throw new Error("path must start with leading slash");
+    throw new Error("Path must start with leading slash");
   }
   const request = new Request(`http://actor${path}`, {
     method: "GET",
@@ -1497,7 +1507,7 @@ async function importWebSocket() {
 
 // src/mod.ts
 var KV_EXPIRE = 3e4;
-var PROTOCOL_VERSION = 5;
+var PROTOCOL_VERSION = 6;
 var EVENT_BACKLOG_WARN_THRESHOLD = 1e4;
 var SIGNAL_HANDLERS = [];
 var RunnerShutdownError = class extends Error {
@@ -1518,8 +1528,9 @@ var Runner = class {
   #shutdown = false;
   #reconnectAttempt = 0;
   #reconnectTimeout;
+  // Protocol metadata
+  #protocolMetadata;
   // Runner lost threshold management
-  #runnerLostThreshold;
   #runnerLostTimeout;
   // Event storage for resending
   #eventBacklogWarned = false;
@@ -1988,7 +1999,7 @@ var Runner = class {
       this.#ackInterval = ackLoop;
     });
     ws.addEventListener("message", async (ev) => {
-      var _a2, _b2, _c, _d, _e;
+      var _a2, _b2, _c, _d;
       let buf;
       if (ev.data instanceof Blob) {
         buf = new Uint8Array(await ev.data.arrayBuffer());
@@ -2008,14 +2019,14 @@ var Runner = class {
           this.runnerId = init.runnerId;
           this.#stopAllActors();
         }
-        this.#runnerLostThreshold = ((_b2 = init.metadata) == null ? void 0 : _b2.runnerLostThreshold) ? Number(init.metadata.runnerLostThreshold) : void 0;
-        (_c = this.log) == null ? void 0 : _c.info({
+        this.#protocolMetadata = init.metadata;
+        (_b2 = this.log) == null ? void 0 : _b2.info({
           msg: "received init",
-          runnerLostThreshold: this.#runnerLostThreshold
+          protocolMetadata: this.#protocolMetadata
         });
         this.#processUnsentKvRequests();
         this.#resendUnacknowledgedEvents();
-        (_d = this.#tunnel) == null ? void 0 : _d.resendBufferedEvents();
+        (_c = this.#tunnel) == null ? void 0 : _c.resendBufferedEvents();
         this.#config.onConnected();
       } else if (message.tag === "ToClientCommands") {
         const commands = message.val;
@@ -2026,7 +2037,7 @@ var Runner = class {
         const kvResponse = message.val;
         this.#handleKvResponse(kvResponse);
       } else if (message.tag === "ToClientTunnelMessage") {
-        (_e = this.#tunnel) == null ? void 0 : _e.handleTunnelMessage(message.val).catch((err) => {
+        (_d = this.#tunnel) == null ? void 0 : _d.handleTunnelMessage(message.val).catch((err) => {
           var _a3;
           (_a3 = this.log) == null ? void 0 : _a3.error({
             msg: "error handling tunnel message",
@@ -2045,33 +2056,17 @@ var Runner = class {
       }
     });
     ws.addEventListener("error", (ev) => {
-      var _a2, _b2;
+      var _a2;
       (_a2 = this.log) == null ? void 0 : _a2.error({
         msg: `WebSocket error: ${stringifyError(ev.error)}`
       });
       if (!this.#shutdown) {
-        if (!this.#runnerLostTimeout && this.#runnerLostThreshold && this.#runnerLostThreshold > 0) {
-          (_b2 = this.log) == null ? void 0 : _b2.info({
-            msg: "starting runner lost timeout",
-            seconds: this.#runnerLostThreshold / 1e3
-          });
-          this.#runnerLostTimeout = setTimeout(() => {
-            var _a3;
-            try {
-              this.#handleLost();
-            } catch (err) {
-              (_a3 = this.log) == null ? void 0 : _a3.error({
-                msg: "error handling runner lost",
-                error: stringifyError(err)
-              });
-            }
-          }, this.#runnerLostThreshold);
-        }
+        this.#startRunnerLostTimeout();
         this.#scheduleReconnect();
       }
     });
     ws.addEventListener("close", async (ev) => {
-      var _a2, _b2, _c, _d;
+      var _a2, _b2, _c;
       if (!this.#shutdown) {
         const closeError = parseWebSocketCloseReason(ev.reason);
         if ((closeError == null ? void 0 : closeError.group) === "ws" && (closeError == null ? void 0 : closeError.error) === "eviction") {
@@ -2091,30 +2086,34 @@ var Runner = class {
           clearInterval(this.#ackInterval);
           this.#ackInterval = void 0;
         }
-        if (!this.#runnerLostTimeout && this.#runnerLostThreshold && this.#runnerLostThreshold > 0) {
-          (_c = this.log) == null ? void 0 : _c.info({
-            msg: "starting runner lost timeout",
-            seconds: this.#runnerLostThreshold / 1e3
-          });
-          this.#runnerLostTimeout = setTimeout(() => {
-            var _a3;
-            try {
-              this.#handleLost();
-            } catch (err) {
-              (_a3 = this.log) == null ? void 0 : _a3.error({
-                msg: "error handling runner lost",
-                error: stringifyError(err)
-              });
-            }
-          }, this.#runnerLostThreshold);
-        }
+        this.#startRunnerLostTimeout();
         this.#scheduleReconnect();
       } else {
-        (_d = this.log) == null ? void 0 : _d.info("websocket closed");
+        (_c = this.log) == null ? void 0 : _c.info("websocket closed");
         this.#config.onDisconnected(ev.code, ev.reason);
       }
     });
   }
+  #startRunnerLostTimeout() {
+    var _a;
+    if (!this.#runnerLostTimeout && this.#protocolMetadata && this.#protocolMetadata.runnerLostThreshold > 0) {
+      (_a = this.log) == null ? void 0 : _a.info({
+        msg: "starting runner lost timeout",
+        seconds: this.#protocolMetadata.runnerLostThreshold / 1000n
+      });
+      this.#runnerLostTimeout = setTimeout(() => {
+        var _a2;
+        try {
+          this.#handleLost();
+        } catch (err) {
+          (_a2 = this.log) == null ? void 0 : _a2.error({
+            msg: "error handling runner lost",
+            error: stringifyError(err)
+          });
+        }
+      }, Number(this.#protocolMetadata.runnerLostThreshold));
+    }
+  }
   #handleCommands(commands) {
     var _a;
     (_a = this.log) == null ? void 0 : _a.info({
@@ -2803,6 +2802,9 @@ var Runner = class {
     if (toDelete.length > 0) {
     }
   }
+  getProtocolMetadata() {
+    return this.#protocolMetadata;
+  }
 };