@replit/river 0.17.3 → 0.18.0

package/dist/util/testHelpers.cjs

@@ -52,8 +52,8 @@ var import_ws = require("ws");
 // transport/transport.ts
 var import_value = require("@sinclair/typebox/value");
 
-// logging/index.ts
-var log;
+// logging/log.ts
+var log = void 0;
 
 // transport/session.ts
 var import_nanoid = require("nanoid");
@@ -115,6 +115,14 @@ var Session = class {
       options.heartbeatIntervalMs
     );
   }
+  get loggingMetadata() {
+    return {
+      clientId: this.from,
+      connectedTo: this.to,
+      sessionId: this.id,
+      connId: this.connection?.debugId
+    };
+  }
   /**
    * 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.
@@ -125,26 +133,37 @@ var Session = class {
    */
   send(msg) {
     const fullMsg = this.constructMsg(msg);
-    log?.debug(`${this.from} -- sending ${JSON.stringify(fullMsg)}`);
+    log?.debug(`sending msg`, {
+      ...this.loggingMetadata,
+      fullTransportMessage: fullMsg
+    });
     if (this.connection) {
       const ok = this.connection.send(this.codec.toBuffer(fullMsg));
       if (ok)
         return fullMsg.id;
       log?.info(
-        `${this.from} -- failed to send ${fullMsg.id} (seq: ${fullMsg.seq}) to ${fullMsg.to}, connection (id: ${this.connection.debugId}) is probably dead`
+        `failed to send msg to ${fullMsg.to}, connection is probably dead`,
+        {
+          ...this.loggingMetadata,
+          fullTransportMessage: fullMsg
+        }
       );
     } else {
       log?.info(
-        `${this.from} -- failed to send ${fullMsg.id} (seq: ${fullMsg.seq}) to ${fullMsg.to}, connection not ready yet`
+        `failed to send msg to ${fullMsg.to}, connection not ready yet`,
+        { ...this.loggingMetadata, fullTransportMessage: fullMsg }
       );
     }
     return fullMsg.id;
   }
   sendHeartbeat() {
-    if (this.heartbeatMisses >= this.options.heartbeatsUntilDead) {
+    const misses = this.heartbeatMisses;
+    const missDuration = misses * this.options.heartbeatIntervalMs;
+    if (misses > this.options.heartbeatsUntilDead) {
       if (this.connection) {
         log?.info(
-          `${this.from} -- closing connection (id: ${this.connection.debugId}) to ${this.to} due to inactivity`
+          `closing connection to ${this.to} due to inactivity (missed ${misses} heartbeats which is ${missDuration}ms)`,
+          this.loggingMetadata
         );
         this.closeStaleConnection();
       }
@@ -166,26 +185,36 @@ var Session = class {
   }
   sendBufferedMessages() {
     if (!this.connection) {
-      const msg = `${this.from} -- tried sending buffered messages without a connection (if you hit this code path something is seriously wrong)`;
-      log?.error(msg);
+      const msg = `tried sending buffered messages without a connection (if you hit this code path something is seriously wrong)`;
+      log?.error(msg, this.loggingMetadata);
       throw new Error(msg);
     }
     log?.info(
-      `${this.from} -- resending ${this.sendBuffer.length} buffered messages`
+      `resending ${this.sendBuffer.length} buffered messages`,
+      this.loggingMetadata
     );
     for (const msg of this.sendBuffer) {
-      log?.debug(`${this.from} -- resending ${msg.id} (seq: ${msg.seq})`);
+      log?.debug(`resending msg`, {
+        ...this.loggingMetadata,
+        fullTransportMessage: msg
+      });
       const ok = this.connection.send(this.codec.toBuffer(msg));
       if (!ok) {
-        const msg2 = `${this.from} -- failed to send buffered message to ${this.to} in session (id: ${this.id}) (if you hit this code path something is seriously wrong)`;
-        log?.error(msg2);
-        throw new Error(msg2);
+        const errMsg = `failed to send buffered message to ${this.to} (if you hit this code path something is seriously wrong)`;
+        log?.error(errMsg, {
+          ...this.loggingMetadata,
+          fullTransportMessage: msg
+        });
+        throw new Error(errMsg);
       }
     }
   }
   updateBookkeeping(ack, seq) {
     if (seq + 1 < this.ack) {
-      log?.error(`${this.from} -- received stale seq ${seq} + 1 < ${this.ack}`);
+      log?.error(
+        `received stale seq ${seq} + 1 < ${this.ack}`,
+        this.loggingMetadata
+      );
       return;
     }
     this.sendBuffer = this.sendBuffer.filter((unacked) => unacked.seq >= ack);
@@ -195,7 +224,8 @@ var Session = class {
     if (this.connection === void 0 || this.connection === conn)
       return;
     log?.info(
-      `${this.from} -- closing old inner connection (id: ${this.connection.debugId}) from session (id: ${this.id}) to ${this.to}`
+      `closing old inner connection from session to ${this.to}`,
+      this.loggingMetadata
     );
     this.connection.close();
     this.connection = void 0;
@@ -207,7 +237,8 @@ var Session = class {
   }
   beginGrace(cb) {
     log?.info(
-      `${this.from} -- starting ${this.options.sessionDisconnectGraceMs}ms grace period until session (id: ${this.id}) to ${this.to} is closed`
+      `starting ${this.options.sessionDisconnectGraceMs}ms grace period until session to ${this.to} is closed`,
+      this.loggingMetadata
     );
     this.disconnectionGrace = setTimeout(() => {
       this.close();
@@ -696,28 +727,30 @@ function catchProcError(err) {
   };
 }
 var testingSessionOptions = defaultTransportOptions;
-function dummyCtx(state, extendedContext) {
-  const session = new Session(
+function dummySession() {
+  return new Session(
     void 0,
     "client",
-    "SERVER",
+    "server",
     testingSessionOptions
   );
+}
+function dummyCtx(state, session, extendedContext) {
   return {
     ...extendedContext,
     state,
-    to: "SERVER",
-    from: "client",
+    to: session.to,
+    from: session.from,
     streamId: (0, import_nanoid2.nanoid)(),
     session
   };
 }
-function asClientRpc(state, proc, extendedContext) {
+function asClientRpc(state, proc, extendedContext, session = dummySession()) {
   return async (msg) => {
-    return await proc.handler(dummyCtx(state, extendedContext), msg).catch(catchProcError);
+    return await proc.handler(dummyCtx(state, session, extendedContext), msg).catch(catchProcError);
   };
 }
-function asClientStream(state, proc, init, extendedContext) {
+function asClientStream(state, proc, init, extendedContext, session = dummySession()) {
   const input = pushable({ objectMode: true });
   const output = pushable({
     objectMode: true
@@ -725,34 +758,34 @@ function asClientStream(state, proc, init, extendedContext) {
   void (async () => {
     if (init) {
       const _proc = proc;
-      await _proc.handler(dummyCtx(state, extendedContext), init, input, output).catch((err) => output.push(catchProcError(err)));
+      await _proc.handler(dummyCtx(state, session, extendedContext), init, input, output).catch((err) => output.push(catchProcError(err)));
     } else {
       const _proc = proc;
-      await _proc.handler(dummyCtx(state, extendedContext), input, output).catch((err) => output.push(catchProcError(err)));
+      await _proc.handler(dummyCtx(state, session, extendedContext), input, output).catch((err) => output.push(catchProcError(err)));
     }
   })();
   return [input, output];
 }
-function asClientSubscription(state, proc, extendedContext) {
+function asClientSubscription(state, proc, extendedContext, session = dummySession()) {
   const output = pushable({
     objectMode: true
   });
   return (msg) => {
     void (async () => {
-      return await proc.handler(dummyCtx(state, extendedContext), msg, output).catch((err) => output.push(catchProcError(err)));
+      return await proc.handler(dummyCtx(state, session, extendedContext), msg, output).catch((err) => output.push(catchProcError(err)));
     })();
     return output;
   };
 }
-function asClientUpload(state, proc, init, extendedContext) {
+function asClientUpload(state, proc, init, extendedContext, session = dummySession()) {
   const input = pushable({ objectMode: true });
   if (init) {
     const _proc = proc;
-    const result = _proc.handler(dummyCtx(state, extendedContext), init, input).catch(catchProcError);
+    const result = _proc.handler(dummyCtx(state, session, extendedContext), init, input).catch(catchProcError);
     return [input, result];
   } else {
     const _proc = proc;
-    const result = _proc.handler(dummyCtx(state, extendedContext), input).catch(catchProcError);
+    const result = _proc.handler(dummyCtx(state, session, extendedContext), input).catch(catchProcError);
     return [input, result];
   }
 }

package/dist/util/testHelpers.d.cts

@@ -1,7 +1,8 @@
 import { Static } from '@sinclair/typebox';
-import { P as PayloadType, R as RiverError, a as Procedure, S as ServiceContext, b as Result, c as RiverUncaughtSchema, d as ProcedureResult } from '../procedures-79a5f07e.js';
-import { P as PartialTransportMessage, T as Transport, C as Connection, O as OpaqueTransportMessage, S as SessionOptions } from '../index-80f87385.js';
+import { P as PayloadType, R as RiverError, a as Procedure, S as ServiceContext, b as Result, c as RiverUncaughtSchema, d as ProcedureResult } from '../procedures-74a10937.js';
+import { T as Transport, C as Connection, S as SessionOptions, a as Session } from '../index-314e676a.js';
 import * as it_pushable from 'it-pushable';
+import { P as PartialTransportMessage, O as OpaqueTransportMessage } from '../index-6118cd48.js';
 import WebSocket from 'isomorphic-ws';
 import http from 'node:http';
 import net from 'node:net';
@@ -36,7 +37,7 @@ declare function createLocalWebSocketClient(port: number): WebSocket;
  * @returns A promise that resolves to the next value from the iterator.
  */
 declare function iterNext<T>(iter: AsyncIterableIterator<T>): Promise<T>;
-declare function payloadToTransportMessage<Payload extends Record<string, unknown>>(payload: Payload): PartialTransportMessage<Payload>;
+declare function payloadToTransportMessage<Payload>(payload: Payload): PartialTransportMessage<Payload>;
 declare function createDummyTransportMessage(): PartialTransportMessage<{
     msg: string;
     test: number;
@@ -49,10 +50,10 @@ declare function createDummyTransportMessage(): PartialTransportMessage<{
  */
 declare function waitForMessage(t: Transport<Connection>, filter?: (msg: OpaqueTransportMessage) => boolean, rejectMismatch?: boolean): Promise<unknown>;
 declare const testingSessionOptions: SessionOptions;
-declare function asClientRpc<State extends object, I extends PayloadType, O extends PayloadType, E extends RiverError, Init extends PayloadType | null = null>(state: State, proc: Procedure<State, 'rpc', I, O, E, Init>, extendedContext?: Omit<ServiceContext, 'state'>): (msg: Static<I>) => Promise<Result<Static<O>, Static<E> | Static<typeof RiverUncaughtSchema>>>;
-declare function asClientStream<State extends object, I extends PayloadType, O extends PayloadType, E extends RiverError, Init extends PayloadType | null = null>(state: State, proc: Procedure<State, 'stream', I, O, E, Init>, init?: Init extends PayloadType ? Static<Init> : null, extendedContext?: Omit<ServiceContext, 'state'>): readonly [it_pushable.Pushable<Static<I>, void, unknown>, it_pushable.Pushable<Result<Static<O>, Static<E>>, void, unknown>];
-declare function asClientSubscription<State extends object, I extends PayloadType, O extends PayloadType, E extends RiverError>(state: State, proc: Procedure<State, 'subscription', I, O, E>, extendedContext?: Omit<ServiceContext, 'state'>): (msg: Static<I>) => it_pushable.Pushable<Result<Static<O>, Static<E>>, void, unknown>;
-declare function asClientUpload<State extends object, I extends PayloadType, O extends PayloadType, E extends RiverError, Init extends PayloadType | null = null>(state: State, proc: Procedure<State, 'upload', I, O, E, Init>, init?: Init extends PayloadType ? Static<Init> : null, extendedContext?: Omit<ServiceContext, 'state'>): readonly [it_pushable.Pushable<Static<I>, void, unknown>, Promise<{
+declare function asClientRpc<State extends object, I extends PayloadType, O extends PayloadType, E extends RiverError, Init extends PayloadType | null = null>(state: State, proc: Procedure<State, 'rpc', I, O, E, Init>, extendedContext?: Omit<ServiceContext, 'state'>, session?: Session<Connection>): (msg: Static<I>) => Promise<Result<Static<O>, Static<E> | Static<typeof RiverUncaughtSchema>>>;
+declare function asClientStream<State extends object, I extends PayloadType, O extends PayloadType, E extends RiverError, Init extends PayloadType | null = null>(state: State, proc: Procedure<State, 'stream', I, O, E, Init>, init?: Init extends PayloadType ? Static<Init> : null, extendedContext?: Omit<ServiceContext, 'state'>, session?: Session<Connection>): readonly [it_pushable.Pushable<Static<I>, void, unknown>, it_pushable.Pushable<Result<Static<O>, Static<E>>, void, unknown>];
+declare function asClientSubscription<State extends object, I extends PayloadType, O extends PayloadType, E extends RiverError>(state: State, proc: Procedure<State, 'subscription', I, O, E>, extendedContext?: Omit<ServiceContext, 'state'>, session?: Session<Connection>): (msg: Static<I>) => it_pushable.Pushable<Result<Static<O>, Static<E>>, void, unknown>;
+declare function asClientUpload<State extends object, I extends PayloadType, O extends PayloadType, E extends RiverError, Init extends PayloadType | null = null>(state: State, proc: Procedure<State, 'upload', I, O, E, Init>, init?: Init extends PayloadType ? Static<Init> : null, extendedContext?: Omit<ServiceContext, 'state'>, session?: Session<Connection>): readonly [it_pushable.Pushable<Static<I>, void, unknown>, Promise<{
     ok: boolean;
     payload: {
         code: string;

package/dist/util/testHelpers.d.ts

@@ -1,7 +1,8 @@
 import { Static } from '@sinclair/typebox';
-import { P as PayloadType, R as RiverError, a as Procedure, S as ServiceContext, b as Result, c as RiverUncaughtSchema, d as ProcedureResult } from '../procedures-79a5f07e.js';
-import { P as PartialTransportMessage, T as Transport, C as Connection, O as OpaqueTransportMessage, S as SessionOptions } from '../index-80f87385.js';
+import { P as PayloadType, R as RiverError, a as Procedure, S as ServiceContext, b as Result, c as RiverUncaughtSchema, d as ProcedureResult } from '../procedures-74a10937.js';
+import { T as Transport, C as Connection, S as SessionOptions, a as Session } from '../index-314e676a.js';
 import * as it_pushable from 'it-pushable';
+import { P as PartialTransportMessage, O as OpaqueTransportMessage } from '../index-6118cd48.js';
 import WebSocket from 'isomorphic-ws';
 import http from 'node:http';
 import net from 'node:net';
@@ -36,7 +37,7 @@ declare function createLocalWebSocketClient(port: number): WebSocket;
  * @returns A promise that resolves to the next value from the iterator.
  */
 declare function iterNext<T>(iter: AsyncIterableIterator<T>): Promise<T>;
-declare function payloadToTransportMessage<Payload extends Record<string, unknown>>(payload: Payload): PartialTransportMessage<Payload>;
+declare function payloadToTransportMessage<Payload>(payload: Payload): PartialTransportMessage<Payload>;
 declare function createDummyTransportMessage(): PartialTransportMessage<{
     msg: string;
     test: number;
@@ -49,10 +50,10 @@ declare function createDummyTransportMessage(): PartialTransportMessage<{
  */
 declare function waitForMessage(t: Transport<Connection>, filter?: (msg: OpaqueTransportMessage) => boolean, rejectMismatch?: boolean): Promise<unknown>;
 declare const testingSessionOptions: SessionOptions;
-declare function asClientRpc<State extends object, I extends PayloadType, O extends PayloadType, E extends RiverError, Init extends PayloadType | null = null>(state: State, proc: Procedure<State, 'rpc', I, O, E, Init>, extendedContext?: Omit<ServiceContext, 'state'>): (msg: Static<I>) => Promise<Result<Static<O>, Static<E> | Static<typeof RiverUncaughtSchema>>>;
-declare function asClientStream<State extends object, I extends PayloadType, O extends PayloadType, E extends RiverError, Init extends PayloadType | null = null>(state: State, proc: Procedure<State, 'stream', I, O, E, Init>, init?: Init extends PayloadType ? Static<Init> : null, extendedContext?: Omit<ServiceContext, 'state'>): readonly [it_pushable.Pushable<Static<I>, void, unknown>, it_pushable.Pushable<Result<Static<O>, Static<E>>, void, unknown>];
-declare function asClientSubscription<State extends object, I extends PayloadType, O extends PayloadType, E extends RiverError>(state: State, proc: Procedure<State, 'subscription', I, O, E>, extendedContext?: Omit<ServiceContext, 'state'>): (msg: Static<I>) => it_pushable.Pushable<Result<Static<O>, Static<E>>, void, unknown>;
-declare function asClientUpload<State extends object, I extends PayloadType, O extends PayloadType, E extends RiverError, Init extends PayloadType | null = null>(state: State, proc: Procedure<State, 'upload', I, O, E, Init>, init?: Init extends PayloadType ? Static<Init> : null, extendedContext?: Omit<ServiceContext, 'state'>): readonly [it_pushable.Pushable<Static<I>, void, unknown>, Promise<{
+declare function asClientRpc<State extends object, I extends PayloadType, O extends PayloadType, E extends RiverError, Init extends PayloadType | null = null>(state: State, proc: Procedure<State, 'rpc', I, O, E, Init>, extendedContext?: Omit<ServiceContext, 'state'>, session?: Session<Connection>): (msg: Static<I>) => Promise<Result<Static<O>, Static<E> | Static<typeof RiverUncaughtSchema>>>;
+declare function asClientStream<State extends object, I extends PayloadType, O extends PayloadType, E extends RiverError, Init extends PayloadType | null = null>(state: State, proc: Procedure<State, 'stream', I, O, E, Init>, init?: Init extends PayloadType ? Static<Init> : null, extendedContext?: Omit<ServiceContext, 'state'>, session?: Session<Connection>): readonly [it_pushable.Pushable<Static<I>, void, unknown>, it_pushable.Pushable<Result<Static<O>, Static<E>>, void, unknown>];
+declare function asClientSubscription<State extends object, I extends PayloadType, O extends PayloadType, E extends RiverError>(state: State, proc: Procedure<State, 'subscription', I, O, E>, extendedContext?: Omit<ServiceContext, 'state'>, session?: Session<Connection>): (msg: Static<I>) => it_pushable.Pushable<Result<Static<O>, Static<E>>, void, unknown>;
+declare function asClientUpload<State extends object, I extends PayloadType, O extends PayloadType, E extends RiverError, Init extends PayloadType | null = null>(state: State, proc: Procedure<State, 'upload', I, O, E, Init>, init?: Init extends PayloadType ? Static<Init> : null, extendedContext?: Omit<ServiceContext, 'state'>, session?: Session<Connection>): readonly [it_pushable.Pushable<Static<I>, void, unknown>, Promise<{
     ok: boolean;
     payload: {
         code: string;

package/dist/util/testHelpers.js

@@ -1,16 +1,16 @@
 import {
   UNCAUGHT_ERROR,
   pushable
-} from "../chunk-4C2OXQJB.js";
+} from "../chunk-TIFNW5GQ.js";
 import "../chunk-RPIDSIQG.js";
 import {
   Session,
   defaultTransportOptions
-} from "../chunk-7WY3Z5ZN.js";
+} from "../chunk-CLY7AQ25.js";
 import {
   coerceErrorString
 } from "../chunk-VH3NGOXQ.js";
-import "../chunk-H4BYJELI.js";
+import "../chunk-YITXOAPA.js";
 import "../chunk-GZ7HCLLM.js";
 
 // util/testHelpers.ts
@@ -86,28 +86,30 @@ function catchProcError(err) {
   };
 }
 var testingSessionOptions = defaultTransportOptions;
-function dummyCtx(state, extendedContext) {
-  const session = new Session(
+function dummySession() {
+  return new Session(
     void 0,
     "client",
-    "SERVER",
+    "server",
     testingSessionOptions
   );
+}
+function dummyCtx(state, session, extendedContext) {
   return {
     ...extendedContext,
     state,
-    to: "SERVER",
-    from: "client",
+    to: session.to,
+    from: session.from,
     streamId: nanoid(),
     session
   };
 }
-function asClientRpc(state, proc, extendedContext) {
+function asClientRpc(state, proc, extendedContext, session = dummySession()) {
   return async (msg) => {
-    return await proc.handler(dummyCtx(state, extendedContext), msg).catch(catchProcError);
+    return await proc.handler(dummyCtx(state, session, extendedContext), msg).catch(catchProcError);
   };
 }
-function asClientStream(state, proc, init, extendedContext) {
+function asClientStream(state, proc, init, extendedContext, session = dummySession()) {
   const input = pushable({ objectMode: true });
   const output = pushable({
     objectMode: true
@@ -115,34 +117,34 @@ function asClientStream(state, proc, init, extendedContext) {
   void (async () => {
     if (init) {
       const _proc = proc;
-      await _proc.handler(dummyCtx(state, extendedContext), init, input, output).catch((err) => output.push(catchProcError(err)));
+      await _proc.handler(dummyCtx(state, session, extendedContext), init, input, output).catch((err) => output.push(catchProcError(err)));
     } else {
       const _proc = proc;
-      await _proc.handler(dummyCtx(state, extendedContext), input, output).catch((err) => output.push(catchProcError(err)));
+      await _proc.handler(dummyCtx(state, session, extendedContext), input, output).catch((err) => output.push(catchProcError(err)));
     }
   })();
   return [input, output];
 }
-function asClientSubscription(state, proc, extendedContext) {
+function asClientSubscription(state, proc, extendedContext, session = dummySession()) {
   const output = pushable({
     objectMode: true
   });
   return (msg) => {
     void (async () => {
-      return await proc.handler(dummyCtx(state, extendedContext), msg, output).catch((err) => output.push(catchProcError(err)));
+      return await proc.handler(dummyCtx(state, session, extendedContext), msg, output).catch((err) => output.push(catchProcError(err)));
     })();
     return output;
   };
 }
-function asClientUpload(state, proc, init, extendedContext) {
+function asClientUpload(state, proc, init, extendedContext, session = dummySession()) {
   const input = pushable({ objectMode: true });
   if (init) {
     const _proc = proc;
-    const result = _proc.handler(dummyCtx(state, extendedContext), init, input).catch(catchProcError);
+    const result = _proc.handler(dummyCtx(state, session, extendedContext), init, input).catch(catchProcError);
     return [input, result];
   } else {
     const _proc = proc;
-    const result = _proc.handler(dummyCtx(state, extendedContext), input).catch(catchProcError);
+    const result = _proc.handler(dummyCtx(state, session, extendedContext), input).catch(catchProcError);
     return [input, result];
   }
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@replit/river",
   "description": "It's like tRPC but... with JSON Schema Support, duplex streaming and support for service multiplexing. Transport agnostic!",
-  "version": "0.17.3",
+  "version": "0.18.0",
   "type": "module",
   "exports": {
     ".": {

package/dist/chunk-H4BYJELI.js

@@ -1,37 +0,0 @@
-// logging/index.ts
-var LoggingLevels = {
-  debug: -1,
-  info: 0,
-  warn: 1,
-  error: 2
-};
-var log;
-var defaultLoggingLevel = "info";
-function bindLogger(write, color) {
-  const debug = color ? "\x1B[37mdebug\x1B[0m" : "debug";
-  const info = color ? "\x1B[37minfo\x1B[0m" : "info";
-  const warn = color ? "\x1B[33mwarn\x1B[0m" : "warn";
-  const error = color ? "\x1B[31merr\x1B[0m" : "err";
-  log = {
-    debug: (msg) => log && LoggingLevels[log.minLevel] <= -1 && write(`[river:${debug}] ${msg}`),
-    info: (msg) => log && LoggingLevels[log.minLevel] <= 0 && write(`[river:${info}] ${msg}`),
-    warn: (msg) => log && LoggingLevels[log.minLevel] <= 1 && write(`[river:${warn}] ${msg}`),
-    error: (msg) => log && LoggingLevels[log.minLevel] <= 2 && write(`[river:${error}] ${msg}`),
-    minLevel: log?.minLevel ?? defaultLoggingLevel
-  };
-}
-function unbindLogger() {
-  log = void 0;
-}
-function setLevel(level) {
-  if (log) {
-    log.minLevel = level;
-  }
-}
-
-export {
-  log,
-  bindLogger,
-  unbindLogger,
-  setLevel
-};