@replit/river 0.213.1 → 0.214.0

package/dist/{chunk-2A645F27.js → chunk-DRYCLL6N.js}

@@ -20,7 +20,7 @@ import {
   handshakeResponseMessage,
   isAcceptedProtocolVersion,
   isAck
-} from "./chunk-X4PP65DW.js";
+} from "./chunk-LECVFB2G.js";
 
 // transport/events.ts
 var ProtocolError = {
@@ -2345,4 +2345,4 @@ export {
   WebSocketConnection,
   CodecMessageAdapter
 };
-//# sourceMappingURL=chunk-2A645F27.js.map
+//# sourceMappingURL=chunk-DRYCLL6N.js.map

package/dist/{chunk-X4PP65DW.js → chunk-LECVFB2G.js}

@@ -1291,6 +1291,7 @@ function coerceErrorString(err) {
 }
 
 // router/server.ts
+import { context as otelContext, trace as trace2 } from "@opentelemetry/api";
 var RiverServer = class {
   transport;
   contextMap;
@@ -1554,9 +1555,49 @@ var RiverServer = class {
       resWritable.close();
       cancelStream(streamId, result);
     };
+    const deferredCleanups = [];
+    let cleanupsHaveRun = false;
+    const runCleanupSafe = async (fn) => {
+      try {
+        await fn();
+      } catch (err) {
+        span.recordException(
+          err instanceof Error ? err : new Error(coerceErrorString(err))
+        );
+      }
+    };
+    const deferCleanup = (fn) => {
+      if (cleanupsHaveRun) {
+        void runCleanupSafe(fn);
+        return;
+      }
+      deferredCleanups.push(fn);
+    };
+    const runDeferredCleanups = async () => {
+      if (deferredCleanups.length === 0) {
+        cleanupsHaveRun = true;
+        span.end();
+        return;
+      }
+      const cleanupSpan = getTracer().startSpan(
+        "river.cleanup",
+        {},
+        trace2.setSpan(otelContext.active(), span)
+      );
+      try {
+        for (let fn = deferredCleanups.pop(); fn; fn = deferredCleanups.pop()) {
+          await runCleanupSafe(fn);
+        }
+      } finally {
+        cleanupsHaveRun = true;
+        cleanupSpan.end();
+        span.end();
+      }
+    };
     const cleanup = () => {
       finishedController.abort();
       this.streams.delete(streamId);
+      void runDeferredCleanups();
     };
     const procClosesWithResponse = procedure.type === "rpc" || procedure.type === "upload";
     const reqReadable = new ReadableImpl();
@@ -1645,6 +1686,7 @@ var RiverServer = class {
         onServerCancel(errRes);
         return Err(errRes);
       },
+      deferCleanup,
       signal: finishedController.signal
     };
     const middlewareContext = {
@@ -1653,6 +1695,7 @@ var RiverServer = class {
       from,
       metadata: sessionMetadata,
       span,
+      deferCleanup,
       signal: finishedController.signal,
       streamId,
       procedureName,
@@ -1672,8 +1715,6 @@ var RiverServer = class {
             resWritable.write(responsePayload);
           } catch (err) {
             onHandlerError(err, span);
-          } finally {
-            span.end();
           }
           break;
         case "stream":
@@ -1686,8 +1727,6 @@ var RiverServer = class {
             });
           } catch (err) {
             onHandlerError(err, span);
-          } finally {
-            span.end();
           }
           break;
         case "subscription":
@@ -1699,8 +1738,6 @@ var RiverServer = class {
             });
           } catch (err) {
             onHandlerError(err, span);
-          } finally {
-            span.end();
           }
           break;
         case "upload":
@@ -1716,8 +1753,6 @@ var RiverServer = class {
             resWritable.write(responsePayload);
           } catch (err) {
             onHandlerError(err, span);
-          } finally {
-            span.end();
           }
           break;
       }
@@ -2019,7 +2054,7 @@ function createServerHandshakeOptions(schema, validate) {
 }
 
 // package.json
-var version = "0.213.1";
+var version = "0.214.0";
 
 export {
   generateId,
@@ -2060,4 +2095,4 @@ export {
   createConnectionTelemetryInfo,
   getTracer
 };
-//# sourceMappingURL=chunk-X4PP65DW.js.map
+//# sourceMappingURL=chunk-LECVFB2G.js.map