@grvt/client 1.5.3 → 1.5.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@grvt/client",
-  "version": "1.5.3",
+  "version": "1.5.5",
   "description": "Node.js & JavaScript client for GRVT REST APIs & WebSockets",
   "repository": {
     "type": "git",

package/ws/ws.d.ts

@@ -16,6 +16,7 @@ interface IOptions {
 }
 export declare class WS {
     private _retries;
+    private _paused;
     private _connecting;
     private readonly _version;
     private readonly _options;
@@ -55,7 +56,8 @@ export declare class WS {
     onClose(callback: (e: CloseEvent) => void): () => void;
     private readonly _onErrors;
     onError(callback: (e: Event | WSError) => void): () => void;
-    private _subscribeCurrentPairs;
+    private _pause;
+    private _resume;
     private _subscribe;
     /**
      * Only supports one feed
@@ -66,5 +68,7 @@ export declare class WS {
     connect(): this;
     disconnect(): this;
     ready(delay?: number): Promise<unknown>;
+    pause(): this;
+    resume(): this;
 }
 export {};

package/ws/ws.js

@@ -55,6 +55,7 @@ class WS {
     }
     constructor(options) {
         this._retries = 0;
+        this._paused = false;
         this._connecting = true;
         this._version = 'v1';
         /**
@@ -130,7 +131,7 @@ class WS {
                 this._close(currentWs);
                 return;
             }
-            this._subscribeCurrentPairs();
+            this._resume();
         });
         currentWs.addEventListener('close', () => {
             // only keep the latest ws
@@ -177,7 +178,7 @@ class WS {
                         }
                     }
                     else {
-                        console.error(error);
+                        console.warn(error);
                     }
                 }
                 return;
@@ -198,6 +199,12 @@ class WS {
                 return;
             }
             const consumers = (() => {
+                /**
+                 * If paused, do not send any message to consumers
+                 */
+                if (this._paused) {
+                    return [];
+                }
                 switch (stream) {
                     case interfaces_1.EStream.DEPOSIT:
                     case interfaces_1.EStream.TRANSFER:
@@ -207,11 +214,6 @@ class WS {
                         return this._getSelectorConsumers({ stream, selector });
                 }
             })();
-            if (!(consumers === null || consumers === void 0 ? void 0 : consumers.length)) {
-                // There are delay in sending unsubscribe message so clients might receive messages after unsubscribing
-                // console.log('TODO: send unsubscribe with by message:', message, result)
-                return;
-            }
             if (result && (consumers === null || consumers === void 0 ? void 0 : consumers.length)) {
                 for (const consumer of consumers) {
                     typeof consumer === 'function' && consumer(result);
@@ -586,10 +588,14 @@ class WS {
                 }
                 const primaryGroup = this._pairs[key];
                 const _a = primaryGroup, _b = consumerKey, _ = _a[_b], keep = __rest(_a, [typeof _b === "symbol" ? _b : _b + ""]);
-                this._pairs[key] = keep;
                 if (Object.keys(keep).length) {
+                    this._pairs[key] = keep;
                     needUnsubscribe = false;
                 }
+                else {
+                    // eslint-disable-next-line @typescript-eslint/no-dynamic-delete
+                    delete this._pairs[key];
+                }
             }
             if (needUnsubscribe) {
                 if (!toUnsubscribe[stream]) {
@@ -645,7 +651,38 @@ class WS {
             this._onErrors.splice(this._onErrors.indexOf(callback), 1);
         };
     }
-    _subscribeCurrentPairs() {
+    _pause() {
+        this._paused = true;
+        const pairs = Object.keys(this._pairs);
+        const groupStreams = {};
+        // keep last primary stream
+        for (const pair of pairs.reverse()) {
+            const { stream, feed } = this._parsePair(pair);
+            if (!groupStreams[stream]) {
+                groupStreams[stream] = [];
+            }
+            const primaryFeed = feed.split('@')[0];
+            if (!groupStreams[stream].some((f) => f.startsWith(`${primaryFeed}@`))) {
+                groupStreams[stream].push(feed);
+            }
+        }
+        const streams = Object.keys(groupStreams);
+        for (const stream of streams) {
+            this._sendMessage({
+                method: 'unsubscribe',
+                stream,
+                feed: groupStreams[stream]
+            });
+        }
+    }
+    _resume() {
+        /**
+         * If not paused, do nothing
+         */
+        if (!this._paused) {
+            return;
+        }
+        this._paused = false;
         const pairs = Object.keys(this._pairs);
         const groupStreams = {};
         // keep last primary stream
@@ -718,7 +755,9 @@ class WS {
             throw new Error('Unknown stream or feed');
         }
         const pair = this._getPair({ stream, feed });
-        void this._subscribe(pair, subscribePayload).catch(onError);
+        void this._subscribe(pair, subscribePayload).catch((error) => {
+            onError === null || onError === void 0 ? void 0 : onError(error);
+        });
         return this._addConsumer(pair, onMessage);
     }
     subscribes(...subscriptions) {
@@ -830,5 +869,13 @@ class WS {
             }, delay);
         });
     }
+    pause() {
+        this._pause();
+        return this;
+    }
+    resume() {
+        this._resume();
+        return this;
+    }
 }
 exports.WS = WS;