market-data-tradingview-ws 0.0.14 → 0.1.0

package/lib/client.js

@@ -108,6 +108,8 @@ module.exports = class Client {
   };
   
   #token = null;
+  #sessionid = null;
+  #sessionidsign = null;
 
   constructor() {
     // this.#resolved = new Map();
@@ -130,16 +132,8 @@ module.exports = class Client {
     return { charts: this.#charts.values };
   }
 
-  // getResolved() {
-  //   return { resolved: this.#resolved };
-  // }
-
-  // getSessionKeys() {
-  //   return this.#sessions.values.keys();
-  // }
-
-  async getToken({ login, pass }) {
-    return tv.getToken({ login, pass });
+  async getToken({ sessionid, sessionidsign, tvecuid, imageurl }) {
+    return tv.getToken({ sessionid, sessionidsign, tvecuid, imageurl });
   }
 
   auth(token = 'unauthorized_user_token') {
@@ -151,38 +145,54 @@ module.exports = class Client {
     });
   }
 
-  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) => {
-        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);
-        };
-
-        ws.onclose = () => console.log('disconnected');
-
-        ws.onerror = (error) => reject(console.error('error: ', error));
-        ws.onopen = () => {
-          ws.send(this.auth(this.#token));
-          ws.send(tv.setLocaleRu());
-          
-          const quoteKey = this.createQuoteSmallSession();
-
-          this.messageListner({ result });
-          resolv('open');
-        };
-      });
+  async connect({ url, options, result, sessionid, sessionidsign, tvecuid, imageurl }) {
+    try {
+      this.#token = await this.getToken({ sessionid, sessionidsign, tvecuid, imageurl });
+      this.#sessionid = sessionid;
+      this.#sessionidsign = sessionidsign;
+
+      if (this.#token.length > 10) {
+        return new Promise((resolv, reject) => {
+          try {
+            url += '?from=chart%2F' + imageurl + '%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);
+            };
+
+            ws.onclose = () => console.log('disconnected');
+
+            ws.onerror = (error) => reject(console.error('error: ', error));
+            ws.onopen = () => {
+              ws.send(this.auth(this.#token));
+              ws.send(tv.setLocaleRu());
+              
+              const quoteKey = this.createQuoteSmallSession();
+
+              this.messageListner({ result });
+              resolv('open');
+            };
+          } catch (error) {
+            reject(error);
+          }
+        });
+      }
+      return null;
+    } catch (error) {
+      console.error('Error in connect:', error.message);
+      throw error;
     }
-    return null;
+  }
+
+  async disconnect() {
+    tv.disconnect({ sessionid: this.#sessionid, sessionidsign: this.#sessionidsign });
+    return 'close';
   }
 
   createQuoteSmallSession() {
@@ -235,6 +245,10 @@ module.exports = class Client {
   }
 
   addChartSymbol({ symbol, period, limit }) {
+    if (!symbol || typeof symbol !== 'string') throw new Error('Invalid symbol parameter');
+    if (!period || typeof period !== 'number') throw new Error('Invalid period parameter');
+    if (!limit || typeof limit !== 'number') throw new Error('Invalid limit parameter');
+
     let key = this.#charts.getBySymbolPeriod({ symbol, period });
     if (key) {
       console.warn('addChartSymbol exist:', key, symbol, period);
@@ -260,7 +274,7 @@ module.exports = class Client {
         frame: data.frame,
         increment: data.i,
         symbolKey: data.symbolKey,
-        interval: periods[period],
+        period: periods[period],
         limit,
       }),
     );
@@ -272,15 +286,6 @@ module.exports = class Client {
   updateChartSymbol({ symbol, period, limit, last }) {
     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';
-    // }
     
     data.symbolKey = this.#symbols.getSymbol({ key, symbol }).key;
     data.symbol = symbol;
@@ -293,7 +298,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 });
@@ -318,52 +323,68 @@ 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.warn('undefined: ', raw.toString());
-        } else {
-          if (packet.type === 'ping') {
-            // console.info('pong', packet);
-            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.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] });
-            if (packet.data[1][session.frame].s.length > 0) {
-              send = {
-                symbol: session.symbol,
-                period: parseInt(session.period),
-                chart: [],
-                end: packet.data[1][session.frame].lbs.bar_close_time,
-              };
-              for (let each of packet.data[1][session.frame].s) {
-                send.chart.push({
-                  open: each.v[1],
-                  high: each.v[2],
-                  low: each.v[3],
-                  close: each.v[4],
-                  timestamp: each.v[0] * 1000,
-                  // turnover: bar.TradeCount,
-                  volume: each.v[5],
-                });
-              }
-              result(packet.type === 'du' ? 'chart_update' : 'chart_history', send);
-            }
-          } else if (['series', 'symbol', 'quote', 'session'].includes(packet.type)) {
-            // console.info(packet);
-          } else {
-            // console.error('error', raw.toString());
-            result('error', raw.toString())
-          }
-        }
-        // name = null;
-        // send = null;
+        this.handlePacket({ packet, result, raw });  
       });
     });
   }
+
+  handlePacket({ packet, result, raw }) {
+    if (!packet) {
+      console.warn('Undefined packet:', raw.toString());
+      return;
+    }
+
+    switch (packet.type) {
+      case 'ping':
+        ws.send(tv.createPong({ value: packet.data }));
+        break;
+      case 'qsd':
+        this.handleQsdPacket({ packet, result });
+        break;
+      case 'du':
+      case 'timescale_update':
+        this.handleChartPacket({ packet, result });
+        break;
+      case 'session':
+        console.info(packet);
+        break;
+      case 'symbol':
+      case 'series':
+      case 'quote':
+        break;
+      default:
+        console.error('Unhandled packet type:', packet.type);
+        result('error', raw.toString());
+    }
+  }
+
+  handleQsdPacket({ packet, result }) {
+    const send = packet.data[1].v;
+    const name = send.bid === undefined && send.ask === undefined ? 'data' : 'levelI';
+    send.symbol = (extractJSON(packet.data[1].n) || { symbol: packet.data[1].n }).symbol;
+    result(name, send);
+  }
+
+  handleChartPacket({ packet, result }) {
+    const session = this.#charts.get({ key: packet.data[0] });
+    if (packet.data[1][session.frame].s.length > 0) {
+      const send = {
+        symbol: session.symbol,
+        period: parseInt(session.period),
+        chart: [],
+        end: packet.data[1][session.frame].lbs.bar_close_time,
+      };
+      packet.data[1][session.frame].s.forEach((each) => {
+        send.chart.push({
+          open: each.v[1],
+          high: each.v[2],
+          low: each.v[3],
+          close: each.v[4],
+          timestamp: each.v[0] * 1000,
+          volume: each.v[5],
+        });
+      });
+      result(packet.type === 'du' ? 'chart_update' : 'chart_history', send);
+    }
+  }
 };

package/lib/tradingView.js

@@ -1,19 +1,17 @@
-/* eslint-disable no-unused-vars */
 'use strict';
 
-// const Utils = require('./utils.js');
-// const utils = new Utils();
-
 const letters = 'abcdefghijklmnopqrstuvwxyz';
 const cleanerRgx = /~h~/g;
 const splitterRgx = /~m~[0-9]{1,}~m~/g;
 const urlSymbolSearch = 'https://symbol-search.tradingview.com/symbol_search';
+const urlwwwTV = 'https://www.tradingview.com';
+const urlRuTV = 'https://ru.tradingview.com';
 
 class TradingView {
-  async getToken({ login, pass }) {
-    const url = 'https://www.tradingview.com/accounts/signin/';
+  async authentication({ login, pass }) {
+    const url = urlwwwTV + '/accounts/signin/';
     const headers = {
-      Referer: 'https://www.tradingview.com',
+      Referer: urlwwwTV,
     };
 
     const form = new FormData();
@@ -21,35 +19,91 @@ class TradingView {
     form.append('password', pass);
     form.append('remember', 'on');
 
-    //   const res = await fetch(url, {
-    //     method: 'POST',
-    //     headers,
-    //     body: form,
-    //   });
-
-    //   if (res.status === 200) {
-    //     const data = await res.json();
-    //     if (data.user.auth_token === undefined) throw new Error('Error get auth_token', data);
-    //     console.log(data.user.auth_token);
-    //     return data.user.auth_token;
-    //   }
-
-    // await utils.pause();
-    return 'eyJhbGciOiJSUzUxMiIsImtpZCI6IkdaeFUiLCJ0eXAiOiJKV1QifQ.eyJ1c2VyX2lkIjoxMjI1ODcxMiwiZXhwIjoxNzI0OTI1MjkyLCJpYXQiOjE3MjQ5MTA4OTIsInBsYW4iOiJwcm9fcHJlbWl1bSIsImV4dF9ob3VycyI6MSwicGVybSI6InVzLXN0b2NrcyxuYXNkYXFfZ2lkcyxvdGMsbnlzZSxuYXNkYXEsYW1leCIsInN0dWR5X3Blcm0iOiJ0di1jaGFydHBhdHRlcm5zLHR2LXByb3N0dWRpZXMsdHYtY2hhcnRfcGF0dGVybnMsdHYtdm9sdW1lYnlwcmljZSIsIm1heF9zdHVkaWVzIjoyNSwibWF4X2Z1bmRhbWVudGFscyI6MTAsIm1heF9jaGFydHMiOjgsIm1heF9hY3RpdmVfYWxlcnRzIjo0MDAsIm1heF9zdHVkeV9vbl9zdHVkeSI6MjQsImZpZWxkc19wZXJtaXNzaW9ucyI6WyJyZWZib25kcyJdLCJtYXhfb3ZlcmFsbF9hbGVydHMiOjIwMDAsIm1heF9hY3RpdmVfcHJpbWl0aXZlX2FsZXJ0cyI6NDAwLCJtYXhfYWN0aXZlX2NvbXBsZXhfYWxlcnRzIjo0MDAsIm1heF9jb25uZWN0aW9ucyI6NTB9.UT2AdPBEAWk6HJEa6isX4gjVqlfThn8bgOVl3Xa36U36Qifg5xXz9Va8q7DWSY3Smaap2wX4cBF4UQXv1t66Q0TQvFudLuvA2dnetBAHYZSOJIi2PGdG1KuMaCRshUuuH9mxgw_xPGITAuQsbBPZJLTOxq5pQN05pZnedC7SaMs';
+    try {
+      const res = await fetch(url, {
+        method: 'POST',
+        headers,
+        body: form,
+      });
+      
+      if (!res.ok) throw new Error('Failed to get auth_token, status: ' + res.status);
+
+      const rawSetCookie = response.headers.raw()['set-cookie'];
+      console.log('Raw Set-Cookie headers:', rawSetCookie);
+      let sessionid, sessionid_sign;
+      for (const cookie of rawSetCookie) {
+        if (cookie.startsWith('sessionid=')) sessionid = cookie.split(';')[0].split('=')[1];
+        if (cookie.startsWith('sessionid_sign=')) sessionid_sign = cookie.split(';')[0].split('=')[1];
+      }
+
+      const data = await res.json();
+      if (!data?.user?.auth_token) throw new Error('Error get auth_token, no auth_token in response');
+      return { sessionid, sessionid_sign, token: data.user.auth_token };
+    } catch (error) {
+      throw new Error('Authentication failed: ' + error.message);
+    }
+  }
+
+  async getToken({ sessionid, sessionidsign, tvecuid, imageurl }) {
+    const url = urlRuTV + '/chart/' + imageurl;
+    const headers = {
+      'accept': 'text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,image/apng,*/*;q=0.8,application/signed-exchange;v=b3;q=0.7',
+      'accept-language': 'ru-RU,ru;q=0.9,en-US;q=0.8,en;q=0.7',
+      'cache-control': 'max-age=0',
+      'upgrade-insecure-requests': '1',
+      'cookie': 'tv_ecuid=' + tvecuid + '; sessionid=' + sessionid + '; sessionid_sign=' + sessionidsign + ';cookiesSettings={\"analytics\":true,\"advertising\":true};backend=test_backend',
+      'Referer': urlRuTV + '/u/PartnerFinance/',
+      'Referrer-Policy': 'origin-when-cross-origin',
+    };
+    
+    try {
+      const res = await fetch(url, { method: 'GET', headers });
+      if (!res.ok) throw new Error(`HTTP ${res.status}`);
+      const html = await res.text();
+      const match = html.match(/"auth_token"\s*:\s*"([^"]+)"/);
+      return match[1];
+    } catch (err) {
+      console.error('❌ Error fetching token:', err.message);
+      return null;
+    }
+  }
+
+  async disconnect({ sessionid, sessionidsign }) {
+    const url = urlRuTV + '/accounts/logout/';
+    const headers = {
+      Origin: urlRuTV,
+      Referer: urlRuTV + '/u/PartnerFinance/',
+    };
+
+    try {
+      // const res = await fetch(url, {
+      //   method: 'POST',
+      //   headers,
+      // });
+
+      // if (!res.ok) throw new Error('Failed to disconnect, status: ' + res.status);
+      return true;
+    } catch (error) {
+      throw new Error('Disconnection failed: ' + error.message);
+    }
   }
 
   async getSymbol({ symbol, type }) {
     // type = 'stock' | 'futures' | 'forex' | 'cfd' | 'crypto' | 'index' | 'economic'
     // query = what you want to search!
     // it returns first matching item
+    try {
     const res = await fetch(urlSymbolSearch + '?text=' + symbol + '&type=' + type);
     if (res.status === 200) {
       const data = await res.json();
       // console.log(data);
-      return data[0];
+        return data[0];
+      }
+      throw new Error('Failed to fetch symbol data');
+    } catch (error) {
+      console.error('Error in getSymbol:', error.message);
+      return 'Network Error!';
     }
-
-    return 'Network Error!';
   }
 
   getSymbolId({ data }) {
@@ -58,6 +112,9 @@ class TradingView {
   }
 
   createSession({ startsWith }) {
+    if (typeof startsWith !== 'string' || startsWith.length === 0) {
+      throw new Error('Invalid startsWith parameter');
+    }
     let session = startsWith;
     while (session.length < 12) session += letters[Math.floor(Math.random() * letters.length)];
     return session;
@@ -268,7 +325,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] },
     });
@@ -285,10 +342,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.14",
+  "version": "0.1.0",
   "description": "marketData from Tradingview ws",
   "main": "index.js",
   "scripts": {