market-data-tradingview-ws 0.0.13 → 0.0.15

package/lib/client.js

@@ -17,6 +17,11 @@ const periods = {
   2592000: '1M',
 };
 
+const extractJSON = (str) => {
+  const match = str.match(/\{.*?\}/s);
+  return match ? JSON.parse(match[0]) : null;
+}
+
 let ws = null;
 
 module.exports = class Client {
@@ -237,7 +242,7 @@ module.exports = class Client {
     }
     // console.warn('modules addChartSymbol1', symbol, period, limit, key);
     const deleted = this.#charts.getDeleted();
-    if (deleted !== null && deleted.limit >= limit) return this.updateChartSymbol({ symbol, period, limit, last: { symbol: deleted.symbol, period: parseInt(deleted.period) }});
+    if (deleted !== null && deleted.limit === limit) return this.updateChartSymbol({ symbol, period, limit, last: { symbol: deleted.symbol, period: parseInt(deleted.period) }});
 
     key = this.createChartSession();
     const data = this.#charts.get({ key });
@@ -255,7 +260,7 @@ module.exports = class Client {
         frame: data.frame,
         increment: data.i,
         symbolKey: data.symbolKey,
-        interval: periods[period],
+        period: periods[period],
         limit,
       }),
     );
@@ -288,7 +293,7 @@ module.exports = class Client {
         frame: data.frame,
         increment: data.i,
         symbolKey: data.symbolKey,
-        interval: periods[period],
+        period: periods[period],
       }),
     );
     this.#charts.set({ key, data });
@@ -324,9 +329,8 @@ module.exports = class Client {
           } else if (packet.type === 'qsd') {
             send = packet.data[1].v;
             name = send.bid === undefined && send.ask === undefined ? 'data' : 'levelI';
-            // console.warn(packet.data[1]);
-            // console.log(JSON.parse(packet.data[1].n.substring(1)).symbol);
-            send.symbol = JSON.parse(packet.data[1].n.substring(1)).symbol;
+            // console.log(packet.data[1].n);
+            send.symbol =(extractJSON(packet.data[1].n) || {symbol: packet.data[1].n}).symbol;
             result(name, send);
           } else if (['du', 'timescale_update'].includes(packet.type)) {
             session = this.#charts.get({ key: packet.data[0] });

package/lib/tradingView.js

@@ -226,10 +226,11 @@ class TradingView {
   }
 
   quoteAddSymbol({ session, symbol }) {
-    // console.log('quoteAddSymbol', session, symbol);
+    const symbolString = symbol.split(':')[0] === 'BINANCE' ? symbol : '={"adjustment":"splits","currency-id":"USD","symbol":"' + symbol + '"}';
+    // console.log('quoteAddSymbol', session, symbol, symbolString);
     // return this.formatWSPacket({ packet: { m: 'quote_add_symbols', p: [session, symbol] } });
     return this.formatWSPacket({
-      packet: { m: 'quote_add_symbols', p: [session, '={"adjustment":"splits","currency-id":"USD","symbol":"' + symbol + '"}'] } 
+      packet: { m: 'quote_add_symbols', p: [session, symbolString] } 
     });
   }
 
@@ -267,7 +268,7 @@ class TradingView {
   // frame - рамка или окно для данной серии
   // increment - инкрементируемый номер изменений запрашиваемого графика в данном frame (таймефрейм)
   createSeries({ chartSession, frame = 'sds_1', increment = 's1', symbolKey, period = '60', limit = 1000 }) {
-    // console.warn('createSeries', chartSession, frame, increment, symbolKey, interval, limit);
+    // console.warn('createSeries', chartSession, frame, increment, symbolKey, period, limit);
     return this.formatWSPacket({
       packet: { m: 'create_series', p: [chartSession, frame, increment, symbolKey, period, limit] },
     });
@@ -284,10 +285,10 @@ class TradingView {
     return this.formatWSPacket({ packet: { m: 'remove_study', p: [ session, st ] } });
   }
 
-  modifySeries({ chartSession, frame = 'sds_1', increment = 's1', symbolKey, interval = '60' }) {
-    // console.warn('modify_series', chartSession, frame, increment, symbolKey, interval, limit);
+  modifySeries({ chartSession, frame = 'sds_1', increment = 's1', symbolKey, period = '60' }) {
+    // console.warn('modify_series', chartSession, frame, increment, symbolKey, pariod, limit);
     return this.formatWSPacket({
-      packet: { m: 'modify_series', p: [chartSession, frame, increment, symbolKey, interval] },
+      packet: { m: 'modify_series', p: [chartSession, frame, increment, symbolKey, period] },
     });
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "market-data-tradingview-ws",
-  "version": "0.0.13",
+  "version": "0.0.15",
   "description": "marketData from Tradingview ws",
   "main": "index.js",
   "scripts": {