@replit/river 0.202.0 → 0.203.1

package/dist/router/index.d.cts

@@ -1,11 +1,11 @@
-import { A as AnyServiceSchemaMap, I as InstantiatedServiceSchemaMap, a as AnyProcedure } from '../services-a05f5174.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-a05f5174.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';
@@ -56,6 +56,6 @@ declare function createServer<Services extends AnyServiceSchemaMap>(transport: S
     maxCancelledStreamTombstonesPerSession?: number;
 }>): Server<Services>;
 
-var version = "0.202.0";
+var version = "0.203.1";
 
 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-a05f5174.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-a05f5174.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';
@@ -56,6 +56,6 @@ declare function createServer<Services extends AnyServiceSchemaMap>(transport: S
     maxCancelledStreamTombstonesPerSession?: number;
 }>): Server<Services>;
 
-var version = "0.202.0";
+var version = "0.203.1";
 
 export { ParsedMetadata, version as RIVER_VERSION, Server, ServiceContext, createServer };

package/dist/router/index.js

@@ -12,7 +12,7 @@ import {
   isStreamClose,
   isStreamOpen,
   version
-} from "../chunk-QMXUCLGE.js";
+} from "../chunk-AK7NTFAM.js";
 
 // router/services.ts
 import { Type as Type2, Kind as Kind2 } from "@sinclair/typebox";
@@ -725,7 +725,7 @@ function handleProc(procType, transport, serverId, init, serviceName, procedureN
   const procClosesWithInit = procType === "rpc" || procType === "subscription";
   const streamId = generateId();
   const { span, ctx } = createProcTelemetryInfo(
-    transport,
+    session,
     procType,
     serviceName,
     procedureName,
@@ -1000,10 +1000,17 @@ var RiverServer = class {
       if (!newStreamProps) {
         return;
       }
-      this.createNewProcStream({
-        ...newStreamProps,
-        ...message
-      });
+      createHandlerSpan(
+        newStreamProps.initialSession,
+        newStreamProps.procedure.type,
+        newStreamProps.serviceName,
+        newStreamProps.procedureName,
+        newStreamProps.streamId,
+        newStreamProps.tracingCtx,
+        (span) => {
+          this.createNewProcStream(span, newStreamProps);
+        }
+      );
     };
     const handleSessionStatus = (evt) => {
       if (evt.status !== "disconnect")
@@ -1037,7 +1044,7 @@ var RiverServer = class {
     this.transport.addEventListener("sessionStatus", handleSessionStatus);
     this.transport.addEventListener("transportStatus", handleTransportStatus);
   }
-  createNewProcStream(props) {
+  createNewProcStream(span, props) {
     const {
       streamId,
       initialSession,
@@ -1047,7 +1054,6 @@ var RiverServer = class {
       sessionMetadata,
       serviceContext,
       initPayload,
-      tracingCtx,
       procClosesWithInit,
       passInitAsDataForBackwardsCompat
     } = props;
@@ -1057,6 +1063,10 @@ var RiverServer = class {
       protocolVersion,
       id: sessionId
     } = initialSession;
+    loggingMetadata.telemetry = {
+      traceId: span.spanContext().traceId,
+      spanId: span.spanContext().spanId
+    };
     let cleanClose = true;
     const onMessage = (msg) => {
       if (msg.from !== from) {
@@ -1229,10 +1239,10 @@ var RiverServer = class {
         }
       }
     });
-    const onHandlerError = (err, span) => {
+    const onHandlerError = (err, span2) => {
       const errorMsg = coerceErrorString(err);
-      span.recordException(err instanceof Error ? err : new Error(errorMsg));
-      span.setStatus({ code: SpanStatusCode.ERROR });
+      span2.recordException(err instanceof Error ? err : new Error(errorMsg));
+      span2.setStatus({ code: SpanStatusCode.ERROR });
       this.log?.error(
         `${serviceName}.${procedureName} handler threw an uncaught error`,
         {
@@ -1256,11 +1266,12 @@ var RiverServer = class {
     if (procClosesWithInit) {
       closeReadable();
     }
-    const handlerContext = {
+    const handlerContextWithSpan = (span2) => ({
       ...serviceContext,
       from,
       sessionId,
       metadata: sessionMetadata,
+      span: span2,
       cancel: () => {
         onServerCancel({
           code: CANCEL_CODE,
@@ -1268,103 +1279,75 @@ var RiverServer = class {
         });
       },
       signal: finishedController.signal
-    };
+    });
     switch (procedure.type) {
       case "rpc":
-        void createHandlerSpan(
-          procedure.type,
-          serviceName,
-          procedureName,
-          streamId,
-          tracingCtx,
-          async (span) => {
-            try {
-              const responsePayload = await procedure.handler({
-                ctx: handlerContext,
-                reqInit: initPayload
-              });
-              if (resWritable.isClosed()) {
-                return;
-              }
-              resWritable.write(responsePayload);
-            } catch (err) {
-              onHandlerError(err, span);
-            } finally {
-              span.end();
+        void (async () => {
+          try {
+            const responsePayload = await procedure.handler({
+              ctx: handlerContextWithSpan(span),
+              reqInit: initPayload
+            });
+            if (resWritable.isClosed()) {
+              return;
             }
+            resWritable.write(responsePayload);
+          } catch (err) {
+            onHandlerError(err, span);
+          } finally {
+            span.end();
           }
-        );
+        })();
         break;
       case "stream":
-        void createHandlerSpan(
-          procedure.type,
-          serviceName,
-          procedureName,
-          streamId,
-          tracingCtx,
-          async (span) => {
-            try {
-              await procedure.handler({
-                ctx: handlerContext,
-                reqInit: initPayload,
-                reqReadable,
-                resWritable
-              });
-            } catch (err) {
-              onHandlerError(err, span);
-            } finally {
-              span.end();
-            }
+        void (async () => {
+          try {
+            await procedure.handler({
+              ctx: handlerContextWithSpan(span),
+              reqInit: initPayload,
+              reqReadable,
+              resWritable
+            });
+          } catch (err) {
+            onHandlerError(err, span);
+          } finally {
+            span.end();
           }
-        );
+        })();
         break;
       case "subscription":
-        void createHandlerSpan(
-          procedure.type,
-          serviceName,
-          procedureName,
-          streamId,
-          tracingCtx,
-          async (span) => {
-            try {
-              await procedure.handler({
-                ctx: handlerContext,
-                reqInit: initPayload,
-                resWritable
-              });
-            } catch (err) {
-              onHandlerError(err, span);
-            } finally {
-              span.end();
-            }
+        void (async () => {
+          try {
+            await procedure.handler({
+              ctx: handlerContextWithSpan(span),
+              reqInit: initPayload,
+              resWritable
+            });
+          } catch (err) {
+            onHandlerError(err, span);
+          } finally {
+            span.end();
           }
-        );
+        })();
         break;
       case "upload":
-        void createHandlerSpan(
-          procedure.type,
-          serviceName,
-          procedureName,
-          streamId,
-          tracingCtx,
-          async (span) => {
-            try {
-              const responsePayload = await procedure.handler({
-                ctx: handlerContext,
-                reqInit: initPayload,
-                reqReadable
-              });
-              if (resWritable.isClosed()) {
-                return;
-              }
-              resWritable.write(responsePayload);
-            } catch (err) {
-              onHandlerError(err, span);
-            } finally {
-              span.end();
+        void (async () => {
+          try {
+            const responsePayload = await procedure.handler({
+              ctx: handlerContextWithSpan(span),
+              reqInit: initPayload,
+              reqReadable
+            });
+            if (resWritable.isClosed()) {
+              return;
             }
+            resWritable.write(responsePayload);
+          } catch (err) {
+            onHandlerError(err, span);
+          } finally {
+            span.end();
           }
-        );
+        })();
         break;
     }
     if (!finishedController.signal.aborted) {