@replit/river 0.200.0-rc.7 → 0.200.0-rc.8

package/dist/{chunk-F2E7ILHW.js → chunk-XV5WUEIR.js}

@@ -1,18 +1,19 @@
 import {
   ProtocolError,
   Transport
-} from "./chunk-U4W75CMT.js";
+} from "./chunk-J54ZWTQM.js";
 import {
   ServerSessionStateGraph,
   defaultServerTransportOptions
-} from "./chunk-3XKJOFZA.js";
+} from "./chunk-Y3JHOIJ7.js";
 import {
   ControlMessageHandshakeRequestSchema,
+  HandshakeErrorCustomHandlerFatalResponseCodes,
   acceptedProtocolVersions,
   coerceErrorString,
   currentProtocolVersion,
   handshakeResponseMessage
-} from "./chunk-BZBEE2VR.js";
+} from "./chunk-3ROTSXAO.js";
 
 // transport/server.ts
 import { SpanStatusCode } from "@opentelemetry/api";
@@ -127,13 +128,17 @@ var ServerTransport = class extends Transport {
           receivedHandshake = true;
           void this.onHandshakeRequest(pendingSession, msg);
         },
-        onInvalidHandshake: (reason) => {
+        onInvalidHandshake: (reason, code) => {
           this.log?.error(
             `invalid handshake: ${reason}`,
             pendingSession.loggingMetadata
           );
           this.deletePendingSession(pendingSession);
-          this.protocolError(ProtocolError.HandshakeFailed, reason);
+          this.protocolError({
+            type: ProtocolError.HandshakeFailed,
+            code,
+            message: reason
+          });
         }
       },
       this.options,
@@ -158,7 +163,11 @@ var ServerTransport = class extends Transport {
         }
       })
     );
-    this.protocolError(ProtocolError.HandshakeFailed, reason);
+    this.protocolError({
+      type: ProtocolError.HandshakeFailed,
+      code,
+      message: reason
+    });
     this.deletePendingSession(session);
   }
   async onHandshakeRequest(session, msg) {
@@ -195,19 +204,58 @@ var ServerTransport = class extends Transport {
       return;
     }
     let oldSession = this.sessions.get(msg.from);
-    const parsedMetadata = await this.validateHandshakeMetadata(
-      session,
-      oldSession,
-      msg.payload.metadata,
-      msg.from
-    );
-    if (parsedMetadata === false) {
-      return;
+    let parsedMetadata = {};
+    if (this.handshakeExtensions) {
+      if (!Value.Check(this.handshakeExtensions.schema, msg.payload.metadata)) {
+        this.rejectHandshakeRequest(
+          session,
+          msg.from,
+          "received malformed handshake metadata",
+          "MALFORMED_HANDSHAKE_META",
+          {
+            ...session.loggingMetadata,
+            connectedTo: msg.from,
+            validationErrors: [
+              ...Value.Errors(
+                this.handshakeExtensions.schema,
+                msg.payload.metadata
+              )
+            ]
+          }
+        );
+        return;
+      }
+      const previousParsedMetadata = oldSession ? this.sessionHandshakeMetadata.get(oldSession.to) : void 0;
+      const parsedMetadataOrFailureCode = await this.handshakeExtensions.validate(
+        msg.payload.metadata,
+        previousParsedMetadata
+      );
+      if (session._isConsumed) {
+        return;
+      }
+      if (Value.Check(
+        HandshakeErrorCustomHandlerFatalResponseCodes,
+        parsedMetadataOrFailureCode
+      )) {
+        this.rejectHandshakeRequest(
+          session,
+          msg.from,
+          "rejected by handshake handler",
+          parsedMetadataOrFailureCode,
+          {
+            ...session.loggingMetadata,
+            connectedTo: msg.from,
+            clientId: this.clientId
+          }
+        );
+        return;
+      }
+      parsedMetadata = parsedMetadataOrFailureCode;
     }
     let connectCase = "new session";
     const clientNextExpectedSeq = msg.payload.expectedSessionState.nextExpectedSeq;
     const clientNextSentSeq = msg.payload.expectedSessionState.nextSentSeq ?? 0;
-    if (oldSession && oldSession.id === msg.payload.sessionId) {
+    if (this.options.enableTransparentSessionReconnects && oldSession && oldSession.id === msg.payload.sessionId) {
       connectCase = "transparent reconnection";
       const ourNextSeq = oldSession.nextSeq();
       const ourAck = oldSession.ack;
@@ -266,10 +314,11 @@ var ServerTransport = class extends Transport {
     }
     if (!oldSession && (clientNextSentSeq > 0 || clientNextExpectedSeq > 0)) {
       connectCase = "unknown session";
+      const rejectionMessage = this.options.enableTransparentSessionReconnects ? `client is trying to reconnect to a session the server don't know about: ${msg.payload.sessionId}` : `client is attempting a transparent reconnect to a session but the server does not support it: ${msg.payload.sessionId}`;
       this.rejectHandshakeRequest(
         session,
         msg.from,
-        `client is trying to reconnect to a session the server don't know about: ${msg.payload.sessionId}`,
+        rejectionMessage,
         "SESSION_STATE_MISMATCH",
         {
           ...session.loggingMetadata,
@@ -320,7 +369,10 @@ var ServerTransport = class extends Transport {
         },
         onMessage: (msg2) => this.handleMsg(msg2),
         onInvalidMessage: (reason) => {
-          this.protocolError(ProtocolError.MessageOrderingViolated, reason);
+          this.protocolError({
+            type: ProtocolError.MessageOrderingViolated,
+            message: reason
+          });
           this.deleteSession(connectedSession);
         }
       },
@@ -331,50 +383,9 @@ var ServerTransport = class extends Transport {
     this.pendingSessions.delete(session);
     connectedSession.startActiveHeartbeat();
   }
-  async validateHandshakeMetadata(handshakingSession, existingSession, rawMetadata, from) {
-    let parsedMetadata = {};
-    if (this.handshakeExtensions) {
-      if (!Value.Check(this.handshakeExtensions.schema, rawMetadata)) {
-        this.rejectHandshakeRequest(
-          handshakingSession,
-          from,
-          "received malformed handshake metadata",
-          "MALFORMED_HANDSHAKE_META",
-          {
-            ...handshakingSession.loggingMetadata,
-            connectedTo: from,
-            validationErrors: [
-              ...Value.Errors(this.handshakeExtensions.schema, rawMetadata)
-            ]
-          }
-        );
-        return false;
-      }
-      const previousParsedMetadata = existingSession ? this.sessionHandshakeMetadata.get(existingSession.to) : void 0;
-      parsedMetadata = await this.handshakeExtensions.validate(
-        rawMetadata,
-        previousParsedMetadata
-      );
-      if (parsedMetadata === false) {
-        this.rejectHandshakeRequest(
-          handshakingSession,
-          from,
-          "rejected by handshake handler",
-          "REJECTED_BY_CUSTOM_HANDLER",
-          {
-            ...handshakingSession.loggingMetadata,
-            connectedTo: from,
-            clientId: this.clientId
-          }
-        );
-        return false;
-      }
-    }
-    return parsedMetadata;
-  }
 };
 
 export {
   ServerTransport
 };
-//# sourceMappingURL=chunk-F2E7ILHW.js.map
+//# sourceMappingURL=chunk-XV5WUEIR.js.map

package/dist/chunk-XV5WUEIR.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../transport/server.ts"],"sourcesContent":["import { SpanStatusCode } from '@opentelemetry/api';\nimport { ParsedMetadata } from '../router/context';\nimport { ServerHandshakeOptions } from '../router/handshake';\nimport {\n  ControlMessageHandshakeRequestSchema,\n  HandshakeErrorCustomHandlerFatalResponseCodes,\n  HandshakeErrorResponseCodes,\n  OpaqueTransportMessage,\n  acceptedProtocolVersions,\n  PartialTransportMessage,\n  TransportClientId,\n  handshakeResponseMessage,\n  currentProtocolVersion,\n} from './message';\nimport {\n  ProvidedServerTransportOptions,\n  ServerTransportOptions,\n  defaultServerTransportOptions,\n} from './options';\nimport { Transport } from './transport';\nimport { coerceErrorString } from '../util/stringify';\nimport { Static } from '@sinclair/typebox';\nimport { Value } from '@sinclair/typebox/value';\nimport { ProtocolError } from './events';\nimport { Connection } from './connection';\nimport { MessageMetadata } from '../logging';\nimport { SessionWaitingForHandshake } from './sessionStateMachine/SessionWaitingForHandshake';\nimport { SessionState } from './sessionStateMachine/common';\nimport {\n  ServerSession,\n  ServerSessionStateGraph,\n} from './sessionStateMachine/transitions';\n\nexport abstract class ServerTransport<\n  ConnType extends Connection,\n> extends Transport<ConnType> {\n  /**\n   * The options for this transport.\n   */\n  protected options: ServerTransportOptions;\n\n  /**\n   * Optional handshake options for the server.\n   */\n  handshakeExtensions?: ServerHandshakeOptions;\n\n  /**\n   * A map of session handshake data for each session.\n   */\n  sessionHandshakeMetadata = new Map<TransportClientId, ParsedMetadata>();\n\n  sessions = new Map<TransportClientId, ServerSession<ConnType>>();\n  pendingSessions = new Set<SessionWaitingForHandshake<ConnType>>();\n\n  constructor(\n    clientId: TransportClientId,\n    providedOptions?: ProvidedServerTransportOptions,\n  ) {\n    super(clientId, providedOptions);\n    this.sessions = new Map();\n    this.options = {\n      ...defaultServerTransportOptions,\n      ...providedOptions,\n    };\n    this.log?.info(`initiated server transport`, {\n      clientId: this.clientId,\n      protocolVersion: currentProtocolVersion,\n    });\n  }\n\n  extendHandshake(options: ServerHandshakeOptions) {\n    this.handshakeExtensions = options;\n  }\n\n  send(to: string, msg: PartialTransportMessage): string {\n    if (this.getStatus() === 'closed') {\n      const err = 'transport is closed, cant send';\n      this.log?.error(err, {\n        clientId: this.clientId,\n        transportMessage: msg,\n        tags: ['invariant-violation'],\n      });\n\n      throw new Error(err);\n    }\n\n    const session = this.sessions.get(to);\n    if (!session) {\n      const err = `session to ${to} does not exist`;\n      this.log?.error(err, {\n        clientId: this.clientId,\n        transportMessage: msg,\n        tags: ['invariant-violation'],\n      });\n\n      throw new Error(err);\n    }\n\n    return session.send(msg);\n  }\n\n  protected deletePendingSession(\n    pendingSession: SessionWaitingForHandshake<ConnType>,\n  ) {\n    pendingSession.close();\n    // we don't dispatch a session disconnect event\n    // for a non-identified session, just delete directly\n\n    this.pendingSessions.delete(pendingSession);\n  }\n\n  protected deleteSession(session: ServerSession<ConnType>): void {\n    this.sessionHandshakeMetadata.delete(session.to);\n    super.deleteSession(session);\n  }\n\n  protected handleConnection(conn: ConnType) {\n    if (this.getStatus() !== 'open') return;\n\n    this.log?.info(`new incoming connection`, {\n      ...conn.loggingMetadata,\n      clientId: this.clientId,\n    });\n\n    let receivedHandshake = false;\n    const pendingSession = ServerSessionStateGraph.entrypoint(\n      this.clientId,\n      conn,\n      {\n        onConnectionClosed: () => {\n          this.log?.warn(\n            `connection from unknown closed before handshake finished`,\n            pendingSession.loggingMetadata,\n          );\n\n          this.deletePendingSession(pendingSession);\n        },\n        onConnectionErrored: (err) => {\n          const errorString = coerceErrorString(err);\n          this.log?.warn(\n            `connection from unknown errored before handshake finished: ${errorString}`,\n            pendingSession.loggingMetadata,\n          );\n\n          this.deletePendingSession(pendingSession);\n        },\n        onHandshakeTimeout: () => {\n          this.log?.warn(\n            `connection from unknown timed out before handshake finished`,\n            pendingSession.loggingMetadata,\n          );\n\n          this.deletePendingSession(pendingSession);\n        },\n        onHandshake: (msg) => {\n          if (receivedHandshake) {\n            this.log?.error(\n              `received multiple handshake messages from pending session`,\n              {\n                ...pendingSession.loggingMetadata,\n                connectedTo: msg.from,\n                transportMessage: msg,\n              },\n            );\n\n            this.deletePendingSession(pendingSession);\n            return;\n          }\n\n          // let this resolve async, we just need to make sure its only\n          // called once so we don't race while transitioning to connected\n          // onHandshakeRequest is async as custom validation may be async\n          receivedHandshake = true;\n          void this.onHandshakeRequest(pendingSession, msg);\n        },\n        onInvalidHandshake: (reason, code) => {\n          this.log?.error(\n            `invalid handshake: ${reason}`,\n            pendingSession.loggingMetadata,\n          );\n          this.deletePendingSession(pendingSession);\n          this.protocolError({\n            type: ProtocolError.HandshakeFailed,\n            code,\n            message: reason,\n          });\n        },\n      },\n      this.options,\n      this.log,\n    );\n\n    this.pendingSessions.add(pendingSession);\n  }\n\n  private rejectHandshakeRequest(\n    session: SessionWaitingForHandshake<ConnType>,\n    to: TransportClientId,\n    reason: string,\n    code: Static<typeof HandshakeErrorResponseCodes>,\n    metadata: MessageMetadata,\n  ) {\n    session.conn.telemetry?.span.setStatus({\n      code: SpanStatusCode.ERROR,\n      message: reason,\n    });\n\n    this.log?.warn(reason, metadata);\n\n    session.sendHandshake(\n      handshakeResponseMessage({\n        from: this.clientId,\n        to,\n        status: {\n          ok: false,\n          code,\n          reason,\n        },\n      }),\n    );\n\n    this.protocolError({\n      type: ProtocolError.HandshakeFailed,\n      code,\n      message: reason,\n    });\n    this.deletePendingSession(session);\n  }\n\n  protected async onHandshakeRequest(\n    session: SessionWaitingForHandshake<ConnType>,\n    msg: OpaqueTransportMessage,\n  ) {\n    // invariant: msg is a handshake request\n    if (!Value.Check(ControlMessageHandshakeRequestSchema, msg.payload)) {\n      this.rejectHandshakeRequest(\n        session,\n        msg.from,\n        'received invalid handshake request',\n        'MALFORMED_HANDSHAKE',\n        {\n          ...session.loggingMetadata,\n          transportMessage: msg,\n          connectedTo: msg.from,\n          validationErrors: [\n            ...Value.Errors(ControlMessageHandshakeRequestSchema, msg.payload),\n          ],\n        },\n      );\n\n      return;\n    }\n\n    // invariant: handshake request passes all the validation\n    const gotVersion = msg.payload.protocolVersion;\n    if (!acceptedProtocolVersions.includes(gotVersion)) {\n      this.rejectHandshakeRequest(\n        session,\n        msg.from,\n        `expected protocol version oneof [${acceptedProtocolVersions.toString()}], got ${gotVersion}`,\n        'PROTOCOL_VERSION_MISMATCH',\n        {\n          ...session.loggingMetadata,\n          connectedTo: msg.from,\n          transportMessage: msg,\n        },\n      );\n\n      return;\n    }\n\n    let oldSession = this.sessions.get(msg.from);\n\n    // invariant: must pass custom validation if defined\n    let parsedMetadata: ParsedMetadata = {};\n    if (this.handshakeExtensions) {\n      if (!Value.Check(this.handshakeExtensions.schema, msg.payload.metadata)) {\n        this.rejectHandshakeRequest(\n          session,\n          msg.from,\n          'received malformed handshake metadata',\n          'MALFORMED_HANDSHAKE_META',\n          {\n            ...session.loggingMetadata,\n            connectedTo: msg.from,\n            validationErrors: [\n              ...Value.Errors(\n                this.handshakeExtensions.schema,\n                msg.payload.metadata,\n              ),\n            ],\n          },\n        );\n\n        return;\n      }\n\n      const previousParsedMetadata = oldSession\n        ? this.sessionHandshakeMetadata.get(oldSession.to)\n        : undefined;\n\n      const parsedMetadataOrFailureCode =\n        await this.handshakeExtensions.validate(\n          msg.payload.metadata,\n          previousParsedMetadata,\n        );\n\n      // double-check to make sure we haven't transitioned the session yet\n      if (session._isConsumed) {\n        // bail out, don't need to do anything\n        return;\n      }\n\n      // handler rejected the connection\n      if (\n        Value.Check(\n          HandshakeErrorCustomHandlerFatalResponseCodes,\n          parsedMetadataOrFailureCode,\n        )\n      ) {\n        this.rejectHandshakeRequest(\n          session,\n          msg.from,\n          'rejected by handshake handler',\n          parsedMetadataOrFailureCode,\n          {\n            ...session.loggingMetadata,\n            connectedTo: msg.from,\n            clientId: this.clientId,\n          },\n        );\n\n        return;\n      }\n\n      // success!\n      parsedMetadata = parsedMetadataOrFailureCode;\n    }\n\n    // 4 connect cases\n    // 1. new session\n    //    we dont have a session and the client is requesting a new one\n    //    we can create the session as normal\n    // 2. client is reconnecting to an existing session but we don't have it\n    //    reject this handshake, there's nothing we can do to salvage it\n    // 3. transparent reconnect (old session exists and is the same as the client wants)\n    //    assign to old session\n    // 4. hard reconnect (oldSession exists but but the client wants a new one)\n    //    we close the old session and create a new one\n    let connectCase:\n      | 'new session'\n      | 'unknown session'\n      | 'transparent reconnection'\n      | 'hard reconnection' = 'new session';\n    const clientNextExpectedSeq =\n      msg.payload.expectedSessionState.nextExpectedSeq;\n    const clientNextSentSeq = msg.payload.expectedSessionState.nextSentSeq ?? 0;\n\n    if (\n      this.options.enableTransparentSessionReconnects &&\n      oldSession &&\n      oldSession.id === msg.payload.sessionId\n    ) {\n      connectCase = 'transparent reconnection';\n\n      // invariant: ordering must be correct\n      const ourNextSeq = oldSession.nextSeq();\n      const ourAck = oldSession.ack;\n\n      // two incorrect cases where we cannot permit a reconnect:\n      // - if the client is about to send a message in the future w.r.t to the server\n      //  - client.seq > server.ack => nextSentSeq > oldSession.ack\n      if (clientNextSentSeq > ourAck) {\n        this.rejectHandshakeRequest(\n          session,\n          msg.from,\n          `client is in the future: server wanted next message to be ${ourAck} but client would have sent ${clientNextSentSeq}`,\n          'SESSION_STATE_MISMATCH',\n          {\n            ...session.loggingMetadata,\n            connectedTo: msg.from,\n            transportMessage: msg,\n          },\n        );\n\n        return;\n      }\n\n      // - if the server is about to send a message in the future w.r.t to the client\n      //  - server.seq > client.ack => oldSession.nextSeq() > nextExpectedSeq\n      if (ourNextSeq > clientNextExpectedSeq) {\n        this.rejectHandshakeRequest(\n          session,\n          msg.from,\n          `server is in the future: client wanted next message to be ${clientNextExpectedSeq} but server would have sent ${ourNextSeq}`,\n          'SESSION_STATE_MISMATCH',\n          {\n            ...session.loggingMetadata,\n            connectedTo: msg.from,\n            transportMessage: msg,\n          },\n        );\n\n        return;\n      }\n\n      // transparent reconnect seems ok, proceed by transitioning old session\n      // to not connected\n      if (oldSession.state !== SessionState.NoConnection) {\n        const noConnectionSession =\n          ServerSessionStateGraph.transition.ConnectedToNoConnection(\n            oldSession,\n            {\n              onSessionGracePeriodElapsed: () => {\n                this.onSessionGracePeriodElapsed(noConnectionSession);\n              },\n            },\n          );\n\n        oldSession = noConnectionSession;\n      }\n\n      this.updateSession(oldSession);\n    } else if (oldSession) {\n      connectCase = 'hard reconnection';\n\n      // just nuke the old session entirely and proceed as if this was new\n      this.log?.info(\n        `client is reconnecting to a new session (${msg.payload.sessionId}) with an old session (${oldSession.id}) already existing, closing old session`,\n        {\n          ...session.loggingMetadata,\n          connectedTo: msg.from,\n          sessionId: msg.payload.sessionId,\n        },\n      );\n      this.deleteSession(oldSession);\n      oldSession = undefined;\n    }\n\n    if (!oldSession && (clientNextSentSeq > 0 || clientNextExpectedSeq > 0)) {\n      // we don't have a session, but the client is trying to reconnect\n      // to an old session. we can't do anything about this, so we reject\n      connectCase = 'unknown session';\n\n      const rejectionMessage = this.options.enableTransparentSessionReconnects\n        ? `client is trying to reconnect to a session the server don't know about: ${msg.payload.sessionId}`\n        : `client is attempting a transparent reconnect to a session but the server does not support it: ${msg.payload.sessionId}`;\n\n      this.rejectHandshakeRequest(\n        session,\n        msg.from,\n        rejectionMessage,\n        'SESSION_STATE_MISMATCH',\n        {\n          ...session.loggingMetadata,\n          connectedTo: msg.from,\n          transportMessage: msg,\n        },\n      );\n      return;\n    }\n\n    // from this point on, we're committed to connecting\n    const sessionId = msg.payload.sessionId;\n    this.log?.info(\n      `handshake from ${msg.from} ok (${connectCase}), responding with handshake success`,\n      {\n        ...session.loggingMetadata,\n        connectedTo: msg.from,\n      },\n    );\n\n    const responseMsg = handshakeResponseMessage({\n      from: this.clientId,\n      to: msg.from,\n      status: {\n        ok: true,\n        sessionId,\n      },\n    });\n\n    session.sendHandshake(responseMsg);\n\n    // transition\n    const connectedSession =\n      ServerSessionStateGraph.transition.WaitingForHandshakeToConnected(\n        session,\n        // by this point oldSession is either no connection or we dont have an old session\n        oldSession,\n        sessionId,\n        msg.from,\n        msg.tracing,\n        {\n          onConnectionErrored: (err) => {\n            // just log, when we error we also emit close\n            const errStr = coerceErrorString(err);\n            this.log?.warn(\n              `connection to ${connectedSession.to} errored: ${errStr}`,\n              connectedSession.loggingMetadata,\n            );\n          },\n          onConnectionClosed: () => {\n            this.log?.info(\n              `connection to ${connectedSession.to} closed`,\n              connectedSession.loggingMetadata,\n            );\n            this.onConnClosed(connectedSession);\n          },\n          onMessage: (msg) => this.handleMsg(msg),\n          onInvalidMessage: (reason) => {\n            this.protocolError({\n              type: ProtocolError.MessageOrderingViolated,\n              message: reason,\n            });\n            this.deleteSession(connectedSession);\n          },\n        },\n        gotVersion,\n      );\n\n    this.sessionHandshakeMetadata.set(connectedSession.to, parsedMetadata);\n    this.updateSession(connectedSession);\n    this.pendingSessions.delete(session);\n    connectedSession.startActiveHeartbeat();\n  }\n}\n"],"mappings":"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","names":["msg"]}

package/dist/{chunk-3XKJOFZA.js → chunk-Y3JHOIJ7.js}

@@ -3,7 +3,7 @@ import {
   createSessionTelemetryInfo,
   generateId,
   isAck
-} from "./chunk-BZBEE2VR.js";
+} from "./chunk-3ROTSXAO.js";
 import {
   NaiveJsonCodec
 } from "./chunk-4PVU7J25.js";
@@ -15,6 +15,7 @@ var defaultTransportOptions = {
   sessionDisconnectGraceMs: 5e3,
   connectionTimeoutMs: 2e3,
   handshakeTimeoutMs: 1e3,
+  enableTransparentSessionReconnects: true,
   codec: NaiveJsonCodec
 };
 var defaultConnectionRetryOptions = {
@@ -68,6 +69,7 @@ var StateMachineState = class {
         }
         if (prop === "_handleClose") {
           return () => {
+            target._isConsumed = true;
             target._handleStateExit();
             target._handleClose();
           };
@@ -150,15 +152,18 @@ var IdentifiedSession = class extends CommonSession {
   }
   get loggingMetadata() {
     const spanContext = this.telemetry.span.spanContext();
-    return {
+    const metadata = {
       clientId: this.from,
       connectedTo: this.to,
-      sessionId: this.id,
-      telemetry: {
+      sessionId: this.id
+    };
+    if (this.telemetry.span.isRecording()) {
+      metadata.telemetry = {
         traceId: spanContext.traceId,
         spanId: spanContext.spanId
-      }
-    };
+      };
+    }
+    return metadata;
   }
   constructMsg(partialMsg) {
     const msg = {
@@ -187,9 +192,32 @@ var IdentifiedSession = class extends CommonSession {
     this.telemetry.span.end();
   }
 };
+var IdentifiedSessionWithGracePeriod = class extends IdentifiedSession {
+  graceExpiryTime;
+  gracePeriodTimeout;
+  listeners;
+  constructor(props) {
+    super(props);
+    this.listeners = props.listeners;
+    this.graceExpiryTime = props.graceExpiryTime;
+    this.gracePeriodTimeout = setTimeout(() => {
+      this.listeners.onSessionGracePeriodElapsed();
+    }, this.graceExpiryTime - Date.now());
+  }
+  _handleStateExit() {
+    super._handleStateExit();
+    if (this.gracePeriodTimeout) {
+      clearTimeout(this.gracePeriodTimeout);
+      this.gracePeriodTimeout = void 0;
+    }
+  }
+  _handleClose() {
+    super._handleClose();
+  }
+};
 
 // transport/sessionStateMachine/SessionConnecting.ts
-var SessionConnecting = class extends IdentifiedSession {
+var SessionConnecting = class extends IdentifiedSessionWithGracePeriod {
   state = "Connecting" /* Connecting */;
   connPromise;
   listeners;
@@ -198,9 +226,6 @@ var SessionConnecting = class extends IdentifiedSession {
     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)
@@ -213,17 +238,33 @@ var SessionConnecting = class extends IdentifiedSession {
         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) => conn.close()).catch(() => {
+    const logger = this.log;
+    const metadata = this.loggingMetadata;
+    this.connPromise.then((conn) => {
+      conn.close();
+      logger?.info(
+        "connection eventually resolved but session has transitioned, closed connection",
+        {
+          ...metadata,
+          ...conn.loggingMetadata
+        }
+      );
+    }).catch(() => {
     });
   }
   _handleStateExit() {
     super._handleStateExit();
-    clearTimeout(this.connectionTimeout);
-    this.connectionTimeout = void 0;
+    if (this.connectionTimeout) {
+      clearTimeout(this.connectionTimeout);
+      this.connectionTimeout = void 0;
+    }
   }
   _handleClose() {
     this.bestEffortClose();
@@ -232,26 +273,13 @@ var SessionConnecting = class extends IdentifiedSession {
 };
 
 // transport/sessionStateMachine/SessionNoConnection.ts
-var SessionNoConnection = class extends IdentifiedSession {
+var SessionNoConnection = class extends IdentifiedSessionWithGracePeriod {
   state = "NoConnection" /* NoConnection */;
-  listeners;
-  gracePeriodTimeout;
-  constructor(props) {
-    super(props);
-    this.listeners = props.listeners;
-    this.gracePeriodTimeout = setTimeout(() => {
-      this.listeners.onSessionGracePeriodElapsed();
-    }, this.options.sessionDisconnectGraceMs);
-  }
   _handleClose() {
     super._handleClose();
   }
   _handleStateExit() {
     super._handleStateExit();
-    if (this.gracePeriodTimeout) {
-      clearTimeout(this.gracePeriodTimeout);
-      this.gracePeriodTimeout = void 0;
-    }
   }
 };
 
@@ -272,20 +300,24 @@ var SessionWaitingForHandshake = class extends CommonSession {
     this.conn.addErrorListener(this.listeners.onConnectionErrored);
     this.conn.addCloseListener(this.listeners.onConnectionClosed);
   }
+  get loggingMetadata() {
+    return {
+      clientId: this.from,
+      connId: this.conn.id,
+      ...this.conn.loggingMetadata
+    };
+  }
   onHandshakeData = (msg) => {
     const parsedMsg = this.parseMsg(msg);
     if (parsedMsg === null) {
-      this.listeners.onInvalidHandshake("could not parse message");
+      this.listeners.onInvalidHandshake(
+        "could not parse message",
+        "MALFORMED_HANDSHAKE"
+      );
       return;
     }
     this.listeners.onHandshake(parsedMsg);
   };
-  get loggingMetadata() {
-    return {
-      clientId: this.from,
-      connId: this.conn.id
-    };
-  }
   sendHandshake(msg) {
     return this.conn.send(this.options.codec.toBuffer(msg));
   }
@@ -302,7 +334,7 @@ var SessionWaitingForHandshake = class extends CommonSession {
 };
 
 // transport/sessionStateMachine/SessionHandshaking.ts
-var SessionHandshaking = class extends IdentifiedSession {
+var SessionHandshaking = class extends IdentifiedSessionWithGracePeriod {
   state = "Handshaking" /* Handshaking */;
   conn;
   listeners;
@@ -318,10 +350,19 @@ var SessionHandshaking = class extends IdentifiedSession {
     this.conn.addErrorListener(this.listeners.onConnectionErrored);
     this.conn.addCloseListener(this.listeners.onConnectionClosed);
   }
+  get loggingMetadata() {
+    return {
+      ...super.loggingMetadata,
+      ...this.conn.loggingMetadata
+    };
+  }
   onHandshakeData = (msg) => {
     const parsedMsg = this.parseMsg(msg);
     if (parsedMsg === null) {
-      this.listeners.onInvalidHandshake("could not parse message");
+      this.listeners.onInvalidHandshake(
+        "could not parse message",
+        "MALFORMED_HANDSHAKE"
+      );
       return;
     }
     this.listeners.onHandshake(parsedMsg);
@@ -334,7 +375,10 @@ var SessionHandshaking = class extends IdentifiedSession {
     this.conn.removeDataListener(this.onHandshakeData);
     this.conn.removeErrorListener(this.listeners.onConnectionErrored);
     this.conn.removeCloseListener(this.listeners.onConnectionClosed);
-    clearTimeout(this.handshakeTimeout);
+    if (this.handshakeTimeout) {
+      clearTimeout(this.handshakeTimeout);
+      this.handshakeTimeout = void 0;
+    }
   }
   _handleClose() {
     super._handleClose();
@@ -399,6 +443,12 @@ var SessionConnected = class extends IdentifiedSession {
       this.heartbeatMisses++;
     }, this.options.heartbeatIntervalMs);
   }
+  get loggingMetadata() {
+    return {
+      ...super.loggingMetadata,
+      ...this.conn.loggingMetadata
+    };
+  }
   startActiveHeartbeat() {
     this.isActivelyHeartbeating = true;
   }
@@ -414,8 +464,10 @@ var SessionConnected = class extends IdentifiedSession {
   }
   onMessageData = (msg) => {
     const parsedMsg = this.parseMsg(msg);
-    if (parsedMsg === null)
+    if (parsedMsg === null) {
+      this.listeners.onInvalidMessage("could not parse message");
       return;
+    }
     if (parsedMsg.seq !== this.ack) {
       if (parsedMsg.seq < this.ack) {
         this.log?.debug(
@@ -472,7 +524,7 @@ var SessionConnected = class extends IdentifiedSession {
 };
 
 // transport/sessionStateMachine/SessionBackingOff.ts
-var SessionBackingOff = class extends IdentifiedSession {
+var SessionBackingOff = class extends IdentifiedSessionWithGracePeriod {
   state = "BackingOff" /* BackingOff */;
   listeners;
   backoffTimeout;
@@ -510,6 +562,12 @@ function inheritSharedSession(session) {
     protocolVersion: session.protocolVersion
   };
 }
+function inheritSharedSessionWithGrace(session) {
+  return {
+    ...inheritSharedSession(session),
+    graceExpiryTime: session.graceExpiryTime
+  };
+}
 var SessionStateGraph = {
   entrypoints: {
     NoConnection: (to, from, listeners, options, protocolVersion, log) => {
@@ -523,6 +581,7 @@ var SessionStateGraph = {
         to,
         seq: 0,
         ack: 0,
+        graceExpiryTime: Date.now() + options.sessionDisconnectGraceMs,
         sendBuffer,
         telemetry,
         options,
@@ -555,7 +614,7 @@ var SessionStateGraph = {
   transition: {
     // happy path transitions
     NoConnectionToBackingOff: (oldSession, backoffMs, listeners) => {
-      const carriedState = inheritSharedSession(oldSession);
+      const carriedState = inheritSharedSessionWithGrace(oldSession);
       oldSession._handleStateExit();
       const session = new SessionBackingOff({
         backoffMs,
@@ -572,7 +631,7 @@ var SessionStateGraph = {
       return session;
     },
     BackingOffToConnecting: (oldSession, connPromise, listeners) => {
-      const carriedState = inheritSharedSession(oldSession);
+      const carriedState = inheritSharedSessionWithGrace(oldSession);
       oldSession._handleStateExit();
       const session = new SessionConnecting({
         connPromise,
@@ -589,7 +648,7 @@ var SessionStateGraph = {
       return session;
     },
     ConnectingToHandshaking: (oldSession, conn, listeners) => {
-      const carriedState = inheritSharedSession(oldSession);
+      const carriedState = inheritSharedSessionWithGrace(oldSession);
       oldSession._handleStateExit();
       const session = new SessionHandshaking({
         conn,
@@ -667,9 +726,12 @@ var SessionStateGraph = {
     },
     // disconnect paths
     BackingOffToNoConnection: (oldSession, listeners) => {
-      const carriedState = inheritSharedSession(oldSession);
+      const carriedState = inheritSharedSessionWithGrace(oldSession);
       oldSession._handleStateExit();
-      const session = new SessionNoConnection({ listeners, ...carriedState });
+      const session = new SessionNoConnection({
+        listeners,
+        ...carriedState
+      });
       session.log?.info(
         `session ${session.id} transition from BackingOff to NoConnection`,
         {
@@ -680,10 +742,13 @@ var SessionStateGraph = {
       return session;
     },
     ConnectingToNoConnection: (oldSession, listeners) => {
-      const carriedState = inheritSharedSession(oldSession);
+      const carriedState = inheritSharedSessionWithGrace(oldSession);
       oldSession.bestEffortClose();
       oldSession._handleStateExit();
-      const session = new SessionNoConnection({ listeners, ...carriedState });
+      const session = new SessionNoConnection({
+        listeners,
+        ...carriedState
+      });
       session.log?.info(
         `session ${session.id} transition from Connecting to NoConnection`,
         {
@@ -694,10 +759,13 @@ var SessionStateGraph = {
       return session;
     },
     HandshakingToNoConnection: (oldSession, listeners) => {
-      const carriedState = inheritSharedSession(oldSession);
+      const carriedState = inheritSharedSessionWithGrace(oldSession);
       oldSession.conn.close();
       oldSession._handleStateExit();
-      const session = new SessionNoConnection({ listeners, ...carriedState });
+      const session = new SessionNoConnection({
+        listeners,
+        ...carriedState
+      });
       session.log?.info(
         `session ${session.id} transition from Handshaking to NoConnection`,
         {
@@ -709,9 +777,14 @@ var SessionStateGraph = {
     },
     ConnectedToNoConnection: (oldSession, listeners) => {
       const carriedState = inheritSharedSession(oldSession);
+      const graceExpiryTime = Date.now() + oldSession.options.sessionDisconnectGraceMs;
       oldSession.conn.close();
       oldSession._handleStateExit();
-      const session = new SessionNoConnection({ listeners, ...carriedState });
+      const session = new SessionNoConnection({
+        listeners,
+        graceExpiryTime,
+        ...carriedState
+      });
       session.log?.info(
         `session ${session.id} transition from Connected to NoConnection`,
         {
@@ -728,24 +801,42 @@ var ClientSessionStateGraph = {
   entrypoint: SessionStateGraph.entrypoints.NoConnection,
   transition: {
     // happy paths
+    // NoConnection -> BackingOff: attempt to connect
     NoConnectionToBackingOff: transitions.NoConnectionToBackingOff,
+    // BackingOff -> Connecting: backoff period elapsed, start connection
     BackingOffToConnecting: transitions.BackingOffToConnecting,
+    // Connecting -> Handshaking: connection established, start handshake
     ConnectingToHandshaking: transitions.ConnectingToHandshaking,
+    // Handshaking -> Connected: handshake complete, session ready
     HandshakingToConnected: transitions.HandshakingToConnected,
     // disconnect paths
+    // BackingOff -> NoConnection: unused
     BackingOffToNoConnection: transitions.BackingOffToNoConnection,
+    // Connecting -> NoConnection: connection failed or connection timeout
     ConnectingToNoConnection: transitions.ConnectingToNoConnection,
+    // Handshaking -> NoConnection: connection closed or handshake timeout
     HandshakingToNoConnection: transitions.HandshakingToNoConnection,
+    // Connected -> NoConnection: connection closed
     ConnectedToNoConnection: transitions.ConnectedToNoConnection
+    // destroy/close paths
+    // NoConnection -> x: grace period elapsed
+    // BackingOff -> x: grace period elapsed
+    // Connecting -> x: grace period elapsed
+    // Handshaking -> x: grace period elapsed or invalid handshake message or handshake rejection
+    // Connected -> x: grace period elapsed or invalid message
   }
 };
 var ServerSessionStateGraph = {
   entrypoint: SessionStateGraph.entrypoints.WaitingForHandshake,
   transition: {
     // happy paths
+    // WaitingForHandshake -> Connected: handshake complete, session ready
     WaitingForHandshakeToConnected: transitions.WaitingForHandshakeToConnected,
     // disconnect paths
+    // Connected -> NoConnection: connection closed
     ConnectedToNoConnection: transitions.ConnectedToNoConnection
+    // destroy/close paths
+    // WaitingForHandshake -> x: handshake timeout elapsed or invalid handshake message or handshake rejection or connection closed
   }
 };
 
@@ -758,4 +849,4 @@ export {
   ClientSessionStateGraph,
   ServerSessionStateGraph
 };
-//# sourceMappingURL=chunk-3XKJOFZA.js.map
+//# sourceMappingURL=chunk-Y3JHOIJ7.js.map