@replit/river 0.203.1 → 0.205.0

package/dist/{client-5d2e41a3.d.ts → client-3adfb12a.d.ts}

@@ -1,4 +1,4 @@
-import { C as Connection, T as Transport, m as ClientTransportOptions, L as LeakyBucketRateLimit, n as ClientHandshakeOptions, o as ClientSession, b as ProvidedClientTransportOptions, e as SessionNoConnection, f as SessionConnecting, g as SessionHandshaking, h as SessionConnected, p as SessionBackingOff } from './context-d6dd8a1a.js';
+import { C as Connection, T as Transport, m as ClientTransportOptions, L as LeakyBucketRateLimit, n as ClientHandshakeOptions, o as ClientSession, b as ProvidedClientTransportOptions, e as SessionNoConnection, f as SessionConnecting, g as SessionHandshaking, h as SessionConnected, p as SessionBackingOff } from './context-1a332293.js';
 import { c as TransportClientId, b as OpaqueTransportMessage } from './message-3def9ded.js';
 
 declare abstract class ClientTransport<ConnType extends Connection> extends Transport<ConnType> {

package/dist/{connection-11a4af0f.d.ts → connection-9ca3e7ed.d.ts}

@@ -1,6 +1,6 @@
 import { P as ProtocolVersion, b as OpaqueTransportMessage, e as Tags } from './message-3def9ded.js';
 import * as _sinclair_typebox_errors from '@sinclair/typebox/errors';
-import { C as Connection } from './context-d6dd8a1a.js';
+import { C as Connection } from './context-1a332293.js';
 import { W as WsLike } from './wslike-e0b32dd5.js';
 
 interface ConnectionInfoExtras extends Record<string, unknown> {

package/dist/{context-d6dd8a1a.d.ts → context-1a332293.d.ts}

@@ -1,7 +1,7 @@
 import { g as TelemetryInfo, M as MessageMetadata, c as TransportClientId, L as Logger, b as OpaqueTransportMessage, P as ProtocolVersion, f as PartialTransportMessage, a as TransportMessage, e as Tags, H as HandshakeErrorResponseCodes, h as LogFn, j as LoggingLevel, k as HandshakeErrorCustomHandlerFatalResponseCodes } from './message-3def9ded.js';
 import { Static, TSchema } from '@sinclair/typebox';
 import * as _sinclair_typebox_errors from '@sinclair/typebox/errors';
-import { Span } from '@opentelemetry/api';
+import { Tracer, Span } from '@opentelemetry/api';
 import { C as Codec } from './types-3e5768ec.js';
 
 /**
@@ -21,6 +21,9 @@ declare abstract class Connection {
     get dataListeners(): ((msg: Uint8Array) => void)[];
     get closeListeners(): (() => void)[];
     get errorListeners(): ((err: Error) => void)[];
+    onData(msg: Uint8Array): void;
+    onError(err: Error): void;
+    onClose(): void;
     /**
      * Handle adding a callback for when a message is received.
      * @param msg The message that was received.
@@ -121,14 +124,16 @@ interface SessionOptions {
 interface CommonSessionProps {
     from: TransportClientId;
     options: SessionOptions;
+    tracer: Tracer;
     log: Logger | undefined;
 }
 declare abstract class CommonSession extends StateMachineState {
     readonly from: TransportClientId;
     readonly options: SessionOptions;
+    tracer: Tracer;
     log?: Logger;
     abstract get loggingMetadata(): MessageMetadata;
-    constructor({ from, options, log }: CommonSessionProps);
+    constructor({ from, options, log, tracer }: CommonSessionProps);
     parseMsg(msg: Uint8Array): OpaqueTransportMessage | null;
 }
 type SessionId = string;
@@ -316,8 +321,11 @@ type ProtocolErrorType = (typeof ProtocolError)[keyof typeof ProtocolError];
 interface EventMap {
     message: OpaqueTransportMessage;
     sessionStatus: {
-        status: 'connect' | 'disconnect';
+        status: 'created' | 'closing';
         session: Session<Connection>;
+    } | {
+        status: 'closed';
+        session: Pick<Session<Connection>, 'id' | 'to'>;
     };
     sessionTransition: {
         state: SessionState.Connected;
@@ -461,6 +469,7 @@ declare abstract class Transport<ConnType extends Connection> {
      */
     protected options: TransportOptions;
     log?: Logger;
+    tracer: Tracer;
     sessions: Map<TransportClientId, Session<ConnType>>;
     /**
      * Creates a new Transport instance.

package/dist/router/index.cjs

@@ -609,11 +609,6 @@ function unwrapOrThrow(result) {
 
 // tracing/index.ts
 var import_api = require("@opentelemetry/api");
-
-// package.json
-var version = "0.203.1";
-
-// tracing/index.ts
 function getPropagationContext(ctx) {
   const tracing = {
     traceparent: "",
@@ -622,10 +617,10 @@ function getPropagationContext(ctx) {
   import_api.propagation.inject(ctx, tracing);
   return tracing;
 }
-function createProcTelemetryInfo(session, kind, serviceName, procedureName, streamId) {
+function createProcTelemetryInfo(tracer, session, kind, serviceName, procedureName, streamId) {
   const baseCtx = import_api.context.active();
   const span = tracer.startSpan(
-    `procedure call ${serviceName}.${procedureName}`,
+    `river.client.${serviceName}.${procedureName}`,
     {
       attributes: {
         component: "river",
@@ -657,10 +652,10 @@ function createProcTelemetryInfo(session, kind, serviceName, procedureName, stre
   session.log?.info(`invoked ${serviceName}.${procedureName}`, metadata);
   return { span, ctx };
 }
-function createHandlerSpan(session, kind, serviceName, procedureName, streamId, tracing, fn) {
+function createHandlerSpan(tracer, session, kind, serviceName, procedureName, streamId, tracing, fn) {
   const ctx = tracing ? import_api.propagation.extract(import_api.context.active(), tracing) : import_api.context.active();
   return tracer.startActiveSpan(
-    `procedure handler ${serviceName}.${procedureName}`,
+    `river.server.${serviceName}.${procedureName}`,
     {
       attributes: {
         component: "river",
@@ -677,7 +672,16 @@ function createHandlerSpan(session, kind, serviceName, procedureName, streamId,
     fn
   );
 }
-var tracer = import_api.trace.getTracer("river", version);
+function recordRiverError(span, error) {
+  span.setStatus({
+    code: import_api.SpanStatusCode.ERROR,
+    message: error.message
+  });
+  span.setAttributes({
+    "river.error_code": error.code,
+    "river.error_message": error.message
+  });
+}
 
 // router/streams.ts
 var ReadableBrokenError = {
@@ -952,6 +956,7 @@ function handleProc(procType, transport, serverId, init, serviceName, procedureN
   const procClosesWithInit = procType === "rpc" || procType === "subscription";
   const streamId = generateId();
   const { span, ctx } = createProcTelemetryInfo(
+    transport.tracer,
     session,
     procType,
     serviceName,
@@ -1091,7 +1096,7 @@ function handleProc(procType, transport, serverId, init, serviceName, procedureN
     }
   }
   function onSessionStatus(evt) {
-    if (evt.status !== "disconnect" || evt.session.to !== serverId || session.id !== evt.session.id) {
+    if (evt.status !== "closing" || evt.session.to !== serverId || session.id !== evt.session.id) {
       return;
     }
     cleanClose = false;
@@ -1170,7 +1175,6 @@ function coerceErrorString(err) {
 }
 
 // router/server.ts
-var import_api2 = require("@opentelemetry/api");
 var CancelResultSchema = ErrResultSchema(
   import_typebox6.Type.Object({
     code: import_typebox6.Type.Literal(CANCEL_CODE),
@@ -1238,6 +1242,7 @@ var RiverServer = class {
         return;
       }
       createHandlerSpan(
+        transport.tracer,
         newStreamProps.initialSession,
         newStreamProps.procedure.type,
         newStreamProps.serviceName,
@@ -1250,7 +1255,7 @@ var RiverServer = class {
       );
     };
     const handleSessionStatus = (evt) => {
-      if (evt.status !== "disconnect")
+      if (evt.status !== "closing")
         return;
       const disconnectedClientId = evt.session.to;
       this.log?.info(
@@ -1416,6 +1421,7 @@ var RiverServer = class {
       this.cancelStream(from, sessionScopedSend, streamId2, payload);
     };
     const onServerCancel = (e) => {
+      recordRiverError(span, e);
       if (reqReadable.isClosed() && resWritable.isClosed()) {
         return;
       }
@@ -1450,6 +1456,9 @@ var RiverServer = class {
     }
     const resWritable = new WritableImpl({
       writeCb: (response) => {
+        if (!response.ok) {
+          recordRiverError(span, response.payload);
+        }
         sessionScopedSend({
           streamId,
           controlFlags: procClosesWithResponse ? getStreamCloseBackwardsCompat(protocolVersion) : 0,
@@ -1479,7 +1488,6 @@ var RiverServer = class {
     const onHandlerError = (err, span2) => {
       const errorMsg = coerceErrorString(err);
       span2.recordException(err instanceof Error ? err : new Error(errorMsg));
-      span2.setStatus({ code: import_api2.SpanStatusCode.ERROR });
       this.log?.error(
         `${serviceName}.${procedureName} handler threw an uncaught error`,
         {
@@ -1848,6 +1856,9 @@ function createClientHandshakeOptions(schema, construct) {
 function createServerHandshakeOptions(schema, validate) {
   return { schema, validate };
 }
+
+// package.json
+var version = "0.205.0";
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   CANCEL_CODE,