@rivetkit/engine-runner 2.0.33 → 2.0.34-rc.1

package/dist/mod.cjs

@@ -1,4 +1,4 @@
-"use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { newObj[key] = obj[key]; } } } newObj.default = obj; return newObj; } } var _class; var _class2;// src/mod.ts
+"use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { newObj[key] = obj[key]; } } } newObj.default = obj; return newObj; } } function _nullishCoalesce(lhs, rhsFn) { if (lhs != null) { return lhs; } else { return rhsFn(); } } var _class;// src/mod.ts
 var _enginerunnerprotocol = require('@rivetkit/engine-runner-protocol'); var protocol = _interopRequireWildcard(_enginerunnerprotocol);
 
 // src/log.ts
@@ -502,9 +502,10 @@ function stringifyKvResponseData(data) {
 }
 
 // src/websocket-tunnel-adapter.ts
+var _virtualwebsocket = require('@rivetkit/virtual-websocket');
 var HIBERNATABLE_SYMBOL = Symbol("hibernatable");
-var WebSocketTunnelAdapter = (_class2 = class {
-  constructor(tunnel, actorId, requestId, serverMessageIndex, hibernatable, isRestoringHibernatable, request, sendCallback, closeCallback) {;_class2.prototype.__init7.call(this);_class2.prototype.__init8.call(this);_class2.prototype.__init9.call(this);_class2.prototype.__init10.call(this);
+var WebSocketTunnelAdapter = class {
+  constructor(tunnel, actorId, requestId, serverMessageIndex, hibernatable, isRestoringHibernatable, request, sendCallback, closeCallback) {
     this.request = request;
     var _a;
     this.#tunnel = tunnel;
@@ -514,69 +515,65 @@ var WebSocketTunnelAdapter = (_class2 = class {
     this.#serverMessageIndex = serverMessageIndex;
     this.#sendCallback = sendCallback;
     this.#closeCallback = closeCallback;
+    this.#ws = new (0, _virtualwebsocket.VirtualWebSocket)({
+      getReadyState: () => this.#readyState,
+      onSend: (data) => this.#handleSend(data),
+      onClose: (code, reason) => this.#close(code, reason, true),
+      onTerminate: () => this.#terminate()
+    });
     if (isRestoringHibernatable) {
       (_a = this.#log) == null ? void 0 : _a.debug({
         msg: "setting WebSocket to OPEN state for restored connection",
         actorId: this.#actorId,
-        requestId: this.#requestId,
-        hibernatable: this.#hibernatable
+        requestId: this.#requestId
       });
       this.#readyState = 1;
     }
   }
-  // MARK: - WebSocket Compat Variables
   #readyState = 0;
-  // CONNECTING
-  #eventListeners = /* @__PURE__ */ new Map();
-  #onopen = null;
-  #onclose = null;
-  #onerror = null;
-  #onmessage = null;
-  #bufferedAmount = 0;
   #binaryType = "nodebuffer";
-  #extensions = "";
-  #protocol = "";
-  #url = "";
-  // mARK: - Internal State
+  #ws;
   #tunnel;
   #actorId;
   #requestId;
   #hibernatable;
   #serverMessageIndex;
+  #sendCallback;
+  #closeCallback;
   get [HIBERNATABLE_SYMBOL]() {
     return this.#hibernatable;
   }
-  /**
-   * Called when sending a message from this WebSocket.
-   *
-   * Used to send a tunnel message from Tunnel.
-   */
-  #sendCallback;
-  /**
-   * Called when closing this WebSocket.
-   *
-   * Used to send a tunnel message from Tunnel
-   */
-  #closeCallback;
   get #log() {
     return this.#tunnel.log;
   }
-  // MARK: - Lifecycle
-  get bufferedAmount() {
-    return this.#bufferedAmount;
+  get websocket() {
+    return this.#ws;
   }
-  _handleOpen(requestId) {
-    if (this.#readyState !== 0) {
-      return;
+  #handleSend(data) {
+    let isBinary = false;
+    let messageData;
+    if (typeof data === "string") {
+      messageData = data;
+    } else if (data instanceof ArrayBuffer) {
+      isBinary = true;
+      messageData = data;
+    } else if (ArrayBuffer.isView(data)) {
+      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);
+      messageData = buffer;
+    } else {
+      throw new Error("Unsupported data type");
     }
+    this.#sendCallback(messageData, isBinary);
+  }
+  // Called by Tunnel when WebSocket is opened
+  _handleOpen(requestId) {
+    if (this.#readyState !== 0) return;
     this.#readyState = 1;
-    const event = {
-      type: "open",
-      rivetRequestId: requestId,
-      target: this
-    };
-    this.#fireEvent("open", event);
+    this.#ws.dispatchEvent({ type: "open", rivetRequestId: requestId, target: this.#ws });
   }
+  // Called by Tunnel when message is received
   _handleMessage(requestId, data, serverMessageIndex, isBinary) {
     var _a, _b, _c;
     if (this.#readyState !== 1) {
@@ -584,10 +581,7 @@ var WebSocketTunnelAdapter = (_class2 = class {
         msg: "WebSocket message ignored - not in OPEN state",
         requestId: this.#requestId,
         actorId: this.#actorId,
-        currentReadyState: this.#readyState,
-        expectedReadyState: 1,
-        serverMessageIndex,
-        hibernatable: this.#hibernatable
+        currentReadyState: this.#readyState
       });
       return true;
     }
@@ -595,11 +589,10 @@ var WebSocketTunnelAdapter = (_class2 = class {
       const previousIndex = this.#serverMessageIndex;
       if (wrappingLteU16(serverMessageIndex, previousIndex)) {
         (_b = this.#log) == null ? void 0 : _b.info({
-          msg: "received duplicate hibernating websocket message, this indicates the actor failed to ack the message index before restarting",
+          msg: "received duplicate hibernating websocket message",
           requestId,
           actorId: this.#actorId,
           previousIndex,
-          expectedIndex: wrappingAddU16(previousIndex, 1),
           receivedIndex: serverMessageIndex
         });
         return true;
@@ -615,307 +608,55 @@ var WebSocketTunnelAdapter = (_class2 = class {
           expectedIndex,
           receivedIndex: serverMessageIndex,
           closeReason,
-          gap: wrappingSubU16(
-            wrappingSubU16(serverMessageIndex, previousIndex),
-            1
-          )
+          gap: wrappingSubU16(wrappingSubU16(serverMessageIndex, previousIndex), 1)
         });
-        this.close(1008, closeReason);
+        this.#close(1008, closeReason, true);
         return true;
       }
       this.#serverMessageIndex = serverMessageIndex;
     }
-    let messageData;
-    if (isBinary) {
+    let messageData = data;
+    if (isBinary && data instanceof Uint8Array) {
       if (this.#binaryType === "nodebuffer") {
         messageData = Buffer.from(data);
       } else if (this.#binaryType === "arraybuffer") {
-        if (data instanceof Uint8Array) {
-          messageData = data.buffer.slice(
-            data.byteOffset,
-            data.byteOffset + data.byteLength
-          );
-        } else {
-          messageData = data;
-        }
-      } else {
-        throw new Error(
-          "Blob binaryType not supported in tunnel adapter"
-        );
+        messageData = data.buffer.slice(data.byteOffset, data.byteOffset + data.byteLength);
       }
-    } else {
-      messageData = data;
     }
-    const event = {
+    this.#ws.dispatchEvent({
       type: "message",
       data: messageData,
       rivetRequestId: requestId,
       rivetMessageIndex: serverMessageIndex,
-      target: this
-    };
-    this.#fireEvent("message", event);
+      target: this.#ws
+    });
     return false;
   }
+  // Called by Tunnel when close is received
   _handleClose(_requestId, code, reason) {
-    this.#closeInner(code, reason, true);
-  }
-  _handleError(error) {
-    const event = {
-      type: "error",
-      target: this,
-      error
-    };
-    this.#fireEvent("error", event);
+    this.#close(code, reason, true);
   }
+  // Close without sending close message to tunnel
   _closeWithoutCallback(code, reason) {
-    this.#closeInner(code, reason, false);
+    this.#close(code, reason, false);
   }
-  #fireEvent(type, event) {
-    var _a, _b, _c, _d, _e;
-    const listeners = this.#eventListeners.get(type);
-    if (listeners && listeners.size > 0) {
-      for (const listener of listeners) {
-        try {
-          listener.call(this, event);
-        } catch (error) {
-          (_a = logger()) == null ? void 0 : _a.error({
-            msg: "error in websocket event listener",
-            error,
-            type
-          });
-        }
-      }
-    }
-    switch (type) {
-      case "open":
-        if (this.#onopen) {
-          try {
-            this.#onopen.call(this, event);
-          } catch (error) {
-            (_b = logger()) == null ? void 0 : _b.error({
-              msg: "error in onopen handler",
-              error
-            });
-          }
-        }
-        break;
-      case "close":
-        if (this.#onclose) {
-          try {
-            this.#onclose.call(this, event);
-          } catch (error) {
-            (_c = logger()) == null ? void 0 : _c.error({
-              msg: "error in onclose handler",
-              error
-            });
-          }
-        }
-        break;
-      case "error":
-        if (this.#onerror) {
-          try {
-            this.#onerror.call(this, event);
-          } catch (error) {
-            (_d = logger()) == null ? void 0 : _d.error({
-              msg: "error in onerror handler",
-              error
-            });
-          }
-        }
-        break;
-      case "message":
-        if (this.#onmessage) {
-          try {
-            this.#onmessage.call(this, event);
-          } catch (error) {
-            (_e = logger()) == null ? void 0 : _e.error({
-              msg: "error in onmessage handler",
-              error
-            });
-          }
-        }
-        break;
-    }
+  // Public close method (used by tunnel.ts for stale websocket cleanup)
+  close(code, reason) {
+    this.#close(code, reason, true);
   }
-  #closeInner(code, reason, callback) {
-    if (this.#readyState === 2 || // CLOSING
-    this.#readyState === 3) {
-      return;
-    }
+  #close(code, reason, sendCallback) {
+    if (this.#readyState >= 2) return;
     this.#readyState = 2;
-    if (callback) {
-      this.#closeCallback(code, reason);
-    }
+    if (sendCallback) this.#closeCallback(code, reason);
     this.#readyState = 3;
-    const closeEvent = {
-      wasClean: true,
-      code: code || 1e3,
-      reason: reason || "",
-      type: "close",
-      target: this
-    };
-    this.#fireEvent("close", closeEvent);
-  }
-  // MARK: - WebSocket Compatible API
-  get readyState() {
-    return this.#readyState;
+    this.#ws.triggerClose(_nullishCoalesce(code, () => ( 1e3)), _nullishCoalesce(reason, () => ( "")));
   }
-  get binaryType() {
-    return this.#binaryType;
-  }
-  set binaryType(value) {
-    if (value === "nodebuffer" || value === "arraybuffer" || value === "blob") {
-      this.#binaryType = value;
-    }
-  }
-  get extensions() {
-    return this.#extensions;
-  }
-  get protocol() {
-    return this.#protocol;
-  }
-  get url() {
-    return this.#url;
-  }
-  get onopen() {
-    return this.#onopen;
-  }
-  set onopen(value) {
-    this.#onopen = value;
-  }
-  get onclose() {
-    return this.#onclose;
-  }
-  set onclose(value) {
-    this.#onclose = value;
-  }
-  get onerror() {
-    return this.#onerror;
-  }
-  set onerror(value) {
-    this.#onerror = value;
-  }
-  get onmessage() {
-    return this.#onmessage;
-  }
-  set onmessage(value) {
-    this.#onmessage = value;
-  }
-  send(data) {
-    if (this.#readyState === 0) {
-      throw new DOMException(
-        "WebSocket is still in CONNECTING state",
-        "InvalidStateError"
-      );
-    }
-    if (this.#readyState === 2 || this.#readyState === 3) {
-      return;
-    }
-    let isBinary = false;
-    let messageData;
-    if (typeof data === "string") {
-      messageData = data;
-    } else if (data instanceof ArrayBuffer) {
-      isBinary = true;
-      messageData = data;
-    } else if (ArrayBuffer.isView(data)) {
-      isBinary = true;
-      const view = data;
-      if (view.buffer instanceof SharedArrayBuffer) {
-        const bytes = new Uint8Array(
-          view.buffer,
-          view.byteOffset,
-          view.byteLength
-        );
-        messageData = bytes.buffer.slice(
-          bytes.byteOffset,
-          bytes.byteOffset + bytes.byteLength
-        );
-      } else {
-        messageData = view.buffer.slice(
-          view.byteOffset,
-          view.byteOffset + view.byteLength
-        );
-      }
-    } else if (data instanceof Blob) {
-      throw new Error("Blob sending not implemented in tunnel adapter");
-    } else if (typeof Buffer !== "undefined" && Buffer.isBuffer(data)) {
-      isBinary = true;
-      const buf = data;
-      if (buf.buffer instanceof SharedArrayBuffer) {
-        const bytes = new Uint8Array(
-          buf.buffer,
-          buf.byteOffset,
-          buf.byteLength
-        );
-        messageData = bytes.buffer.slice(
-          bytes.byteOffset,
-          bytes.byteOffset + bytes.byteLength
-        );
-      } else {
-        messageData = buf.buffer.slice(
-          buf.byteOffset,
-          buf.byteOffset + buf.byteLength
-        );
-      }
-    } else {
-      throw new Error("Invalid data type");
-    }
-    this.#sendCallback(messageData, isBinary);
-  }
-  close(code, reason) {
-    this.#closeInner(code, reason, true);
-  }
-  addEventListener(type, listener, options) {
-    if (typeof listener === "function") {
-      let listeners = this.#eventListeners.get(type);
-      if (!listeners) {
-        listeners = /* @__PURE__ */ new Set();
-        this.#eventListeners.set(type, listeners);
-      }
-      listeners.add(listener);
-    }
-  }
-  removeEventListener(type, listener, options) {
-    if (typeof listener === "function") {
-      const listeners = this.#eventListeners.get(type);
-      if (listeners) {
-        listeners.delete(listener);
-      }
-    }
-  }
-  dispatchEvent(event) {
-    return true;
-  }
-  static __initStatic() {this.CONNECTING = 0}
-  static __initStatic2() {this.OPEN = 1}
-  static __initStatic3() {this.CLOSING = 2}
-  static __initStatic4() {this.CLOSED = 3}
-  __init7() {this.CONNECTING = 0}
-  __init8() {this.OPEN = 1}
-  __init9() {this.CLOSING = 2}
-  __init10() {this.CLOSED = 3}
-  // Additional methods for compatibility
-  ping(data, mask, cb) {
-    if (cb) cb(new Error("Ping not supported in tunnel adapter"));
-  }
-  pong(data, mask, cb) {
-    if (cb) cb(new Error("Pong not supported in tunnel adapter"));
-  }
-  /** @experimental */
-  terminate() {
+  #terminate() {
     this.#readyState = 3;
     this.#closeCallback(1006, "Abnormal Closure");
-    const event = {
-      wasClean: false,
-      code: 1006,
-      reason: "Abnormal Closure",
-      type: "close",
-      target: this
-    };
-    this.#fireEvent("close", event);
+    this.#ws.triggerClose(1006, "Abnormal Closure", false);
   }
-}, _class2.__initStatic(), _class2.__initStatic2(), _class2.__initStatic3(), _class2.__initStatic4(), _class2);
+};
 
 // src/tunnel.ts
 var Tunnel = class {
@@ -1167,7 +908,7 @@ var Tunnel = class {
     await this.#runner.config.websocket(
       this.#runner,
       actorId,
-      adapter,
+      adapter.websocket,
       gatewayId,
       requestId,
       request,
@@ -1220,7 +961,7 @@ var Tunnel = class {
   }
   #sendMessage(gatewayId, requestId, messageKind) {
     var _a, _b, _c, _d;
-    if (!this.#runner.__webSocketReady()) {
+    if (!this.#runner.getPegboardWebSocketIfReady()) {
       (_a = this.log) == null ? void 0 : _a.debug({
         msg: "buffering tunnel message, socket not connected to engine",
         requestId: idToStr(requestId),
@@ -1771,7 +1512,7 @@ var Runner = class {
   }
   #actors = /* @__PURE__ */ new Map();
   // WebSocket
-  
+  #pegboardWebSocket;
   
   #started = false;
   #shutdown = false;
@@ -2014,8 +1755,8 @@ var Runner = class {
       );
     }
     this.#kvRequests.clear();
-    if (this.__webSocketReady()) {
-      const pegboardWebSocket = this.__pegboardWebSocket;
+    const pegboardWebSocket = this.getPegboardWebSocketIfReady();
+    if (pegboardWebSocket) {
       if (immediate) {
         pegboardWebSocket.close(1e3, "pegboard.runner_shutdown");
       } else {
@@ -2061,7 +1802,7 @@ var Runner = class {
     } else {
       (_h = this.log) == null ? void 0 : _h.debug({
         msg: "no runner WebSocket to shutdown or already closed",
-        readyState: (_g = this.__pegboardWebSocket) == null ? void 0 : _g.readyState
+        readyState: (_g = this.#pegboardWebSocket) == null ? void 0 : _g.readyState
       });
     }
     if (this.#tunnel) {
@@ -2164,14 +1905,20 @@ var Runner = class {
   }
   // MARK: Runner protocol
   async #openPegboardWebSocket() {
-    var _a;
+    var _a, _b;
     const protocols = ["rivet"];
     if (this.config.token)
       protocols.push(`rivet_token.${this.config.token}`);
     const WS = await importWebSocket();
+    if (this.#pegboardWebSocket && (this.#pegboardWebSocket.readyState === WS.CONNECTING || this.#pegboardWebSocket.readyState === WS.OPEN)) {
+      (_a = this.log) == null ? void 0 : _a.error(
+        "found duplicate pegboardWebSocket, closing previous"
+      );
+      this.#pegboardWebSocket.close(1e3, "duplicate_websocket");
+    }
     const ws = new WS(this.pegboardUrl, protocols);
-    this.__pegboardWebSocket = ws;
-    (_a = this.log) == null ? void 0 : _a.info({
+    this.#pegboardWebSocket = ws;
+    (_b = this.log) == null ? void 0 : _b.info({
       msg: "connecting",
       endpoint: this.pegboardEndpoint,
       namespace: this.#config.namespace,
@@ -2179,7 +1926,7 @@ var Runner = class {
       hasToken: !!this.config.token
     });
     ws.addEventListener("open", () => {
-      var _a2, _b;
+      var _a2, _b2;
       if (this.#reconnectAttempt > 0) {
         (_a2 = this.log) == null ? void 0 : _a2.info({
           msg: "runner reconnected",
@@ -2188,7 +1935,7 @@ var Runner = class {
           reconnectAttempt: this.#reconnectAttempt
         });
       } else {
-        (_b = this.log) == null ? void 0 : _b.debug({
+        (_b2 = this.log) == null ? void 0 : _b2.debug({
           msg: "runner connected",
           namespace: this.#config.namespace,
           runnerName: this.#config.runnerName
@@ -2223,7 +1970,7 @@ var Runner = class {
       });
       const ackInterval = 5 * 60 * 1e3;
       const ackLoop = setInterval(() => {
-        var _a3, _b2;
+        var _a3, _b3;
         try {
           if (ws.readyState === 1) {
             this.#sendCommandAcknowledgment();
@@ -2234,7 +1981,7 @@ var Runner = class {
             });
           }
         } catch (err) {
-          (_b2 = this.log) == null ? void 0 : _b2.error({
+          (_b3 = this.log) == null ? void 0 : _b3.error({
             msg: "error in command acknowledgment loop",
             error: stringifyError(err)
           });
@@ -2243,7 +1990,7 @@ var Runner = class {
       this.#ackInterval = ackLoop;
     });
     ws.addEventListener("message", async (ev) => {
-      var _a2, _b, _c, _d, _e;
+      var _a2, _b2, _c, _d, _e;
       let buf;
       if (ev.data instanceof Blob) {
         buf = new Uint8Array(await ev.data.arrayBuffer());
@@ -2263,7 +2010,7 @@ var Runner = class {
           this.runnerId = init.runnerId;
           this.#stopAllActors();
         }
-        this.#runnerLostThreshold = ((_b = init.metadata) == null ? void 0 : _b.runnerLostThreshold) ? Number(init.metadata.runnerLostThreshold) : void 0;
+        this.#runnerLostThreshold = ((_b2 = init.metadata) == null ? void 0 : _b2.runnerLostThreshold) ? Number(init.metadata.runnerLostThreshold) : void 0;
         (_c = this.log) == null ? void 0 : _c.info({
           msg: "received init",
           runnerLostThreshold: this.#runnerLostThreshold
@@ -2300,13 +2047,13 @@ var Runner = class {
       }
     });
     ws.addEventListener("error", (ev) => {
-      var _a2, _b;
+      var _a2, _b2;
       (_a2 = this.log) == null ? void 0 : _a2.error({
         msg: `WebSocket error: ${ev.error}`
       });
       if (!this.#shutdown) {
         if (!this.#runnerLostTimeout && this.#runnerLostThreshold && this.#runnerLostThreshold > 0) {
-          (_b = this.log) == null ? void 0 : _b.info({
+          (_b2 = this.log) == null ? void 0 : _b2.info({
             msg: "starting runner lost timeout",
             seconds: this.#runnerLostThreshold / 1e3
           });
@@ -2326,7 +2073,7 @@ var Runner = class {
       }
     });
     ws.addEventListener("close", async (ev) => {
-      var _a2, _b, _c, _d;
+      var _a2, _b2, _c, _d;
       const closeError = parseWebSocketCloseReason(ev.reason);
       if ((closeError == null ? void 0 : closeError.group) === "ws" && (closeError == null ? void 0 : closeError.error) === "eviction") {
         (_a2 = this.log) == null ? void 0 : _a2.info("runner websocket evicted");
@@ -2334,7 +2081,7 @@ var Runner = class {
         await this.shutdown(true);
       } else {
         if ((closeError == null ? void 0 : closeError.group) === "pegboard" && (closeError == null ? void 0 : closeError.error) === "runner_shutdown") {
-          (_b = this.log) == null ? void 0 : _b.info("runner shutdown");
+          (_b2 = this.log) == null ? void 0 : _b2.info("runner shutdown");
         } else {
           (_c = this.log) == null ? void 0 : _c.warn({
             msg: "runner disconnected",
@@ -2870,7 +2617,7 @@ var Runner = class {
         timestamp: Date.now()
       };
       this.#kvRequests.set(requestId, requestEntry);
-      if (this.__webSocketReady()) {
+      if (this.getPegboardWebSocketIfReady()) {
         this.#sendSingleKvRequest(requestId);
       }
     });
@@ -2896,7 +2643,7 @@ var Runner = class {
     }
   }
   #processUnsentKvRequests() {
-    if (!this.__webSocketReady()) {
+    if (!this.getPegboardWebSocketIfReady()) {
       return;
     }
     let processedCount = 0;
@@ -2910,8 +2657,12 @@ var Runner = class {
     }
   }
   /** Asserts WebSocket exists and is ready. */
-  __webSocketReady() {
-    return !!this.__pegboardWebSocket && this.__pegboardWebSocket.readyState === 1;
+  getPegboardWebSocketIfReady() {
+    if (!!this.#pegboardWebSocket && this.#pegboardWebSocket.readyState === 1) {
+      return this.#pegboardWebSocket;
+    } else {
+      return void 0;
+    }
   }
   __sendToServer(message) {
     var _a, _b;
@@ -2920,8 +2671,9 @@ var Runner = class {
       data: stringifyToServer(message)
     });
     const encoded = protocol.encodeToServer(message);
-    if (this.__webSocketReady()) {
-      this.__pegboardWebSocket.send(encoded);
+    const pegboardWebSocket = this.getPegboardWebSocketIfReady();
+    if (pegboardWebSocket) {
+      pegboardWebSocket.send(encoded);
     } else {
       (_b = this.log) == null ? void 0 : _b.error({
         msg: "WebSocket not available or not open for sending data"
@@ -2980,7 +2732,7 @@ var Runner = class {
     return buffer.toString("base64");
   }
   #scheduleReconnect() {
-    var _a, _b;
+    var _a, _b, _c;
     if (this.#shutdown) {
       (_a = this.log) == null ? void 0 : _a.debug({
         msg: "Runner is shut down, not attempting reconnect"
@@ -2996,6 +2748,12 @@ var Runner = class {
     (_b = this.log) == null ? void 0 : _b.debug({
       msg: `Scheduling reconnect attempt ${this.#reconnectAttempt + 1} in ${delay}ms`
     });
+    if (this.#reconnectTimeout) {
+      (_c = this.log) == null ? void 0 : _c.info(
+        "clearing previous reconnect timeout in schedule reconnect"
+      );
+      clearTimeout(this.#reconnectTimeout);
+    }
     this.#reconnectTimeout = setTimeout(() => {
       var _a2;
       if (!this.#shutdown) {