@icgio/icg-exchanges-wrapper 1.21.23 → 1.21.25

package/middleware/orders.js

@@ -857,6 +857,7 @@ module.exports = class Orders {
     }
     for (let exchange in open_orders) {
       for (let pair in open_orders[exchange]) {
+        const init_orders = this.check_init_order_opened ? this.get_order_info_status_all(exchange, pair, 'both', 'INIT') : []
         open_orders[exchange][pair].open_orders.map((order) => {
           if (_.get(this.order_info, [exchange, pair, order.type, order.order_id])) {
             let order_info = this.order_info[exchange][pair][order.type][order.order_id]
@@ -905,8 +906,8 @@ module.exports = class Orders {
                 order_info.order_type + ' order-p-filled-2',
               )
             }
-          } else if (this.get_order_info_status_all(exchange, pair, 'both', 'INIT') && this.check_init_order_opened) {
-            this.get_order_info_status_all(exchange, pair, 'both', 'INIT').map((init_order) => {
+          } else if (init_orders.length > 0) {
+            init_orders.forEach((init_order) => {
               let init_order_price = round_price(exchange, pair, init_order.price)
               let order_price = round_price(exchange, pair, order.price)
               let init_order_time = typeof init_order.open_time === 'number' ? init_order.open_time : new Date(init_order.open_time).getTime()
@@ -1492,8 +1493,7 @@ module.exports = class Orders {
     get_trades_all(this.Exchanges, this.exchange_pairs, this.interval_dict)
   }
   check_query_order(exchange, order_types) {
-    // const QUERY_ORDER_TIME_IN_MS = 30 * 60 * 1000
-    const QUERY_ORDER_TIME_IN_MS = 0
+    const QUERY_ORDER_TIME_IN_MS = 5 * 1000
     const types = order_types && order_types.length > 0 ? order_types : ['maker_1']
     let query_order_handler = (exchange, pair, res) => {
       if (res.success) {
@@ -1505,6 +1505,7 @@ module.exports = class Orders {
         console.error('%s %s query_order: %j', exchange, pair, res)
       }
     }
+    const in_flight = new Set()
     let get_query_order_all = (Exchanges, exchange_pairs, interval_dict) => {
       let query_order = (exchange, pair) => {
         let order_info = _.get(this.get_order_info_by_order_type(types), [exchange, pair], {})
@@ -1514,27 +1515,38 @@ module.exports = class Orders {
         let order_number = _.keys(order_info['sell']).length + _.keys(order_info['buy']).length,
           count = 0,
           result = []
+        const settle = () => {
+          query_order_handler(exchange, pair, { success: true, body: result })
+          clearTimeout(timeout)
+          setTimeout(() => {
+            query_order(exchange, pair)
+          }, interval_dict[exchange].query_order)
+        }
+        if (order_number === 0) {
+          return
+        }
         for (let type in order_info) {
           for (let order_id in order_info[type]) {
             let { open_time } = order_info[type][order_id]
-            // console.log(order_id, open_time, open_time < new Date() - 30 * 60 * 1000)
+            const key = `${exchange}:${pair}:${type}:${order_id}`
+            if (in_flight.has(key)) {
+              count++
+              if (count === order_number) settle()
+              continue
+            }
             if (open_time < Date.now() - QUERY_ORDER_TIME_IN_MS) {
-              // console.log('query_order_maker_1: %s %s %s', exchange, pair, order_id)
+              in_flight.add(key)
               Exchanges[exchange].query_order(pair, order_id, (res) => {
+                in_flight.delete(key)
                 count++
                 if (res.success) {
                   result.push(res.body)
                 }
-                if (count === order_number) {
-                  query_order_handler(exchange, pair, { success: true, body: result })
-                  clearTimeout(timeout)
-                  setTimeout(() => {
-                    query_order(exchange, pair)
-                  }, interval_dict[exchange].query_order)
-                }
+                if (count === order_number) settle()
               })
             } else {
               count++
+              if (count === order_number) settle()
             }
           }
         }

package/package.json

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