@icgio/icg-exchanges-wrapper 1.14.170 → 1.14.172

package/middleware/orders.js

@@ -181,7 +181,7 @@ module.exports = class Orders {
       positions_check: false,
       open_orders_check: true,
       trades_check: true,
-      query_order_check: true,
+      query_order_check_old_orders: true,
       query_order_check_exchange: {},
       rates_check: true,
       market_history_check: true,
@@ -201,7 +201,7 @@ module.exports = class Orders {
       this.trades_amount_past_hour = {}
       this.check_trades()
     }
-    if (this.function_enabled.query_order_check) {
+    if (this.function_enabled.query_order_check_old_orders) {
       for (let exchange in this.Exchanges) {
         if (this.function_enabled.query_order_check_exchange[exchange]) {
           this.check_query_order(exchange)
@@ -226,7 +226,7 @@ module.exports = class Orders {
         this.process_open_orders(this.open_orders)
       }, PROCESS_OPEN_ORDERS_TRADERS_INTERVAL_MS)
     }
-    if (this.function_enabled.query_order_check) {
+    if (this.function_enabled.query_order_check_old_orders) {
       setInterval(() => {
         this.process_query_order(this.query_order)
       }, PROCESS_OPEN_ORDERS_TRADERS_INTERVAL_MS)
@@ -865,25 +865,24 @@ module.exports = class Orders {
       if (_.includes(this.no_cancel_previous_exchanges, exchange) && !this.previous_orders_canceled) {
         _.set(this.previous_orders_canceled_exchange_pair, [exchange, pair], true)
       }
-      // cancel previous orders with delay
-      else if (this.cancel_previous_orders && this.cancel_previous_orders_with_delay) {
-        const previous_orders = _.cloneDeep(orders)
-        setTimeout(() => {
-          previous_orders.map((order) => {
-            console.log('cancel original order: %s %s %j', exchange, pair, order)
-            this.Exchanges[exchange].cancel_order_by_order(order, (res) => {})
-          })
-        }, CANCEL_PREVIOUS_ORDERS_DELAY_MS)
-        this.previous_orders_canceled = true
-      }
       // cancel previous orders
       else if (this.cancel_previous_orders && !this.previous_orders_canceled) {
-        orders.map((order) => {
-          console.log('cancel original order: %s %s %j', exchange, pair, order)
-          this.Exchanges[exchange].cancel_order_by_order(order, (res) => {})
-        })
-        if (orders.length === 0) {
+        if (this.cancel_previous_orders_with_delay) {
+          setTimeout(() => {
+            orders.map((order) => {
+              console.log('cancel original order with delay: %s %s %j', exchange, pair, order)
+              this.Exchanges[exchange].cancel_order_by_order(order, (res) => {})
+            })
+          }, CANCEL_PREVIOUS_ORDERS_DELAY_MS)
           _.set(this.previous_orders_canceled_exchange_pair, [exchange, pair], true)
+        } else {
+          orders.map((order) => {
+            console.log('cancel original order: %s %s %j', exchange, pair, order)
+            this.Exchanges[exchange].cancel_order_by_order(order, (res) => {})
+          })
+          if (orders.length === 0) {
+            _.set(this.previous_orders_canceled_exchange_pair, [exchange, pair], true)
+          }
         }
         if (!this.previous_orders_canceled) {
           let previous_orders_canceled = true
@@ -1146,8 +1145,8 @@ module.exports = class Orders {
     get_trades_all(this.Exchanges, this.exchange_pairs, this.interval_dict)
   }
   check_query_order(exchange) {
-    // const QUERY_ORDER_TIME_IN_MS = 30 * 60 * 1000
-    const QUERY_ORDER_TIME_IN_MS = 0
+    const QUERY_ORDER_TIME_IN_MS = 30 * 60 * 1000
+    // const QUERY_ORDER_TIME_IN_MS = 0
     let query_order_handler = (exchange, pair, res) => {
       if (res.success) {
         _.set(this.query_order, [exchange, pair], { query_order: res.body, update_time: new Date() })
@@ -1172,6 +1171,7 @@ module.exports = class Orders {
             let { open_time } = order_info[type][order_id]
             // console.log(order_id, open_time, open_time < new Date() - 30 * 60 * 1000)
             if (open_time < new Date() - QUERY_ORDER_TIME_IN_MS) {
+              console.log('query_order_old_orders: %s %s %s', exchange, pair, order_id)
               Exchanges[exchange].query_order(pair, order_id, (res) => {
                 count++
                 if (res.success) {

package/package.json

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