@replit/river 0.26.3 → 0.26.5

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

@@ -1,13 +1,13 @@
 import {
   ServerTransport
-} from "../../../chunk-X35QRIA5.js";
+} from "../../../chunk-AZ3ILPXP.js";
 import {
   WebSocketConnection
-} from "../../../chunk-ZY2HYJ5Y.js";
-import "../../../chunk-JI6FFDY5.js";
+} from "../../../chunk-QEWSUVWV.js";
+import "../../../chunk-IPOUVVKT.js";
 import "../../../chunk-TAH2GVTJ.js";
-import "../../../chunk-OCL2FUTQ.js";
-import "../../../chunk-MZELCWJK.js";
+import "../../../chunk-XRZ52TYH.js";
+import "../../../chunk-7KB7DHFZ.js";
 import "../../../chunk-4PVU7J25.js";
 
 // transport/impls/ws/server.ts

package/dist/transport/index.cjs

@@ -246,10 +246,7 @@ var ControlMessageHandshakeRequestSchema = import_typebox.Type.Object({
   expectedSessionState: import_typebox.Type.Object({
     // what the client expects the server to send next
     nextExpectedSeq: import_typebox.Type.Integer(),
-    // TODO: remove optional once we know all servers
-    // are nextSentSeq here
-    // what the server expects the client to send next
-    nextSentSeq: import_typebox.Type.Optional(import_typebox.Type.Integer())
+    nextSentSeq: import_typebox.Type.Integer()
   }),
   metadata: import_typebox.Type.Optional(import_typebox.Type.Unknown())
 });
@@ -285,9 +282,7 @@ var ControlMessageHandshakeResponseSchema = import_typebox.Type.Object({
     import_typebox.Type.Object({
       ok: import_typebox.Type.Literal(false),
       reason: import_typebox.Type.String(),
-      // TODO: remove optional once we know all servers
-      // are sending code here
-      code: import_typebox.Type.Optional(HandshakeErrorResponseCodes)
+      code: HandshakeErrorResponseCodes
     })
   ])
 });
@@ -540,9 +535,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 +547,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 +596,7 @@ var SessionNoConnection = class extends IdentifiedSessionWithGracePeriod {
 var import_api = require("@opentelemetry/api");
 
 // package.json
-var version = "0.26.3";
+var version = "0.26.5";
 
 // tracing/index.ts
 function getPropagationContext(ctx) {
@@ -761,13 +758,13 @@ var SessionConnected = class extends IdentifiedSession {
     this.conn.addCloseListener(this.listeners.onConnectionClosed);
     this.conn.addErrorListener(this.listeners.onConnectionErrored);
     if (this.sendBuffer.length > 0) {
-      this.log?.debug(
-        `sending ${this.sendBuffer.length} buffered messages`,
+      this.log?.info(
+        `sending ${this.sendBuffer.length} buffered messages, starting at seq ${this.nextSeq()}`,
         this.loggingMetadata
       );
-    }
-    for (const msg of this.sendBuffer) {
-      this.conn.send(this.options.codec.toBuffer(msg));
+      for (const msg of this.sendBuffer) {
+        this.conn.send(this.options.codec.toBuffer(msg));
+      }
     }
     this.isActivelyHeartbeating = false;
     this.heartbeatHandle = setInterval(() => {
@@ -1568,10 +1565,10 @@ var ClientTransport = class extends Transport {
       return;
     }
     if (!msg.payload.status.ok) {
-      const retriable = msg.payload.status.code ? import_value2.Value.Check(
+      const retriable = import_value2.Value.Check(
         HandshakeErrorRetriableResponseCodes,
         msg.payload.status.code
-      ) : false;
+      );
       const reason = `handshake failed: ${msg.payload.status.reason}`;
       const to = session.to;
       this.rejectHandshakeResponse(session, reason, {
@@ -1669,22 +1666,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 +1675,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 +1695,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);
         },
@@ -1994,7 +1991,7 @@ var ServerTransport = class extends Transport {
     }
     let connectCase = "new session";
     const clientNextExpectedSeq = msg.payload.expectedSessionState.nextExpectedSeq;
-    const clientNextSentSeq = msg.payload.expectedSessionState.nextSentSeq ?? 0;
+    const clientNextSentSeq = msg.payload.expectedSessionState.nextSentSeq;
     if (this.options.enableTransparentSessionReconnects && oldSession && oldSession.id === msg.payload.sessionId) {
       connectCase = "transparent reconnection";
       const ourNextSeq = oldSession.nextSeq();