@replit/river 0.207.3 → 0.208.0

package/dist/router/index.d.cts

@@ -1,11 +1,11 @@
-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 { T as TransportClientId, O as OpaqueTransportMessage } from '../message-01c3e85a.js';
+import { A as AnyServiceSchemaMap, b as Connection, S as ServerHandshakeOptions, c as ServiceContext, d as ProcedureHandlerContext, e as PayloadType, I as InstantiatedServiceSchemaMap, f as ParsedMetadata, g as AnyProcedure } from '../transport-CCaWx1Rb.cjs';
+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 '../transport-CCaWx1Rb.cjs';
+import { Static } from '@sinclair/typebox';
+import { T as TransportClientId, O as OpaqueTransportMessage } from '../message-Di94OL80.cjs';
 import { ServerTransport } from '../transport/index.cjs';
-import '@sinclair/typebox';
 import '@opentelemetry/api';
-import '../index-02554794.js';
-import '../adapter-f2b6e211.js';
+import '../index-C9tpZjBN.cjs';
+import '../adapter-Cuc4JtfV.cjs';
 
 type StreamId = string;
 /**
@@ -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.0";
 
-export { ParsedMetadata, version as RIVER_VERSION, Server, ServiceContext, createServer };
+export { type Middleware, type MiddlewareContext, type MiddlewareParam, ParsedMetadata, PayloadType, ProcedureHandlerContext, version as RIVER_VERSION, type Server, ServiceContext, createServer };

package/dist/router/index.d.ts

@@ -1,11 +1,11 @@
-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 { T as TransportClientId, O as OpaqueTransportMessage } from '../message-01c3e85a.js';
+import { A as AnyServiceSchemaMap, b as Connection, S as ServerHandshakeOptions, c as ServiceContext, d as ProcedureHandlerContext, e as PayloadType, I as InstantiatedServiceSchemaMap, f as ParsedMetadata, g as AnyProcedure } from '../transport-CZb3vdB4.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 '../transport-CZb3vdB4.js';
+import { Static } from '@sinclair/typebox';
+import { T as TransportClientId, O as OpaqueTransportMessage } from '../message-Di94OL80.js';
 import { ServerTransport } from '../transport/index.js';
-import '@sinclair/typebox';
 import '@opentelemetry/api';
-import '../index-02554794.js';
-import '../adapter-f2b6e211.js';
+import '../index-D8IOd3LG.js';
+import '../adapter-ChksXKVN.js';
 
 type StreamId = string;
 /**
@@ -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.0";
 
-export { ParsedMetadata, version as RIVER_VERSION, Server, ServiceContext, createServer };
+export { type Middleware, type MiddlewareContext, type MiddlewareParam, ParsedMetadata, PayloadType, ProcedureHandlerContext, version as RIVER_VERSION, type Server, ServiceContext, createServer };

package/dist/router/index.js

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

package/dist/testUtil/index.cjs

@@ -488,13 +488,11 @@ var SessionConnecting = class extends IdentifiedSessionWithGracePeriod {
     this.listeners = props.listeners;
     this.connPromise.then(
       (conn) => {
-        if (this._isConsumed)
-          return;
+        if (this._isConsumed) return;
         this.listeners.onConnectionEstablished(conn);
       },
       (err) => {
-        if (this._isConsumed)
-          return;
+        if (this._isConsumed) return;
         this.listeners.onConnectionFailed(err);
       }
     );
@@ -555,7 +553,7 @@ function coerceErrorString(err) {
 }
 
 // package.json
-var version = "0.207.3";
+var version = "0.208.0";
 
 // tracing/index.ts
 function getPropagationContext(ctx) {
@@ -569,7 +567,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 +583,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 +613,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 +639,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 +663,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 +689,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 +747,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 +858,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;
@@ -1054,8 +1052,7 @@ var Transport = class {
    * @param message The received message.
    */
   handleMsg(message) {
-    if (this.getStatus() !== "open")
-      return;
+    if (this.getStatus() !== "open") return;
     this.eventDispatcher.dispatchEvent("message", message);
   }
   /**
@@ -1143,8 +1140,7 @@ var Transport = class {
     });
   }
   deleteSession(session, options) {
-    if (session._isConsumed)
-      return;
+    if (session._isConsumed) return;
     const loggingMetadata = session.loggingMetadata;
     if (loggingMetadata.tags && options?.unhealthy) {
       loggingMetadata.tags.push("unhealthy-session");
@@ -1164,7 +1160,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 +1517,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);
@@ -1731,8 +1718,7 @@ var ServerTransport = class extends Transport {
     super.deleteSession(session, options);
   }
   handleConnection(conn) {
-    if (this.getStatus() !== "open")
-      return;
+    if (this.getStatus() !== "open") return;
     this.log?.info(`new incoming connection`, {
       ...conn.loggingMetadata,
       clientId: this.clientId
@@ -2076,18 +2062,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 +2092,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 +2137,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 +2610,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) {
@@ -2747,8 +2699,7 @@ function createMockTransportNetwork(opts) {
     },
     async restartServer() {
       for (const transport of transports) {
-        if (transport.clientId !== "SERVER")
-          continue;
+        if (transport.clientId !== "SERVER") continue;
         transport.close();
       }
       for (const conn of Object.values(connections.get())) {