@replit/river 0.24.3 → 0.25.0

package/dist/transport/impls/ws/server.d.ts

@@ -1,9 +1,9 @@
 import { c as TransportClientId } from '../../../message-e6c560fd.js';
 import { WebSocketServer } from 'ws';
-import { W as WebSocketConnection } from '../../../connection-55cba970.js';
+import { W as WebSocketConnection } from '../../../connection-bd907ca6.js';
 import { W as WsLike } from '../../../wslike-e0b32dd5.js';
-import { S as ServerTransport } from '../../../server-732e7014.js';
-import { c as ProvidedServerTransportOptions } from '../../../handshake-0b88e8fc.js';
+import { S as ServerTransport } from '../../../server-f0fd2b98.js';
+import { c as ProvidedServerTransportOptions } from '../../../handshake-3772d7ca.js';
 import '@sinclair/typebox/value';
 import '@sinclair/typebox';
 import '@opentelemetry/api';

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

@@ -1,13 +1,13 @@
 import {
   ServerTransport
-} from "../../../chunk-W3CY6PNC.js";
+} from "../../../chunk-N2UT2H2D.js";
 import {
   WebSocketConnection
-} from "../../../chunk-EHXKU4TW.js";
-import "../../../chunk-FKBXIWWN.js";
+} from "../../../chunk-BMSEVPGM.js";
+import "../../../chunk-FEMGSUEE.js";
 import "../../../chunk-TAH2GVTJ.js";
-import "../../../chunk-KVLCQ24J.js";
-import "../../../chunk-DZNP3EI5.js";
+import "../../../chunk-XVGZYVNR.js";
+import "../../../chunk-6NPQ43ZP.js";
 import "../../../chunk-4PVU7J25.js";
 
 // transport/impls/ws/server.ts

package/dist/transport/index.cjs

@@ -562,7 +562,7 @@ var SessionNoConnection = class extends IdentifiedSession {
 var import_api = require("@opentelemetry/api");
 
 // package.json
-var version = "0.24.3";
+var version = "0.25.0";
 
 // tracing/index.ts
 function getPropagationContext(ctx) {
@@ -686,15 +686,16 @@ var SessionConnected = class extends IdentifiedSession {
   state = "Connected" /* Connected */;
   conn;
   listeners;
-  heartbeatHandle;
-  heartbeatMisses = 0;
+  activeHeartbeatHandle;
+  activeHeartbeatMisses = 0;
+  passiveHeartbeatHandle;
   get isActivelyHeartbeating() {
-    return this.heartbeatHandle !== void 0;
+    return this.activeHeartbeatHandle !== void 0;
   }
   updateBookkeeping(ack, seq) {
     this.sendBuffer = this.sendBuffer.filter((unacked) => unacked.seq >= ack);
     this.ack = seq + 1;
-    this.heartbeatMisses = 0;
+    this.activeHeartbeatMisses = 0;
   }
   send(msg) {
     const constructedMsg = this.constructMsg(msg);
@@ -720,8 +721,8 @@ var SessionConnected = class extends IdentifiedSession {
     }
   }
   startActiveHeartbeat() {
-    this.heartbeatHandle = setInterval(() => {
-      const misses = this.heartbeatMisses;
+    this.activeHeartbeatHandle = setInterval(() => {
+      const misses = this.activeHeartbeatMisses;
       const missDuration = misses * this.options.heartbeatIntervalMs;
       if (misses >= this.options.heartbeatsUntilDead) {
         this.log?.info(
@@ -730,15 +731,32 @@ var SessionConnected = class extends IdentifiedSession {
         );
         this.telemetry.span.addEvent("closing connection due to inactivity");
         this.conn.close();
-        clearInterval(this.heartbeatHandle);
-        this.heartbeatHandle = void 0;
+        clearInterval(this.activeHeartbeatHandle);
+        this.activeHeartbeatHandle = void 0;
         return;
       }
       this.sendHeartbeat();
-      this.heartbeatMisses++;
+      this.activeHeartbeatMisses++;
     }, this.options.heartbeatIntervalMs);
   }
+  waitForNextHeartbeat() {
+    const duration = this.options.heartbeatsUntilDead * this.options.heartbeatIntervalMs;
+    if (this.passiveHeartbeatHandle) {
+      clearTimeout(this.passiveHeartbeatHandle);
+      this.passiveHeartbeatHandle = void 0;
+    }
+    this.passiveHeartbeatHandle = setTimeout(() => {
+      this.log?.info(
+        `closing connection to ${this.to} due to not receiving a heartbeat in the last ${duration}ms`,
+        this.loggingMetadata
+      );
+      this.telemetry.span.addEvent("closing connection due to inactivity");
+      this.conn.close();
+      this.passiveHeartbeatHandle = void 0;
+    }, duration);
+  }
   sendHeartbeat() {
+    this.log?.debug("sending heartbeat", this.loggingMetadata);
     this.send({
       streamId: "heartbeat",
       controlFlags: 1 /* AckBit */,
@@ -790,6 +808,7 @@ var SessionConnected = class extends IdentifiedSession {
     });
     if (!this.isActivelyHeartbeating) {
       this.sendHeartbeat();
+      this.waitForNextHeartbeat();
     }
   };
   _handleStateExit() {
@@ -797,8 +816,10 @@ var SessionConnected = class extends IdentifiedSession {
     this.conn.removeDataListener(this.onMessageData);
     this.conn.removeCloseListener(this.listeners.onConnectionClosed);
     this.conn.removeErrorListener(this.listeners.onConnectionErrored);
-    clearInterval(this.heartbeatHandle);
-    this.heartbeatHandle = void 0;
+    clearInterval(this.activeHeartbeatHandle);
+    clearTimeout(this.passiveHeartbeatHandle);
+    this.activeHeartbeatHandle = void 0;
+    this.passiveHeartbeatHandle = void 0;
   }
   _handleClose() {
     super._handleClose();
@@ -1711,10 +1732,10 @@ var ServerTransport = class extends Transport {
       return;
     }
     let connectCase = "new session";
+    const clientNextExpectedSeq = msg.payload.expectedSessionState.nextExpectedSeq;
+    const clientNextSentSeq = msg.payload.expectedSessionState.nextSentSeq ?? 0;
     if (oldSession && oldSession.id === msg.payload.sessionId) {
       connectCase = "transparent reconnection";
-      const clientNextExpectedSeq = msg.payload.expectedSessionState.nextExpectedSeq;
-      const clientNextSentSeq = msg.payload.expectedSessionState.nextSentSeq ?? 0;
       const ourNextSeq = oldSession.nextSeq();
       const ourAck = oldSession.ack;
       if (clientNextSentSeq > ourAck) {
@@ -1770,26 +1791,31 @@ var ServerTransport = class extends Transport {
       this.updateSession(oldSession);
     } else if (oldSession) {
       connectCase = "hard reconnection";
+      this.log?.info(
+        `client is reconnecting to a new session (${msg.payload.sessionId}) with an old session (${oldSession.id}) already existing, closing old session`,
+        {
+          ...session.loggingMetadata,
+          connectedTo: msg.from,
+          sessionId: msg.payload.sessionId
+        }
+      );
       this.deleteSession(oldSession);
       oldSession = void 0;
-    } else {
+    }
+    if (!oldSession && (clientNextSentSeq > 0 || clientNextExpectedSeq > 0)) {
       connectCase = "unknown session";
-      const clientNextExpectedSeq = msg.payload.expectedSessionState.nextExpectedSeq;
-      const clientNextSentSeq = msg.payload.expectedSessionState.nextSentSeq ?? 0;
-      if (clientNextSentSeq > 0 || clientNextExpectedSeq > 0) {
-        this.rejectHandshakeRequest(
-          session,
-          msg.from,
-          `client is trying to reconnect to a session the server don't know about: ${msg.payload.sessionId}`,
-          "SESSION_STATE_MISMATCH",
-          {
-            ...session.loggingMetadata,
-            connectedTo: msg.from,
-            transportMessage: msg
-          }
-        );
-        return;
-      }
+      this.rejectHandshakeRequest(
+        session,
+        msg.from,
+        `client is trying to reconnect to a session the server don't know about: ${msg.payload.sessionId}`,
+        "SESSION_STATE_MISMATCH",
+        {
+          ...session.loggingMetadata,
+          connectedTo: msg.from,
+          transportMessage: msg
+        }
+      );
+      return;
     }
     const sessionId = msg.payload.sessionId;
     this.log?.info(