@grvt/client 1.4.10 → 1.4.12-fix.0

package/package.json

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

package/ws/ws.js

@@ -24,6 +24,7 @@ exports.WS = void 0;
 const interfaces_1 = require("../interfaces");
 const utils_1 = require("../utils");
 const interfaces_2 = require("./interfaces");
+const omitZeroStr = (str) => str === '0' ? '' : str;
 class WS {
     get _ws() {
         if (!this.__ws) {
@@ -213,16 +214,16 @@ class WS {
             if (!key.startsWith(`${stream}__`)) {
                 return acc;
             }
-            const depositDestinationAccountId = result.to_account_id;
+            const depositDestinationAccountId = omitZeroStr(result.to_account_id);
             const transferSourceKey = [
-                result.from_account_id,
-                result.from_sub_account_id ? result.from_sub_account_id : 0
+                omitZeroStr(result.from_account_id),
+                omitZeroStr(result.from_sub_account_id) ? result.from_sub_account_id : 0
             ].filter(Boolean).join('-');
             const transferDestinationKey = [
-                result.to_account_id,
-                result.to_sub_account_id ? result.to_sub_account_id : 0
+                omitZeroStr(result.to_account_id),
+                omitZeroStr(result.to_sub_account_id) ? result.to_sub_account_id : 0
             ].filter(Boolean).join('-');
-            const withdrawalFromAccountId = result.from_account_id;
+            const withdrawalFromAccountId = omitZeroStr(result.from_account_id);
             switch (stream) {
                 case interfaces_2.EStream.GROUP:
                     return [...acc, ...Object.values(value)];
@@ -253,7 +254,7 @@ class WS {
      */
     _getInstrumentConsumers({ result, stream, instrument }) {
         return Object.entries(this._pairs).reduce((acc, [key, value]) => {
-            var _a, _b, _c;
+            var _a, _b, _c, _d;
             if (!key.startsWith(`${stream}__`)) {
                 return acc;
             }
@@ -268,22 +269,22 @@ class WS {
             ].includes(stream);
             // no sub account id handling
             if (!hasSubAccountId) {
-                return key.includes(instrument)
+                return key.startsWith(`${stream}__${instrument}`)
                     ? [...acc, ...Object.values(value)]
                     : acc;
             }
             // has sub account id handling
-            const subAccountId = String(result.sub_account_id);
+            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 = (_a = this._parseStream({
+            const feed = (_b = this._parseStream({
                 stream: stream,
                 params: {
-                    sub_account_id: subAccountId,
+                    sub_account_id: omitZeroStr(subAccountId),
                     instrument
                 }
-            })) === null || _a === void 0 ? void 0 : _a.feed;
-            const tdgFeedPrefix = (_c = (_b = feed === null || feed === void 0 ? void 0 : feed[0]) === null || _b === void 0 ? void 0 : _b.split('@')) === null || _c === void 0 ? void 0 : _c[0];
+            })) === 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)];
             }