@replit/river 0.201.0 → 0.203.0

package/dist/router/index.cjs

@@ -284,9 +284,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
     });
   }
 };
@@ -605,7 +611,7 @@ function unwrapOrThrow(result) {
 var import_api = require("@opentelemetry/api");
 
 // package.json
-var version = "0.201.0";
+var version = "0.203.0";
 
 // tracing/index.ts
 function getPropagationContext(ctx) {
@@ -1181,6 +1187,7 @@ var RiverServer = class {
   maxCancelledStreamTombstonesPerSession;
   streams;
   services;
+  unregisterTransportListeners;
   constructor(transport, services, handshakeOptions, extendedContext, maxCancelledStreamTombstonesPerSession = 200) {
     const instances = {};
     this.services = instances;
@@ -1248,6 +1255,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(
@@ -1478,11 +1488,12 @@ var RiverServer = class {
     if (procClosesWithInit) {
       closeReadable();
     }
-    const handlerContext = {
+    const handlerContextWithSpan = (span) => ({
       ...serviceContext,
       from,
       sessionId,
       metadata: sessionMetadata,
+      span,
       cancel: () => {
         onServerCancel({
           code: CANCEL_CODE,
@@ -1490,7 +1501,7 @@ var RiverServer = class {
         });
       },
       signal: finishedController.signal
-    };
+    });
     switch (procedure.type) {
       case "rpc":
         void createHandlerSpan(
@@ -1502,7 +1513,7 @@ var RiverServer = class {
           async (span) => {
             try {
               const responsePayload = await procedure.handler({
-                ctx: handlerContext,
+                ctx: handlerContextWithSpan(span),
                 reqInit: initPayload
               });
               if (resWritable.isClosed()) {
@@ -1527,7 +1538,7 @@ var RiverServer = class {
           async (span) => {
             try {
               await procedure.handler({
-                ctx: handlerContext,
+                ctx: handlerContextWithSpan(span),
                 reqInit: initPayload,
                 reqReadable,
                 resWritable
@@ -1550,7 +1561,7 @@ var RiverServer = class {
           async (span) => {
             try {
               await procedure.handler({
-                ctx: handlerContext,
+                ctx: handlerContextWithSpan(span),
                 reqInit: initPayload,
                 resWritable
               });
@@ -1572,7 +1583,7 @@ var RiverServer = class {
           async (span) => {
             try {
               const responsePayload = await procedure.handler({
-                ctx: handlerContext,
+                ctx: handlerContextWithSpan(span),
                 reqInit: initPayload,
                 reqReadable
               });
@@ -1785,6 +1796,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;