@replit/river 0.200.0-rc.9 → 0.200.2

package/dist/util/testHelpers.d.cts

@@ -1,15 +1,16 @@
-import { T as Transport, C as Connection, m as SessionOptions, n as ClientTransportOptions, e as SessionNoConnection, o as ServiceContext, S as Session } from '../context-b4aff18f.js';
+import { T as Transport, C as Connection, m as SessionOptions, n as ClientTransportOptions, e as SessionNoConnection, o as SessionBoundSendFn, p as ServiceContext, S as Session } from '../context-69f37ac1.js';
+import { C as ClientTransport } from '../client-9292552a.js';
+import { S as ServerTransport } from '../server-8fdd7fb2.js';
+import { P as PartialTransportMessage, b as OpaqueTransportMessage } from '../message-57bb8187.js';
 import { Static } from '@sinclair/typebox';
-import { P as PartialTransportMessage, b as OpaqueTransportMessage } from '../message-7d135e38.js';
-import { B as BaseErrorSchemaType, R as ReadStream, S as SimpleIterator, O as OkResult, E as ErrResult, P as PayloadType, a as ProcedureErrorSchemaType, b as Procedure, c as Result, d as ResponseReaderErrorSchema, W as WriteStream } from '../services-1b5ac5bc.js';
 import NodeWs from 'ws';
 import http from 'node:http';
+import { B as BaseErrorSchemaType, R as Readable, a as ReadableIterator, b as ReadableResult, P as PayloadType, c as ProcedureErrorSchemaType, d as Procedure, e as Result, f as ReaderErrorSchema, W as Writable } from '../services-259f39a3.js';
 import { W as WsLike } from '../wslike-e0b32dd5.js';
 import '@sinclair/typebox/errors';
 import '../types-3e5768ec.js';
 import '@sinclair/typebox/value';
 import '@opentelemetry/api';
-import '../client-22a47343.js';
 
 /**
  * Creates a WebSocket client that connects to a local server at the specified port.
@@ -33,24 +34,26 @@ declare function createWebSocketServer(server: http.Server): NodeWs.Server<typeo
  * @throws An error if a port cannot be allocated.
  */
 declare function onWsServerReady(server: http.Server): Promise<number>;
-declare function getIteratorFromStream<T, E extends Static<BaseErrorSchemaType>>(readStream: ReadStream<T, E>): SimpleIterator<OkResult<T> | ErrResult<E | {
-    readonly code: "STREAM_DRAINED";
-    readonly message: "Stream was drained";
-}>>;
 /**
- * Retrieves the next value from an async iterable iterator.
- * @param iter The async iterable iterator.
- * @returns A promise that resolves to the next value from the iterator.
+ * A safe way to access {@link Readble}'s iterator multiple times in test helpers.
+ *
+ * If there are other iteration attempts outside of the test helpers
+ * (this function, {@link readNextResult}, and {@link isReadableDone})
+ * it will throw an error.
  */
-declare function iterNext<T>(iter: {
-    next(): Promise<{
-        done: false;
-        value: T;
-    } | {
-        done: true;
-        value: undefined;
-    }>;
-}): Promise<T>;
+declare function getReadableIterator<T, E extends Static<BaseErrorSchemaType>>(readable: Readable<T, E>): ReadableIterator<T, E>;
+/**
+ * Retrieves the next value from {@link Readable}, or throws an error if the Readable is done.
+ *
+ * Calling semantics are similar to {@link getReadableIterator}
+ */
+declare function readNextResult<T, E extends Static<BaseErrorSchemaType>>(readable: Readable<T, E>): Promise<ReadableResult<T, E>>;
+/**
+ * Checks if the readable is done iterating, it consumes an iteration in the process.
+ *
+ * Calling semantics are similar to {@link getReadableIterator}
+ */
+declare function isReadableDone<T, E extends Static<BaseErrorSchemaType>>(readable: Readable<T, E>): Promise<boolean>;
 declare function payloadToTransportMessage<Payload>(payload: Payload): PartialTransportMessage<Payload>;
 declare function createDummyTransportMessage(): PartialTransportMessage<{
     msg: string;
@@ -66,20 +69,22 @@ declare function waitForMessage(t: Transport<Connection>, filter?: (msg: OpaqueT
 declare const testingSessionOptions: SessionOptions;
 declare const testingClientSessionOptions: ClientTransportOptions;
 declare function dummySession(): SessionNoConnection;
-declare function asClientRpc<State extends object, Init extends PayloadType, Output extends PayloadType, Err extends ProcedureErrorSchemaType>(state: State, proc: Procedure<State, 'rpc', Init, null, Output, Err>, extendedContext?: Omit<ServiceContext, 'state'>, session?: Session<Connection>): (msg: Static<Init>) => Promise<Result<Static<Output>, Static<Err> | Static<typeof ResponseReaderErrorSchema>>>;
-declare function asClientStream<State extends object, Init extends PayloadType, Input extends PayloadType, Output extends PayloadType, Err extends ProcedureErrorSchemaType>(state: State, proc: Procedure<State, 'stream', Init, Input, Output, Err>, reqInit?: Static<Init>, extendedContext?: Omit<ServiceContext, 'state'>, session?: Session<Connection>): {
-    reqWriter: WriteStream<Static<Input>>;
-    resReader: ReadStream<Static<Output>, Static<Err>>;
+declare function getClientSendFn(clientTransport: ClientTransport<Connection>, serverTransport: ServerTransport<Connection>): SessionBoundSendFn;
+declare function getServerSendFn(serverTransport: ServerTransport<Connection>, clientTransport: ClientTransport<Connection>): SessionBoundSendFn;
+declare function asClientRpc<State extends object, Init extends PayloadType, Res extends PayloadType, Err extends ProcedureErrorSchemaType>(state: State, proc: Procedure<State, 'rpc', Init, null, Res, Err>, extendedContext?: Omit<ServiceContext, 'state'>, session?: Session<Connection>): (msg: Static<Init>) => Promise<Result<Static<Res>, Static<Err> | Static<typeof ReaderErrorSchema>>>;
+declare function asClientStream<State extends object, Init extends PayloadType, Req extends PayloadType, Res extends PayloadType, Err extends ProcedureErrorSchemaType>(state: State, proc: Procedure<State, 'stream', Init, Req, Res, Err>, reqInit?: Static<Init>, extendedContext?: Omit<ServiceContext, 'state'>, session?: Session<Connection>): {
+    reqWritable: Writable<Static<Req>>;
+    resReadable: Readable<Static<Res>, Static<Err>>;
+};
+declare function asClientSubscription<State extends object, Init extends PayloadType, Res extends PayloadType, Err extends ProcedureErrorSchemaType>(state: State, proc: Procedure<State, 'subscription', Init, null, Res, Err>, extendedContext?: Omit<ServiceContext, 'state'>, session?: Session<Connection>): (msg: Static<Init>) => {
+    resReadable: Readable<Static<Res>, Static<Err>>;
 };
-declare function asClientSubscription<State extends object, Init extends PayloadType, Output extends PayloadType, Err extends ProcedureErrorSchemaType>(state: State, proc: Procedure<State, 'subscription', Init, null, Output, Err>, extendedContext?: Omit<ServiceContext, 'state'>, session?: Session<Connection>): (msg: Static<Init>) => {
-    resReader: ReadStream<Static<Output>, Static<Err>>;
+declare function asClientUpload<State extends object, Init extends PayloadType, Req extends PayloadType, Res extends PayloadType, Err extends ProcedureErrorSchemaType>(state: State, proc: Procedure<State, 'upload', Init, Req, Res, Err>, reqInit?: Static<Init>, extendedContext?: Omit<ServiceContext, 'state'>, session?: Session<Connection>): {
+    reqWritable: Writable<Static<Req>>;
+    finalize: () => Promise<Result<Static<Res>, Static<Err>>>;
 };
-declare function asClientUpload<State extends object, Init extends PayloadType, Input extends PayloadType, Output extends PayloadType, Err extends ProcedureErrorSchemaType>(state: State, proc: Procedure<State, 'upload', Init, Input, Output, Err>, reqInit?: Static<Init>, extendedContext?: Omit<ServiceContext, 'state'>, session?: Session<Connection>): [
-    WriteStream<Static<Input>>,
-    () => Promise<Result<Static<Output>, Static<Err>>>
-];
 declare function getTransportConnections<ConnType extends Connection>(transport: Transport<ConnType>): Array<ConnType>;
 declare function numberOfConnections<ConnType extends Connection>(transport: Transport<ConnType>): number;
 declare function closeAllConnections<ConnType extends Connection>(transport: Transport<ConnType>): void;
 
-export { asClientRpc, asClientStream, asClientSubscription, asClientUpload, closeAllConnections, createDummyTransportMessage, createLocalWebSocketClient, createWebSocketServer, dummySession, getIteratorFromStream, getTransportConnections, iterNext, numberOfConnections, onWsServerReady, payloadToTransportMessage, testingClientSessionOptions, testingSessionOptions, waitForMessage };
+export { asClientRpc, asClientStream, asClientSubscription, asClientUpload, closeAllConnections, createDummyTransportMessage, createLocalWebSocketClient, createWebSocketServer, dummySession, getClientSendFn, getReadableIterator, getServerSendFn, getTransportConnections, isReadableDone, numberOfConnections, onWsServerReady, payloadToTransportMessage, readNextResult, testingClientSessionOptions, testingSessionOptions, waitForMessage };

package/dist/util/testHelpers.d.ts

@@ -1,15 +1,16 @@
-import { T as Transport, C as Connection, m as SessionOptions, n as ClientTransportOptions, e as SessionNoConnection, o as ServiceContext, S as Session } from '../context-b4aff18f.js';
+import { T as Transport, C as Connection, m as SessionOptions, n as ClientTransportOptions, e as SessionNoConnection, o as SessionBoundSendFn, p as ServiceContext, S as Session } from '../context-69f37ac1.js';
+import { C as ClientTransport } from '../client-9292552a.js';
+import { S as ServerTransport } from '../server-8fdd7fb2.js';
+import { P as PartialTransportMessage, b as OpaqueTransportMessage } from '../message-57bb8187.js';
 import { Static } from '@sinclair/typebox';
-import { P as PartialTransportMessage, b as OpaqueTransportMessage } from '../message-7d135e38.js';
-import { B as BaseErrorSchemaType, R as ReadStream, S as SimpleIterator, O as OkResult, E as ErrResult, P as PayloadType, a as ProcedureErrorSchemaType, b as Procedure, c as Result, d as ResponseReaderErrorSchema, W as WriteStream } from '../services-1b5ac5bc.js';
 import NodeWs from 'ws';
 import http from 'node:http';
+import { B as BaseErrorSchemaType, R as Readable, a as ReadableIterator, b as ReadableResult, P as PayloadType, c as ProcedureErrorSchemaType, d as Procedure, e as Result, f as ReaderErrorSchema, W as Writable } from '../services-259f39a3.js';
 import { W as WsLike } from '../wslike-e0b32dd5.js';
 import '@sinclair/typebox/errors';
 import '../types-3e5768ec.js';
 import '@sinclair/typebox/value';
 import '@opentelemetry/api';
-import '../client-22a47343.js';
 
 /**
  * Creates a WebSocket client that connects to a local server at the specified port.
@@ -33,24 +34,26 @@ declare function createWebSocketServer(server: http.Server): NodeWs.Server<typeo
  * @throws An error if a port cannot be allocated.
  */
 declare function onWsServerReady(server: http.Server): Promise<number>;
-declare function getIteratorFromStream<T, E extends Static<BaseErrorSchemaType>>(readStream: ReadStream<T, E>): SimpleIterator<OkResult<T> | ErrResult<E | {
-    readonly code: "STREAM_DRAINED";
-    readonly message: "Stream was drained";
-}>>;
 /**
- * Retrieves the next value from an async iterable iterator.
- * @param iter The async iterable iterator.
- * @returns A promise that resolves to the next value from the iterator.
+ * A safe way to access {@link Readble}'s iterator multiple times in test helpers.
+ *
+ * If there are other iteration attempts outside of the test helpers
+ * (this function, {@link readNextResult}, and {@link isReadableDone})
+ * it will throw an error.
  */
-declare function iterNext<T>(iter: {
-    next(): Promise<{
-        done: false;
-        value: T;
-    } | {
-        done: true;
-        value: undefined;
-    }>;
-}): Promise<T>;
+declare function getReadableIterator<T, E extends Static<BaseErrorSchemaType>>(readable: Readable<T, E>): ReadableIterator<T, E>;
+/**
+ * Retrieves the next value from {@link Readable}, or throws an error if the Readable is done.
+ *
+ * Calling semantics are similar to {@link getReadableIterator}
+ */
+declare function readNextResult<T, E extends Static<BaseErrorSchemaType>>(readable: Readable<T, E>): Promise<ReadableResult<T, E>>;
+/**
+ * Checks if the readable is done iterating, it consumes an iteration in the process.
+ *
+ * Calling semantics are similar to {@link getReadableIterator}
+ */
+declare function isReadableDone<T, E extends Static<BaseErrorSchemaType>>(readable: Readable<T, E>): Promise<boolean>;
 declare function payloadToTransportMessage<Payload>(payload: Payload): PartialTransportMessage<Payload>;
 declare function createDummyTransportMessage(): PartialTransportMessage<{
     msg: string;
@@ -66,20 +69,22 @@ declare function waitForMessage(t: Transport<Connection>, filter?: (msg: OpaqueT
 declare const testingSessionOptions: SessionOptions;
 declare const testingClientSessionOptions: ClientTransportOptions;
 declare function dummySession(): SessionNoConnection;
-declare function asClientRpc<State extends object, Init extends PayloadType, Output extends PayloadType, Err extends ProcedureErrorSchemaType>(state: State, proc: Procedure<State, 'rpc', Init, null, Output, Err>, extendedContext?: Omit<ServiceContext, 'state'>, session?: Session<Connection>): (msg: Static<Init>) => Promise<Result<Static<Output>, Static<Err> | Static<typeof ResponseReaderErrorSchema>>>;
-declare function asClientStream<State extends object, Init extends PayloadType, Input extends PayloadType, Output extends PayloadType, Err extends ProcedureErrorSchemaType>(state: State, proc: Procedure<State, 'stream', Init, Input, Output, Err>, reqInit?: Static<Init>, extendedContext?: Omit<ServiceContext, 'state'>, session?: Session<Connection>): {
-    reqWriter: WriteStream<Static<Input>>;
-    resReader: ReadStream<Static<Output>, Static<Err>>;
+declare function getClientSendFn(clientTransport: ClientTransport<Connection>, serverTransport: ServerTransport<Connection>): SessionBoundSendFn;
+declare function getServerSendFn(serverTransport: ServerTransport<Connection>, clientTransport: ClientTransport<Connection>): SessionBoundSendFn;
+declare function asClientRpc<State extends object, Init extends PayloadType, Res extends PayloadType, Err extends ProcedureErrorSchemaType>(state: State, proc: Procedure<State, 'rpc', Init, null, Res, Err>, extendedContext?: Omit<ServiceContext, 'state'>, session?: Session<Connection>): (msg: Static<Init>) => Promise<Result<Static<Res>, Static<Err> | Static<typeof ReaderErrorSchema>>>;
+declare function asClientStream<State extends object, Init extends PayloadType, Req extends PayloadType, Res extends PayloadType, Err extends ProcedureErrorSchemaType>(state: State, proc: Procedure<State, 'stream', Init, Req, Res, Err>, reqInit?: Static<Init>, extendedContext?: Omit<ServiceContext, 'state'>, session?: Session<Connection>): {
+    reqWritable: Writable<Static<Req>>;
+    resReadable: Readable<Static<Res>, Static<Err>>;
+};
+declare function asClientSubscription<State extends object, Init extends PayloadType, Res extends PayloadType, Err extends ProcedureErrorSchemaType>(state: State, proc: Procedure<State, 'subscription', Init, null, Res, Err>, extendedContext?: Omit<ServiceContext, 'state'>, session?: Session<Connection>): (msg: Static<Init>) => {
+    resReadable: Readable<Static<Res>, Static<Err>>;
 };
-declare function asClientSubscription<State extends object, Init extends PayloadType, Output extends PayloadType, Err extends ProcedureErrorSchemaType>(state: State, proc: Procedure<State, 'subscription', Init, null, Output, Err>, extendedContext?: Omit<ServiceContext, 'state'>, session?: Session<Connection>): (msg: Static<Init>) => {
-    resReader: ReadStream<Static<Output>, Static<Err>>;
+declare function asClientUpload<State extends object, Init extends PayloadType, Req extends PayloadType, Res extends PayloadType, Err extends ProcedureErrorSchemaType>(state: State, proc: Procedure<State, 'upload', Init, Req, Res, Err>, reqInit?: Static<Init>, extendedContext?: Omit<ServiceContext, 'state'>, session?: Session<Connection>): {
+    reqWritable: Writable<Static<Req>>;
+    finalize: () => Promise<Result<Static<Res>, Static<Err>>>;
 };
-declare function asClientUpload<State extends object, Init extends PayloadType, Input extends PayloadType, Output extends PayloadType, Err extends ProcedureErrorSchemaType>(state: State, proc: Procedure<State, 'upload', Init, Input, Output, Err>, reqInit?: Static<Init>, extendedContext?: Omit<ServiceContext, 'state'>, session?: Session<Connection>): [
-    WriteStream<Static<Input>>,
-    () => Promise<Result<Static<Output>, Static<Err>>>
-];
 declare function getTransportConnections<ConnType extends Connection>(transport: Transport<ConnType>): Array<ConnType>;
 declare function numberOfConnections<ConnType extends Connection>(transport: Transport<ConnType>): number;
 declare function closeAllConnections<ConnType extends Connection>(transport: Transport<ConnType>): void;
 
-export { asClientRpc, asClientStream, asClientSubscription, asClientUpload, closeAllConnections, createDummyTransportMessage, createLocalWebSocketClient, createWebSocketServer, dummySession, getIteratorFromStream, getTransportConnections, iterNext, numberOfConnections, onWsServerReady, payloadToTransportMessage, testingClientSessionOptions, testingSessionOptions, waitForMessage };
+export { asClientRpc, asClientStream, asClientSubscription, asClientUpload, closeAllConnections, createDummyTransportMessage, createLocalWebSocketClient, createWebSocketServer, dummySession, getClientSendFn, getReadableIterator, getServerSendFn, getTransportConnections, isReadableDone, numberOfConnections, onWsServerReady, payloadToTransportMessage, readNextResult, testingClientSessionOptions, testingSessionOptions, waitForMessage };

package/dist/util/testHelpers.js

@@ -1,20 +1,20 @@
 import {
   Err,
   Ok,
-  ReadStreamImpl,
+  ReadableImpl,
   UNCAUGHT_ERROR_CODE,
-  WriteStreamImpl
-} from "../chunk-MQ6ANR3H.js";
+  WritableImpl
+} from "../chunk-Z4PX66JO.js";
 import {
   SessionStateGraph,
   defaultClientTransportOptions,
   defaultTransportOptions
-} from "../chunk-42Z2FQIU.js";
+} from "../chunk-6BH2CXVE.js";
 import {
   coerceErrorString,
   currentProtocolVersion
-} from "../chunk-EETL2L77.js";
-import "../chunk-4PVU7J25.js";
+} from "../chunk-GJUUVID2.js";
+import "../chunk-AJGIY2UB.js";
 
 // util/testHelpers.ts
 import NodeWs, { WebSocketServer } from "ws";
@@ -38,11 +38,25 @@ function onWsServerReady(server) {
     });
   });
 }
-function getIteratorFromStream(readStream) {
-  return readStream[Symbol.asyncIterator]();
+var readableIterators = /* @__PURE__ */ new WeakMap();
+function getReadableIterator(readable) {
+  let iter = readableIterators.get(readable);
+  if (!iter) {
+    iter = readable[Symbol.asyncIterator]();
+    readableIterators.set(readable, iter);
+  }
+  return iter;
+}
+async function readNextResult(readable) {
+  const res = await getReadableIterator(readable).next();
+  if (res.done) {
+    throw new Error("readNext from a done Readable");
+  }
+  return res.value;
 }
-async function iterNext(iter) {
-  return await iter.next().then((res) => res.value);
+async function isReadableDone(readable) {
+  const res = await getReadableIterator(readable).next();
+  return res.done;
 }
 function payloadToTransportMessage(payload) {
   return {
@@ -92,6 +106,23 @@ function dummySession() {
     currentProtocolVersion
   );
 }
+function getClientSendFn(clientTransport, serverTransport) {
+  const session = clientTransport.sessions.get(serverTransport.clientId) ?? clientTransport.createUnconnectedSession(serverTransport.clientId);
+  return clientTransport.getSessionBoundSendFn(
+    serverTransport.clientId,
+    session.id
+  );
+}
+function getServerSendFn(serverTransport, clientTransport) {
+  const session = serverTransport.sessions.get(clientTransport.clientId);
+  if (!session) {
+    throw new Error("session not found");
+  }
+  return serverTransport.getSessionBoundSendFn(
+    clientTransport.clientId,
+    session.id
+  );
+}
 function dummyCtx(state, session, extendedContext) {
   return {
     ...extendedContext,
@@ -99,9 +130,9 @@ function dummyCtx(state, session, extendedContext) {
     sessionId: session.id,
     from: session.from,
     metadata: {},
-    abortController: new AbortController(),
-    clientAbortSignal: new AbortController().signal,
-    onRequestFinished: () => void 0
+    // TODO might wanna hook these up!
+    cancel: () => void 0,
+    signal: new AbortController().signal
   };
 }
 function asClientRpc(state, proc, extendedContext, session = dummySession()) {
@@ -113,38 +144,32 @@ function asClientRpc(state, proc, extendedContext, session = dummySession()) {
   };
 }
 function createResponsePipe() {
-  const reader = new ReadStreamImpl(() => {
-    void Promise.resolve().then(() => {
-      writer.triggerCloseRequest();
-    });
-  });
-  const writer = new WriteStreamImpl(
-    (v) => {
-      reader.pushValue(v);
+  const readable = new ReadableImpl();
+  const writable = new WritableImpl({
+    writeCb: (v) => {
+      readable._pushValue(v);
+    },
+    closeCb: () => {
+      void Promise.resolve().then(() => {
+        readable._triggerClose();
+      });
     }
-  );
-  writer.onClose(() => {
-    void Promise.resolve().then(() => {
-      reader.triggerClose();
-    });
   });
-  return { reader, writer };
+  return { readable, writable };
 }
 function createRequestPipe() {
-  const reader = new ReadStreamImpl(() => {
-    void Promise.resolve().then(() => {
-      writer.triggerCloseRequest();
-    });
-  });
-  const writer = new WriteStreamImpl((v) => {
-    reader.pushValue(Ok(v));
-  });
-  writer.onClose(() => {
-    void Promise.resolve().then(() => {
-      reader.triggerClose();
-    });
+  const readable = new ReadableImpl();
+  const writable = new WritableImpl({
+    writeCb: (v) => {
+      readable._pushValue(Ok(v));
+    },
+    closeCb: () => {
+      void Promise.resolve().then(() => {
+        readable._triggerClose();
+      });
+    }
   });
-  return { reader, writer };
+  return { readable, writable };
 }
 function asClientStream(state, proc, reqInit, extendedContext, session = dummySession()) {
   const requestPipe = createRequestPipe();
@@ -152,12 +177,12 @@ function asClientStream(state, proc, reqInit, extendedContext, session = dummySe
   void proc.handler({
     ctx: dummyCtx(state, session, extendedContext),
     reqInit: reqInit ?? {},
-    reqReader: requestPipe.reader,
-    resWriter: responsePipe.writer
-  }).catch((err) => responsePipe.writer.write(catchProcError(err)));
+    reqReadable: requestPipe.readable,
+    resWritable: responsePipe.writable
+  }).catch((err) => responsePipe.writable.write(catchProcError(err)));
   return {
-    reqWriter: requestPipe.writer,
-    resReader: responsePipe.reader
+    reqWritable: requestPipe.writable,
+    resReadable: responsePipe.readable
   };
 }
 function asClientSubscription(state, proc, extendedContext, session = dummySession()) {
@@ -166,9 +191,11 @@ function asClientSubscription(state, proc, extendedContext, session = dummySessi
     void proc.handler({
       ctx: dummyCtx(state, session, extendedContext),
       reqInit: msg,
-      resWriter: responsePipe.writer
-    }).catch((err) => responsePipe.writer.write(catchProcError(err)));
-    return { resReader: responsePipe.reader };
+      resWritable: responsePipe.writable
+    }).catch(
+      (err) => responsePipe.writable.write(catchProcError(err))
+    );
+    return { resReadable: responsePipe.readable };
   };
 }
 function asClientUpload(state, proc, reqInit, extendedContext, session = dummySession()) {
@@ -176,9 +203,9 @@ function asClientUpload(state, proc, reqInit, extendedContext, session = dummySe
   const result = proc.handler({
     ctx: dummyCtx(state, session, extendedContext),
     reqInit: reqInit ?? {},
-    reqReader: requestPipe.reader
+    reqReadable: requestPipe.readable
   }).catch(catchProcError);
-  return [requestPipe.writer, () => result];
+  return { reqWritable: requestPipe.writable, finalize: () => result };
 }
 function getTransportConnections(transport) {
   const connections = [];
@@ -207,12 +234,15 @@ export {
   createLocalWebSocketClient,
   createWebSocketServer,
   dummySession,
-  getIteratorFromStream,
+  getClientSendFn,
+  getReadableIterator,
+  getServerSendFn,
   getTransportConnections,
-  iterNext,
+  isReadableDone,
   numberOfConnections,
   onWsServerReady,
   payloadToTransportMessage,
+  readNextResult,
   testingClientSessionOptions,
   testingSessionOptions,
   waitForMessage

package/dist/util/testHelpers.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../util/testHelpers.ts"],"sourcesContent":["import NodeWs, { WebSocketServer } from 'ws';\nimport http from 'node:http';\nimport { Err, Ok, Result, BaseErrorSchemaType } from '../router/result';\nimport {\n  ProcedureErrorSchemaType,\n  RequestReaderErrorSchema,\n  ResponseReaderErrorSchema,\n  UNCAUGHT_ERROR_CODE,\n  PayloadType,\n  Procedure,\n} from '../router/procedures';\nimport { Static } from '@sinclair/typebox';\nimport {\n  OpaqueTransportMessage,\n  PartialTransportMessage,\n  currentProtocolVersion,\n} from '../transport/message';\nimport { coerceErrorString } from './stringify';\nimport { Transport } from '../transport/transport';\nimport {\n  ReadStream,\n  WriteStream,\n  ReadStreamImpl,\n  WriteStreamImpl,\n} from '../router/streams';\nimport { ServiceContext, ProcedureHandlerContext } from '../router/context';\nimport { WsLike } from '../transport/impls/ws/wslike';\nimport {\n  defaultClientTransportOptions,\n  defaultTransportOptions,\n} from '../transport/options';\nimport { Connection } from '../transport/connection';\nimport { SessionState } from '../transport/sessionStateMachine/common';\nimport {\n  Session,\n  SessionStateGraph,\n} from '../transport/sessionStateMachine/transitions';\n\n/**\n * Creates a WebSocket client that connects to a local server at the specified port.\n * This should only be used for testing.\n * @param port - The port number to connect to.\n * @returns A Promise that resolves to a WebSocket instance.\n */\nexport function createLocalWebSocketClient(port: number): WsLike {\n  const sock = new NodeWs(`ws://localhost:${port}`);\n  sock.binaryType = 'arraybuffer';\n\n  return sock;\n}\n\n/**\n * Creates a WebSocket server instance using the provided HTTP server.\n * Only used as helper for testing.\n * @param server - The HTTP server instance to use for the WebSocket server.\n * @returns A Promise that resolves to the created WebSocket server instance.\n */\nexport function createWebSocketServer(server: http.Server) {\n  return new WebSocketServer({ server });\n}\n\n/**\n * Starts listening on the given server and returns the automatically allocated port number.\n * This should only be used for testing.\n * @param server - The http server to listen on.\n * @returns A promise that resolves with the allocated port number.\n * @throws An error if a port cannot be allocated.\n */\nexport function onWsServerReady(server: http.Server): Promise<number> {\n  return new Promise((resolve, reject) => {\n    server.listen(() => {\n      const addr = server.address();\n      if (typeof addr === 'object' && addr) {\n        resolve(addr.port);\n      } else {\n        reject(new Error(\"couldn't find a port to allocate\"));\n      }\n    });\n  });\n}\n\nexport function getIteratorFromStream<T, E extends Static<BaseErrorSchemaType>>(\n  readStream: ReadStream<T, E>,\n) {\n  return readStream[Symbol.asyncIterator]();\n}\n\n/**\n * Retrieves the next value from an async iterable iterator.\n * @param iter The async iterable iterator.\n * @returns A promise that resolves to the next value from the iterator.\n */\nexport async function iterNext<T>(iter: {\n  next(): Promise<\n    | {\n        done: false;\n        value: T;\n      }\n    | {\n        done: true;\n        value: undefined;\n      }\n  >;\n}) {\n  return await iter.next().then((res) => res.value as T);\n}\n\nexport function payloadToTransportMessage<Payload>(\n  payload: Payload,\n): PartialTransportMessage<Payload> {\n  return {\n    streamId: 'stream',\n    controlFlags: 0,\n    payload,\n  };\n}\n\nexport function createDummyTransportMessage() {\n  return payloadToTransportMessage({\n    msg: 'cool',\n    test: Math.random(),\n  });\n}\n\n/**\n * Waits for a message on the transport.\n * @param {Transport} t - The transport to listen to.\n * @param filter - An optional filter function to apply to the received messages.\n * @returns A promise that resolves with the payload of the first message that passes the filter.\n */\nexport async function waitForMessage(\n  t: Transport<Connection>,\n  filter?: (msg: OpaqueTransportMessage) => boolean,\n  rejectMismatch?: boolean,\n) {\n  return new Promise((resolve, reject) => {\n    function cleanup() {\n      t.removeEventListener('message', onMessage);\n    }\n\n    function onMessage(msg: OpaqueTransportMessage) {\n      if (!filter || filter(msg)) {\n        cleanup();\n        resolve(msg.payload);\n      } else if (rejectMismatch) {\n        cleanup();\n        reject(new Error('message didnt match the filter'));\n      }\n    }\n\n    t.addEventListener('message', onMessage);\n  });\n}\n\nfunction catchProcError(err: unknown) {\n  const errorMsg = coerceErrorString(err);\n  return Err({ code: UNCAUGHT_ERROR_CODE, message: errorMsg });\n}\n\nexport const testingSessionOptions = defaultTransportOptions;\nexport const testingClientSessionOptions = defaultClientTransportOptions;\n\nexport function dummySession() {\n  return SessionStateGraph.entrypoints.NoConnection(\n    'client',\n    'server',\n    {\n      onSessionGracePeriodElapsed: () => {\n        /* noop */\n      },\n    },\n    testingSessionOptions,\n    currentProtocolVersion,\n  );\n}\n\nfunction dummyCtx<State>(\n  state: State,\n  session: Session<Connection>,\n  extendedContext?: Omit<ServiceContext, 'state'>,\n): ProcedureHandlerContext<State> {\n  return {\n    ...extendedContext,\n    state,\n    sessionId: session.id,\n    from: session.from,\n    metadata: {},\n    abortController: new AbortController(),\n    clientAbortSignal: new AbortController().signal,\n    onRequestFinished: () => undefined,\n  };\n}\n\nexport function asClientRpc<\n  State extends object,\n  Init extends PayloadType,\n  Output extends PayloadType,\n  Err extends ProcedureErrorSchemaType,\n>(\n  state: State,\n  proc: Procedure<State, 'rpc', Init, null, Output, Err>,\n  extendedContext?: Omit<ServiceContext, 'state'>,\n  session: Session<Connection> = dummySession(),\n) {\n  return async (\n    msg: Static<Init>,\n  ): Promise<\n    Result<\n      Static<Output>,\n      Static<Err> | Static<typeof ResponseReaderErrorSchema>\n    >\n  > => {\n    return proc\n      .handler({\n        ctx: dummyCtx(state, session, extendedContext),\n        reqInit: msg,\n      })\n      .catch(catchProcError);\n  };\n}\n\nfunction createResponsePipe<\n  Output extends PayloadType,\n  Err extends ProcedureErrorSchemaType,\n>(): {\n  reader: ReadStream<\n    Static<Output>,\n    Static<Err> | Static<typeof ResponseReaderErrorSchema>\n  >;\n  writer: WriteStream<Result<Static<Output>, Static<Err>>>;\n} {\n  const reader = new ReadStreamImpl<\n    Static<Output>,\n    Static<Err> | Static<typeof ResponseReaderErrorSchema>\n  >(() => {\n    // Make it async to simulate request going over the wire\n    // using promises so that we don't get affected by fake timers.\n    void Promise.resolve().then(() => {\n      writer.triggerCloseRequest();\n    });\n  });\n  const writer = new WriteStreamImpl<Result<Static<Output>, Static<Err>>>(\n    (v) => {\n      reader.pushValue(v);\n    },\n  );\n  writer.onClose(() => {\n    // Make it async to simulate request going over the wire\n    // using promises so that we don't get affected by fake timers.\n    void Promise.resolve().then(() => {\n      reader.triggerClose();\n    });\n  });\n\n  return { reader, writer };\n}\n\nfunction createRequestPipe<Input extends PayloadType>(): {\n  reader: ReadStream<Static<Input>, Static<typeof RequestReaderErrorSchema>>;\n  writer: WriteStream<Static<Input>>;\n} {\n  const reader = new ReadStreamImpl<\n    Static<Input>,\n    Static<typeof RequestReaderErrorSchema>\n  >(() => {\n    // Make it async to simulate request going over the wire\n    // using promises so that we don't get affected by fake timers.\n    void Promise.resolve().then(() => {\n      writer.triggerCloseRequest();\n    });\n  });\n  const writer = new WriteStreamImpl<Static<Input>>((v) => {\n    reader.pushValue(Ok(v));\n  });\n  writer.onClose(() => {\n    // Make it async to simulate request going over the wire\n    // using promises so that we don't get affected by fake timers.\n    void Promise.resolve().then(() => {\n      reader.triggerClose();\n    });\n  });\n\n  return { reader, writer };\n}\n\nexport function asClientStream<\n  State extends object,\n  Init extends PayloadType,\n  Input extends PayloadType,\n  Output extends PayloadType,\n  Err extends ProcedureErrorSchemaType,\n>(\n  state: State,\n  proc: Procedure<State, 'stream', Init, Input, Output, Err>,\n  reqInit?: Static<Init>,\n  extendedContext?: Omit<ServiceContext, 'state'>,\n  session: Session<Connection> = dummySession(),\n): {\n  reqWriter: WriteStream<Static<Input>>;\n  resReader: ReadStream<Static<Output>, Static<Err>>;\n} {\n  const requestPipe = createRequestPipe<Input>();\n  const responsePipe = createResponsePipe<Output, Err>();\n\n  void proc\n    .handler({\n      ctx: dummyCtx(state, session, extendedContext),\n      reqInit: reqInit ?? {},\n      reqReader: requestPipe.reader,\n      resWriter: responsePipe.writer,\n    })\n    .catch((err: unknown) => responsePipe.writer.write(catchProcError(err)));\n\n  return {\n    reqWriter: requestPipe.writer,\n    resReader: responsePipe.reader,\n  };\n}\n\nexport function asClientSubscription<\n  State extends object,\n  Init extends PayloadType,\n  Output extends PayloadType,\n  Err extends ProcedureErrorSchemaType,\n>(\n  state: State,\n  proc: Procedure<State, 'subscription', Init, null, Output, Err>,\n  extendedContext?: Omit<ServiceContext, 'state'>,\n  session: Session<Connection> = dummySession(),\n): (msg: Static<Init>) => {\n  resReader: ReadStream<Static<Output>, Static<Err>>;\n} {\n  const responsePipe = createResponsePipe<Output, Err>();\n\n  return (msg: Static<Init>) => {\n    void proc\n      .handler({\n        ctx: dummyCtx(state, session, extendedContext),\n        reqInit: msg,\n        resWriter: responsePipe.writer,\n      })\n      .catch((err: unknown) => responsePipe.writer.write(catchProcError(err)));\n\n    return { resReader: responsePipe.reader };\n  };\n}\n\nexport function asClientUpload<\n  State extends object,\n  Init extends PayloadType,\n  Input extends PayloadType,\n  Output extends PayloadType,\n  Err extends ProcedureErrorSchemaType,\n>(\n  state: State,\n  proc: Procedure<State, 'upload', Init, Input, Output, Err>,\n  reqInit?: Static<Init>,\n  extendedContext?: Omit<ServiceContext, 'state'>,\n  session: Session<Connection> = dummySession(),\n): [\n  WriteStream<Static<Input>>,\n  () => Promise<Result<Static<Output>, Static<Err>>>,\n] {\n  const requestPipe = createRequestPipe<Input>();\n  const result = proc\n    .handler({\n      ctx: dummyCtx(state, session, extendedContext),\n      reqInit: reqInit ?? {},\n      reqReader: requestPipe.reader,\n    })\n    .catch(catchProcError);\n\n  return [requestPipe.writer, () => result];\n}\n\nexport function getTransportConnections<ConnType extends Connection>(\n  transport: Transport<ConnType>,\n): Array<ConnType> {\n  const connections = [];\n  for (const session of transport.sessions.values()) {\n    if (session.state === SessionState.Connected) {\n      connections.push(session.conn);\n    }\n  }\n\n  return connections;\n}\n\nexport function numberOfConnections<ConnType extends Connection>(\n  transport: Transport<ConnType>,\n): number {\n  return getTransportConnections(transport).length;\n}\n\nexport function closeAllConnections<ConnType extends Connection>(\n  transport: Transport<ConnType>,\n) {\n  for (const conn of getTransportConnections(transport)) {\n    conn.close();\n  }\n}\n"],"mappings":"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","names":[]}
+{"version":3,"sources":["../../util/testHelpers.ts"],"sourcesContent":["import NodeWs, { WebSocketServer } from 'ws';\nimport http from 'node:http';\nimport { Err, Ok, Result } from '../router/result';\nimport { PayloadType, Procedure } from '../router/procedures';\nimport { Static } from '@sinclair/typebox';\nimport {\n  OpaqueTransportMessage,\n  PartialTransportMessage,\n  currentProtocolVersion,\n} from '../transport/message';\nimport { coerceErrorString } from './stringify';\nimport { Transport } from '../transport/transport';\nimport {\n  Readable,\n  ReadableImpl,\n  ReadableResult,\n  ReadableIterator,\n  Writable,\n  WritableImpl,\n} from '../router/streams';\nimport { ServiceContext, ProcedureHandlerContext } from '../router/context';\nimport { WsLike } from '../transport/impls/ws/wslike';\nimport {\n  defaultClientTransportOptions,\n  defaultTransportOptions,\n} from '../transport/options';\nimport { Connection } from '../transport/connection';\nimport { SessionState } from '../transport/sessionStateMachine/common';\nimport {\n  Session,\n  SessionStateGraph,\n} from '../transport/sessionStateMachine/transitions';\nimport {\n  BaseErrorSchemaType,\n  ProcedureErrorSchemaType,\n  ReaderErrorSchema,\n  UNCAUGHT_ERROR_CODE,\n} from '../router/errors';\nimport { ClientTransport } from '../transport/client';\nimport { ServerTransport } from '../transport/server';\n\n/**\n * Creates a WebSocket client that connects to a local server at the specified port.\n * This should only be used for testing.\n * @param port - The port number to connect to.\n * @returns A Promise that resolves to a WebSocket instance.\n */\nexport function createLocalWebSocketClient(port: number): WsLike {\n  const sock = new NodeWs(`ws://localhost:${port}`);\n  sock.binaryType = 'arraybuffer';\n\n  return sock;\n}\n\n/**\n * Creates a WebSocket server instance using the provided HTTP server.\n * Only used as helper for testing.\n * @param server - The HTTP server instance to use for the WebSocket server.\n * @returns A Promise that resolves to the created WebSocket server instance.\n */\nexport function createWebSocketServer(server: http.Server) {\n  return new WebSocketServer({ server });\n}\n\n/**\n * Starts listening on the given server and returns the automatically allocated port number.\n * This should only be used for testing.\n * @param server - The http server to listen on.\n * @returns A promise that resolves with the allocated port number.\n * @throws An error if a port cannot be allocated.\n */\nexport function onWsServerReady(server: http.Server): Promise<number> {\n  return new Promise((resolve, reject) => {\n    server.listen(() => {\n      const addr = server.address();\n      if (typeof addr === 'object' && addr) {\n        resolve(addr.port);\n      } else {\n        reject(new Error(\"couldn't find a port to allocate\"));\n      }\n    });\n  });\n}\n\nconst readableIterators = new WeakMap<\n  Readable<unknown, Static<BaseErrorSchemaType>>,\n  ReadableIterator<unknown, Static<BaseErrorSchemaType>>\n>();\n\n/**\n * A safe way to access {@link Readble}'s iterator multiple times in test helpers.\n *\n * If there are other iteration attempts outside of the test helpers\n * (this function, {@link readNextResult}, and {@link isReadableDone})\n * it will throw an error.\n */\nexport function getReadableIterator<T, E extends Static<BaseErrorSchemaType>>(\n  readable: Readable<T, E>,\n): ReadableIterator<T, E> {\n  let iter = readableIterators.get(readable) as\n    | ReadableIterator<T, E>\n    | undefined;\n\n  if (!iter) {\n    iter = readable[Symbol.asyncIterator]();\n    readableIterators.set(readable, iter);\n  }\n\n  return iter;\n}\n\n/**\n * Retrieves the next value from {@link Readable}, or throws an error if the Readable is done.\n *\n * Calling semantics are similar to {@link getReadableIterator}\n */\nexport async function readNextResult<T, E extends Static<BaseErrorSchemaType>>(\n  readable: Readable<T, E>,\n): Promise<ReadableResult<T, E>> {\n  const res = await getReadableIterator(readable).next();\n\n  if (res.done) {\n    throw new Error('readNext from a done Readable');\n  }\n\n  return res.value;\n}\n\n/**\n * Checks if the readable is done iterating, it consumes an iteration in the process.\n *\n * Calling semantics are similar to {@link getReadableIterator}\n */\nexport async function isReadableDone<T, E extends Static<BaseErrorSchemaType>>(\n  readable: Readable<T, E>,\n) {\n  const res = await getReadableIterator(readable).next();\n\n  return res.done;\n}\n\nexport function payloadToTransportMessage<Payload>(\n  payload: Payload,\n): PartialTransportMessage<Payload> {\n  return {\n    streamId: 'stream',\n    controlFlags: 0,\n    payload,\n  };\n}\n\nexport function createDummyTransportMessage() {\n  return payloadToTransportMessage({\n    msg: 'cool',\n    test: Math.random(),\n  });\n}\n\n/**\n * Waits for a message on the transport.\n * @param {Transport} t - The transport to listen to.\n * @param filter - An optional filter function to apply to the received messages.\n * @returns A promise that resolves with the payload of the first message that passes the filter.\n */\nexport async function waitForMessage(\n  t: Transport<Connection>,\n  filter?: (msg: OpaqueTransportMessage) => boolean,\n  rejectMismatch?: boolean,\n) {\n  return new Promise((resolve, reject) => {\n    function cleanup() {\n      t.removeEventListener('message', onMessage);\n    }\n\n    function onMessage(msg: OpaqueTransportMessage) {\n      if (!filter || filter(msg)) {\n        cleanup();\n        resolve(msg.payload);\n      } else if (rejectMismatch) {\n        cleanup();\n        reject(new Error('message didnt match the filter'));\n      }\n    }\n\n    t.addEventListener('message', onMessage);\n  });\n}\n\nfunction catchProcError(err: unknown) {\n  const errorMsg = coerceErrorString(err);\n\n  return Err({ code: UNCAUGHT_ERROR_CODE, message: errorMsg });\n}\n\nexport const testingSessionOptions = defaultTransportOptions;\nexport const testingClientSessionOptions = defaultClientTransportOptions;\n\nexport function dummySession() {\n  return SessionStateGraph.entrypoints.NoConnection(\n    'client',\n    'server',\n    {\n      onSessionGracePeriodElapsed: () => {\n        /* noop */\n      },\n    },\n    testingSessionOptions,\n    currentProtocolVersion,\n  );\n}\n\nexport function getClientSendFn(\n  clientTransport: ClientTransport<Connection>,\n  serverTransport: ServerTransport<Connection>,\n) {\n  const session =\n    clientTransport.sessions.get(serverTransport.clientId) ??\n    clientTransport.createUnconnectedSession(serverTransport.clientId);\n\n  return clientTransport.getSessionBoundSendFn(\n    serverTransport.clientId,\n    session.id,\n  );\n}\n\nexport function getServerSendFn(\n  serverTransport: ServerTransport<Connection>,\n  clientTransport: ClientTransport<Connection>,\n) {\n  const session = serverTransport.sessions.get(clientTransport.clientId);\n  if (!session) {\n    throw new Error('session not found');\n  }\n\n  return serverTransport.getSessionBoundSendFn(\n    clientTransport.clientId,\n    session.id,\n  );\n}\n\nfunction dummyCtx<State>(\n  state: State,\n  session: Session<Connection>,\n  extendedContext?: Omit<ServiceContext, 'state'>,\n): ProcedureHandlerContext<State> {\n  return {\n    ...extendedContext,\n    state,\n    sessionId: session.id,\n    from: session.from,\n    metadata: {},\n    // TODO might wanna hook these up!\n    cancel: () => undefined,\n    signal: new AbortController().signal,\n  };\n}\n\nexport function asClientRpc<\n  State extends object,\n  Init extends PayloadType,\n  Res extends PayloadType,\n  Err extends ProcedureErrorSchemaType,\n>(\n  state: State,\n  proc: Procedure<State, 'rpc', Init, null, Res, Err>,\n  extendedContext?: Omit<ServiceContext, 'state'>,\n  session: Session<Connection> = dummySession(),\n) {\n  return async (\n    msg: Static<Init>,\n  ): Promise<\n    Result<Static<Res>, Static<Err> | Static<typeof ReaderErrorSchema>>\n  > => {\n    return proc\n      .handler({\n        ctx: dummyCtx(state, session, extendedContext),\n        reqInit: msg,\n      })\n      .catch(catchProcError);\n  };\n}\n\nfunction createResponsePipe<\n  Res extends PayloadType,\n  Err extends ProcedureErrorSchemaType,\n>(): {\n  readable: Readable<\n    Static<Res>,\n    Static<Err> | Static<typeof ReaderErrorSchema>\n  >;\n  writable: Writable<Result<Static<Res>, Static<Err>>>;\n} {\n  const readable = new ReadableImpl<\n    Static<Res>,\n    Static<Err> | Static<typeof ReaderErrorSchema>\n  >();\n  const writable = new WritableImpl<Result<Static<Res>, Static<Err>>>({\n    writeCb: (v) => {\n      readable._pushValue(v);\n    },\n    closeCb: () => {\n      // Make it async to simulate request going over the wire\n      // using promises so that we don't get affected by fake timers.\n      void Promise.resolve().then(() => {\n        readable._triggerClose();\n      });\n    },\n  });\n\n  return { readable, writable };\n}\n\nfunction createRequestPipe<Req extends PayloadType>(): {\n  readable: Readable<Static<Req>, Static<typeof ReaderErrorSchema>>;\n  writable: Writable<Static<Req>>;\n} {\n  const readable = new ReadableImpl<\n    Static<Req>,\n    Static<typeof ReaderErrorSchema>\n  >();\n  const writable = new WritableImpl<Static<Req>>({\n    writeCb: (v) => {\n      readable._pushValue(Ok(v));\n    },\n    closeCb: () => {\n      // Make it async to simulate request going over the wire\n      // using promises so that we don't get affected by fake timers.\n      void Promise.resolve().then(() => {\n        readable._triggerClose();\n      });\n    },\n  });\n\n  return { readable, writable };\n}\n\nexport function asClientStream<\n  State extends object,\n  Init extends PayloadType,\n  Req extends PayloadType,\n  Res extends PayloadType,\n  Err extends ProcedureErrorSchemaType,\n>(\n  state: State,\n  proc: Procedure<State, 'stream', Init, Req, Res, Err>,\n  reqInit?: Static<Init>,\n  extendedContext?: Omit<ServiceContext, 'state'>,\n  session: Session<Connection> = dummySession(),\n): {\n  reqWritable: Writable<Static<Req>>;\n  resReadable: Readable<Static<Res>, Static<Err>>;\n} {\n  const requestPipe = createRequestPipe<Req>();\n  const responsePipe = createResponsePipe<Res, Err>();\n\n  void proc\n    .handler({\n      ctx: dummyCtx(state, session, extendedContext),\n      reqInit: reqInit ?? {},\n      reqReadable: requestPipe.readable,\n      resWritable: responsePipe.writable,\n    })\n    .catch((err: unknown) => responsePipe.writable.write(catchProcError(err)));\n\n  return {\n    reqWritable: requestPipe.writable,\n    resReadable: responsePipe.readable,\n  };\n}\n\nexport function asClientSubscription<\n  State extends object,\n  Init extends PayloadType,\n  Res extends PayloadType,\n  Err extends ProcedureErrorSchemaType,\n>(\n  state: State,\n  proc: Procedure<State, 'subscription', Init, null, Res, Err>,\n  extendedContext?: Omit<ServiceContext, 'state'>,\n  session: Session<Connection> = dummySession(),\n): (msg: Static<Init>) => {\n  resReadable: Readable<Static<Res>, Static<Err>>;\n} {\n  const responsePipe = createResponsePipe<Res, Err>();\n\n  return (msg: Static<Init>) => {\n    void proc\n      .handler({\n        ctx: dummyCtx(state, session, extendedContext),\n        reqInit: msg,\n        resWritable: responsePipe.writable,\n      })\n      .catch((err: unknown) =>\n        responsePipe.writable.write(catchProcError(err)),\n      );\n\n    return { resReadable: responsePipe.readable };\n  };\n}\n\nexport function asClientUpload<\n  State extends object,\n  Init extends PayloadType,\n  Req extends PayloadType,\n  Res extends PayloadType,\n  Err extends ProcedureErrorSchemaType,\n>(\n  state: State,\n  proc: Procedure<State, 'upload', Init, Req, Res, Err>,\n  reqInit?: Static<Init>,\n  extendedContext?: Omit<ServiceContext, 'state'>,\n  session: Session<Connection> = dummySession(),\n): {\n  reqWritable: Writable<Static<Req>>;\n  finalize: () => Promise<Result<Static<Res>, Static<Err>>>;\n} {\n  const requestPipe = createRequestPipe<Req>();\n  const result = proc\n    .handler({\n      ctx: dummyCtx(state, session, extendedContext),\n      reqInit: reqInit ?? {},\n      reqReadable: requestPipe.readable,\n    })\n    .catch(catchProcError);\n\n  return { reqWritable: requestPipe.writable, finalize: () => result };\n}\n\nexport function getTransportConnections<ConnType extends Connection>(\n  transport: Transport<ConnType>,\n): Array<ConnType> {\n  const connections = [];\n  for (const session of transport.sessions.values()) {\n    if (session.state === SessionState.Connected) {\n      connections.push(session.conn);\n    }\n  }\n\n  return connections;\n}\n\nexport function numberOfConnections<ConnType extends Connection>(\n  transport: Transport<ConnType>,\n): number {\n  return getTransportConnections(transport).length;\n}\n\nexport function closeAllConnections<ConnType extends Connection>(\n  transport: Transport<ConnType>,\n) {\n  for (const conn of getTransportConnections(transport)) {\n    conn.close();\n  }\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;;AAAA,OAAO,UAAU,uBAAuB;AA+CjC,SAAS,2BAA2B,MAAsB;AAC/D,QAAM,OAAO,IAAI,OAAO,kBAAkB,IAAI,EAAE;AAChD,OAAK,aAAa;AAElB,SAAO;AACT;AAQO,SAAS,sBAAsB,QAAqB;AACzD,SAAO,IAAI,gBAAgB,EAAE,OAAO,CAAC;AACvC;AASO,SAAS,gBAAgB,QAAsC;AACpE,SAAO,IAAI,QAAQ,CAAC,SAAS,WAAW;AACtC,WAAO,OAAO,MAAM;AAClB,YAAM,OAAO,OAAO,QAAQ;AAC5B,UAAI,OAAO,SAAS,YAAY,MAAM;AACpC,gBAAQ,KAAK,IAAI;AAAA,MACnB,OAAO;AACL,eAAO,IAAI,MAAM,kCAAkC,CAAC;AAAA,MACtD;AAAA,IACF,CAAC;AAAA,EACH,CAAC;AACH;AAEA,IAAM,oBAAoB,oBAAI,QAG5B;AASK,SAAS,oBACd,UACwB;AACxB,MAAI,OAAO,kBAAkB,IAAI,QAAQ;AAIzC,MAAI,CAAC,MAAM;AACT,WAAO,SAAS,OAAO,aAAa,EAAE;AACtC,sBAAkB,IAAI,UAAU,IAAI;AAAA,EACtC;AAEA,SAAO;AACT;AAOA,eAAsB,eACpB,UAC+B;AAC/B,QAAM,MAAM,MAAM,oBAAoB,QAAQ,EAAE,KAAK;AAErD,MAAI,IAAI,MAAM;AACZ,UAAM,IAAI,MAAM,+BAA+B;AAAA,EACjD;AAEA,SAAO,IAAI;AACb;AAOA,eAAsB,eACpB,UACA;AACA,QAAM,MAAM,MAAM,oBAAoB,QAAQ,EAAE,KAAK;AAErD,SAAO,IAAI;AACb;AAEO,SAAS,0BACd,SACkC;AAClC,SAAO;AAAA,IACL,UAAU;AAAA,IACV,cAAc;AAAA,IACd;AAAA,EACF;AACF;AAEO,SAAS,8BAA8B;AAC5C,SAAO,0BAA0B;AAAA,IAC/B,KAAK;AAAA,IACL,MAAM,KAAK,OAAO;AAAA,EACpB,CAAC;AACH;AAQA,eAAsB,eACpB,GACA,QACA,gBACA;AACA,SAAO,IAAI,QAAQ,CAAC,SAAS,WAAW;AACtC,aAAS,UAAU;AACjB,QAAE,oBAAoB,WAAW,SAAS;AAAA,IAC5C;AAEA,aAAS,UAAU,KAA6B;AAC9C,UAAI,CAAC,UAAU,OAAO,GAAG,GAAG;AAC1B,gBAAQ;AACR,gBAAQ,IAAI,OAAO;AAAA,MACrB,WAAW,gBAAgB;AACzB,gBAAQ;AACR,eAAO,IAAI,MAAM,gCAAgC,CAAC;AAAA,MACpD;AAAA,IACF;AAEA,MAAE,iBAAiB,WAAW,SAAS;AAAA,EACzC,CAAC;AACH;AAEA,SAAS,eAAe,KAAc;AACpC,QAAM,WAAW,kBAAkB,GAAG;AAEtC,SAAO,IAAI,EAAE,MAAM,qBAAqB,SAAS,SAAS,CAAC;AAC7D;AAEO,IAAM,wBAAwB;AAC9B,IAAM,8BAA8B;AAEpC,SAAS,eAAe;AAC7B,SAAO,kBAAkB,YAAY;AAAA,IACnC;AAAA,IACA;AAAA,IACA;AAAA,MACE,6BAA6B,MAAM;AAAA,MAEnC;AAAA,IACF;AAAA,IACA;AAAA,IACA;AAAA,EACF;AACF;AAEO,SAAS,gBACd,iBACA,iBACA;AACA,QAAM,UACJ,gBAAgB,SAAS,IAAI,gBAAgB,QAAQ,KACrD,gBAAgB,yBAAyB,gBAAgB,QAAQ;AAEnE,SAAO,gBAAgB;AAAA,IACrB,gBAAgB;AAAA,IAChB,QAAQ;AAAA,EACV;AACF;AAEO,SAAS,gBACd,iBACA,iBACA;AACA,QAAM,UAAU,gBAAgB,SAAS,IAAI,gBAAgB,QAAQ;AACrE,MAAI,CAAC,SAAS;AACZ,UAAM,IAAI,MAAM,mBAAmB;AAAA,EACrC;AAEA,SAAO,gBAAgB;AAAA,IACrB,gBAAgB;AAAA,IAChB,QAAQ;AAAA,EACV;AACF;AAEA,SAAS,SACP,OACA,SACA,iBACgC;AAChC,SAAO;AAAA,IACL,GAAG;AAAA,IACH;AAAA,IACA,WAAW,QAAQ;AAAA,IACnB,MAAM,QAAQ;AAAA,IACd,UAAU,CAAC;AAAA;AAAA,IAEX,QAAQ,MAAM;AAAA,IACd,QAAQ,IAAI,gBAAgB,EAAE;AAAA,EAChC;AACF;AAEO,SAAS,YAMd,OACA,MACA,iBACA,UAA+B,aAAa,GAC5C;AACA,SAAO,OACL,QAGG;AACH,WAAO,KACJ,QAAQ;AAAA,MACP,KAAK,SAAS,OAAO,SAAS,eAAe;AAAA,MAC7C,SAAS;AAAA,IACX,CAAC,EACA,MAAM,cAAc;AAAA,EACzB;AACF;AAEA,SAAS,qBASP;AACA,QAAM,WAAW,IAAI,aAGnB;AACF,QAAM,WAAW,IAAI,aAA+C;AAAA,IAClE,SAAS,CAAC,MAAM;AACd,eAAS,WAAW,CAAC;AAAA,IACvB;AAAA,IACA,SAAS,MAAM;AAGb,WAAK,QAAQ,QAAQ,EAAE,KAAK,MAAM;AAChC,iBAAS,cAAc;AAAA,MACzB,CAAC;AAAA,IACH;AAAA,EACF,CAAC;AAED,SAAO,EAAE,UAAU,SAAS;AAC9B;AAEA,SAAS,oBAGP;AACA,QAAM,WAAW,IAAI,aAGnB;AACF,QAAM,WAAW,IAAI,aAA0B;AAAA,IAC7C,SAAS,CAAC,MAAM;AACd,eAAS,WAAW,GAAG,CAAC,CAAC;AAAA,IAC3B;AAAA,IACA,SAAS,MAAM;AAGb,WAAK,QAAQ,QAAQ,EAAE,KAAK,MAAM;AAChC,iBAAS,cAAc;AAAA,MACzB,CAAC;AAAA,IACH;AAAA,EACF,CAAC;AAED,SAAO,EAAE,UAAU,SAAS;AAC9B;AAEO,SAAS,eAOd,OACA,MACA,SACA,iBACA,UAA+B,aAAa,GAI5C;AACA,QAAM,cAAc,kBAAuB;AAC3C,QAAM,eAAe,mBAA6B;AAElD,OAAK,KACF,QAAQ;AAAA,IACP,KAAK,SAAS,OAAO,SAAS,eAAe;AAAA,IAC7C,SAAS,WAAW,CAAC;AAAA,IACrB,aAAa,YAAY;AAAA,IACzB,aAAa,aAAa;AAAA,EAC5B,CAAC,EACA,MAAM,CAAC,QAAiB,aAAa,SAAS,MAAM,eAAe,GAAG,CAAC,CAAC;AAE3E,SAAO;AAAA,IACL,aAAa,YAAY;AAAA,IACzB,aAAa,aAAa;AAAA,EAC5B;AACF;AAEO,SAAS,qBAMd,OACA,MACA,iBACA,UAA+B,aAAa,GAG5C;AACA,QAAM,eAAe,mBAA6B;AAElD,SAAO,CAAC,QAAsB;AAC5B,SAAK,KACF,QAAQ;AAAA,MACP,KAAK,SAAS,OAAO,SAAS,eAAe;AAAA,MAC7C,SAAS;AAAA,MACT,aAAa,aAAa;AAAA,IAC5B,CAAC,EACA;AAAA,MAAM,CAAC,QACN,aAAa,SAAS,MAAM,eAAe,GAAG,CAAC;AAAA,IACjD;AAEF,WAAO,EAAE,aAAa,aAAa,SAAS;AAAA,EAC9C;AACF;AAEO,SAAS,eAOd,OACA,MACA,SACA,iBACA,UAA+B,aAAa,GAI5C;AACA,QAAM,cAAc,kBAAuB;AAC3C,QAAM,SAAS,KACZ,QAAQ;AAAA,IACP,KAAK,SAAS,OAAO,SAAS,eAAe;AAAA,IAC7C,SAAS,WAAW,CAAC;AAAA,IACrB,aAAa,YAAY;AAAA,EAC3B,CAAC,EACA,MAAM,cAAc;AAEvB,SAAO,EAAE,aAAa,YAAY,UAAU,UAAU,MAAM,OAAO;AACrE;AAEO,SAAS,wBACd,WACiB;AACjB,QAAM,cAAc,CAAC;AACrB,aAAW,WAAW,UAAU,SAAS,OAAO,GAAG;AACjD,QAAI,QAAQ,uCAAkC;AAC5C,kBAAY,KAAK,QAAQ,IAAI;AAAA,IAC/B;AAAA,EACF;AAEA,SAAO;AACT;AAEO,SAAS,oBACd,WACQ;AACR,SAAO,wBAAwB,SAAS,EAAE;AAC5C;AAEO,SAAS,oBACd,WACA;AACA,aAAW,QAAQ,wBAAwB,SAAS,GAAG;AACrD,SAAK,MAAM;AAAA,EACb;AACF;","names":[]}

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.200.0-rc.9",
+  "version": "0.200.2",
   "type": "module",
   "exports": {
     ".": {
@@ -60,17 +60,18 @@
     "@opentelemetry/core": "^1.7.0",
     "@opentelemetry/sdk-trace-base": "^1.24.1",
     "@opentelemetry/sdk-trace-web": "^1.24.1",
+    "@stylistic/eslint-plugin": "^2.6.4",
     "@types/ws": "^8.5.5",
     "@typescript-eslint/eslint-plugin": "^7.8.0",
     "@typescript-eslint/parser": "^7.8.0",
-    "@vitest/ui": "^1.3.1",
+    "@vitest/ui": "^2.0.5",
     "eslint": "^8.57.0",
     "eslint-config-prettier": "^9.1.0",
     "eslint-plugin-prettier": "^5.1.3",
     "prettier": "^3.0.0",
     "tsup": "^7.2.0",
     "typescript": "^5.4.5",
-    "vitest": "^1.3.1"
+    "vitest": "^2.0.5"
   },
   "scripts": {
     "check": "tsc --noEmit && npm run format && npm run lint",