@replit/river 0.6.2 → 0.6.4

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

@@ -29,7 +29,7 @@ export declare class WebSocketTransport extends Transport {
      * A flag indicating whether the transport has been destroyed.
      * A destroyed transport will not attempt to reconnect and cannot be used again.
      */
-    destroyed: boolean;
+    state: 'open' | 'closed' | 'destroyed';
     /**
      * An ongoing reconnect attempt if it exists. When the attempt finishes, it contains a
      * {@link WebSocketResult} object when a connection is established or an error occurs.
@@ -59,9 +59,13 @@ export declare class WebSocketTransport extends Transport {
      */
     send(msg: OpaqueTransportMessage): MessageId;
     /**
-     * Destroys the WebSocket transport and marks it as unusable.
+     * Closes the WebSocket transport. Any messages sent while the transport is closed will be silently discarded.
      */
     close(): Promise<void | undefined>;
+    /**
+     * Destroys the WebSocket transport. Any messages sent while the transport is closed will throw an error.
+     */
+    destroy(): Promise<void | undefined>;
 }
 export {};
 //# sourceMappingURL=ws.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"ws.d.ts","sourceRoot":"","sources":["../../../transport/impls/ws.ts"],"names":[],"mappings":";AAAA,OAAO,SAAS,MAAM,eAAe,CAAC;AACtC,OAAO,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AAErC,OAAO,EACL,SAAS,EACT,sBAAsB,EACtB,iBAAiB,EAClB,MAAM,YAAY,CAAC;AAEpB,OAAO,EAAE,KAAK,KAAK,EAAE,MAAM,aAAa,CAAC;AAEzC,UAAU,OAAO;IACf,eAAe,EAAE,MAAM,CAAC;IACxB,KAAK,EAAE,KAAK,CAAC;IACb,UAAU,EAAE,aAAa,GAAG,MAAM,CAAC;CACpC;AAQD,KAAK,eAAe,GAAG;IAAE,EAAE,EAAE,SAAS,CAAA;CAAE,GAAG;IAAE,GAAG,EAAE,MAAM,CAAA;CAAE,CAAC;AAE3D;;;;GAIG;AACH,qBAAa,kBAAmB,SAAQ,SAAS;IAC/C;;OAEG;IACH,QAAQ,EAAE,MAAM,OAAO,CAAC,SAAS,CAAC,CAAC;IACnC,EAAE,CAAC,EAAE,SAAS,CAAC;IACf,OAAO,EAAE,OAAO,CAAC;IAEjB;;;OAGG;IACH,SAAS,EAAE,OAAO,CAAC;IAEnB;;;OAGG;IACH,gBAAgB,CAAC,EAAE,OAAO,CAAC,eAAe,CAAC,CAAC;IAE5C;;;OAGG;IACH,SAAS,EAAE,KAAK,CAAC,SAAS,CAAC,CAAC;IAE5B;;;;;OAKG;gBAED,QAAQ,EAAE,MAAM,OAAO,CAAC,SAAS,CAAC,EAClC,QAAQ,EAAE,iBAAiB,EAC3B,eAAe,CAAC,EAAE,OAAO,CAAC,OAAO,CAAC;IAWpC;;OAEG;YACW,UAAU;IAmExB;;;;;OAKG;IACH,IAAI,CAAC,GAAG,EAAE,sBAAsB,GAAG,SAAS;IAyB5C;;OAEG;IACG,KAAK;CAKZ"}
+{"version":3,"file":"ws.d.ts","sourceRoot":"","sources":["../../../transport/impls/ws.ts"],"names":[],"mappings":";AAAA,OAAO,SAAS,MAAM,eAAe,CAAC;AACtC,OAAO,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AAErC,OAAO,EACL,SAAS,EACT,sBAAsB,EACtB,iBAAiB,EAClB,MAAM,YAAY,CAAC;AAEpB,OAAO,EAAE,KAAK,KAAK,EAAE,MAAM,aAAa,CAAC;AAEzC,UAAU,OAAO;IACf,eAAe,EAAE,MAAM,CAAC;IACxB,KAAK,EAAE,KAAK,CAAC;IACb,UAAU,EAAE,aAAa,GAAG,MAAM,CAAC;CACpC;AAQD,KAAK,eAAe,GAAG;IAAE,EAAE,EAAE,SAAS,CAAA;CAAE,GAAG;IAAE,GAAG,EAAE,MAAM,CAAA;CAAE,CAAC;AAE3D;;;;GAIG;AACH,qBAAa,kBAAmB,SAAQ,SAAS;IAC/C;;OAEG;IACH,QAAQ,EAAE,MAAM,OAAO,CAAC,SAAS,CAAC,CAAC;IACnC,EAAE,CAAC,EAAE,SAAS,CAAC;IACf,OAAO,EAAE,OAAO,CAAC;IAEjB;;;OAGG;IACH,KAAK,EAAE,MAAM,GAAG,QAAQ,GAAG,WAAW,CAAC;IAEvC;;;OAGG;IACH,gBAAgB,CAAC,EAAE,OAAO,CAAC,eAAe,CAAC,CAAC;IAE5C;;;OAGG;IACH,SAAS,EAAE,KAAK,CAAC,SAAS,CAAC,CAAC;IAE5B;;;;;OAKG;gBAED,QAAQ,EAAE,MAAM,OAAO,CAAC,SAAS,CAAC,EAClC,QAAQ,EAAE,iBAAiB,EAC3B,eAAe,CAAC,EAAE,OAAO,CAAC,OAAO,CAAC;IAWpC;;OAEG;YACW,UAAU;IAuExB;;;;;OAKG;IACH,IAAI,CAAC,GAAG,EAAE,sBAAsB,GAAG,SAAS;IA4B5C;;OAEG;IACG,KAAK;IAMX;;OAEG;IACG,OAAO;CAKd"}

package/dist/transport/impls/ws.js

@@ -22,7 +22,7 @@ export class WebSocketTransport extends Transport {
      * A flag indicating whether the transport has been destroyed.
      * A destroyed transport will not attempt to reconnect and cannot be used again.
      */
-    destroyed;
+    state;
     /**
      * An ongoing reconnect attempt if it exists. When the attempt finishes, it contains a
      * {@link WebSocketResult} object when a connection is established or an error occurs.
@@ -42,7 +42,7 @@ export class WebSocketTransport extends Transport {
     constructor(wsGetter, clientId, providedOptions) {
         const options = { ...defaultOptions, ...providedOptions };
         super(options.codec, clientId);
-        this.destroyed = false;
+        this.state = 'open';
         this.wsGetter = wsGetter;
         this.options = options;
         this.sendQueue = [];
@@ -52,6 +52,9 @@ export class WebSocketTransport extends Transport {
      * Begins a new attempt to establish a WebSocket connection.
      */
     async tryConnect() {
+        if (this.state !== 'open') {
+            return;
+        }
         // wait until it's ready or we get an error
         this.reconnectPromise ??= new Promise(async (resolve) => {
             log?.info(`${this.clientId} -- establishing a new websocket`);
@@ -113,11 +116,15 @@ export class WebSocketTransport extends Transport {
      */
     send(msg) {
         const id = msg.id;
-        if (this.destroyed) {
+        if (this.state === 'destroyed') {
             const err = 'ws is destroyed, cant send';
-            log?.error(err);
+            log?.error(err + `: ${JSON.stringify(msg)}`);
             throw new Error(err);
         }
+        else if (this.state === 'closed') {
+            log?.info(`ws is closed, discarding msg: ${JSON.stringify(msg)}`);
+            return msg.id;
+        }
         this.sendBuffer.set(id, msg);
         if (this.ws && this.ws.readyState === this.ws.OPEN) {
             log?.info(`${this.clientId} -- sending ${JSON.stringify(msg)}`);
@@ -131,11 +138,19 @@ export class WebSocketTransport extends Transport {
         return id;
     }
     /**
-     * Destroys the WebSocket transport and marks it as unusable.
+     * Closes the WebSocket transport. Any messages sent while the transport is closed will be silently discarded.
      */
     async close() {
-        log?.info('manually closed ws');
-        this.destroyed = true;
+        log?.info('closed ws transport');
+        this.state = 'closed';
+        return this.ws?.close();
+    }
+    /**
+     * Destroys the WebSocket transport. Any messages sent while the transport is closed will throw an error.
+     */
+    async destroy() {
+        log?.info('destroyed ws transport');
+        this.state = 'destroyed';
         return this.ws?.close();
     }
 }

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

@@ -52,13 +52,13 @@ describe('retry logic', async () => {
         clientTransport.send(msg2);
         return expect(waitForMessage(serverTransport, (recv) => recv.id === msg2.id)).resolves.toStrictEqual(msg2.payload);
     });
-    test('ws transport is not recreated after manually closing', async () => {
+    test('ws transport is not recreated after destroy', async () => {
         const [clientTransport, serverTransport] = createWsTransports(port, wss);
         const msg1 = createDummyTransportMessage();
         const msg2 = createDummyTransportMessage();
         clientTransport.send(msg1);
         await expect(waitForMessage(serverTransport, (recv) => recv.id === msg1.id)).resolves.toStrictEqual(msg1.payload);
-        clientTransport.close();
+        clientTransport.destroy();
         return expect(() => clientTransport.send(msg2)).toThrow(new Error('ws is destroyed, cant send'));
     });
 });

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

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../transport/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAC;AAEvC,OAAO,EAEL,SAAS,EACT,sBAAsB,EAGtB,iBAAiB,EAGlB,MAAM,WAAW,CAAC;AAGnB;;;;GAIG;AACH,8BAAsB,SAAS;IAC7B;;OAEG;IACH,KAAK,EAAE,KAAK,CAAC;IAEb;;OAEG;IACH,QAAQ,EAAE,iBAAiB,CAAC;IAE5B;;OAEG;IACH,QAAQ,EAAE,GAAG,CAAC,CAAC,GAAG,EAAE,sBAAsB,KAAK,IAAI,CAAC,CAAC;IAGrD;;OAEG;IACH,UAAU,EAAE,GAAG,CAAC,SAAS,EAAE,sBAAsB,CAAC,CAAC;IAEnD;;;;OAIG;gBACS,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,iBAAiB;IAOrD;;;;OAIG;IACH,SAAS,CAAC,GAAG,EAAE,UAAU;IA2CzB;;;OAGG;IACH,kBAAkB,CAAC,OAAO,EAAE,CAAC,GAAG,EAAE,sBAAsB,KAAK,IAAI,GAAG,IAAI;IAIxE;;;OAGG;IACH,qBAAqB,CAAC,OAAO,EAAE,CAAC,GAAG,EAAE,sBAAsB,KAAK,IAAI,GAAG,IAAI;IAI3E,QAAQ,CAAC,IAAI,CAAC,GAAG,EAAE,sBAAsB,GAAG,SAAS;IACrD,QAAQ,CAAC,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;CAChC"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../transport/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAC;AAEvC,OAAO,EAEL,SAAS,EACT,sBAAsB,EAGtB,iBAAiB,EAGlB,MAAM,WAAW,CAAC;AAGnB;;;;GAIG;AACH,8BAAsB,SAAS;IAC7B;;OAEG;IACH,KAAK,EAAE,KAAK,CAAC;IAEb;;OAEG;IACH,QAAQ,EAAE,iBAAiB,CAAC;IAE5B;;OAEG;IACH,QAAQ,EAAE,GAAG,CAAC,CAAC,GAAG,EAAE,sBAAsB,KAAK,IAAI,CAAC,CAAC;IAGrD;;OAEG;IACH,UAAU,EAAE,GAAG,CAAC,SAAS,EAAE,sBAAsB,CAAC,CAAC;IAEnD;;;;OAIG;gBACS,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,iBAAiB;IAOrD;;;;OAIG;IACH,SAAS,CAAC,GAAG,EAAE,UAAU;IAoDzB;;;OAGG;IACH,kBAAkB,CAAC,OAAO,EAAE,CAAC,GAAG,EAAE,sBAAsB,KAAK,IAAI,GAAG,IAAI;IAIxE;;;OAGG;IACH,qBAAqB,CAAC,OAAO,EAAE,CAAC,GAAG,EAAE,sBAAsB,KAAK,IAAI,GAAG,IAAI;IAI3E,QAAQ,CAAC,IAAI,CAAC,GAAG,EAAE,sBAAsB,GAAG,SAAS;IACrD,QAAQ,CAAC,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;CAChC"}

package/dist/transport/types.js

@@ -43,20 +43,24 @@ export class Transport {
     onMessage(msg) {
         const parsedMsg = this.codec.fromBuffer(msg);
         if (parsedMsg === null) {
-            log?.warn(`${this.clientId} -- received malformed msg: ${msg.toString()}`);
+            log?.warn(`${this.clientId} -- received malformed msg: ${new TextDecoder().decode(msg)}`);
             return;
         }
+        let stringifiedMessage;
+        if (log) {
+            stringifiedMessage = JSON.stringify(parsedMsg);
+        }
         if (Value.Check(TransportAckSchema, parsedMsg) &&
             isAck(parsedMsg.controlFlags)) {
             // process ack
-            log?.info(`${this.clientId} -- received ack: ${msg.toString()}`);
+            log?.info(`${this.clientId} -- received ack: ${stringifiedMessage}`);
             if (this.sendBuffer.has(parsedMsg.payload.ack)) {
                 this.sendBuffer.delete(parsedMsg.payload.ack);
             }
         }
         else if (Value.Check(OpaqueTransportMessageSchema, parsedMsg)) {
             // regular river message
-            log?.info(`${this.clientId} -- received msg: ${msg.toString()}`);
+            log?.info(`${this.clientId} -- received msg: ${stringifiedMessage}`);
             // ignore if not for us
             if (parsedMsg.to !== this.clientId && parsedMsg.to !== 'broadcast') {
                 return;
@@ -71,7 +75,7 @@ export class Transport {
             this.send(ackMsg);
         }
         else {
-            log?.warn(`${this.clientId} -- received invalid transport msg: ${msg.toString()}`);
+            log?.warn(`${this.clientId} -- received invalid transport msg: ${stringifiedMessage}`);
         }
     }
     /**

package/package.json

@@ -2,7 +2,7 @@
   "name": "@replit/river",
   "sideEffects": false,
   "description": "It's like tRPC but... with JSON Schema Support, duplex streaming and support for service multiplexing. Transport agnostic!",
-  "version": "0.6.2",
+  "version": "0.6.4",
   "type": "module",
   "exports": {
     ".": "./dist/router/index.js",