rivetkit 3.0.0-preview.3 → 3.0.0-preview.5

package/dist/tsup/{chunk-2VXPVVNW.js → chunk-EOUH7MP7.js}

@@ -3,13 +3,13 @@ import {
   deserializeActorKey,
   serializeActorKey
 } from "./chunk-A2CF6PFH.js";
-import {
-  importWebSocket,
-  logger
-} from "./chunk-A447S5YG.js";
 import {
   AsyncMutex
 } from "./chunk-JTHHCZCZ.js";
+import {
+  importWebSocket,
+  logger
+} from "./chunk-SJUGJ5DT.js";
 import {
   EncodingSchema,
   assertUnreachable,
@@ -36,7 +36,7 @@ import {
   serializeWithEncoding,
   stringifyError,
   uint8ArrayToBase64
-} from "./chunk-JXO5QVDX.js";
+} from "./chunk-KKSIGBUN.js";
 import {
   INTERNAL_ERROR_CODE,
   RivetError,
@@ -2266,6 +2266,14 @@ function classifyActorError(error) {
       }
     );
   }
+  if (error.group === "ups" && error.code === "consumer_closed" || error.group === "depot" && error.code === "request_deadline_exceeded") {
+    return buildLifecycleBoundaryInfo(
+      "reconnect_only",
+      "actor_error",
+      error.message,
+      { group: error.group, code: error.code }
+    );
+  }
   if (error.group === "guard" && isRetryableGuardGatewayHttpError(error.code)) {
     return buildLifecycleBoundaryInfo(
       "request_retry",
@@ -4020,6 +4028,8 @@ var ActorConnRaw = class {
   /* Will be aborted on dispose. */
   #abortController = new AbortController();
   #connStatus = "idle";
+  /** The opening failure that stopped retries. Later actions must fail instead of queueing. */
+  #connectionOpenError;
   #actorId;
   #connId;
   #messageQueue = [];
@@ -4141,6 +4151,8 @@ var ActorConnRaw = class {
         `Invalid action call: expected an options object { name, args }, got ${typeof opts}. Use conn.actionName(...args) for the shorthand API.`
       );
     }
+    if (this.#disposed) throw new ActorConnDisposed();
+    if (this.#connectionOpenError) throw this.#connectionOpenError;
     logger().debug({ msg: "action", name: opts.name, args: opts.args });
     const actionId = this.#actionIdCounter;
     this.#actionIdCounter += 1;
@@ -4228,6 +4240,7 @@ var ActorConnRaw = class {
     }
   }
   #connectWithRetry() {
+    this.#connectionOpenError = void 0;
     this.#setConnStatus("connecting");
     pRetry(this.#connectAndWait.bind(this), {
       forever: true,
@@ -4270,6 +4283,9 @@ var ActorConnRaw = class {
       await this.#connectWebSocket();
       await this.#waitForOpen(this.#onOpenPromise.promise);
     } catch (error) {
+      this.#abandonCurrentSocket(
+        isConnectionOpenTimeout(error) ? "Connect timeout" : "Connection opening failed"
+      );
       if (this.#shouldRetryConnectionOpenError(error)) {
         throw error;
       }
@@ -4279,7 +4295,7 @@ var ActorConnRaw = class {
         `Failed to open connection: ${stringifyError(error)}`,
         { error: stringifyError(error) }
       );
-      this.#clearQueuedMessages();
+      this.#connectionOpenError = actorError;
       this.#rejectPendingPromises(actorError, false);
       this.#dispatchActorError(actorError);
       this.#setConnStatus("idle");
@@ -4311,28 +4327,23 @@ var ActorConnRaw = class {
     });
     try {
       await Promise.race([open, timedOut]);
-    } catch (error) {
-      if (isConnectionOpenTimeout(error)) {
-        this.#abandonCurrentSocket();
-      }
-      throw error;
     } finally {
       clearTimeout(timer);
     }
   }
-  #abandonCurrentSocket() {
+  #abandonCurrentSocket(reason) {
     const ws = this.#websocket;
     if (!ws) return;
     this.#websocket = void 0;
     this.#abandonedSockets.add(ws);
-    logger().warn({
-      msg: "connection did not open in time, retrying",
+    logger().debug({
+      msg: "closing failed connection attempt",
       connId: this.#connId,
       readyState: ws.readyState,
-      timeoutMs: CONNECT_TIMEOUT_MS
+      reason
     });
     try {
-      ws.close(1e3, "Connect timeout");
+      ws.close(1e3, reason);
     } catch (err) {
       logger().debug({
         msg: "failed to close abandoned websocket",
@@ -4347,6 +4358,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 +4420,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 +4440,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 +4452,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 +4519,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 +4528,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,18 +4601,15 @@ var ActorConnRaw = class {
             this.#actorResolutionState,
             this.#driver
           );
+          if (this.#websocket !== socket || this.#abandonedSockets.has(socket)) {
+            return;
+          }
           if (schedulingError) {
             errorToThrow = schedulingError;
           }
         }
-        if (this.#onOpenPromise) {
-          this.#onOpenPromise.reject(errorToThrow);
-        }
         this.#invalidateActorIfStale(group, code);
-        for (const [id, inFlight] of this.#actionsInFlight.entries()) {
-          inFlight.reject(errorToThrow);
-          this.#actionsInFlight.delete(id);
-        }
+        this.#rejectPendingPromises(errorToThrow, false);
         this.#dispatchActorError(errorToThrow);
       }
     } else if (response.body.tag === "ActionResponse") {
@@ -4702,9 +4719,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) {
@@ -4720,6 +4740,7 @@ var ActorConnRaw = class {
     }
   }
   #rejectPendingPromises(error, suppressUnhandled) {
+    this.#clearQueuedMessages();
     if (this.#onOpenPromise) {
       if (suppressUnhandled) {
         this.#onOpenPromise.promise.catch(() => {
@@ -6529,4 +6550,4 @@ export {
   updateRunnerConfig,
   RemoteEngineControlClient
 };
-//# sourceMappingURL=chunk-2VXPVVNW.js.map
+//# sourceMappingURL=chunk-EOUH7MP7.js.map