@grvt/client 1.5.1 → 1.5.2

package/package.json

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

package/ws/ws.d.ts

@@ -27,14 +27,13 @@ export declare class WS {
     private _bindWebSocketListeners;
     /**
      * Only use for TDG
-     * Use for TEntities of GROUP | STATE | DEPOSIT | TRANSFER | WITHDRAWAL streams
+     * Use for TEntities of DEPOSIT | TRANSFER | WITHDRAWAL streams
      */
-    private _getNonInstrumentConsumers;
+    private _getHistoryConsumers;
     /**
      * Use for MDG/TDG
-     * Use for TEntityHasInstrument
      */
-    private _getInstrumentConsumers;
+    private _getSelectorConsumers;
     private _parseStream;
     private _messageLiteToFull;
     private _sendMessage;

package/ws/ws.js

@@ -149,7 +149,7 @@ class WS {
             reconnect();
         });
         currentWs.addEventListener('message', (e) => {
-            var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
+            var _a, _b, _c, _d, _e, _f;
             // only keep the latest ws
             if (currentWs !== this.__ws) {
                 this._close(currentWs);
@@ -183,12 +183,13 @@ class WS {
                 return;
             }
             const stream = message.s = (_f = (_e = message.s) === null || _e === void 0 ? void 0 : _e.replace) === null || _f === void 0 ? void 0 : _f.call(_e, `${this._version}.`, '');
+            const selector = typeof message.s1 === 'string' ? message.s1 : '';
             const result = this._messageLiteToFull(message);
             // no entity found
-            if (!result) {
+            if (!selector || !result) {
                 // if no entity found and not a subscription message
-                if (!((_g = message.s1) === null || _g === void 0 ? void 0 : _g.length)) {
-                    console.warn('Error: something went wrong with message', message);
+                if (typeof message.s1 === 'string') {
+                    console.warn('Error: not found selector', message);
                 }
                 return;
             }
@@ -196,13 +197,16 @@ class WS {
                 console.warn('Error: cannot parse stream or feed from message', message);
                 return;
             }
-            const instrument = (_k = (_j = (_h = result === null || result === void 0 ? void 0 : result.legs) === null || _h === void 0 ? void 0 : _h[0]) === null || _j === void 0 ? void 0 : _j.instrument) !== null && _k !== void 0 ? _k : result === null || result === void 0 ? void 0 : result.instrument;
-            /**
-             * Handle subscriptions with instrument
-             */
-            const consumers = instrument
-                ? this._getInstrumentConsumers({ stream, instrument, result })
-                : this._getNonInstrumentConsumers({ stream, result });
+            const consumers = (() => {
+                switch (stream) {
+                    case interfaces_1.EStream.DEPOSIT:
+                    case interfaces_1.EStream.TRANSFER:
+                    case interfaces_1.EStream.WITHDRAWAL:
+                        return this._getHistoryConsumers({ stream, result });
+                    default:
+                        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)
@@ -244,9 +248,9 @@ class WS {
     }
     /**
      * Only use for TDG
-     * Use for TEntities of GROUP | STATE | DEPOSIT | TRANSFER | WITHDRAWAL streams
+     * Use for TEntities of DEPOSIT | TRANSFER | WITHDRAWAL streams
      */
-    _getNonInstrumentConsumers({ result, stream }) {
+    _getHistoryConsumers({ result, stream }) {
         return Object.entries(this._pairs).reduce((acc, [key, value]) => {
             if (!key.startsWith(`${stream}__`)) {
                 return acc;
@@ -262,10 +266,6 @@ class WS {
             ].filter(Boolean).join('-');
             const withdrawalFromAccountId = omitZeroStr(result.from_account_id);
             switch (stream) {
-                case interfaces_1.EStream.GROUP:
-                    return [...acc, ...Object.values(value)];
-                case interfaces_1.EStream.STATE:
-                    return [...acc, ...Object.values(value)];
                 case interfaces_1.EStream.DEPOSIT:
                     if (depositDestinationAccountId && key.endsWith(depositDestinationAccountId)) {
                         return [...acc, ...Object.values(value)];
@@ -287,45 +287,18 @@ class WS {
     }
     /**
      * Use for MDG/TDG
-     * Use for TEntityHasInstrument
      */
-    _getInstrumentConsumers({ result, stream, instrument }) {
+    _getSelectorConsumers({ stream, selector }) {
+        const selectorPrimary = selector.split('@')[0];
         return Object.entries(this._pairs).reduce((acc, [key, value]) => {
-            var _a, _b, _c, _d;
-            if (!key.startsWith(`${stream}__`)) {
+            const pairPrefix = `${stream}__${selectorPrimary}`;
+            const isKeyMatch = key.includes('@')
+                ? key.startsWith(pairPrefix)
+                : key === pairPrefix;
+            if (!isKeyMatch) {
                 return acc;
             }
-            const hasSubAccountId = [
-                interfaces_1.EStream.ORDER,
-                // EStream.STATE,
-                interfaces_1.EStream.POSITION,
-                interfaces_1.EStream.FILL
-                // EStream.DEPOSIT,
-                // EStream.TRANSFER,
-                // EStream.WITHDRAWAL
-            ].includes(stream);
-            // no sub account id handling
-            if (!hasSubAccountId) {
-                return key.startsWith(`${stream}__${instrument}`)
-                    ? [...acc, ...Object.values(value)]
-                    : acc;
-            }
-            // has sub account id handling
-            const subAccountId = String((_a = result.sub_account_id) !== null && _a !== void 0 ? _a : '');
-            // const subAccountId = String((result as IPositions).sub_account_id)
-            // const subAccountId = String((result as IFill).sub_account_id)
-            const feed = (_b = this._parseStream({
-                stream: stream,
-                params: {
-                    sub_account_id: omitZeroStr(subAccountId),
-                    instrument
-                }
-            })) === null || _b === void 0 ? void 0 : _b.feed;
-            const tdgFeedPrefix = (_d = (_c = feed === null || feed === void 0 ? void 0 : feed[0]) === null || _c === void 0 ? void 0 : _c.split('@')) === null || _d === void 0 ? void 0 : _d[0];
-            if (tdgFeedPrefix && key.startsWith(`${stream}__${tdgFeedPrefix}`)) {
-                return [...acc, ...Object.values(value)];
-            }
-            return acc;
+            return [...acc, ...Object.values(value)];
         }, []);
     }
     _parseStream(options) {
@@ -707,7 +680,7 @@ class WS {
             const onPaired = (e) => {
                 var _a, _b, _c;
                 const message = utils_1.JsonUtils.parse(e.data);
-                if (!(message === null || message === void 0 ? void 0 : message.s) || !((_a = message === null || message === void 0 ? void 0 : message.s1) === null || _a === void 0 ? void 0 : _a.length)) {
+                if (!(message === null || message === void 0 ? void 0 : message.s) || !((_a = message === null || message === void 0 ? void 0 : message.s1) === null || _a === void 0 ? void 0 : _a.length) || typeof message.s1 === 'string') {
                     return;
                 }
                 const responseStream = (_c = (_b = message.s) === null || _b === void 0 ? void 0 : _b.replace) === null || _c === void 0 ? void 0 : _c.call(_b, `${this._version}.`, '');
@@ -790,7 +763,7 @@ class WS {
                 const onPaired = (e) => {
                     var _a, _b, _c;
                     const message = utils_1.JsonUtils.parse(e.data);
-                    if (!(message === null || message === void 0 ? void 0 : message.s) || !((_a = message === null || message === void 0 ? void 0 : message.s1) === null || _a === void 0 ? void 0 : _a.length)) {
+                    if (!(message === null || message === void 0 ? void 0 : message.s) || !((_a = message === null || message === void 0 ? void 0 : message.s1) === null || _a === void 0 ? void 0 : _a.length) || typeof message.s1 === 'string') {
                         return;
                     }
                     const responseStream = (_c = (_b = message.s) === null || _b === void 0 ? void 0 : _b.replace) === null || _c === void 0 ? void 0 : _c.call(_b, `${this._version}.`, '');