@replit/river 0.26.0 → 0.26.2

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

@@ -1,9 +1,9 @@
-import { c as TransportClientId } from '../../../message-1a434848.js';
+import { c as TransportClientId } from '../../../message-57296605.js';
 import { WebSocketServer } from 'ws';
-import { W as WebSocketConnection } from '../../../connection-6a404bb8.js';
+import { W as WebSocketConnection } from '../../../connection-bc2454dc.js';
 import { W as WsLike } from '../../../wslike-e0b32dd5.js';
-import { S as ServerTransport } from '../../../server-1b695374.js';
-import { c as ProvidedServerTransportOptions } from '../../../handshake-3342bb94.js';
+import { S as ServerTransport } from '../../../server-9a6b5a8e.js';
+import { c as ProvidedServerTransportOptions } from '../../../handshake-1a86f06d.js';
 import '@sinclair/typebox/value';
 import '@sinclair/typebox';
 import '@opentelemetry/api';

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

@@ -1,9 +1,9 @@
-import { c as TransportClientId } from '../../../message-1a434848.js';
+import { c as TransportClientId } from '../../../message-57296605.js';
 import { WebSocketServer } from 'ws';
-import { W as WebSocketConnection } from '../../../connection-6a404bb8.js';
+import { W as WebSocketConnection } from '../../../connection-bc2454dc.js';
 import { W as WsLike } from '../../../wslike-e0b32dd5.js';
-import { S as ServerTransport } from '../../../server-1b695374.js';
-import { c as ProvidedServerTransportOptions } from '../../../handshake-3342bb94.js';
+import { S as ServerTransport } from '../../../server-9a6b5a8e.js';
+import { c as ProvidedServerTransportOptions } from '../../../handshake-1a86f06d.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-7ETNUCOL.js";
+} from "../../../chunk-YQABPD3C.js";
 import {
   WebSocketConnection
-} from "../../../chunk-KP4UB5NW.js";
-import "../../../chunk-5FDAIAQ5.js";
+} from "../../../chunk-AWCUCZY4.js";
+import "../../../chunk-M5X4JTU3.js";
 import "../../../chunk-TAH2GVTJ.js";
-import "../../../chunk-JSU2KACV.js";
-import "../../../chunk-CCUYKR5C.js";
+import "../../../chunk-NC54BC47.js";
+import "../../../chunk-M75K5TJS.js";
 import "../../../chunk-4PVU7J25.js";
 
 // transport/impls/ws/server.ts

package/dist/transport/index.cjs

@@ -180,6 +180,7 @@ var defaultTransportOptions = {
   sessionDisconnectGraceMs: 5e3,
   connectionTimeoutMs: 2e3,
   handshakeTimeoutMs: 1e3,
+  enableTransparentSessionReconnects: true,
   codec: NaiveJsonCodec
 };
 var defaultConnectionRetryOptions = {
@@ -501,9 +502,32 @@ var IdentifiedSession = class extends CommonSession {
     this.telemetry.span.end();
   }
 };
+var IdentifiedSessionWithGracePeriod = class extends IdentifiedSession {
+  graceExpiryTime;
+  gracePeriodTimeout;
+  listeners;
+  constructor(props) {
+    super(props);
+    this.listeners = props.listeners;
+    this.graceExpiryTime = props.graceExpiryTime;
+    this.gracePeriodTimeout = setTimeout(() => {
+      this.listeners.onSessionGracePeriodElapsed();
+    }, this.graceExpiryTime - Date.now());
+  }
+  _handleStateExit() {
+    super._handleStateExit();
+    if (this.gracePeriodTimeout) {
+      clearTimeout(this.gracePeriodTimeout);
+      this.gracePeriodTimeout = void 0;
+    }
+  }
+  _handleClose() {
+    super._handleClose();
+  }
+};
 
 // transport/sessionStateMachine/SessionConnecting.ts
-var SessionConnecting = class extends IdentifiedSession {
+var SessionConnecting = class extends IdentifiedSessionWithGracePeriod {
   state = "Connecting" /* Connecting */;
   connPromise;
   listeners;
@@ -536,8 +560,10 @@ var SessionConnecting = class extends IdentifiedSession {
   }
   _handleStateExit() {
     super._handleStateExit();
-    clearTimeout(this.connectionTimeout);
-    this.connectionTimeout = void 0;
+    if (this.connectionTimeout) {
+      clearTimeout(this.connectionTimeout);
+      this.connectionTimeout = void 0;
+    }
   }
   _handleClose() {
     this.bestEffortClose();
@@ -546,26 +572,13 @@ var SessionConnecting = class extends IdentifiedSession {
 };
 
 // transport/sessionStateMachine/SessionNoConnection.ts
-var SessionNoConnection = class extends IdentifiedSession {
+var SessionNoConnection = class extends IdentifiedSessionWithGracePeriod {
   state = "NoConnection" /* NoConnection */;
-  listeners;
-  gracePeriodTimeout;
-  constructor(props) {
-    super(props);
-    this.listeners = props.listeners;
-    this.gracePeriodTimeout = setTimeout(() => {
-      this.listeners.onSessionGracePeriodElapsed();
-    }, this.options.sessionDisconnectGraceMs);
-  }
   _handleClose() {
     super._handleClose();
   }
   _handleStateExit() {
     super._handleStateExit();
-    if (this.gracePeriodTimeout) {
-      clearTimeout(this.gracePeriodTimeout);
-      this.gracePeriodTimeout = void 0;
-    }
   }
 };
 
@@ -573,7 +586,7 @@ var SessionNoConnection = class extends IdentifiedSession {
 var import_api = require("@opentelemetry/api");
 
 // package.json
-var version = "0.26.0";
+var version = "0.26.2";
 
 // tracing/index.ts
 function getPropagationContext(ctx) {
@@ -624,7 +637,10 @@ var SessionWaitingForHandshake = class extends CommonSession {
   onHandshakeData = (msg) => {
     const parsedMsg = this.parseMsg(msg);
     if (parsedMsg === null) {
-      this.listeners.onInvalidHandshake("could not parse message");
+      this.listeners.onInvalidHandshake(
+        "could not parse message",
+        "MALFORMED_HANDSHAKE"
+      );
       return;
     }
     this.listeners.onHandshake(parsedMsg);
@@ -651,7 +667,7 @@ var SessionWaitingForHandshake = class extends CommonSession {
 };
 
 // transport/sessionStateMachine/SessionHandshaking.ts
-var SessionHandshaking = class extends IdentifiedSession {
+var SessionHandshaking = class extends IdentifiedSessionWithGracePeriod {
   state = "Handshaking" /* Handshaking */;
   conn;
   listeners;
@@ -670,7 +686,10 @@ var SessionHandshaking = class extends IdentifiedSession {
   onHandshakeData = (msg) => {
     const parsedMsg = this.parseMsg(msg);
     if (parsedMsg === null) {
-      this.listeners.onInvalidHandshake("could not parse message");
+      this.listeners.onInvalidHandshake(
+        "could not parse message",
+        "MALFORMED_HANDSHAKE"
+      );
       return;
     }
     this.listeners.onHandshake(parsedMsg);
@@ -683,7 +702,10 @@ var SessionHandshaking = class extends IdentifiedSession {
     this.conn.removeDataListener(this.onHandshakeData);
     this.conn.removeErrorListener(this.listeners.onConnectionErrored);
     this.conn.removeCloseListener(this.listeners.onConnectionClosed);
-    clearTimeout(this.handshakeTimeout);
+    if (this.handshakeTimeout) {
+      clearTimeout(this.handshakeTimeout);
+      this.handshakeTimeout = void 0;
+    }
   }
   _handleClose() {
     super._handleClose();
@@ -763,8 +785,10 @@ var SessionConnected = class extends IdentifiedSession {
   }
   onMessageData = (msg) => {
     const parsedMsg = this.parseMsg(msg);
-    if (parsedMsg === null)
+    if (parsedMsg === null) {
+      this.listeners.onInvalidMessage("could not parse message");
       return;
+    }
     if (parsedMsg.seq !== this.ack) {
       if (parsedMsg.seq < this.ack) {
         this.log?.debug(
@@ -821,7 +845,7 @@ var SessionConnected = class extends IdentifiedSession {
 };
 
 // transport/sessionStateMachine/SessionBackingOff.ts
-var SessionBackingOff = class extends IdentifiedSession {
+var SessionBackingOff = class extends IdentifiedSessionWithGracePeriod {
   state = "BackingOff" /* BackingOff */;
   listeners;
   backoffTimeout;
@@ -858,6 +882,12 @@ function inheritSharedSession(session) {
     log: session.log
   };
 }
+function inheritSharedSessionWithGrace(session) {
+  return {
+    ...inheritSharedSession(session),
+    graceExpiryTime: session.graceExpiryTime
+  };
+}
 var SessionStateGraph = {
   entrypoints: {
     NoConnection: (to, from, listeners, options, log) => {
@@ -871,6 +901,7 @@ var SessionStateGraph = {
         to,
         seq: 0,
         ack: 0,
+        graceExpiryTime: Date.now() + options.sessionDisconnectGraceMs,
         sendBuffer,
         telemetry,
         options,
@@ -902,7 +933,7 @@ var SessionStateGraph = {
   transition: {
     // happy path transitions
     NoConnectionToBackingOff: (oldSession, backoffMs, listeners) => {
-      const carriedState = inheritSharedSession(oldSession);
+      const carriedState = inheritSharedSessionWithGrace(oldSession);
       oldSession._handleStateExit();
       const session = new SessionBackingOff({
         backoffMs,
@@ -919,7 +950,7 @@ var SessionStateGraph = {
       return session;
     },
     BackingOffToConnecting: (oldSession, connPromise, listeners) => {
-      const carriedState = inheritSharedSession(oldSession);
+      const carriedState = inheritSharedSessionWithGrace(oldSession);
       oldSession._handleStateExit();
       const session = new SessionConnecting({
         connPromise,
@@ -936,7 +967,7 @@ var SessionStateGraph = {
       return session;
     },
     ConnectingToHandshaking: (oldSession, conn, listeners) => {
-      const carriedState = inheritSharedSession(oldSession);
+      const carriedState = inheritSharedSessionWithGrace(oldSession);
       oldSession._handleStateExit();
       const session = new SessionHandshaking({
         conn,
@@ -1013,9 +1044,12 @@ var SessionStateGraph = {
     },
     // disconnect paths
     BackingOffToNoConnection: (oldSession, listeners) => {
-      const carriedState = inheritSharedSession(oldSession);
+      const carriedState = inheritSharedSessionWithGrace(oldSession);
       oldSession._handleStateExit();
-      const session = new SessionNoConnection({ listeners, ...carriedState });
+      const session = new SessionNoConnection({
+        listeners,
+        ...carriedState
+      });
       session.log?.info(
         `session ${session.id} transition from BackingOff to NoConnection`,
         {
@@ -1026,10 +1060,13 @@ var SessionStateGraph = {
       return session;
     },
     ConnectingToNoConnection: (oldSession, listeners) => {
-      const carriedState = inheritSharedSession(oldSession);
+      const carriedState = inheritSharedSessionWithGrace(oldSession);
       oldSession.bestEffortClose();
       oldSession._handleStateExit();
-      const session = new SessionNoConnection({ listeners, ...carriedState });
+      const session = new SessionNoConnection({
+        listeners,
+        ...carriedState
+      });
       session.log?.info(
         `session ${session.id} transition from Connecting to NoConnection`,
         {
@@ -1040,10 +1077,13 @@ var SessionStateGraph = {
       return session;
     },
     HandshakingToNoConnection: (oldSession, listeners) => {
-      const carriedState = inheritSharedSession(oldSession);
+      const carriedState = inheritSharedSessionWithGrace(oldSession);
       oldSession.conn.close();
       oldSession._handleStateExit();
-      const session = new SessionNoConnection({ listeners, ...carriedState });
+      const session = new SessionNoConnection({
+        listeners,
+        ...carriedState
+      });
       session.log?.info(
         `session ${session.id} transition from Handshaking to NoConnection`,
         {
@@ -1055,9 +1095,14 @@ var SessionStateGraph = {
     },
     ConnectedToNoConnection: (oldSession, listeners) => {
       const carriedState = inheritSharedSession(oldSession);
+      const graceExpiryTime = Date.now() + oldSession.options.sessionDisconnectGraceMs;
       oldSession.conn.close();
       oldSession._handleStateExit();
-      const session = new SessionNoConnection({ listeners, ...carriedState });
+      const session = new SessionNoConnection({
+        listeners,
+        graceExpiryTime,
+        ...carriedState
+      });
       session.log?.info(
         `session ${session.id} transition from Connected to NoConnection`,
         {
@@ -1074,24 +1119,42 @@ var ClientSessionStateGraph = {
   entrypoint: SessionStateGraph.entrypoints.NoConnection,
   transition: {
     // happy paths
+    // NoConnection -> BackingOff: attempt to connect
     NoConnectionToBackingOff: transitions.NoConnectionToBackingOff,
+    // BackingOff -> Connecting: backoff period elapsed, start connection
     BackingOffToConnecting: transitions.BackingOffToConnecting,
+    // Connecting -> Handshaking: connection established, start handshake
     ConnectingToHandshaking: transitions.ConnectingToHandshaking,
+    // Handshaking -> Connected: handshake complete, session ready
     HandshakingToConnected: transitions.HandshakingToConnected,
     // disconnect paths
+    // BackingOff -> NoConnection: unused
     BackingOffToNoConnection: transitions.BackingOffToNoConnection,
+    // Connecting -> NoConnection: connection failed or connection timeout
     ConnectingToNoConnection: transitions.ConnectingToNoConnection,
+    // Handshaking -> NoConnection: connection closed or handshake timeout
     HandshakingToNoConnection: transitions.HandshakingToNoConnection,
+    // Connected -> NoConnection: connection closed
     ConnectedToNoConnection: transitions.ConnectedToNoConnection
+    // destroy/close paths
+    // NoConnection -> x: grace period elapsed
+    // BackingOff -> x: grace period elapsed
+    // Connecting -> x: grace period elapsed
+    // Handshaking -> x: grace period elapsed or invalid handshake message or handshake rejection
+    // Connected -> x: grace period elapsed or invalid message
   }
 };
 var ServerSessionStateGraph = {
   entrypoint: SessionStateGraph.entrypoints.WaitingForHandshake,
   transition: {
     // happy paths
+    // WaitingForHandshake -> Connected: handshake complete, session ready
     WaitingForHandshakeToConnected: transitions.WaitingForHandshakeToConnected,
     // disconnect paths
+    // Connected -> NoConnection: connection closed
     ConnectedToNoConnection: transitions.ConnectedToNoConnection
+    // destroy/close paths
+    // WaitingForHandshake -> x: handshake timeout elapsed or invalid handshake message or handshake rejection or connection closed
   }
 };
 
@@ -1160,8 +1223,8 @@ var Transport = class {
   removeEventListener(type, handler) {
     this.eventDispatcher.removeEventListener(type, handler);
   }
-  protocolError(type, message) {
-    this.eventDispatcher.dispatchEvent("protocolError", { type, message });
+  protocolError(message) {
+    this.eventDispatcher.dispatchEvent("protocolError", message);
   }
   /**
    * Default close implementation for transports. You should override this in the downstream
@@ -1357,6 +1420,10 @@ var ClientTransport = class extends Transport {
     this.handshakeExtensions = options;
   }
   tryReconnecting(to) {
+    const oldSession = this.sessions.get(to);
+    if (!this.options.enableTransparentSessionReconnects && oldSession) {
+      this.deleteSession(oldSession);
+    }
     if (this.reconnectOnConnectionDrop && this.getStatus() === "open") {
       this.connect(to);
     }
@@ -1425,13 +1492,17 @@ var ClientTransport = class extends Transport {
         onHandshake: (msg) => {
           this.onHandshakeResponse(handshakingSession, msg);
         },
-        onInvalidHandshake: (reason) => {
+        onInvalidHandshake: (reason, code) => {
           this.log?.error(
             `invalid handshake: ${reason}`,
             handshakingSession.loggingMetadata
           );
           this.deleteSession(session);
-          this.protocolError(ProtocolError.HandshakeFailed, reason);
+          this.protocolError({
+            type: ProtocolError.HandshakeFailed,
+            code,
+            message: reason
+          });
         },
         onHandshakeTimeout: () => {
           this.log?.error(
@@ -1439,6 +1510,9 @@ var ClientTransport = class extends Transport {
             handshakingSession.loggingMetadata
           );
           this.onConnClosed(handshakingSession);
+        },
+        onSessionGracePeriodElapsed: () => {
+          this.onSessionGracePeriodElapsed(handshakingSession);
         }
       }
     );
@@ -1480,7 +1554,11 @@ var ClientTransport = class extends Transport {
         this.tryReconnecting(session.to);
       } else {
         this.deleteSession(session);
-        this.protocolError(ProtocolError.HandshakeFailed, reason);
+        this.protocolError({
+          type: ProtocolError.HandshakeFailed,
+          code: msg.payload.status.code,
+          message: reason
+        });
       }
       return;
     }
@@ -1514,7 +1592,10 @@ var ClientTransport = class extends Transport {
       onMessage: (msg2) => this.handleMsg(msg2),
       onInvalidMessage: (reason) => {
         this.deleteSession(connectedSession);
-        this.protocolError(ProtocolError.MessageOrderingViolated, reason);
+        this.protocolError({
+          type: ProtocolError.MessageOrderingViolated,
+          message: reason
+        });
       }
     });
     this.updateSession(connectedSession);
@@ -1545,7 +1626,10 @@ var ClientTransport = class extends Transport {
       const budgetConsumed = this.retryBudget.getBudgetConsumed();
       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, session.loggingMetadata);
-      this.protocolError(ProtocolError.RetriesExceeded, errMsg);
+      this.protocolError({
+        type: ProtocolError.RetriesExceeded,
+        message: errMsg
+      });
       return;
     }
     const backoffMs = this.retryBudget.getBackoffMs();
@@ -1575,6 +1659,9 @@ var ClientTransport = class extends Transport {
             }
           );
           this.onBackoffFinished(backingOffSession, reconnectPromise);
+        },
+        onSessionGracePeriodElapsed: () => {
+          this.onSessionGracePeriodElapsed(backingOffSession);
         }
       }
     );
@@ -1606,6 +1693,9 @@ var ClientTransport = class extends Transport {
             connectingSession.loggingMetadata
           );
           this.onConnectingFailed(connectingSession);
+        },
+        onSessionGracePeriodElapsed: () => {
+          this.onSessionGracePeriodElapsed(connectingSession);
         }
       }
     );
@@ -1752,13 +1842,17 @@ var ServerTransport = class extends Transport {
           receivedHandshake = true;
           void this.onHandshakeRequest(pendingSession, msg);
         },
-        onInvalidHandshake: (reason) => {
+        onInvalidHandshake: (reason, code) => {
           this.log?.error(
             `invalid handshake: ${reason}`,
             pendingSession.loggingMetadata
           );
           this.deletePendingSession(pendingSession);
-          this.protocolError(ProtocolError.HandshakeFailed, reason);
+          this.protocolError({
+            type: ProtocolError.HandshakeFailed,
+            code,
+            message: reason
+          });
         }
       },
       this.options,
@@ -1783,7 +1877,11 @@ var ServerTransport = class extends Transport {
         }
       })
     );
-    this.protocolError(ProtocolError.HandshakeFailed, reason);
+    this.protocolError({
+      type: ProtocolError.HandshakeFailed,
+      code,
+      message: reason
+    });
     this.deletePendingSession(session);
   }
   async onHandshakeRequest(session, msg) {
@@ -1832,7 +1930,7 @@ var ServerTransport = class extends Transport {
     let connectCase = "new session";
     const clientNextExpectedSeq = msg.payload.expectedSessionState.nextExpectedSeq;
     const clientNextSentSeq = msg.payload.expectedSessionState.nextSentSeq ?? 0;
-    if (oldSession && oldSession.id === msg.payload.sessionId) {
+    if (this.options.enableTransparentSessionReconnects && oldSession && oldSession.id === msg.payload.sessionId) {
       connectCase = "transparent reconnection";
       const ourNextSeq = oldSession.nextSeq();
       const ourAck = oldSession.ack;
@@ -1891,10 +1989,11 @@ var ServerTransport = class extends Transport {
     }
     if (!oldSession && (clientNextSentSeq > 0 || clientNextExpectedSeq > 0)) {
       connectCase = "unknown session";
+      const rejectionMessage = this.options.enableTransparentSessionReconnects ? `client is trying to reconnect to a session the server don't know about: ${msg.payload.sessionId}` : `client is attempting a transparent reconnect to a session but the server does not support it: ${msg.payload.sessionId}`;
       this.rejectHandshakeRequest(
         session,
         msg.from,
-        `client is trying to reconnect to a session the server don't know about: ${msg.payload.sessionId}`,
+        rejectionMessage,
         "SESSION_STATE_MISMATCH",
         {
           ...session.loggingMetadata,
@@ -1945,7 +2044,10 @@ var ServerTransport = class extends Transport {
         },
         onMessage: (msg2) => this.handleMsg(msg2),
         onInvalidMessage: (reason) => {
-          this.protocolError(ProtocolError.MessageOrderingViolated, reason);
+          this.protocolError({
+            type: ProtocolError.MessageOrderingViolated,
+            message: reason
+          });
           this.deleteSession(connectedSession);
         }
       }
@@ -1976,16 +2078,19 @@ var ServerTransport = class extends Transport {
       return false;
     }
     const previousParsedMetadata = existingSession ? this.sessionHandshakeMetadata.get(existingSession.to) : void 0;
-    const parsedMetadata = await this.handshakeExtensions.validate(
+    const parsedMetadataOrFailureCode = await this.handshakeExtensions.validate(
       rawMetadata,
       previousParsedMetadata
     );
-    if (import_value3.Value.Check(HandshakeErrorCustomHandlerFatalResponseCodes, parsedMetadata)) {
+    if (import_value3.Value.Check(
+      HandshakeErrorCustomHandlerFatalResponseCodes,
+      parsedMetadataOrFailureCode
+    )) {
       this.rejectHandshakeRequest(
         handshakingSession,
         from,
         "rejected by handshake handler",
-        parsedMetadata,
+        parsedMetadataOrFailureCode,
         {
           ...handshakingSession.loggingMetadata,
           connectedTo: from,
@@ -1994,7 +2099,7 @@ var ServerTransport = class extends Transport {
       );
       return false;
     }
-    return parsedMetadata;
+    return parsedMetadataOrFailureCode;
   }
 };