@replit/river 0.23.6 → 0.23.7

package/dist/{transport-cbe70659.d.ts → transport-3d34f714.d.ts}

@@ -1,5 +1,5 @@
 import { C as Codec } from './types-3e5768ec.js';
-import { a as TelemetryInfo, T as TransportClientId, b as PropagationContext, M as MessageMetadata, P as PartialTransportMessage, c as TransportMessage, O as OpaqueTransportMessage } from './index-926aea33.js';
+import { a as TelemetryInfo, M as MessageMetadata, T as TransportClientId, b as PropagationContext, L as Logger, P as PartialTransportMessage, c as TransportMessage, O as OpaqueTransportMessage, g as LogFn, h as LoggingLevel } from './index-60f03cb7.js';
 import { TSchema, Static } from '@sinclair/typebox';
 
 /**
@@ -12,6 +12,7 @@ declare abstract class Connection {
     id: string;
     telemetry?: TelemetryInfo;
     constructor();
+    get loggingMetadata(): MessageMetadata;
     /**
      * Handle adding a callback for when a message is received.
      * @param msg The message that was received.
@@ -26,7 +27,7 @@ declare abstract class Connection {
     abstract addCloseListener(cb: () => void): void;
     /**
      * Handle adding a callback for when an error is received.
-     * This should only be used for logging errors, all cleanup
+     * This should only be used for this.logging errors, all cleanup
      * should be delegated to addCloseListener.
      *
      * The implementer should take care such that the implemented
@@ -117,8 +118,10 @@ declare class Session<ConnType extends Connection> {
      * The interval for sending heartbeats.
      */
     private heartbeat;
+    private log?;
     constructor(conn: ConnType | undefined, from: TransportClientId, to: TransportClientId, options: SessionOptions, propagationCtx?: PropagationContext);
-    get loggingMetadata(): Omit<MessageMetadata, 'parsedMsg'>;
+    bindLogger(log: Logger): void;
+    get loggingMetadata(): MessageMetadata;
     /**
      * Sends a message over the session's connection.
      * If the connection is not ready or the message fails to send, the message can be buffered for retry unless skipped.
@@ -391,6 +394,7 @@ declare abstract class Transport<ConnType extends Connection> {
      * The options for this transport.
      */
     protected options: TransportOptions;
+    log?: Logger;
     /**
      * Creates a new Transport instance.
      * This should also set up {@link onConnect}, and {@link onDisconnect} listeners.
@@ -398,6 +402,7 @@ declare abstract class Transport<ConnType extends Connection> {
      * @param clientId The client ID of this transport.
      */
     constructor(clientId: TransportClientId, providedOptions?: ProvidedTransportOptions);
+    bindLogger(fn: LogFn | Logger, level?: LoggingLevel): void;
     /**
      * This is called immediately after a new connection is established and we
      * may or may not know the identity of the connected client.
@@ -430,13 +435,13 @@ declare abstract class Transport<ConnType extends Connection> {
      * @param msg The message to parse.
      * @returns The parsed message, or null if the message is malformed or invalid.
      */
-    protected parseMsg(msg: Uint8Array): OpaqueTransportMessage | null;
+    protected parseMsg(msg: Uint8Array, conn: ConnType): OpaqueTransportMessage | null;
     /**
      * Called when a message is received by this transport.
      * You generally shouldn't need to override this in downstream transport implementations.
      * @param msg The received message.
      */
-    protected handleMsg(msg: OpaqueTransportMessage): void;
+    protected handleMsg(msg: OpaqueTransportMessage, conn: ConnType): void;
     /**
      * Adds a listener to this transport.
      * @param the type of event to listen for
@@ -534,4 +539,4 @@ declare abstract class ServerTransport<ConnType extends Connection> extends Tran
     receiveHandshakeRequestMessage(data: Uint8Array, conn: ConnType): Promise<Session<ConnType> | false>;
 }
 
-export { Connection as C, EventMap as E, ProvidedClientTransportOptions as P, SessionOptions as S, Transport as T, ServiceContext as a, Session as b, ClientTransport as c, ServerTransport as d, ProvidedServerTransportOptions as e, ServerHandshakeOptions as f, ParsedMetadata as g, ServiceContextWithState as h, ServiceContextWithTransportInfo as i, createClientHandshakeOptions as j, createServerHandshakeOptions as k, ClientHandshakeOptions as l, ProvidedTransportOptions as m, TransportStatus as n, EventTypes as o, EventHandler as p, ProtocolError as q, ProtocolErrorType as r };
+export { Connection as C, EventMap as E, ProvidedClientTransportOptions as P, SessionOptions as S, Transport as T, Session as a, ServiceContext as b, ClientTransport as c, ServerTransport as d, ProvidedServerTransportOptions as e, ServerHandshakeOptions as f, ParsedMetadata as g, ServiceContextWithState as h, ServiceContextWithTransportInfo as i, createClientHandshakeOptions as j, createServerHandshakeOptions as k, ClientHandshakeOptions as l, ProvidedTransportOptions as m, TransportStatus as n, EventTypes as o, EventHandler as p, ProtocolError as q, ProtocolErrorType as r };

package/dist/util/testHelpers.cjs

@@ -37,6 +37,7 @@ __export(testHelpers_exports, {
   createDummyTransportMessage: () => createDummyTransportMessage,
   createLocalWebSocketClient: () => createLocalWebSocketClient,
   createWebSocketServer: () => createWebSocketServer,
+  dummySession: () => dummySession,
   getUnixSocketPath: () => getUnixSocketPath,
   iterNext: () => iterNext,
   onUdsServeReady: () => onUdsServeReady,
@@ -348,18 +349,15 @@ function Err(error) {
   };
 }
 
-// logging/log.ts
-var log = void 0;
-
 // tracing/index.ts
 var import_api = require("@opentelemetry/api");
 
 // package.json
-var version = "0.23.6";
+var version = "0.23.7";
 
 // tracing/index.ts
 function createSessionTelemetryInfo(session, propagationCtx) {
-  const ctx = propagationCtx ? import_api.propagation.extract(import_api.context.active(), propagationCtx) : import_api.context.active();
+  const parentCtx = propagationCtx ? import_api.propagation.extract(import_api.context.active(), propagationCtx) : import_api.context.active();
   const span = tracer.startSpan(
     `session ${session.id}`,
     {
@@ -370,8 +368,9 @@ function createSessionTelemetryInfo(session, propagationCtx) {
         "river.session.from": session.from
       }
     },
-    ctx
+    parentCtx
   );
+  const ctx = import_api.trace.setSpan(parentCtx, span);
   return { span, ctx };
 }
 var tracer = import_api.trace.getTracer("river", version);
@@ -436,6 +435,7 @@ var Session = class {
    * The interval for sending heartbeats.
    */
   heartbeat;
+  log;
   constructor(conn, from, to, options, propagationCtx) {
     this.id = `session-${nanoid(12)}`;
     this.options = options;
@@ -450,12 +450,20 @@ var Session = class {
     );
     this.telemetry = createSessionTelemetryInfo(this, propagationCtx);
   }
+  bindLogger(log) {
+    this.log = log;
+  }
   get loggingMetadata() {
+    const spanContext = this.telemetry.span.spanContext();
     return {
       clientId: this.from,
       connectedTo: this.to,
       sessionId: this.id,
-      connId: this.connection?.id
+      connId: this.connection?.id,
+      telemetry: {
+        traceId: spanContext.traceId,
+        spanId: spanContext.spanId
+      }
     };
   }
   /**
@@ -468,7 +476,7 @@ var Session = class {
    */
   send(msg) {
     const fullMsg = this.constructMsg(msg);
-    log?.debug(`sending msg`, {
+    this.log?.debug(`sending msg`, {
       ...this.loggingMetadata,
       transportMessage: fullMsg
     });
@@ -476,7 +484,7 @@ var Session = class {
       const ok = this.connection.send(this.codec.toBuffer(fullMsg));
       if (ok)
         return fullMsg.id;
-      log?.info(
+      this.log?.info(
         `failed to send msg to ${fullMsg.to}, connection is probably dead`,
         {
           ...this.loggingMetadata,
@@ -484,8 +492,8 @@ var Session = class {
         }
       );
     } else {
-      log?.info(
-        `failed to send msg to ${fullMsg.to}, connection not ready yet`,
+      this.log?.debug(
+        `buffering msg to ${fullMsg.to}, connection not ready yet`,
         { ...this.loggingMetadata, transportMessage: fullMsg }
       );
     }
@@ -496,7 +504,7 @@ var Session = class {
     const missDuration = misses * this.options.heartbeatIntervalMs;
     if (misses > this.options.heartbeatsUntilDead) {
       if (this.connection) {
-        log?.info(
+        this.log?.info(
           `closing connection to ${this.to} due to inactivity (missed ${misses} heartbeats which is ${missDuration}ms)`,
           this.loggingMetadata
         );
@@ -520,12 +528,12 @@ var Session = class {
     this.ack = 0;
   }
   sendBufferedMessages(conn) {
-    log?.info(`resending ${this.sendBuffer.length} buffered messages`, {
+    this.log?.info(`resending ${this.sendBuffer.length} buffered messages`, {
       ...this.loggingMetadata,
       connId: conn.id
     });
     for (const msg of this.sendBuffer) {
-      log?.debug(`resending msg`, {
+      this.log?.debug(`resending msg`, {
         ...this.loggingMetadata,
         transportMessage: msg,
         connId: conn.id
@@ -537,7 +545,7 @@ var Session = class {
           code: import_api2.SpanStatusCode.ERROR,
           message: errMsg
         });
-        log?.error(errMsg, {
+        this.log?.error(errMsg, {
           ...this.loggingMetadata,
           transportMessage: msg,
           connId: conn.id,
@@ -550,7 +558,7 @@ var Session = class {
   }
   updateBookkeeping(ack, seq) {
     if (seq + 1 < this.ack) {
-      log?.error(`received stale seq ${seq} + 1 < ${this.ack}`, {
+      this.log?.error(`received stale seq ${seq} + 1 < ${this.ack}`, {
         ...this.loggingMetadata,
         tags: ["invariant-violation"]
       });
@@ -562,7 +570,7 @@ var Session = class {
   closeStaleConnection(conn) {
     if (this.connection === void 0 || this.connection === conn)
       return;
-    log?.info(
+    this.log?.info(
       `closing old inner connection from session to ${this.to}`,
       this.loggingMetadata
     );
@@ -576,7 +584,7 @@ var Session = class {
     this.connection = newConn;
   }
   beginGrace(cb) {
-    log?.info(
+    this.log?.info(
       `starting ${this.options.sessionDisconnectGraceMs}ms grace period until session to ${this.to} is closed`,
       this.loggingMetadata
     );
@@ -840,6 +848,7 @@ var getUnixSocketPath = () => {
   createDummyTransportMessage,
   createLocalWebSocketClient,
   createWebSocketServer,
+  dummySession,
   getUnixSocketPath,
   iterNext,
   onUdsServeReady,