market-data-tradingview-ws 0.0.10 → 0.0.11

package/lib/client.js

@@ -21,15 +21,36 @@ module.exports = class Client {
     values: {},
     set({ key, data }) {
       if (data) {
-        this.values[key] = data;
+        this.values[key] = { 
+          id: data.id, 
+          symbol: data.symbol, 
+          period: parseInt(data.period),
+          symbolKey: data.symbolKey,
+          frame: data.frame,
+          i: data.i,
+          deleted: data.deleted || false,
+        };
       }
     },
+    delete({ key }) {
+      this.values[key].deleted = true;
+    },
     get({ key }) {
       return this.values[key];
     },
+    getDeleted() {
+      for (let key of Object.keys(this.values)) {
+        if (this.values[key].deleted) {
+          this.values[key].deleted = false;
+          return this.get({ key });
+        }
+      }
+      return null;
+    },
     getBySymbolPeriod({ symbol, period }) {
       for (let key of Object.keys(this.values)) {
-        if (this.values[key].symbol === symbol && this.values[key].period === period) return key;
+        // console.warn(symbol, period, key, this.values[key], this.values[key].symbol === symbol, this.values[key].period === period);
+        if (this.values[key].symbol === symbol && parseInt(this.values[key].period) === parseInt(period) && !this.values[key].deleted) return key;
       }
       return null;
     },
@@ -63,11 +84,13 @@ module.exports = class Client {
       if (index !== -1) arr.splice(index, 1);
     },
   };
-  #resolved;
+  
+  // #resolved;
   #token = null;
-  maxSymbolKey = 0;
+  #maxSymbolKey = 1;
+
   constructor() {
-    this.#resolved = new Map();
+    // this.#resolved = new Map();
   }
 
   close() {
@@ -86,9 +109,9 @@ module.exports = class Client {
     return { charts: this.#charts.values };
   }
 
-  getResolved() {
-    return { resolved: this.#resolved };
-  }
+  // getResolved() {
+  //   return { resolved: this.#resolved };
+  // }
 
   // getSessionKeys() {
   //   return this.#sessions.values.keys();
@@ -150,7 +173,7 @@ module.exports = class Client {
 
   createChartSession() {
     const key = tv.createSession({ startsWith: 'cs_' });
-    this.#charts.set({ key, data: { id: key, symbol: '', period: '', symbolKey: '', frame: '', i: '' } });
+    this.#charts.set({ key, data: { id: key, symbol: '', period: 0, symbolKey: '', frame: '', i: '', deleted: false } });
     this.#ws.send(tv.chartCreateSession({ chartSession: key }));
     this.#ws.send(tv.switchTimezone({ chartSession: key, tz: 'Etc/UTC' }));
     return key;
@@ -182,22 +205,34 @@ module.exports = class Client {
     return 'delete';
   }
 
+  resolveSymbol({ key, symbol }) {
+    const symbolKey = 'sds_sym_' + this.#maxSymbolKey++;
+    this.#ws.send(tv.resolveSymbol({ chartSession: key, symbolKey, symbol }));
+    return symbolKey;
+  }
+
   addChartSymbol({ symbol, period, limit }) {
     let key = this.#charts.getBySymbolPeriod({ symbol, period });
-    if (key) return 'exist';
-    
-    // console.log('addChartSymbol1', symbol, period, limit, key);
+    if (key) {
+      console.warn('addChartSymbol exist');
+      return 'exist';
+    }
+
+    // console.warn('modules addChartSymbol1', symbol, period, limit, key);
+    const exist = this.#charts.getDeleted();
+    if (exist !== null) return this.updateChartSymbol({ symbol, period, limit, last: { symbol: exist.symbol, period: parseInt(exist.period) }});
+
     key = this.createChartSession();
     const data = this.#charts.get({ key });
 
+    data.symbolKey = this.resolveSymbol({ key, symbol });
     data.symbol = symbol;
     data.period = period;
-    data.symbolKey = 'sds_sym_' + ++this.maxSymbolKey;
     data.frame = 'sds_' + Object.keys(this.#charts.values).length;
     data.i = 's' + 1;
 
-    this.#ws.send(tv.resolveSymbol({ chartSession: key, symbolKey: data.symbolKey, symbol }));
-    this.#resolved.set(symbol, { key: data.symbolKey });
+    // this.#ws.send(tv.resolveSymbol({ chartSession: key, symbolKey: data.symbolKey, symbol }));
+    // this.#resolved.set(symbol, { key: data.symbolKey });
     this.#ws.send(
       tv.createSeries({
         chartSession: key,
@@ -214,20 +249,23 @@ module.exports = class Client {
     return 'add';
   }
 
-  updateChartSymbol({ symbol, period, limit, exist }) {
-    let key = this.#charts.getBySymbolPeriod({ symbol: exist.symbol, period: exist.period });
+  updateChartSymbol({ symbol, period, limit, last }) {
+    // period = parseInt(period);
+    // last.period = parseInt(last.period);
+    const key = this.#charts.getBySymbolPeriod({ symbol: last.symbol, period: last.period });
     const data = this.#charts.get({ key });
 
-    // console.log('updateChartSymbol', symbol, exist.symbol, data);
+    // console.warn('modules updateChartSymbol 1: ', symbol, period, limit, last, data);
 
-    if (this.#resolved.has(symbol)) {
-      data.symbolKey = this.#resolved.get(symbol).key;
-    } else {
-      data.symbolKey = 'sds_sym_' + ++this.maxSymbolKey;
-      this.#ws.send(tv.resolveSymbol({ chartSession: key, symbolKey: data.symbolKey, symbol }));
-      this.#resolved.set(symbol, { key: data.symbolKey });
+    const alreadyKey = this.#charts.getBySymbolPeriod({ symbol, period })
+    if (alreadyKey) {
+      // console.warn('updateChartSymbol exist: ', alreadyKey);
+      this.#charts.delete({ key });
+      console.warn('updateChartSymbol exist');
+      return 'exist';
     }
-
+    
+    data.symbolKey = this.resolveSymbol({ key, symbol });
     data.symbol = symbol;
     data.period = period;
     data.i = 's' + (parseInt(data.i.replace(/[^0-9]/g, '')) + 1);
@@ -252,8 +290,10 @@ module.exports = class Client {
       // console.log('raw: ', JSON.stringify(raw.toString()));
       let session = '';
       tv.parsePacket({ str: raw }).forEach((packet) => {
+        let name = null;
+        let send = null;
         if (packet === undefined) {
-          console.log('undefined: ', raw.toString());
+          console.warn('undefined: ', raw.toString());
         } else {
           // eslint-disable-next-line no-lonely-if
           if (packet.type === 'ping') {
@@ -263,19 +303,18 @@ module.exports = class Client {
             // console.warn('protocol_error', packet);
             // this.close();
           } else if (packet.type === 'qsd') {
-            const send = packet.data[1].v;
-            const name = send.bid === undefined && send.ask === undefined ? 'data' : 'levelI';
+            send = packet.data[1].v;
+            name = send.bid === undefined && send.ask === undefined ? 'data' : 'levelI';
             // console.log(packet.data[1].n);
             // console.log(JSON.parse(packet.data[1].n.substring(1)).symbol);
-            // send.symbol = packet.data[1].n;
             send.symbol = JSON.parse(packet.data[1].n.substring(1)).symbol;
             result(name, send);
           } else if (['du', 'timescale_update'].includes(packet.type)) {
             session = this.#charts.get({ key: packet.data[0] });
             if (packet.data[1][session.frame].s.length > 0) {
-              const send = {
+              send = {
                 symbol: session.symbol,
-                period: session.period,
+                period: parseInt(session.period),
                 chart: [],
                 end: packet.data[1][session.frame].lbs.bar_close_time,
               };
@@ -299,6 +338,8 @@ module.exports = class Client {
             result('error', raw.toString())
           }
         }
+        name = null;
+        send = null;
       });
     });
   }

package/lib/tradingView.js

@@ -88,7 +88,7 @@ class TradingView {
         try {
           return JSON.parse(p);
         } catch (error) {
-          console.warn('Cant parse', p);
+          console.error('Cant parse', p);
           return false;
         }
       })
@@ -254,7 +254,7 @@ class TradingView {
   }
 
   resolveSymbol({ chartSession, symbolKey, symbol }) {
-    console.log('resolveSymbol', chartSession, symbolKey, symbol);
+    // console.warn('resolveSymbol', chartSession, symbolKey, symbol);
     return this.formatWSPacket({
       packet: {
         m: 'resolve_symbol',
@@ -267,7 +267,7 @@ class TradingView {
   // frame - рамка или окно для данной серии
   // increment - инкрементируемый номер изменений запрашиваемого графика в данном frame (таймефрейм)
   createSeries({ chartSession, frame = 'sds_1', increment = 's1', symbolKey, interval = '60', limit = 1000 }) {
-    console.log('createSeries', chartSession, frame, increment, symbolKey, interval, limit);
+    // console.warn('createSeries', chartSession, frame, increment, symbolKey, interval, limit);
     return this.formatWSPacket({
       packet: { m: 'create_series', p: [chartSession, frame, increment, symbolKey, interval, limit] },
     });
@@ -280,8 +280,12 @@ class TradingView {
     });
   }
 
+  chartRemoveSeries({ session, st }) {
+    return this.formatWSPacket({ packet: { m: 'remove_study', p: [ session, st ] } });
+  }
+
   modifySeries({ chartSession, frame = 'sds_1', increment = 's1', symbolKey, interval = '60', limit = 1000 }) {
-    console.log('modify_series', chartSession, frame, increment, symbolKey, interval, limit);
+    // console.warn('modify_series', chartSession, frame, increment, symbolKey, interval, limit);
     return this.formatWSPacket({
       packet: { m: 'modify_series', p: [chartSession, frame, increment, symbolKey, interval] },
     });

package/package.json

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