@replit/river 0.26.1 → 0.26.3

package/dist/transport/index.d.cts

@@ -1,8 +1,9 @@
-export { b as ClientTransportOptions, C as Connection, j as EventHandler, E as EventMap, i as EventTypes, k as ProtocolError, l as ProtocolErrorType, c as ServerTransportOptions, S as Session, h as SessionConnected, f as SessionConnecting, g as SessionHandshaking, e as SessionNoConnection, d as SessionState, T as Transport, P as TransportOptions, a as TransportStatus } from '../handshake-8752f79e.js';
-export { C as ClientTransport } from '../client-0f636b3a.js';
-export { S as ServerTransport, a as SessionWaitingForHandshake } from '../server-e304daec.js';
-export { b as OpaqueTransportMessage, O as OpaqueTransportMessageSchema, c as TransportClientId, a as TransportMessage, T as TransportMessageSchema, d as isStreamClose, i as isStreamOpen } from '../message-57296605.js';
+export { b as ClientTransportOptions, C as Connection, j as EventHandler, E as EventMap, i as EventTypes, k as ProtocolError, l as ProtocolErrorType, c as ServerTransportOptions, S as Session, h as SessionConnected, f as SessionConnecting, g as SessionHandshaking, e as SessionNoConnection, d as SessionState, T as Transport, P as TransportOptions, a as TransportStatus } from '../handshake-154a0bb2.js';
+export { C as ClientTransport } from '../client-1894a9c9.js';
+export { S as ServerTransport, a as SessionWaitingForHandshake } from '../server-1f5eb427.js';
+export { b as OpaqueTransportMessage, O as OpaqueTransportMessageSchema, c as TransportClientId, a as TransportMessage, T as TransportMessageSchema, d as isStreamClose, i as isStreamOpen } from '../message-ff78a233.js';
 import '@sinclair/typebox';
+import '@sinclair/typebox/errors';
 import '../types-3e5768ec.js';
 import '@sinclair/typebox/value';
 import '@opentelemetry/api';

package/dist/transport/index.d.ts

@@ -1,8 +1,9 @@
-export { b as ClientTransportOptions, C as Connection, j as EventHandler, E as EventMap, i as EventTypes, k as ProtocolError, l as ProtocolErrorType, c as ServerTransportOptions, S as Session, h as SessionConnected, f as SessionConnecting, g as SessionHandshaking, e as SessionNoConnection, d as SessionState, T as Transport, P as TransportOptions, a as TransportStatus } from '../handshake-8752f79e.js';
-export { C as ClientTransport } from '../client-0f636b3a.js';
-export { S as ServerTransport, a as SessionWaitingForHandshake } from '../server-e304daec.js';
-export { b as OpaqueTransportMessage, O as OpaqueTransportMessageSchema, c as TransportClientId, a as TransportMessage, T as TransportMessageSchema, d as isStreamClose, i as isStreamOpen } from '../message-57296605.js';
+export { b as ClientTransportOptions, C as Connection, j as EventHandler, E as EventMap, i as EventTypes, k as ProtocolError, l as ProtocolErrorType, c as ServerTransportOptions, S as Session, h as SessionConnected, f as SessionConnecting, g as SessionHandshaking, e as SessionNoConnection, d as SessionState, T as Transport, P as TransportOptions, a as TransportStatus } from '../handshake-154a0bb2.js';
+export { C as ClientTransport } from '../client-1894a9c9.js';
+export { S as ServerTransport, a as SessionWaitingForHandshake } from '../server-1f5eb427.js';
+export { b as OpaqueTransportMessage, O as OpaqueTransportMessageSchema, c as TransportClientId, a as TransportMessage, T as TransportMessageSchema, d as isStreamClose, i as isStreamOpen } from '../message-ff78a233.js';
 import '@sinclair/typebox';
+import '@sinclair/typebox/errors';
 import '../types-3e5768ec.js';
 import '@sinclair/typebox/value';
 import '@opentelemetry/api';

package/dist/transport/index.js

@@ -1,22 +1,22 @@
 import {
   ClientTransport
-} from "../chunk-XRI2BXMM.js";
+} from "../chunk-BB2E5L4U.js";
 import {
   ServerTransport
-} from "../chunk-IVNX5H6C.js";
+} from "../chunk-X35QRIA5.js";
 import {
   Connection,
   ProtocolError,
   Transport
-} from "../chunk-6UVTCZ6K.js";
+} from "../chunk-JI6FFDY5.js";
 import "../chunk-TAH2GVTJ.js";
 import {
   SessionState
-} from "../chunk-M43R4RPL.js";
+} from "../chunk-OCL2FUTQ.js";
 import {
   OpaqueTransportMessageSchema,
   TransportMessageSchema
-} from "../chunk-UQOD22AN.js";
+} from "../chunk-MZELCWJK.js";
 import "../chunk-4PVU7J25.js";
 export {
   ClientTransport,

package/dist/util/testHelpers.cjs

@@ -460,7 +460,7 @@ function Err(error) {
 var import_api = require("@opentelemetry/api");
 
 // package.json
-var version = "0.26.1";
+var version = "0.26.3";
 
 // tracing/index.ts
 function createSessionTelemetryInfo(sessionId, to, from, propagationCtx) {
@@ -549,6 +549,7 @@ var defaultTransportOptions = {
   sessionDisconnectGraceMs: 5e3,
   connectionTimeoutMs: 2e3,
   handshakeTimeoutMs: 1e3,
+  enableTransparentSessionReconnects: true,
   codec: NaiveJsonCodec
 };
 var defaultConnectionRetryOptions = {
@@ -593,6 +594,7 @@ var StateMachineState = class {
         }
         if (prop === "_handleClose") {
           return () => {
+            target._isConsumed = true;
             target._handleStateExit();
             target._handleClose();
           };
@@ -673,15 +675,18 @@ var IdentifiedSession = class extends CommonSession {
   }
   get loggingMetadata() {
     const spanContext = this.telemetry.span.spanContext();
-    return {
+    const metadata = {
       clientId: this.from,
       connectedTo: this.to,
-      sessionId: this.id,
-      telemetry: {
+      sessionId: this.id
+    };
+    if (this.telemetry.span.isRecording()) {
+      metadata.telemetry = {
         traceId: spanContext.traceId,
         spanId: spanContext.spanId
-      }
-    };
+      };
+    }
+    return metadata;
   }
   constructMsg(partialMsg) {
     const msg = {
@@ -710,9 +715,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;
@@ -740,13 +768,24 @@ var SessionConnecting = class extends IdentifiedSession {
   // close a pending connection if it resolves, ignore errors if the promise
   // ends up rejected anyways
   bestEffortClose() {
-    void this.connPromise.then((conn) => conn.close()).catch(() => {
+    void this.connPromise.then((conn) => {
+      conn.close();
+      this.log?.info(
+        "connection eventually resolved but session has transitioned, closed connection",
+        {
+          ...this.loggingMetadata,
+          ...conn.loggingMetadata
+        }
+      );
+    }).catch(() => {
     });
   }
   _handleStateExit() {
     super._handleStateExit();
-    clearTimeout(this.connectionTimeout);
-    this.connectionTimeout = void 0;
+    if (this.connectionTimeout) {
+      clearTimeout(this.connectionTimeout);
+      this.connectionTimeout = void 0;
+    }
   }
   _handleClose() {
     this.bestEffortClose();
@@ -755,26 +794,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;
-    }
   }
 };
 
@@ -795,6 +821,13 @@ var SessionWaitingForHandshake = class extends CommonSession {
     this.conn.addErrorListener(this.listeners.onConnectionErrored);
     this.conn.addCloseListener(this.listeners.onConnectionClosed);
   }
+  get loggingMetadata() {
+    return {
+      clientId: this.from,
+      connId: this.conn.id,
+      ...this.conn.loggingMetadata
+    };
+  }
   onHandshakeData = (msg) => {
     const parsedMsg = this.parseMsg(msg);
     if (parsedMsg === null) {
@@ -806,12 +839,6 @@ var SessionWaitingForHandshake = class extends CommonSession {
     }
     this.listeners.onHandshake(parsedMsg);
   };
-  get loggingMetadata() {
-    return {
-      clientId: this.from,
-      connId: this.conn.id
-    };
-  }
   sendHandshake(msg) {
     return this.conn.send(this.options.codec.toBuffer(msg));
   }
@@ -828,7 +855,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;
@@ -844,6 +871,12 @@ var SessionHandshaking = class extends IdentifiedSession {
     this.conn.addErrorListener(this.listeners.onConnectionErrored);
     this.conn.addCloseListener(this.listeners.onConnectionClosed);
   }
+  get loggingMetadata() {
+    return {
+      ...super.loggingMetadata,
+      ...this.conn.loggingMetadata
+    };
+  }
   onHandshakeData = (msg) => {
     const parsedMsg = this.parseMsg(msg);
     if (parsedMsg === null) {
@@ -863,7 +896,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();
@@ -928,6 +964,12 @@ var SessionConnected = class extends IdentifiedSession {
       this.heartbeatMisses++;
     }, this.options.heartbeatIntervalMs);
   }
+  get loggingMetadata() {
+    return {
+      ...super.loggingMetadata,
+      ...this.conn.loggingMetadata
+    };
+  }
   startActiveHeartbeat() {
     this.isActivelyHeartbeating = true;
   }
@@ -943,8 +985,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(
@@ -1001,7 +1045,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;
@@ -1038,6 +1082,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) => {
@@ -1051,6 +1101,7 @@ var SessionStateGraph = {
         to,
         seq: 0,
         ack: 0,
+        graceExpiryTime: Date.now() + options.sessionDisconnectGraceMs,
         sendBuffer,
         telemetry,
         options,
@@ -1082,7 +1133,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,
@@ -1099,7 +1150,7 @@ var SessionStateGraph = {
       return session;
     },
     BackingOffToConnecting: (oldSession, connPromise, listeners) => {
-      const carriedState = inheritSharedSession(oldSession);
+      const carriedState = inheritSharedSessionWithGrace(oldSession);
       oldSession._handleStateExit();
       const session = new SessionConnecting({
         connPromise,
@@ -1116,7 +1167,7 @@ var SessionStateGraph = {
       return session;
     },
     ConnectingToHandshaking: (oldSession, conn, listeners) => {
-      const carriedState = inheritSharedSession(oldSession);
+      const carriedState = inheritSharedSessionWithGrace(oldSession);
       oldSession._handleStateExit();
       const session = new SessionHandshaking({
         conn,
@@ -1193,9 +1244,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`,
         {
@@ -1206,10 +1260,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`,
         {
@@ -1220,10 +1277,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`,
         {
@@ -1235,9 +1295,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`,
         {
@@ -1254,24 +1319,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
   }
 };