@icgio/icg-exchanges-wrapper 1.12.211 → 1.13.0

package/middleware/orders.js

@@ -4,7 +4,7 @@ const { v4: uuid } = require('uuid')
 
 const icg_exchanges = require('@icgio/icg-exchanges')
 const utils = require('@icgio/icg-utils').utils
-const get_coinmarketcap_rates = require('@icgio/icg-utils').coinmarketcap
+const { coinmarketcap: get_coinmarketcap_rates, observable: Observable } = require('@icgio/icg-utils')
 
 const { round_price, round_amount } = require('@icgio/icg-exchanges-data')
 
@@ -103,9 +103,9 @@ module.exports = class Orders {
         LIMITS
       if (_.includes(['binance', 'gate', 'gatev4'], exchange)) {
         LIMITS = MEDIUM_LIMITS
-      } else if (_.includes(['bitfinex', 'bitforex', 'bkex', 'coinsbit', 'kucoin', 'lbank', 'okx', 'phemex', 'xt'], exchange)) {
+      } else if (_.includes(['bitfinex', 'coinsbit', 'kucoin', 'lbank', 'okx', 'phemex', 'xt'], exchange)) {
         LIMITS = SMALL_LIMITS
-      } else if (_.includes(['bitkub', 'coinbene', 'poloniex'], exchange)) {
+      } else if (_.includes(['bitkub', 'poloniex'], exchange)) {
         LIMITS = MINIMUM_LIMITS
       } else if (_.includes(['swft'], exchange)) {
         LIMITS = SWFT_LIMITS
@@ -147,6 +147,7 @@ module.exports = class Orders {
     this.query_order = {}
     this.rates = {}
     this.rates_with_routes = {}
+    this.rates_observable = new Observable()
     this.market_history = {}
     this.ohlcv = {}
     this.cmc_rates = {}
@@ -224,7 +225,6 @@ module.exports = class Orders {
         this.process_query_order(this.query_order)
       }, PROCESS_INTERVAL)
     }
-    this.ws_market_first_time = {}
   }
   init_account(balances, benchmarks) {
     this.account = new Account(balances, benchmarks)
@@ -1282,22 +1282,23 @@ module.exports = class Orders {
         this.info_log('%s %s rates expired: %j', exchange, pair, res)
         this.rates[exchange] = _.omit(this.rates[exchange], [pair])
       }
+      this.rates_observable.notify()
     }
     let get_rates = (Exchanges, ExchangesRatesOnly, exchange_pairs, exchange_pairs_rates_only, interval_dict) => {
+      if (!this.ws_market_first_time) {
+        this.ws_market_first_time = {}
+      }
       for (let exchange in Exchanges) {
         if (Exchanges[exchange].ws_market && Exchanges[exchange].exchange_type === 'spot') {
-          setInterval(() => {
-            if (!this.ws_market_first_time[exchange]) {
-              Exchanges[exchange].ws_market(exchange_pairs[exchange])
-              this.ws_market_first_time[exchange] = true
-            } else {
-              for (let pair of exchange_pairs[exchange]) {
-                Exchanges[exchange].rate_ws(pair, (res) => {
-                  rates_handler(exchange, pair, res)
-                })
-              }
-            }
-          }, interval_dict[exchange].rates)
+          if (!this.ws_market_first_time[exchange]) {
+            Exchanges[exchange].ws_market(exchange_pairs[exchange])
+            this.ws_market_first_time[exchange] = true
+          }
+          for (let pair of exchange_pairs[exchange]) {
+            Exchanges[exchange].rate_ws_observable(pair, (res) => {
+              rates_handler(exchange, pair, res)
+            })
+          }
         } else if (Exchanges[exchange].ws_market && Exchanges[exchange].exchange_type === 'dex') {
           setInterval(() => {
             if (!this.ws_market_first_time[exchange]) {
@@ -1331,18 +1332,15 @@ module.exports = class Orders {
       }
       for (let exchange in ExchangesRatesOnly) {
         if (ExchangesRatesOnly[exchange].ws_market) {
-          setInterval(() => {
-            if (!this.ws_market_first_time[exchange]) {
-              ExchangesRatesOnly[exchange].ws_market(exchange_pairs_rates_only[exchange])
-              this.ws_market_first_time[exchange] = true
-            } else {
-              for (let pair of exchange_pairs_rates_only[exchange]) {
-                ExchangesRatesOnly[exchange].rate_ws(pair, (res) => {
-                  rates_handler(exchange, pair, res)
-                })
-              }
-            }
-          }, interval_dict[exchange].rates)
+          if (!this.ws_market_first_time[exchange]) {
+            ExchangesRatesOnly[exchange].ws_market(exchange_pairs_rates_only[exchange])
+            this.ws_market_first_time[exchange] = true
+          }
+          for (let pair of exchange_pairs_rates_only[exchange]) {
+            ExchangesRatesOnly[exchange].rate_ws_observable(pair, (res) => {
+              rates_handler(exchange, pair, res)
+            })
+          }
         } else {
           for (let pair of exchange_pairs_rates_only[exchange]) {
             setInterval(() => {
@@ -1369,18 +1367,15 @@ module.exports = class Orders {
       for (let exchange in Exchanges) {
         const market_history_timeframe = exchange === 'coinbene' ? 30 * 24 * 60 * 60 * 1000 : MARKET_HISTORY_DEFAULT_TIME
         if (Exchanges[exchange].ws_market && Exchanges[exchange].exchange_type === 'spot') {
-          setInterval(() => {
-            if (!this.ws_market_first_time[exchange]) {
-              Exchanges[exchange].ws_market(exchange_pairs[exchange])
-              this.ws_market_first_time[exchange] = true
-            } else {
-              for (let pair of exchange_pairs[exchange]) {
-                Exchanges[exchange].market_history_ws(pair, market_history_timeframe, (res) => {
-                  market_history_handler(exchange, pair, res)
-                })
-              }
-            }
-          }, interval_dict[exchange].market_history)
+          if (!this.ws_market_first_time[exchange]) {
+            Exchanges[exchange].ws_market(exchange_pairs[exchange])
+            this.ws_market_first_time[exchange] = true
+          }
+          for (let pair of exchange_pairs[exchange]) {
+            Exchanges[exchange].market_history_ws_observable(pair, market_history_timeframe, (res) => {
+              market_history_handler(exchange, pair, res)
+            })
+          }
         } else if (Exchanges[exchange].market_history) {
           for (let pair of exchange_pairs[exchange]) {
             setInterval(() => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@icgio/icg-exchanges-wrapper",
-  "version": "1.12.211",
+  "version": "1.13.0",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -17,9 +17,9 @@
   },
   "homepage": "https://github.com/icgio/icg-exchanges-wrapper#readme",
   "dependencies": {
-    "@icgio/icg-exchanges": "^1.30.95",
-    "@icgio/icg-exchanges-data": "^1.8.173",
-    "@icgio/icg-utils": "^1.7.77",
+    "@icgio/icg-exchanges": "^1.31.0",
+    "@icgio/icg-exchanges-data": "^1.9.0",
+    "@icgio/icg-utils": "^1.8.0",
     "influx": "^5.7.0",
     "lodash": "^4.17.20",
     "uuid": "^9.0.1",