@replit/river 0.17.1 → 0.17.3

package/dist/{chunk-7IQO434V.js → chunk-4C2OXQJB.js}

@@ -111,7 +111,9 @@ var ServiceSchema = class _ServiceSchema {
           {
             input: Type.Strict(procDef.input),
             output: Type.Strict(procDef.output),
-            // Only add the `errors` field if it is non-never.
+            // Only add `description` field if the type declares it.
+            ..."description" in procDef ? { description: procDef.description } : {},
+            // Only add the `errors` field if the type declares it.
             ..."errors" in procDef ? {
               errors: Type.Strict(procDef.errors)
             } : {},
@@ -201,35 +203,83 @@ function rpc({
   input,
   output,
   errors = Type2.Never(),
+  description,
   handler
 }) {
-  return { type: "rpc", input, output, errors, handler };
+  return {
+    ...description ? { description } : {},
+    type: "rpc",
+    input,
+    output,
+    errors,
+    handler
+  };
 }
 function upload({
   init,
   input,
   output,
   errors = Type2.Never(),
+  description,
   handler
 }) {
-  return init !== void 0 && init !== null ? { type: "upload", init, input, output, errors, handler } : { type: "upload", input, output, errors, handler };
+  return init !== void 0 && init !== null ? {
+    type: "upload",
+    ...description ? { description } : {},
+    init,
+    input,
+    output,
+    errors,
+    handler
+  } : {
+    type: "upload",
+    ...description ? { description } : {},
+    input,
+    output,
+    errors,
+    handler
+  };
 }
 function subscription({
   input,
   output,
   errors = Type2.Never(),
+  description,
   handler
 }) {
-  return { type: "subscription", input, output, errors, handler };
+  return {
+    type: "subscription",
+    ...description ? { description } : {},
+    input,
+    output,
+    errors,
+    handler
+  };
 }
 function stream({
   init,
   input,
   output,
   errors = Type2.Never(),
+  description,
   handler
 }) {
-  return init !== void 0 && init !== null ? { type: "stream", init, input, output, errors, handler } : { type: "stream", input, output, errors, handler };
+  return init !== void 0 && init !== null ? {
+    type: "stream",
+    ...description ? { description } : {},
+    init,
+    input,
+    output,
+    errors,
+    handler
+  } : {
+    type: "stream",
+    ...description ? { description } : {},
+    input,
+    output,
+    errors,
+    handler
+  };
 }
 var Procedure = {
   rpc,
@@ -858,6 +908,7 @@ function handleUpload(transport, serverId, init, serviceName, procedureName) {
 import { Value } from "@sinclair/typebox/value";
 var RiverServer = class {
   transport;
+  serviceDefs;
   services;
   contextMap;
   // map of streamId to ProcStream
@@ -866,6 +917,7 @@ var RiverServer = class {
   clientStreams;
   disconnectedSessions;
   constructor(transport, services, extendedContext) {
+    this.serviceDefs = services;
     const instances = {};
     this.services = instances;
     this.contextMap = /* @__PURE__ */ new Map();
@@ -887,6 +939,15 @@ var RiverServer = class {
   get streams() {
     return this.streamMap;
   }
+  serialize() {
+    return Object.entries(this.serviceDefs).reduce(
+      (acc, [name, value]) => {
+        acc[name] = value.serialize();
+        return acc;
+      },
+      {}
+    );
+  }
   onMessage = async (message) => {
     if (message.to !== this.transport.clientId) {
       log?.info(

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-713c8c66.d.ts}

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

package/dist/{connection-f31edbcd.d.ts → connection-b79329de.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-80f87385.js';
 
 declare class WebSocketConnection extends Connection {
     ws: WebSocket;

package/dist/{index-8df0bdfb.d.ts → index-80f87385.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;
 }

package/dist/{procedures-b5ddb54d.d.ts → procedures-79a5f07e.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 { b as TransportClientId, f as Session, C as Connection } from './index-80f87385.js';
 
 type TLiteralString = TLiteral<string>;
 type RiverErrorSchema = TObject<{
@@ -83,7 +83,7 @@ type ValidProcType = 'rpc' | 'upload' | 'subscription' | 'stream';
 /**
  * Represents the payload type for {@link Procedure}s.
  */
-type PayloadType = TObject | TUnion<Array<TObject>>;
+type PayloadType = TSchema;
 /**
  * Represents results from a {@link Procedure}. Might come from inside a stream or
  * from a single message.
@@ -102,6 +102,7 @@ interface RPCProcedure<State, I extends PayloadType, O extends PayloadType, E ex
     input: I;
     output: O;
     errors: E;
+    description?: string;
     handler(context: ServiceContextWithTransportInfo<State>, input: Static<I>): Promise<ProcedureResult<O, E>>;
 }
 /**
@@ -120,12 +121,14 @@ type UploadProcedure<State, I extends PayloadType, O extends PayloadType, E exte
     input: I;
     output: O;
     errors: E;
+    description?: string;
     handler(context: ServiceContextWithTransportInfo<State>, init: Static<Init>, input: AsyncIterableIterator<Static<I>>): Promise<ProcedureResult<O, E>>;
 } : {
     type: 'upload';
     input: I;
     output: O;
     errors: E;
+    description?: string;
     handler(context: ServiceContextWithTransportInfo<State>, input: AsyncIterableIterator<Static<I>>): Promise<ProcedureResult<O, E>>;
 };
 /**
@@ -141,6 +144,7 @@ interface SubscriptionProcedure<State, I extends PayloadType, O extends PayloadT
     input: I;
     output: O;
     errors: E;
+    description?: string;
     handler(context: ServiceContextWithTransportInfo<State>, input: Static<I>, output: Pushable<ProcedureResult<O, E>>): Promise<(() => void) | void>;
 }
 /**
@@ -159,12 +163,14 @@ type StreamProcedure<State, I extends PayloadType, O extends PayloadType, E exte
     input: I;
     output: O;
     errors: E;
+    description?: string;
     handler(context: ServiceContextWithTransportInfo<State>, init: Static<Init>, input: AsyncIterableIterator<Static<I>>, output: Pushable<ProcedureResult<O, E>>): Promise<void>;
 } : {
     type: 'stream';
     input: I;
     output: O;
     errors: E;
+    description?: string;
     handler(context: ServiceContextWithTransportInfo<State>, input: AsyncIterableIterator<Static<I>>, output: Pushable<ProcedureResult<O, E>>): Promise<void>;
 };
 /**
@@ -188,12 +194,14 @@ declare function rpc<State, I extends PayloadType, O extends PayloadType>(def: {
     input: I;
     output: O;
     errors?: never;
+    description?: string;
     handler: RPCProcedure<State, I, O, TNever>['handler'];
 }): Branded<RPCProcedure<State, I, O, TNever>>;
 declare function rpc<State, I extends PayloadType, O extends PayloadType, E extends RiverError>(def: {
     input: I;
     output: O;
     errors: E;
+    description?: string;
     handler: RPCProcedure<State, I, O, E>['handler'];
 }): Branded<RPCProcedure<State, I, O, E>>;
 /**
@@ -204,6 +212,7 @@ declare function upload<State, I extends PayloadType, O extends PayloadType, Ini
     input: I;
     output: O;
     errors?: never;
+    description?: string;
     handler: UploadProcedure<State, I, O, TNever, Init>['handler'];
 }): Branded<UploadProcedure<State, I, O, TNever, Init>>;
 declare function upload<State, I extends PayloadType, O extends PayloadType, E extends RiverError, Init extends PayloadType>(def: {
@@ -211,6 +220,7 @@ declare function upload<State, I extends PayloadType, O extends PayloadType, E e
     input: I;
     output: O;
     errors: E;
+    description?: string;
     handler: UploadProcedure<State, I, O, E, Init>['handler'];
 }): Branded<UploadProcedure<State, I, O, E, Init>>;
 declare function upload<State, I extends PayloadType, O extends PayloadType>(def: {
@@ -218,6 +228,7 @@ declare function upload<State, I extends PayloadType, O extends PayloadType>(def
     input: I;
     output: O;
     errors?: never;
+    description?: string;
     handler: UploadProcedure<State, I, O, TNever>['handler'];
 }): Branded<UploadProcedure<State, I, O, TNever>>;
 declare function upload<State, I extends PayloadType, O extends PayloadType, E extends RiverError>(def: {
@@ -225,6 +236,7 @@ declare function upload<State, I extends PayloadType, O extends PayloadType, E e
     input: I;
     output: O;
     errors: E;
+    description?: string;
     handler: UploadProcedure<State, I, O, E>['handler'];
 }): Branded<UploadProcedure<State, I, O, E>>;
 /**
@@ -234,12 +246,14 @@ declare function subscription<State, I extends PayloadType, O extends PayloadTyp
     input: I;
     output: O;
     errors?: never;
+    description?: string;
     handler: SubscriptionProcedure<State, I, O, TNever>['handler'];
 }): Branded<SubscriptionProcedure<State, I, O, TNever>>;
 declare function subscription<State, I extends PayloadType, O extends PayloadType, E extends RiverError>(def: {
     input: I;
     output: O;
     errors: E;
+    description?: string;
     handler: SubscriptionProcedure<State, I, O, E>['handler'];
 }): Branded<SubscriptionProcedure<State, I, O, E>>;
 /**
@@ -250,6 +264,7 @@ declare function stream<State, I extends PayloadType, O extends PayloadType, Ini
     input: I;
     output: O;
     errors?: never;
+    description?: string;
     handler: StreamProcedure<State, I, O, TNever, Init>['handler'];
 }): Branded<StreamProcedure<State, I, O, TNever, Init>>;
 declare function stream<State, I extends PayloadType, O extends PayloadType, E extends RiverError, Init extends PayloadType>(def: {
@@ -257,6 +272,7 @@ declare function stream<State, I extends PayloadType, O extends PayloadType, E e
     input: I;
     output: O;
     errors: E;
+    description?: string;
     handler: StreamProcedure<State, I, O, E, Init>['handler'];
 }): Branded<StreamProcedure<State, I, O, E, Init>>;
 declare function stream<State, I extends PayloadType, O extends PayloadType>(def: {
@@ -264,6 +280,7 @@ declare function stream<State, I extends PayloadType, O extends PayloadType>(def
     input: I;
     output: O;
     errors?: never;
+    description?: string;
     handler: StreamProcedure<State, I, O, TNever>['handler'];
 }): Branded<StreamProcedure<State, I, O, TNever>>;
 declare function stream<State, I extends PayloadType, O extends PayloadType, E extends RiverError>(def: {
@@ -271,6 +288,7 @@ declare function stream<State, I extends PayloadType, O extends PayloadType, E e
     input: I;
     output: O;
     errors: E;
+    description?: string;
     handler: StreamProcedure<State, I, O, E>['handler'];
 }): Branded<StreamProcedure<State, I, O, E>>;
 /**

package/dist/router/index.cjs

@@ -134,7 +134,9 @@ var ServiceSchema = class _ServiceSchema {
           {
             input: import_typebox.Type.Strict(procDef.input),
             output: import_typebox.Type.Strict(procDef.output),
-            // Only add the `errors` field if it is non-never.
+            // Only add `description` field if the type declares it.
+            ..."description" in procDef ? { description: procDef.description } : {},
+            // Only add the `errors` field if the type declares it.
             ..."errors" in procDef ? {
               errors: import_typebox.Type.Strict(procDef.errors)
             } : {},
@@ -224,35 +226,83 @@ function rpc({
   input,
   output,
   errors = import_typebox2.Type.Never(),
+  description,
   handler
 }) {
-  return { type: "rpc", input, output, errors, handler };
+  return {
+    ...description ? { description } : {},
+    type: "rpc",
+    input,
+    output,
+    errors,
+    handler
+  };
 }
 function upload({
   init,
   input,
   output,
   errors = import_typebox2.Type.Never(),
+  description,
   handler
 }) {
-  return init !== void 0 && init !== null ? { type: "upload", init, input, output, errors, handler } : { type: "upload", input, output, errors, handler };
+  return init !== void 0 && init !== null ? {
+    type: "upload",
+    ...description ? { description } : {},
+    init,
+    input,
+    output,
+    errors,
+    handler
+  } : {
+    type: "upload",
+    ...description ? { description } : {},
+    input,
+    output,
+    errors,
+    handler
+  };
 }
 function subscription({
   input,
   output,
   errors = import_typebox2.Type.Never(),
+  description,
   handler
 }) {
-  return { type: "subscription", input, output, errors, handler };
+  return {
+    type: "subscription",
+    ...description ? { description } : {},
+    input,
+    output,
+    errors,
+    handler
+  };
 }
 function stream({
   init,
   input,
   output,
   errors = import_typebox2.Type.Never(),
+  description,
   handler
 }) {
-  return init !== void 0 && init !== null ? { type: "stream", init, input, output, errors, handler } : { type: "stream", input, output, errors, handler };
+  return init !== void 0 && init !== null ? {
+    type: "stream",
+    ...description ? { description } : {},
+    init,
+    input,
+    output,
+    errors,
+    handler
+  } : {
+    type: "stream",
+    ...description ? { description } : {},
+    input,
+    output,
+    errors,
+    handler
+  };
 }
 var Procedure = {
   rpc,
@@ -953,6 +1003,7 @@ function coerceErrorString(err) {
 // router/server.ts
 var RiverServer = class {
   transport;
+  serviceDefs;
   services;
   contextMap;
   // map of streamId to ProcStream
@@ -961,6 +1012,7 @@ var RiverServer = class {
   clientStreams;
   disconnectedSessions;
   constructor(transport, services, extendedContext) {
+    this.serviceDefs = services;
     const instances = {};
     this.services = instances;
     this.contextMap = /* @__PURE__ */ new Map();
@@ -982,6 +1034,15 @@ var RiverServer = class {
   get streams() {
     return this.streamMap;
   }
+  serialize() {
+    return Object.entries(this.serviceDefs).reduce(
+      (acc, [name, value]) => {
+        acc[name] = value.serialize();
+        return acc;
+      },
+      {}
+    );
+  }
   onMessage = async (message) => {
     if (message.to !== this.transport.clientId) {
       log?.info(

package/dist/router/index.d.cts

@@ -1,7 +1,7 @@
-import { TObject, TUnion, Static } from '@sinclair/typebox';
-import { e as ProcedureMap, c as RiverUncaughtSchema, U as Unbranded, B as Branded, A as AnyProcedure, P as PayloadType, b as Result, R as RiverError, S as ServiceContext } from '../procedures-b5ddb54d.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-b5ddb54d.js';
-import { d as ServerTransport, C as Connection, a as ClientTransport, b as TransportClientId } from '../index-8df0bdfb.js';
+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-79a5f07e.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-79a5f07e.js';
+import { d as ServerTransport, C as Connection, a as ClientTransport, b as TransportClientId } from '../index-80f87385.js';
 import { Pushable } from 'it-pushable';
 import '../types-3e5768ec.js';
 
@@ -45,7 +45,7 @@ type ProcHandler<S extends AnyService, ProcName extends keyof S['procedures']> =
  * @template ProcName - The name of the procedure.
  */
 type ProcHasInit<S extends AnyService, ProcName extends keyof S['procedures']> = S['procedures'][ProcName] extends {
-    init: TObject;
+    init: PayloadType;
 } ? true : false;
 /**
  * Helper to get the type definition for the procedure init type of a service.
@@ -53,7 +53,7 @@ type ProcHasInit<S extends AnyService, ProcName extends keyof S['procedures']> =
  * @template ProcName - The name of the procedure.
  */
 type ProcInit<S extends AnyService, ProcName extends keyof S['procedures']> = S['procedures'][ProcName] extends {
-    init: TObject;
+    init: PayloadType;
 } ? S['procedures'][ProcName]['init'] : never;
 /**
  * Helper to get the type definition for the procedure input of a service.
@@ -93,6 +93,15 @@ interface ServiceConfiguration<State extends object> {
      */
     initializeState: () => State;
 }
+interface SerializedServiceSchema {
+    procedures: Record<string, {
+        input: PayloadType;
+        output: PayloadType;
+        errors?: RiverError;
+        type: 'rpc' | 'subscription' | 'upload' | 'stream';
+        init?: PayloadType;
+    }>;
+}
 /**
  * The schema for a {@link Service}. This is used to define a service, specifically
  * its initial state and procedures.
@@ -239,7 +248,7 @@ declare class ServiceSchema<State extends object, Procedures extends ProcedureMa
     /**
      * Serializes this schema's procedures into a plain object that is JSON compatible.
      */
-    serialize(): object;
+    serialize(): SerializedServiceSchema;
     /**
      * Instantiates this schema into a {@link Service} object.
      *
@@ -313,6 +322,7 @@ declare class ServiceScaffold<State extends object> {
 interface Server<Services extends ServiceSchemaMap> {
     services: InstantiatedServiceSchemaMap<Services>;
     streams: Map<string, ProcStream>;
+    serialize(): SerializedServerSchema;
     close(): Promise<void>;
 }
 interface ProcStream {
@@ -326,6 +336,7 @@ interface ProcStream {
         inputHandler: Promise<unknown>;
     };
 }
+type SerializedServerSchema = Record<string, SerializedServiceSchema>;
 /**
  * Creates a server instance that listens for incoming messages from a transport and routes them to the appropriate service and procedure.
  * The server tracks the state of each service along with open streams and the extended context object.

package/dist/router/index.d.ts

@@ -1,7 +1,7 @@
-import { TObject, TUnion, Static } from '@sinclair/typebox';
-import { e as ProcedureMap, c as RiverUncaughtSchema, U as Unbranded, B as Branded, A as AnyProcedure, P as PayloadType, b as Result, R as RiverError, S as ServiceContext } from '../procedures-b5ddb54d.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-b5ddb54d.js';
-import { d as ServerTransport, C as Connection, a as ClientTransport, b as TransportClientId } from '../index-8df0bdfb.js';
+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-79a5f07e.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-79a5f07e.js';
+import { d as ServerTransport, C as Connection, a as ClientTransport, b as TransportClientId } from '../index-80f87385.js';
 import { Pushable } from 'it-pushable';
 import '../types-3e5768ec.js';
 
@@ -45,7 +45,7 @@ type ProcHandler<S extends AnyService, ProcName extends keyof S['procedures']> =
  * @template ProcName - The name of the procedure.
  */
 type ProcHasInit<S extends AnyService, ProcName extends keyof S['procedures']> = S['procedures'][ProcName] extends {
-    init: TObject;
+    init: PayloadType;
 } ? true : false;
 /**
  * Helper to get the type definition for the procedure init type of a service.
@@ -53,7 +53,7 @@ type ProcHasInit<S extends AnyService, ProcName extends keyof S['procedures']> =
  * @template ProcName - The name of the procedure.
  */
 type ProcInit<S extends AnyService, ProcName extends keyof S['procedures']> = S['procedures'][ProcName] extends {
-    init: TObject;
+    init: PayloadType;
 } ? S['procedures'][ProcName]['init'] : never;
 /**
  * Helper to get the type definition for the procedure input of a service.
@@ -93,6 +93,15 @@ interface ServiceConfiguration<State extends object> {
      */
     initializeState: () => State;
 }
+interface SerializedServiceSchema {
+    procedures: Record<string, {
+        input: PayloadType;
+        output: PayloadType;
+        errors?: RiverError;
+        type: 'rpc' | 'subscription' | 'upload' | 'stream';
+        init?: PayloadType;
+    }>;
+}
 /**
  * The schema for a {@link Service}. This is used to define a service, specifically
  * its initial state and procedures.
@@ -239,7 +248,7 @@ declare class ServiceSchema<State extends object, Procedures extends ProcedureMa
     /**
      * Serializes this schema's procedures into a plain object that is JSON compatible.
      */
-    serialize(): object;
+    serialize(): SerializedServiceSchema;
     /**
      * Instantiates this schema into a {@link Service} object.
      *
@@ -313,6 +322,7 @@ declare class ServiceScaffold<State extends object> {
 interface Server<Services extends ServiceSchemaMap> {
     services: InstantiatedServiceSchemaMap<Services>;
     streams: Map<string, ProcStream>;
+    serialize(): SerializedServerSchema;
     close(): Promise<void>;
 }
 interface ProcStream {
@@ -326,6 +336,7 @@ interface ProcStream {
         inputHandler: Promise<unknown>;
     };
 }
+type SerializedServerSchema = Record<string, SerializedServiceSchema>;
 /**
  * Creates a server instance that listens for incoming messages from a transport and routes them to the appropriate service and procedure.
  * The server tracks the state of each service along with open streams and the extended context object.

package/dist/router/index.js

@@ -7,7 +7,7 @@ import {
   UNCAUGHT_ERROR,
   createClient,
   createServer
-} from "../chunk-7IQO434V.js";
+} from "../chunk-4C2OXQJB.js";
 import "../chunk-VH3NGOXQ.js";
 import "../chunk-H4BYJELI.js";
 export {

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 { a as ClientTransport, c as ProvidedClientTransportOptions, b as TransportClientId } from '../../../index-80f87385.js';
+import { U as UdsConnection } from '../../../connection-713c8c66.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 { a as ClientTransport, c as ProvidedClientTransportOptions, b as TransportClientId } from '../../../index-80f87385.js';
+import { U as UdsConnection } from '../../../connection-713c8c66.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 { d as ServerTransport, b as TransportClientId, e as ProvidedTransportOptions } from '../../../index-80f87385.js';
+import { U as UdsConnection } from '../../../connection-713c8c66.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 { d as ServerTransport, b as TransportClientId, e as ProvidedTransportOptions } from '../../../index-80f87385.js';
+import { U as UdsConnection } from '../../../connection-713c8c66.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 { a as ClientTransport, b as TransportClientId, c as ProvidedClientTransportOptions } from '../../../index-80f87385.js';
+import { W as WebSocketConnection } from '../../../connection-b79329de.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 { a as ClientTransport, b as TransportClientId, c as ProvidedClientTransportOptions } from '../../../index-80f87385.js';
+import { W as WebSocketConnection } from '../../../connection-b79329de.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 { d as ServerTransport, b as TransportClientId, e as ProvidedTransportOptions } from '../../../index-80f87385.js';
 import { WebSocketServer } from 'ws';
 import { WebSocket } from 'isomorphic-ws';
-import { W as WebSocketConnection } from '../../../connection-f31edbcd.js';
+import { W as WebSocketConnection } from '../../../connection-b79329de.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 { d as ServerTransport, b as TransportClientId, e as ProvidedTransportOptions } from '../../../index-80f87385.js';
 import { WebSocketServer } from 'ws';
 import { WebSocket } from 'isomorphic-ws';
-import { W as WebSocketConnection } from '../../../connection-f31edbcd.js';
+import { W as WebSocketConnection } from '../../../connection-b79329de.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 { 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-80f87385.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 { 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-80f87385.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.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-b5ddb54d.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-79a5f07e.js';
+import { P as PartialTransportMessage, T as Transport, C as Connection, O as OpaqueTransportMessage, S as SessionOptions } from '../index-80f87385.js';
 import * as it_pushable from 'it-pushable';
 import WebSocket from 'isomorphic-ws';
 import http from 'node:http';

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-b5ddb54d.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-79a5f07e.js';
+import { P as PartialTransportMessage, T as Transport, C as Connection, O as OpaqueTransportMessage, S as SessionOptions } from '../index-80f87385.js';
 import * as it_pushable from 'it-pushable';
 import WebSocket from 'isomorphic-ws';
 import http from 'node:http';

package/dist/util/testHelpers.js

@@ -1,12 +1,12 @@
 import {
   UNCAUGHT_ERROR,
   pushable
-} from "../chunk-7IQO434V.js";
+} from "../chunk-4C2OXQJB.js";
 import "../chunk-RPIDSIQG.js";
 import {
   Session,
   defaultTransportOptions
-} from "../chunk-F6KWMEPR.js";
+} from "../chunk-7WY3Z5ZN.js";
 import {
   coerceErrorString
 } from "../chunk-VH3NGOXQ.js";

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.1",
+  "version": "0.17.3",
   "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"
   },