@replit/river 0.207.1 → 0.207.3

package/dist/testUtil/index.cjs

@@ -235,23 +235,20 @@ var NaiveJsonCodec = {
     );
   },
   fromBuffer: (buff) => {
-    try {
-      const parsed = JSON.parse(
-        decoder.decode(buff),
-        function reviver(_key, val) {
-          if (val?.$t) {
-            return base64ToUint8Array(val.$t);
-          } else {
-            return val;
-          }
+    const parsed = JSON.parse(
+      decoder.decode(buff),
+      function reviver(_key, val) {
+        if (val?.$t) {
+          return base64ToUint8Array(val.$t);
+        } else {
+          return val;
         }
-      );
-      if (typeof parsed === "object")
-        return parsed;
-      return null;
-    } catch {
-      return null;
+      }
+    );
+    if (typeof parsed !== "object" || parsed === null) {
+      throw new Error("unpacked msg is not an object");
     }
+    return parsed;
   }
 };
 
@@ -281,7 +278,6 @@ var defaultServerTransportOptions = {
 };
 
 // transport/sessionStateMachine/common.ts
-var import_value = require("@sinclair/typebox/value");
 var ERR_CONSUMED = `session state has been consumed and is no longer valid`;
 var StateMachineState = class {
   /*
@@ -341,34 +337,16 @@ var StateMachineState = class {
 var CommonSession = class extends StateMachineState {
   from;
   options;
+  codec;
   tracer;
   log;
-  constructor({ from, options, log, tracer }) {
+  constructor({ from, options, log, tracer, codec }) {
     super();
     this.from = from;
     this.options = options;
     this.log = log;
     this.tracer = tracer;
-  }
-  parseMsg(msg) {
-    const parsedMsg = this.options.codec.fromBuffer(msg);
-    if (parsedMsg === null) {
-      this.log?.error(
-        `received malformed msg: ${Buffer.from(msg).toString("base64")}`,
-        this.loggingMetadata
-      );
-      return null;
-    }
-    if (!import_value.Value.Check(OpaqueTransportMessageSchema, parsedMsg)) {
-      this.log?.error(`received invalid msg: ${JSON.stringify(parsedMsg)}`, {
-        ...this.loggingMetadata,
-        validationErrors: [
-          ...import_value.Value.Errors(OpaqueTransportMessageSchema, parsedMsg)
-        ]
-      });
-      return null;
-    }
-    return parsedMsg;
+    this.codec = codec;
   }
 };
 var IdentifiedSession = class extends CommonSession {
@@ -428,9 +406,6 @@ var IdentifiedSession = class extends CommonSession {
     return metadata;
   }
   constructMsg(partialMsg) {
-    if (this._isConsumed) {
-      throw new Error(ERR_CONSUMED);
-    }
     const msg = {
       ...partialMsg,
       id: generateId(),
@@ -448,7 +423,10 @@ var IdentifiedSession = class extends CommonSession {
   send(msg) {
     const constructedMsg = this.constructMsg(msg);
     this.sendBuffer.push(constructedMsg);
-    return constructedMsg.id;
+    return {
+      ok: true,
+      value: constructedMsg.id
+    };
   }
   _handleStateExit() {
   }
@@ -480,6 +458,23 @@ var IdentifiedSessionWithGracePeriod = class extends IdentifiedSession {
     super._handleClose();
   }
 };
+function sendMessage(conn, codec, msg) {
+  const buff = codec.toBuffer(msg);
+  if (!buff.ok) {
+    return buff;
+  }
+  const sent = conn.send(buff.value);
+  if (!sent) {
+    return {
+      ok: false,
+      reason: "failed to send message"
+    };
+  }
+  return {
+    ok: true,
+    value: msg.id
+  };
+}
 
 // transport/sessionStateMachine/SessionConnecting.ts
 var SessionConnecting = class extends IdentifiedSessionWithGracePeriod {
@@ -532,8 +527,8 @@ var SessionConnecting = class extends IdentifiedSessionWithGracePeriod {
     }
   }
   _handleClose() {
-    this.bestEffortClose();
     super._handleClose();
+    this.bestEffortClose();
   }
 };
 
@@ -560,7 +555,7 @@ function coerceErrorString(err) {
 }
 
 // package.json
-var version = "0.207.1";
+var version = "0.207.3";
 
 // tracing/index.ts
 function getPropagationContext(ctx) {
@@ -632,18 +627,18 @@ var SessionWaitingForHandshake = class extends CommonSession {
     };
   }
   onHandshakeData = (msg) => {
-    const parsedMsg = this.parseMsg(msg);
-    if (parsedMsg === null) {
+    const parsedMsgRes = this.codec.fromBuffer(msg);
+    if (!parsedMsgRes.ok) {
       this.listeners.onInvalidHandshake(
-        "could not parse message",
+        `could not parse handshake message: ${parsedMsgRes.reason}`,
         "MALFORMED_HANDSHAKE"
       );
       return;
     }
-    this.listeners.onHandshake(parsedMsg);
+    this.listeners.onHandshake(parsedMsgRes.value);
   };
   sendHandshake(msg) {
-    return this.conn.send(this.options.codec.toBuffer(msg));
+    return sendMessage(this.conn, this.codec, msg);
   }
   _handleStateExit() {
     this.conn.removeDataListener(this.onHandshakeData);
@@ -681,18 +676,18 @@ var SessionHandshaking = class extends IdentifiedSessionWithGracePeriod {
     };
   }
   onHandshakeData = (msg) => {
-    const parsedMsg = this.parseMsg(msg);
-    if (parsedMsg === null) {
+    const parsedMsgRes = this.codec.fromBuffer(msg);
+    if (!parsedMsgRes.ok) {
       this.listeners.onInvalidHandshake(
-        "could not parse message",
+        `could not parse handshake message: ${parsedMsgRes.reason}`,
         "MALFORMED_HANDSHAKE"
       );
       return;
     }
-    this.listeners.onHandshake(parsedMsg);
+    this.listeners.onHandshake(parsedMsgRes.value);
   };
   sendHandshake(msg) {
-    return this.conn.send(this.options.codec.toBuffer(msg));
+    return sendMessage(this.conn, this.codec, msg);
   }
   _handleStateExit() {
     super._handleStateExit();
@@ -717,12 +712,15 @@ var SessionConnected = class extends IdentifiedSession {
   conn;
   listeners;
   heartbeatHandle;
-  heartbeatMisses = 0;
-  isActivelyHeartbeating;
+  heartbeatMissTimeout;
+  isActivelyHeartbeating = false;
   updateBookkeeping(ack, seq) {
     this.sendBuffer = this.sendBuffer.filter((unacked) => unacked.seq >= ack);
     this.ack = seq + 1;
-    this.heartbeatMisses = 0;
+    if (this.heartbeatMissTimeout) {
+      clearTimeout(this.heartbeatMissTimeout);
+    }
+    this.startMissingHeartbeatTimeout();
   }
   assertSendOrdering(constructedMsg) {
     if (constructedMsg.seq > this.seqSent + 1) {
@@ -739,9 +737,13 @@ var SessionConnected = class extends IdentifiedSession {
     const constructedMsg = this.constructMsg(msg);
     this.assertSendOrdering(constructedMsg);
     this.sendBuffer.push(constructedMsg);
-    this.conn.send(this.options.codec.toBuffer(constructedMsg));
+    const res = sendMessage(this.conn, this.codec, constructedMsg);
+    if (!res.ok) {
+      this.listeners.onMessageSendFailure(constructedMsg, res.reason);
+      return res;
+    }
     this.seqSent = constructedMsg.seq;
-    return constructedMsg.id;
+    return res;
   }
   constructor(props) {
     super(props);
@@ -750,6 +752,8 @@ var SessionConnected = class extends IdentifiedSession {
     this.conn.addDataListener(this.onMessageData);
     this.conn.addCloseListener(this.listeners.onConnectionClosed);
     this.conn.addErrorListener(this.listeners.onConnectionErrored);
+  }
+  sendBufferedMessages() {
     if (this.sendBuffer.length > 0) {
       this.log?.info(
         `sending ${this.sendBuffer.length} buffered messages, starting at seq ${this.nextSeq()}`,
@@ -757,30 +761,15 @@ var SessionConnected = class extends IdentifiedSession {
       );
       for (const msg of this.sendBuffer) {
         this.assertSendOrdering(msg);
-        this.conn.send(this.options.codec.toBuffer(msg));
+        const res = sendMessage(this.conn, this.codec, msg);
+        if (!res.ok) {
+          this.listeners.onMessageSendFailure(msg, res.reason);
+          return res;
+        }
         this.seqSent = msg.seq;
       }
     }
-    this.isActivelyHeartbeating = false;
-    this.heartbeatHandle = setInterval(() => {
-      const misses = this.heartbeatMisses;
-      const missDuration = misses * this.options.heartbeatIntervalMs;
-      if (misses >= this.options.heartbeatsUntilDead) {
-        this.log?.info(
-          `closing connection to ${this.to} due to inactivity (missed ${misses} heartbeats which is ${missDuration}ms)`,
-          this.loggingMetadata
-        );
-        this.telemetry.span.addEvent("closing connection due to inactivity");
-        this.conn.close();
-        clearInterval(this.heartbeatHandle);
-        this.heartbeatHandle = void 0;
-        return;
-      }
-      if (this.isActivelyHeartbeating) {
-        this.sendHeartbeat();
-      }
-      this.heartbeatMisses++;
-    }, this.options.heartbeatIntervalMs);
+    return { ok: true, value: void 0 };
   }
   get loggingMetadata() {
     return {
@@ -788,31 +777,46 @@ var SessionConnected = class extends IdentifiedSession {
       ...this.conn.loggingMetadata
     };
   }
+  startMissingHeartbeatTimeout() {
+    const maxMisses = this.options.heartbeatsUntilDead;
+    const missDuration = maxMisses * this.options.heartbeatIntervalMs;
+    this.heartbeatMissTimeout = setTimeout(() => {
+      this.log?.info(
+        `closing connection to ${this.to} due to inactivity (missed ${maxMisses} heartbeats which is ${missDuration}ms)`,
+        this.loggingMetadata
+      );
+      this.telemetry.span.addEvent(
+        "closing connection due to missing heartbeat"
+      );
+      this.conn.close();
+    }, missDuration);
+  }
   startActiveHeartbeat() {
     this.isActivelyHeartbeating = true;
+    this.heartbeatHandle = setInterval(() => {
+      this.sendHeartbeat();
+    }, this.options.heartbeatIntervalMs);
   }
   sendHeartbeat() {
     this.log?.debug("sending heartbeat", this.loggingMetadata);
-    this.send({
+    const heartbeat = {
       streamId: "heartbeat",
       controlFlags: 1 /* AckBit */,
       payload: {
         type: "ACK"
       }
-    });
-  }
-  closeConnection() {
-    this.conn.removeDataListener(this.onMessageData);
-    this.conn.removeCloseListener(this.listeners.onConnectionClosed);
-    this.conn.removeErrorListener(this.listeners.onConnectionErrored);
-    this.conn.close();
+    };
+    this.send(heartbeat);
   }
   onMessageData = (msg) => {
-    const parsedMsg = this.parseMsg(msg);
-    if (parsedMsg === null) {
-      this.listeners.onInvalidMessage("could not parse message");
+    const parsedMsgRes = this.codec.fromBuffer(msg);
+    if (!parsedMsgRes.ok) {
+      this.listeners.onInvalidMessage(
+        `could not parse message: ${parsedMsgRes.reason}`
+      );
       return;
     }
+    const parsedMsg = parsedMsgRes.value;
     if (parsedMsg.seq !== this.ack) {
       if (parsedMsg.seq < this.ack) {
         this.log?.debug(
@@ -833,7 +837,7 @@ var SessionConnected = class extends IdentifiedSession {
           code: import_api2.SpanStatusCode.ERROR,
           message: reason
         });
-        this.closeConnection();
+        this.conn.close();
       }
       return;
     }
@@ -851,9 +855,7 @@ var SessionConnected = class extends IdentifiedSession {
       transportMessage: parsedMsg
     });
     if (!this.isActivelyHeartbeating) {
-      void Promise.resolve().then(() => {
-        this.sendHeartbeat();
-      });
+      this.sendHeartbeat();
     }
   };
   _handleStateExit() {
@@ -865,6 +867,10 @@ var SessionConnected = class extends IdentifiedSession {
       clearInterval(this.heartbeatHandle);
       this.heartbeatHandle = void 0;
     }
+    if (this.heartbeatMissTimeout) {
+      clearTimeout(this.heartbeatMissTimeout);
+      this.heartbeatMissTimeout = void 0;
+    }
   }
   _handleClose() {
     super._handleClose();
@@ -896,485 +902,108 @@ var SessionBackingOff = class extends IdentifiedSessionWithGracePeriod {
   }
 };
 
-// transport/sessionStateMachine/transitions.ts
-function inheritSharedSession(session) {
-  return {
-    id: session.id,
-    from: session.from,
-    to: session.to,
-    seq: session.seq,
-    ack: session.ack,
-    seqSent: session.seqSent,
-    sendBuffer: session.sendBuffer,
-    telemetry: session.telemetry,
-    options: session.options,
-    log: session.log,
-    tracer: session.tracer,
-    protocolVersion: session.protocolVersion
-  };
-}
-function inheritSharedSessionWithGrace(session) {
-  return {
-    ...inheritSharedSession(session),
-    graceExpiryTime: session.graceExpiryTime
+// codec/adapter.ts
+var import_value3 = require("@sinclair/typebox/value");
+
+// logging/log.ts
+var import_api3 = require("@opentelemetry/api");
+var LoggingLevels = {
+  debug: -1,
+  info: 0,
+  warn: 1,
+  error: 2
+};
+var cleanedLogFn = (log) => {
+  return (msg, metadata) => {
+    if (metadata && !metadata.telemetry) {
+      const span = import_api3.trace.getSpan(import_api3.context.active());
+      if (span) {
+        metadata.telemetry = {
+          traceId: span.spanContext().traceId,
+          spanId: span.spanContext().spanId
+        };
+      }
+    }
+    if (!metadata?.transportMessage) {
+      log(msg, metadata);
+      return;
+    }
+    const { payload, ...rest } = metadata.transportMessage;
+    metadata.transportMessage = rest;
+    log(msg, metadata);
   };
-}
-var SessionStateGraph = {
-  entrypoints: {
-    NoConnection: (to, from, listeners, options, protocolVersion, tracer, log) => {
-      const id = `session-${generateId()}`;
-      const telemetry = createSessionTelemetryInfo(tracer, id, to, from);
-      const sendBuffer = [];
-      const session = new SessionNoConnection({
-        listeners,
-        id,
-        from,
-        to,
-        seq: 0,
-        ack: 0,
-        seqSent: 0,
-        graceExpiryTime: Date.now() + options.sessionDisconnectGraceMs,
-        sendBuffer,
-        telemetry,
-        options,
-        protocolVersion,
-        tracer,
-        log
-      });
-      session.log?.info(`session ${session.id} created in NoConnection state`, {
-        ...session.loggingMetadata,
-        tags: ["state-transition"]
-      });
-      return session;
-    },
-    WaitingForHandshake: (from, conn, listeners, options, tracer, log) => {
-      const session = new SessionWaitingForHandshake({
-        conn,
-        listeners,
-        from,
-        options,
-        tracer,
-        log
-      });
-      session.log?.info(`session created in WaitingForHandshake state`, {
-        ...session.loggingMetadata,
-        tags: ["state-transition"]
-      });
-      return session;
+};
+var BaseLogger = class {
+  minLevel;
+  output;
+  constructor(output, minLevel = "info") {
+    this.minLevel = minLevel;
+    this.output = output;
+  }
+  debug(msg, metadata) {
+    if (LoggingLevels[this.minLevel] <= LoggingLevels.debug) {
+      this.output(msg, metadata ?? {}, "debug");
     }
-  },
-  // All of the transitions 'move'/'consume' the old session and return a new one.
-  // After a session is transitioned, any usage of the old session will throw.
-  transition: {
-    // happy path transitions
-    NoConnectionToBackingOff: (oldSession, backoffMs, listeners) => {
-      const carriedState = inheritSharedSessionWithGrace(oldSession);
-      oldSession._handleStateExit();
-      const session = new SessionBackingOff({
-        backoffMs,
-        listeners,
-        ...carriedState
-      });
-      session.log?.info(
-        `session ${session.id} transition from NoConnection to BackingOff`,
-        {
-          ...session.loggingMetadata,
-          tags: ["state-transition"]
-        }
-      );
-      return session;
-    },
-    BackingOffToConnecting: (oldSession, connPromise, listeners) => {
-      const carriedState = inheritSharedSessionWithGrace(oldSession);
-      oldSession._handleStateExit();
-      const session = new SessionConnecting({
-        connPromise,
-        listeners,
-        ...carriedState
-      });
-      session.log?.info(
-        `session ${session.id} transition from BackingOff to Connecting`,
-        {
-          ...session.loggingMetadata,
-          tags: ["state-transition"]
-        }
-      );
-      return session;
-    },
-    ConnectingToHandshaking: (oldSession, conn, listeners) => {
-      const carriedState = inheritSharedSessionWithGrace(oldSession);
-      oldSession._handleStateExit();
-      const session = new SessionHandshaking({
-        conn,
-        listeners,
-        ...carriedState
-      });
-      conn.telemetry = createConnectionTelemetryInfo(
-        session.tracer,
-        conn,
-        session.telemetry
-      );
-      session.log?.info(
-        `session ${session.id} transition from Connecting to Handshaking`,
-        {
-          ...session.loggingMetadata,
-          tags: ["state-transition"]
-        }
-      );
-      return session;
-    },
-    HandshakingToConnected: (oldSession, listeners) => {
-      const carriedState = inheritSharedSession(oldSession);
-      const conn = oldSession.conn;
-      oldSession._handleStateExit();
-      const session = new SessionConnected({
-        conn,
-        listeners,
-        ...carriedState
-      });
-      session.log?.info(
-        `session ${session.id} transition from Handshaking to Connected`,
-        {
-          ...session.loggingMetadata,
-          tags: ["state-transition"]
-        }
-      );
-      return session;
-    },
-    WaitingForHandshakeToConnected: (pendingSession, oldSession, sessionId, to, propagationCtx, listeners, protocolVersion) => {
-      const conn = pendingSession.conn;
-      const { from, options } = pendingSession;
-      const carriedState = oldSession ? (
-        // old session exists, inherit state
-        inheritSharedSession(oldSession)
-      ) : (
-        // old session does not exist, create new state
-        {
-          id: sessionId,
-          from,
-          to,
-          seq: 0,
-          ack: 0,
-          seqSent: 0,
-          sendBuffer: [],
-          telemetry: createSessionTelemetryInfo(
-            pendingSession.tracer,
-            sessionId,
-            to,
-            from,
-            propagationCtx
-          ),
-          options,
-          tracer: pendingSession.tracer,
-          log: pendingSession.log,
-          protocolVersion
-        }
-      );
-      pendingSession._handleStateExit();
-      oldSession?._handleStateExit();
-      const session = new SessionConnected({
-        conn,
-        listeners,
-        ...carriedState
-      });
-      conn.telemetry = createConnectionTelemetryInfo(
-        session.tracer,
-        conn,
-        session.telemetry
-      );
-      session.log?.info(
-        `session ${session.id} transition from WaitingForHandshake to Connected`,
-        {
-          ...session.loggingMetadata,
-          tags: ["state-transition"]
-        }
-      );
-      return session;
-    },
-    // disconnect paths
-    BackingOffToNoConnection: (oldSession, listeners) => {
-      const carriedState = inheritSharedSessionWithGrace(oldSession);
-      oldSession._handleStateExit();
-      const session = new SessionNoConnection({
-        listeners,
-        ...carriedState
-      });
-      session.log?.info(
-        `session ${session.id} transition from BackingOff to NoConnection`,
-        {
-          ...session.loggingMetadata,
-          tags: ["state-transition"]
-        }
-      );
-      return session;
-    },
-    ConnectingToNoConnection: (oldSession, listeners) => {
-      const carriedState = inheritSharedSessionWithGrace(oldSession);
-      oldSession.bestEffortClose();
-      oldSession._handleStateExit();
-      const session = new SessionNoConnection({
-        listeners,
-        ...carriedState
-      });
-      session.log?.info(
-        `session ${session.id} transition from Connecting to NoConnection`,
-        {
-          ...session.loggingMetadata,
-          tags: ["state-transition"]
-        }
-      );
-      return session;
-    },
-    HandshakingToNoConnection: (oldSession, listeners) => {
-      const carriedState = inheritSharedSessionWithGrace(oldSession);
-      oldSession.conn.close();
-      oldSession._handleStateExit();
-      const session = new SessionNoConnection({
-        listeners,
-        ...carriedState
-      });
-      session.log?.info(
-        `session ${session.id} transition from Handshaking to NoConnection`,
-        {
-          ...session.loggingMetadata,
-          tags: ["state-transition"]
-        }
-      );
-      return session;
-    },
-    ConnectedToNoConnection: (oldSession, listeners) => {
-      const carriedState = inheritSharedSession(oldSession);
-      const graceExpiryTime = Date.now() + oldSession.options.sessionDisconnectGraceMs;
-      oldSession.conn.close();
-      oldSession._handleStateExit();
-      const session = new SessionNoConnection({
-        listeners,
-        graceExpiryTime,
-        ...carriedState
-      });
-      session.log?.info(
-        `session ${session.id} transition from Connected to NoConnection`,
-        {
-          ...session.loggingMetadata,
-          tags: ["state-transition"]
-        }
-      );
-      return session;
+  }
+  info(msg, metadata) {
+    if (LoggingLevels[this.minLevel] <= LoggingLevels.info) {
+      this.output(msg, metadata ?? {}, "info");
     }
   }
-};
-var transitions = SessionStateGraph.transition;
-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
+  warn(msg, metadata) {
+    if (LoggingLevels[this.minLevel] <= LoggingLevels.warn) {
+      this.output(msg, metadata ?? {}, "warn");
+    }
   }
-};
-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
+  error(msg, metadata) {
+    if (LoggingLevels[this.minLevel] <= LoggingLevels.error) {
+      this.output(msg, metadata ?? {}, "error");
+    }
   }
 };
+var createLogProxy = (log) => ({
+  debug: cleanedLogFn(log.debug.bind(log)),
+  info: cleanedLogFn(log.info.bind(log)),
+  warn: cleanedLogFn(log.warn.bind(log)),
+  error: cleanedLogFn(log.error.bind(log))
+});
 
-// transport/client.ts
-var import_api4 = require("@opentelemetry/api");
-
-// transport/rateLimit.ts
-var LeakyBucketRateLimit = class {
-  budgetConsumed;
-  intervalHandle;
-  options;
-  constructor(options) {
-    this.options = options;
-    this.budgetConsumed = 0;
-  }
-  getBackoffMs() {
-    if (this.getBudgetConsumed() === 0) {
-      return 0;
-    }
-    const exponent = Math.max(0, this.getBudgetConsumed() - 1);
-    const jitter = Math.floor(Math.random() * this.options.maxJitterMs);
-    const backoffMs = Math.min(
-      this.options.baseIntervalMs * 2 ** exponent,
-      this.options.maxBackoffMs
-    );
-    return backoffMs + jitter;
-  }
-  get totalBudgetRestoreTime() {
-    return this.options.budgetRestoreIntervalMs * this.options.attemptBudgetCapacity;
-  }
-  consumeBudget() {
-    this.stopLeak();
-    this.budgetConsumed = this.getBudgetConsumed() + 1;
-  }
-  getBudgetConsumed() {
-    return this.budgetConsumed;
+// transport/events.ts
+var ProtocolError = {
+  RetriesExceeded: "conn_retry_exceeded",
+  HandshakeFailed: "handshake_failed",
+  MessageOrderingViolated: "message_ordering_violated",
+  InvalidMessage: "invalid_message",
+  MessageSendFailure: "message_send_failure"
+};
+var EventDispatcher = class {
+  eventListeners = {};
+  removeAllListeners() {
+    this.eventListeners = {};
   }
-  hasBudget() {
-    return this.getBudgetConsumed() < this.options.attemptBudgetCapacity;
+  numberOfListeners(eventType) {
+    return this.eventListeners[eventType]?.size ?? 0;
   }
-  startRestoringBudget() {
-    if (this.intervalHandle) {
-      return;
+  addEventListener(eventType, handler) {
+    if (!this.eventListeners[eventType]) {
+      this.eventListeners[eventType] = /* @__PURE__ */ new Set();
     }
-    const restoreBudgetForUser = () => {
-      const currentBudget = this.budgetConsumed;
-      if (!currentBudget) {
-        this.stopLeak();
-        return;
-      }
-      const newBudget = currentBudget - 1;
-      if (newBudget === 0) {
-        return;
-      }
-      this.budgetConsumed = newBudget;
-    };
-    this.intervalHandle = setInterval(
-      restoreBudgetForUser,
-      this.options.budgetRestoreIntervalMs
-    );
+    this.eventListeners[eventType]?.add(handler);
   }
-  stopLeak() {
-    if (!this.intervalHandle) {
-      return;
+  removeEventListener(eventType, handler) {
+    const handlers = this.eventListeners[eventType];
+    if (handlers) {
+      this.eventListeners[eventType]?.delete(handler);
     }
-    clearInterval(this.intervalHandle);
-    this.intervalHandle = void 0;
   }
-  close() {
-    this.stopLeak();
-  }
-};
-
-// logging/log.ts
-var import_api3 = require("@opentelemetry/api");
-var LoggingLevels = {
-  debug: -1,
-  info: 0,
-  warn: 1,
-  error: 2
-};
-var cleanedLogFn = (log) => {
-  return (msg, metadata) => {
-    if (metadata && !metadata.telemetry) {
-      const span = import_api3.trace.getSpan(import_api3.context.active());
-      if (span) {
-        metadata.telemetry = {
-          traceId: span.spanContext().traceId,
-          spanId: span.spanContext().spanId
-        };
-      }
-    }
-    if (!metadata?.transportMessage) {
-      log(msg, metadata);
-      return;
-    }
-    const { payload, ...rest } = metadata.transportMessage;
-    metadata.transportMessage = rest;
-    log(msg, metadata);
-  };
-};
-var BaseLogger = class {
-  minLevel;
-  output;
-  constructor(output, minLevel = "info") {
-    this.minLevel = minLevel;
-    this.output = output;
-  }
-  debug(msg, metadata) {
-    if (LoggingLevels[this.minLevel] <= LoggingLevels.debug) {
-      this.output(msg, metadata ?? {}, "debug");
-    }
-  }
-  info(msg, metadata) {
-    if (LoggingLevels[this.minLevel] <= LoggingLevels.info) {
-      this.output(msg, metadata ?? {}, "info");
-    }
-  }
-  warn(msg, metadata) {
-    if (LoggingLevels[this.minLevel] <= LoggingLevels.warn) {
-      this.output(msg, metadata ?? {}, "warn");
-    }
-  }
-  error(msg, metadata) {
-    if (LoggingLevels[this.minLevel] <= LoggingLevels.error) {
-      this.output(msg, metadata ?? {}, "error");
-    }
-  }
-};
-var createLogProxy = (log) => ({
-  debug: cleanedLogFn(log.debug.bind(log)),
-  info: cleanedLogFn(log.info.bind(log)),
-  warn: cleanedLogFn(log.warn.bind(log)),
-  error: cleanedLogFn(log.error.bind(log))
-});
-
-// transport/events.ts
-var ProtocolError = {
-  RetriesExceeded: "conn_retry_exceeded",
-  HandshakeFailed: "handshake_failed",
-  MessageOrderingViolated: "message_ordering_violated",
-  InvalidMessage: "invalid_message"
-};
-var EventDispatcher = class {
-  eventListeners = {};
-  removeAllListeners() {
-    this.eventListeners = {};
-  }
-  numberOfListeners(eventType) {
-    return this.eventListeners[eventType]?.size ?? 0;
-  }
-  addEventListener(eventType, handler) {
-    if (!this.eventListeners[eventType]) {
-      this.eventListeners[eventType] = /* @__PURE__ */ new Set();
-    }
-    this.eventListeners[eventType]?.add(handler);
-  }
-  removeEventListener(eventType, handler) {
-    const handlers = this.eventListeners[eventType];
-    if (handlers) {
-      this.eventListeners[eventType]?.delete(handler);
-    }
-  }
-  dispatchEvent(eventType, event) {
-    const handlers = this.eventListeners[eventType];
-    if (handlers) {
-      const copy = [...handlers];
-      for (const handler of copy) {
-        handler(event);
-      }
-    }
+  dispatchEvent(eventType, event) {
+    const handlers = this.eventListeners[eventType];
+    if (handlers) {
+      const copy = [...handlers];
+      for (const handler of copy) {
+        handler(event);
+      }
+    }
   }
 };
 
@@ -1588,18 +1217,92 @@ var Transport = class {
         );
       }
       const sameSession = session.id === sessionId;
-      if (!sameSession) {
+      if (!sameSession || session._isConsumed) {
         throw new Error(
           `session scope for ${sessionId} has ended (transition), can't send`
         );
       }
-      return session.send(msg);
+      const res = session.send(msg);
+      if (!res.ok) {
+        throw new Error(res.reason);
+      }
+      return res.value;
     };
   }
 };
 
 // transport/client.ts
-var import_value2 = require("@sinclair/typebox/value");
+var import_api4 = require("@opentelemetry/api");
+
+// transport/rateLimit.ts
+var LeakyBucketRateLimit = class {
+  budgetConsumed;
+  intervalHandle;
+  options;
+  constructor(options) {
+    this.options = options;
+    this.budgetConsumed = 0;
+  }
+  getBackoffMs() {
+    if (this.getBudgetConsumed() === 0) {
+      return 0;
+    }
+    const exponent = Math.max(0, this.getBudgetConsumed() - 1);
+    const jitter = Math.floor(Math.random() * this.options.maxJitterMs);
+    const backoffMs = Math.min(
+      this.options.baseIntervalMs * 2 ** exponent,
+      this.options.maxBackoffMs
+    );
+    return backoffMs + jitter;
+  }
+  get totalBudgetRestoreTime() {
+    return this.options.budgetRestoreIntervalMs * this.options.attemptBudgetCapacity;
+  }
+  consumeBudget() {
+    this.stopLeak();
+    this.budgetConsumed = this.getBudgetConsumed() + 1;
+  }
+  getBudgetConsumed() {
+    return this.budgetConsumed;
+  }
+  hasBudget() {
+    return this.getBudgetConsumed() < this.options.attemptBudgetCapacity;
+  }
+  startRestoringBudget() {
+    if (this.intervalHandle) {
+      return;
+    }
+    const restoreBudgetForUser = () => {
+      const currentBudget = this.budgetConsumed;
+      if (!currentBudget) {
+        this.stopLeak();
+        return;
+      }
+      const newBudget = currentBudget - 1;
+      if (newBudget === 0) {
+        return;
+      }
+      this.budgetConsumed = newBudget;
+    };
+    this.intervalHandle = setInterval(
+      restoreBudgetForUser,
+      this.options.budgetRestoreIntervalMs
+    );
+  }
+  stopLeak() {
+    if (!this.intervalHandle) {
+      return;
+    }
+    clearInterval(this.intervalHandle);
+    this.intervalHandle = void 0;
+  }
+  close() {
+    this.stopLeak();
+  }
+};
+
+// transport/client.ts
+var import_value = require("@sinclair/typebox/value");
 var ClientTransport = class extends Transport {
   /**
    * The options for this transport.
@@ -1730,19 +1433,19 @@ var ClientTransport = class extends Transport {
     this.deleteSession(session, { unhealthy: true });
   }
   onHandshakeResponse(session, msg) {
-    if (!import_value2.Value.Check(ControlMessageHandshakeResponseSchema, msg.payload)) {
+    if (!import_value.Value.Check(ControlMessageHandshakeResponseSchema, msg.payload)) {
       const reason = `received invalid handshake response`;
       this.rejectHandshakeResponse(session, reason, {
         ...session.loggingMetadata,
         transportMessage: msg,
         validationErrors: [
-          ...import_value2.Value.Errors(ControlMessageHandshakeResponseSchema, msg.payload)
+          ...import_value.Value.Errors(ControlMessageHandshakeResponseSchema, msg.payload)
         ]
       });
       return;
     }
     if (!msg.payload.status.ok) {
-      const retriable = import_value2.Value.Check(
+      const retriable = import_value.Value.Check(
         HandshakeErrorRetriableResponseCodes,
         msg.payload.status.code
       );
@@ -1794,13 +1497,41 @@ var ClientTransport = class extends Transport {
         this.handleMsg(msg2);
       },
       onInvalidMessage: (reason) => {
-        this.deleteSession(connectedSession, { unhealthy: true });
+        this.log?.error(`invalid message: ${reason}`, {
+          ...connectedSession.loggingMetadata,
+          transportMessage: msg
+        });
         this.protocolError({
           type: ProtocolError.InvalidMessage,
           message: reason
         });
+        this.deleteSession(connectedSession, { unhealthy: true });
+      },
+      onMessageSendFailure: (msg2, reason) => {
+        this.log?.error(`failed to send message: ${reason}`, {
+          ...connectedSession.loggingMetadata,
+          transportMessage: msg2
+        });
+        this.protocolError({
+          type: ProtocolError.MessageSendFailure,
+          message: reason
+        });
+        this.deleteSession(connectedSession, { unhealthy: true });
       }
     });
+    const res = connectedSession.sendBufferedMessages();
+    if (!res.ok) {
+      this.log?.error(`failed to send buffered messages: ${res.reason}`, {
+        ...connectedSession.loggingMetadata,
+        transportMessage: msg
+      });
+      this.protocolError({
+        type: ProtocolError.MessageSendFailure,
+        message: res.reason
+      });
+      this.deleteSession(connectedSession, { unhealthy: true });
+      return;
+    }
     this.updateSession(connectedSession);
     this.retryBudget.startRestoringBudget();
   }
@@ -1939,7 +1670,18 @@ var ClientTransport = class extends Transport {
       ...session.loggingMetadata,
       transportMessage: requestMsg
     });
-    session.sendHandshake(requestMsg);
+    const res = session.sendHandshake(requestMsg);
+    if (!res.ok) {
+      this.log?.error(`failed to send handshake request: ${res.reason}`, {
+        ...session.loggingMetadata,
+        transportMessage: requestMsg
+      });
+      this.protocolError({
+        type: ProtocolError.MessageSendFailure,
+        message: res.reason
+      });
+      this.deleteSession(session, { unhealthy: true });
+    }
   }
   close() {
     this.retryBudget.close();
@@ -1947,103 +1689,16 @@ var ClientTransport = class extends Transport {
   }
 };
 
-// transport/connection.ts
-var Connection = class {
-  id;
-  telemetry;
-  constructor() {
-    this.id = `conn-${generateId()}`;
-  }
-  get loggingMetadata() {
-    const metadata = { connId: this.id };
-    if (this.telemetry?.span.isRecording()) {
-      const spanContext = this.telemetry.span.spanContext();
-      metadata.telemetry = {
-        traceId: spanContext.traceId,
-        spanId: spanContext.spanId
-      };
-    }
-    return metadata;
-  }
-  // can't use event emitter because we need this to work in both node + browser
-  _dataListeners = /* @__PURE__ */ new Set();
-  _closeListeners = /* @__PURE__ */ new Set();
-  _errorListeners = /* @__PURE__ */ new Set();
-  get dataListeners() {
-    return [...this._dataListeners];
-  }
-  get closeListeners() {
-    return [...this._closeListeners];
-  }
-  get errorListeners() {
-    return [...this._errorListeners];
-  }
-  onData(msg) {
-    for (const cb of this.dataListeners) {
-      cb(msg);
-    }
-  }
-  onError(err) {
-    for (const cb of this.errorListeners) {
-      cb(err);
-    }
-  }
-  onClose() {
-    for (const cb of this.closeListeners) {
-      cb();
-    }
-    this.telemetry?.span.end();
-  }
+// transport/server.ts
+var import_api5 = require("@opentelemetry/api");
+var import_value2 = require("@sinclair/typebox/value");
+var ServerTransport = class extends Transport {
   /**
-   * Handle adding a callback for when a message is received.
-   * @param msg The message that was received.
+   * The options for this transport.
    */
-  addDataListener(cb) {
-    this._dataListeners.add(cb);
-  }
-  removeDataListener(cb) {
-    this._dataListeners.delete(cb);
-  }
+  options;
   /**
-   * Handle adding a callback for when the connection is closed.
-   * This should also be called if an error happens and after notifying all the error listeners.
-   * @param cb The callback to call when the connection is closed.
-   */
-  addCloseListener(cb) {
-    this._closeListeners.add(cb);
-  }
-  removeCloseListener(cb) {
-    this._closeListeners.delete(cb);
-  }
-  /**
-   * Handle adding a callback for when an error is received.
-   * This should only be used for this.logging errors, all cleanup
-   * should be delegated to addCloseListener.
-   *
-   * The implementer should take care such that the implemented
-   * connection will call both the close and error callbacks
-   * on an error.
-   *
-   * @param cb The callback to call when an error is received.
-   */
-  addErrorListener(cb) {
-    this._errorListeners.add(cb);
-  }
-  removeErrorListener(cb) {
-    this._errorListeners.delete(cb);
-  }
-};
-
-// transport/server.ts
-var import_api5 = require("@opentelemetry/api");
-var import_value3 = require("@sinclair/typebox/value");
-var ServerTransport = class extends Transport {
-  /**
-   * The options for this transport.
-   */
-  options;
-  /**
-   * Optional handshake options for the server.
+   * Optional handshake options for the server.
    */
   handshakeExtensions;
   /**
@@ -2150,17 +1805,28 @@ var ServerTransport = class extends Transport {
       message: reason
     });
     this.log?.warn(reason, metadata);
-    session.sendHandshake(
-      handshakeResponseMessage({
-        from: this.clientId,
-        to,
-        status: {
-          ok: false,
-          code,
-          reason
-        }
-      })
-    );
+    const responseMsg = handshakeResponseMessage({
+      from: this.clientId,
+      to,
+      status: {
+        ok: false,
+        code,
+        reason
+      }
+    });
+    const res = session.sendHandshake(responseMsg);
+    if (!res.ok) {
+      this.log?.error(`failed to send handshake response: ${res.reason}`, {
+        ...session.loggingMetadata,
+        transportMessage: responseMsg
+      });
+      this.protocolError({
+        type: ProtocolError.MessageSendFailure,
+        message: res.reason
+      });
+      this.deletePendingSession(session);
+      return;
+    }
     this.protocolError({
       type: ProtocolError.HandshakeFailed,
       code,
@@ -2169,7 +1835,7 @@ var ServerTransport = class extends Transport {
     this.deletePendingSession(session);
   }
   async onHandshakeRequest(session, msg) {
-    if (!import_value3.Value.Check(ControlMessageHandshakeRequestSchema, msg.payload)) {
+    if (!import_value2.Value.Check(ControlMessageHandshakeRequestSchema, msg.payload)) {
       this.rejectHandshakeRequest(
         session,
         msg.from,
@@ -2180,7 +1846,7 @@ var ServerTransport = class extends Transport {
           transportMessage: msg,
           connectedTo: msg.from,
           validationErrors: [
-            ...import_value3.Value.Errors(ControlMessageHandshakeRequestSchema, msg.payload)
+            ...import_value2.Value.Errors(ControlMessageHandshakeRequestSchema, msg.payload)
           ]
         }
       );
@@ -2203,7 +1869,7 @@ var ServerTransport = class extends Transport {
     }
     let parsedMetadata = {};
     if (this.handshakeExtensions) {
-      if (!import_value3.Value.Check(this.handshakeExtensions.schema, msg.payload.metadata)) {
+      if (!import_value2.Value.Check(this.handshakeExtensions.schema, msg.payload.metadata)) {
         this.rejectHandshakeRequest(
           session,
           msg.from,
@@ -2213,7 +1879,7 @@ var ServerTransport = class extends Transport {
             ...session.loggingMetadata,
             connectedTo: msg.from,
             validationErrors: [
-              ...import_value3.Value.Errors(
+              ...import_value2.Value.Errors(
                 this.handshakeExtensions.schema,
                 msg.payload.metadata
               )
@@ -2229,165 +1895,652 @@ var ServerTransport = class extends Transport {
         msg.payload.metadata,
         previousParsedMetadata
       );
-      if (session._isConsumed) {
-        return;
-      }
-      if (import_value3.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;
-    let oldSession = this.sessions.get(msg.from);
-    if (this.options.enableTransparentSessionReconnects && oldSession && oldSession.id === msg.payload.sessionId) {
-      connectCase = "transparent reconnection";
-      const ourNextSeq = oldSession.nextSeq();
-      const ourAck = oldSession.ack;
-      if (clientNextSentSeq > ourAck) {
-        this.rejectHandshakeRequest(
-          session,
-          msg.from,
-          `client is in the future: server wanted next message to be ${ourAck} but client would have sent ${clientNextSentSeq}`,
-          "SESSION_STATE_MISMATCH",
-          {
-            ...session.loggingMetadata,
-            connectedTo: msg.from,
-            transportMessage: msg
-          }
-        );
-        return;
-      }
-      if (ourNextSeq > clientNextExpectedSeq) {
-        this.rejectHandshakeRequest(
-          session,
-          msg.from,
-          `server is in the future: client wanted next message to be ${clientNextExpectedSeq} but server would have sent ${ourNextSeq}`,
-          "SESSION_STATE_MISMATCH",
-          {
-            ...session.loggingMetadata,
-            connectedTo: msg.from,
-            transportMessage: msg
-          }
-        );
-        return;
-      }
-      if (oldSession.state !== "NoConnection" /* NoConnection */) {
-        const noConnectionSession = ServerSessionStateGraph.transition.ConnectedToNoConnection(
-          oldSession,
-          {
-            onSessionGracePeriodElapsed: () => {
-              this.onSessionGracePeriodElapsed(noConnectionSession);
-            }
-          }
-        );
-        oldSession = noConnectionSession;
-        this.updateSession(oldSession);
-      }
-    } else if (oldSession) {
-      connectCase = "hard reconnection";
-      this.log?.info(
-        `client is reconnecting to a new session (${msg.payload.sessionId}) with an old session (${oldSession.id}) already existing, closing old session`,
+      if (session._isConsumed) {
+        return;
+      }
+      if (import_value2.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;
+    let oldSession = this.sessions.get(msg.from);
+    if (this.options.enableTransparentSessionReconnects && oldSession && oldSession.id === msg.payload.sessionId) {
+      connectCase = "transparent reconnection";
+      const ourNextSeq = oldSession.nextSeq();
+      const ourAck = oldSession.ack;
+      if (clientNextSentSeq > ourAck) {
+        this.rejectHandshakeRequest(
+          session,
+          msg.from,
+          `client is in the future: server wanted next message to be ${ourAck} but client would have sent ${clientNextSentSeq}`,
+          "SESSION_STATE_MISMATCH",
+          {
+            ...session.loggingMetadata,
+            connectedTo: msg.from,
+            transportMessage: msg
+          }
+        );
+        return;
+      }
+      if (ourNextSeq > clientNextExpectedSeq) {
+        this.rejectHandshakeRequest(
+          session,
+          msg.from,
+          `server is in the future: client wanted next message to be ${clientNextExpectedSeq} but server would have sent ${ourNextSeq}`,
+          "SESSION_STATE_MISMATCH",
+          {
+            ...session.loggingMetadata,
+            connectedTo: msg.from,
+            transportMessage: msg
+          }
+        );
+        return;
+      }
+      if (oldSession.state !== "NoConnection" /* NoConnection */) {
+        const noConnectionSession = ServerSessionStateGraph.transition.ConnectedToNoConnection(
+          oldSession,
+          {
+            onSessionGracePeriodElapsed: () => {
+              this.onSessionGracePeriodElapsed(noConnectionSession);
+            }
+          }
+        );
+        oldSession = noConnectionSession;
+        this.updateSession(oldSession);
+      }
+    } else if (oldSession) {
+      connectCase = "hard reconnection";
+      this.log?.info(
+        `client is reconnecting to a new session (${msg.payload.sessionId}) with an old session (${oldSession.id}) already existing, closing old session`,
+        {
+          ...session.loggingMetadata,
+          connectedTo: msg.from,
+          sessionId: msg.payload.sessionId
+        }
+      );
+      this.deleteSession(oldSession);
+      oldSession = void 0;
+    }
+    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,
+        rejectionMessage,
+        "SESSION_STATE_MISMATCH",
+        {
+          ...session.loggingMetadata,
+          connectedTo: msg.from,
+          transportMessage: msg
+        }
+      );
+      return;
+    }
+    const sessionId = msg.payload.sessionId;
+    this.log?.info(
+      `handshake from ${msg.from} ok (${connectCase}), responding with handshake success`,
+      {
+        ...session.loggingMetadata,
+        connectedTo: msg.from
+      }
+    );
+    const responseMsg = handshakeResponseMessage({
+      from: this.clientId,
+      to: msg.from,
+      status: {
+        ok: true,
+        sessionId
+      }
+    });
+    const res = session.sendHandshake(responseMsg);
+    if (!res.ok) {
+      this.log?.error(`failed to send handshake response: ${res.reason}`, {
+        ...session.loggingMetadata,
+        transportMessage: responseMsg
+      });
+      this.protocolError({
+        type: ProtocolError.MessageSendFailure,
+        message: res.reason
+      });
+      this.deletePendingSession(session);
+      return;
+    }
+    this.pendingSessions.delete(session);
+    const connectedSession = ServerSessionStateGraph.transition.WaitingForHandshakeToConnected(
+      session,
+      // by this point oldSession is either no connection or we dont have an old session
+      oldSession,
+      sessionId,
+      msg.from,
+      msg.tracing,
+      {
+        onConnectionErrored: (err) => {
+          const errStr = coerceErrorString(err);
+          this.log?.warn(
+            `connection to ${connectedSession.to} errored: ${errStr}`,
+            connectedSession.loggingMetadata
+          );
+        },
+        onConnectionClosed: () => {
+          this.log?.info(
+            `connection to ${connectedSession.to} closed`,
+            connectedSession.loggingMetadata
+          );
+          this.onConnClosed(connectedSession);
+        },
+        onMessage: (msg2) => {
+          this.handleMsg(msg2);
+        },
+        onInvalidMessage: (reason) => {
+          this.log?.error(`invalid message: ${reason}`, {
+            ...connectedSession.loggingMetadata,
+            transportMessage: msg
+          });
+          this.protocolError({
+            type: ProtocolError.InvalidMessage,
+            message: reason
+          });
+          this.deleteSession(connectedSession, { unhealthy: true });
+        },
+        onMessageSendFailure: (msg2, reason) => {
+          this.log?.error(`failed to send message: ${reason}`, {
+            ...connectedSession.loggingMetadata,
+            transportMessage: msg2
+          });
+          this.protocolError({
+            type: ProtocolError.MessageSendFailure,
+            message: reason
+          });
+          this.deleteSession(connectedSession, { unhealthy: true });
+        }
+      },
+      gotVersion
+    );
+    const bufferSendRes = connectedSession.sendBufferedMessages();
+    if (!bufferSendRes.ok) {
+      this.log?.error(
+        `failed to send buffered messages: ${bufferSendRes.reason}`,
+        {
+          ...connectedSession.loggingMetadata,
+          transportMessage: msg
+        }
+      );
+      this.protocolError({
+        type: ProtocolError.MessageSendFailure,
+        message: bufferSendRes.reason
+      });
+      this.deleteSession(connectedSession, { unhealthy: true });
+      return;
+    }
+    this.sessionHandshakeMetadata.set(connectedSession.to, parsedMetadata);
+    if (oldSession) {
+      this.updateSession(connectedSession);
+    } else {
+      this.createSession(connectedSession);
+    }
+    connectedSession.startActiveHeartbeat();
+  }
+};
+
+// transport/connection.ts
+var Connection = class {
+  id;
+  telemetry;
+  constructor() {
+    this.id = `conn-${generateId()}`;
+  }
+  get loggingMetadata() {
+    const metadata = { connId: this.id };
+    if (this.telemetry?.span.isRecording()) {
+      const spanContext = this.telemetry.span.spanContext();
+      metadata.telemetry = {
+        traceId: spanContext.traceId,
+        spanId: spanContext.spanId
+      };
+    }
+    return metadata;
+  }
+  // can't use event emitter because we need this to work in both node + browser
+  _dataListeners = /* @__PURE__ */ new Set();
+  _closeListeners = /* @__PURE__ */ new Set();
+  _errorListeners = /* @__PURE__ */ new Set();
+  get dataListeners() {
+    return [...this._dataListeners];
+  }
+  get closeListeners() {
+    return [...this._closeListeners];
+  }
+  get errorListeners() {
+    return [...this._errorListeners];
+  }
+  onData(msg) {
+    for (const cb of this.dataListeners) {
+      cb(msg);
+    }
+  }
+  onError(err) {
+    for (const cb of this.errorListeners) {
+      cb(err);
+    }
+  }
+  onClose() {
+    for (const cb of this.closeListeners) {
+      cb();
+    }
+    this.telemetry?.span.end();
+  }
+  /**
+   * Handle adding a callback for when a message is received.
+   * @param msg The message that was received.
+   */
+  addDataListener(cb) {
+    this._dataListeners.add(cb);
+  }
+  removeDataListener(cb) {
+    this._dataListeners.delete(cb);
+  }
+  /**
+   * Handle adding a callback for when the connection is closed.
+   * This should also be called if an error happens and after notifying all the error listeners.
+   * @param cb The callback to call when the connection is closed.
+   */
+  addCloseListener(cb) {
+    this._closeListeners.add(cb);
+  }
+  removeCloseListener(cb) {
+    this._closeListeners.delete(cb);
+  }
+  /**
+   * Handle adding a callback for when an error is received.
+   * This should only be used for this.logging errors, all cleanup
+   * should be delegated to addCloseListener.
+   *
+   * The implementer should take care such that the implemented
+   * connection will call both the close and error callbacks
+   * on an error.
+   *
+   * @param cb The callback to call when an error is received.
+   */
+  addErrorListener(cb) {
+    this._errorListeners.add(cb);
+  }
+  removeErrorListener(cb) {
+    this._errorListeners.delete(cb);
+  }
+};
+
+// codec/adapter.ts
+var CodecMessageAdapter = class {
+  constructor(codec) {
+    this.codec = codec;
+  }
+  toBuffer(msg) {
+    try {
+      return {
+        ok: true,
+        value: this.codec.toBuffer(msg)
+      };
+    } catch (e) {
+      return {
+        ok: false,
+        reason: coerceErrorString(e)
+      };
+    }
+  }
+  fromBuffer(buf) {
+    try {
+      const parsedMsg = this.codec.fromBuffer(buf);
+      if (!import_value3.Value.Check(OpaqueTransportMessageSchema, parsedMsg)) {
+        return {
+          ok: false,
+          reason: "transport message schema mismatch"
+        };
+      }
+      return {
+        ok: true,
+        value: parsedMsg
+      };
+    } catch (e) {
+      return {
+        ok: false,
+        reason: coerceErrorString(e)
+      };
+    }
+  }
+};
+
+// transport/sessionStateMachine/transitions.ts
+function inheritSharedSession(session) {
+  return {
+    id: session.id,
+    from: session.from,
+    to: session.to,
+    seq: session.seq,
+    ack: session.ack,
+    seqSent: session.seqSent,
+    sendBuffer: session.sendBuffer,
+    telemetry: session.telemetry,
+    options: session.options,
+    log: session.log,
+    tracer: session.tracer,
+    protocolVersion: session.protocolVersion,
+    codec: session.codec
+  };
+}
+function inheritSharedSessionWithGrace(session) {
+  return {
+    ...inheritSharedSession(session),
+    graceExpiryTime: session.graceExpiryTime
+  };
+}
+var SessionStateGraph = {
+  entrypoints: {
+    NoConnection: (to, from, listeners, options, protocolVersion, tracer, log) => {
+      const id = `session-${generateId()}`;
+      const telemetry = createSessionTelemetryInfo(tracer, id, to, from);
+      const sendBuffer = [];
+      const session = new SessionNoConnection({
+        listeners,
+        id,
+        from,
+        to,
+        seq: 0,
+        ack: 0,
+        seqSent: 0,
+        graceExpiryTime: Date.now() + options.sessionDisconnectGraceMs,
+        sendBuffer,
+        telemetry,
+        options,
+        protocolVersion,
+        tracer,
+        log,
+        codec: new CodecMessageAdapter(options.codec)
+      });
+      session.log?.info(`session ${session.id} created in NoConnection state`, {
+        ...session.loggingMetadata,
+        tags: ["state-transition"]
+      });
+      return session;
+    },
+    WaitingForHandshake: (from, conn, listeners, options, tracer, log) => {
+      const session = new SessionWaitingForHandshake({
+        conn,
+        listeners,
+        from,
+        options,
+        tracer,
+        log,
+        codec: new CodecMessageAdapter(options.codec)
+      });
+      session.log?.info(`session created in WaitingForHandshake state`, {
+        ...session.loggingMetadata,
+        tags: ["state-transition"]
+      });
+      return session;
+    }
+  },
+  // All of the transitions 'move'/'consume' the old session and return a new one.
+  // After a session is transitioned, any usage of the old session will throw.
+  transition: {
+    // happy path transitions
+    NoConnectionToBackingOff: (oldSession, backoffMs, listeners) => {
+      const carriedState = inheritSharedSessionWithGrace(oldSession);
+      oldSession._handleStateExit();
+      const session = new SessionBackingOff({
+        backoffMs,
+        listeners,
+        ...carriedState
+      });
+      session.log?.info(
+        `session ${session.id} transition from NoConnection to BackingOff`,
+        {
+          ...session.loggingMetadata,
+          tags: ["state-transition"]
+        }
+      );
+      return session;
+    },
+    BackingOffToConnecting: (oldSession, connPromise, listeners) => {
+      const carriedState = inheritSharedSessionWithGrace(oldSession);
+      oldSession._handleStateExit();
+      const session = new SessionConnecting({
+        connPromise,
+        listeners,
+        ...carriedState
+      });
+      session.log?.info(
+        `session ${session.id} transition from BackingOff to Connecting`,
+        {
+          ...session.loggingMetadata,
+          tags: ["state-transition"]
+        }
+      );
+      return session;
+    },
+    ConnectingToHandshaking: (oldSession, conn, listeners) => {
+      const carriedState = inheritSharedSessionWithGrace(oldSession);
+      oldSession._handleStateExit();
+      const session = new SessionHandshaking({
+        conn,
+        listeners,
+        ...carriedState
+      });
+      conn.telemetry = createConnectionTelemetryInfo(
+        session.tracer,
+        conn,
+        session.telemetry
+      );
+      session.log?.info(
+        `session ${session.id} transition from Connecting to Handshaking`,
+        {
+          ...session.loggingMetadata,
+          tags: ["state-transition"]
+        }
+      );
+      return session;
+    },
+    HandshakingToConnected: (oldSession, listeners) => {
+      const carriedState = inheritSharedSession(oldSession);
+      const conn = oldSession.conn;
+      oldSession._handleStateExit();
+      const session = new SessionConnected({
+        conn,
+        listeners,
+        ...carriedState
+      });
+      session.startMissingHeartbeatTimeout();
+      session.log?.info(
+        `session ${session.id} transition from Handshaking to Connected`,
+        {
+          ...session.loggingMetadata,
+          tags: ["state-transition"]
+        }
+      );
+      return session;
+    },
+    WaitingForHandshakeToConnected: (pendingSession, oldSession, sessionId, to, propagationCtx, listeners, protocolVersion) => {
+      const conn = pendingSession.conn;
+      const { from, options } = pendingSession;
+      const carriedState = oldSession ? (
+        // old session exists, inherit state
+        inheritSharedSession(oldSession)
+      ) : (
+        // old session does not exist, create new state
+        {
+          id: sessionId,
+          from,
+          to,
+          seq: 0,
+          ack: 0,
+          seqSent: 0,
+          sendBuffer: [],
+          telemetry: createSessionTelemetryInfo(
+            pendingSession.tracer,
+            sessionId,
+            to,
+            from,
+            propagationCtx
+          ),
+          options,
+          tracer: pendingSession.tracer,
+          log: pendingSession.log,
+          protocolVersion,
+          codec: new CodecMessageAdapter(options.codec)
+        }
+      );
+      pendingSession._handleStateExit();
+      oldSession?._handleStateExit();
+      const session = new SessionConnected({
+        conn,
+        listeners,
+        ...carriedState
+      });
+      session.startMissingHeartbeatTimeout();
+      conn.telemetry = createConnectionTelemetryInfo(
+        session.tracer,
+        conn,
+        session.telemetry
+      );
+      session.log?.info(
+        `session ${session.id} transition from WaitingForHandshake to Connected`,
+        {
+          ...session.loggingMetadata,
+          tags: ["state-transition"]
+        }
+      );
+      return session;
+    },
+    // disconnect paths
+    BackingOffToNoConnection: (oldSession, listeners) => {
+      const carriedState = inheritSharedSessionWithGrace(oldSession);
+      oldSession._handleStateExit();
+      const session = new SessionNoConnection({
+        listeners,
+        ...carriedState
+      });
+      session.log?.info(
+        `session ${session.id} transition from BackingOff to NoConnection`,
+        {
+          ...session.loggingMetadata,
+          tags: ["state-transition"]
+        }
+      );
+      return session;
+    },
+    ConnectingToNoConnection: (oldSession, listeners) => {
+      const carriedState = inheritSharedSessionWithGrace(oldSession);
+      oldSession.bestEffortClose();
+      oldSession._handleStateExit();
+      const session = new SessionNoConnection({
+        listeners,
+        ...carriedState
+      });
+      session.log?.info(
+        `session ${session.id} transition from Connecting to NoConnection`,
         {
           ...session.loggingMetadata,
-          connectedTo: msg.from,
-          sessionId: msg.payload.sessionId
+          tags: ["state-transition"]
         }
       );
-      this.deleteSession(oldSession);
-      oldSession = void 0;
-    }
-    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,
-        rejectionMessage,
-        "SESSION_STATE_MISMATCH",
+      return session;
+    },
+    HandshakingToNoConnection: (oldSession, listeners) => {
+      const carriedState = inheritSharedSessionWithGrace(oldSession);
+      oldSession.conn.close();
+      oldSession._handleStateExit();
+      const session = new SessionNoConnection({
+        listeners,
+        ...carriedState
+      });
+      session.log?.info(
+        `session ${session.id} transition from Handshaking to NoConnection`,
         {
           ...session.loggingMetadata,
-          connectedTo: msg.from,
-          transportMessage: msg
+          tags: ["state-transition"]
         }
       );
-      return;
-    }
-    const sessionId = msg.payload.sessionId;
-    this.log?.info(
-      `handshake from ${msg.from} ok (${connectCase}), responding with handshake success`,
-      {
-        ...session.loggingMetadata,
-        connectedTo: msg.from
-      }
-    );
-    const responseMsg = handshakeResponseMessage({
-      from: this.clientId,
-      to: msg.from,
-      status: {
-        ok: true,
-        sessionId
-      }
-    });
-    session.sendHandshake(responseMsg);
-    const connectedSession = ServerSessionStateGraph.transition.WaitingForHandshakeToConnected(
-      session,
-      // by this point oldSession is either no connection or we dont have an old session
-      oldSession,
-      sessionId,
-      msg.from,
-      msg.tracing,
-      {
-        onConnectionErrored: (err) => {
-          const errStr = coerceErrorString(err);
-          this.log?.warn(
-            `connection to ${connectedSession.to} errored: ${errStr}`,
-            connectedSession.loggingMetadata
-          );
-        },
-        onConnectionClosed: () => {
-          this.log?.info(
-            `connection to ${connectedSession.to} closed`,
-            connectedSession.loggingMetadata
-          );
-          this.onConnClosed(connectedSession);
-        },
-        onMessage: (msg2) => {
-          this.handleMsg(msg2);
-        },
-        onInvalidMessage: (reason) => {
-          this.protocolError({
-            type: ProtocolError.InvalidMessage,
-            message: reason
-          });
-          this.deleteSession(connectedSession, { unhealthy: true });
+      return session;
+    },
+    ConnectedToNoConnection: (oldSession, listeners) => {
+      const carriedState = inheritSharedSession(oldSession);
+      const graceExpiryTime = Date.now() + oldSession.options.sessionDisconnectGraceMs;
+      oldSession.conn.close();
+      oldSession._handleStateExit();
+      const session = new SessionNoConnection({
+        listeners,
+        graceExpiryTime,
+        ...carriedState
+      });
+      session.log?.info(
+        `session ${session.id} transition from Connected to NoConnection`,
+        {
+          ...session.loggingMetadata,
+          tags: ["state-transition"]
         }
-      },
-      gotVersion
-    );
-    this.sessionHandshakeMetadata.set(connectedSession.to, parsedMetadata);
-    if (oldSession) {
-      this.updateSession(connectedSession);
-    } else {
-      this.createSession(connectedSession);
+      );
+      return session;
     }
-    this.pendingSessions.delete(session);
-    connectedSession.startActiveHeartbeat();
+  }
+};
+var transitions = SessionStateGraph.transition;
+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
   }
 };
 
@@ -2477,6 +2630,16 @@ function duplexPair() {
   const side1 = new DuplexSide();
   side0[kInitOtherSide](side1);
   side1[kInitOtherSide](side0);
+  side0.on("close", () => {
+    setImmediate(() => {
+      side1.destroy();
+    });
+  });
+  side1.on("close", () => {
+    setImmediate(() => {
+      side0.destroy();
+    });
+  });
   return [side0, side1];
 }
 
@@ -2589,14 +2752,14 @@ function createMockTransportNetwork(opts) {
         transport.close();
       }
       for (const conn of Object.values(connections.get())) {
-        conn.serverToClient.end();
-        conn.clientToServer.end();
+        conn.serverToClient.destroy();
+        conn.clientToServer.destroy();
       }
     },
     cleanup() {
       for (const conn of Object.values(connections.get())) {
-        conn.serverToClient.end();
-        conn.clientToServer.end();
+        conn.serverToClient.destroy();
+        conn.clientToServer.destroy();
       }
     }
   };