@replit/river 0.23.10 → 0.23.11

package/dist/transport/index.cjs

@@ -224,7 +224,7 @@ var import_nanoid2 = require("nanoid");
 var import_api = require("@opentelemetry/api");
 
 // package.json
-var version = "0.23.10";
+var version = "0.23.11";
 
 // tracing/index.ts
 function getPropagationContext(ctx) {
@@ -498,19 +498,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
@@ -519,14 +508,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;
   }
@@ -787,7 +770,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
@@ -795,13 +778,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(
@@ -1132,12 +1113,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);
@@ -1223,8 +1208,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;
   }
   /**
@@ -1232,6 +1217,13 @@ var ClientTransport = class extends Transport {
    * @param to The client ID of the node to connect to.
    */
   async connect(to) {
+    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(
@@ -1242,8 +1234,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);
@@ -1324,7 +1316,7 @@ var ClientTransport = class extends Transport {
           clientId: this.clientId,
           connectedTo: to
         });
-        return this.connect(to);
+        await this.connect(to);
       }
     }
   }
@@ -1632,7 +1624,7 @@ var ServerTransport = class extends Transport {
       sessionId: session.id
     });
     conn.send(this.codec.toBuffer(responseMsg));
-    this.onConnect(conn, parsed.from, session, isReconnect);
+    this.onConnect(conn, session, isReconnect);
     return session;
   }
 };