@replit/river 0.18.3 → 0.18.5

package/dist/{chunk-7OS34AWW.js → chunk-6Q3MSICL.js}

@@ -10,6 +10,15 @@ import {
 
 // router/services.ts
 import { Type } from "@sinclair/typebox";
+function serializeSchema(services) {
+  return Object.entries(services).reduce(
+    (acc, [name, value]) => {
+      acc[name] = value.serialize();
+      return acc;
+    },
+    {}
+  );
+}
 var ServiceSchema = class _ServiceSchema {
   /**
    * Factory function for creating a fresh state.
@@ -887,7 +896,6 @@ 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
@@ -896,7 +904,6 @@ var RiverServer = class {
   clientStreams;
   disconnectedSessions;
   constructor(transport, services, extendedContext) {
-    this.serviceDefs = services;
     const instances = {};
     this.services = instances;
     this.contextMap = /* @__PURE__ */ new Map();
@@ -918,15 +925,6 @@ 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(`got msg with destination that isn't this server, ignoring`, {
@@ -966,6 +964,14 @@ var RiverServer = class {
     this.transport.removeEventListener("message", this.onMessage);
     this.transport.removeEventListener("sessionStatus", this.onSessionStatus);
     await Promise.all([...this.streamMap.keys()].map(this.cleanupStream));
+    for (const context of this.contextMap.values()) {
+      if (Symbol.dispose in context.state) {
+        const dispose = context.state[Symbol.dispose];
+        if (typeof dispose === "function") {
+          dispose();
+        }
+      }
+    }
   }
   createNewProcStream(message) {
     if (!isStreamOpen(message.controlFlags)) {
@@ -1241,9 +1247,10 @@ function createServer(transport, services, extendedContext) {
 }
 
 // package.json
-var version = "0.18.3";
+var version = "0.18.5";
 
 export {
+  serializeSchema,
   ServiceSchema,
   Procedure,
   pushable,

package/dist/{procedures-85e52b9c.d.ts → procedures-bfffcb0b.d.ts}

@@ -58,7 +58,7 @@ type ServiceContextWithState<State> = ServiceContext & {
     state: State;
 };
 type ServiceContextWithTransportInfo<State> = ServiceContext & {
-    state: State;
+    state: Omit<State, typeof Symbol.dispose>;
     to: TransportClientId;
     from: TransportClientId;
     streamId: string;

package/dist/router/index.cjs

@@ -28,12 +28,22 @@ __export(router_exports, {
   ServiceSchema: () => ServiceSchema,
   UNCAUGHT_ERROR: () => UNCAUGHT_ERROR,
   createClient: () => createClient,
-  createServer: () => createServer
+  createServer: () => createServer,
+  serializeSchema: () => serializeSchema
 });
 module.exports = __toCommonJS(router_exports);
 
 // router/services.ts
 var import_typebox = require("@sinclair/typebox");
+function serializeSchema(services) {
+  return Object.entries(services).reduce(
+    (acc, [name, value]) => {
+      acc[name] = value.serialize();
+      return acc;
+    },
+    {}
+  );
+}
 var ServiceSchema = class _ServiceSchema {
   /**
    * Factory function for creating a fresh state.
@@ -983,7 +993,6 @@ function coerceErrorString(err) {
 // router/server.ts
 var RiverServer = class {
   transport;
-  serviceDefs;
   services;
   contextMap;
   // map of streamId to ProcStream
@@ -992,7 +1001,6 @@ var RiverServer = class {
   clientStreams;
   disconnectedSessions;
   constructor(transport, services, extendedContext) {
-    this.serviceDefs = services;
     const instances = {};
     this.services = instances;
     this.contextMap = /* @__PURE__ */ new Map();
@@ -1014,15 +1022,6 @@ 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(`got msg with destination that isn't this server, ignoring`, {
@@ -1062,6 +1061,14 @@ var RiverServer = class {
     this.transport.removeEventListener("message", this.onMessage);
     this.transport.removeEventListener("sessionStatus", this.onSessionStatus);
     await Promise.all([...this.streamMap.keys()].map(this.cleanupStream));
+    for (const context of this.contextMap.values()) {
+      if (Symbol.dispose in context.state) {
+        const dispose = context.state[Symbol.dispose];
+        if (typeof dispose === "function") {
+          dispose();
+        }
+      }
+    }
   }
   createNewProcStream(message) {
     if (!isStreamOpen(message.controlFlags)) {
@@ -1337,7 +1344,7 @@ function createServer(transport, services, extendedContext) {
 }
 
 // package.json
-var version = "0.18.3";
+var version = "0.18.5";
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   Err,
@@ -1348,5 +1355,6 @@ var version = "0.18.3";
   ServiceSchema,
   UNCAUGHT_ERROR,
   createClient,
-  createServer
+  createServer,
+  serializeSchema
 });

package/dist/router/index.d.cts

@@ -1,6 +1,6 @@
 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-85e52b9c.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-85e52b9c.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-bfffcb0b.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-bfffcb0b.js';
 import { b as ClientTransport, C as Connection, c as ServerTransport } from '../index-d412ca83.js';
 import { Pushable } from 'it-pushable';
 import { T as TransportClientId } from '../index-46ed19d8.js';
@@ -103,6 +103,8 @@ interface SerializedServiceSchema {
         init?: PayloadType;
     }>;
 }
+type SerializedServerSchema = Record<string, SerializedServiceSchema>;
+declare function serializeSchema(services: AnyServiceSchemaMap): SerializedServerSchema;
 /**
  * The schema for a {@link Service}. This is used to define a service, specifically
  * its initial state and procedures.
@@ -387,7 +389,6 @@ declare const createClient: <ServiceSchemaMap extends AnyServiceSchemaMap>(trans
 interface Server<Services extends AnyServiceSchemaMap> {
     services: InstantiatedServiceSchemaMap<Services>;
     streams: Map<string, ProcStream>;
-    serialize(): SerializedServerSchema;
     close(): Promise<void>;
 }
 interface ProcStream {
@@ -401,7 +402,6 @@ 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.
@@ -412,6 +412,6 @@ type SerializedServerSchema = Record<string, SerializedServiceSchema>;
  */
 declare function createServer<Services extends AnyServiceSchemaMap>(transport: ServerTransport<Connection>, services: Services, extendedContext?: Omit<ServiceContext, 'state'>): Server<Services>;
 
-var version = "0.18.3";
+var version = "0.18.5";
 
-export { Client, PayloadType, ProcErrors, ProcHandler, ProcInit, ProcInput, ProcOutput, ProcType, ProcedureMap, version as RIVER_VERSION, Result, RiverError, RiverUncaughtSchema, Server, Service, ServiceConfiguration, ServiceContext, ServiceSchema, createClient, createServer };
+export { Client, PayloadType, ProcErrors, ProcHandler, ProcInit, ProcInput, ProcOutput, ProcType, ProcedureMap, version as RIVER_VERSION, Result, RiverError, RiverUncaughtSchema, SerializedServerSchema, Server, Service, ServiceConfiguration, ServiceContext, ServiceSchema, createClient, createServer, serializeSchema };

package/dist/router/index.d.ts

@@ -1,6 +1,6 @@
 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-85e52b9c.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-85e52b9c.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-bfffcb0b.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-bfffcb0b.js';
 import { b as ClientTransport, C as Connection, c as ServerTransport } from '../index-d412ca83.js';
 import { Pushable } from 'it-pushable';
 import { T as TransportClientId } from '../index-46ed19d8.js';
@@ -103,6 +103,8 @@ interface SerializedServiceSchema {
         init?: PayloadType;
     }>;
 }
+type SerializedServerSchema = Record<string, SerializedServiceSchema>;
+declare function serializeSchema(services: AnyServiceSchemaMap): SerializedServerSchema;
 /**
  * The schema for a {@link Service}. This is used to define a service, specifically
  * its initial state and procedures.
@@ -387,7 +389,6 @@ declare const createClient: <ServiceSchemaMap extends AnyServiceSchemaMap>(trans
 interface Server<Services extends AnyServiceSchemaMap> {
     services: InstantiatedServiceSchemaMap<Services>;
     streams: Map<string, ProcStream>;
-    serialize(): SerializedServerSchema;
     close(): Promise<void>;
 }
 interface ProcStream {
@@ -401,7 +402,6 @@ 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.
@@ -412,6 +412,6 @@ type SerializedServerSchema = Record<string, SerializedServiceSchema>;
  */
 declare function createServer<Services extends AnyServiceSchemaMap>(transport: ServerTransport<Connection>, services: Services, extendedContext?: Omit<ServiceContext, 'state'>): Server<Services>;
 
-var version = "0.18.3";
+var version = "0.18.5";
 
-export { Client, PayloadType, ProcErrors, ProcHandler, ProcInit, ProcInput, ProcOutput, ProcType, ProcedureMap, version as RIVER_VERSION, Result, RiverError, RiverUncaughtSchema, Server, Service, ServiceConfiguration, ServiceContext, ServiceSchema, createClient, createServer };
+export { Client, PayloadType, ProcErrors, ProcHandler, ProcInit, ProcInput, ProcOutput, ProcType, ProcedureMap, version as RIVER_VERSION, Result, RiverError, RiverUncaughtSchema, SerializedServerSchema, Server, Service, ServiceConfiguration, ServiceContext, ServiceSchema, createClient, createServer, serializeSchema };

package/dist/router/index.js

@@ -7,8 +7,9 @@ import {
   UNCAUGHT_ERROR,
   createClient,
   createServer,
+  serializeSchema,
   version
-} from "../chunk-7OS34AWW.js";
+} from "../chunk-6Q3MSICL.js";
 import "../chunk-VH3NGOXQ.js";
 import "../chunk-WER2DWCP.js";
 export {
@@ -20,5 +21,6 @@ export {
   ServiceSchema,
   UNCAUGHT_ERROR,
   createClient,
-  createServer
+  createServer,
+  serializeSchema
 };

package/dist/util/testHelpers.d.cts

@@ -1,5 +1,5 @@
 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-85e52b9c.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-bfffcb0b.js';
 import { T as Transport, C as Connection, S as SessionOptions, a as Session } from '../index-d412ca83.js';
 import * as it_pushable from 'it-pushable';
 import { P as PartialTransportMessage, O as OpaqueTransportMessage } from '../index-46ed19d8.js';

package/dist/util/testHelpers.d.ts

@@ -1,5 +1,5 @@
 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-85e52b9c.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-bfffcb0b.js';
 import { T as Transport, C as Connection, S as SessionOptions, a as Session } from '../index-d412ca83.js';
 import * as it_pushable from 'it-pushable';
 import { P as PartialTransportMessage, O as OpaqueTransportMessage } from '../index-46ed19d8.js';

package/dist/util/testHelpers.js

@@ -1,7 +1,7 @@
 import {
   UNCAUGHT_ERROR,
   pushable
-} from "../chunk-7OS34AWW.js";
+} from "../chunk-6Q3MSICL.js";
 import "../chunk-RPIDSIQG.js";
 import {
   Session,

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.18.3",
+  "version": "0.18.5",
   "type": "module",
   "exports": {
     ".": {
@@ -68,7 +68,8 @@
     "prettier": "^3.0.0",
     "tsup": "^7.2.0",
     "typescript": "^5.2.2",
-    "vitest": "^1.3.1"
+    "vitest": "^1.3.1",
+    "vscode-langservers-extracted": "4.8.0"
   },
   "scripts": {
     "check": "tsc --noEmit && npm run format && npm run lint",