@replit/river 0.26.2 → 0.26.4

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

@@ -1,11 +1,12 @@
-import { C as ClientTransport } from '../../../client-654098be.js';
-import { c as TransportClientId } from '../../../message-57296605.js';
-import { b as ProvidedClientTransportOptions } from '../../../handshake-1a86f06d.js';
-import { W as WebSocketConnection } from '../../../connection-bc2454dc.js';
+import { C as ClientTransport } from '../../../client-6c67339a.js';
+import { c as TransportClientId } from '../../../message-ff78a233.js';
+import { b as ProvidedClientTransportOptions } from '../../../handshake-154a0bb2.js';
+import { W as WebSocketConnection } from '../../../connection-03ffb583.js';
 import { W as WsLike } from '../../../wslike-e0b32dd5.js';
 import '@sinclair/typebox/value';
 import '@sinclair/typebox';
 import '@opentelemetry/api';
+import '@sinclair/typebox/errors';
 import '../../../types-3e5768ec.js';
 
 /**

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

@@ -1,11 +1,12 @@
-import { C as ClientTransport } from '../../../client-654098be.js';
-import { c as TransportClientId } from '../../../message-57296605.js';
-import { b as ProvidedClientTransportOptions } from '../../../handshake-1a86f06d.js';
-import { W as WebSocketConnection } from '../../../connection-bc2454dc.js';
+import { C as ClientTransport } from '../../../client-6c67339a.js';
+import { c as TransportClientId } from '../../../message-ff78a233.js';
+import { b as ProvidedClientTransportOptions } from '../../../handshake-154a0bb2.js';
+import { W as WebSocketConnection } from '../../../connection-03ffb583.js';
 import { W as WsLike } from '../../../wslike-e0b32dd5.js';
 import '@sinclair/typebox/value';
 import '@sinclair/typebox';
 import '@opentelemetry/api';
+import '@sinclair/typebox/errors';
 import '../../../types-3e5768ec.js';
 
 /**

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

@@ -1,13 +1,13 @@
 import {
   ClientTransport
-} from "../../../chunk-IV27BICV.js";
+} from "../../../chunk-HPOR6FST.js";
 import {
   WebSocketConnection
-} from "../../../chunk-AWCUCZY4.js";
-import "../../../chunk-M5X4JTU3.js";
+} from "../../../chunk-CYD6GTCU.js";
+import "../../../chunk-RSCUADHY.js";
 import "../../../chunk-TAH2GVTJ.js";
-import "../../../chunk-NC54BC47.js";
-import "../../../chunk-M75K5TJS.js";
+import "../../../chunk-42SXIIHP.js";
+import "../../../chunk-65EMTMCV.js";
 import "../../../chunk-4PVU7J25.js";
 
 // transport/impls/ws/client.ts
@@ -53,9 +53,10 @@ var WebSocketClientTransport = class extends ClientTransport {
       };
     });
     const conn = new WebSocketConnection(ws);
-    this.log?.info(`raw websocket to ${to} ok, starting handshake`, {
+    this.log?.info(`raw websocket to ${to} ok`, {
       clientId: this.clientId,
-      connectedTo: to
+      connectedTo: to,
+      ...conn.loggingMetadata
     });
     return conn;
   }

package/dist/transport/impls/ws/client.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../transport/impls/ws/client.ts"],"sourcesContent":["import { ClientTransport } from '../../client';\nimport { TransportClientId } from '../../message';\nimport { ProvidedClientTransportOptions } from '../../options';\nimport { WebSocketConnection } from './connection';\nimport { WsLike } from './wslike';\n\n/**\n * A transport implementation that uses a WebSocket connection with automatic reconnection.\n * @class\n * @extends Transport\n */\nexport class WebSocketClientTransport extends ClientTransport<WebSocketConnection> {\n  /**\n   * A function that returns a Promise that resolves to a websocket URL.\n   */\n  wsGetter: (to: TransportClientId) => Promise<WsLike> | WsLike;\n\n  /**\n   * Creates a new WebSocketClientTransport instance.\n   * @param wsGetter A function that returns a Promise that resolves to a WebSocket instance.\n   * @param clientId The ID of the client using the transport. This should be unique per session.\n   * @param serverId The ID of the server this transport is connecting to.\n   * @param providedOptions An optional object containing configuration options for the transport.\n   */\n  constructor(\n    wsGetter: (to: TransportClientId) => Promise<WsLike> | WsLike,\n    clientId: TransportClientId,\n    providedOptions?: ProvidedClientTransportOptions,\n  ) {\n    super(clientId, providedOptions);\n    this.wsGetter = wsGetter;\n  }\n\n  async createNewOutgoingConnection(to: string) {\n    this.log?.info(`establishing a new websocket to ${to}`, {\n      clientId: this.clientId,\n      connectedTo: to,\n    });\n\n    const ws = await this.wsGetter(to);\n\n    await new Promise<void>((resolve, reject) => {\n      if (ws.readyState === ws.OPEN) {\n        resolve();\n        return;\n      }\n\n      if (ws.readyState === ws.CLOSING || ws.readyState === ws.CLOSED) {\n        reject(new Error('ws is closing or closed'));\n        return;\n      }\n\n      ws.onopen = () => {\n        resolve();\n      };\n\n      ws.onclose = (evt) => {\n        reject(new Error(evt.reason));\n      };\n\n      ws.onerror = (err) => {\n        reject(new Error(err.message));\n      };\n    });\n\n    const conn = new WebSocketConnection(ws);\n    this.log?.info(`raw websocket to ${to} ok, starting handshake`, {\n      clientId: this.clientId,\n      connectedTo: to,\n    });\n\n    return conn;\n  }\n}\n"],"mappings":";;;;;;;;;;;;;AAWO,IAAM,2BAAN,cAAuC,gBAAqC;AAAA;AAAA;AAAA;AAAA,EAIjF;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,EASA,YACE,UACA,UACA,iBACA;AACA,UAAM,UAAU,eAAe;AAC/B,SAAK,WAAW;AAAA,EAClB;AAAA,EAEA,MAAM,4BAA4B,IAAY;AAC5C,SAAK,KAAK,KAAK,mCAAmC,EAAE,IAAI;AAAA,MACtD,UAAU,KAAK;AAAA,MACf,aAAa;AAAA,IACf,CAAC;AAED,UAAM,KAAK,MAAM,KAAK,SAAS,EAAE;AAEjC,UAAM,IAAI,QAAc,CAAC,SAAS,WAAW;AAC3C,UAAI,GAAG,eAAe,GAAG,MAAM;AAC7B,gBAAQ;AACR;AAAA,MACF;AAEA,UAAI,GAAG,eAAe,GAAG,WAAW,GAAG,eAAe,GAAG,QAAQ;AAC/D,eAAO,IAAI,MAAM,yBAAyB,CAAC;AAC3C;AAAA,MACF;AAEA,SAAG,SAAS,MAAM;AAChB,gBAAQ;AAAA,MACV;AAEA,SAAG,UAAU,CAAC,QAAQ;AACpB,eAAO,IAAI,MAAM,IAAI,MAAM,CAAC;AAAA,MAC9B;AAEA,SAAG,UAAU,CAAC,QAAQ;AACpB,eAAO,IAAI,MAAM,IAAI,OAAO,CAAC;AAAA,MAC/B;AAAA,IACF,CAAC;AAED,UAAM,OAAO,IAAI,oBAAoB,EAAE;AACvC,SAAK,KAAK,KAAK,oBAAoB,EAAE,2BAA2B;AAAA,MAC9D,UAAU,KAAK;AAAA,MACf,aAAa;AAAA,IACf,CAAC;AAED,WAAO;AAAA,EACT;AACF;","names":[]}
+{"version":3,"sources":["../../../../transport/impls/ws/client.ts"],"sourcesContent":["import { ClientTransport } from '../../client';\nimport { TransportClientId } from '../../message';\nimport { ProvidedClientTransportOptions } from '../../options';\nimport { WebSocketConnection } from './connection';\nimport { WsLike } from './wslike';\n\n/**\n * A transport implementation that uses a WebSocket connection with automatic reconnection.\n * @class\n * @extends Transport\n */\nexport class WebSocketClientTransport extends ClientTransport<WebSocketConnection> {\n  /**\n   * A function that returns a Promise that resolves to a websocket URL.\n   */\n  wsGetter: (to: TransportClientId) => Promise<WsLike> | WsLike;\n\n  /**\n   * Creates a new WebSocketClientTransport instance.\n   * @param wsGetter A function that returns a Promise that resolves to a WebSocket instance.\n   * @param clientId The ID of the client using the transport. This should be unique per session.\n   * @param serverId The ID of the server this transport is connecting to.\n   * @param providedOptions An optional object containing configuration options for the transport.\n   */\n  constructor(\n    wsGetter: (to: TransportClientId) => Promise<WsLike> | WsLike,\n    clientId: TransportClientId,\n    providedOptions?: ProvidedClientTransportOptions,\n  ) {\n    super(clientId, providedOptions);\n    this.wsGetter = wsGetter;\n  }\n\n  async createNewOutgoingConnection(to: string) {\n    this.log?.info(`establishing a new websocket to ${to}`, {\n      clientId: this.clientId,\n      connectedTo: to,\n    });\n\n    const ws = await this.wsGetter(to);\n\n    await new Promise<void>((resolve, reject) => {\n      if (ws.readyState === ws.OPEN) {\n        resolve();\n        return;\n      }\n\n      if (ws.readyState === ws.CLOSING || ws.readyState === ws.CLOSED) {\n        reject(new Error('ws is closing or closed'));\n        return;\n      }\n\n      ws.onopen = () => {\n        resolve();\n      };\n\n      ws.onclose = (evt) => {\n        reject(new Error(evt.reason));\n      };\n\n      ws.onerror = (err) => {\n        reject(new Error(err.message));\n      };\n    });\n\n    const conn = new WebSocketConnection(ws);\n    this.log?.info(`raw websocket to ${to} ok`, {\n      clientId: this.clientId,\n      connectedTo: to,\n      ...conn.loggingMetadata,\n    });\n\n    return conn;\n  }\n}\n"],"mappings":";;;;;;;;;;;;;AAWO,IAAM,2BAAN,cAAuC,gBAAqC;AAAA;AAAA;AAAA;AAAA,EAIjF;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,EASA,YACE,UACA,UACA,iBACA;AACA,UAAM,UAAU,eAAe;AAC/B,SAAK,WAAW;AAAA,EAClB;AAAA,EAEA,MAAM,4BAA4B,IAAY;AAC5C,SAAK,KAAK,KAAK,mCAAmC,EAAE,IAAI;AAAA,MACtD,UAAU,KAAK;AAAA,MACf,aAAa;AAAA,IACf,CAAC;AAED,UAAM,KAAK,MAAM,KAAK,SAAS,EAAE;AAEjC,UAAM,IAAI,QAAc,CAAC,SAAS,WAAW;AAC3C,UAAI,GAAG,eAAe,GAAG,MAAM;AAC7B,gBAAQ;AACR;AAAA,MACF;AAEA,UAAI,GAAG,eAAe,GAAG,WAAW,GAAG,eAAe,GAAG,QAAQ;AAC/D,eAAO,IAAI,MAAM,yBAAyB,CAAC;AAC3C;AAAA,MACF;AAEA,SAAG,SAAS,MAAM;AAChB,gBAAQ;AAAA,MACV;AAEA,SAAG,UAAU,CAAC,QAAQ;AACpB,eAAO,IAAI,MAAM,IAAI,MAAM,CAAC;AAAA,MAC9B;AAEA,SAAG,UAAU,CAAC,QAAQ;AACpB,eAAO,IAAI,MAAM,IAAI,OAAO,CAAC;AAAA,MAC/B;AAAA,IACF,CAAC;AAED,UAAM,OAAO,IAAI,oBAAoB,EAAE;AACvC,SAAK,KAAK,KAAK,oBAAoB,EAAE,OAAO;AAAA,MAC1C,UAAU,KAAK;AAAA,MACf,aAAa;AAAA,MACb,GAAG,KAAK;AAAA,IACV,CAAC;AAED,WAAO;AAAA,EACT;AACF;","names":[]}

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

@@ -457,6 +457,7 @@ var StateMachineState = class {
         }
         if (prop === "_handleClose") {
           return () => {
+            target._isConsumed = true;
             target._handleStateExit();
             target._handleClose();
           };
@@ -537,15 +538,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 = {
@@ -608,9 +612,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)
@@ -623,11 +624,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() {
@@ -658,7 +673,7 @@ var SessionNoConnection = class extends IdentifiedSessionWithGracePeriod {
 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) {
@@ -697,6 +712,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) {
@@ -708,12 +730,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));
   }
@@ -746,6 +762,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) {
@@ -833,6 +855,12 @@ var SessionConnected = class extends IdentifiedSession {
       this.heartbeatMisses++;
     }, this.options.heartbeatIntervalMs);
   }
+  get loggingMetadata() {
+    return {
+      ...super.loggingMetadata,
+      ...this.conn.loggingMetadata
+    };
+  }
   startActiveHeartbeat() {
     this.isActivelyHeartbeating = true;
   }
@@ -1334,8 +1362,9 @@ var Transport = class {
       status: "disconnect",
       session
     });
+    const to = session.to;
     session.close();
-    this.sessions.delete(session.to);
+    this.sessions.delete(to);
   }
   // common listeners
   onSessionGracePeriodElapsed(session) {
@@ -1568,14 +1597,53 @@ var ServerTransport = class extends Transport {
       return;
     }
     let oldSession = this.sessions.get(msg.from);
-    const parsedMetadata = await this.validateHandshakeMetadata(
-      session,
-      oldSession,
-      msg.payload.metadata,
-      msg.from
-    );
-    if (parsedMetadata === false) {
-      return;
+    let parsedMetadata = {};
+    if (this.handshakeExtensions) {
+      if (!import_value2.Value.Check(this.handshakeExtensions.schema, msg.payload.metadata)) {
+        this.rejectHandshakeRequest(
+          session,
+          msg.from,
+          "received malformed handshake metadata",
+          "MALFORMED_HANDSHAKE_META",
+          {
+            ...session.loggingMetadata,
+            connectedTo: msg.from,
+            validationErrors: [
+              ...import_value2.Value.Errors(
+                this.handshakeExtensions.schema,
+                msg.payload.metadata
+              )
+            ]
+          }
+        );
+        return;
+      }
+      const previousParsedMetadata = oldSession ? this.sessionHandshakeMetadata.get(oldSession.to) : void 0;
+      const parsedMetadataOrFailureCode = await this.handshakeExtensions.validate(
+        msg.payload.metadata,
+        previousParsedMetadata
+      );
+      if (session._isConsumed) {
+        return;
+      }
+      if (import_value2.Value.Check(
+        HandshakeErrorCustomHandlerFatalResponseCodes,
+        parsedMetadataOrFailureCode
+      )) {
+        this.rejectHandshakeRequest(
+          session,
+          msg.from,
+          "rejected by handshake handler",
+          parsedMetadataOrFailureCode,
+          {
+            ...session.loggingMetadata,
+            connectedTo: msg.from,
+            clientId: this.clientId
+          }
+        );
+        return;
+      }
+      parsedMetadata = parsedMetadataOrFailureCode;
     }
     let connectCase = "new session";
     const clientNextExpectedSeq = msg.payload.expectedSessionState.nextExpectedSeq;
@@ -1707,50 +1775,6 @@ var ServerTransport = class extends Transport {
     this.pendingSessions.delete(session);
     connectedSession.startActiveHeartbeat();
   }
-  async validateHandshakeMetadata(handshakingSession, existingSession, rawMetadata, from) {
-    if (!this.handshakeExtensions) {
-      return {};
-    }
-    if (!import_value2.Value.Check(this.handshakeExtensions.schema, rawMetadata)) {
-      this.rejectHandshakeRequest(
-        handshakingSession,
-        from,
-        "received malformed handshake metadata",
-        "MALFORMED_HANDSHAKE_META",
-        {
-          ...handshakingSession.loggingMetadata,
-          connectedTo: from,
-          validationErrors: [
-            ...import_value2.Value.Errors(this.handshakeExtensions.schema, rawMetadata)
-          ]
-        }
-      );
-      return false;
-    }
-    const previousParsedMetadata = existingSession ? this.sessionHandshakeMetadata.get(existingSession.to) : void 0;
-    const parsedMetadataOrFailureCode = await this.handshakeExtensions.validate(
-      rawMetadata,
-      previousParsedMetadata
-    );
-    if (import_value2.Value.Check(
-      HandshakeErrorCustomHandlerFatalResponseCodes,
-      parsedMetadataOrFailureCode
-    )) {
-      this.rejectHandshakeRequest(
-        handshakingSession,
-        from,
-        "rejected by handshake handler",
-        parsedMetadataOrFailureCode,
-        {
-          ...handshakingSession.loggingMetadata,
-          connectedTo: from,
-          clientId: this.clientId
-        }
-      );
-      return false;
-    }
-    return parsedMetadataOrFailureCode;
-  }
 };
 
 // transport/impls/ws/server.ts