@replit/river 0.202.0 → 0.203.1

package/dist/testUtil/index.d.cts

@@ -1,17 +1,17 @@
-import { b as ProvidedClientTransportOptions, c as ProvidedServerTransportOptions, n as ClientHandshakeOptions, C as Connection, r as ServerHandshakeOptions, T as Transport, A as SessionOptions, m as ClientTransportOptions, e as SessionNoConnection, B as SessionBoundSendFn } from '../context-8d263a7f.js';
-import { C as ClientTransport } from '../client-a32692b0.js';
-import { S as ServerTransport } from '../server-48d90a77.js';
+import { b as ProvidedClientTransportOptions, c as ProvidedServerTransportOptions, n as ClientHandshakeOptions, C as Connection, r as ServerHandshakeOptions, T as Transport, A as SessionOptions, m as ClientTransportOptions, e as SessionNoConnection, B as SessionBoundSendFn } from '../context-d6dd8a1a.js';
+import { C as ClientTransport } from '../client-5d2e41a3.js';
+import { S as ServerTransport } from '../server-e46399f9.js';
 import { c as TransportClientId, f as PartialTransportMessage, b as OpaqueTransportMessage } from '../message-3def9ded.js';
 import { Static } from '@sinclair/typebox';
-import { E as BaseErrorSchemaType, u as Readable, X as ReadableIterator, Y as ReadableResult } from '../services-a05f5174.js';
+import { E as BaseErrorSchemaType, u as Readable, X as ReadableIterator, Y as ReadableResult } from '../services-56cbea0d.js';
 import NodeWs from 'ws';
 import http from 'node:http';
 import { W as WsLike } from '../wslike-e0b32dd5.js';
 import { Duplex } from 'node:stream';
 import '@sinclair/typebox/errors';
+import '@opentelemetry/api';
 import '../types-3e5768ec.js';
 import '@sinclair/typebox/value';
-import '@opentelemetry/api';
 
 interface TestTransportOptions {
     client?: ProvidedClientTransportOptions;

package/dist/testUtil/index.d.ts

@@ -1,17 +1,17 @@
-import { b as ProvidedClientTransportOptions, c as ProvidedServerTransportOptions, n as ClientHandshakeOptions, C as Connection, r as ServerHandshakeOptions, T as Transport, A as SessionOptions, m as ClientTransportOptions, e as SessionNoConnection, B as SessionBoundSendFn } from '../context-8d263a7f.js';
-import { C as ClientTransport } from '../client-a32692b0.js';
-import { S as ServerTransport } from '../server-48d90a77.js';
+import { b as ProvidedClientTransportOptions, c as ProvidedServerTransportOptions, n as ClientHandshakeOptions, C as Connection, r as ServerHandshakeOptions, T as Transport, A as SessionOptions, m as ClientTransportOptions, e as SessionNoConnection, B as SessionBoundSendFn } from '../context-d6dd8a1a.js';
+import { C as ClientTransport } from '../client-5d2e41a3.js';
+import { S as ServerTransport } from '../server-e46399f9.js';
 import { c as TransportClientId, f as PartialTransportMessage, b as OpaqueTransportMessage } from '../message-3def9ded.js';
 import { Static } from '@sinclair/typebox';
-import { E as BaseErrorSchemaType, u as Readable, X as ReadableIterator, Y as ReadableResult } from '../services-a05f5174.js';
+import { E as BaseErrorSchemaType, u as Readable, X as ReadableIterator, Y as ReadableResult } from '../services-56cbea0d.js';
 import NodeWs from 'ws';
 import http from 'node:http';
 import { W as WsLike } from '../wslike-e0b32dd5.js';
 import { Duplex } from 'node:stream';
 import '@sinclair/typebox/errors';
+import '@opentelemetry/api';
 import '../types-3e5768ec.js';
 import '@sinclair/typebox/value';
-import '@opentelemetry/api';
 
 interface TestTransportOptions {
     client?: ProvidedClientTransportOptions;

package/dist/testUtil/index.js

@@ -1,19 +1,19 @@
 import {
   ClientTransport
-} from "../chunk-NSH4D6OB.js";
+} from "../chunk-T4WWG42M.js";
 import {
   ServerTransport
-} from "../chunk-2T22KY5X.js";
+} from "../chunk-7MKTFUJO.js";
 import {
   Connection,
   SessionStateGraph,
   defaultClientTransportOptions,
   defaultTransportOptions
-} from "../chunk-W4AGHFXK.js";
+} from "../chunk-TMOCPK63.js";
 import {
   currentProtocolVersion
-} from "../chunk-QMXUCLGE.js";
-import "../chunk-LHH5LQ7C.js";
+} from "../chunk-AK7NTFAM.js";
+import "../chunk-WBGKPIFS.js";
 import "../chunk-AJGIY2UB.js";
 
 // testUtil/index.ts

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

@@ -25,7 +25,7 @@ __export(client_exports, {
 module.exports = __toCommonJS(client_exports);
 
 // transport/client.ts
-var import_api3 = require("@opentelemetry/api");
+var import_api4 = require("@opentelemetry/api");
 
 // transport/message.ts
 var import_typebox = require("@sinclair/typebox");
@@ -299,6 +299,7 @@ var LeakyBucketRateLimit = class {
 };
 
 // logging/log.ts
+var import_api = require("@opentelemetry/api");
 var LoggingLevels = {
   debug: -1,
   info: 0,
@@ -307,6 +308,15 @@ var LoggingLevels = {
 };
 var cleanedLogFn = (log) => {
   return (msg, metadata) => {
+    if (metadata && !metadata.telemetry) {
+      const span = import_api.trace.getSpan(import_api.context.active());
+      if (span) {
+        metadata.telemetry = {
+          traceId: span.spanContext().traceId,
+          spanId: span.spanContext().spanId
+        };
+      }
+    }
     if (!metadata?.transportMessage) {
       log(msg, metadata);
       return;
@@ -398,6 +408,14 @@ var StateMachineState = class {
    * and we've moved on to another state
    */
   _isConsumed;
+  /**
+   * Cleanup this state machine state and mark it as consumed.
+   * After calling close, it is an error to access any properties on the state.
+   * You should never need to call this as a consumer.
+   *
+   * If you're looking to close the session from the client,
+   * use `.hardDisconnect` on the client transport.
+   */
   close() {
     this._handleClose();
   }
@@ -452,9 +470,8 @@ var CommonSession = class extends StateMachineState {
   parseMsg(msg) {
     const parsedMsg = this.options.codec.fromBuffer(msg);
     if (parsedMsg === null) {
-      const decodedBuffer = new TextDecoder().decode(Buffer.from(msg));
       this.log?.error(
-        `received malformed msg: ${decodedBuffer}`,
+        `received malformed msg: ${Buffer.from(msg).toString("base64")}`,
         this.loggingMetadata
       );
       return null;
@@ -498,13 +515,13 @@ var IdentifiedSession = class extends CommonSession {
     this.protocolVersion = protocolVersion;
   }
   get loggingMetadata() {
-    const spanContext = this.telemetry.span.spanContext();
     const metadata = {
       clientId: this.from,
       connectedTo: this.to,
       sessionId: this.id
     };
     if (this.telemetry.span.isRecording()) {
+      const spanContext = this.telemetry.span.spanContext();
       metadata.telemetry = {
         traceId: spanContext.traceId,
         spanId: spanContext.spanId
@@ -631,10 +648,10 @@ var SessionNoConnection = class extends IdentifiedSessionWithGracePeriod {
 };
 
 // tracing/index.ts
-var import_api = require("@opentelemetry/api");
+var import_api2 = require("@opentelemetry/api");
 
 // package.json
-var version = "0.202.0";
+var version = "0.203.1";
 
 // tracing/index.ts
 function getPropagationContext(ctx) {
@@ -642,11 +659,11 @@ function getPropagationContext(ctx) {
     traceparent: "",
     tracestate: ""
   };
-  import_api.propagation.inject(ctx, tracing);
+  import_api2.propagation.inject(ctx, tracing);
   return tracing;
 }
 function createSessionTelemetryInfo(sessionId, to, from, propagationCtx) {
-  const parentCtx = propagationCtx ? import_api.propagation.extract(import_api.context.active(), propagationCtx) : import_api.context.active();
+  const parentCtx = propagationCtx ? import_api2.propagation.extract(import_api2.context.active(), propagationCtx) : import_api2.context.active();
   const span = tracer.startSpan(
     `session ${sessionId}`,
     {
@@ -659,10 +676,25 @@ function createSessionTelemetryInfo(sessionId, to, from, propagationCtx) {
     },
     parentCtx
   );
-  const ctx = import_api.trace.setSpan(parentCtx, span);
+  const ctx = import_api2.trace.setSpan(parentCtx, span);
+  return { span, ctx };
+}
+function createConnectionTelemetryInfo(connection, info) {
+  const span = tracer.startSpan(
+    `connection ${connection.id}`,
+    {
+      attributes: {
+        component: "river",
+        "river.connection.id": connection.id
+      },
+      links: [{ context: info.span.spanContext() }]
+    },
+    info.ctx
+  );
+  const ctx = import_api2.trace.setSpan(info.ctx, span);
   return { span, ctx };
 }
-var tracer = import_api.trace.getTracer("river", version);
+var tracer = import_api2.trace.getTracer("river", version);
 var tracing_default = tracer;
 
 // transport/sessionStateMachine/SessionWaitingForHandshake.ts
@@ -769,7 +801,7 @@ var SessionHandshaking = class extends IdentifiedSessionWithGracePeriod {
 };
 
 // transport/sessionStateMachine/SessionConnected.ts
-var import_api2 = require("@opentelemetry/api");
+var import_api3 = require("@opentelemetry/api");
 var SessionConnected = class extends IdentifiedSession {
   state = "Connected" /* Connected */;
   conn;
@@ -873,7 +905,7 @@ var SessionConnected = class extends IdentifiedSession {
           tags: ["invariant-violation"]
         });
         this.telemetry.span.setStatus({
-          code: import_api2.SpanStatusCode.ERROR,
+          code: import_api3.SpanStatusCode.ERROR,
           message: reason
         });
         this.closeConnection();
@@ -1045,6 +1077,7 @@ var SessionStateGraph = {
         listeners,
         ...carriedState
       });
+      conn.telemetry = createConnectionTelemetryInfo(conn, session.telemetry);
       session.log?.info(
         `session ${session.id} transition from Connecting to Handshaking`,
         {
@@ -1105,6 +1138,7 @@ var SessionStateGraph = {
         listeners,
         ...carriedState
       });
+      conn.telemetry = createConnectionTelemetryInfo(conn, session.telemetry);
       session.log?.info(
         `session ${session.id} transition from WaitingForHandshake to Connected`,
         {
@@ -1575,7 +1609,7 @@ var ClientTransport = class extends Transport {
   }
   rejectHandshakeResponse(session, reason, metadata) {
     session.conn.telemetry?.span.setStatus({
-      code: import_api3.SpanStatusCode.ERROR,
+      code: import_api4.SpanStatusCode.ERROR,
       message: reason
     });
     this.log?.warn(reason, metadata);
@@ -1705,6 +1739,16 @@ var ClientTransport = class extends Transport {
     );
     this.updateSession(backingOffSession);
   }
+  /**
+   * Manually kills all sessions to the server (including all pending state).
+   * This is useful for when you want to close all connections to a server
+   * and don't want to wait for the grace period to elapse.
+   */
+  hardDisconnect() {
+    for (const session of this.sessions.values()) {
+      this.deleteSession(session);
+    }
+  }
   onBackoffFinished(session) {
     const connPromise = tracing_default.startActiveSpan("connect", async (span) => {
       try {
@@ -1712,7 +1756,7 @@ var ClientTransport = class extends Transport {
       } catch (err) {
         const errStr = coerceErrorString(err);
         span.recordException(errStr);
-        span.setStatus({ code: import_api3.SpanStatusCode.ERROR });
+        span.setStatus({ code: import_api4.SpanStatusCode.ERROR });
         throw err;
       } finally {
         span.end();
@@ -1794,8 +1838,8 @@ var Connection = class {
   }
   get loggingMetadata() {
     const metadata = { connId: this.id };
-    const spanContext = this.telemetry?.span.spanContext();
-    if (this.telemetry?.span.isRecording() && spanContext) {
+    if (this.telemetry?.span.isRecording()) {
+      const spanContext = this.telemetry.span.spanContext();
       metadata.telemetry = {
         traceId: spanContext.traceId,
         spanId: spanContext.spanId