@replit/river 0.200.0-rc.9 → 0.200.2

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

@@ -1,9 +1,10 @@
-import { c as TransportClientId } from '../../../message-7d135e38.js';
+import { c as TransportClientId } from '../../../message-57bb8187.js';
 import { WebSocketServer } from 'ws';
-import { W as WebSocketConnection } from '../../../connection-260e45a8.js';
+import { W as WebSocketConnection } from '../../../connection-94dea547.js';
 import { W as WsLike } from '../../../wslike-e0b32dd5.js';
-import { S as ServerTransport } from '../../../server-dd6a9853.js';
-import { c as ProvidedServerTransportOptions } from '../../../context-b4aff18f.js';
+import { S as ServerTransport } from '../../../server-8fdd7fb2.js';
+import { c as ProvidedServerTransportOptions } from '../../../context-69f37ac1.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-7d135e38.js';
+import { c as TransportClientId } from '../../../message-57bb8187.js';
 import { WebSocketServer } from 'ws';
-import { W as WebSocketConnection } from '../../../connection-260e45a8.js';
+import { W as WebSocketConnection } from '../../../connection-94dea547.js';
 import { W as WsLike } from '../../../wslike-e0b32dd5.js';
-import { S as ServerTransport } from '../../../server-dd6a9853.js';
-import { c as ProvidedServerTransportOptions } from '../../../context-b4aff18f.js';
+import { S as ServerTransport } from '../../../server-8fdd7fb2.js';
+import { c as ProvidedServerTransportOptions } from '../../../context-69f37ac1.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-ZXZE253M.js";
+} from "../../../chunk-PJB2Y2AV.js";
 import {
   WebSocketConnection
-} from "../../../chunk-GR3AQKHL.js";
-import "../../../chunk-I75XYO5W.js";
-import "../../../chunk-VXYHC666.js";
-import "../../../chunk-42Z2FQIU.js";
-import "../../../chunk-EETL2L77.js";
-import "../../../chunk-4PVU7J25.js";
+} from "../../../chunk-HRKM7BIE.js";
+import "../../../chunk-QIDEN5PP.js";
+import "../../../chunk-YTMS7OP6.js";
+import "../../../chunk-6BH2CXVE.js";
+import "../../../chunk-GJUUVID2.js";
+import "../../../chunk-AJGIY2UB.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 = {};
@@ -235,6 +236,9 @@ var ControlMessageCloseSchema = import_typebox.Type.Object({
 });
 var currentProtocolVersion = "v2.0";
 var acceptedProtocolVersions = ["v1.1", currentProtocolVersion];
+function isAcceptedProtocolVersion(version2) {
+  return acceptedProtocolVersions.includes(version2);
+}
 var ControlMessageHandshakeRequestSchema = import_typebox.Type.Object({
   type: import_typebox.Type.Literal("HANDSHAKE_REQ"),
   protocolVersion: import_typebox.Type.String(),
@@ -247,10 +251,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())
 });
@@ -286,9 +287,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
     })
   ])
 });
@@ -604,7 +603,7 @@ var SessionNoConnection = class extends IdentifiedSessionWithGracePeriod {
 var import_api = require("@opentelemetry/api");
 
 // package.json
-var version = "0.200.0-rc.9";
+var version = "0.200.2";
 
 // tracing/index.ts
 function getPropagationContext(ctx) {
@@ -766,13 +765,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(() => {
@@ -814,6 +813,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) {
@@ -830,8 +835,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"]
@@ -840,7 +845,7 @@ var SessionConnected = class extends IdentifiedSession {
           code: import_api2.SpanStatusCode.ERROR,
           message: reason
         });
-        this.listeners.onInvalidMessage(reason);
+        this.closeConnection();
       }
       return;
     }
@@ -866,8 +871,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();
@@ -1234,12 +1241,12 @@ var Transport = class {
   /**
    * Called when a message is received by this transport.
    * You generally shouldn't need to override this in downstream transport implementations.
-   * @param msg The received message.
+   * @param message The received message.
    */
-  handleMsg(msg) {
+  handleMsg(message) {
     if (this.getStatus() !== "open")
       return;
-    this.eventDispatcher.dispatchEvent("message", msg);
+    this.eventDispatcher.dispatchEvent("message", message);
   }
   /**
    * Adds a listener to this transport.
@@ -1279,28 +1286,59 @@ var Transport = class {
   getStatus() {
     return this.status;
   }
-  updateSession(session) {
+  // state transitions
+  createSession(session) {
     const activeSession = this.sessions.get(session.to);
-    if (activeSession && activeSession.id !== session.id) {
-      const msg = `attempt to transition active session for ${session.to} but active session (${activeSession.id}) is different from handle (${session.id})`;
+    if (activeSession) {
+      const msg = `attempt to create session for ${session.to} but active session (${activeSession.id}) already exists`;
+      this.log?.error(msg, {
+        ...session.loggingMetadata,
+        tags: ["invariant-violation"]
+      });
       throw new Error(msg);
     }
     this.sessions.set(session.to, session);
+    this.eventDispatcher.dispatchEvent("sessionStatus", {
+      status: "connect",
+      session
+    });
+    this.eventDispatcher.dispatchEvent("sessionTransition", {
+      state: session.state,
+      session
+    });
+  }
+  updateSession(session) {
+    const activeSession = this.sessions.get(session.to);
     if (!activeSession) {
-      this.eventDispatcher.dispatchEvent("sessionStatus", {
-        status: "connect",
-        session
+      const msg = `attempt to transition session for ${session.to} but no active session exists`;
+      this.log?.error(msg, {
+        ...session.loggingMetadata,
+        tags: ["invariant-violation"]
       });
+      throw new Error(msg);
     }
+    if (activeSession.id !== session.id) {
+      const msg = `attempt to transition active session for ${session.to} but active session (${activeSession.id}) is different from handle (${session.id})`;
+      this.log?.error(msg, {
+        ...session.loggingMetadata,
+        tags: ["invariant-violation"]
+      });
+      throw new Error(msg);
+    }
+    this.sessions.set(session.to, session);
     this.eventDispatcher.dispatchEvent("sessionTransition", {
       state: session.state,
       session
     });
-    return session;
   }
-  // state transitions
-  deleteSession(session) {
-    session.log?.info(`closing session ${session.id}`, session.loggingMetadata);
+  deleteSession(session, options) {
+    if (session._isConsumed)
+      return;
+    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
@@ -1323,7 +1361,8 @@ var Transport = class {
         this.onSessionGracePeriodElapsed(noConnectionSession);
       }
     });
-    return this.updateSession(noConnectionSession);
+    this.updateSession(noConnectionSession);
+    return noConnectionSession;
   }
   onConnClosed(session) {
     let noConnectionSession;
@@ -1340,7 +1379,36 @@ var Transport = class {
         }
       });
     }
-    return this.updateSession(noConnectionSession);
+    this.updateSession(noConnectionSession);
+    return noConnectionSession;
+  }
+  /**
+   * Gets a send closure scoped to a specific session. Sending using the returned
+   * closure after the session has transitioned to a different state will be a noop.
+   *
+   * Session objects themselves can become stale as they transition between
+   * states. As stale sessions cannot be used again (and will throw), holding
+   * onto a session object is not recommended.
+   */
+  getSessionBoundSendFn(to, sessionId) {
+    if (this.getStatus() !== "open") {
+      throw new Error("cannot get a bound send function on a closed transport");
+    }
+    return (msg) => {
+      const session = this.sessions.get(to);
+      if (!session) {
+        throw new Error(
+          `session scope for ${sessionId} has ended (close), can't send`
+        );
+      }
+      const sameSession = session.id === sessionId;
+      if (!sameSession) {
+        throw new Error(
+          `session scope for ${sessionId} has ended (transition), can't send`
+        );
+      }
+      return session.send(msg);
+    };
   }
 };
 
@@ -1463,22 +1531,10 @@ var ClientTransport = class extends Transport {
       this.connect(to);
     }
   }
-  send(to, msg) {
-    if (this.getStatus() === "closed") {
-      const err = "transport is closed, cant send";
-      this.log?.error(err, {
-        clientId: this.clientId,
-        transportMessage: msg,
-        tags: ["invariant-violation"]
-      });
-      throw new Error(err);
-    }
-    let session = this.sessions.get(to);
-    if (!session) {
-      session = this.createUnconnectedSession(to);
-    }
-    return session.send(msg);
-  }
+  /*
+   * Creates a raw unconnected session object.
+   * This is mostly a River internal, you shouldn't need to use this directly.
+   */
   createUnconnectedSession(to) {
     const session = ClientSessionStateGraph.entrypoint(
       to,
@@ -1492,7 +1548,7 @@ var ClientTransport = class extends Transport {
       currentProtocolVersion,
       this.log
     );
-    this.updateSession(session);
+    this.createSession(session);
     return session;
   }
   // listeners
@@ -1533,7 +1589,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,
@@ -1562,7 +1618,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)) {
@@ -1577,10 +1633,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, {
@@ -1625,11 +1681,13 @@ var ClientTransport = class extends Transport {
         );
         this.onConnClosed(connectedSession);
       },
-      onMessage: (msg2) => this.handleMsg(msg2),
+      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
         });
       }
@@ -1648,8 +1706,7 @@ var ClientTransport = class extends Transport {
       );
       return;
     }
-    let session = this.sessions.get(to);
-    session ??= this.createUnconnectedSession(to);
+    const session = this.sessions.get(to) ?? this.createUnconnectedSession(to);
     if (session.state !== "NoConnection" /* NoConnection */) {
       this.log?.debug(
         `session to ${to} has state ${session.state}, skipping connect attempt`,
@@ -1741,6 +1798,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,
@@ -1797,35 +1857,13 @@ var ServerTransport = class extends Transport {
   extendHandshake(options) {
     this.handshakeExtensions = options;
   }
-  send(to, msg) {
-    if (this.getStatus() === "closed") {
-      const err = "transport is closed, cant send";
-      this.log?.error(err, {
-        clientId: this.clientId,
-        transportMessage: msg,
-        tags: ["invariant-violation"]
-      });
-      throw new Error(err);
-    }
-    const session = this.sessions.get(to);
-    if (!session) {
-      const err = `session to ${to} does not exist`;
-      this.log?.error(err, {
-        clientId: this.clientId,
-        transportMessage: msg,
-        tags: ["invariant-violation"]
-      });
-      throw new Error(err);
-    }
-    return session.send(msg);
-  }
   deletePendingSession(pendingSession) {
     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")
@@ -1938,7 +1976,7 @@ var ServerTransport = class extends Transport {
       return;
     }
     const gotVersion = msg.payload.protocolVersion;
-    if (!acceptedProtocolVersions.includes(gotVersion)) {
+    if (!isAcceptedProtocolVersion(gotVersion)) {
       this.rejectHandshakeRequest(
         session,
         msg.from,
@@ -1952,7 +1990,6 @@ var ServerTransport = class extends Transport {
       );
       return;
     }
-    let oldSession = this.sessions.get(msg.from);
     let parsedMetadata = {};
     if (this.handshakeExtensions) {
       if (!import_value3.Value.Check(this.handshakeExtensions.schema, msg.payload.metadata)) {
@@ -1974,7 +2011,9 @@ var ServerTransport = class extends Transport {
         );
         return;
       }
-      const previousParsedMetadata = oldSession ? this.sessionHandshakeMetadata.get(oldSession.to) : void 0;
+      const previousParsedMetadata = this.sessionHandshakeMetadata.get(
+        msg.from
+      );
       const parsedMetadataOrFailureCode = await this.handshakeExtensions.validate(
         msg.payload.metadata,
         previousParsedMetadata
@@ -2003,7 +2042,8 @@ 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;
+    let oldSession = this.sessions.get(msg.from);
     if (this.options.enableTransparentSessionReconnects && oldSession && oldSession.id === msg.payload.sessionId) {
       connectCase = "transparent reconnection";
       const ourNextSeq = oldSession.nextSeq();
@@ -2116,19 +2156,25 @@ var ServerTransport = class extends Transport {
           );
           this.onConnClosed(connectedSession);
         },
-        onMessage: (msg2) => this.handleMsg(msg2),
+        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 });
         }
       },
       gotVersion
     );
     this.sessionHandshakeMetadata.set(connectedSession.to, parsedMetadata);
-    this.updateSession(connectedSession);
+    if (oldSession) {
+      this.updateSession(connectedSession);
+    } else {
+      this.createSession(connectedSession);
+    }
     this.pendingSessions.delete(session);
     connectedSession.startActiveHeartbeat();
   }