@replit/river 0.201.0 → 0.203.0

package/dist/router/index.d.cts

@@ -1,11 +1,11 @@
-import { A as AnyServiceSchemaMap, I as InstantiatedServiceSchemaMap, a as AnyProcedure } from '../services-e71ea921.js';
-export { E as BaseErrorSchemaType, C as CANCEL_CODE, G as Client, H as Err, L as ErrResult, B as INVALID_REQUEST_CODE, O as Ok, M as OkResult, p as PayloadType, f as ProcErrors, P as ProcHandler, c as ProcInit, d as ProcRequest, e as ProcResponse, g as ProcType, v as Procedure, w as ProcedureErrorSchemaType, q as ProcedureMap, R as RPCProcedure, u as Readable, D as ReaderErrorSchema, T as ResponseData, K as Result, Q as ResultUnwrapErr, N as ResultUnwrapOk, k as SerializedProcedureSchema, o as SerializedProcedureSchemaProtocolv1, i as SerializedServerSchema, m as SerializedServerSchemaProtocolv1, j as SerializedServiceSchema, n as SerializedServiceSchemaProtocolv1, S as Service, b as ServiceConfiguration, h as ServiceSchema, t as StreamProcedure, r as SubscriptionProcedure, y as UNCAUGHT_ERROR_CODE, z as UNEXPECTED_DISCONNECT_CODE, U as UploadProcedure, V as ValidProcType, W as Writable, F as createClient, x as flattenErrorType, s as serializeSchema, l as serializeSchemaV1Compat, J as unwrapOrThrow } from '../services-e71ea921.js';
+import { A as AnyServiceSchemaMap, I as InstantiatedServiceSchemaMap, a as AnyProcedure } from '../services-56cbea0d.js';
+export { E as BaseErrorSchemaType, C as CANCEL_CODE, G as Client, H as Err, L as ErrResult, B as INVALID_REQUEST_CODE, O as Ok, M as OkResult, p as PayloadType, f as ProcErrors, P as ProcHandler, c as ProcInit, d as ProcRequest, e as ProcResponse, g as ProcType, v as Procedure, w as ProcedureErrorSchemaType, q as ProcedureMap, R as RPCProcedure, u as Readable, D as ReaderErrorSchema, T as ResponseData, K as Result, Q as ResultUnwrapErr, N as ResultUnwrapOk, k as SerializedProcedureSchema, o as SerializedProcedureSchemaProtocolv1, i as SerializedServerSchema, m as SerializedServerSchemaProtocolv1, j as SerializedServiceSchema, n as SerializedServiceSchemaProtocolv1, S as Service, b as ServiceConfiguration, h as ServiceSchema, t as StreamProcedure, r as SubscriptionProcedure, y as UNCAUGHT_ERROR_CODE, z as UNEXPECTED_DISCONNECT_CODE, U as UploadProcedure, V as ValidProcType, W as Writable, F as createClient, x as flattenErrorType, s as serializeSchema, l as serializeSchemaV1Compat, J as unwrapOrThrow } from '../services-56cbea0d.js';
 import { c as TransportClientId, b as OpaqueTransportMessage } from '../message-3def9ded.js';
-import { q as ParsedMetadata, C as Connection, r as ServerHandshakeOptions, s as ServiceContext } from '../context-8d263a7f.js';
-export { t as ProcedureHandlerContext, u as createClientHandshakeOptions, v as createServerHandshakeOptions } from '../context-8d263a7f.js';
-import { S as ServerTransport } from '../server-48d90a77.js';
+import { q as ParsedMetadata, C as Connection, r as ServerHandshakeOptions, s as ServiceContext } from '../context-d6dd8a1a.js';
+export { t as ProcedureHandlerContext, u as createClientHandshakeOptions, v as createServerHandshakeOptions } from '../context-d6dd8a1a.js';
+import { S as ServerTransport } from '../server-e46399f9.js';
 import '@sinclair/typebox';
-import '../client-a32692b0.js';
+import '../client-5d2e41a3.js';
 import '@sinclair/typebox/value';
 import '@opentelemetry/api';
 import '@sinclair/typebox/errors';
@@ -25,6 +25,7 @@ interface Server<Services extends AnyServiceSchemaMap> {
      * A set of stream ids that are currently open.
      */
     streams: Map<StreamId, ProcStream>;
+    close: () => Promise<void>;
 }
 interface ProcStream {
     streamId: StreamId;
@@ -47,7 +48,7 @@ interface ProcStream {
  */
 declare function createServer<Services extends AnyServiceSchemaMap>(transport: ServerTransport<Connection>, services: Services, providedServerOptions?: Partial<{
     handshakeOptions?: ServerHandshakeOptions;
-    extendedContext?: Omit<ServiceContext, 'state'>;
+    extendedContext?: ServiceContext;
     /**
      * Maximum number of cancelled streams to keep track of to avoid
      * cascading stream errors.
@@ -55,6 +56,6 @@ declare function createServer<Services extends AnyServiceSchemaMap>(transport: S
     maxCancelledStreamTombstonesPerSession?: number;
 }>): Server<Services>;
 
-var version = "0.201.0";
+var version = "0.203.0";
 
 export { ParsedMetadata, version as RIVER_VERSION, Server, ServiceContext, createServer };

package/dist/router/index.d.ts

@@ -1,11 +1,11 @@
-import { A as AnyServiceSchemaMap, I as InstantiatedServiceSchemaMap, a as AnyProcedure } from '../services-e71ea921.js';
-export { E as BaseErrorSchemaType, C as CANCEL_CODE, G as Client, H as Err, L as ErrResult, B as INVALID_REQUEST_CODE, O as Ok, M as OkResult, p as PayloadType, f as ProcErrors, P as ProcHandler, c as ProcInit, d as ProcRequest, e as ProcResponse, g as ProcType, v as Procedure, w as ProcedureErrorSchemaType, q as ProcedureMap, R as RPCProcedure, u as Readable, D as ReaderErrorSchema, T as ResponseData, K as Result, Q as ResultUnwrapErr, N as ResultUnwrapOk, k as SerializedProcedureSchema, o as SerializedProcedureSchemaProtocolv1, i as SerializedServerSchema, m as SerializedServerSchemaProtocolv1, j as SerializedServiceSchema, n as SerializedServiceSchemaProtocolv1, S as Service, b as ServiceConfiguration, h as ServiceSchema, t as StreamProcedure, r as SubscriptionProcedure, y as UNCAUGHT_ERROR_CODE, z as UNEXPECTED_DISCONNECT_CODE, U as UploadProcedure, V as ValidProcType, W as Writable, F as createClient, x as flattenErrorType, s as serializeSchema, l as serializeSchemaV1Compat, J as unwrapOrThrow } from '../services-e71ea921.js';
+import { A as AnyServiceSchemaMap, I as InstantiatedServiceSchemaMap, a as AnyProcedure } from '../services-56cbea0d.js';
+export { E as BaseErrorSchemaType, C as CANCEL_CODE, G as Client, H as Err, L as ErrResult, B as INVALID_REQUEST_CODE, O as Ok, M as OkResult, p as PayloadType, f as ProcErrors, P as ProcHandler, c as ProcInit, d as ProcRequest, e as ProcResponse, g as ProcType, v as Procedure, w as ProcedureErrorSchemaType, q as ProcedureMap, R as RPCProcedure, u as Readable, D as ReaderErrorSchema, T as ResponseData, K as Result, Q as ResultUnwrapErr, N as ResultUnwrapOk, k as SerializedProcedureSchema, o as SerializedProcedureSchemaProtocolv1, i as SerializedServerSchema, m as SerializedServerSchemaProtocolv1, j as SerializedServiceSchema, n as SerializedServiceSchemaProtocolv1, S as Service, b as ServiceConfiguration, h as ServiceSchema, t as StreamProcedure, r as SubscriptionProcedure, y as UNCAUGHT_ERROR_CODE, z as UNEXPECTED_DISCONNECT_CODE, U as UploadProcedure, V as ValidProcType, W as Writable, F as createClient, x as flattenErrorType, s as serializeSchema, l as serializeSchemaV1Compat, J as unwrapOrThrow } from '../services-56cbea0d.js';
 import { c as TransportClientId, b as OpaqueTransportMessage } from '../message-3def9ded.js';
-import { q as ParsedMetadata, C as Connection, r as ServerHandshakeOptions, s as ServiceContext } from '../context-8d263a7f.js';
-export { t as ProcedureHandlerContext, u as createClientHandshakeOptions, v as createServerHandshakeOptions } from '../context-8d263a7f.js';
-import { S as ServerTransport } from '../server-48d90a77.js';
+import { q as ParsedMetadata, C as Connection, r as ServerHandshakeOptions, s as ServiceContext } from '../context-d6dd8a1a.js';
+export { t as ProcedureHandlerContext, u as createClientHandshakeOptions, v as createServerHandshakeOptions } from '../context-d6dd8a1a.js';
+import { S as ServerTransport } from '../server-e46399f9.js';
 import '@sinclair/typebox';
-import '../client-a32692b0.js';
+import '../client-5d2e41a3.js';
 import '@sinclair/typebox/value';
 import '@opentelemetry/api';
 import '@sinclair/typebox/errors';
@@ -25,6 +25,7 @@ interface Server<Services extends AnyServiceSchemaMap> {
      * A set of stream ids that are currently open.
      */
     streams: Map<StreamId, ProcStream>;
+    close: () => Promise<void>;
 }
 interface ProcStream {
     streamId: StreamId;
@@ -47,7 +48,7 @@ interface ProcStream {
  */
 declare function createServer<Services extends AnyServiceSchemaMap>(transport: ServerTransport<Connection>, services: Services, providedServerOptions?: Partial<{
     handshakeOptions?: ServerHandshakeOptions;
-    extendedContext?: Omit<ServiceContext, 'state'>;
+    extendedContext?: ServiceContext;
     /**
      * Maximum number of cancelled streams to keep track of to avoid
      * cascading stream errors.
@@ -55,6 +56,6 @@ declare function createServer<Services extends AnyServiceSchemaMap>(transport: S
     maxCancelledStreamTombstonesPerSession?: number;
 }>): Server<Services>;
 
-var version = "0.201.0";
+var version = "0.203.0";
 
 export { ParsedMetadata, version as RIVER_VERSION, Server, ServiceContext, createServer };

package/dist/router/index.js

@@ -12,7 +12,7 @@ import {
   isStreamClose,
   isStreamOpen,
   version
-} from "../chunk-7IUEEQP7.js";
+} from "../chunk-SZHNMLKC.js";
 
 // router/services.ts
 import { Type as Type2, Kind as Kind2 } from "@sinclair/typebox";
@@ -260,9 +260,15 @@ var ServiceSchema = class _ServiceSchema {
    * for you.
    */
   instantiate(extendedContext) {
+    const state = this.initializeState(extendedContext);
+    const dispose = async () => {
+      await state[Symbol.asyncDispose]?.();
+      state[Symbol.dispose]?.();
+    };
     return Object.freeze({
-      state: this.initializeState(extendedContext),
-      procedures: this.procedures
+      state,
+      procedures: this.procedures,
+      [Symbol.asyncDispose]: dispose
     });
   }
 };
@@ -949,6 +955,7 @@ var RiverServer = class {
   maxCancelledStreamTombstonesPerSession;
   streams;
   services;
+  unregisterTransportListeners;
   constructor(transport, services, handshakeOptions, extendedContext, maxCancelledStreamTombstonesPerSession = 200) {
     const instances = {};
     this.services = instances;
@@ -1016,6 +1023,9 @@ var RiverServer = class {
     const handleTransportStatus = (evt) => {
       if (evt.status !== "closed")
         return;
+      this.unregisterTransportListeners();
+    };
+    this.unregisterTransportListeners = () => {
       this.transport.removeEventListener("message", handleCreatingNewStreams);
       this.transport.removeEventListener("sessionStatus", handleSessionStatus);
       this.transport.removeEventListener(
@@ -1246,11 +1256,12 @@ var RiverServer = class {
     if (procClosesWithInit) {
       closeReadable();
     }
-    const handlerContext = {
+    const handlerContextWithSpan = (span) => ({
       ...serviceContext,
       from,
       sessionId,
       metadata: sessionMetadata,
+      span,
       cancel: () => {
         onServerCancel({
           code: CANCEL_CODE,
@@ -1258,7 +1269,7 @@ var RiverServer = class {
         });
       },
       signal: finishedController.signal
-    };
+    });
     switch (procedure.type) {
       case "rpc":
         void createHandlerSpan(
@@ -1270,7 +1281,7 @@ var RiverServer = class {
           async (span) => {
             try {
               const responsePayload = await procedure.handler({
-                ctx: handlerContext,
+                ctx: handlerContextWithSpan(span),
                 reqInit: initPayload
               });
               if (resWritable.isClosed()) {
@@ -1295,7 +1306,7 @@ var RiverServer = class {
           async (span) => {
             try {
               await procedure.handler({
-                ctx: handlerContext,
+                ctx: handlerContextWithSpan(span),
                 reqInit: initPayload,
                 reqReadable,
                 resWritable
@@ -1318,7 +1329,7 @@ var RiverServer = class {
           async (span) => {
             try {
               await procedure.handler({
-                ctx: handlerContext,
+                ctx: handlerContextWithSpan(span),
                 reqInit: initPayload,
                 resWritable
               });
@@ -1340,7 +1351,7 @@ var RiverServer = class {
           async (span) => {
             try {
               const responsePayload = await procedure.handler({
-                ctx: handlerContext,
+                ctx: handlerContextWithSpan(span),
                 reqInit: initPayload,
                 reqReadable
               });
@@ -1553,6 +1564,13 @@ var RiverServer = class {
     const msg = cancelMessage(streamId, payload);
     sessionScopedSend(msg);
   }
+  async close() {
+    this.unregisterTransportListeners();
+    for (const serviceName of Object.keys(this.services)) {
+      const service = this.services[serviceName];
+      await service[Symbol.asyncDispose]();
+    }
+  }
 };
 var LRUSet = class {
   items;