@replit/river 0.20.1 → 0.21.1

package/dist/transport/impls/ws/client.cjs

@@ -1,7 +1,9 @@
 "use strict";
+var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
   for (var name in all)
@@ -15,6 +17,14 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
 // transport/impls/ws/client.ts
@@ -23,6 +33,7 @@ __export(client_exports, {
   WebSocketClientTransport: () => WebSocketClientTransport
 });
 module.exports = __toCommonJS(client_exports);
+var import_agnostic_ws2 = __toESM(require("agnostic-ws"), 1);
 
 // transport/transport.ts
 var import_value = require("@sinclair/typebox/value");
@@ -300,18 +311,20 @@ var Session = class {
         log?.error(errMsg, {
           ...this.loggingMetadata,
           fullTransportMessage: msg,
-          connId: conn.debugId
+          connId: conn.debugId,
+          tags: ["invariant-violation"]
         });
-        throw new Error(errMsg);
+        conn.close();
+        return;
       }
     }
   }
   updateBookkeeping(ack, seq) {
     if (seq + 1 < this.ack) {
-      log?.error(
-        `received stale seq ${seq} + 1 < ${this.ack}`,
-        this.loggingMetadata
-      );
+      log?.error(`received stale seq ${seq} + 1 < ${this.ack}`, {
+        ...this.loggingMetadata,
+        tags: ["invariant-violation"]
+      });
       return;
     }
     this.sendBuffer = this.sendBuffer.filter((unacked) => unacked.seq >= ack);
@@ -696,9 +709,10 @@ var Transport = class {
       return;
     const session = this.sessions.get(msg.from);
     if (!session) {
-      log?.error(`(invariant violation) no existing session for ${msg.from}`, {
+      log?.error(`no existing session for ${msg.from}`, {
         clientId: this.clientId,
-        fullTransportMessage: msg
+        fullTransportMessage: msg,
+        tags: ["invariant-violation"]
       });
       return;
     }
@@ -717,7 +731,8 @@ var Transport = class {
         const errMsg = `received out-of-order msg (got seq: ${msg.seq}, wanted seq: ${session.nextExpectedSeq})`;
         log?.error(`${errMsg}, marking connection as dead`, {
           clientId: this.clientId,
-          fullTransportMessage: msg
+          fullTransportMessage: msg,
+          tags: ["invariant-violation"]
         });
         this.protocolError(ProtocolError.MessageOrderingViolated, errMsg);
         session.close();
@@ -761,7 +776,8 @@ var Transport = class {
       const err = "transport is destroyed, cant send";
       log?.error(err, {
         clientId: this.clientId,
-        partialTransportMessage: msg
+        partialTransportMessage: msg,
+        tags: ["invariant-violation"]
       });
       this.protocolError(ProtocolError.UseAfterDestroy, err);
       return void 0;
@@ -1096,7 +1112,8 @@ var ClientTransport = class extends Transport {
       if (!import_value.Value.Check(this.options.handshake.schema, metadata)) {
         log?.error(`handshake metadata did not match schema`, {
           clientId: this.clientId,
-          connectedTo: to
+          connectedTo: to,
+          tags: ["invariant-violation"]
         });
         this.protocolError(
           ProtocolError.HandshakeFailed,
@@ -1127,6 +1144,7 @@ var ClientTransport = class extends Transport {
 };
 
 // transport/impls/ws/connection.ts
+var import_agnostic_ws = __toESM(require("agnostic-ws"), 1);
 var WebSocketConnection = class extends Connection {
   ws;
   constructor(ws) {
@@ -1144,10 +1162,10 @@ var WebSocketConnection = class extends Connection {
     this.ws.onclose = cb;
   }
   addErrorListener(cb) {
-    this.ws.onerror = (err) => cb(new Error(err.message));
+    this.ws.onerror = (err) => cb(err.error);
   }
   send(payload) {
-    if (this.ws.readyState === this.ws.OPEN) {
+    if (this.ws.readyState === import_agnostic_ws.default.OPEN) {
       this.ws.send(payload);
       return true;
     } else {
@@ -1162,9 +1180,9 @@ var WebSocketConnection = class extends Connection {
 // transport/impls/ws/client.ts
 var WebSocketClientTransport = class extends ClientTransport {
   /**
-   * A function that returns a Promise that resolves to a WebSocket instance.
+   * A function that returns a Promise that resolves to a websocket URL.
    */
-  wsGetter;
+  urlGetter;
   /**
    * Creates a new WebSocketClientTransport instance.
    * @param wsGetter A function that returns a Promise that resolves to a WebSocket instance.
@@ -1172,9 +1190,9 @@ var WebSocketClientTransport = class extends ClientTransport {
    * @param serverId The ID of the server this transport is connecting to.
    * @param providedOptions An optional object containing configuration options for the transport.
    */
-  constructor(wsGetter, clientId, providedOptions) {
+  constructor(urlGetter, clientId, providedOptions) {
     super(clientId, providedOptions);
-    this.wsGetter = wsGetter;
+    this.urlGetter = urlGetter;
   }
   async createNewOutgoingConnection(to) {
     const wsRes = await new Promise((resolve) => {
@@ -1182,12 +1200,12 @@ var WebSocketClientTransport = class extends ClientTransport {
         clientId: this.clientId,
         connectedTo: to
       });
-      this.wsGetter(to).then((ws) => {
-        if (ws.readyState === ws.OPEN) {
+      Promise.resolve(this.urlGetter(to)).then((url) => new import_agnostic_ws2.default(url)).then((ws) => {
+        if (ws.readyState === import_agnostic_ws2.default.OPEN) {
           resolve({ ws });
           return;
         }
-        if (ws.readyState === ws.CLOSING || ws.readyState === ws.CLOSED) {
+        if (ws.readyState === import_agnostic_ws2.default.CLOSING || ws.readyState === import_agnostic_ws2.default.CLOSED) {
           resolve({ err: "ws is closing or closed" });
           return;
         }
@@ -1200,7 +1218,7 @@ var WebSocketClientTransport = class extends ClientTransport {
         ws.onerror = (evt) => {
           const err = evt.error;
           resolve({
-            err: err?.code ?? "unexpected disconnect"
+            err: `${err.name}: ${err.message}`
           });
         };
       }).catch((e) => {