@replit/river 0.26.3 → 0.26.4

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

@@ -1,13 +1,13 @@
 import {
   ServerTransport
-} from "../../../chunk-X35QRIA5.js";
+} from "../../../chunk-DS5LF6PS.js";
 import {
   WebSocketConnection
-} from "../../../chunk-ZY2HYJ5Y.js";
-import "../../../chunk-JI6FFDY5.js";
+} from "../../../chunk-CYD6GTCU.js";
+import "../../../chunk-RSCUADHY.js";
 import "../../../chunk-TAH2GVTJ.js";
-import "../../../chunk-OCL2FUTQ.js";
-import "../../../chunk-MZELCWJK.js";
+import "../../../chunk-42SXIIHP.js";
+import "../../../chunk-65EMTMCV.js";
 import "../../../chunk-4PVU7J25.js";
 
 // transport/impls/ws/server.ts

package/dist/transport/index.cjs

@@ -540,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)
@@ -555,16 +552,21 @@ 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) => {
+    const logger = this.log;
+    const metadata = this.loggingMetadata;
+    this.connPromise.then((conn) => {
       conn.close();
-      this.log?.info(
+      logger?.info(
         "connection eventually resolved but session has transitioned, closed connection",
         {
-          ...this.loggingMetadata,
+          ...metadata,
           ...conn.loggingMetadata
         }
       );
@@ -599,7 +601,7 @@ var SessionNoConnection = class extends IdentifiedSessionWithGracePeriod {
 var import_api = require("@opentelemetry/api");
 
 // package.json
-var version = "0.26.3";
+var version = "0.26.4";
 
 // tracing/index.ts
 function getPropagationContext(ctx) {
@@ -1669,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);
@@ -1693,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,
@@ -1701,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);
         },