@replit/river 0.26.5 → 0.26.7

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

@@ -1,9 +1,10 @@
-import { c as TransportClientId } from '../../../message-ff78a233.js';
+import { c as TransportClientId } from '../../../message-3edb8fac.js';
 import { WebSocketServer } from 'ws';
-import { W as WebSocketConnection } from '../../../connection-03ffb583.js';
+import { W as WebSocketConnection } from '../../../connection-c5ffd44e.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-89076d9a.js';
+import { c as ProvidedServerTransportOptions } from '../../../handshake-02a61755.js';
+import { IncomingMessage } from 'http';
 import '@sinclair/typebox/value';
 import '@sinclair/typebox';
 import '@opentelemetry/api';
@@ -13,7 +14,7 @@ import '../../../types-3e5768ec.js';
 declare class WebSocketServerTransport extends ServerTransport<WebSocketConnection> {
     wss: WebSocketServer;
     constructor(wss: WebSocketServer, clientId: TransportClientId, providedOptions?: ProvidedServerTransportOptions);
-    connectionHandler: (ws: WsLike) => void;
+    connectionHandler: (ws: WsLike, req: IncomingMessage) => void;
     close(): void;
 }
 

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

@@ -1,9 +1,10 @@
-import { c as TransportClientId } from '../../../message-ff78a233.js';
+import { c as TransportClientId } from '../../../message-3edb8fac.js';
 import { WebSocketServer } from 'ws';
-import { W as WebSocketConnection } from '../../../connection-03ffb583.js';
+import { W as WebSocketConnection } from '../../../connection-c5ffd44e.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-89076d9a.js';
+import { c as ProvidedServerTransportOptions } from '../../../handshake-02a61755.js';
+import { IncomingMessage } from 'http';
 import '@sinclair/typebox/value';
 import '@sinclair/typebox';
 import '@opentelemetry/api';
@@ -13,7 +14,7 @@ import '../../../types-3e5768ec.js';
 declare class WebSocketServerTransport extends ServerTransport<WebSocketConnection> {
     wss: WebSocketServer;
     constructor(wss: WebSocketServer, clientId: TransportClientId, providedOptions?: ProvidedServerTransportOptions);
-    connectionHandler: (ws: WsLike) => void;
+    connectionHandler: (ws: WsLike, req: IncomingMessage) => void;
     close(): void;
 }
 

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

@@ -1,16 +1,26 @@
 import {
   ServerTransport
-} from "../../../chunk-AZ3ILPXP.js";
+} from "../../../chunk-X4TDCNNT.js";
 import {
   WebSocketConnection
-} from "../../../chunk-QEWSUVWV.js";
-import "../../../chunk-IPOUVVKT.js";
-import "../../../chunk-TAH2GVTJ.js";
-import "../../../chunk-XRZ52TYH.js";
-import "../../../chunk-7KB7DHFZ.js";
+} from "../../../chunk-KMH4I245.js";
+import "../../../chunk-I3Z6XQVK.js";
+import "../../../chunk-KTS4HBYE.js";
+import "../../../chunk-F32IOMOX.js";
+import "../../../chunk-NHM3XC6K.js";
 import "../../../chunk-4PVU7J25.js";
 
 // transport/impls/ws/server.ts
+function cleanHeaders(headers) {
+  const cleanedHeaders = {};
+  for (const [key, value] of Object.entries(headers)) {
+    if (!key.startsWith("sec-") && value) {
+      const cleanedValue = Array.isArray(value) ? value[0] : value;
+      cleanedHeaders[key] = cleanedValue;
+    }
+  }
+  return cleanedHeaders;
+}
 var WebSocketServerTransport = class extends ServerTransport {
   wss;
   constructor(wss, clientId, providedOptions) {
@@ -18,8 +28,10 @@ var WebSocketServerTransport = class extends ServerTransport {
     this.wss = wss;
     this.wss.on("connection", this.connectionHandler);
   }
-  connectionHandler = (ws) => {
-    const conn = new WebSocketConnection(ws);
+  connectionHandler = (ws, req) => {
+    const conn = new WebSocketConnection(ws, {
+      headers: cleanHeaders(req.headersDistinct)
+    });
     this.handleConnection(conn);
   };
   close() {

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

@@ -1 +1 @@
-{"version":3,"sources":["../../../../transport/impls/ws/server.ts"],"sourcesContent":["import { TransportClientId } from '../../message';\nimport { WebSocketServer } from 'ws';\nimport { WebSocketConnection } from './connection';\nimport { WsLike } from './wslike';\nimport { ServerTransport } from '../../server';\nimport { ProvidedServerTransportOptions } from '../../options';\n\nexport class WebSocketServerTransport extends ServerTransport<WebSocketConnection> {\n  wss: WebSocketServer;\n\n  constructor(\n    wss: WebSocketServer,\n    clientId: TransportClientId,\n    providedOptions?: ProvidedServerTransportOptions,\n  ) {\n    super(clientId, providedOptions);\n    this.wss = wss;\n    this.wss.on('connection', this.connectionHandler);\n  }\n\n  connectionHandler = (ws: WsLike) => {\n    const conn = new WebSocketConnection(ws);\n    this.handleConnection(conn);\n  };\n\n  close() {\n    super.close();\n    this.wss.off('connection', this.connectionHandler);\n  }\n}\n"],"mappings":";;;;;;;;;;;;;AAOO,IAAM,2BAAN,cAAuC,gBAAqC;AAAA,EACjF;AAAA,EAEA,YACE,KACA,UACA,iBACA;AACA,UAAM,UAAU,eAAe;AAC/B,SAAK,MAAM;AACX,SAAK,IAAI,GAAG,cAAc,KAAK,iBAAiB;AAAA,EAClD;AAAA,EAEA,oBAAoB,CAAC,OAAe;AAClC,UAAM,OAAO,IAAI,oBAAoB,EAAE;AACvC,SAAK,iBAAiB,IAAI;AAAA,EAC5B;AAAA,EAEA,QAAQ;AACN,UAAM,MAAM;AACZ,SAAK,IAAI,IAAI,cAAc,KAAK,iBAAiB;AAAA,EACnD;AACF;","names":[]}
+{"version":3,"sources":["../../../../transport/impls/ws/server.ts"],"sourcesContent":["import { TransportClientId } from '../../message';\nimport { WebSocketServer } from 'ws';\nimport { WebSocketConnection } from './connection';\nimport { WsLike } from './wslike';\nimport { ServerTransport } from '../../server';\nimport { ProvidedServerTransportOptions } from '../../options';\nimport { type IncomingMessage } from 'http';\n\nfunction cleanHeaders(\n  headers: IncomingMessage['headers'],\n): Record<string, string> {\n  const cleanedHeaders: Record<string, string> = {};\n\n  for (const [key, value] of Object.entries(headers)) {\n    if (!key.startsWith('sec-') && value) {\n      const cleanedValue = Array.isArray(value) ? value[0] : value;\n      cleanedHeaders[key] = cleanedValue;\n    }\n  }\n\n  return cleanedHeaders;\n}\n\nexport class WebSocketServerTransport extends ServerTransport<WebSocketConnection> {\n  wss: WebSocketServer;\n\n  constructor(\n    wss: WebSocketServer,\n    clientId: TransportClientId,\n    providedOptions?: ProvidedServerTransportOptions,\n  ) {\n    super(clientId, providedOptions);\n    this.wss = wss;\n    this.wss.on('connection', this.connectionHandler);\n  }\n\n  connectionHandler = (ws: WsLike, req: IncomingMessage) => {\n    const conn = new WebSocketConnection(ws, {\n      headers: cleanHeaders(req.headersDistinct),\n    });\n\n    this.handleConnection(conn);\n  };\n\n  close() {\n    super.close();\n    this.wss.off('connection', this.connectionHandler);\n  }\n}\n"],"mappings":";;;;;;;;;;;;;AAQA,SAAS,aACP,SACwB;AACxB,QAAM,iBAAyC,CAAC;AAEhD,aAAW,CAAC,KAAK,KAAK,KAAK,OAAO,QAAQ,OAAO,GAAG;AAClD,QAAI,CAAC,IAAI,WAAW,MAAM,KAAK,OAAO;AACpC,YAAM,eAAe,MAAM,QAAQ,KAAK,IAAI,MAAM,CAAC,IAAI;AACvD,qBAAe,GAAG,IAAI;AAAA,IACxB;AAAA,EACF;AAEA,SAAO;AACT;AAEO,IAAM,2BAAN,cAAuC,gBAAqC;AAAA,EACjF;AAAA,EAEA,YACE,KACA,UACA,iBACA;AACA,UAAM,UAAU,eAAe;AAC/B,SAAK,MAAM;AACX,SAAK,IAAI,GAAG,cAAc,KAAK,iBAAiB;AAAA,EAClD;AAAA,EAEA,oBAAoB,CAAC,IAAY,QAAyB;AACxD,UAAM,OAAO,IAAI,oBAAoB,IAAI;AAAA,MACvC,SAAS,aAAa,IAAI,eAAe;AAAA,IAC3C,CAAC;AAED,SAAK,iBAAiB,IAAI;AAAA,EAC5B;AAAA,EAEA,QAAQ;AACN,UAAM,MAAM;AACZ,SAAK,IAAI,IAAI,cAAc,KAAK,iBAAiB;AAAA,EACnD;AACF;","names":[]}

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 = {};
@@ -596,7 +597,7 @@ var SessionNoConnection = class extends IdentifiedSessionWithGracePeriod {
 var import_api = require("@opentelemetry/api");
 
 // package.json
-var version = "0.26.5";
+var version = "0.26.7";
 
 // tracing/index.ts
 function getPropagationContext(ctx) {
@@ -806,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) {
@@ -822,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"]
@@ -832,7 +839,7 @@ var SessionConnected = class extends IdentifiedSession {
           code: import_api2.SpanStatusCode.ERROR,
           message: reason
         });
-        this.listeners.onInvalidMessage(reason);
+        this.closeConnection();
       }
       return;
     }
@@ -858,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();
@@ -1288,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
@@ -1521,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,
@@ -1550,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)) {
@@ -1615,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
         });
       }
@@ -1729,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,
@@ -1811,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")
@@ -2107,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 });
         }
       }
     );