@rivetkit/engine-runner 2.0.37 → 2.0.39

package/dist/mod.js

@@ -1516,7 +1516,6 @@ var Runner = class {
   runnerId;
   #started = false;
   #shutdown = false;
-  #shuttingDown = false;
   #reconnectAttempt = 0;
   #reconnectTimeout;
   // Runner lost threshold management
@@ -1720,19 +1719,18 @@ var Runner = class {
   // MARK: Shutdown
   async shutdown(immediate, exit = false) {
     var _a, _b, _c, _d, _e, _f, _g, _h;
-    if (this.#shuttingDown) {
+    if (this.#shutdown) {
       (_a = this.log) == null ? void 0 : _a.debug({
         msg: "shutdown already in progress, ignoring"
       });
       return;
     }
-    this.#shuttingDown = true;
+    this.#shutdown = true;
     (_b = this.log) == null ? void 0 : _b.info({
       msg: "starting shutdown",
       immediate,
       exit
     });
-    this.#shutdown = true;
     if (this.#reconnectTimeout) {
       clearTimeout(this.#reconnectTimeout);
       this.#reconnectTimeout = void 0;
@@ -2049,7 +2047,7 @@ var Runner = class {
     ws.addEventListener("error", (ev) => {
       var _a2, _b2;
       (_a2 = this.log) == null ? void 0 : _a2.error({
-        msg: `WebSocket error: ${ev.error}`
+        msg: `WebSocket error: ${stringifyError(ev.error)}`
       });
       if (!this.#shutdown) {
         if (!this.#runnerLostTimeout && this.#runnerLostThreshold && this.#runnerLostThreshold > 0) {
@@ -2074,31 +2072,27 @@ var Runner = class {
     });
     ws.addEventListener("close", async (ev) => {
       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");
-        this.#config.onDisconnected(ev.code, ev.reason);
-        await this.shutdown(true);
-      } else {
-        if ((closeError == null ? void 0 : closeError.group) === "pegboard" && (closeError == null ? void 0 : closeError.error) === "runner_shutdown") {
-          (_b2 = this.log) == null ? void 0 : _b2.info("runner shutdown");
+      if (!this.#shutdown) {
+        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");
+          this.#config.onDisconnected(ev.code, ev.reason);
+          await this.shutdown(true);
         } else {
-          (_c = this.log) == null ? void 0 : _c.warn({
+          (_b2 = this.log) == null ? void 0 : _b2.warn({
             msg: "runner disconnected",
             code: ev.code,
             reason: ev.reason.toString(),
             closeError
           });
+          this.#config.onDisconnected(ev.code, ev.reason);
+        }
+        if (this.#ackInterval) {
+          clearInterval(this.#ackInterval);
+          this.#ackInterval = void 0;
         }
-        this.#config.onDisconnected(ev.code, ev.reason);
-      }
-      if (this.#ackInterval) {
-        clearInterval(this.#ackInterval);
-        this.#ackInterval = void 0;
-      }
-      if (!this.#shutdown) {
         if (!this.#runnerLostTimeout && this.#runnerLostThreshold && this.#runnerLostThreshold > 0) {
-          (_d = this.log) == null ? void 0 : _d.info({
+          (_c = this.log) == null ? void 0 : _c.info({
             msg: "starting runner lost timeout",
             seconds: this.#runnerLostThreshold / 1e3
           });
@@ -2115,6 +2109,9 @@ var Runner = class {
           }, this.#runnerLostThreshold);
         }
         this.#scheduleReconnect();
+      } else {
+        (_d = this.log) == null ? void 0 : _d.info("websocket closed");
+        this.#config.onDisconnected(ev.code, ev.reason);
       }
     });
   }