@replit/river 0.213.0 → 0.214.0

package/dist/codec/index.js

@@ -2,9 +2,9 @@ import {
   BinaryCodec,
   CodecMessageAdapter,
   NaiveJsonCodec
-} from "../chunk-WBBJI3NJ.js";
+} from "../chunk-DRYCLL6N.js";
 import "../chunk-CC7RN7GI.js";
-import "../chunk-ED2QVVIW.js";
+import "../chunk-LECVFB2G.js";
 export {
   BinaryCodec,
   CodecMessageAdapter,

package/dist/router/index.cjs

@@ -927,6 +927,9 @@ function recordRiverError(span, error) {
     "river.error_message": error.message
   });
 }
+function getTracer() {
+  return import_api.trace.getTracer("river", version);
+}
 
 // router/client.ts
 var import_value = require("@sinclair/typebox/value");
@@ -1238,6 +1241,7 @@ function coerceErrorString(err) {
 }
 
 // router/server.ts
+var import_api2 = require("@opentelemetry/api");
 var RiverServer = class {
   transport;
   contextMap;
@@ -1501,9 +1505,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",
+        {},
+        import_api2.trace.setSpan(import_api2.context.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();
@@ -1592,6 +1636,7 @@ var RiverServer = class {
         onServerCancel(errRes);
         return Err(errRes);
       },
+      deferCleanup,
       signal: finishedController.signal
     };
     const middlewareContext = {
@@ -1600,6 +1645,7 @@ var RiverServer = class {
       from,
       metadata: sessionMetadata,
       span,
+      deferCleanup,
       signal: finishedController.signal,
       streamId,
       procedureName,
@@ -1619,8 +1665,6 @@ var RiverServer = class {
             resWritable.write(responsePayload);
           } catch (err) {
             onHandlerError(err, span);
-          } finally {
-            span.end();
           }
           break;
         case "stream":
@@ -1633,8 +1677,6 @@ var RiverServer = class {
             });
           } catch (err) {
             onHandlerError(err, span);
-          } finally {
-            span.end();
           }
           break;
         case "subscription":
@@ -1646,8 +1688,6 @@ var RiverServer = class {
             });
           } catch (err) {
             onHandlerError(err, span);
-          } finally {
-            span.end();
           }
           break;
         case "upload":
@@ -1663,8 +1703,6 @@ var RiverServer = class {
             resWritable.write(responsePayload);
           } catch (err) {
             onHandlerError(err, span);
-          } finally {
-            span.end();
           }
           break;
       }
@@ -1966,7 +2004,7 @@ function createServerHandshakeOptions(schema, validate) {
 }
 
 // package.json
-var version = "0.213.0";
+var version = "0.214.0";
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   CANCEL_CODE,