@replit/river 0.207.3 → 0.208.1

package/dist/router/index.d.cts

@@ -1,8 +1,8 @@
-import { A as AnyServiceSchemaMap, I as InstantiatedServiceSchemaMap, c as ParsedMetadata, d as AnyProcedure, b as Connection, S as ServerHandshakeOptions, e as ServiceContext } from '../services-87887bc5.js';
-export { M as BaseErrorSchemaType, K as CANCEL_CODE, O as Client, X as Err, Z as ErrResult, J as INVALID_REQUEST_CODE, T as Ok, _ as OkResult, w as PayloadType, l as ProcErrors, h as ProcHandler, i as ProcInit, j as ProcRequest, k as ProcResponse, m as ProcType, D as Procedure, E as ProcedureErrorSchemaType, Q as ProcedureHandlerContext, x as ProcedureMap, R as RPCProcedure, B as Readable, L as ReaderErrorSchema, a1 as ResponseData, Y as Result, a0 as ResultUnwrapErr, $ as ResultUnwrapOk, q as SerializedProcedureSchema, v as SerializedProcedureSchemaProtocolv1, o as SerializedServerSchema, t as SerializedServerSchemaProtocolv1, p as SerializedServiceSchema, u as SerializedServiceSchemaProtocolv1, f as Service, g as ServiceConfiguration, n as ServiceSchema, z as StreamProcedure, y as SubscriptionProcedure, G as UNCAUGHT_ERROR_CODE, H as UNEXPECTED_DISCONNECT_CODE, U as UploadProcedure, V as ValidProcType, W as Writable, N as createClient, a2 as createClientHandshakeOptions, a3 as createServerHandshakeOptions, F as flattenErrorType, s as serializeSchema, r as serializeSchemaV1Compat } from '../services-87887bc5.js';
+import { A as AnyServiceSchemaMap, I as InstantiatedServiceSchemaMap, c as ParsedMetadata, d as AnyProcedure, e as ProcedureHandlerContext, f as PayloadType, b as Connection, S as ServerHandshakeOptions, g as ServiceContext } from '../services-44be1b6b.js';
+export { N as BaseErrorSchemaType, L as CANCEL_CODE, Q as Client, X as Err, Z as ErrResult, K as INVALID_REQUEST_CODE, T as Ok, _ as OkResult, n as ProcErrors, j as ProcHandler, k as ProcInit, l as ProcRequest, m as ProcResponse, o as ProcType, E as Procedure, F as ProcedureErrorSchemaType, y as ProcedureMap, R as RPCProcedure, D as Readable, M as ReaderErrorSchema, a1 as ResponseData, Y as Result, a0 as ResultUnwrapErr, $ as ResultUnwrapOk, t as SerializedProcedureSchema, x as SerializedProcedureSchemaProtocolv1, q as SerializedServerSchema, v as SerializedServerSchemaProtocolv1, r as SerializedServiceSchema, w as SerializedServiceSchemaProtocolv1, h as Service, i as ServiceConfiguration, p as ServiceSchema, B as StreamProcedure, z as SubscriptionProcedure, H as UNCAUGHT_ERROR_CODE, J as UNEXPECTED_DISCONNECT_CODE, U as UploadProcedure, V as ValidProcType, W as Writable, O as createClient, a2 as createClientHandshakeOptions, a3 as createServerHandshakeOptions, G as flattenErrorType, s as serializeSchema, u as serializeSchemaV1Compat } from '../services-44be1b6b.js';
+import { Static } from '@sinclair/typebox';
 import { T as TransportClientId, O as OpaqueTransportMessage } from '../message-01c3e85a.js';
 import { ServerTransport } from '../transport/index.cjs';
-import '@sinclair/typebox';
 import '@opentelemetry/api';
 import '../index-02554794.js';
 import '../adapter-f2b6e211.js';
@@ -33,6 +33,21 @@ interface ProcStream {
     handleMsg: (msg: OpaqueTransportMessage) => void;
     handleSessionDisconnect: () => void;
 }
+interface MiddlewareContext extends Readonly<Omit<ProcedureHandlerContext<unknown>, 'cancel'>> {
+    readonly streamId: StreamId;
+    readonly procedureName: string;
+    readonly serviceName: string;
+}
+interface MiddlewareParam {
+    readonly ctx: MiddlewareContext;
+    readonly reqInit: Static<PayloadType>;
+    next: () => void;
+}
+/**
+ * Middleware is a function that can inspect requests as they are received.
+ * For now modification of the request is not supported behavior.
+ */
+type Middleware = (param: MiddlewareParam) => void;
 /**
  * Creates a server instance that listens for incoming messages from a transport and routes them to the appropriate service and procedure.
  * The server tracks the state of each service along with open streams and the extended context object.
@@ -50,8 +65,12 @@ declare function createServer<Services extends AnyServiceSchemaMap>(transport: S
      * cascading stream errors.
      */
     maxCancelledStreamTombstonesPerSession?: number;
+    /**
+     * Middlewares run before procedure handlers allowing you to inspect requests and responses..
+     */
+    middlewares?: Array<Middleware>;
 }>): Server<Services>;
 
-var version = "0.207.3";
+var version = "0.208.1";
 
-export { ParsedMetadata, version as RIVER_VERSION, Server, ServiceContext, createServer };
+export { Middleware, MiddlewareContext, MiddlewareParam, ParsedMetadata, PayloadType, ProcedureHandlerContext, version as RIVER_VERSION, Server, ServiceContext, createServer };

package/dist/router/index.d.ts

@@ -1,8 +1,8 @@
-import { A as AnyServiceSchemaMap, I as InstantiatedServiceSchemaMap, c as ParsedMetadata, d as AnyProcedure, b as Connection, S as ServerHandshakeOptions, e as ServiceContext } from '../services-87887bc5.js';
-export { M as BaseErrorSchemaType, K as CANCEL_CODE, O as Client, X as Err, Z as ErrResult, J as INVALID_REQUEST_CODE, T as Ok, _ as OkResult, w as PayloadType, l as ProcErrors, h as ProcHandler, i as ProcInit, j as ProcRequest, k as ProcResponse, m as ProcType, D as Procedure, E as ProcedureErrorSchemaType, Q as ProcedureHandlerContext, x as ProcedureMap, R as RPCProcedure, B as Readable, L as ReaderErrorSchema, a1 as ResponseData, Y as Result, a0 as ResultUnwrapErr, $ as ResultUnwrapOk, q as SerializedProcedureSchema, v as SerializedProcedureSchemaProtocolv1, o as SerializedServerSchema, t as SerializedServerSchemaProtocolv1, p as SerializedServiceSchema, u as SerializedServiceSchemaProtocolv1, f as Service, g as ServiceConfiguration, n as ServiceSchema, z as StreamProcedure, y as SubscriptionProcedure, G as UNCAUGHT_ERROR_CODE, H as UNEXPECTED_DISCONNECT_CODE, U as UploadProcedure, V as ValidProcType, W as Writable, N as createClient, a2 as createClientHandshakeOptions, a3 as createServerHandshakeOptions, F as flattenErrorType, s as serializeSchema, r as serializeSchemaV1Compat } from '../services-87887bc5.js';
+import { A as AnyServiceSchemaMap, I as InstantiatedServiceSchemaMap, c as ParsedMetadata, d as AnyProcedure, e as ProcedureHandlerContext, f as PayloadType, b as Connection, S as ServerHandshakeOptions, g as ServiceContext } from '../services-44be1b6b.js';
+export { N as BaseErrorSchemaType, L as CANCEL_CODE, Q as Client, X as Err, Z as ErrResult, K as INVALID_REQUEST_CODE, T as Ok, _ as OkResult, n as ProcErrors, j as ProcHandler, k as ProcInit, l as ProcRequest, m as ProcResponse, o as ProcType, E as Procedure, F as ProcedureErrorSchemaType, y as ProcedureMap, R as RPCProcedure, D as Readable, M as ReaderErrorSchema, a1 as ResponseData, Y as Result, a0 as ResultUnwrapErr, $ as ResultUnwrapOk, t as SerializedProcedureSchema, x as SerializedProcedureSchemaProtocolv1, q as SerializedServerSchema, v as SerializedServerSchemaProtocolv1, r as SerializedServiceSchema, w as SerializedServiceSchemaProtocolv1, h as Service, i as ServiceConfiguration, p as ServiceSchema, B as StreamProcedure, z as SubscriptionProcedure, H as UNCAUGHT_ERROR_CODE, J as UNEXPECTED_DISCONNECT_CODE, U as UploadProcedure, V as ValidProcType, W as Writable, O as createClient, a2 as createClientHandshakeOptions, a3 as createServerHandshakeOptions, G as flattenErrorType, s as serializeSchema, u as serializeSchemaV1Compat } from '../services-44be1b6b.js';
+import { Static } from '@sinclair/typebox';
 import { T as TransportClientId, O as OpaqueTransportMessage } from '../message-01c3e85a.js';
 import { ServerTransport } from '../transport/index.js';
-import '@sinclair/typebox';
 import '@opentelemetry/api';
 import '../index-02554794.js';
 import '../adapter-f2b6e211.js';
@@ -33,6 +33,21 @@ interface ProcStream {
     handleMsg: (msg: OpaqueTransportMessage) => void;
     handleSessionDisconnect: () => void;
 }
+interface MiddlewareContext extends Readonly<Omit<ProcedureHandlerContext<unknown>, 'cancel'>> {
+    readonly streamId: StreamId;
+    readonly procedureName: string;
+    readonly serviceName: string;
+}
+interface MiddlewareParam {
+    readonly ctx: MiddlewareContext;
+    readonly reqInit: Static<PayloadType>;
+    next: () => void;
+}
+/**
+ * Middleware is a function that can inspect requests as they are received.
+ * For now modification of the request is not supported behavior.
+ */
+type Middleware = (param: MiddlewareParam) => void;
 /**
  * Creates a server instance that listens for incoming messages from a transport and routes them to the appropriate service and procedure.
  * The server tracks the state of each service along with open streams and the extended context object.
@@ -50,8 +65,12 @@ declare function createServer<Services extends AnyServiceSchemaMap>(transport: S
      * cascading stream errors.
      */
     maxCancelledStreamTombstonesPerSession?: number;
+    /**
+     * Middlewares run before procedure handlers allowing you to inspect requests and responses..
+     */
+    middlewares?: Array<Middleware>;
 }>): Server<Services>;
 
-var version = "0.207.3";
+var version = "0.208.1";
 
-export { ParsedMetadata, version as RIVER_VERSION, Server, ServiceContext, createServer };
+export { Middleware, MiddlewareContext, MiddlewareParam, ParsedMetadata, PayloadType, ProcedureHandlerContext, version as RIVER_VERSION, Server, ServiceContext, createServer };

package/dist/router/index.js

@@ -16,7 +16,7 @@ import {
   serializeSchema,
   serializeSchemaV1Compat,
   version
-} from "../chunk-QGPYCXV4.js";
+} from "../chunk-EVAQ2QMB.js";
 export {
   CANCEL_CODE,
   Err,

package/dist/{services-87887bc5.d.ts → services-44be1b6b.d.ts}

@@ -7,41 +7,38 @@ import { C as Codec, a as CodecMessageAdapter, S as SendResult, b as SendBufferR
 
 /**
  * A connection is the actual raw underlying transport connection.
- * It’s responsible for dispatching to/from the actual connection itself
+ * It's responsible for dispatching to/from the actual connection itself
  * This should be instantiated as soon as the client/server has a connection
- * It’s tied to the lifecycle of the underlying transport connection (i.e. if the WS drops, this connection should be deleted)
+ * It's tied to the lifecycle of the underlying transport connection (i.e. if the WS drops, this connection should be deleted)
  */
 declare abstract class Connection {
     id: string;
     telemetry?: TelemetryInfo;
     constructor();
     get loggingMetadata(): MessageMetadata;
-    private _dataListeners;
-    private _closeListeners;
-    private _errorListeners;
-    get dataListeners(): ((msg: Uint8Array) => void)[];
-    get closeListeners(): (() => void)[];
-    get errorListeners(): ((err: Error) => void)[];
+    dataListener?: (msg: Uint8Array) => void;
+    closeListener?: () => void;
+    errorListener?: (err: Error) => void;
     onData(msg: Uint8Array): void;
     onError(err: Error): void;
     onClose(): void;
     /**
-     * Handle adding a callback for when a message is received.
-     * @param msg The message that was received.
+     * Set the callback for when a message is received.
+     * @param cb The message handler callback.
      */
-    addDataListener(cb: (msg: Uint8Array) => void): void;
-    removeDataListener(cb: (msg: Uint8Array) => void): void;
+    setDataListener(cb: (msg: Uint8Array) => void): void;
+    removeDataListener(): void;
     /**
-     * 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.
+     * Set the callback for when the connection is closed.
+     * This should also be called if an error happens and after notifying the error listener.
      * @param cb The callback to call when the connection is closed.
      */
-    addCloseListener(cb: () => void): void;
-    removeCloseListener(cb: () => void): void;
+    setCloseListener(cb: () => void): void;
+    removeCloseListener(): void;
     /**
-     * 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.
+     * Set the callback for when an error is received.
+     * This should only be used for logging errors, all cleanup
+     * should be delegated to setCloseListener.
      *
      * The implementer should take care such that the implemented
      * connection will call both the close and error callbacks
@@ -49,8 +46,8 @@ declare abstract class Connection {
      *
      * @param cb The callback to call when an error is received.
      */
-    addErrorListener(cb: (err: Error) => void): void;
-    removeErrorListener(cb: (err: Error) => void): void;
+    setErrorListener(cb: (err: Error) => void): void;
+    removeErrorListener(): void;
     /**
      * Sends a message over the connection.
      * @param msg The message to send.
@@ -658,7 +655,7 @@ type BaseErrorSchemaType = TObject<{
 /**
  * A schema for cancel payloads sent from the client
  */
-declare const CancelResultSchema: TObject<{
+declare const CancelErrorSchema: TObject<{
     code: TLiteral<"CANCEL">;
     message: TString;
 }>;
@@ -978,7 +975,7 @@ type ProcedureHandlerContext<State> = ServiceContext & {
      * Cancelling is not the same as closing procedure calls gracefully, please refer to
      * the river documentation to understand the difference between the two concepts.
      */
-    cancel: (message?: string) => ErrResult<Static<typeof CancelResultSchema>>;
+    cancel: (message?: string) => ErrResult<Static<typeof CancelErrorSchema>>;
     /**
      * This signal is a standard [AbortSignal](https://developer.mozilla.org/en-US/docs/Web/API/AbortSignal)
      * triggered when the procedure invocation is done. This signal tracks the invocation/request finishing
@@ -1022,7 +1019,7 @@ type ValidProcType = 'rpc' | 'upload' | 'subscription' | 'stream';
  * Represents the payload type for {@link Procedure}s.
  */
 type PayloadType = TSchema;
-type Cancellable<T> = T | Static<typeof CancelResultSchema>;
+type Cancellable<T> = T | Static<typeof CancelErrorSchema>;
 /**
  * Procedure for a single message in both directions (1:1).
  *
@@ -1566,4 +1563,4 @@ declare class ServiceScaffold<State extends object> {
     }>;
 }
 
-export { ResultUnwrapOk as $, AnyServiceSchemaMap as A, Readable as B, ClientTransport as C, Procedure as D, ProcedureErrorSchemaType as E, flattenErrorType as F, UNCAUGHT_ERROR_CODE as G, UNEXPECTED_DISCONNECT_CODE as H, InstantiatedServiceSchemaMap as I, INVALID_REQUEST_CODE as J, CANCEL_CODE as K, ReaderErrorSchema as L, BaseErrorSchemaType as M, createClient as N, Client as O, ProvidedClientTransportOptions as P, ProcedureHandlerContext as Q, RpcProcedure as R, ServerHandshakeOptions as S, Ok as T, UploadProcedure as U, ValidProcType as V, Writable as W, Err as X, Result as Y, ErrResult as Z, OkResult as _, ProvidedServerTransportOptions as a, ResultUnwrapErr as a0, ResponseData as a1, createClientHandshakeOptions as a2, createServerHandshakeOptions as a3, ClientHandshakeOptions as a4, ReadableIterator as a5, ReadableResult as a6, Transport as a7, SessionOptions as a8, ClientTransportOptions as a9, SessionNoConnection as aa, SessionBoundSendFn as ab, CommonSession as ac, SessionState as ad, CommonSessionProps as ae, ServerTransportOptions as af, ServerSession as ag, DeleteSessionOptions as ah, TransportStatus as ai, ProvidedTransportOptions as aj, Session as ak, SessionConnecting as al, SessionHandshaking as am, SessionConnected as an, EventMap as ao, EventTypes as ap, EventHandler as aq, ProtocolError as ar, ProtocolErrorType as as, Connection as b, ParsedMetadata as c, AnyProcedure as d, ServiceContext as e, Service as f, ServiceConfiguration as g, ProcHandler as h, ProcInit as i, ProcRequest as j, ProcResponse as k, ProcErrors as l, ProcType as m, ServiceSchema as n, SerializedServerSchema as o, SerializedServiceSchema as p, SerializedProcedureSchema as q, serializeSchemaV1Compat as r, serializeSchema as s, SerializedServerSchemaProtocolv1 as t, SerializedServiceSchemaProtocolv1 as u, SerializedProcedureSchemaProtocolv1 as v, PayloadType as w, ProcedureMap as x, SubscriptionProcedure as y, StreamProcedure as z };
+export { ResultUnwrapOk as $, AnyServiceSchemaMap as A, StreamProcedure as B, ClientTransport as C, Readable as D, Procedure as E, ProcedureErrorSchemaType as F, flattenErrorType as G, UNCAUGHT_ERROR_CODE as H, InstantiatedServiceSchemaMap as I, UNEXPECTED_DISCONNECT_CODE as J, INVALID_REQUEST_CODE as K, CANCEL_CODE as L, ReaderErrorSchema as M, BaseErrorSchemaType as N, createClient as O, ProvidedClientTransportOptions as P, Client as Q, RpcProcedure as R, ServerHandshakeOptions as S, Ok as T, UploadProcedure as U, ValidProcType as V, Writable as W, Err as X, Result as Y, ErrResult as Z, OkResult as _, ProvidedServerTransportOptions as a, ResultUnwrapErr as a0, ResponseData as a1, createClientHandshakeOptions as a2, createServerHandshakeOptions as a3, ClientHandshakeOptions as a4, ReadableIterator as a5, ReadableResult as a6, Transport as a7, SessionOptions as a8, ClientTransportOptions as a9, SessionNoConnection as aa, SessionBoundSendFn as ab, CommonSession as ac, SessionState as ad, CommonSessionProps as ae, ServerTransportOptions as af, ServerSession as ag, DeleteSessionOptions as ah, TransportStatus as ai, ProvidedTransportOptions as aj, Session as ak, SessionConnecting as al, SessionHandshaking as am, SessionConnected as an, EventMap as ao, EventTypes as ap, EventHandler as aq, ProtocolError as ar, ProtocolErrorType as as, Connection as b, ParsedMetadata as c, AnyProcedure as d, ProcedureHandlerContext as e, PayloadType as f, ServiceContext as g, Service as h, ServiceConfiguration as i, ProcHandler as j, ProcInit as k, ProcRequest as l, ProcResponse as m, ProcErrors as n, ProcType as o, ServiceSchema as p, SerializedServerSchema as q, SerializedServiceSchema as r, serializeSchema as s, SerializedProcedureSchema as t, serializeSchemaV1Compat as u, SerializedServerSchemaProtocolv1 as v, SerializedServiceSchemaProtocolv1 as w, SerializedProcedureSchemaProtocolv1 as x, ProcedureMap as y, SubscriptionProcedure as z };

package/dist/testUtil/index.cjs

@@ -238,7 +238,7 @@ var NaiveJsonCodec = {
     const parsed = JSON.parse(
       decoder.decode(buff),
       function reviver(_key, val) {
-        if (val?.$t) {
+        if (val?.$t !== void 0) {
           return base64ToUint8Array(val.$t);
         } else {
           return val;
@@ -555,7 +555,7 @@ function coerceErrorString(err) {
 }
 
 // package.json
-var version = "0.207.3";
+var version = "0.208.1";
 
 // tracing/index.ts
 function getPropagationContext(ctx) {
@@ -569,7 +569,7 @@ function getPropagationContext(ctx) {
 function createSessionTelemetryInfo(tracer, sessionId, to, from, propagationCtx) {
   const parentCtx = propagationCtx ? import_api.propagation.extract(import_api.context.active(), propagationCtx) : import_api.context.active();
   const span = tracer.startSpan(
-    `river.session.${sessionId}`,
+    `river.session`,
     {
       attributes: {
         component: "river",
@@ -585,7 +585,7 @@ function createSessionTelemetryInfo(tracer, sessionId, to, from, propagationCtx)
 }
 function createConnectionTelemetryInfo(tracer, connection, info) {
   const span = tracer.startSpan(
-    `connection ${connection.id}`,
+    `river.connection`,
     {
       attributes: {
         component: "river",
@@ -615,9 +615,9 @@ var SessionWaitingForHandshake = class extends CommonSession {
     this.handshakeTimeout = setTimeout(() => {
       this.listeners.onHandshakeTimeout();
     }, this.options.handshakeTimeoutMs);
-    this.conn.addDataListener(this.onHandshakeData);
-    this.conn.addErrorListener(this.listeners.onConnectionErrored);
-    this.conn.addCloseListener(this.listeners.onConnectionClosed);
+    this.conn.setDataListener(this.onHandshakeData);
+    this.conn.setErrorListener(this.listeners.onConnectionErrored);
+    this.conn.setCloseListener(this.listeners.onConnectionClosed);
   }
   get loggingMetadata() {
     return {
@@ -641,9 +641,9 @@ var SessionWaitingForHandshake = class extends CommonSession {
     return sendMessage(this.conn, this.codec, msg);
   }
   _handleStateExit() {
-    this.conn.removeDataListener(this.onHandshakeData);
-    this.conn.removeErrorListener(this.listeners.onConnectionErrored);
-    this.conn.removeCloseListener(this.listeners.onConnectionClosed);
+    this.conn.removeDataListener();
+    this.conn.removeErrorListener();
+    this.conn.removeCloseListener();
     clearTimeout(this.handshakeTimeout);
     this.handshakeTimeout = void 0;
   }
@@ -665,9 +665,9 @@ var SessionHandshaking = class extends IdentifiedSessionWithGracePeriod {
     this.handshakeTimeout = setTimeout(() => {
       this.listeners.onHandshakeTimeout();
     }, this.options.handshakeTimeoutMs);
-    this.conn.addDataListener(this.onHandshakeData);
-    this.conn.addErrorListener(this.listeners.onConnectionErrored);
-    this.conn.addCloseListener(this.listeners.onConnectionClosed);
+    this.conn.setDataListener(this.onHandshakeData);
+    this.conn.setErrorListener(this.listeners.onConnectionErrored);
+    this.conn.setCloseListener(this.listeners.onConnectionClosed);
   }
   get loggingMetadata() {
     return {
@@ -691,9 +691,9 @@ var SessionHandshaking = class extends IdentifiedSessionWithGracePeriod {
   }
   _handleStateExit() {
     super._handleStateExit();
-    this.conn.removeDataListener(this.onHandshakeData);
-    this.conn.removeErrorListener(this.listeners.onConnectionErrored);
-    this.conn.removeCloseListener(this.listeners.onConnectionClosed);
+    this.conn.removeDataListener();
+    this.conn.removeErrorListener();
+    this.conn.removeCloseListener();
     if (this.handshakeTimeout) {
       clearTimeout(this.handshakeTimeout);
       this.handshakeTimeout = void 0;
@@ -749,9 +749,9 @@ var SessionConnected = class extends IdentifiedSession {
     super(props);
     this.conn = props.conn;
     this.listeners = props.listeners;
-    this.conn.addDataListener(this.onMessageData);
-    this.conn.addCloseListener(this.listeners.onConnectionClosed);
-    this.conn.addErrorListener(this.listeners.onConnectionErrored);
+    this.conn.setDataListener(this.onMessageData);
+    this.conn.setCloseListener(this.listeners.onConnectionClosed);
+    this.conn.setErrorListener(this.listeners.onConnectionErrored);
   }
   sendBufferedMessages() {
     if (this.sendBuffer.length > 0) {
@@ -860,9 +860,9 @@ var SessionConnected = class extends IdentifiedSession {
   };
   _handleStateExit() {
     super._handleStateExit();
-    this.conn.removeDataListener(this.onMessageData);
-    this.conn.removeCloseListener(this.listeners.onConnectionClosed);
-    this.conn.removeErrorListener(this.listeners.onConnectionErrored);
+    this.conn.removeDataListener();
+    this.conn.removeCloseListener();
+    this.conn.removeErrorListener();
     if (this.heartbeatHandle) {
       clearInterval(this.heartbeatHandle);
       this.heartbeatHandle = void 0;
@@ -1164,7 +1164,7 @@ var Transport = class {
   }
   // common listeners
   onSessionGracePeriodElapsed(session) {
-    this.log?.warn(
+    this.log?.info(
       `session to ${session.to} grace period elapsed, closing`,
       session.loggingMetadata
     );
@@ -1521,15 +1521,6 @@ var ClientTransport = class extends Transport {
     });
     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);
@@ -2076,18 +2067,6 @@ var ServerTransport = class extends Transport {
     );
     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);
@@ -2118,60 +2097,44 @@ var Connection = class {
     }
     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];
-  }
+  dataListener;
+  closeListener;
+  errorListener;
   onData(msg) {
-    for (const cb of this.dataListeners) {
-      cb(msg);
-    }
+    this.dataListener?.(msg);
   }
   onError(err) {
-    for (const cb of this.errorListeners) {
-      cb(err);
-    }
+    this.errorListener?.(err);
   }
   onClose() {
-    for (const cb of this.closeListeners) {
-      cb();
-    }
+    this.closeListener?.();
     this.telemetry?.span.end();
   }
   /**
-   * Handle adding a callback for when a message is received.
-   * @param msg The message that was received.
+   * Set the callback for when a message is received.
+   * @param cb The message handler callback.
    */
-  addDataListener(cb) {
-    this._dataListeners.add(cb);
+  setDataListener(cb) {
+    this.dataListener = cb;
   }
-  removeDataListener(cb) {
-    this._dataListeners.delete(cb);
+  removeDataListener() {
+    this.dataListener = void 0;
   }
   /**
-   * 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.
+   * Set the callback for when the connection is closed.
+   * This should also be called if an error happens and after notifying the error listener.
    * @param cb The callback to call when the connection is closed.
    */
-  addCloseListener(cb) {
-    this._closeListeners.add(cb);
+  setCloseListener(cb) {
+    this.closeListener = cb;
   }
-  removeCloseListener(cb) {
-    this._closeListeners.delete(cb);
+  removeCloseListener() {
+    this.closeListener = void 0;
   }
   /**
-   * 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.
+   * Set the callback for when an error is received.
+   * This should only be used for logging errors, all cleanup
+   * should be delegated to setCloseListener.
    *
    * The implementer should take care such that the implemented
    * connection will call both the close and error callbacks
@@ -2179,11 +2142,11 @@ var Connection = class {
    *
    * @param cb The callback to call when an error is received.
    */
-  addErrorListener(cb) {
-    this._errorListeners.add(cb);
+  setErrorListener(cb) {
+    this.errorListener = cb;
   }
-  removeErrorListener(cb) {
-    this._errorListeners.delete(cb);
+  removeErrorListener() {
+    this.errorListener = void 0;
   }
 };
 
@@ -2652,19 +2615,13 @@ var InMemoryConnection = class extends Connection {
     this.conn = pipe;
     this.conn.allowHalfOpen = false;
     this.conn.on("data", (data) => {
-      for (const cb of this.dataListeners) {
-        cb(data);
-      }
+      this.dataListener?.(data);
     });
     this.conn.on("close", () => {
-      for (const cb of this.closeListeners) {
-        cb();
-      }
+      this.closeListener?.();
     });
     this.conn.on("error", (err) => {
-      for (const cb of this.errorListeners) {
-        cb(err);
-      }
+      this.errorListener?.(err);
     });
   }
   send(payload) {