@replit/river 0.202.0 → 0.203.1

package/dist/{server-48d90a77.d.ts → server-e46399f9.d.ts}

@@ -1,4 +1,4 @@
-import { C as Connection, w as CommonSession, d as SessionState, x as CommonSessionProps, T as Transport, y as ServerTransportOptions, r as ServerHandshakeOptions, q as ParsedMetadata, z as ServerSession, c as ProvidedServerTransportOptions, D as DeleteSessionOptions } from './context-8d263a7f.js';
+import { C as Connection, w as CommonSession, d as SessionState, x as CommonSessionProps, T as Transport, y as ServerTransportOptions, r as ServerHandshakeOptions, q as ParsedMetadata, z as ServerSession, c as ProvidedServerTransportOptions, D as DeleteSessionOptions } from './context-d6dd8a1a.js';
 import { P as ProtocolVersion, b as OpaqueTransportMessage, e as Tags, a as TransportMessage, H as HandshakeErrorResponseCodes, c as TransportClientId } from './message-3def9ded.js';
 import * as _sinclair_typebox_errors from '@sinclair/typebox/errors';
 import { Static } from '@sinclair/typebox';

package/dist/{services-a05f5174.d.ts → services-56cbea0d.d.ts}

@@ -1,7 +1,7 @@
 import { TObject, TString, TSchema, TUnion, TLiteral, TNever, Static } from '@sinclair/typebox';
-import { C as Connection, n as ClientHandshakeOptions, t as ProcedureHandlerContext, s as ServiceContext } from './context-8d263a7f.js';
+import { C as Connection, n as ClientHandshakeOptions, t as ProcedureHandlerContext, s as ServiceContext } from './context-d6dd8a1a.js';
 import { c as TransportClientId } from './message-3def9ded.js';
-import { C as ClientTransport } from './client-a32692b0.js';
+import { C as ClientTransport } from './client-5d2e41a3.js';
 
 /**
  * {@link UNCAUGHT_ERROR_CODE} is the code that is used when an error is thrown

package/dist/testUtil/index.cjs

@@ -289,6 +289,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();
   }
@@ -343,9 +351,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;
@@ -389,13 +396,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
@@ -525,7 +532,7 @@ var SessionNoConnection = class extends IdentifiedSessionWithGracePeriod {
 var import_api = require("@opentelemetry/api");
 
 // package.json
-var version = "0.202.0";
+var version = "0.203.1";
 
 // tracing/index.ts
 function getPropagationContext(ctx) {
@@ -553,6 +560,21 @@ function createSessionTelemetryInfo(sessionId, to, from, propagationCtx) {
   const ctx = import_api.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_api.trace.setSpan(info.ctx, span);
+  return { span, ctx };
+}
 var tracer = import_api.trace.getTracer("river", version);
 var tracing_default = tracer;
 
@@ -936,6 +958,7 @@ var SessionStateGraph = {
         listeners,
         ...carriedState
       });
+      conn.telemetry = createConnectionTelemetryInfo(conn, session.telemetry);
       session.log?.info(
         `session ${session.id} transition from Connecting to Handshaking`,
         {
@@ -996,6 +1019,7 @@ var SessionStateGraph = {
         listeners,
         ...carriedState
       });
+      conn.telemetry = createConnectionTelemetryInfo(conn, session.telemetry);
       session.log?.info(
         `session ${session.id} transition from WaitingForHandshake to Connected`,
         {
@@ -1122,7 +1146,7 @@ var ServerSessionStateGraph = {
 };
 
 // transport/client.ts
-var import_api3 = require("@opentelemetry/api");
+var import_api4 = require("@opentelemetry/api");
 
 // transport/rateLimit.ts
 var LeakyBucketRateLimit = class {
@@ -1192,6 +1216,7 @@ var LeakyBucketRateLimit = class {
 };
 
 // logging/log.ts
+var import_api3 = require("@opentelemetry/api");
 var LoggingLevels = {
   debug: -1,
   info: 0,
@@ -1200,6 +1225,15 @@ var LoggingLevels = {
 };
 var cleanedLogFn = (log) => {
   return (msg, metadata) => {
+    if (metadata && !metadata.telemetry) {
+      const span = import_api3.trace.getSpan(import_api3.context.active());
+      if (span) {
+        metadata.telemetry = {
+          traceId: span.spanContext().traceId,
+          spanId: span.spanContext().spanId
+        };
+      }
+    }
     if (!metadata?.transportMessage) {
       log(msg, metadata);
       return;
@@ -1627,7 +1661,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);
@@ -1757,6 +1791,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 {
@@ -1764,7 +1808,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();
@@ -1846,8 +1890,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
@@ -1909,7 +1953,7 @@ var Connection = class {
 };
 
 // transport/server.ts
-var import_api4 = require("@opentelemetry/api");
+var import_api5 = require("@opentelemetry/api");
 var import_value3 = require("@sinclair/typebox/value");
 var ServerTransport = class extends Transport {
   /**
@@ -2019,7 +2063,7 @@ var ServerTransport = class extends Transport {
   }
   rejectHandshakeRequest(session, to, reason, code, metadata) {
     session.conn.telemetry?.span.setStatus({
-      code: import_api4.SpanStatusCode.ERROR,
+      code: import_api5.SpanStatusCode.ERROR,
       message: reason
     });
     this.log?.warn(reason, metadata);