@icgio/icg-exchanges-wrapper 1.9.168 → 1.9.170

package/middleware/orders.js

@@ -137,60 +137,65 @@ module.exports = class Orders {
     this.buy_sell_limits_against_reserve_balance = {}
     this.order_info = {}
     this.order_info_status = {}
-    this.enabled = settings.enabled || {
+    this.function_enabled = settings.function_enabled || {
       info_log: true,
       error_log: true,
       balances_check: true,
       positions_check: false,
       open_orders_check: true,
       trades_check: true,
-      query_order_check: false,
+      query_order_check: true,
+      query_order_check_exchange: {},
       rates_check: true,
       market_history_check: true,
       ohlcv_check: false,
       cmc_rates_check: true,
     }
     this.info_log = (...args) => {
-      if (this.enabled.info_log) console.log(...args)
+      if (this.function_enabled.info_log) console.log(...args)
     }
     this.error_log = (...args) => {
-      if (this.enabled.info_log) console.error(...args)
+      if (this.function_enabled.info_log) console.error(...args)
     }
-    if (this.enabled.balances_check) {
+    if (this.function_enabled.balances_check) {
       this.check_balances()
     }
-    if (this.enabled.positions_check) {
+    if (this.function_enabled.positions_check) {
       this.check_positions()
     }
-    if (this.enabled.open_orders_check) {
+    if (this.function_enabled.open_orders_check) {
       this.check_open_orders()
     }
-    if (this.enabled.trades_check) {
+    if (this.function_enabled.trades_check) {
       this.trades_amount_past_hour = {}
       this.check_trades()
     }
-    if (this.enabled.query_order_check) {
-      this.check_query_order()
+    if (this.function_enabled.query_order_check) {
+      for (let exchange in this.Exchanges) {
+        if (this.function_enabled.query_order_check_exchange[exchange]) {
+          this.check_query_order(exchange)
+        }
+      }
     }
-    if (this.enabled.rates_check) {
+    if (this.function_enabled.rates_check) {
       this.check_rates()
     }
-    if (this.enabled.market_history_check) {
+    if (this.function_enabled.market_history_check) {
       this.check_market_history()
     }
-    if (this.enabled.ohlcv_check) {
+    if (this.function_enabled.ohlcv_check) {
       this.check_ohlcv()
     }
-    if (this.enabled.cmc_rates_check) {
+    if (this.function_enabled.cmc_rates_check) {
       this.check_cmc_rates(this.cmc_curs, 'curs')
     }
-    if (this.enabled.balances_check && this.enabled.open_orders_check && this.enabled.trades_check) {
+    if (this.function_enabled.balances_check && this.function_enabled.open_orders_check && this.function_enabled.trades_check) {
       setInterval(() => {
         this.process_trades(this.trades)
         this.process_open_orders(this.open_orders)
       }, PROCESS_INTERVAL)
     }
-    if (this.enabled.query_order_check) {
+    if (this.function_enabled.query_order_check) {
       setInterval(() => {
         this.process_query_order(this.query_order)
       }, PROCESS_INTERVAL)
@@ -1069,7 +1074,7 @@ module.exports = class Orders {
     }
     get_trades_all(this.Exchanges, this.exchange_pairs, this.interval_dict)
   }
-  check_query_order() {
+  check_query_order(exchange) {
     // const QUERY_ORDER_TIME_IN_MS = 30 * 60 * 1000
     const QUERY_ORDER_TIME_IN_MS = 0
     let query_order_handler = (exchange, pair, res) => {
@@ -1115,11 +1120,9 @@ module.exports = class Orders {
           }
         }
       }
-      for (let exchange in Exchanges) {
-        if (Exchanges[exchange].query_order) {
-          for (let pair of exchange_pairs[exchange]) {
-            query_order(exchange, pair)
-          }
+      if (Exchanges[exchange].query_order) {
+        for (let pair of exchange_pairs[exchange]) {
+          query_order(exchange, pair)
         }
       }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@icgio/icg-exchanges-wrapper",
-  "version": "1.9.168",
+  "version": "1.9.170",
   "description": "",
   "main": "index.js",
   "scripts": {