market-data-tradingview-ws 0.0.6 → 0.0.8

package/lib/client.js

@@ -5,54 +5,6 @@
 const WebSocket = require('ws');
 const tv = require('./tradingView.js');
 
-const quotes = {
-  values: {},
-  set({ key, data }) {
-    if (data) {
-      this.values[key] = data;
-    }
-  },
-  add({ symbol }) {
-    for (let key in this.values) {
-      this.values[key].symbols.push(symbol);
-      return key;
-    }
-    return null;
-  },
-  get({ key }) {
-    return this.values[key];
-  },
-  getBySymbol({ symbol }) {
-    for (let key in this.values) {
-      if (this.values[key].symbols.includes(symbol)) return key;
-    }
-    return null;
-  },
-  delete({ key, symbol }) {
-    const arr = this.values[key].symbols;
-    const index = arr.indexOf(symbol);
-    if (index !== -1) arr.splice(index, 1);
-  },
-};
-
-const charts = {
-  values: {},
-  set({ key, data }) {
-    if (data) {
-      this.values[key] = data;
-    }
-  },
-  get({ key }) {
-    return this.values[key];
-  },
-  getBySymbolPeriod({ symbol, period }) {
-    for (let key of Object.keys(this.values)) {
-      if (this.values[key].symbol === symbol && this.values[key].period === period) return key;
-    }
-    return null;
-  },
-};
-
 const periods = {
   60: '1',
   300: '5',
@@ -65,19 +17,60 @@ const periods = {
 
 module.exports = class Client {
   #ws;
-  #charts;
-  #quotes;
+  #charts = {
+    values: {},
+    set({ key, data }) {
+      if (data) {
+        this.values[key] = data;
+      }
+    },
+    get({ key }) {
+      return this.values[key];
+    },
+    getBySymbolPeriod({ symbol, period }) {
+      for (let key of Object.keys(this.values)) {
+        if (this.values[key].symbol === symbol && this.values[key].period === period) return key;
+      }
+      return null;
+    },
+  };
+  #quotes = {
+    values: {},
+    set({ key, data }) {
+      if (data) {
+        this.values[key] = data;
+      }
+    },
+    add({ symbol }) {
+      for (let key in this.values) {
+        this.values[key].symbols.push(symbol);
+        return key;
+      }
+      return null;
+    },
+    get({ key }) {
+      return this.values[key];
+    },
+    getBySymbol({ symbol }) {
+      for (let key in this.values) {
+        if (this.values[key].symbols.includes(symbol)) return key;
+      }
+      return null;
+    },
+    delete({ key, symbol }) {
+      const arr = this.values[key].symbols;
+      const index = arr.indexOf(symbol);
+      if (index !== -1) arr.splice(index, 1);
+    },
+  };
   #resolved;
   #token = null;
   maxSymbolKey = 0;
   constructor() {
-    this.#charts = charts;
-    this.#quotes = quotes;
     this.#resolved = new Map();
   }
 
   close() {
-    // console.log(this.#sessions.values, this.#charts.values, this.#quotes.values);
     this.#ws.close();
   }
 
@@ -115,7 +108,7 @@ module.exports = class Client {
           this.#ws.send(this.auth(this.#token));
           this.#ws.send(tv.setLocaleRu());
           
-          const chartKey = this.createChartSession();
+          // const chartKey = this.createChartSession();
           const quoteKey = this.createQuoteSmallSession();
           // this.addQuoteSymbols({ symbols: ['NASDAQ:PYPL'] });
 
@@ -180,7 +173,8 @@ module.exports = class Client {
   addChartSymbol({ symbol, period, limit }) {
     let key = this.#charts.getBySymbolPeriod({ symbol, period });
     if (key) return 'exist';
-    // console.log('addChartSymbol', symbol, period, limit, key);
+    
+    // console.log('addChartSymbol1', symbol, period, limit, key);
     key = this.createChartSession();
     const data = this.#charts.get({ key });
 
@@ -202,7 +196,7 @@ module.exports = class Client {
         limit,
       }),
     );
-    // console.log('addChartSymbol1', periods[period], data);
+    // console.log('addChartSymbol4', periods[period], data);
     this.#charts.set({ key, data });
 
     return 'add';
@@ -235,7 +229,6 @@ module.exports = class Client {
         limit,
       }),
     );
-    // console.log('updateChartSymbol1', key, data);
     this.#charts.set({ key, data });
     return 'update';
   }
@@ -254,9 +247,9 @@ module.exports = class Client {
           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();
+          // } else if (packet.type === 'protocol_error') {
+            // 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';
@@ -291,6 +284,7 @@ module.exports = class Client {
             // console.info(packet);
           } else {
             console.warn('error', raw.toString());
+            result('error', raw.toString())
           }
         }
       });

package/package.json

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