@grvt/client 1.5.0 → 1.5.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@grvt/client",
-  "version": "1.5.0",
+  "version": "1.5.1",
   "description": "Node.js & JavaScript client for GRVT REST APIs & WebSockets",
   "repository": {
     "type": "git",
@@ -33,7 +33,7 @@
     "test": "nodemon dist/index.js"
   },
   "dependencies": {
-    "axios": "^1.8.2"
+    "axios": "^1.11.0"
   },
   "devDependencies": {
     "@typescript-eslint/eslint-plugin": "^6.10.0",

package/ws/interfaces.d.ts

@@ -1,4 +1,4 @@
-import { type ECandlestickInterval, type ECandlestickType, type IWSCandlestickFeedDataV1, type IWSCandlestickFeedSelectorV1, type IWSDepositFeedDataV1, type IWSDepositFeedSelectorV1, type IWSFillFeedDataV1, type IWSFillFeedSelectorV1, type IWSMiniTickerFeedDataV1, type IWSMiniTickerFeedSelectorV1, type IWSOrderFeedDataV1, type IWSOrderFeedSelectorV1, type IWSOrderGroupFeedDataV1, type IWSOrderStateFeedDataV1, type IWSOrderStateFeedSelectorV1, type IWSOrderbookLevelsFeedDataV1, type IWSOrderbookLevelsFeedSelectorV1, type IWSPositionsFeedDataV1, type IWSPositionsFeedSelectorV1, type IWSTickerFeedDataV1, type IWSTickerFeedSelectorV1, type IWSTradeFeedDataV1, type IWSTradeFeedSelectorV1, type IWSTransferFeedDataV1, type IWSTransferFeedSelectorV1, type IWSWithdrawalFeedDataV1, type IWSWithdrawalFeedSelectorV1 } from '../interfaces';
+import type { ECandlestickInterval, ECandlestickType, IWSCandlestickFeedDataV1, IWSCandlestickFeedSelectorV1, IWSDepositFeedDataV1, IWSDepositFeedSelectorV1, IWSFillFeedDataV1, IWSFillFeedSelectorV1, IWSMiniTickerFeedDataV1, IWSMiniTickerFeedSelectorV1, IWSOrderFeedDataV1, IWSOrderFeedSelectorV1, IWSOrderGroupFeedDataV1, IWSOrderStateFeedDataV1, IWSOrderStateFeedSelectorV1, IWSOrderbookLevelsFeedDataV1, IWSOrderbookLevelsFeedSelectorV1, IWSPositionsFeedDataV1, IWSPositionsFeedSelectorV1, IWSTickerFeedDataV1, IWSTickerFeedSelectorV1, IWSTradeFeedDataV1, IWSTradeFeedSelectorV1, IWSTransferFeedDataV1, IWSTransferFeedSelectorV1, IWSWithdrawalFeedDataV1, IWSWithdrawalFeedSelectorV1 } from '../interfaces';
 export declare enum EStream {
     CANDLE = "candle",
     MINI_DELTA = "mini.d",

package/ws/ws.js

@@ -597,30 +597,45 @@ class WS {
         this._pairs[pair][consumerKey] = onMessage;
         return `${pair}__${consumerKey}`;
     }
-    _removeConsumer(pairedConsumerKey) {
-        const [stream, feed, consumerKey] = pairedConsumerKey.split('__');
-        const pairKey = this._getPair({ stream, feed });
-        if (!this._pairs[pairKey]) {
-            return;
-        }
-        let needUnsubscribe = true;
-        const pairPrimary = pairKey.split('@')[0];
-        for (const key of Object.keys(this._pairs)) {
-            if (key.split('@')[0] !== pairPrimary) {
-                continue;
+    _removeConsumer(...pairedConsumerKeys) {
+        const toUnsubscribe = {};
+        for (const pairedConsumerKey of pairedConsumerKeys) {
+            const [stream, feed, consumerKey] = pairedConsumerKey.split('__');
+            const pairKey = this._getPair({ stream, feed });
+            if (!this._pairs[pairKey]) {
+                return;
+            }
+            let needUnsubscribe = true;
+            const pairPrimary = pairKey.split('@')[0];
+            for (const key of Object.keys(this._pairs)) {
+                if (key.split('@')[0] !== pairPrimary) {
+                    continue;
+                }
+                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) {
+                    needUnsubscribe = false;
+                }
             }
-            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) {
-                needUnsubscribe = false;
+            if (needUnsubscribe) {
+                if (!toUnsubscribe[stream]) {
+                    toUnsubscribe[stream] = [];
+                }
+                const primaryFeed = feed.split('@')[0];
+                if (!toUnsubscribe[stream].some((f) => f.startsWith(`${primaryFeed}@`))) {
+                    toUnsubscribe[stream].push(feed);
+                }
             }
         }
-        if (needUnsubscribe) {
+        /**
+         * Send unsubscribes
+         */
+        for (const stream of Object.keys(toUnsubscribe)) {
             this._sendMessage({
                 method: 'unsubscribe',
                 stream,
-                feed: [feed]
+                feed: toUnsubscribe[stream]
             });
         }
     }
@@ -814,9 +829,7 @@ class WS {
         });
     }
     unsubscribe(...pairedConsumerKeys) {
-        for (const pairedConsumerKey of pairedConsumerKeys) {
-            this._removeConsumer(pairedConsumerKey);
-        }
+        this._removeConsumer(...pairedConsumerKeys);
         return this;
     }
     connect() {