@replit/river 0.17.2 → 0.17.4

package/dist/{chunk-F6KWMEPR.js → chunk-7WY3Z5ZN.js}

@@ -407,7 +407,6 @@ var Transport = class {
       log?.warn(
         `${this.clientId} -- connection from ${connectedTo} is a different session (id: ${advertisedSessionId}, last connected to: ${oldSession.advertisedSessionId}), starting a new session`
       );
-      oldSession.close();
       this.deleteSession(oldSession);
       oldSession = void 0;
     }
@@ -452,6 +451,7 @@ var Transport = class {
     return session;
   }
   deleteSession(session) {
+    session.close();
     this.sessions.delete(session.to);
     log?.info(
       `${this.clientId} -- session ${session.id} disconnect from ${session.to}`
@@ -599,7 +599,6 @@ var Transport = class {
   close() {
     this.state = "closed";
     for (const session of this.sessions.values()) {
-      session.close();
       this.deleteSession(session);
     }
     log?.info(`${this.clientId} -- manually closed transport`);
@@ -612,7 +611,6 @@ var Transport = class {
   destroy() {
     this.state = "destroyed";
     for (const session of this.sessions.values()) {
-      session.close();
       this.deleteSession(session);
     }
     log?.info(`${this.clientId} -- manually destroyed transport`);
@@ -793,6 +791,10 @@ var ClientTransport = class extends Transport {
       }
     }
   }
+  deleteSession(session) {
+    this.inflightConnectionPromises.delete(session.to);
+    super.deleteSession(session);
+  }
   sendHandshake(to, conn) {
     const session = this.getOrCreateSession(to, conn);
     const requestMsg = handshakeRequestMessage(this.clientId, to, session.id);

package/dist/{chunk-MSAS5CVJ.js → chunk-F3LFO3GU.js}

@@ -1,6 +1,6 @@
 import {
   Connection
-} from "./chunk-F6KWMEPR.js";
+} from "./chunk-7WY3Z5ZN.js";
 
 // transport/impls/ws/connection.ts
 var WebSocketConnection = class extends Connection {

package/dist/{chunk-4A7FDC2C.js → chunk-Q7OSVPZ5.js}

@@ -1,6 +1,6 @@
 import {
   Connection
-} from "./chunk-F6KWMEPR.js";
+} from "./chunk-7WY3Z5ZN.js";
 
 // transport/transforms/messageFraming.ts
 import { Transform } from "node:stream";

package/dist/{connection-0767dc6b.d.ts → connection-bdbd20da.d.ts}

@@ -1,4 +1,4 @@
-import { C as Connection } from './index-8df0bdfb.js';
+import { C as Connection } from './index-9e300e8a.js';
 import { Socket } from 'node:net';
 import stream, { Transform, TransformCallback, TransformOptions } from 'node:stream';
 

package/dist/{connection-f31edbcd.d.ts → connection-c4a17403.d.ts}

@@ -1,5 +1,5 @@
 import WebSocket from 'isomorphic-ws';
-import { C as Connection } from './index-8df0bdfb.js';
+import { C as Connection } from './index-9e300e8a.js';
 
 declare class WebSocketConnection extends Connection {
     ws: WebSocket;

package/dist/{index-8df0bdfb.d.ts → index-9e300e8a.d.ts}

@@ -489,6 +489,7 @@ declare abstract class ClientTransport<ConnType extends Connection> extends Tran
      * @param to The client ID of the node to connect to.
      */
     connect(to: TransportClientId): Promise<void>;
+    protected deleteSession(session: Session<ConnType>): void;
     protected sendHandshake(to: TransportClientId, conn: ConnType): void;
     close(): void;
 }
@@ -498,4 +499,4 @@ declare abstract class ServerTransport<ConnType extends Connection> extends Tran
     receiveHandshakeRequestMessage(data: Uint8Array, conn: ConnType): Session<ConnType> | false;
 }
 
-export { Connection as C, EventMap as E, OpaqueTransportMessage as O, PartialTransportMessage as P, SessionOptions as S, Transport as T, ClientTransport as a, TransportClientId as b, ProvidedClientTransportOptions as c, ServerTransport as d, ProvidedTransportOptions as e, Session as f, TransportStatus as g, TransportMessageSchema as h, OpaqueTransportMessageSchema as i, TransportMessage as j, isStreamOpen as k, isStreamClose as l, EventTypes as m, EventHandler as n, ProtocolError as o, ProtocolErrorType as p };
+export { Connection as C, EventMap as E, OpaqueTransportMessage as O, PartialTransportMessage as P, SessionOptions as S, Transport as T, Session as a, ClientTransport as b, TransportClientId as c, ProvidedClientTransportOptions as d, ServerTransport as e, ProvidedTransportOptions as f, TransportStatus as g, TransportMessageSchema as h, OpaqueTransportMessageSchema as i, TransportMessage as j, isStreamOpen as k, isStreamClose as l, EventTypes as m, EventHandler as n, ProtocolError as o, ProtocolErrorType as p };

package/dist/{procedures-1a298406.d.ts → procedures-1c0d2eee.d.ts}

@@ -1,6 +1,6 @@
 import { TObject, TUnion, TString, TSchema, TNever, TLiteral, Static } from '@sinclair/typebox';
 import { Pushable } from 'it-pushable';
-import { b as TransportClientId, f as Session, C as Connection } from './index-8df0bdfb.js';
+import { c as TransportClientId, a as Session, C as Connection } from './index-9e300e8a.js';
 
 type TLiteralString = TLiteral<string>;
 type RiverErrorSchema = TObject<{

package/dist/router/index.d.cts

@@ -1,7 +1,7 @@
 import { TUnion, Static } from '@sinclair/typebox';
-import { e as ProcedureMap, P as PayloadType, c as RiverUncaughtSchema, U as Unbranded, B as Branded, A as AnyProcedure, R as RiverError, b as Result, S as ServiceContext } from '../procedures-1a298406.js';
-export { E as Err, O as Ok, a as Procedure, d as ProcedureResult, f as RPCProcedure, m as RiverErrorSchema, j as ServiceContextWithState, k as ServiceContextWithTransportInfo, i as StreamProcedure, h as SubscriptionProcedure, l as UNCAUGHT_ERROR, g as UploadProcedure, V as ValidProcType } from '../procedures-1a298406.js';
-import { d as ServerTransport, C as Connection, a as ClientTransport, b as TransportClientId } from '../index-8df0bdfb.js';
+import { e as ProcedureMap, P as PayloadType, c as RiverUncaughtSchema, U as Unbranded, B as Branded, A as AnyProcedure, R as RiverError, b as Result, S as ServiceContext } from '../procedures-1c0d2eee.js';
+export { E as Err, O as Ok, a as Procedure, d as ProcedureResult, f as RPCProcedure, m as RiverErrorSchema, j as ServiceContextWithState, k as ServiceContextWithTransportInfo, i as StreamProcedure, h as SubscriptionProcedure, l as UNCAUGHT_ERROR, g as UploadProcedure, V as ValidProcType } from '../procedures-1c0d2eee.js';
+import { e as ServerTransport, C as Connection, b as ClientTransport, c as TransportClientId } from '../index-9e300e8a.js';
 import { Pushable } from 'it-pushable';
 import '../types-3e5768ec.js';
 

package/dist/router/index.d.ts

@@ -1,7 +1,7 @@
 import { TUnion, Static } from '@sinclair/typebox';
-import { e as ProcedureMap, P as PayloadType, c as RiverUncaughtSchema, U as Unbranded, B as Branded, A as AnyProcedure, R as RiverError, b as Result, S as ServiceContext } from '../procedures-1a298406.js';
-export { E as Err, O as Ok, a as Procedure, d as ProcedureResult, f as RPCProcedure, m as RiverErrorSchema, j as ServiceContextWithState, k as ServiceContextWithTransportInfo, i as StreamProcedure, h as SubscriptionProcedure, l as UNCAUGHT_ERROR, g as UploadProcedure, V as ValidProcType } from '../procedures-1a298406.js';
-import { d as ServerTransport, C as Connection, a as ClientTransport, b as TransportClientId } from '../index-8df0bdfb.js';
+import { e as ProcedureMap, P as PayloadType, c as RiverUncaughtSchema, U as Unbranded, B as Branded, A as AnyProcedure, R as RiverError, b as Result, S as ServiceContext } from '../procedures-1c0d2eee.js';
+export { E as Err, O as Ok, a as Procedure, d as ProcedureResult, f as RPCProcedure, m as RiverErrorSchema, j as ServiceContextWithState, k as ServiceContextWithTransportInfo, i as StreamProcedure, h as SubscriptionProcedure, l as UNCAUGHT_ERROR, g as UploadProcedure, V as ValidProcType } from '../procedures-1c0d2eee.js';
+import { e as ServerTransport, C as Connection, b as ClientTransport, c as TransportClientId } from '../index-9e300e8a.js';
 import { Pushable } from 'it-pushable';
 import '../types-3e5768ec.js';
 

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

@@ -644,7 +644,6 @@ var Transport = class {
       log?.warn(
         `${this.clientId} -- connection from ${connectedTo} is a different session (id: ${advertisedSessionId}, last connected to: ${oldSession.advertisedSessionId}), starting a new session`
       );
-      oldSession.close();
       this.deleteSession(oldSession);
       oldSession = void 0;
     }
@@ -689,6 +688,7 @@ var Transport = class {
     return session;
   }
   deleteSession(session) {
+    session.close();
     this.sessions.delete(session.to);
     log?.info(
       `${this.clientId} -- session ${session.id} disconnect from ${session.to}`
@@ -836,7 +836,6 @@ var Transport = class {
   close() {
     this.state = "closed";
     for (const session of this.sessions.values()) {
-      session.close();
       this.deleteSession(session);
     }
     log?.info(`${this.clientId} -- manually closed transport`);
@@ -849,7 +848,6 @@ var Transport = class {
   destroy() {
     this.state = "destroyed";
     for (const session of this.sessions.values()) {
-      session.close();
       this.deleteSession(session);
     }
     log?.info(`${this.clientId} -- manually destroyed transport`);
@@ -1030,6 +1028,10 @@ var ClientTransport = class extends Transport {
       }
     }
   }
+  deleteSession(session) {
+    this.inflightConnectionPromises.delete(session.to);
+    super.deleteSession(session);
+  }
   sendHandshake(to, conn) {
     const session = this.getOrCreateSession(to, conn);
     const requestMsg = handshakeRequestMessage(this.clientId, to, session.id);

package/dist/transport/impls/uds/client.d.cts

@@ -1,5 +1,5 @@
-import { a as ClientTransport, c as ProvidedClientTransportOptions, b as TransportClientId } from '../../../index-8df0bdfb.js';
-import { U as UdsConnection } from '../../../connection-0767dc6b.js';
+import { b as ClientTransport, d as ProvidedClientTransportOptions, c as TransportClientId } from '../../../index-9e300e8a.js';
+import { U as UdsConnection } from '../../../connection-bdbd20da.js';
 import '../../../types-3e5768ec.js';
 import '@sinclair/typebox';
 import 'node:net';

package/dist/transport/impls/uds/client.d.ts

@@ -1,5 +1,5 @@
-import { a as ClientTransport, c as ProvidedClientTransportOptions, b as TransportClientId } from '../../../index-8df0bdfb.js';
-import { U as UdsConnection } from '../../../connection-0767dc6b.js';
+import { b as ClientTransport, d as ProvidedClientTransportOptions, c as TransportClientId } from '../../../index-9e300e8a.js';
+import { U as UdsConnection } from '../../../connection-bdbd20da.js';
 import '../../../types-3e5768ec.js';
 import '@sinclair/typebox';
 import 'node:net';

package/dist/transport/impls/uds/client.js

@@ -1,9 +1,9 @@
 import {
   UdsConnection
-} from "../../../chunk-4A7FDC2C.js";
+} from "../../../chunk-Q7OSVPZ5.js";
 import {
   ClientTransport
-} from "../../../chunk-F6KWMEPR.js";
+} from "../../../chunk-7WY3Z5ZN.js";
 import "../../../chunk-VH3NGOXQ.js";
 import {
   log

package/dist/transport/impls/uds/server.cjs

@@ -24,9 +24,6 @@ __export(server_exports, {
 });
 module.exports = __toCommonJS(server_exports);
 
-// logging/index.ts
-var log;
-
 // transport/transport.ts
 var import_value = require("@sinclair/typebox/value");
 
@@ -98,6 +95,9 @@ function isAck(controlFlag) {
   return (controlFlag & 1 /* AckBit */) === 1 /* AckBit */;
 }
 
+// logging/index.ts
+var log;
+
 // transport/events.ts
 var ProtocolError = {
   RetriesExceeded: "conn_retry_exceeded",
@@ -476,7 +476,6 @@ var Transport = class {
       log?.warn(
         `${this.clientId} -- connection from ${connectedTo} is a different session (id: ${advertisedSessionId}, last connected to: ${oldSession.advertisedSessionId}), starting a new session`
       );
-      oldSession.close();
       this.deleteSession(oldSession);
       oldSession = void 0;
     }
@@ -521,6 +520,7 @@ var Transport = class {
     return session;
   }
   deleteSession(session) {
+    session.close();
     this.sessions.delete(session.to);
     log?.info(
       `${this.clientId} -- session ${session.id} disconnect from ${session.to}`
@@ -668,7 +668,6 @@ var Transport = class {
   close() {
     this.state = "closed";
     for (const session of this.sessions.values()) {
-      session.close();
       this.deleteSession(session);
     }
     log?.info(`${this.clientId} -- manually closed transport`);
@@ -681,7 +680,6 @@ var Transport = class {
   destroy() {
     this.state = "destroyed";
     for (const session of this.sessions.values()) {
-      session.close();
       this.deleteSession(session);
     }
     log?.info(`${this.clientId} -- manually destroyed transport`);
@@ -887,9 +885,6 @@ var UnixDomainSocketServerTransport = class extends ServerTransport {
     super(clientId, providedOptions);
     this.server = server;
     server.addListener("connection", this.connectionHandler);
-    server.on("listening", () => {
-      log?.info(`${this.clientId} -- server is listening`);
-    });
   }
   connectionHandler = (sock) => {
     const conn = new UdsConnection(sock);

package/dist/transport/impls/uds/server.d.cts

@@ -1,6 +1,6 @@
 import { Server, Socket } from 'node:net';
-import { d as ServerTransport, b as TransportClientId, e as ProvidedTransportOptions } from '../../../index-8df0bdfb.js';
-import { U as UdsConnection } from '../../../connection-0767dc6b.js';
+import { e as ServerTransport, c as TransportClientId, f as ProvidedTransportOptions } from '../../../index-9e300e8a.js';
+import { U as UdsConnection } from '../../../connection-bdbd20da.js';
 import '../../../types-3e5768ec.js';
 import '@sinclair/typebox';
 import 'node:stream';

package/dist/transport/impls/uds/server.d.ts

@@ -1,6 +1,6 @@
 import { Server, Socket } from 'node:net';
-import { d as ServerTransport, b as TransportClientId, e as ProvidedTransportOptions } from '../../../index-8df0bdfb.js';
-import { U as UdsConnection } from '../../../connection-0767dc6b.js';
+import { e as ServerTransport, c as TransportClientId, f as ProvidedTransportOptions } from '../../../index-9e300e8a.js';
+import { U as UdsConnection } from '../../../connection-bdbd20da.js';
 import '../../../types-3e5768ec.js';
 import '@sinclair/typebox';
 import 'node:stream';

package/dist/transport/impls/uds/server.js

@@ -1,13 +1,11 @@
 import {
   UdsConnection
-} from "../../../chunk-4A7FDC2C.js";
+} from "../../../chunk-Q7OSVPZ5.js";
 import {
   ServerTransport
-} from "../../../chunk-F6KWMEPR.js";
+} from "../../../chunk-7WY3Z5ZN.js";
 import "../../../chunk-VH3NGOXQ.js";
-import {
-  log
-} from "../../../chunk-H4BYJELI.js";
+import "../../../chunk-H4BYJELI.js";
 import "../../../chunk-GZ7HCLLM.js";
 
 // transport/impls/uds/server.ts
@@ -17,9 +15,6 @@ var UnixDomainSocketServerTransport = class extends ServerTransport {
     super(clientId, providedOptions);
     this.server = server;
     server.addListener("connection", this.connectionHandler);
-    server.on("listening", () => {
-      log?.info(`${this.clientId} -- server is listening`);
-    });
   }
   connectionHandler = (sock) => {
     const conn = new UdsConnection(sock);

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

@@ -548,7 +548,6 @@ var Transport = class {
       log?.warn(
         `${this.clientId} -- connection from ${connectedTo} is a different session (id: ${advertisedSessionId}, last connected to: ${oldSession.advertisedSessionId}), starting a new session`
       );
-      oldSession.close();
       this.deleteSession(oldSession);
       oldSession = void 0;
     }
@@ -593,6 +592,7 @@ var Transport = class {
     return session;
   }
   deleteSession(session) {
+    session.close();
     this.sessions.delete(session.to);
     log?.info(
       `${this.clientId} -- session ${session.id} disconnect from ${session.to}`
@@ -740,7 +740,6 @@ var Transport = class {
   close() {
     this.state = "closed";
     for (const session of this.sessions.values()) {
-      session.close();
       this.deleteSession(session);
     }
     log?.info(`${this.clientId} -- manually closed transport`);
@@ -753,7 +752,6 @@ var Transport = class {
   destroy() {
     this.state = "destroyed";
     for (const session of this.sessions.values()) {
-      session.close();
       this.deleteSession(session);
     }
     log?.info(`${this.clientId} -- manually destroyed transport`);
@@ -934,6 +932,10 @@ var ClientTransport = class extends Transport {
       }
     }
   }
+  deleteSession(session) {
+    this.inflightConnectionPromises.delete(session.to);
+    super.deleteSession(session);
+  }
   sendHandshake(to, conn) {
     const session = this.getOrCreateSession(to, conn);
     const requestMsg = handshakeRequestMessage(this.clientId, to, session.id);

package/dist/transport/impls/ws/client.d.cts

@@ -1,6 +1,6 @@
 import WebSocket from 'isomorphic-ws';
-import { a as ClientTransport, b as TransportClientId, c as ProvidedClientTransportOptions } from '../../../index-8df0bdfb.js';
-import { W as WebSocketConnection } from '../../../connection-f31edbcd.js';
+import { b as ClientTransport, c as TransportClientId, d as ProvidedClientTransportOptions } from '../../../index-9e300e8a.js';
+import { W as WebSocketConnection } from '../../../connection-c4a17403.js';
 import '../../../types-3e5768ec.js';
 import '@sinclair/typebox';
 

package/dist/transport/impls/ws/client.d.ts

@@ -1,6 +1,6 @@
 import WebSocket from 'isomorphic-ws';
-import { a as ClientTransport, b as TransportClientId, c as ProvidedClientTransportOptions } from '../../../index-8df0bdfb.js';
-import { W as WebSocketConnection } from '../../../connection-f31edbcd.js';
+import { b as ClientTransport, c as TransportClientId, d as ProvidedClientTransportOptions } from '../../../index-9e300e8a.js';
+import { W as WebSocketConnection } from '../../../connection-c4a17403.js';
 import '../../../types-3e5768ec.js';
 import '@sinclair/typebox';
 

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

@@ -1,9 +1,9 @@
 import {
   WebSocketConnection
-} from "../../../chunk-MSAS5CVJ.js";
+} from "../../../chunk-F3LFO3GU.js";
 import {
   ClientTransport
-} from "../../../chunk-F6KWMEPR.js";
+} from "../../../chunk-7WY3Z5ZN.js";
 import "../../../chunk-VH3NGOXQ.js";
 import {
   log

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

@@ -476,7 +476,6 @@ var Transport = class {
       log?.warn(
         `${this.clientId} -- connection from ${connectedTo} is a different session (id: ${advertisedSessionId}, last connected to: ${oldSession.advertisedSessionId}), starting a new session`
       );
-      oldSession.close();
       this.deleteSession(oldSession);
       oldSession = void 0;
     }
@@ -521,6 +520,7 @@ var Transport = class {
     return session;
   }
   deleteSession(session) {
+    session.close();
     this.sessions.delete(session.to);
     log?.info(
       `${this.clientId} -- session ${session.id} disconnect from ${session.to}`
@@ -668,7 +668,6 @@ var Transport = class {
   close() {
     this.state = "closed";
     for (const session of this.sessions.values()) {
-      session.close();
       this.deleteSession(session);
     }
     log?.info(`${this.clientId} -- manually closed transport`);
@@ -681,7 +680,6 @@ var Transport = class {
   destroy() {
     this.state = "destroyed";
     for (const session of this.sessions.values()) {
-      session.close();
       this.deleteSession(session);
     }
     log?.info(`${this.clientId} -- manually destroyed transport`);

package/dist/transport/impls/ws/server.d.cts

@@ -1,7 +1,7 @@
-import { d as ServerTransport, b as TransportClientId, e as ProvidedTransportOptions } from '../../../index-8df0bdfb.js';
+import { e as ServerTransport, c as TransportClientId, f as ProvidedTransportOptions } from '../../../index-9e300e8a.js';
 import { WebSocketServer } from 'ws';
 import { WebSocket } from 'isomorphic-ws';
-import { W as WebSocketConnection } from '../../../connection-f31edbcd.js';
+import { W as WebSocketConnection } from '../../../connection-c4a17403.js';
 import '../../../types-3e5768ec.js';
 import '@sinclair/typebox';
 

package/dist/transport/impls/ws/server.d.ts

@@ -1,7 +1,7 @@
-import { d as ServerTransport, b as TransportClientId, e as ProvidedTransportOptions } from '../../../index-8df0bdfb.js';
+import { e as ServerTransport, c as TransportClientId, f as ProvidedTransportOptions } from '../../../index-9e300e8a.js';
 import { WebSocketServer } from 'ws';
 import { WebSocket } from 'isomorphic-ws';
-import { W as WebSocketConnection } from '../../../connection-f31edbcd.js';
+import { W as WebSocketConnection } from '../../../connection-c4a17403.js';
 import '../../../types-3e5768ec.js';
 import '@sinclair/typebox';
 

package/dist/transport/impls/ws/server.js

@@ -1,9 +1,9 @@
 import {
   WebSocketConnection
-} from "../../../chunk-MSAS5CVJ.js";
+} from "../../../chunk-F3LFO3GU.js";
 import {
   ServerTransport
-} from "../../../chunk-F6KWMEPR.js";
+} from "../../../chunk-7WY3Z5ZN.js";
 import "../../../chunk-VH3NGOXQ.js";
 import "../../../chunk-H4BYJELI.js";
 import "../../../chunk-GZ7HCLLM.js";

package/dist/transport/index.cjs

@@ -570,7 +570,6 @@ var Transport = class {
       log?.warn(
         `${this.clientId} -- connection from ${connectedTo} is a different session (id: ${advertisedSessionId}, last connected to: ${oldSession.advertisedSessionId}), starting a new session`
       );
-      oldSession.close();
       this.deleteSession(oldSession);
       oldSession = void 0;
     }
@@ -615,6 +614,7 @@ var Transport = class {
     return session;
   }
   deleteSession(session) {
+    session.close();
     this.sessions.delete(session.to);
     log?.info(
       `${this.clientId} -- session ${session.id} disconnect from ${session.to}`
@@ -762,7 +762,6 @@ var Transport = class {
   close() {
     this.state = "closed";
     for (const session of this.sessions.values()) {
-      session.close();
       this.deleteSession(session);
     }
     log?.info(`${this.clientId} -- manually closed transport`);
@@ -775,7 +774,6 @@ var Transport = class {
   destroy() {
     this.state = "destroyed";
     for (const session of this.sessions.values()) {
-      session.close();
       this.deleteSession(session);
     }
     log?.info(`${this.clientId} -- manually destroyed transport`);
@@ -956,6 +954,10 @@ var ClientTransport = class extends Transport {
       }
     }
   }
+  deleteSession(session) {
+    this.inflightConnectionPromises.delete(session.to);
+    super.deleteSession(session);
+  }
   sendHandshake(to, conn) {
     const session = this.getOrCreateSession(to, conn);
     const requestMsg = handshakeRequestMessage(this.clientId, to, session.id);

package/dist/transport/index.d.cts

@@ -1,3 +1,3 @@
-export { a as ClientTransport, c as ClientTransportOptions, C as Connection, n as EventHandler, E as EventMap, m as EventTypes, O as OpaqueTransportMessage, i as OpaqueTransportMessageSchema, o as ProtocolError, p as ProtocolErrorType, d as ServerTransport, f as Session, T as Transport, b as TransportClientId, j as TransportMessage, h as TransportMessageSchema, e as TransportOptions, g as TransportStatus, l as isStreamClose, k as isStreamOpen } from '../index-8df0bdfb.js';
+export { b as ClientTransport, d as ClientTransportOptions, C as Connection, n as EventHandler, E as EventMap, m as EventTypes, O as OpaqueTransportMessage, i as OpaqueTransportMessageSchema, o as ProtocolError, p as ProtocolErrorType, e as ServerTransport, a as Session, T as Transport, c as TransportClientId, j as TransportMessage, h as TransportMessageSchema, f as TransportOptions, g as TransportStatus, l as isStreamClose, k as isStreamOpen } from '../index-9e300e8a.js';
 import '../types-3e5768ec.js';
 import '@sinclair/typebox';

package/dist/transport/index.d.ts

@@ -1,3 +1,3 @@
-export { a as ClientTransport, c as ClientTransportOptions, C as Connection, n as EventHandler, E as EventMap, m as EventTypes, O as OpaqueTransportMessage, i as OpaqueTransportMessageSchema, o as ProtocolError, p as ProtocolErrorType, d as ServerTransport, f as Session, T as Transport, b as TransportClientId, j as TransportMessage, h as TransportMessageSchema, e as TransportOptions, g as TransportStatus, l as isStreamClose, k as isStreamOpen } from '../index-8df0bdfb.js';
+export { b as ClientTransport, d as ClientTransportOptions, C as Connection, n as EventHandler, E as EventMap, m as EventTypes, O as OpaqueTransportMessage, i as OpaqueTransportMessageSchema, o as ProtocolError, p as ProtocolErrorType, e as ServerTransport, a as Session, T as Transport, c as TransportClientId, j as TransportMessage, h as TransportMessageSchema, f as TransportOptions, g as TransportStatus, l as isStreamClose, k as isStreamOpen } from '../index-9e300e8a.js';
 import '../types-3e5768ec.js';
 import '@sinclair/typebox';

package/dist/transport/index.js

@@ -6,7 +6,7 @@ import {
   ServerTransport,
   Session,
   Transport
-} from "../chunk-F6KWMEPR.js";
+} from "../chunk-7WY3Z5ZN.js";
 import {
   OpaqueTransportMessageSchema,
   TransportMessageSchema

package/dist/util/testHelpers.cjs

@@ -696,28 +696,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 +727,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,6 +1,6 @@
 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-1a298406.js';
-import { P as PartialTransportMessage, T as Transport, C as Connection, O as OpaqueTransportMessage, S as SessionOptions } from '../index-8df0bdfb.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-1c0d2eee.js';
+import { P as PartialTransportMessage, T as Transport, C as Connection, O as OpaqueTransportMessage, S as SessionOptions, a as Session } from '../index-9e300e8a.js';
 import * as it_pushable from 'it-pushable';
 import WebSocket from 'isomorphic-ws';
 import http from 'node:http';
@@ -49,10 +49,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,6 +1,6 @@
 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-1a298406.js';
-import { P as PartialTransportMessage, T as Transport, C as Connection, O as OpaqueTransportMessage, S as SessionOptions } from '../index-8df0bdfb.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-1c0d2eee.js';
+import { P as PartialTransportMessage, T as Transport, C as Connection, O as OpaqueTransportMessage, S as SessionOptions, a as Session } from '../index-9e300e8a.js';
 import * as it_pushable from 'it-pushable';
 import WebSocket from 'isomorphic-ws';
 import http from 'node:http';
@@ -49,10 +49,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

@@ -6,7 +6,7 @@ import "../chunk-RPIDSIQG.js";
 import {
   Session,
   defaultTransportOptions
-} from "../chunk-F6KWMEPR.js";
+} from "../chunk-7WY3Z5ZN.js";
 import {
   coerceErrorString
 } from "../chunk-VH3NGOXQ.js";
@@ -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.2",
+  "version": "0.17.4",
   "type": "module",
   "exports": {
     ".": {
@@ -82,7 +82,7 @@
     "release": "npm publish --access public",
     "test:ui": "echo \"remember to go to /__vitest__ in the webview\" && vitest --ui --api.host 0.0.0.0 --api.port 3000",
     "test": "vitest --test-timeout=500",
-    "test:single": "vitest run --test-timeout=500",
+    "test:single": "vitest run --test-timeout=500 --reporter=dot",
     "test:flake": "./flake.sh",
     "bench": "vitest bench"
   },