@replit/river 0.23.15 → 0.23.18

package/dist/transport/index.cjs

@@ -252,7 +252,7 @@ var import_nanoid2 = require("nanoid");
 var import_api = require("@opentelemetry/api");
 
 // package.json
-var version = "0.23.15";
+var version = "0.23.18";
 
 // tracing/index.ts
 function getPropagationContext(ctx) {
@@ -572,6 +572,18 @@ var Session = class {
   get nextExpectedSeq() {
     return this.ack;
   }
+  /**
+   * Check that the peer's next expected seq number matches something that is in our send buffer
+   * _or_ matches our actual next seq.
+   */
+  nextExpectedSeqInRange(nextExpectedSeq) {
+    for (const msg of this.sendBuffer) {
+      if (nextExpectedSeq === msg.seq) {
+        return true;
+      }
+    }
+    return nextExpectedSeq === this.seq;
+  }
   // This is only used in tests to make the session misbehave.
   /* @internal */
   advanceAckForTesting(by) {
@@ -655,6 +667,7 @@ var defaultTransportOptions = {
   heartbeatIntervalMs: 1e3,
   heartbeatsUntilDead: 2,
   sessionDisconnectGraceMs: 5e3,
+  handshakeTimeoutMs: 5e3,
   codec: NaiveJsonCodec
 };
 var defaultConnectionRetryOptions = {
@@ -809,7 +822,7 @@ var Transport = class {
     if (
       // reject this request if there was no previous session to replace
       session === void 0 || // or if both parties do not agree about the next expected sequence number
-      session.nextExpectedAck < nextExpectedSeq || // or if both parties do not agree on the advertised session id
+      !session.nextExpectedSeqInRange(nextExpectedSeq) || // or if both parties do not agree on the advertised session id
       session.advertisedSessionId !== sessionId
     ) {
       return false;
@@ -1219,7 +1232,7 @@ var ClientTransport = class extends Transport {
         { ...conn.loggingMetadata, clientId: this.clientId, connectedTo: to }
       );
       conn.close();
-    }, this.options.sessionDisconnectGraceMs);
+    }, this.options.handshakeTimeoutMs);
     const handshakeHandler = (data) => {
       const maybeSession = this.receiveHandshakeResponseMessage(data, conn);
       clearTimeout(handshakeTimeout);
@@ -1610,7 +1623,7 @@ var ServerTransport = class extends Transport {
         });
         conn.close();
       }
-    }, this.options.sessionDisconnectGraceMs);
+    }, this.options.handshakeTimeoutMs);
     const buffer = [];
     let receivedHandshakeMessage = false;
     const handshakeHandler = (data) => {