market-data-tradingview-ws 0.0.12 → 0.0.14

package/lib/client.js

@@ -13,10 +13,18 @@ const periods = {
   3600: '60',
   14400: '240',
   86400: '1D',
+  604800: '1W',
+  2592000: '1M',
 };
 
+const extractJSON = (str) => {
+  const match = str.match(/\{.*?\}/s);
+  return match ? JSON.parse(match[0]) : null;
+}
+
+let ws = null;
+
 module.exports = class Client {
-  #ws;
   #charts = {
     values: {},
     set({ key, data }) {
@@ -29,6 +37,7 @@ module.exports = class Client {
           frame: data.frame,
           i: data.i,
           deleted: data.deleted || false,
+          limit: data.limit || 1500,
         };
       }
     },
@@ -84,17 +93,29 @@ module.exports = class Client {
       if (index !== -1) arr.splice(index, 1);
     },
   };
+  #symbols = {
+    values: {},
+    max: 1,
+    getSymbol({ key, symbol }) {
+      // let data = this.values[symbol];
+      // if (data === undefined) data = this.set({ key, symbol });
+      // return data;
+      const symbolKey = 'sds_sym_' + this.max++;
+      ws.send(tv.resolveSymbol({ chartSession: key, symbolKey, symbol }));
+      this.values[symbol] = { key: symbolKey };
+      return this.values[symbol];
+    },
+  };
   
-  // #resolved;
   #token = null;
-  #maxSymbolKey = 1;
 
   constructor() {
     // this.#resolved = new Map();
   }
 
-  close() {
-    this.#ws.close();
+  async close() {
+    // token delete !!!
+    ws.close();
   }
 
   getAll() {
@@ -130,23 +151,31 @@ module.exports = class Client {
     });
   }
 
-  async connect({ url, options, login, pass, result }) {
-    this.#token = await this.getToken({ login, pass });
-    // console.log(this.#token);
+  async connect({ url, options, login, pass, result, token }) {
+    this.#token = token || await this.getToken({ login, pass });
+
     if (this.#token.length > 10) {
       return new Promise((resolv, reject) => {
-        this.#ws = new WebSocket(url, options);
+        url += '?from=chart%2FKq8EfKQU%2F';
+        const date = new Date();
+        url += '&date=' + date.getFullYear() + '_' + String(date.getMonth() + 1).padStart(2, '0') + '_' + String(date.getDate()).padStart(2, '0') + '-11_25';
+        url += '&type=chart';
+        ws = new WebSocket(url, options);
+
+        const originalSend = ws.send;
+        ws.send = function(data) {
+          // console.log('Message sent:', data);
+          originalSend.apply(ws, arguments);
+        };
 
-        this.#ws.onclose = () => console.log('disconnected');
+        ws.onclose = () => console.log('disconnected');
 
-        this.#ws.onerror = (error) => reject(console.error('error: ', error));
-        this.#ws.onopen = () => {
-          this.#ws.send(this.auth(this.#token));
-          this.#ws.send(tv.setLocaleRu());
+        ws.onerror = (error) => reject(console.error('error: ', error));
+        ws.onopen = () => {
+          ws.send(this.auth(this.#token));
+          ws.send(tv.setLocaleRu());
           
-          // const chartKey = this.createChartSession();
           const quoteKey = this.createQuoteSmallSession();
-          // this.addQuoteSymbols({ symbols: ['NASDAQ:PYPL'] });
 
           this.messageListner({ result });
           resolv('open');
@@ -159,24 +188,24 @@ module.exports = class Client {
   createQuoteSmallSession() {
     const key = tv.createSession({ startsWith: 'qs_' });
     this.#quotes.set({ key, data: { id: key, type: 'small', symbols: [] } });
-    this.#ws.send(tv.quoteCreateSession({ session: key }));
-    this.#ws.send(tv.setFieldsSmall({ session: key }));
-    // this.#ws.send(tv.setFields({ session: key }));
+    ws.send(tv.quoteCreateSession({ session: key }));
+    ws.send(tv.setFieldsSmall({ session: key }));
+    // ws.send(tv.setFields({ session: key }));
     return key;
   }
 
   createQuoteFullSession() {
     const key = tv.createSession({ startsWith: 'qs_' });
     this.#quotes.set({ key, data: { id: key, type: 'full', symbols: [] } });
-    this.#ws.send(tv.quoteCreateSession({ session: key }));
+    ws.send(tv.quoteCreateSession({ session: key }));
     return key;
   }
 
   createChartSession() {
     const key = tv.createSession({ startsWith: 'cs_' });
     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' }));
+    ws.send(tv.chartCreateSession({ chartSession: key }));
+    ws.send(tv.switchTimezone({ chartSession: key, tz: 'Etc/UTC' }));
     return key;
   }
 
@@ -189,9 +218,8 @@ module.exports = class Client {
         result.exist.push(symbol);
       } else {
         key = this.#quotes.add({ symbol });
-        // console.log(key, symbol);
-        this.#ws.send(tv.quoteAddSymbol({ session: key, symbol }));
-        // this.#ws.send(tv.quoteFastSymbol({ session: key, symbol }));
+        ws.send(tv.quoteAddSymbol({ session: key, symbol }));
+        // ws.send(tv.quoteFastSymbol({ session: key, symbol }));
         result.add.push(symbol);
       }
     });
@@ -202,39 +230,31 @@ module.exports = class Client {
     const key = this.#quotes.getBySymbol({ symbol });
     if (!key) return 'unlisted';
     this.#quotes.delete({ key, symbol });
-    this.#ws.send(tv.quoteRemoveSymbols({ session: key, symbol }));
+    ws.send(tv.quoteRemoveSymbols({ session: key, symbol }));
     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) {
-      console.warn('addChartSymbol exist');
+      console.warn('addChartSymbol exist:', key, symbol, period);
       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) }});
+    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) }});
 
     key = this.createChartSession();
     const data = this.#charts.get({ key });
 
-    data.symbolKey = this.resolveSymbol({ key, symbol });
+    data.symbolKey = this.#symbols.getSymbol({ key, symbol }).key;
     data.symbol = symbol;
     data.period = period;
     data.frame = 'sds_' + Object.keys(this.#charts.values).length;
     data.i = 's' + 1;
+    data.limit = limit;
 
-    // this.#ws.send(tv.resolveSymbol({ chartSession: key, symbolKey: data.symbolKey, symbol }));
-    // this.#resolved.set(symbol, { key: data.symbolKey });
-    this.#ws.send(
+    ws.send(
       tv.createSeries({
         chartSession: key,
         frame: data.frame,
@@ -244,49 +264,56 @@ module.exports = class Client {
         limit,
       }),
     );
-    // console.log('addChartSymbol4', periods[period], data);
+    // console.warn('addChartSymbol4', periods[period], data);
     this.#charts.set({ key, data });
-
     return 'add';
   }
 
   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.warn('modules updateChartSymbol 1: ', symbol, period, limit, last, data);
-
-    const alreadyKey = this.#charts.getBySymbolPeriod({ symbol, period })
-    if (alreadyKey) {
-      // console.warn('updateChartSymbol exist: ', alreadyKey);
-      this.#charts.delete({ key });
-      console.warn('updateChartSymbol exist');
-      return 'exist';
-    }
+    // 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.symbolKey = this.#symbols.getSymbol({ key, symbol }).key;
     data.symbol = symbol;
     data.period = period;
     data.i = 's' + (parseInt(data.i.replace(/[^0-9]/g, '')) + 1);
-    this.#ws.send(
+    
+    ws.send(
       tv.modifySeries({
         chartSession: key,
         frame: data.frame,
         increment: data.i,
         symbolKey: data.symbolKey,
         interval: periods[period],
-        limit,
       }),
     );
     this.#charts.set({ key, data });
+    if (data.limit < limit) {
+      ws.send(tv.moreData({ chartSession: key, frame: data.frame, add: limit - data.limit }));
+      data.limit = limit;
+    }
     return 'update';
   }
 
+  deleteChartSymbol({ symbol, period }) {
+    let key = this.#charts.getBySymbolPeriod({ symbol, period });
+    if (!key) return void console.warn('deleteChartSymbol empty key');
+    this.#charts.delete({ key });
+    return void console.log('deleteChartSymbol: ', key);
+  }
+
   messageListner({ result }) {
-    this.#ws.on('message', (raw) => {
-      if (this.#ws.readyState !== this.#ws.OPEN) return;
+    ws.on('message', (raw) => {
+      if (ws.readyState !== ws.OPEN) return;
 
       // console.log('raw: ', JSON.stringify(raw.toString()));
       let session = '';
@@ -296,19 +323,14 @@ module.exports = class Client {
         if (packet === undefined) {
           console.warn('undefined: ', raw.toString());
         } else {
-          // eslint-disable-next-line no-lonely-if
           if (packet.type === 'ping') {
             // console.info('pong', packet);
-            this.#ws.send(tv.createPong({ value: packet.data }));
-          // } else if (packet.type === 'protocol_error') {
-            // console.warn('protocol_error', packet);
-            // this.close();
+            ws.send(tv.createPong({ value: packet.data }));
           } 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] });
@@ -335,12 +357,12 @@ module.exports = class Client {
           } else if (['series', 'symbol', 'quote', 'session'].includes(packet.type)) {
             // console.info(packet);
           } else {
-            console.warn('error', raw.toString());
+            // console.error('error', raw.toString());
             result('error', raw.toString())
           }
         }
-        name = null;
-        send = null;
+        // name = null;
+        // send = null;
       });
     });
   }

package/lib/tradingView.js

@@ -35,8 +35,7 @@ class TradingView {
     //   }
 
     // await utils.pause();
-    // old return 'eyJhbGciOiJSUzUxMiIsImtpZCI6IkdaeFUiLCJ0eXAiOiJKV1QifQ.eyJ1c2VyX2lkIjoxMjI1ODcxMiwiZXhwIjoxNjkwNzkzMjIwLCJpYXQiOjE2OTA3Nzg4MjAsInBsYW4iOiJwcm9fcHJlbWl1bSIsImV4dF9ob3VycyI6MSwicGVybSI6IiIsInN0dWR5X3Blcm0iOiJ0di1jaGFydF9wYXR0ZXJucyx0di1jaGFydHBhdHRlcm5zLHR2LXByb3N0dWRpZXMsdHYtdm9sdW1lYnlwcmljZSIsIm1heF9zdHVkaWVzIjoyNSwibWF4X2Z1bmRhbWVudGFscyI6MCwibWF4X2NoYXJ0cyI6OCwibWF4X2FjdGl2ZV9hbGVydHMiOjQwMCwibWF4X3N0dWR5X29uX3N0dWR5IjoyNCwibWF4X2FjdGl2ZV9wcmltaXRpdmVfYWxlcnRzIjo0MDAsIm1heF9hY3RpdmVfY29tcGxleF9hbGVydHMiOjQwMCwibWF4X2Nvbm5lY3Rpb25zIjo1MH0.pZQgM_oTZMnm1Qb4qBf6CfM9dHKltp2T3O2g_VVoK9l66UngEL8mLdeH7-ZpUZ8Y50rV5yr0ND8WRPsRH2w2izk_SNMD63p6GJzXXGPvILgirXW3SFa7HmaHv8Xp6SPhQTWb-ahyv_2GUIueKTvHWBNF5-eBnqYeoXQeWkRFsLA';
-    return 'eyJhbGciOiJSUzUxMiIsImtpZCI6IkdaeFUiLCJ0eXAiOiJKV1QifQ.eyJ1c2VyX2lkIjoxMjI1ODcxMiwiZXhwIjoxNzA1OTE3OTE1LCJpYXQiOjE3MDU5MDM1MTUsInBsYW4iOiJwcm9fcHJlbWl1bSIsImV4dF9ob3VycyI6MSwicGVybSI6IiIsInN0dWR5X3Blcm0iOiJ0di1wcm9zdHVkaWVzLHR2LWNoYXJ0X3BhdHRlcm5zLHR2LXZvbHVtZWJ5cHJpY2UsdHYtY2hhcnRwYXR0ZXJucyIsIm1heF9zdHVkaWVzIjoyNSwibWF4X2Z1bmRhbWVudGFscyI6MTAsIm1heF9jaGFydHMiOjgsIm1heF9hY3RpdmVfYWxlcnRzIjo0MDAsIm1heF9zdHVkeV9vbl9zdHVkeSI6MjQsIm1heF9vdmVyYWxsX2FsZXJ0cyI6MjAwMCwibWF4X2FjdGl2ZV9wcmltaXRpdmVfYWxlcnRzIjo0MDAsIm1heF9hY3RpdmVfY29tcGxleF9hbGVydHMiOjQwMCwibWF4X2Nvbm5lY3Rpb25zIjo1MH0.Zoe1DAU3Fn2XpNNvI7uYK0JGHEsNs_OjTqBsnj8vsqWWeDDaOFPVO5m_DLuaUaSFZ4w3diQtgqfeovyPzzUCFDooGEF9FRypY9-zTjGbV0pbQajx-a8X3j79qxvLWe7VYg7cx5RQJGBoN7CGIPzrdpvNvVEYGb_QqXOPy_-F1BE';
+    return 'eyJhbGciOiJSUzUxMiIsImtpZCI6IkdaeFUiLCJ0eXAiOiJKV1QifQ.eyJ1c2VyX2lkIjoxMjI1ODcxMiwiZXhwIjoxNzI0OTI1MjkyLCJpYXQiOjE3MjQ5MTA4OTIsInBsYW4iOiJwcm9fcHJlbWl1bSIsImV4dF9ob3VycyI6MSwicGVybSI6InVzLXN0b2NrcyxuYXNkYXFfZ2lkcyxvdGMsbnlzZSxuYXNkYXEsYW1leCIsInN0dWR5X3Blcm0iOiJ0di1jaGFydHBhdHRlcm5zLHR2LXByb3N0dWRpZXMsdHYtY2hhcnRfcGF0dGVybnMsdHYtdm9sdW1lYnlwcmljZSIsIm1heF9zdHVkaWVzIjoyNSwibWF4X2Z1bmRhbWVudGFscyI6MTAsIm1heF9jaGFydHMiOjgsIm1heF9hY3RpdmVfYWxlcnRzIjo0MDAsIm1heF9zdHVkeV9vbl9zdHVkeSI6MjQsImZpZWxkc19wZXJtaXNzaW9ucyI6WyJyZWZib25kcyJdLCJtYXhfb3ZlcmFsbF9hbGVydHMiOjIwMDAsIm1heF9hY3RpdmVfcHJpbWl0aXZlX2FsZXJ0cyI6NDAwLCJtYXhfYWN0aXZlX2NvbXBsZXhfYWxlcnRzIjo0MDAsIm1heF9jb25uZWN0aW9ucyI6NTB9.UT2AdPBEAWk6HJEa6isX4gjVqlfThn8bgOVl3Xa36U36Qifg5xXz9Va8q7DWSY3Smaap2wX4cBF4UQXv1t66Q0TQvFudLuvA2dnetBAHYZSOJIi2PGdG1KuMaCRshUuuH9mxgw_xPGITAuQsbBPZJLTOxq5pQN05pZnedC7SaMs';
   }
 
   async getSymbol({ symbol, type }) {
@@ -60,9 +59,7 @@ class TradingView {
 
   createSession({ startsWith }) {
     let session = startsWith;
-    while (session.length < 12) {
-      session += letters[Math.floor(Math.random() * letters.length)];
-    }
+    while (session.length < 12) session += letters[Math.floor(Math.random() * letters.length)];
     return session;
   }
 
@@ -229,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] } 
     });
   }
 
@@ -269,10 +267,10 @@ class TradingView {
   // symbolKey - id запрошенного тиккера
   // frame - рамка или окно для данной серии
   // increment - инкрементируемый номер изменений запрашиваемого графика в данном frame (таймефрейм)
-  createSeries({ chartSession, frame = 'sds_1', increment = 's1', symbolKey, interval = '60', limit = 1000 }) {
+  createSeries({ chartSession, frame = 'sds_1', increment = 's1', symbolKey, period = '60', limit = 1000 }) {
     // console.warn('createSeries', chartSession, frame, increment, symbolKey, interval, limit);
     return this.formatWSPacket({
-      packet: { m: 'create_series', p: [chartSession, frame, increment, symbolKey, interval, limit] },
+      packet: { m: 'create_series', p: [chartSession, frame, increment, symbolKey, period, limit] },
     });
   }
 
@@ -287,13 +285,22 @@ class TradingView {
     return this.formatWSPacket({ packet: { m: 'remove_study', p: [ session, st ] } });
   }
 
-  modifySeries({ chartSession, frame = 'sds_1', increment = 's1', symbolKey, interval = '60', limit = 1000 }) {
+  modifySeries({ chartSession, frame = 'sds_1', increment = 's1', symbolKey, interval = '60' }) {
     // console.warn('modify_series', chartSession, frame, increment, symbolKey, interval, limit);
     return this.formatWSPacket({
       packet: { m: 'modify_series', p: [chartSession, frame, increment, symbolKey, interval] },
     });
   }
 
+  moreData({ chartSession, frame, add }) {
+    return this.formatWSPacket({ packet: { m: 'request_more_data', p: [chartSession, frame, add] } });
+  }
+
+  moreTickmark({chartSession, frame, add}) {
+    // "m":"request_more_tickmarks","p":["cs_lslcBHYaqGTT","sds_1",10]
+    return this.formatWSPacket({ packet: { m: 'request_more_tickmarks', p: [chartSession, frame, add] } });
+  }
+
   createPong({ value }) {
     return this.formatWSPacket({ packet: '~h~' + value });
   }

package/package.json

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