@replit/river 0.23.11 → 0.23.12

package/dist/transport/impls/ws/server.js

@@ -1,10 +1,10 @@
 import {
   WebSocketConnection
-} from "../../../chunk-HM7VDTDJ.js";
+} from "../../../chunk-HDBVL7EF.js";
 import {
   ServerTransport
-} from "../../../chunk-EOJMKMDO.js";
-import "../../../chunk-MEHCOYKJ.js";
+} from "../../../chunk-VRU4IKRT.js";
+import "../../../chunk-7RUKEUKE.js";
 import "../../../chunk-6LCL2ZZF.js";
 import "../../../chunk-3AW3IXVD.js";
 

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.11";
+var version = "0.23.12";
 
 // tracing/index.ts
 function getPropagationContext(ctx) {
@@ -483,10 +483,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;
   }
@@ -770,15 +772,13 @@ var Transport = class {
    * and we know the identity of the connected client.
    * @param conn The connection object.
    */
-  onConnect(conn, session, isReconnect) {
+  onConnect(conn, session, isTransparentReconnect) {
     this.eventDispatcher.dispatchEvent("connectionStatus", {
       status: "connect",
       conn
     });
     conn.telemetry = createConnectionTelemetryInfo(conn, session.telemetry);
-    if (isReconnect) {
-      session.replaceWithNewConnection(conn);
-    }
+    session.replaceWithNewConnection(conn, isTransparentReconnect);
     this.log?.info(`connected to ${session.to}`, {
       ...conn.loggingMetadata,
       ...session.loggingMetadata
@@ -810,7 +810,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`,
@@ -821,7 +822,7 @@ var Transport = class {
         closeHandshakingConnection: handshakingConn !== void 0,
         handshakingConn
       });
-      isReconnect = false;
+      isTransparentReconnect = false;
       session = void 0;
     }
     if (!session) {
@@ -837,7 +838,7 @@ var Transport = class {
     if (handshakingConn !== void 0) {
       session.replaceWithNewHandshakingConnection(handshakingConn);
     }
-    return { session, isReconnect };
+    return { session, isReconnect, isTransparentReconnect };
   }
   deleteSession({
     session,
@@ -1197,18 +1198,37 @@ var ClientTransport = class extends Transport {
       );
       return false;
     }
+    const previousSession = this.sessions.get(parsed.from);
+    if (previousSession?.advertisedSessionId && previousSession.advertisedSessionId !== parsed.payload.status.sessionId) {
+      this.deleteSession({
+        session: previousSession,
+        closeHandshakingConnection: true
+      });
+      conn.telemetry?.span.setStatus({
+        code: import_api3.SpanStatusCode.ERROR,
+        message: "session id mismatch"
+      });
+      this.log?.warn(`handshake from ${parsed.from} session id mismatch`, {
+        ...conn.loggingMetadata,
+        clientId: this.clientId,
+        connectedTo: parsed.from,
+        transportMessage: parsed
+      });
+      this.protocolError(ProtocolError.HandshakeFailed, "session id mismatch");
+      return false;
+    }
     this.log?.debug(`handshake from ${parsed.from} ok`, {
       ...conn.loggingMetadata,
       clientId: this.clientId,
       connectedTo: parsed.from,
       transportMessage: parsed
     });
-    const { session, isReconnect } = this.getOrCreateSession({
+    const { session, isTransparentReconnect } = this.getOrCreateSession({
       to: parsed.from,
       conn,
       sessionId: parsed.payload.status.sessionId
     });
-    this.onConnect(conn, session, isReconnect);
+    this.onConnect(conn, session, isTransparentReconnect);
     this.retryBudget.startRestoringBudget(session.to);
     return session;
   }
@@ -1608,7 +1628,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,
@@ -1624,7 +1644,7 @@ var ServerTransport = class extends Transport {
       sessionId: session.id
     });
     conn.send(this.codec.toBuffer(responseMsg));
-    this.onConnect(conn, session, isReconnect);
+    this.onConnect(conn, session, isTransparentReconnect);
     return session;
   }
 };