@replit/river 0.203.1 → 0.204.0

package/dist/transport/impls/ws/client.d.cts

@@ -1,7 +1,7 @@
-import { C as ClientTransport } from '../../../client-5d2e41a3.js';
+import { C as ClientTransport } from '../../../client-0c0a4a5e.js';
 import { c as TransportClientId } from '../../../message-3def9ded.js';
-import { b as ProvidedClientTransportOptions } from '../../../context-d6dd8a1a.js';
-import { W as WebSocketConnection } from '../../../connection-11a4af0f.js';
+import { b as ProvidedClientTransportOptions } from '../../../context-3cf1ed4e.js';
+import { W as WebSocketConnection } from '../../../connection-7b62dfec.js';
 import { W as WsLike } from '../../../wslike-e0b32dd5.js';
 import '@sinclair/typebox/value';
 import '@sinclair/typebox';

package/dist/transport/impls/ws/client.d.ts

@@ -1,7 +1,7 @@
-import { C as ClientTransport } from '../../../client-5d2e41a3.js';
+import { C as ClientTransport } from '../../../client-0c0a4a5e.js';
 import { c as TransportClientId } from '../../../message-3def9ded.js';
-import { b as ProvidedClientTransportOptions } from '../../../context-d6dd8a1a.js';
-import { W as WebSocketConnection } from '../../../connection-11a4af0f.js';
+import { b as ProvidedClientTransportOptions } from '../../../context-3cf1ed4e.js';
+import { W as WebSocketConnection } from '../../../connection-7b62dfec.js';
 import { W as WsLike } from '../../../wslike-e0b32dd5.js';
 import '@sinclair/typebox/value';
 import '@sinclair/typebox';

package/dist/transport/impls/ws/client.js

@@ -1,11 +1,11 @@
 import {
   ClientTransport
-} from "../../../chunk-T4WWG42M.js";
+} from "../../../chunk-3V7VMJNA.js";
 import {
   WebSocketConnection
-} from "../../../chunk-2FHJVQBE.js";
-import "../../../chunk-TMOCPK63.js";
-import "../../../chunk-AK7NTFAM.js";
+} from "../../../chunk-QSW7AWEP.js";
+import "../../../chunk-6YUDEFCS.js";
+import "../../../chunk-LJCR3ADI.js";
 import "../../../chunk-WBGKPIFS.js";
 import "../../../chunk-AJGIY2UB.js";
 

package/dist/transport/impls/ws/server.cjs

@@ -62,6 +62,22 @@ var Connection = class {
   get errorListeners() {
     return [...this._errorListeners];
   }
+  onData(msg) {
+    for (const cb of this.dataListeners) {
+      cb(msg);
+    }
+  }
+  onError(err) {
+    for (const cb of this.errorListeners) {
+      cb(err);
+    }
+  }
+  onClose() {
+    for (const cb of this.closeListeners) {
+      cb();
+    }
+    this.telemetry?.span.end();
+  }
   /**
    * Handle adding a callback for when a message is received.
    * @param msg The message that was received.
@@ -128,18 +144,12 @@ var WebSocketConnection = class extends Connection {
         const err = new Error(
           `websocket closed with code and reason: ${code} - ${reason}`
         );
-        for (const cb of this.errorListeners) {
-          cb(err);
-        }
-      }
-      for (const cb of this.closeListeners) {
-        cb();
+        this.onError(err);
       }
+      this.onClose();
     };
     this.ws.onmessage = (msg) => {
-      for (const cb of this.dataListeners) {
-        cb(msg.data);
-      }
+      this.onData(msg.data);
     };
   }
   send(payload) {
@@ -511,12 +521,14 @@ var StateMachineState = class {
 var CommonSession = class extends StateMachineState {
   from;
   options;
+  tracer;
   log;
-  constructor({ from, options, log }) {
+  constructor({ from, options, log, tracer }) {
     super();
     this.from = from;
     this.options = options;
     this.log = log;
+    this.tracer = tracer;
   }
   parseMsg(msg) {
     const parsedMsg = this.options.codec.fromBuffer(msg);
@@ -701,14 +713,22 @@ var SessionNoConnection = class extends IdentifiedSessionWithGracePeriod {
 // tracing/index.ts
 var import_api2 = require("@opentelemetry/api");
 
+// transport/stringifyError.ts
+function coerceErrorString(err) {
+  if (err instanceof Error) {
+    return err.message || "unknown reason";
+  }
+  return `[coerced to error] ${String(err)}`;
+}
+
 // package.json
-var version = "0.203.1";
+var version = "0.204.0";
 
 // tracing/index.ts
-function createSessionTelemetryInfo(sessionId, to, from, propagationCtx) {
+function createSessionTelemetryInfo(tracer, sessionId, to, from, propagationCtx) {
   const parentCtx = propagationCtx ? import_api2.propagation.extract(import_api2.context.active(), propagationCtx) : import_api2.context.active();
   const span = tracer.startSpan(
-    `session ${sessionId}`,
+    `river.session.${sessionId}`,
     {
       attributes: {
         component: "river",
@@ -722,7 +742,7 @@ function createSessionTelemetryInfo(sessionId, to, from, propagationCtx) {
   const ctx = import_api2.trace.setSpan(parentCtx, span);
   return { span, ctx };
 }
-function createConnectionTelemetryInfo(connection, info) {
+function createConnectionTelemetryInfo(tracer, connection, info) {
   const span = tracer.startSpan(
     `connection ${connection.id}`,
     {
@@ -737,7 +757,9 @@ function createConnectionTelemetryInfo(connection, info) {
   const ctx = import_api2.trace.setSpan(info.ctx, span);
   return { span, ctx };
 }
-var tracer = import_api2.trace.getTracer("river", version);
+function getTracer() {
+  return import_api2.trace.getTracer("river", version);
+}
 
 // transport/sessionStateMachine/SessionWaitingForHandshake.ts
 var SessionWaitingForHandshake = class extends CommonSession {
@@ -1023,6 +1045,7 @@ function inheritSharedSession(session) {
     telemetry: session.telemetry,
     options: session.options,
     log: session.log,
+    tracer: session.tracer,
     protocolVersion: session.protocolVersion
   };
 }
@@ -1034,9 +1057,9 @@ function inheritSharedSessionWithGrace(session) {
 }
 var SessionStateGraph = {
   entrypoints: {
-    NoConnection: (to, from, listeners, options, protocolVersion, log) => {
+    NoConnection: (to, from, listeners, options, protocolVersion, tracer, log) => {
       const id = `session-${generateId()}`;
-      const telemetry = createSessionTelemetryInfo(id, to, from);
+      const telemetry = createSessionTelemetryInfo(tracer, id, to, from);
       const sendBuffer = [];
       const session = new SessionNoConnection({
         listeners,
@@ -1050,6 +1073,7 @@ var SessionStateGraph = {
         telemetry,
         options,
         protocolVersion,
+        tracer,
         log
       });
       session.log?.info(`session ${session.id} created in NoConnection state`, {
@@ -1058,12 +1082,13 @@ var SessionStateGraph = {
       });
       return session;
     },
-    WaitingForHandshake: (from, conn, listeners, options, log) => {
+    WaitingForHandshake: (from, conn, listeners, options, tracer, log) => {
       const session = new SessionWaitingForHandshake({
         conn,
         listeners,
         from,
         options,
+        tracer,
         log
       });
       session.log?.info(`session created in WaitingForHandshake state`, {
@@ -1119,7 +1144,11 @@ var SessionStateGraph = {
         listeners,
         ...carriedState
       });
-      conn.telemetry = createConnectionTelemetryInfo(conn, session.telemetry);
+      conn.telemetry = createConnectionTelemetryInfo(
+        session.tracer,
+        conn,
+        session.telemetry
+      );
       session.log?.info(
         `session ${session.id} transition from Connecting to Handshaking`,
         {
@@ -1163,12 +1192,14 @@ var SessionStateGraph = {
           ack: 0,
           sendBuffer: [],
           telemetry: createSessionTelemetryInfo(
+            pendingSession.tracer,
             sessionId,
             to,
             from,
             propagationCtx
           ),
           options,
+          tracer: pendingSession.tracer,
           log: pendingSession.log,
           protocolVersion
         }
@@ -1180,7 +1211,11 @@ var SessionStateGraph = {
         listeners,
         ...carriedState
       });
-      conn.telemetry = createConnectionTelemetryInfo(conn, session.telemetry);
+      conn.telemetry = createConnectionTelemetryInfo(
+        session.tracer,
+        conn,
+        session.telemetry
+      );
       session.log?.info(
         `session ${session.id} transition from WaitingForHandshake to Connected`,
         {
@@ -1325,6 +1360,7 @@ var Transport = class {
    */
   options;
   log;
+  tracer;
   sessions;
   /**
    * Creates a new Transport instance.
@@ -1337,6 +1373,7 @@ var Transport = class {
     this.clientId = clientId;
     this.status = "open";
     this.sessions = /* @__PURE__ */ new Map();
+    this.tracer = getTracer();
   }
   bindLogger(fn, level) {
     if (typeof fn === "function") {
@@ -1519,14 +1556,6 @@ var Transport = class {
   }
 };
 
-// transport/stringifyError.ts
-function coerceErrorString(err) {
-  if (err instanceof Error) {
-    return err.message || "unknown reason";
-  }
-  return `[coerced to error] ${String(err)}`;
-}
-
 // transport/server.ts
 var import_value2 = require("@sinclair/typebox/value");
 var ServerTransport = class extends Transport {
@@ -1631,6 +1660,7 @@ var ServerTransport = class extends Transport {
         }
       },
       this.options,
+      this.tracer,
       this.log
     );
     this.pendingSessions.add(pendingSession);