@replit/river 0.213.1 → 0.215.0

package/dist/{message-Dlsh5WDF.d.cts → message-aABg0s5M.d.cts}

@@ -92,6 +92,17 @@ type PartialTransportMessage<Payload = unknown> = Omit<TransportMessage<Payload>
  */
 type OpaqueTransportMessage = TransportMessage;
 type TransportClientId = string;
+/**
+ * An encoded message that is ready to be sent over the transport.
+ * The seq number is kept to track which messages have been
+ * acked by the peer and can be dropped from the send buffer.
+ */
+interface EncodedTransportMessage {
+    id: string;
+    seq: number;
+    msg: PartialTransportMessage;
+    data: Uint8Array;
+}
 /**
  * Checks if the given control flag (usually found in msg.controlFlag) is a stream open message.
  * @param controlFlag - The control flag to check.
@@ -105,4 +116,4 @@ declare function isStreamOpen(controlFlag: number): boolean;
  */
 declare function isStreamClose(controlFlag: number): boolean;
 
-export { HandshakeErrorResponseCodes as H, OpaqueTransportMessageSchema as O, type ProtocolVersion as P, TransportMessageSchema as T, type TransportMessage as a, type OpaqueTransportMessage as b, type TransportClientId as c, isStreamClose as d, type PartialTransportMessage as e, type TelemetryInfo as f, HandshakeErrorCustomHandlerFatalResponseCodes as g, isStreamOpen as i };
+export { type EncodedTransportMessage as E, HandshakeErrorResponseCodes as H, OpaqueTransportMessageSchema as O, type ProtocolVersion as P, TransportMessageSchema as T, type TransportMessage as a, type OpaqueTransportMessage as b, type TransportClientId as c, isStreamClose as d, type PartialTransportMessage as e, type TelemetryInfo as f, HandshakeErrorCustomHandlerFatalResponseCodes as g, isStreamOpen as i };

package/dist/{message-Dlsh5WDF.d.ts → message-aABg0s5M.d.ts}

@@ -92,6 +92,17 @@ type PartialTransportMessage<Payload = unknown> = Omit<TransportMessage<Payload>
  */
 type OpaqueTransportMessage = TransportMessage;
 type TransportClientId = string;
+/**
+ * An encoded message that is ready to be sent over the transport.
+ * The seq number is kept to track which messages have been
+ * acked by the peer and can be dropped from the send buffer.
+ */
+interface EncodedTransportMessage {
+    id: string;
+    seq: number;
+    msg: PartialTransportMessage;
+    data: Uint8Array;
+}
 /**
  * Checks if the given control flag (usually found in msg.controlFlag) is a stream open message.
  * @param controlFlag - The control flag to check.
@@ -105,4 +116,4 @@ declare function isStreamOpen(controlFlag: number): boolean;
  */
 declare function isStreamClose(controlFlag: number): boolean;
 
-export { HandshakeErrorResponseCodes as H, OpaqueTransportMessageSchema as O, type ProtocolVersion as P, TransportMessageSchema as T, type TransportMessage as a, type OpaqueTransportMessage as b, type TransportClientId as c, isStreamClose as d, type PartialTransportMessage as e, type TelemetryInfo as f, HandshakeErrorCustomHandlerFatalResponseCodes as g, isStreamOpen as i };
+export { type EncodedTransportMessage as E, HandshakeErrorResponseCodes as H, OpaqueTransportMessageSchema as O, type ProtocolVersion as P, TransportMessageSchema as T, type TransportMessage as a, type OpaqueTransportMessage as b, type TransportClientId as c, isStreamClose as d, type PartialTransportMessage as e, type TelemetryInfo as f, HandshakeErrorCustomHandlerFatalResponseCodes as g, isStreamOpen as i };

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");
@@ -1158,14 +1161,19 @@ function handleProc(procType, transport, serverId, init, serviceName, procedureN
   abortSignal?.addEventListener("abort", onClientCancel);
   transport.addEventListener("message", onMessage);
   transport.addEventListener("sessionStatus", onSessionStatus);
-  sessionScopedSend({
-    streamId,
-    serviceName,
-    procedureName,
-    tracing: getPropagationContext(ctx),
-    payload: init,
-    controlFlags: procClosesWithInit ? 2 /* StreamOpenBit */ | 8 /* StreamClosedBit */ : 2 /* StreamOpenBit */
-  });
+  try {
+    sessionScopedSend({
+      streamId,
+      serviceName,
+      procedureName,
+      tracing: getPropagationContext(ctx),
+      payload: init,
+      controlFlags: procClosesWithInit ? 2 /* StreamOpenBit */ | 8 /* StreamClosedBit */ : 2 /* StreamOpenBit */
+    });
+  } catch (e) {
+    cleanup();
+    throw e;
+  }
   if (procClosesWithInit) {
     reqWritable.close();
   }
@@ -1238,6 +1246,7 @@ function coerceErrorString(err) {
 }
 
 // router/server.ts
+var import_api2 = require("@opentelemetry/api");
 var RiverServer = class {
   transport;
   contextMap;
@@ -1501,9 +1510,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 +1641,7 @@ var RiverServer = class {
         onServerCancel(errRes);
         return Err(errRes);
       },
+      deferCleanup,
       signal: finishedController.signal
     };
     const middlewareContext = {
@@ -1600,6 +1650,7 @@ var RiverServer = class {
       from,
       metadata: sessionMetadata,
       span,
+      deferCleanup,
       signal: finishedController.signal,
       streamId,
       procedureName,
@@ -1619,8 +1670,6 @@ var RiverServer = class {
             resWritable.write(responsePayload);
           } catch (err) {
             onHandlerError(err, span);
-          } finally {
-            span.end();
           }
           break;
         case "stream":
@@ -1633,8 +1682,6 @@ var RiverServer = class {
             });
           } catch (err) {
             onHandlerError(err, span);
-          } finally {
-            span.end();
           }
           break;
         case "subscription":
@@ -1646,8 +1693,6 @@ var RiverServer = class {
             });
           } catch (err) {
             onHandlerError(err, span);
-          } finally {
-            span.end();
           }
           break;
         case "upload":
@@ -1663,8 +1708,6 @@ var RiverServer = class {
             resWritable.write(responsePayload);
           } catch (err) {
             onHandlerError(err, span);
-          } finally {
-            span.end();
           }
           break;
       }
@@ -1966,7 +2009,7 @@ function createServerHandshakeOptions(schema, validate) {
 }
 
 // package.json
-var version = "0.213.1";
+var version = "0.215.0";
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   CANCEL_CODE,