@replit/river 0.8.0 → 0.9.0

package/dist/router/server.js

@@ -1,5 +1,5 @@
 import { pushable } from 'it-pushable';
-import { ControlMessagePayloadSchema, isStreamClose, isStreamOpen, reply, } from '../transport/message';
+import { ControlMessagePayloadSchema, isStreamClose, isStreamOpen, reply, closeStream, } from '../transport/message';
 import { log } from '../logging';
 import { Value } from '@sinclair/typebox/value';
 import { Err, UNCAUGHT_ERROR, } from './result';
@@ -15,6 +15,16 @@ export async function createServer(transport, services, extendedContext) {
     const contextMap = new Map();
     // map of streamId to ProcStream
     const streamMap = new Map();
+    async function cleanupStream(id) {
+        const stream = streamMap.get(id);
+        if (stream) {
+            stream.incoming.end();
+            await stream.promises.inputHandler;
+            stream.outgoing.end();
+            await stream.promises.outputHandler;
+            streamMap.delete(id);
+        }
+    }
     function getContext(service) {
         const context = contextMap.get(service);
         if (!context) {
@@ -28,50 +38,70 @@ export async function createServer(transport, services, extendedContext) {
     for (const service of Object.values(services)) {
         contextMap.set(service, { ...extendedContext, state: service.state });
     }
-    const handler = async (msg) => {
-        if (msg.to !== transport.clientId) {
+    const handler = async (message) => {
+        if (message.to !== transport.clientId) {
             log?.info(`${transport.clientId} -- got msg with destination that isn't the server, ignoring`);
             return;
         }
-        if (!(msg.serviceName in services)) {
-            log?.warn(`${transport.clientId} -- couldn't find service ${msg.serviceName}`);
+        if (!(message.serviceName in services)) {
+            log?.warn(`${transport.clientId} -- couldn't find service ${message.serviceName}`);
             return;
         }
-        const service = services[msg.serviceName];
+        const service = services[message.serviceName];
         const serviceContext = getContext(service);
-        if (!(msg.procedureName in service.procedures)) {
-            log?.warn(`${transport.clientId} -- couldn't find a matching procedure for ${msg.serviceName}.${msg.procedureName}`);
+        if (!(message.procedureName in service.procedures)) {
+            log?.warn(`${transport.clientId} -- couldn't find a matching procedure for ${message.serviceName}.${message.procedureName}`);
             return;
         }
-        const procedure = service.procedures[msg.procedureName];
-        const streamIdx = `${msg.serviceName}.${msg.procedureName}:${msg.streamId}`;
-        if (isStreamOpen(msg.controlFlags) && !streamMap.has(streamIdx)) {
+        const procedure = service.procedures[message.procedureName];
+        const streamIdx = `${message.serviceName}.${message.procedureName}:${message.streamId}`;
+        if (isStreamOpen(message.controlFlags) && !streamMap.has(streamIdx)) {
             const incoming = pushable({ objectMode: true });
             const outgoing = pushable({ objectMode: true });
-            const openPromises = [
-                // sending outgoing messages back to client
-                (async () => {
-                    for await (const response of outgoing) {
-                        transport.send(response);
-                    }
-                })(),
-            ];
+            const outputHandler = 
+            // sending outgoing messages back to client
+            (async () => {
+                for await (const response of outgoing) {
+                    transport.send(response);
+                }
+                // we ended, send a close bit back to the client
+                // only subscriptions and streams have streams the
+                // handler can close
+                if (procedure.type === 'subscription' ||
+                    procedure.type === 'stream') {
+                    transport.send(closeStream(transport.clientId, message.from, message.serviceName, message.procedureName, message.streamId));
+                }
+            })();
             function errorHandler(err) {
                 const errorMsg = err instanceof Error ? err.message : `[coerced to error] ${err}`;
-                log?.error(`${transport.clientId} -- procedure ${msg.serviceName}.${msg.procedureName}:${msg.streamId} threw an error: ${errorMsg}`);
-                outgoing.push(reply(msg, Err({
+                log?.error(`${transport.clientId} -- procedure ${message.serviceName}.${message.procedureName}:${message.streamId} threw an error: ${errorMsg}`);
+                outgoing.push(reply(message, Err({
                     code: UNCAUGHT_ERROR,
                     message: errorMsg,
                 })));
             }
             // pump incoming message stream -> handler -> outgoing message stream
+            let inputHandler;
             if (procedure.type === 'stream') {
-                openPromises.push(procedure
-                    .handler(serviceContext, incoming, outgoing)
-                    .catch(errorHandler));
+                if ('init' in procedure) {
+                    inputHandler = (async () => {
+                        const initMessage = await incoming.next();
+                        if (initMessage.done) {
+                            return;
+                        }
+                        return procedure
+                            .handler(serviceContext, initMessage.value, incoming, outgoing)
+                            .catch(errorHandler);
+                    })();
+                }
+                else {
+                    inputHandler = procedure
+                        .handler(serviceContext, incoming, outgoing)
+                        .catch(errorHandler);
+                }
             }
             else if (procedure.type === 'rpc') {
-                openPromises.push((async () => {
+                inputHandler = (async () => {
                     const inputMessage = await incoming.next();
                     if (inputMessage.done) {
                         return;
@@ -83,10 +113,10 @@ export async function createServer(transport, services, extendedContext) {
                     catch (err) {
                         errorHandler(err);
                     }
-                })());
+                })();
             }
             else if (procedure.type === 'subscription') {
-                openPromises.push((async () => {
+                inputHandler = (async () => {
                     const inputMessage = await incoming.next();
                     if (inputMessage.done) {
                         return;
@@ -97,40 +127,72 @@ export async function createServer(transport, services, extendedContext) {
                     catch (err) {
                         errorHandler(err);
                     }
-                })());
+                })();
+            }
+            else if (procedure.type === 'upload') {
+                if ('init' in procedure) {
+                    inputHandler = (async () => {
+                        const initMessage = await incoming.next();
+                        if (initMessage.done) {
+                            return;
+                        }
+                        try {
+                            const outputMessage = await procedure.handler(serviceContext, initMessage.value, incoming);
+                            outgoing.push(outputMessage);
+                        }
+                        catch (err) {
+                            errorHandler(err);
+                        }
+                    })();
+                }
+                else {
+                    inputHandler = (async () => {
+                        try {
+                            const outputMessage = await procedure.handler(serviceContext, incoming);
+                            outgoing.push(outputMessage);
+                        }
+                        catch (err) {
+                            errorHandler(err);
+                        }
+                    })();
+                }
+            }
+            else {
+                // procedure is inferred to be never here as this is not a valid procedure type
+                // we cast just to log
+                log?.warn(`${transport.clientId} -- got request for invalid procedure type ${procedure.type} at ${message.serviceName}.${message.procedureName}`);
+                return;
             }
             streamMap.set(streamIdx, {
                 incoming,
                 outgoing,
-                openPromises,
+                promises: { inputHandler, outputHandler },
             });
         }
         const procStream = streamMap.get(streamIdx);
         if (!procStream) {
-            log?.warn(`${transport.clientId} -- couldn't find a matching procedure stream for ${msg.serviceName}.${msg.procedureName}:${msg.streamId}`);
+            log?.warn(`${transport.clientId} -- couldn't find a matching procedure stream for ${message.serviceName}.${message.procedureName}:${message.streamId}`);
             return;
         }
-        if (Value.Check(procedure.input, msg.payload)) {
-            procStream.incoming.push(msg);
+        if (Value.Check(procedure.input, message.payload) ||
+            ('init' in procedure && Value.Check(procedure.init, message.payload))) {
+            procStream.incoming.push(message);
         }
-        else if (!Value.Check(ControlMessagePayloadSchema, msg.payload)) {
-            log?.error(`${transport.clientId} -- procedure ${msg.serviceName}.${msg.procedureName} received invalid payload: ${JSON.stringify(msg.payload)}`);
+        else if (!Value.Check(ControlMessagePayloadSchema, message.payload)) {
+            log?.error(`${transport.clientId} -- procedure ${message.serviceName}.${message.procedureName} received invalid payload: ${JSON.stringify(message.payload)}`);
         }
-        if (isStreamClose(msg.controlFlags)) {
-            procStream.incoming.end();
-            await Promise.all(procStream.openPromises);
-            procStream.outgoing.end();
+        if (isStreamClose(message.controlFlags)) {
+            await cleanupStream(streamIdx);
         }
     };
-    transport.addMessageListener(handler);
+    transport.addEventListener('message', handler);
     return {
         services,
+        streams: streamMap,
         async close() {
-            transport.removeMessageListener(handler);
-            for (const [_, stream] of streamMap) {
-                stream.incoming.end();
-                await Promise.all(stream.openPromises);
-                stream.outgoing.end();
+            transport.removeEventListener('message', handler);
+            for (const streamIdx of streamMap.keys()) {
+                await cleanupStream(streamIdx);
             }
         },
     };

package/dist/transport/events.d.ts

@@ -0,0 +1,19 @@
+import { OpaqueTransportMessage } from './message';
+import { Connection } from './transport';
+export interface EventMap {
+    message: OpaqueTransportMessage;
+    connectionStatus: {
+        status: 'connect' | 'disconnect';
+        conn: Connection;
+    };
+}
+export type EventTypes = keyof EventMap;
+export type EventHandler<K extends EventTypes> = (event: EventMap[K]) => void;
+export declare class EventDispatcher<T extends EventTypes> {
+    private eventListeners;
+    numberOfListeners<K extends T>(eventType: K): number;
+    addEventListener<K extends T>(eventType: K, handler: EventHandler<K>): void;
+    removeEventListener<K extends T>(eventType: K, handler: EventHandler<K>): void;
+    dispatchEvent<K extends T>(eventType: K, event: EventMap[K]): void;
+}
+//# sourceMappingURL=events.d.ts.map

package/dist/transport/events.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"events.d.ts","sourceRoot":"","sources":["../../transport/events.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,MAAM,WAAW,CAAC;AACnD,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAEzC,MAAM,WAAW,QAAQ;IACvB,OAAO,EAAE,sBAAsB,CAAC;IAChC,gBAAgB,EAAE;QAChB,MAAM,EAAE,SAAS,GAAG,YAAY,CAAC;QACjC,IAAI,EAAE,UAAU,CAAC;KAClB,CAAC;CACH;AAED,MAAM,MAAM,UAAU,GAAG,MAAM,QAAQ,CAAC;AACxC,MAAM,MAAM,YAAY,CAAC,CAAC,SAAS,UAAU,IAAI,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC,CAAC,KAAK,IAAI,CAAC;AAE9E,qBAAa,eAAe,CAAC,CAAC,SAAS,UAAU;IAC/C,OAAO,CAAC,cAAc,CAA2C;IAEjE,iBAAiB,CAAC,CAAC,SAAS,CAAC,EAAE,SAAS,EAAE,CAAC;IAI3C,gBAAgB,CAAC,CAAC,SAAS,CAAC,EAAE,SAAS,EAAE,CAAC,EAAE,OAAO,EAAE,YAAY,CAAC,CAAC,CAAC;IAQpE,mBAAmB,CAAC,CAAC,SAAS,CAAC,EAAE,SAAS,EAAE,CAAC,EAAE,OAAO,EAAE,YAAY,CAAC,CAAC,CAAC;IAOvE,aAAa,CAAC,CAAC,SAAS,CAAC,EAAE,SAAS,EAAE,CAAC,EAAE,KAAK,EAAE,QAAQ,CAAC,CAAC,CAAC;CAQ5D"}

package/dist/transport/events.js

@@ -0,0 +1,26 @@
+export class EventDispatcher {
+    eventListeners = {};
+    numberOfListeners(eventType) {
+        return this.eventListeners[eventType]?.size ?? 0;
+    }
+    addEventListener(eventType, handler) {
+        if (!this.eventListeners[eventType]) {
+            this.eventListeners[eventType] = new Set();
+        }
+        this.eventListeners[eventType]?.add(handler);
+    }
+    removeEventListener(eventType, handler) {
+        const handlers = this.eventListeners[eventType];
+        if (handlers) {
+            this.eventListeners[eventType]?.delete(handler);
+        }
+    }
+    dispatchEvent(eventType, event) {
+        const handlers = this.eventListeners[eventType];
+        if (handlers) {
+            for (const handler of handlers) {
+                handler(event);
+            }
+        }
+    }
+}

package/dist/transport/impls/stdio/stdio.d.ts

@@ -3,9 +3,6 @@ import { Codec } from '../../../codec';
 import { TransportClientId } from '../../message';
 import { Connection, Transport } from '../../transport';
 export declare class StdioConnection extends Connection {
-    /**
-     * The writable stream to use as output.
-     */
     output: NodeJS.WritableStream;
     constructor(transport: Transport<StdioConnection>, connectedTo: TransportClientId, output: NodeJS.WritableStream);
     send(payload: Uint8Array): boolean;
@@ -16,7 +13,6 @@ interface Options {
 }
 /**
  * A transport implementation that uses standard input and output streams.
- * Can only be used 1:1, not N:1
  * @extends Transport
  */
 export declare class StdioTransport extends Transport<StdioConnection> {

package/dist/transport/impls/stdio/stdio.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"stdio.d.ts","sourceRoot":"","sources":["../../../../transport/impls/stdio/stdio.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAC;AAGvC,OAAO,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAC;AAClD,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAKxD,qBAAa,eAAgB,SAAQ,UAAU;IAC7C;;OAEG;IACH,MAAM,EAAE,MAAM,CAAC,cAAc,CAAC;gBAG5B,SAAS,EAAE,SAAS,CAAC,eAAe,CAAC,EACrC,WAAW,EAAE,iBAAiB,EAC9B,MAAM,EAAE,MAAM,CAAC,cAAc;IAM/B,IAAI,CAAC,OAAO,EAAE,UAAU;IAOlB,KAAK;CAIZ;AAED,UAAU,OAAO;IACf,KAAK,EAAE,KAAK,CAAC;CACd;AAMD;;;;GAIG;AACH,qBAAa,cAAe,SAAQ,SAAS,CAAC,eAAe,CAAC;IAC5D,QAAQ,EAAE,iBAAiB,CAAC;IAC5B,KAAK,EAAE,MAAM,CAAC,cAAc,CAAiB;IAC7C,MAAM,EAAE,MAAM,CAAC,cAAc,CAAkB;IAE/C;;;;;OAKG;gBAED,QAAQ,EAAE,iBAAiB,EAC3B,KAAK,GAAE,MAAM,CAAC,cAA8B,EAC5C,MAAM,GAAE,MAAM,CAAC,cAA+B,EAC9C,eAAe,CAAC,EAAE,OAAO,CAAC,OAAO,CAAC;IAUpC,8BAA8B,IAAI,IAAI;IAwBhC,mBAAmB,CAAC,EAAE,EAAE,iBAAiB;CAShD"}
+{"version":3,"file":"stdio.d.ts","sourceRoot":"","sources":["../../../../transport/impls/stdio/stdio.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAC;AAGvC,OAAO,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAC;AAClD,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAKxD,qBAAa,eAAgB,SAAQ,UAAU;IAC7C,MAAM,EAAE,MAAM,CAAC,cAAc,CAAC;gBAG5B,SAAS,EAAE,SAAS,CAAC,eAAe,CAAC,EACrC,WAAW,EAAE,iBAAiB,EAC9B,MAAM,EAAE,MAAM,CAAC,cAAc;IAM/B,IAAI,CAAC,OAAO,EAAE,UAAU;IAOlB,KAAK;CAGZ;AAED,UAAU,OAAO;IACf,KAAK,EAAE,KAAK,CAAC;CACd;AAMD;;;GAGG;AACH,qBAAa,cAAe,SAAQ,SAAS,CAAC,eAAe,CAAC;IAC5D,QAAQ,EAAE,iBAAiB,CAAC;IAC5B,KAAK,EAAE,MAAM,CAAC,cAAc,CAAiB;IAC7C,MAAM,EAAE,MAAM,CAAC,cAAc,CAAkB;IAE/C;;;;;OAKG;gBAED,QAAQ,EAAE,iBAAiB,EAC3B,KAAK,GAAE,MAAM,CAAC,cAA8B,EAC5C,MAAM,GAAE,MAAM,CAAC,cAA+B,EAC9C,eAAe,CAAC,EAAE,OAAO,CAAC,OAAO,CAAC;IAUpC,8BAA8B,IAAI,IAAI;IAwBhC,mBAAmB,CAAC,EAAE,EAAE,iBAAiB;CAShD"}

package/dist/transport/impls/stdio/stdio.js

@@ -4,9 +4,6 @@ import { Connection, Transport } from '../../transport';
 import readline from 'readline';
 const newlineBuff = new TextEncoder().encode('\n');
 export class StdioConnection extends Connection {
-    /**
-     * The writable stream to use as output.
-     */
     output;
     constructor(transport, connectedTo, output) {
         super(transport, connectedTo);
@@ -19,7 +16,6 @@ export class StdioConnection extends Connection {
         return this.output.write(out);
     }
     async close() {
-        this.transport.onDisconnect(this);
         this.output.end();
     }
 }
@@ -28,7 +24,6 @@ const defaultOptions = {
 };
 /**
  * A transport implementation that uses standard input and output streams.
- * Can only be used 1:1, not N:1
  * @extends Transport
  */
 export class StdioTransport extends Transport {

package/dist/transport/impls/stdio/stdio.test.js

@@ -3,6 +3,7 @@ import stream from 'node:stream';
 import { StdioTransport } from './stdio';
 import { waitForMessage } from '../..';
 import { payloadToTransportMessage } from '../../../util/testHelpers';
+import { ensureTransportIsClean } from '../../../__tests__/fixtures/cleanup';
 describe('sending and receiving across node streams works', () => {
     test('basic send/receive', async () => {
         const clientToServer = new stream.PassThrough();
@@ -16,5 +17,9 @@ describe('sending and receiving across node streams works', () => {
         const p = waitForMessage(serverTransport);
         clientTransport.send(payloadToTransportMessage(msg, 'stream', clientTransport.clientId, serverTransport.clientId));
         await expect(p).resolves.toStrictEqual(msg);
+        await clientTransport.close();
+        await serverTransport.close();
+        await ensureTransportIsClean(clientTransport);
+        await ensureTransportIsClean(serverTransport);
     });
 });

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

@@ -1 +1 @@
-{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../../../transport/impls/ws/client.ts"],"names":[],"mappings":";AAAA,OAAO,SAAS,MAAM,eAAe,CAAC;AACtC,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAE5C,OAAO,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAC;AAElD,OAAO,EAAE,KAAK,KAAK,EAAE,MAAM,gBAAgB,CAAC;AAC5C,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AAEnD,UAAU,OAAO;IACf,eAAe,EAAE,MAAM,CAAC;IACxB,gBAAgB,EAAE,MAAM,CAAC;IACzB,KAAK,EAAE,KAAK,CAAC;CACd;AAQD,KAAK,eAAe,GAAG;IAAE,EAAE,EAAE,SAAS,CAAA;CAAE,GAAG;IAAE,GAAG,EAAE,MAAM,CAAA;CAAE,CAAC;AAE3D;;;;GAIG;AACH,qBAAa,wBAAyB,SAAQ,SAAS,CAAC,mBAAmB,CAAC;IAC1E;;OAEG;IACH,QAAQ,EAAE,CAAC,EAAE,EAAE,iBAAiB,KAAK,OAAO,CAAC,SAAS,CAAC,CAAC;IACxD,OAAO,EAAE,OAAO,CAAC;IACjB,QAAQ,EAAE,iBAAiB,CAAC;IAE5B,iBAAiB,EAAE,GAAG,CAAC,iBAAiB,EAAE,OAAO,CAAC,eAAe,CAAC,CAAC,CAAC;IAEpE;;;;;OAKG;gBAED,QAAQ,EAAE,MAAM,OAAO,CAAC,SAAS,CAAC,EAClC,QAAQ,EAAE,iBAAiB,EAC3B,QAAQ,EAAE,iBAAiB,EAC3B,eAAe,CAAC,EAAE,OAAO,CAAC,OAAO,CAAC;IAWpC,8BAA8B,IAAI,IAAI;IAIhC,mBAAmB,CAAC,EAAE,EAAE,MAAM,EAAE,OAAO,SAAI;IAmEjD;;OAEG;IACG,IAAI;CAGX"}
+{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../../../transport/impls/ws/client.ts"],"names":[],"mappings":";AAAA,OAAO,SAAS,MAAM,eAAe,CAAC;AACtC,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAE5C,OAAO,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAC;AAElD,OAAO,EAAE,KAAK,KAAK,EAAE,MAAM,gBAAgB,CAAC;AAC5C,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AAEnD,UAAU,OAAO;IACf,eAAe,EAAE,MAAM,CAAC;IACxB,gBAAgB,EAAE,MAAM,CAAC;IACzB,KAAK,EAAE,KAAK,CAAC;CACd;AAQD,KAAK,eAAe,GAAG;IAAE,EAAE,EAAE,SAAS,CAAA;CAAE,GAAG;IAAE,GAAG,EAAE,MAAM,CAAA;CAAE,CAAC;AAE3D;;;;GAIG;AACH,qBAAa,wBAAyB,SAAQ,SAAS,CAAC,mBAAmB,CAAC;IAC1E;;OAEG;IACH,QAAQ,EAAE,CAAC,EAAE,EAAE,iBAAiB,KAAK,OAAO,CAAC,SAAS,CAAC,CAAC;IACxD,OAAO,EAAE,OAAO,CAAC;IACjB,QAAQ,EAAE,iBAAiB,CAAC;IAE5B,iBAAiB,EAAE,GAAG,CAAC,iBAAiB,EAAE,OAAO,CAAC,eAAe,CAAC,CAAC,CAAC;IAEpE;;;;;OAKG;gBAED,QAAQ,EAAE,MAAM,OAAO,CAAC,SAAS,CAAC,EAClC,QAAQ,EAAE,iBAAiB,EAC3B,QAAQ,EAAE,iBAAiB,EAC3B,eAAe,CAAC,EAAE,OAAO,CAAC,OAAO,CAAC;IAWpC,8BAA8B,IAAI,IAAI;IAIhC,mBAAmB,CAAC,EAAE,EAAE,MAAM,EAAE,OAAO,SAAI;IAuEjD;;OAEG;IACG,IAAI;CAGX"}

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

@@ -83,13 +83,13 @@ export class WebSocketClientTransport extends Transport {
             return;
         }
         // otherwise try and reconnect again
-        log?.warn(`${this.clientId} -- websocket failed, trying again in ${this.options.retryIntervalMs}ms`);
         this.reconnectPromises.delete(to);
         if (attempt >= this.options.retryAttemptsMax) {
-            return;
+            throw new Error(`${this.clientId} -- websocket to ${to} failed after ${attempt} attempts, giving up`);
         }
         else {
             // linear backoff
+            log?.warn(`${this.clientId} -- websocket to ${to} failed, trying again in ${this.options.retryIntervalMs * attempt}ms`);
             setTimeout(() => this.createNewConnection(to, attempt + 1), this.options.retryIntervalMs * attempt);
         }
     }

package/dist/transport/impls/ws/connection.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"connection.d.ts","sourceRoot":"","sources":["../../../../transport/impls/ws/connection.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAC;AAClD,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AACxD,OAAO,SAAS,MAAM,eAAe,CAAC;AAEtC,qBAAa,mBAAoB,SAAQ,UAAU;IACjD,EAAE,EAAE,SAAS,CAAC;gBAGZ,SAAS,EAAE,SAAS,CAAC,mBAAmB,CAAC,EACzC,WAAW,EAAE,iBAAiB,EAC9B,EAAE,EAAE,SAAS;IAQf,IAAI,CAAC,OAAO,EAAE,UAAU;IASlB,KAAK;CAGZ"}
+{"version":3,"file":"connection.d.ts","sourceRoot":"","sources":["../../../../transport/impls/ws/connection.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAC;AAClD,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AACxD,OAAO,SAAS,MAAM,eAAe,CAAC;AAEtC,qBAAa,mBAAoB,SAAQ,UAAU;IACjD,EAAE,EAAE,SAAS,CAAC;gBAGZ,SAAS,EAAE,SAAS,CAAC,mBAAmB,CAAC,EACzC,WAAW,EAAE,iBAAiB,EAC9B,EAAE,EAAE,SAAS;IAUf,IAAI,CAAC,OAAO,EAAE,UAAU;IASlB,KAAK;CAGZ"}

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

@@ -5,7 +5,8 @@ export class WebSocketConnection extends Connection {
         super(transport, connectedTo);
         this.ws = ws;
         ws.binaryType = 'arraybuffer';
-        this.ws.onmessage = (msg) => this.onMessage(msg.data);
+        // take over the onmessage for this websocket
+        this.ws.onmessage = (msg) => transport.onMessage(msg.data);
     }
     send(payload) {
         if (this.ws.readyState === this.ws.OPEN) {

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

@@ -12,8 +12,6 @@ export declare class WebSocketServerTransport extends Transport<WebSocketConnect
     constructor(wss: Server, clientId: TransportClientId, providedOptions?: Partial<Options>);
     setupConnectionStatusListeners(): void;
     createNewConnection(to: string): Promise<void>;
-    destroy(): Promise<void>;
-    close(): Promise<void>;
 }
 export {};
 //# sourceMappingURL=server.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../../../transport/impls/ws/server.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAkB,MAAM,gBAAgB,CAAC;AAEvD,OAAO,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAC;AAClD,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,MAAM,EAAE,MAAM,IAAI,CAAC;AAC5B,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AAEnD,UAAU,OAAO;IACf,KAAK,EAAE,KAAK,CAAC;CACd;AAMD,qBAAa,wBAAyB,SAAQ,SAAS,CAAC,mBAAmB,CAAC;IAC1E,GAAG,EAAE,MAAM,CAAC;IACZ,QAAQ,EAAE,iBAAiB,CAAC;gBAG1B,GAAG,EAAE,MAAM,EACX,QAAQ,EAAE,iBAAiB,EAC3B,eAAe,CAAC,EAAE,OAAO,CAAC,OAAO,CAAC;IASpC,8BAA8B,IAAI,IAAI;IA8BhC,mBAAmB,CAAC,EAAE,EAAE,MAAM;IAM9B,OAAO;IAKP,KAAK;CAIZ"}
+{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../../../transport/impls/ws/server.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAkB,MAAM,gBAAgB,CAAC;AAEvD,OAAO,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAC;AAClD,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,MAAM,EAAE,MAAM,IAAI,CAAC;AAC5B,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AAEnD,UAAU,OAAO;IACf,KAAK,EAAE,KAAK,CAAC;CACd;AAMD,qBAAa,wBAAyB,SAAQ,SAAS,CAAC,mBAAmB,CAAC;IAC1E,GAAG,EAAE,MAAM,CAAC;IACZ,QAAQ,EAAE,iBAAiB,CAAC;gBAG1B,GAAG,EAAE,MAAM,EACX,QAAQ,EAAE,iBAAiB,EAC3B,eAAe,CAAC,EAAE,OAAO,CAAC,OAAO,CAAC;IASpC,8BAA8B,IAAI,IAAI;IAiChC,mBAAmB,CAAC,EAAE,EAAE,MAAM;CAKrC"}

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

@@ -19,8 +19,11 @@ export class WebSocketServerTransport extends Transport {
         this.wss.on('connection', (ws) => {
             let conn = undefined;
             ws.onmessage = (msg) => {
+                // when we establish WebSocketConnection, ws.onmessage
+                // gets overriden so this only runs on the first valid message
+                // the websocket receives
                 const parsedMsg = this.parseMsg(msg.data);
-                if (parsedMsg) {
+                if (parsedMsg && !conn) {
                     conn = new WebSocketConnection(this, parsedMsg.from, ws);
                     this.onConnect(conn);
                     this.handleMsg(parsedMsg);
@@ -42,12 +45,4 @@ export class WebSocketServerTransport extends Transport {
         log?.warn(err);
         return;
     }
-    async destroy() {
-        super.destroy();
-        this.wss.close();
-    }
-    async close() {
-        super.close();
-        this.wss.close();
-    }
 }

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

@@ -4,21 +4,24 @@ import { createWebSocketServer, createWsTransports, createDummyTransportMessage,
 import { msg, waitForMessage } from '../..';
 import { WebSocketServerTransport } from './server';
 import { WebSocketClientTransport } from './client';
+import { testFinishesCleanly } from '../../../__tests__/fixtures/cleanup';
 describe('sending and receiving across websockets works', async () => {
     const server = http.createServer();
     const port = await onServerReady(server);
     const wss = await createWebSocketServer(server);
     afterAll(() => {
-        wss.clients.forEach((socket) => {
-            socket.close();
-        });
+        wss.close();
         server.close();
     });
     test('basic send/receive', async () => {
         const [clientTransport, serverTransport] = createWsTransports(port, wss);
         const msg = createDummyTransportMessage();
         clientTransport.send(msg);
-        return expect(waitForMessage(serverTransport, (recv) => recv.id === msg.id)).resolves.toStrictEqual(msg.payload);
+        await expect(waitForMessage(serverTransport, (recv) => recv.id === msg.id)).resolves.toStrictEqual(msg.payload);
+        await testFinishesCleanly({
+            clientTransports: [clientTransport],
+            serverTransport,
+        });
     });
     test('sending respects to/from fields', async () => {
         const makeDummyMessage = (from, to, message) => {
@@ -50,6 +53,10 @@ describe('sending and receiving across websockets works', async () => {
         serverTransport.send(msg1);
         serverTransport.send(msg2);
         await expect(promises).resolves.toStrictEqual([msg1.payload, msg2.payload]);
+        await testFinishesCleanly({
+            clientTransports: [client1, client2],
+            serverTransport,
+        });
     });
 });
 describe('retry logic', async () => {
@@ -57,9 +64,7 @@ describe('retry logic', async () => {
     const port = await onServerReady(server);
     const wss = await createWebSocketServer(server);
     afterAll(() => {
-        wss.clients.forEach((socket) => {
-            socket.close();
-        });
+        wss.close();
         server.close();
     });
     // TODO: right now, we only test client-side disconnects, we probably
@@ -73,7 +78,12 @@ describe('retry logic', async () => {
         await expect(waitForMessage(serverTransport, (recv) => recv.id === msg1.id)).resolves.toStrictEqual(msg1.payload);
         clientTransport.connections.forEach((conn) => conn.ws.close());
         clientTransport.send(msg2);
-        return expect(waitForMessage(serverTransport, (recv) => recv.id === msg2.id)).resolves.toStrictEqual(msg2.payload);
+        // by this point the client should have reconnected
+        await expect(waitForMessage(serverTransport, (recv) => recv.id === msg2.id)).resolves.toStrictEqual(msg2.payload);
+        await testFinishesCleanly({
+            clientTransports: [clientTransport],
+            serverTransport,
+        });
     });
     test('ws transport is recreated after unclean disconnect', async () => {
         const [clientTransport, serverTransport] = createWsTransports(port, wss);
@@ -83,7 +93,13 @@ describe('retry logic', async () => {
         await expect(waitForMessage(serverTransport, (recv) => recv.id === msg1.id)).resolves.toStrictEqual(msg1.payload);
         clientTransport.connections.forEach((conn) => conn.ws.terminate());
         clientTransport.send(msg2);
-        return expect(waitForMessage(serverTransport, (recv) => recv.id === msg2.id)).resolves.toStrictEqual(msg2.payload);
+        // by this point the client should have reconnected
+        await expect(waitForMessage(serverTransport, (recv) => recv.id === msg2.id)).resolves.toStrictEqual(msg2.payload);
+        // this is not expected to be clean because we destroyed the transport
+        await testFinishesCleanly({
+            clientTransports: [clientTransport],
+            serverTransport,
+        });
     });
     test('ws transport is not recreated after destroy', async () => {
         const [clientTransport, serverTransport] = createWsTransports(port, wss);
@@ -92,6 +108,10 @@ describe('retry logic', async () => {
         clientTransport.send(msg1);
         await expect(waitForMessage(serverTransport, (recv) => recv.id === msg1.id)).resolves.toStrictEqual(msg1.payload);
         clientTransport.destroy();
-        return expect(() => clientTransport.send(msg2)).toThrow(new Error('transport is destroyed, cant send'));
+        expect(() => clientTransport.send(msg2)).toThrow(new Error('transport is destroyed, cant send'));
+        // this is not expected to be clean because we destroyed the transport
+        expect(clientTransport.state).toEqual('destroyed');
+        await clientTransport.close();
+        await serverTransport.close();
     });
 });

package/dist/transport/index.d.ts

@@ -1,8 +1,8 @@
 import { OpaqueTransportMessage } from './message';
-import { Connection, Transport } from './transport';
-export { Transport } from './transport';
+import { Transport, Connection } from './transport';
+export { Transport, Connection } from './transport';
 export { TransportMessageSchema, OpaqueTransportMessageSchema, msg, reply, } from './message';
-export type { TransportMessage, MessageId, OpaqueTransportMessage, TransportClientId, } from './message';
+export type { TransportMessage, MessageId, OpaqueTransportMessage, TransportClientId, isStreamOpen, isStreamClose, } from './message';
 /**
  * Waits for a message from the transport.
  * @param {Transport} t - The transport to listen to.

package/dist/transport/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../transport/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,MAAM,WAAW,CAAC;AACnD,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAGpD,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxC,OAAO,EACL,sBAAsB,EACtB,4BAA4B,EAC5B,GAAG,EACH,KAAK,GACN,MAAM,WAAW,CAAC;AACnB,YAAY,EACV,gBAAgB,EAChB,SAAS,EACT,sBAAsB,EACtB,iBAAiB,GAClB,MAAM,WAAW,CAAC;AAEnB;;;;;GAKG;AACH,wBAAsB,cAAc,CAClC,CAAC,EAAE,SAAS,CAAC,UAAU,CAAC,EACxB,MAAM,CAAC,EAAE,CAAC,GAAG,EAAE,sBAAsB,KAAK,OAAO,EACjD,cAAc,CAAC,EAAE,OAAO,oBAczB"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../transport/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,MAAM,WAAW,CAAC;AACnD,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAGpD,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACpD,OAAO,EACL,sBAAsB,EACtB,4BAA4B,EAC5B,GAAG,EACH,KAAK,GACN,MAAM,WAAW,CAAC;AACnB,YAAY,EACV,gBAAgB,EAChB,SAAS,EACT,sBAAsB,EACtB,iBAAiB,EACjB,YAAY,EACZ,aAAa,GACd,MAAM,WAAW,CAAC;AAEnB;;;;;GAKG;AACH,wBAAsB,cAAc,CAClC,CAAC,EAAE,SAAS,CAAC,UAAU,CAAC,EACxB,MAAM,CAAC,EAAE,CAAC,GAAG,EAAE,sBAAsB,KAAK,OAAO,EACjD,cAAc,CAAC,EAAE,OAAO,oBAczB"}

package/dist/transport/index.js

@@ -1,5 +1,5 @@
 // re-export
-export { Transport } from './transport';
+export { Transport, Connection } from './transport';
 export { TransportMessageSchema, OpaqueTransportMessageSchema, msg, reply, } from './message';
 /**
  * Waits for a message from the transport.
@@ -12,12 +12,12 @@ export async function waitForMessage(t, filter, rejectMismatch) {
         function onMessage(msg) {
             if (!filter || filter?.(msg)) {
                 resolve(msg.payload);
-                t.removeMessageListener(onMessage);
+                t.removeEventListener('message', onMessage);
             }
             else if (rejectMismatch) {
                 reject(new Error('message didnt match the filter'));
             }
         }
-        t.addMessageListener(onMessage);
+        t.addEventListener('message', onMessage);
     });
 }

package/dist/transport/message.d.ts

@@ -103,6 +103,16 @@ export declare function msg<Payload extends object>(from: string, to: string, se
  * @returns A new transport message with appropriate to, from, and payload fields
  */
 export declare function reply<Payload extends object>(msg: OpaqueTransportMessage, response: Payload): TransportMessage<Payload>;
+/**
+ * Create a request to close a stream
+ * @param from The ID of the client initiating the close.
+ * @param to The ID of the client being closed.
+ * @param respondTo The transport message to respond to.
+ * @returns The close message
+ */
+export declare function closeStream(from: TransportClientId, to: TransportClientId, service: string, proc: string, stream: string): TransportMessage<{
+    type: "CLOSE";
+}>;
 /**
  * Checks if the given control flag (usually found in msg.controlFlag) is an ack message.
  * @param controlFlag - The control flag to check.

package/dist/transport/message.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"message.d.ts","sourceRoot":"","sources":["../../transport/message.ts"],"names":[],"mappings":"AAAA,OAAO,EAAQ,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAGlD;;;;;;GAMG;AACH,0BAAkB,YAAY;IAC5B,MAAM,IAAS;IACf,aAAa,IAAS;IACtB,eAAe,IAAS;CACzB;AAED;;;;;GAKG;AACH,eAAO,MAAM,sBAAsB;;;;;;;;;EAU/B,CAAC;AAEL;;;;GAIG;AACH,eAAO,MAAM,kBAAkB;;;;;;;;;;;EAI9B,CAAC;AAEF,eAAO,MAAM,2BAA2B;;EAEtC,CAAC;AAEH;;;;GAIG;AACH,eAAO,MAAM,4BAA4B;;;;;;;;;EAExC,CAAC;AAEF;;;;GAIG;AACH,MAAM,MAAM,gBAAgB,CAC1B,OAAO,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,OAAO,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,IACzE;IACF,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,EAAE,EAAE,MAAM,CAAC;IACX,WAAW,EAAE,MAAM,CAAC;IACpB,aAAa,EAAE,MAAM,CAAC;IACtB,QAAQ,EAAE,MAAM,CAAC;IACjB,YAAY,EAAE,MAAM,CAAC;IACrB,OAAO,EAAE,OAAO,CAAC;CAClB,CAAC;AAEF,MAAM,MAAM,SAAS,GAAG,MAAM,CAAC;AAE/B;;;GAGG;AACH,MAAM,MAAM,sBAAsB,GAAG,gBAAgB,CAAC,OAAO,CAAC,CAAC;AAC/D,MAAM,MAAM,iBAAiB,GAAG,MAAM,CAAC;AAEvC;;;;;;;;;;GAUG;AACH,wBAAgB,GAAG,CAAC,OAAO,SAAS,MAAM,EACxC,IAAI,EAAE,MAAM,EACZ,EAAE,EAAE,MAAM,EACV,OAAO,EAAE,MAAM,EACf,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,OAAO,GACf,gBAAgB,CAAC,OAAO,CAAC,CAW3B;AAED;;;;;GAKG;AACH,wBAAgB,KAAK,CAAC,OAAO,SAAS,MAAM,EAC1C,GAAG,EAAE,sBAAsB,EAC3B,QAAQ,EAAE,OAAO,GAChB,gBAAgB,CAAC,OAAO,CAAC,CAQ3B;AAED;;;;GAIG;AACH,wBAAgB,KAAK,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAElD;AAED;;;;GAIG;AACH,wBAAgB,YAAY,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAIzD;AAED;;;;GAIG;AACH,wBAAgB,aAAa,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAK1D"}
+{"version":3,"file":"message.d.ts","sourceRoot":"","sources":["../../transport/message.ts"],"names":[],"mappings":"AAAA,OAAO,EAAQ,OAAO,EAAU,MAAM,mBAAmB,CAAC;AAG1D;;;;;;GAMG;AACH,0BAAkB,YAAY;IAC5B,MAAM,IAAS;IACf,aAAa,IAAS;IACtB,eAAe,IAAS;CACzB;AAED;;;;;GAKG;AACH,eAAO,MAAM,sBAAsB;;;;;;;;;EAU/B,CAAC;AAEL;;;;GAIG;AACH,eAAO,MAAM,kBAAkB;;;;;;;;;;;EAI9B,CAAC;AAEF,eAAO,MAAM,2BAA2B;;EAEtC,CAAC;AAEH;;;;GAIG;AACH,eAAO,MAAM,4BAA4B;;;;;;;;;EAExC,CAAC;AAEF;;;;GAIG;AACH,MAAM,MAAM,gBAAgB,CAC1B,OAAO,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,OAAO,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,IACzE;IACF,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,EAAE,EAAE,MAAM,CAAC;IACX,WAAW,EAAE,MAAM,CAAC;IACpB,aAAa,EAAE,MAAM,CAAC;IACtB,QAAQ,EAAE,MAAM,CAAC;IACjB,YAAY,EAAE,MAAM,CAAC;IACrB,OAAO,EAAE,OAAO,CAAC;CAClB,CAAC;AAEF,MAAM,MAAM,SAAS,GAAG,MAAM,CAAC;AAE/B;;;GAGG;AACH,MAAM,MAAM,sBAAsB,GAAG,gBAAgB,CAAC,OAAO,CAAC,CAAC;AAC/D,MAAM,MAAM,iBAAiB,GAAG,MAAM,CAAC;AAEvC;;;;;;;;;;GAUG;AACH,wBAAgB,GAAG,CAAC,OAAO,SAAS,MAAM,EACxC,IAAI,EAAE,MAAM,EACZ,EAAE,EAAE,MAAM,EACV,OAAO,EAAE,MAAM,EACf,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,OAAO,GACf,gBAAgB,CAAC,OAAO,CAAC,CAW3B;AAED;;;;;GAKG;AACH,wBAAgB,KAAK,CAAC,OAAO,SAAS,MAAM,EAC1C,GAAG,EAAE,sBAAsB,EAC3B,QAAQ,EAAE,OAAO,GAChB,gBAAgB,CAAC,OAAO,CAAC,CAS3B;AAED;;;;;;GAMG;AACH,wBAAgB,WAAW,CACzB,IAAI,EAAE,iBAAiB,EACvB,EAAE,EAAE,iBAAiB,EACrB,OAAO,EAAE,MAAM,EACf,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,MAAM;;GAOf;AAED;;;;GAIG;AACH,wBAAgB,KAAK,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAElD;AAED;;;;GAIG;AACH,wBAAgB,YAAY,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAIzD;AAED;;;;GAIG;AACH,wBAAgB,aAAa,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAK1D"}

package/dist/transport/message.js

@@ -65,12 +65,27 @@ export function msg(from, to, service, proc, stream, payload) {
 export function reply(msg, response) {
     return {
         ...msg,
+        controlFlags: 0,
         id: nanoid(),
         to: msg.from,
         from: msg.to,
         payload: response,
     };
 }
+/**
+ * Create a request to close a stream
+ * @param from The ID of the client initiating the close.
+ * @param to The ID of the client being closed.
+ * @param respondTo The transport message to respond to.
+ * @returns The close message
+ */
+export function closeStream(from, to, service, proc, stream) {
+    const closeMessage = msg(from, to, service, proc, stream, {
+        type: 'CLOSE',
+    });
+    closeMessage.controlFlags |= 4 /* ControlFlags.StreamClosedBit */;
+    return closeMessage;
+}
 /**
  * Checks if the given control flag (usually found in msg.controlFlag) is an ack message.
  * @param controlFlag - The control flag to check.