@replit/river 0.26.2 → 0.26.4

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-1a86f06d.js';
-export { C as ClientTransport } from '../client-654098be.js';
-export { S as ServerTransport, a as SessionWaitingForHandshake } from '../server-9a6b5a8e.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-6c67339a.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-1a86f06d.js';
-export { C as ClientTransport } from '../client-654098be.js';
-export { S as ServerTransport, a as SessionWaitingForHandshake } from '../server-9a6b5a8e.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-6c67339a.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-IV27BICV.js";
+} from "../chunk-HPOR6FST.js";
 import {
   ServerTransport
-} from "../chunk-YQABPD3C.js";
+} from "../chunk-DS5LF6PS.js";
 import {
   Connection,
   ProtocolError,
   Transport
-} from "../chunk-M5X4JTU3.js";
+} from "../chunk-RSCUADHY.js";
 import "../chunk-TAH2GVTJ.js";
 import {
   SessionState
-} from "../chunk-NC54BC47.js";
+} from "../chunk-42SXIIHP.js";
 import {
   OpaqueTransportMessageSchema,
   TransportMessageSchema
-} from "../chunk-M75K5TJS.js";
+} from "../chunk-65EMTMCV.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.2";
+var version = "0.26.4";
 
 // tracing/index.ts
 function createSessionTelemetryInfo(sessionId, to, from, propagationCtx) {
@@ -594,6 +594,7 @@ var StateMachineState = class {
         }
         if (prop === "_handleClose") {
           return () => {
+            target._isConsumed = true;
             target._handleStateExit();
             target._handleClose();
           };
@@ -674,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 = {
@@ -745,9 +749,6 @@ var SessionConnecting = class extends IdentifiedSessionWithGracePeriod {
     super(props);
     this.connPromise = props.connPromise;
     this.listeners = props.listeners;
-    this.connectionTimeout = setTimeout(() => {
-      this.listeners.onConnectionTimeout();
-    }, this.options.connectionTimeoutMs);
     this.connPromise.then(
       (conn) => {
         if (this._isConsumed)
@@ -760,11 +761,25 @@ var SessionConnecting = class extends IdentifiedSessionWithGracePeriod {
         this.listeners.onConnectionFailed(err);
       }
     );
+    this.connectionTimeout = setTimeout(() => {
+      this.listeners.onConnectionTimeout();
+    }, this.options.connectionTimeoutMs);
   }
   // 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(() => {
+    const logger = this.log;
+    const metadata = this.loggingMetadata;
+    this.connPromise.then((conn) => {
+      conn.close();
+      logger?.info(
+        "connection eventually resolved but session has transitioned, closed connection",
+        {
+          ...metadata,
+          ...conn.loggingMetadata
+        }
+      );
+    }).catch(() => {
     });
   }
   _handleStateExit() {
@@ -808,6 +823,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) {
@@ -819,12 +841,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));
   }
@@ -857,6 +873,12 @@ var SessionHandshaking = class extends IdentifiedSessionWithGracePeriod {
     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) {
@@ -944,6 +966,12 @@ var SessionConnected = class extends IdentifiedSession {
       this.heartbeatMisses++;
     }, this.options.heartbeatIntervalMs);
   }
+  get loggingMetadata() {
+    return {
+      ...super.loggingMetadata,
+      ...this.conn.loggingMetadata
+    };
+  }
   startActiveHeartbeat() {
     this.isActivelyHeartbeating = true;
   }