@replit/river 0.26.4 → 0.26.6

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

@@ -1,9 +1,9 @@
-import { c as TransportClientId } from '../../../message-ff78a233.js';
+import { c as TransportClientId } from '../../../message-e917ee98.js';
 import { WebSocketServer } from 'ws';
-import { W as WebSocketConnection } from '../../../connection-03ffb583.js';
+import { W as WebSocketConnection } from '../../../connection-48133ec3.js';
 import { W as WsLike } from '../../../wslike-e0b32dd5.js';
-import { S as ServerTransport } from '../../../server-1f5eb427.js';
-import { c as ProvidedServerTransportOptions } from '../../../handshake-154a0bb2.js';
+import { S as ServerTransport } from '../../../server-b8aaf116.js';
+import { c as ProvidedServerTransportOptions } from '../../../handshake-65e0e848.js';
 import '@sinclair/typebox/value';
 import '@sinclair/typebox';
 import '@opentelemetry/api';

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

@@ -1,9 +1,9 @@
-import { c as TransportClientId } from '../../../message-ff78a233.js';
+import { c as TransportClientId } from '../../../message-e917ee98.js';
 import { WebSocketServer } from 'ws';
-import { W as WebSocketConnection } from '../../../connection-03ffb583.js';
+import { W as WebSocketConnection } from '../../../connection-48133ec3.js';
 import { W as WsLike } from '../../../wslike-e0b32dd5.js';
-import { S as ServerTransport } from '../../../server-1f5eb427.js';
-import { c as ProvidedServerTransportOptions } from '../../../handshake-154a0bb2.js';
+import { S as ServerTransport } from '../../../server-b8aaf116.js';
+import { c as ProvidedServerTransportOptions } from '../../../handshake-65e0e848.js';
 import '@sinclair/typebox/value';
 import '@sinclair/typebox';
 import '@opentelemetry/api';

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

@@ -1,13 +1,13 @@
 import {
   ServerTransport
-} from "../../../chunk-DS5LF6PS.js";
+} from "../../../chunk-J7AQMYUQ.js";
 import {
   WebSocketConnection
-} from "../../../chunk-CYD6GTCU.js";
-import "../../../chunk-RSCUADHY.js";
-import "../../../chunk-TAH2GVTJ.js";
-import "../../../chunk-42SXIIHP.js";
-import "../../../chunk-65EMTMCV.js";
+} from "../../../chunk-5INVLQT5.js";
+import "../../../chunk-3NZ73HXL.js";
+import "../../../chunk-MZM234IB.js";
+import "../../../chunk-H677UET6.js";
+import "../../../chunk-H2RVJ32Z.js";
 import "../../../chunk-4PVU7J25.js";
 
 // transport/impls/ws/server.ts

package/dist/transport/index.cjs

@@ -88,7 +88,8 @@ var createLogProxy = (log) => ({
 var ProtocolError = {
   RetriesExceeded: "conn_retry_exceeded",
   HandshakeFailed: "handshake_failed",
-  MessageOrderingViolated: "message_ordering_violated"
+  MessageOrderingViolated: "message_ordering_violated",
+  InvalidMessage: "invalid_message"
 };
 var EventDispatcher = class {
   eventListeners = {};
@@ -246,10 +247,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 +283,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
     })
   ])
 });
@@ -601,7 +597,7 @@ var SessionNoConnection = class extends IdentifiedSessionWithGracePeriod {
 var import_api = require("@opentelemetry/api");
 
 // package.json
-var version = "0.26.4";
+var version = "0.26.6";
 
 // tracing/index.ts
 function getPropagationContext(ctx) {
@@ -763,13 +759,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(() => {
@@ -811,6 +807,12 @@ var SessionConnected = class extends IdentifiedSession {
       }
     });
   }
+  closeConnection() {
+    this.conn.removeDataListener(this.onMessageData);
+    this.conn.removeCloseListener(this.listeners.onConnectionClosed);
+    this.conn.removeErrorListener(this.listeners.onConnectionErrored);
+    this.conn.close();
+  }
   onMessageData = (msg) => {
     const parsedMsg = this.parseMsg(msg);
     if (parsedMsg === null) {
@@ -827,8 +829,8 @@ var SessionConnected = class extends IdentifiedSession {
           }
         );
       } else {
-        const reason = `received out-of-order msg (got seq: ${parsedMsg.seq}, wanted seq: ${this.ack})`;
-        this.log?.error(reason, {
+        const reason = `received out-of-order msg, closing connection (got seq: ${parsedMsg.seq}, wanted seq: ${this.ack})`;
+        this.log?.warn(reason, {
           ...this.loggingMetadata,
           transportMessage: parsedMsg,
           tags: ["invariant-violation"]
@@ -837,7 +839,7 @@ var SessionConnected = class extends IdentifiedSession {
           code: import_api2.SpanStatusCode.ERROR,
           message: reason
         });
-        this.listeners.onInvalidMessage(reason);
+        this.closeConnection();
       }
       return;
     }
@@ -863,8 +865,10 @@ var SessionConnected = class extends IdentifiedSession {
     this.conn.removeDataListener(this.onMessageData);
     this.conn.removeCloseListener(this.listeners.onConnectionClosed);
     this.conn.removeErrorListener(this.listeners.onConnectionErrored);
-    clearInterval(this.heartbeatHandle);
-    this.heartbeatHandle = void 0;
+    if (this.heartbeatHandle) {
+      clearInterval(this.heartbeatHandle);
+      this.heartbeatHandle = void 0;
+    }
   }
   _handleClose() {
     super._handleClose();
@@ -1293,8 +1297,12 @@ var Transport = class {
     return session;
   }
   // state transitions
-  deleteSession(session) {
-    session.log?.info(`closing session ${session.id}`, session.loggingMetadata);
+  deleteSession(session, options) {
+    const loggingMetadata = session.loggingMetadata;
+    if (loggingMetadata.tags && options?.unhealthy) {
+      loggingMetadata.tags.push("unhealthy-session");
+    }
+    session.log?.info(`closing session ${session.id}`, loggingMetadata);
     this.eventDispatcher.dispatchEvent("sessionStatus", {
       status: "disconnect",
       session
@@ -1526,7 +1534,7 @@ var ClientTransport = class extends Transport {
             `invalid handshake: ${reason}`,
             handshakingSession.loggingMetadata
           );
-          this.deleteSession(session);
+          this.deleteSession(session, { unhealthy: true });
           this.protocolError({
             type: ProtocolError.HandshakeFailed,
             code,
@@ -1555,7 +1563,7 @@ var ClientTransport = class extends Transport {
       message: reason
     });
     this.log?.warn(reason, metadata);
-    this.deleteSession(session);
+    this.deleteSession(session, { unhealthy: true });
   }
   onHandshakeResponse(session, msg) {
     if (!import_value2.Value.Check(ControlMessageHandshakeResponseSchema, msg.payload)) {
@@ -1570,10 +1578,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, {
@@ -1620,9 +1628,9 @@ var ClientTransport = class extends Transport {
       },
       onMessage: (msg2) => this.handleMsg(msg2),
       onInvalidMessage: (reason) => {
-        this.deleteSession(connectedSession);
+        this.deleteSession(connectedSession, { unhealthy: true });
         this.protocolError({
-          type: ProtocolError.MessageOrderingViolated,
+          type: ProtocolError.InvalidMessage,
           message: reason
         });
       }
@@ -1734,6 +1742,9 @@ var ClientTransport = class extends Transport {
     if (this.handshakeExtensions) {
       metadata = await this.handshakeExtensions.construct();
     }
+    if (session._isConsumed) {
+      return;
+    }
     const requestMsg = handshakeRequestMessage({
       from: this.clientId,
       to: session.to,
@@ -1816,9 +1827,9 @@ var ServerTransport = class extends Transport {
     pendingSession.close();
     this.pendingSessions.delete(pendingSession);
   }
-  deleteSession(session) {
+  deleteSession(session, options) {
     this.sessionHandshakeMetadata.delete(session.to);
-    super.deleteSession(session);
+    super.deleteSession(session, options);
   }
   handleConnection(conn) {
     if (this.getStatus() !== "open")
@@ -1996,7 +2007,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();
@@ -2112,10 +2123,10 @@ var ServerTransport = class extends Transport {
         onMessage: (msg2) => this.handleMsg(msg2),
         onInvalidMessage: (reason) => {
           this.protocolError({
-            type: ProtocolError.MessageOrderingViolated,
+            type: ProtocolError.InvalidMessage,
             message: reason
           });
-          this.deleteSession(connectedSession);
+          this.deleteSession(connectedSession, { unhealthy: true });
         }
       }
     );