Merge pull request #143 from brandonros/patch-3

expand QuoteMarket to accept extended session

Author: Mathieu2301

src/quote/market.js

@@ -5,11 +5,16 @@
 /**
  * @param {import('./session').QuoteSessionBridge} quoteSession
  */
+
 module.exports = (quoteSession) => class QuoteMarket {
   #symbolListeners = quoteSession.symbolListeners;
 
   #symbol;
 
+  #session;
+
+  #symbolKey;
+
   #symbolListenerID = 0;
 
   #lastData = {};
@@ -38,20 +43,24 @@ module.exports = (quoteSession) => class QuoteMarket {
 
   /**
    * @param {string} symbol Market symbol (like: 'BTCEUR' or 'KRAKEN:BTCEUR')
+   * @param {string} session Market session (like: 'regular' or 'extended')
    */
-  constructor(symbol) {
+  constructor(symbol, session = 'regular') {
     this.#symbol = symbol;
+    this.#session = session;
+    this.#symbolKey = `=${JSON.stringify({ session, symbol })}`;
 
-    if (!this.#symbolListeners[symbol]) {
-      this.#symbolListeners[symbol] = [];
+    if (!this.#symbolListeners[this.#symbolKey]) {
+      this.#symbolListeners[this.#symbolKey] = [];
       quoteSession.send('quote_add_symbols', [
         quoteSession.sessionID,
-        symbol,
+        this.#symbolKey,
       ]);
     }
-    this.#symbolListenerID = this.#symbolListeners[symbol].length;
 
-    this.#symbolListeners[symbol][this.#symbolListenerID] = (packet) => {
+    this.#symbolListenerID = this.#symbolListeners[this.#symbolKey].length;
+
+    this.#symbolListeners[this.#symbolKey][this.#symbolListenerID] = (packet) => {
       if (global.TW_DEBUG) console.log('§90§30§105 MARKET §0 DATA', packet);
 
       if (packet.type === 'qsd' && packet.data[1].s === 'ok') {
@@ -112,12 +121,12 @@ module.exports = (quoteSession) => class QuoteMarket {
 
   /** Close this listener */
   close() {
-    if (this.#symbolListeners[this.#symbol].length <= 1) {
+    if (this.#symbolListeners[this.#symbolKey].length <= 1) {
       quoteSession.send('quote_remove_symbols', [
         quoteSession.sessionID,
-        this.#symbol,
+        this.#symbolKey,
       ]);
     }
-    delete this.#symbolListeners[this.#symbol][this.#symbolListenerID];
+    delete this.#symbolListeners[this.#symbolKey][this.#symbolListenerID];
   }
 };

src/quote/session.js

@@ -79,21 +79,21 @@ module.exports = (client) => class QuoteSession {
         if (global.TW_DEBUG) console.log('§90§30§102 QUOTE SESSION §0 DATA', packet);
 
         if (packet.type === 'quote_completed') {
-          const symbol = packet.data[1];
-          if (!this.#symbolListeners[symbol]) {
-            this.#client.send('quote_remove_symbols', [this.#sessionID, symbol]);
+          const symbolKey = packet.data[1];
+          if (!this.#symbolListeners[symbolKey]) {
+            this.#client.send('quote_remove_symbols', [this.#sessionID, symbolKey]);
             return;
           }
-          this.#symbolListeners[symbol].forEach((h) => h(packet));
+          this.#symbolListeners[symbolKey].forEach((h) => h(packet));
         }
 
         if (packet.type === 'qsd') {
-          const symbol = packet.data[1].n;
-          if (!this.#symbolListeners[symbol]) {
-            this.#client.send('quote_remove_symbols', [this.#sessionID, symbol]);
+          const symbolKey = packet.data[1].n;
+          if (!this.#symbolListeners[symbolKey]) {
+            this.#client.send('quote_remove_symbols', [this.#sessionID, symbolKey]);
             return;
           }
-          this.#symbolListeners[symbol].forEach((h) => h(packet));
+          this.#symbolListeners[symbolKey].forEach((h) => h(packet));
         }
       },
     };