@replit/river 0.23.10 → 0.23.12

package/dist/transport/impls/uds/server.cjs

@@ -199,7 +199,7 @@ var import_nanoid2 = require("nanoid");
 var import_api = require("@opentelemetry/api");
 
 // package.json
-var version = "0.23.10";
+var version = "0.23.12";
 
 // tracing/index.ts
 function createSessionTelemetryInfo(session, propagationCtx) {
@@ -449,10 +449,12 @@ var Session = class {
     this.connection.close();
     this.connection = void 0;
   }
-  replaceWithNewConnection(newConn) {
+  replaceWithNewConnection(newConn, isTransparentReconnect) {
     this.closeStaleConnection(newConn);
     this.cancelGrace();
-    this.sendBufferedMessages(newConn);
+    if (isTransparentReconnect) {
+      this.sendBufferedMessages(newConn);
+    }
     this.connection = newConn;
     this.handshakingConnection = void 0;
   }
@@ -464,19 +466,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
@@ -485,14 +476,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;
   }
@@ -682,21 +667,17 @@ 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, isTransparentReconnect) {
     this.eventDispatcher.dispatchEvent("connectionStatus", {
       status: "connect",
       conn
     });
     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
-      });
-    }
+    session.replaceWithNewConnection(conn, isTransparentReconnect);
+    this.log?.info(`connected to ${session.to}`, {
+      ...conn.loggingMetadata,
+      ...session.loggingMetadata
+    });
   }
   createSession(to, conn, propagationCtx) {
     const session = new Session(
@@ -724,7 +705,8 @@ var Transport = class {
     propagationCtx
   }) {
     let session = this.sessions.get(to);
-    let isReconnect = session !== void 0;
+    const isReconnect = session !== void 0;
+    let isTransparentReconnect = isReconnect;
     if (session?.advertisedSessionId !== void 0 && sessionId !== void 0 && session.advertisedSessionId !== sessionId) {
       this.log?.info(
         `session for ${to} already exists but has a different session id (expected: ${session.advertisedSessionId}, got: ${sessionId}), creating a new one`,
@@ -735,7 +717,7 @@ var Transport = class {
         closeHandshakingConnection: handshakingConn !== void 0,
         handshakingConn
       });
-      isReconnect = false;
+      isTransparentReconnect = false;
       session = void 0;
     }
     if (!session) {
@@ -751,7 +733,7 @@ var Transport = class {
     if (handshakingConn !== void 0) {
       session.replaceWithNewHandshakingConnection(handshakingConn);
     }
-    return { session, isReconnect };
+    return { session, isReconnect, isTransparentReconnect };
   }
   deleteSession({
     session,
@@ -1182,7 +1164,7 @@ var ServerTransport = class extends Transport {
     if (parsedMetadata === false) {
       return false;
     }
-    const { session, isReconnect } = this.getOrCreateSession({
+    const { session, isTransparentReconnect } = this.getOrCreateSession({
       to: parsed.from,
       conn,
       sessionId: parsed.payload.sessionId,
@@ -1198,7 +1180,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, isTransparentReconnect);
     return session;
   }
 };