@replit/river 0.203.1 → 0.205.0

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

@@ -1,9 +1,9 @@
 import { c as TransportClientId } from '../../../message-3def9ded.js';
 import { WebSocketServer } from 'ws';
-import { W as WebSocketConnection } from '../../../connection-11a4af0f.js';
+import { W as WebSocketConnection } from '../../../connection-9ca3e7ed.js';
 import { W as WsLike } from '../../../wslike-e0b32dd5.js';
-import { S as ServerTransport } from '../../../server-e46399f9.js';
-import { c as ProvidedServerTransportOptions } from '../../../context-d6dd8a1a.js';
+import { S as ServerTransport } from '../../../server-8ac5c6bf.js';
+import { c as ProvidedServerTransportOptions } from '../../../context-1a332293.js';
 import { IncomingMessage } from 'http';
 import '@sinclair/typebox/value';
 import '@sinclair/typebox';

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

@@ -1,9 +1,9 @@
 import { c as TransportClientId } from '../../../message-3def9ded.js';
 import { WebSocketServer } from 'ws';
-import { W as WebSocketConnection } from '../../../connection-11a4af0f.js';
+import { W as WebSocketConnection } from '../../../connection-9ca3e7ed.js';
 import { W as WsLike } from '../../../wslike-e0b32dd5.js';
-import { S as ServerTransport } from '../../../server-e46399f9.js';
-import { c as ProvidedServerTransportOptions } from '../../../context-d6dd8a1a.js';
+import { S as ServerTransport } from '../../../server-8ac5c6bf.js';
+import { c as ProvidedServerTransportOptions } from '../../../context-1a332293.js';
 import { IncomingMessage } from 'http';
 import '@sinclair/typebox/value';
 import '@sinclair/typebox';

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

@@ -1,11 +1,11 @@
 import {
   ServerTransport
-} from "../../../chunk-7MKTFUJO.js";
+} from "../../../chunk-VN7QS6OS.js";
 import {
   WebSocketConnection
-} from "../../../chunk-2FHJVQBE.js";
-import "../../../chunk-TMOCPK63.js";
-import "../../../chunk-AK7NTFAM.js";
+} from "../../../chunk-EU2H4J7U.js";
+import "../../../chunk-AXZPYUY6.js";
+import "../../../chunk-GG3GL7CW.js";
 import "../../../chunk-WBGKPIFS.js";
 import "../../../chunk-AJGIY2UB.js";
 

package/dist/transport/index.cjs

@@ -429,12 +429,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);
@@ -619,8 +621,16 @@ 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.205.0";
 
 // tracing/index.ts
 function getPropagationContext(ctx) {
@@ -631,10 +641,10 @@ function getPropagationContext(ctx) {
   import_api2.propagation.inject(ctx, tracing);
   return tracing;
 }
-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",
@@ -648,7 +658,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}`,
     {
@@ -663,8 +673,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);
-var tracing_default = tracer;
+function getTracer() {
+  return import_api2.trace.getTracer("river", version);
+}
 
 // transport/sessionStateMachine/SessionWaitingForHandshake.ts
 var SessionWaitingForHandshake = class extends CommonSession {
@@ -950,6 +961,7 @@ function inheritSharedSession(session) {
     telemetry: session.telemetry,
     options: session.options,
     log: session.log,
+    tracer: session.tracer,
     protocolVersion: session.protocolVersion
   };
 }
@@ -961,9 +973,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,
@@ -977,6 +989,7 @@ var SessionStateGraph = {
         telemetry,
         options,
         protocolVersion,
+        tracer,
         log
       });
       session.log?.info(`session ${session.id} created in NoConnection state`, {
@@ -985,12 +998,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`, {
@@ -1046,7 +1060,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`,
         {
@@ -1090,12 +1108,14 @@ var SessionStateGraph = {
           ack: 0,
           sendBuffer: [],
           telemetry: createSessionTelemetryInfo(
+            pendingSession.tracer,
             sessionId,
             to,
             from,
             propagationCtx
           ),
           options,
+          tracer: pendingSession.tracer,
           log: pendingSession.log,
           protocolVersion
         }
@@ -1107,7 +1127,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`,
         {
@@ -1252,6 +1276,7 @@ var Transport = class {
    */
   options;
   log;
+  tracer;
   sessions;
   /**
    * Creates a new Transport instance.
@@ -1264,6 +1289,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") {
@@ -1308,7 +1334,8 @@ var Transport = class {
    */
   close() {
     this.status = "closed";
-    for (const session of this.sessions.values()) {
+    const sessions = Array.from(this.sessions.values());
+    for (const session of sessions) {
       this.deleteSession(session);
     }
     this.eventDispatcher.dispatchEvent("transportStatus", {
@@ -1333,7 +1360,7 @@ var Transport = class {
     }
     this.sessions.set(session.to, session);
     this.eventDispatcher.dispatchEvent("sessionStatus", {
-      status: "connect",
+      status: "created",
       session
     });
     this.eventDispatcher.dispatchEvent("sessionTransition", {
@@ -1374,12 +1401,16 @@ var Transport = class {
     }
     session.log?.info(`closing session ${session.id}`, loggingMetadata);
     this.eventDispatcher.dispatchEvent("sessionStatus", {
-      status: "disconnect",
+      status: "closing",
       session
     });
     const to = session.to;
     session.close();
     this.sessions.delete(to);
+    this.eventDispatcher.dispatchEvent("sessionStatus", {
+      status: "closed",
+      session: { id: session.id, to }
+    });
   }
   // common listeners
   onSessionGracePeriodElapsed(session) {
@@ -1516,14 +1547,6 @@ var LeakyBucketRateLimit = class {
   }
 };
 
-// transport/stringifyError.ts
-function coerceErrorString(err) {
-  if (err instanceof Error) {
-    return err.message || "unknown reason";
-  }
-  return `[coerced to error] ${String(err)}`;
-}
-
 // transport/client.ts
 var import_value2 = require("@sinclair/typebox/value");
 var ClientTransport = class extends Transport {
@@ -1580,6 +1603,7 @@ var ClientTransport = class extends Transport {
       },
       this.options,
       currentProtocolVersion,
+      this.tracer,
       this.log
     );
     this.createSession(session);
@@ -1784,23 +1808,27 @@ var ClientTransport = class extends Transport {
    * and don't want to wait for the grace period to elapse.
    */
   hardDisconnect() {
-    for (const session of this.sessions.values()) {
+    const sessions = Array.from(this.sessions.values());
+    for (const session of sessions) {
       this.deleteSession(session);
     }
   }
   onBackoffFinished(session) {
-    const connPromise = tracing_default.startActiveSpan("connect", async (span) => {
-      try {
-        return await this.createNewOutgoingConnection(session.to);
-      } catch (err) {
-        const errStr = coerceErrorString(err);
-        span.recordException(errStr);
-        span.setStatus({ code: import_api4.SpanStatusCode.ERROR });
-        throw err;
-      } finally {
-        span.end();
+    const connPromise = session.tracer.startActiveSpan(
+      "connect",
+      async (span) => {
+        try {
+          return await this.createNewOutgoingConnection(session.to);
+        } catch (err) {
+          const errStr = coerceErrorString(err);
+          span.recordException(errStr);
+          span.setStatus({ code: import_api4.SpanStatusCode.ERROR });
+          throw err;
+        } finally {
+          span.end();
+        }
       }
-    });
+    );
     const connectingSession = ClientSessionStateGraph.transition.BackingOffToConnecting(
       session,
       connPromise,
@@ -1973,6 +2001,7 @@ var ServerTransport = class extends Transport {
         }
       },
       this.options,
+      this.tracer,
       this.log
     );
     this.pendingSessions.add(pendingSession);
@@ -2255,6 +2284,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.