rivetkit 3.0.0-preview.2 → 3.0.0-preview.4

package/dist/tsup/{chunk-6IGGYL2C.js → chunk-C45DIKGB.js}

@@ -3,13 +3,13 @@ import {
   deserializeActorKey,
   serializeActorKey
 } from "./chunk-A2CF6PFH.js";
-import {
-  AsyncMutex
-} from "./chunk-JTHHCZCZ.js";
 import {
   importWebSocket,
   logger
-} from "./chunk-WGKL7HMH.js";
+} from "./chunk-IPDSE33U.js";
+import {
+  AsyncMutex
+} from "./chunk-JTHHCZCZ.js";
 import {
   EncodingSchema,
   assertUnreachable,
@@ -36,7 +36,7 @@ import {
   serializeWithEncoding,
   stringifyError,
   uint8ArrayToBase64
-} from "./chunk-5F7FWAJI.js";
+} from "./chunk-MAUVZIXL.js";
 import {
   INTERNAL_ERROR_CODE,
   RivetError,
@@ -4347,6 +4347,9 @@ var ActorConnRaw = class {
     if (isConnectionOpenTimeout(error)) {
       return true;
     }
+    if (error instanceof RivetError && error.group === "client" && error.code === "connection_open_interrupted") {
+      return true;
+    }
     if (error instanceof RivetError && isInvalidToken(error.group, error.code) && this.#driver.refreshAuthToken && this.#authRetryAvailable) {
       this.#authRetryAvailable = false;
       return true;
@@ -4406,16 +4409,18 @@ var ActorConnRaw = class {
     });
     this.#websocket = ws;
     ws.addEventListener("open", () => {
-      if (this.#abandonedSockets.has(ws)) return;
+      if (this.#websocket !== ws || this.#abandonedSockets.has(ws))
+        return;
       logger().debug({
         msg: "client websocket open",
         connId: this.#connId
       });
     });
     ws.addEventListener("message", async (ev) => {
-      if (this.#abandonedSockets.has(ws)) return;
+      if (this.#websocket !== ws || this.#abandonedSockets.has(ws))
+        return;
       try {
-        await this.#handleOnMessage(ev.data);
+        await this.#handleOnMessage(ev.data, ws);
       } catch (err) {
         logger().error({
           msg: "error in websocket message handler",
@@ -4424,7 +4429,8 @@ var ActorConnRaw = class {
       }
     });
     ws.addEventListener("close", async (ev) => {
-      if (this.#abandonedSockets.has(ws)) return;
+      if (this.#websocket !== ws || this.#abandonedSockets.has(ws))
+        return;
       try {
         await this.#handleOnClose(ev);
       } catch (err) {
@@ -4435,7 +4441,8 @@ var ActorConnRaw = class {
       }
     });
     ws.addEventListener("error", () => {
-      if (this.#abandonedSockets.has(ws)) return;
+      if (this.#websocket !== ws || this.#abandonedSockets.has(ws))
+        return;
       try {
         this.#handleOnError();
       } catch (err) {
@@ -4501,7 +4508,7 @@ var ActorConnRaw = class {
     });
   }
   /** Called by the onmessage event from drivers. */
-  async #handleOnMessage(data) {
+  async #handleOnMessage(data, socket) {
     var _a;
     logger().trace({
       msg: "received message",
@@ -4510,6 +4517,8 @@ var ActorConnRaw = class {
       isArrayBuffer: data instanceof ArrayBuffer
     });
     const response = await this.#parseMessage(data);
+    if (this.#websocket !== socket || this.#abandonedSockets.has(socket))
+      return;
     logger().trace(
       getLogMessage() ? {
         msg: "parsed message",
@@ -4581,6 +4590,9 @@ var ActorConnRaw = class {
             this.#actorResolutionState,
             this.#driver
           );
+          if (this.#websocket !== socket || this.#abandonedSockets.has(socket)) {
+            return;
+          }
           if (schedulingError) {
             errorToThrow = schedulingError;
           }
@@ -4702,9 +4714,12 @@ var ActorConnRaw = class {
         }
         this.#invalidateActorIfStale(group, code);
       } else {
-        error = new Error(
-          `${wasClean ? "Connection closed" : "Connection lost"} (code: ${closeEvent.code}, reason: ${reason})`
-        );
+        const message = `${wasClean ? "Connection closed" : "Connection lost"} (code: ${closeEvent.code}, reason: ${reason})`;
+        error = !wasConnected && closeEvent.code === 1006 ? new RivetError(
+          "client",
+          "connection_open_interrupted",
+          message
+        ) : new Error(message);
       }
       this.#rejectPendingPromises(error, false);
       if (error instanceof RivetError) {
@@ -6529,4 +6544,4 @@ export {
   updateRunnerConfig,
   RemoteEngineControlClient
 };
-//# sourceMappingURL=chunk-6IGGYL2C.js.map
+//# sourceMappingURL=chunk-C45DIKGB.js.map