@replit/river 0.23.9 → 0.23.11

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

@@ -162,11 +162,13 @@ var createLogProxy = (log) => ({
 var ProtocolError = {
   RetriesExceeded: "conn_retry_exceeded",
   HandshakeFailed: "handshake_failed",
-  UseAfterDestroy: "use_after_destroy",
   MessageOrderingViolated: "message_ordering_violated"
 };
 var EventDispatcher = class {
   eventListeners = {};
+  removeAllListeners() {
+    this.eventListeners = {};
+  }
   numberOfListeners(eventType) {
     return this.eventListeners[eventType]?.size ?? 0;
   }
@@ -185,7 +187,8 @@ var EventDispatcher = class {
   dispatchEvent(eventType, event) {
     const handlers = this.eventListeners[eventType];
     if (handlers) {
-      for (const handler of handlers) {
+      const copy = [...handlers];
+      for (const handler of copy) {
         handler(event);
       }
     }
@@ -199,7 +202,7 @@ var import_nanoid2 = require("nanoid");
 var import_api = require("@opentelemetry/api");
 
 // package.json
-var version = "0.23.9";
+var version = "0.23.11";
 
 // tracing/index.ts
 function getPropagationContext(ctx) {
@@ -258,7 +261,7 @@ var Connection = class {
   get loggingMetadata() {
     const metadata = { connId: this.id };
     const spanContext = this.telemetry?.span.spanContext();
-    if (spanContext) {
+    if (this.telemetry?.span.isRecording() && spanContext) {
       metadata.telemetry = {
         traceId: spanContext.traceId,
         spanId: spanContext.spanId
@@ -473,19 +476,8 @@ var Session = class {
       `starting ${this.options.sessionDisconnectGraceMs}ms grace period until session to ${this.to} is closed`,
       this.loggingMetadata
     );
-    this.cancelGrace({ keepHeartbeatMisses: true });
+    this.cancelGrace();
     this.disconnectionGrace = setTimeout(() => {
-      if (this.connection !== void 0) {
-        this.log?.warn(
-          `grace period for ${this.to} elapsed while connected. not calling callback`,
-          {
-            ...this.loggingMetadata,
-            connId: this.connection.id,
-            tags: ["invariant-violation"]
-          }
-        );
-        return;
-      }
       this.log?.info(
         `grace period for ${this.to} elapsed`,
         this.loggingMetadata
@@ -494,14 +486,8 @@ var Session = class {
     }, this.options.sessionDisconnectGraceMs);
   }
   // called on reconnect of the underlying session
-  cancelGrace({ keepHeartbeatMisses } = {
-    keepHeartbeatMisses: false
-  }) {
-    if (!keepHeartbeatMisses) {
-      this.heartbeatMisses = 0;
-    }
-    if (this.disconnectionGrace === void 0)
-      return;
+  cancelGrace() {
+    this.heartbeatMisses = 0;
     clearTimeout(this.disconnectionGrace);
     this.disconnectionGrace = void 0;
   }
@@ -704,10 +690,9 @@ var defaultServerTransportOptions = {
 };
 var Transport = class {
   /**
-   * A flag indicating whether the transport has been destroyed.
-   * A destroyed transport will not attempt to reconnect and cannot be used again.
+   * The status of the transport.
    */
-  state;
+  status;
   /**
    * The {@link Codec} used to encode and decode messages.
    */
@@ -749,7 +734,7 @@ var Transport = class {
     this.sessions = /* @__PURE__ */ new Map();
     this.codec = this.options.codec;
     this.clientId = clientId;
-    this.state = "open";
+    this.status = "open";
   }
   bindLogger(fn, level) {
     if (typeof fn === "function") {
@@ -763,7 +748,7 @@ var Transport = class {
    * and we know the identity of the connected client.
    * @param conn The connection object.
    */
-  onConnect(conn, connectedTo, session, isReconnect) {
+  onConnect(conn, session, isReconnect) {
     this.eventDispatcher.dispatchEvent("connectionStatus", {
       status: "connect",
       conn
@@ -771,13 +756,11 @@ var Transport = class {
     conn.telemetry = createConnectionTelemetryInfo(conn, session.telemetry);
     if (isReconnect) {
       session.replaceWithNewConnection(conn);
-      this.log?.info(`reconnected to ${connectedTo}`, {
-        ...conn.loggingMetadata,
-        ...session.loggingMetadata,
-        clientId: this.clientId,
-        connectedTo
-      });
     }
+    this.log?.info(`connected to ${session.to}`, {
+      ...conn.loggingMetadata,
+      ...session.loggingMetadata
+    });
   }
   createSession(to, conn, propagationCtx) {
     const session = new Session(
@@ -911,7 +894,7 @@ var Transport = class {
    * @param msg The received message.
    */
   handleMsg(msg, conn) {
-    if (this.state !== "open")
+    if (this.getStatus() !== "open")
       return;
     const session = this.sessions.get(msg.from);
     if (!session) {
@@ -990,21 +973,14 @@ var Transport = class {
    * @returns The ID of the sent message or undefined if it wasn't sent
    */
   send(to, msg) {
-    if (this.state === "destroyed") {
-      const err = "transport is destroyed, cant send";
+    if (this.getStatus() === "closed") {
+      const err = "transport is closed, cant send";
       this.log?.error(err, {
         clientId: this.clientId,
         transportMessage: msg,
         tags: ["invariant-violation"]
       });
-      this.protocolError(ProtocolError.UseAfterDestroy, err);
-      return void 0;
-    } else if (this.state === "closed") {
-      this.log?.info(`transport closed when sending, discarding`, {
-        clientId: this.clientId,
-        transportMessage: msg
-      });
-      return void 0;
+      throw new Error(err);
     }
     return this.getOrCreateSession({ to }).session.send(msg);
   }
@@ -1027,23 +1003,18 @@ var Transport = class {
    * Closes the transport. Any messages sent while the transport is closed will be silently discarded.
    */
   close() {
-    this.state = "closed";
+    this.status = "closed";
     for (const session of this.sessions.values()) {
       this.deleteSession({ session, closeHandshakingConnection: true });
     }
+    this.eventDispatcher.dispatchEvent("transportStatus", {
+      status: this.status
+    });
+    this.eventDispatcher.removeAllListeners();
     this.log?.info(`manually closed transport`, { clientId: this.clientId });
   }
-  /**
-   * Default destroy implementation for transports. You should override this in the downstream
-   * implementation if you need to do any additional cleanup and call super.destroy() at the end.
-   * Destroys the transport. Any messages sent while the transport is destroyed will throw an error.
-   */
-  destroy() {
-    this.state = "destroyed";
-    for (const session of this.sessions.values()) {
-      this.deleteSession({ session, closeHandshakingConnection: true });
-    }
-    this.log?.info(`manually destroyed transport`, { clientId: this.clientId });
+  getStatus() {
+    return this.status;
   }
 };
 var ClientTransport = class extends Transport {
@@ -1080,7 +1051,7 @@ var ClientTransport = class extends Transport {
     this.handshakeExtensions = options;
   }
   handleConnection(conn, to) {
-    if (this.state !== "open")
+    if (this.getStatus() !== "open")
       return;
     let session = void 0;
     const handshakeTimeout = setTimeout(() => {
@@ -1120,12 +1091,16 @@ var ClientTransport = class extends Transport {
       if (session) {
         this.onDisconnect(conn, session);
       }
-      this.log?.info(`connection to ${to} disconnected`, {
-        ...conn.loggingMetadata,
-        ...session?.loggingMetadata,
-        clientId: this.clientId,
-        connectedTo: to
-      });
+      const willReconnect = this.reconnectOnConnectionDrop && this.getStatus() === "open";
+      this.log?.info(
+        `connection to ${to} disconnected` + (willReconnect ? ", reconnecting" : ""),
+        {
+          ...conn.loggingMetadata,
+          ...session?.loggingMetadata,
+          clientId: this.clientId,
+          connectedTo: to
+        }
+      );
       this.inflightConnectionPromises.delete(to);
       if (this.reconnectOnConnectionDrop) {
         void this.connect(to);
@@ -1211,8 +1186,8 @@ var ClientTransport = class extends Transport {
       conn,
       sessionId: parsed.payload.status.sessionId
     });
-    this.onConnect(conn, parsed.from, session, isReconnect);
-    this.retryBudget.startRestoringBudget(parsed.from);
+    this.onConnect(conn, session, isReconnect);
+    this.retryBudget.startRestoringBudget(session.to);
     return session;
   }
   /**
@@ -1220,7 +1195,14 @@ var ClientTransport = class extends Transport {
    * @param to The client ID of the node to connect to.
    */
   async connect(to) {
-    const canProceedWithConnection = () => this.state === "open";
+    if (this.connections.has(to)) {
+      this.log?.info(`already connected to ${to}, skipping connect attempt`, {
+        clientId: this.clientId,
+        connectedTo: to
+      });
+      return;
+    }
+    const canProceedWithConnection = () => this.getStatus() === "open";
     if (!canProceedWithConnection()) {
       this.log?.info(
         `transport state is no longer open, cancelling attempt to connect to ${to}`,
@@ -1230,8 +1212,8 @@ var ClientTransport = class extends Transport {
     }
     let reconnectPromise = this.inflightConnectionPromises.get(to);
     if (!reconnectPromise) {
-      const budgetConsumed = this.retryBudget.getBudgetConsumed(to);
       if (!this.retryBudget.hasBudget(to)) {
+        const budgetConsumed = this.retryBudget.getBudgetConsumed(to);
         const errMsg = `tried to connect to ${to} but retry budget exceeded (more than ${budgetConsumed} attempts in the last ${this.retryBudget.totalBudgetRestoreTime}ms)`;
         this.log?.error(errMsg, { clientId: this.clientId, connectedTo: to });
         this.protocolError(ProtocolError.RetriesExceeded, errMsg);
@@ -1312,7 +1294,7 @@ var ClientTransport = class extends Transport {
           clientId: this.clientId,
           connectedTo: to
         });
-        return this.connect(to);
+        await this.connect(to);
       }
     }
   }
@@ -1465,6 +1447,9 @@ var WebSocketClientTransport = class extends ClientTransport {
       ws.onclose = (evt) => {
         reject(new Error(evt.reason));
       };
+      ws.onerror = (err) => {
+        reject(new Error(err.message));
+      };
     });
     const conn = new WebSocketConnection(ws);
     this.log?.info(`raw websocket to ${to} ok, starting handshake`, {