@replit/river 0.26.2 → 0.26.4

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

@@ -1,12 +1,13 @@
-import { c as TransportClientId } from '../../../message-57296605.js';
+import { c as TransportClientId } from '../../../message-ff78a233.js';
 import { WebSocketServer } from 'ws';
-import { W as WebSocketConnection } from '../../../connection-bc2454dc.js';
+import { W as WebSocketConnection } from '../../../connection-03ffb583.js';
 import { W as WsLike } from '../../../wslike-e0b32dd5.js';
-import { S as ServerTransport } from '../../../server-9a6b5a8e.js';
-import { c as ProvidedServerTransportOptions } from '../../../handshake-1a86f06d.js';
+import { S as ServerTransport } from '../../../server-1f5eb427.js';
+import { c as ProvidedServerTransportOptions } from '../../../handshake-154a0bb2.js';
 import '@sinclair/typebox/value';
 import '@sinclair/typebox';
 import '@opentelemetry/api';
+import '@sinclair/typebox/errors';
 import '../../../types-3e5768ec.js';
 
 declare class WebSocketServerTransport extends ServerTransport<WebSocketConnection> {

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

@@ -1,12 +1,13 @@
-import { c as TransportClientId } from '../../../message-57296605.js';
+import { c as TransportClientId } from '../../../message-ff78a233.js';
 import { WebSocketServer } from 'ws';
-import { W as WebSocketConnection } from '../../../connection-bc2454dc.js';
+import { W as WebSocketConnection } from '../../../connection-03ffb583.js';
 import { W as WsLike } from '../../../wslike-e0b32dd5.js';
-import { S as ServerTransport } from '../../../server-9a6b5a8e.js';
-import { c as ProvidedServerTransportOptions } from '../../../handshake-1a86f06d.js';
+import { S as ServerTransport } from '../../../server-1f5eb427.js';
+import { c as ProvidedServerTransportOptions } from '../../../handshake-154a0bb2.js';
 import '@sinclair/typebox/value';
 import '@sinclair/typebox';
 import '@opentelemetry/api';
+import '@sinclair/typebox/errors';
 import '../../../types-3e5768ec.js';
 
 declare class WebSocketServerTransport extends ServerTransport<WebSocketConnection> {

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

@@ -1,13 +1,13 @@
 import {
   ServerTransport
-} from "../../../chunk-YQABPD3C.js";
+} from "../../../chunk-DS5LF6PS.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/server.ts

package/dist/transport/index.cjs

@@ -385,6 +385,7 @@ var StateMachineState = class {
         }
         if (prop === "_handleClose") {
           return () => {
+            target._isConsumed = true;
             target._handleStateExit();
             target._handleClose();
           };
@@ -465,15 +466,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 = {
@@ -536,9 +540,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)
@@ -551,11 +552,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() {
@@ -586,7 +601,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 getPropagationContext(ctx) {
@@ -634,6 +649,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) {
@@ -645,12 +667,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));
   }
@@ -683,6 +699,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) {
@@ -770,6 +792,12 @@ var SessionConnected = class extends IdentifiedSession {
       this.heartbeatMisses++;
     }, this.options.heartbeatIntervalMs);
   }
+  get loggingMetadata() {
+    return {
+      ...super.loggingMetadata,
+      ...this.conn.loggingMetadata
+    };
+  }
   startActiveHeartbeat() {
     this.isActivelyHeartbeating = true;
   }
@@ -1271,8 +1299,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) {
@@ -1546,14 +1575,14 @@ var ClientTransport = class extends Transport {
         msg.payload.status.code
       ) : false;
       const reason = `handshake failed: ${msg.payload.status.reason}`;
+      const to = session.to;
       this.rejectHandshakeResponse(session, reason, {
         ...session.loggingMetadata,
         transportMessage: msg
       });
       if (retriable) {
-        this.tryReconnecting(session.to);
+        this.tryReconnecting(to);
       } else {
-        this.deleteSession(session);
         this.protocolError({
           type: ProtocolError.HandshakeFailed,
           code: msg.payload.status.code,
@@ -1606,6 +1635,12 @@ var ClientTransport = class extends Transport {
    * @param to The client ID of the node to connect to.
    */
   connect(to) {
+    if (this.getStatus() !== "open") {
+      this.log?.info(
+        `transport state is no longer open, cancelling attempt to connect to ${to}`
+      );
+      return;
+    }
     let session = this.sessions.get(to);
     session ??= this.createUnconnectedSession(to);
     if (session.state !== "NoConnection" /* NoConnection */) {
@@ -1615,13 +1650,6 @@ var ClientTransport = class extends Transport {
       );
       return;
     }
-    if (this.getStatus() !== "open") {
-      this.log?.info(
-        `transport state is no longer open, cancelling attempt to connect to ${to}`,
-        session.loggingMetadata
-      );
-      return;
-    }
     if (!this.retryBudget.hasBudget()) {
       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)`;
@@ -1643,22 +1671,7 @@ var ClientTransport = class extends Transport {
       backoffMs,
       {
         onBackoffFinished: () => {
-          const reconnectPromise = tracing_default.startActiveSpan(
-            "connect",
-            async (span) => {
-              try {
-                return await this.createNewOutgoingConnection(to);
-              } catch (err) {
-                const errStr = coerceErrorString(err);
-                span.recordException(errStr);
-                span.setStatus({ code: import_api3.SpanStatusCode.ERROR });
-                throw err;
-              } finally {
-                span.end();
-              }
-            }
-          );
-          this.onBackoffFinished(backingOffSession, reconnectPromise);
+          this.onBackoffFinished(backingOffSession);
         },
         onSessionGracePeriodElapsed: () => {
           this.onSessionGracePeriodElapsed(backingOffSession);
@@ -1667,7 +1680,19 @@ var ClientTransport = class extends Transport {
     );
     this.updateSession(backingOffSession);
   }
-  onBackoffFinished(session, connPromise) {
+  onBackoffFinished(session) {
+    const connPromise = tracing_default.startActiveSpan("connect", async (span) => {
+      try {
+        return await this.createNewOutgoingConnection(session.to);
+      } catch (err) {
+        const errStr = coerceErrorString(err);
+        span.recordException(errStr);
+        span.setStatus({ code: import_api3.SpanStatusCode.ERROR });
+        throw err;
+      } finally {
+        span.end();
+      }
+    });
     const connectingSession = ClientSessionStateGraph.transition.BackingOffToConnecting(
       session,
       connPromise,
@@ -1675,7 +1700,10 @@ var ClientTransport = class extends Transport {
         onConnectionEstablished: (conn) => {
           this.log?.debug(
             `connection to ${connectingSession.to} established`,
-            connectingSession.loggingMetadata
+            {
+              ...conn.loggingMetadata,
+              ...connectingSession.loggingMetadata
+            }
           );
           this.onConnectionEstablished(connectingSession, conn);
         },
@@ -1918,14 +1946,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_value3.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_value3.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_value3.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;
@@ -2057,50 +2124,6 @@ var ServerTransport = class extends Transport {
     this.pendingSessions.delete(session);
     connectedSession.startActiveHeartbeat();
   }
-  async validateHandshakeMetadata(handshakingSession, existingSession, rawMetadata, from) {
-    if (!this.handshakeExtensions) {
-      return {};
-    }
-    if (!import_value3.Value.Check(this.handshakeExtensions.schema, rawMetadata)) {
-      this.rejectHandshakeRequest(
-        handshakingSession,
-        from,
-        "received malformed handshake metadata",
-        "MALFORMED_HANDSHAKE_META",
-        {
-          ...handshakingSession.loggingMetadata,
-          connectedTo: from,
-          validationErrors: [
-            ...import_value3.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_value3.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/connection.ts