@icgio/icg-exchanges-wrapper 1.14.112 → 1.14.114

package/middleware/orders.js

@@ -107,7 +107,7 @@ module.exports = class Orders {
     this.f_filled_threshold = 0.999
     this.previous_orders_canceled = false
     this.previous_orders_canceled_exchange_pair = {}
-    this.account_init = false
+    this.check_balance_amount_init = false
     this.cmc_curs = settings.cmc_curs || []
     this.accounting_benchmark = settings.accounting_benchmark
     this.balance_benchmark = settings.balance_benchmark || {}
@@ -176,8 +176,6 @@ module.exports = class Orders {
     this.order_info = {}
     this.order_info_status = {}
     this.function_enabled = settings.function_enabled || {
-      info_log: true,
-      error_log: true,
       balances_check: true,
       positions_check: false,
       open_orders_check: true,
@@ -189,12 +187,6 @@ module.exports = class Orders {
       ohlcv_check: false,
       cmc_rates_check: true,
     }
-    this.info_log = (...args) => {
-      if (this.function_enabled.info_log) console.log(...args)
-    }
-    this.error_log = (...args) => {
-      if (this.function_enabled.info_log) console.error(...args)
-    }
     if (this.function_enabled.balances_check) {
       this.check_balances()
     }
@@ -248,7 +240,7 @@ module.exports = class Orders {
   limit_trade(exchange, pair, method, price, amount, id = uuid(), order_type = '', limiter_on = true, api_key_index) {
     price = round_price(_.upperFirst(exchange.replace('_2', '')), pair, price)
     amount = round_amount(_.upperFirst(exchange.replace('_2', '')), pair, amount)
-    this.info_log('%s %s %s %s %s %s at %s', limiter_on, order_type, exchange, pair, method, amount, price)
+    // console.log('%s %s %s %s %s %s at %s', limiter_on, order_type, exchange, pair, method, amount, price)
     this.update_order_info(
       exchange,
       pair,
@@ -313,7 +305,7 @@ module.exports = class Orders {
         if (routes) {
           this.Exchanges[exchange].limit_trade_with_routes(pair, method, price, amount, routes, cb)
         } else {
-          this.error_log('dex no routes:', rates_with_routes, price)
+          console.error('dex no routes:', rates_with_routes, price)
         }
       } else if (limiter_on) {
         this.Exchanges[exchange].limit_trade(pair, method, price, amount, cb)
@@ -364,7 +356,7 @@ module.exports = class Orders {
         //     status: 'N-OPENED-TIMEOUT'
         //   }, order_type + ' n-opened-timeout-callback')
         // }
-        this.error_log('limit trade error: %s %s %s %s %s %s %s %j', order_type, id, exchange, pair, method, price, amount, res)
+        console.error('limit trade error: %s %s %s %s %s %s %s %j', order_type, id, exchange, pair, method, price, amount, res)
       }
       clearTimeout(no_callback_timeout)
     })
@@ -399,7 +391,7 @@ module.exports = class Orders {
           this.delete_order_info(exchange, pair, order.type, order.order_id, order.order_type + ' cancel-order-success')
         }, this.delete_finished_orders_timeout)
       } else if (!res.success && res.error === 'order-not-open' && original_status !== 'CANCELED') {
-        // this.info_log('%s ORDER CANNOT BE CANCELED: %j', original_status, order)
+        // console.log('%s ORDER CANNOT BE CANCELED: %j', original_status, order)
         this.update_order_info(
           exchange,
           pair,
@@ -493,7 +485,7 @@ module.exports = class Orders {
             if (_.includes(['CANCELED', 'CANCELING'], order_info.status) && trade.amount > order_info.f_amount) {
               let type = trade.type,
                 order_id = trade.order_id
-              // this.info_log('TRADES: %s ORDER FILLED', order_info.status, trade, order_info)
+              // console.log('TRADES: %s ORDER FILLED', order_info.status, trade, order_info)
               this.update_order_info(
                 exchange,
                 pair,
@@ -514,7 +506,7 @@ module.exports = class Orders {
                 this.delete_order_info(exchange, pair, type, order_id, order_info.order_type + ' canceled-order-filled(-more)')
               }, this.delete_finished_orders_timeout)
             } else if (order_info.status === 'F-FILLED' && trade.amount > order_info.f_amount) {
-              // this.info_log('TRADES: FILLED ORDER FILLED MORE', trade, order_info)
+              // console.log('TRADES: FILLED ORDER FILLED MORE', trade, order_info)
               this.update_order_info(
                 exchange,
                 pair,
@@ -533,7 +525,7 @@ module.exports = class Orders {
               trade.amount > order_info.f_amount &&
               trade.amount / order_info.t_amount > this.f_filled_threshold
             ) {
-              // this.info_log('TRADES: %s %s ORDER F-FILLED', exchange, pair, trade)
+              // console.log('TRADES: %s %s ORDER F-FILLED', exchange, pair, trade)
               this.update_order_info(
                 exchange,
                 pair,
@@ -558,7 +550,7 @@ module.exports = class Orders {
               trade.amount > order_info.f_amount &&
               trade.amount / order_info.t_amount > this.p_filled_threshold
             ) {
-              // this.info_log('TRADES: %s %s ORDER P-FILLED', exchange, pair, trade)
+              // console.log('TRADES: %s %s ORDER P-FILLED', exchange, pair, trade)
               this.update_order_info(
                 exchange,
                 pair,
@@ -576,7 +568,7 @@ module.exports = class Orders {
             } else if (_.includes(['F-FILLED', 'P-FILLED'], order_info.status)) {
             } else if (_.includes(['CANCELED', 'CANCELING'], order_info.status) && trade.amount === order_info.f_amount) {
             } else {
-              this.info_log('TRADES: UNKNOWN %j %j', order_info, trade)
+              console.log('TRADES: UNKNOWN %j %j', order_info, trade)
             }
           }
         })
@@ -621,7 +613,7 @@ module.exports = class Orders {
                 }
               })
               if (!exist) {
-                // this.info_log('ORDERS: %s %s ORDER F-FILLED NO TRADES FUNCTION EXCHANGES', exchange, pair)
+                // console.log('ORDERS: %s %s ORDER F-FILLED NO TRADES FUNCTION EXCHANGES', exchange, pair)
                 this.update_order_info(
                   exchange,
                   pair,
@@ -652,7 +644,7 @@ module.exports = class Orders {
             let order_info = this.order_info[exchange][pair][order.type][order.order_id]
             order.f_amount = round_amount(_.upperFirst(exchange.replace('_2', '')), pair, order.f_amount)
             if (_.includes(['N-FILLED', 'P-FILLED'], order_info.status) && order.f_amount > order_info.f_amount && order.f_amount / order_info.t_amount > this.f_filled_threshold) {
-              // this.info_log('ORDERS: %s %s ORDER F-FILLED', exchange, pair)
+              // console.log('ORDERS: %s %s ORDER F-FILLED', exchange, pair)
               this.update_order_info(
                 exchange,
                 pair,
@@ -675,7 +667,7 @@ module.exports = class Orders {
               order.f_amount > order_info.f_amount &&
               order.f_amount / order_info.t_amount > this.p_filled_threshold
             ) {
-              // this.info_log('ORDERS: %s %s ORDER P-FILLED', exchange, pair)
+              // console.log('ORDERS: %s %s ORDER P-FILLED', exchange, pair)
               this.update_order_info(
                 exchange,
                 pair,
@@ -702,7 +694,7 @@ module.exports = class Orders {
                 order_time - init_order_time > 0 &&
                 order_time - init_order_time < this.check_init_order_opened_timeout
               ) {
-                // this.info_log('ORDERS: %s %s %s %s INIT ORDER OPENED', init_order.order_id, order.order_id, exchange, pair)
+                // console.log('ORDERS: %s %s %s %s INIT ORDER OPENED', init_order.order_id, order.order_id, exchange, pair)
                 this.delete_order_info(exchange, pair, init_order.type, init_order.order_id, init_order.order_type + ' init-order-opened')
                 this.update_order_info(
                   exchange,
@@ -731,7 +723,7 @@ module.exports = class Orders {
   }
   update_order_info(exchange, pair, type, order_id, dict, note) {
     if (!order_id) {
-      this.error_log('UPDATE %s: order_id invalid %s %s %s %s %j', note, exchange, pair, type, order_id, dict)
+      console.error('UPDATE %s: order_id invalid %s %s %s %s %j', note, exchange, pair, type, order_id, dict)
       return
     }
     for (let key in dict) {
@@ -740,7 +732,7 @@ module.exports = class Orders {
       }
       _.setWith(this.order_info, `${exchange}.${pair}.${type}.${order_id}.${key}`, dict[key], Object)
     }
-    this.info_log('UPDATE %s: %s %s %s %s %j', note, exchange, pair, type, order_id, dict)
+    console.log('UPDATE %s: %s %s %s %s %j', note, exchange, pair, type, order_id, dict)
     // start: log every f-filled trade for future analysis
     if (dict.status === 'F-FILLED') {
       let { price, amount, f_amount, t_amount, fees, close_time } = _.get(this.order_info, [exchange, pair, type, order_id])
@@ -751,7 +743,7 @@ module.exports = class Orders {
   }
   delete_order_info(exchange, pair, type, order_id, note) {
     this.order_info[exchange][pair][type] = _.omit(this.order_info[exchange][pair][type], [order_id])
-    this.info_log('DELETE %s: %s %s %s %s', note, exchange, pair, type, order_id)
+    console.log('DELETE %s: %s %s %s %s', note, exchange, pair, type, order_id)
   }
   check_balances() {
     let balances_handler = (exchange, res) => {
@@ -786,12 +778,12 @@ module.exports = class Orders {
             })
           }
         }
-        if (!this.account_init && _.keys(this.balances).length === _.keys(this.exchange_pairs).length) {
-          this.account_init = true
+        if (!this.check_balance_amount_init && _.keys(this.balances).length === _.keys(this.exchange_pairs).length) {
+          this.check_balance_amount_init = true
           this.init_account(this.balances, this.accounting_benchmark || this.balance_benchmark) // use accounting_benchmark if it exists
         }
       } else if (_.get(this.balances, [exchange, 'update_time']) < new Date().getTime() - this.interval_dict[exchange].balances) {
-        this.info_log('%s balances expired: %j', exchange, res)
+        console.log('%s balances expired: %j', exchange, res)
         this.balances = _.omit(this.balances, [exchange])
         this.buy_sell_limits_against_reserve_balance = _.omit(this.buy_sell_limits_against_reserve_balance, [exchange])
       }
@@ -822,7 +814,7 @@ module.exports = class Orders {
       if (res.success) {
         _.set(this.positions, [exchange], Object.assign(res.body, { update_time: new Date() }))
       } else if (_.get(this.positions, [exchange, 'update_time']) < new Date().getTime() - this.interval_dict[exchange].positions) {
-        this.info_log('%s positions expired: %j', exchange, res)
+        console.log('%s positions expired: %j', exchange, res)
         this.positions = _.omit(this.positions, [exchange])
       }
     }
@@ -872,21 +864,21 @@ module.exports = class Orders {
         // if (buy_orders.length > 0) {
         //   buy_orders = _.initial(_.sortBy(buy_orders, 'price'))
         //   buy_orders.map((order) => {
-        //     this.info_log('cancel original order: %s %s %j', exchange, pair, order)
+        //     console.log('cancel original order: %s %s %j', exchange, pair, order)
         //     this.Exchanges[exchange].cancel_order_by_order(order, (res) => {})
         //   })
         // }
         // if (sell_orders.length > 0) {
         //   sell_orders = _.initial(_.sortBy(sell_orders, 'price').reverse())
         //   sell_orders.map((order) => {
-        //     this.info_log('cancel original order: %s %s %j', exchange, pair, order)
+        //     console.log('cancel original order: %s %s %j', exchange, pair, order)
         //     this.Exchanges[exchange].cancel_order_by_order(order, (res) => {})
         //   })
         // }
         _.set(this.previous_orders_canceled_exchange_pair, [exchange, pair], true)
       } else if (this.cancel_previous_orders && !this.previous_orders_canceled) {
         orders.map((order) => {
-          this.info_log('cancel original order: %s %s %j', exchange, pair, 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) {
@@ -902,7 +894,7 @@ module.exports = class Orders {
             })
           }
           if (previous_orders_canceled) {
-            this.info_log('original order canceled')
+            console.log('original order canceled')
           }
           this.previous_orders_canceled = previous_orders_canceled
         }
@@ -912,12 +904,12 @@ module.exports = class Orders {
         // console.log(exchange, pair, rate_major, orders)
         orders.map((order) => {
           if (order.type === 'sell' && order.price < rate_major.asks[0][0] && order.order_status !== 'F-FILLED' && order.order_type !== 'arb') {
-            this.info_log('cancel range order: %s %s %j', exchange, pair, order)
+            console.log('cancel range order: %s %s %j', exchange, pair, order)
             order.order_type = 'range-order'
             this.cancel_order(exchange, pair, order)
           }
           if (order.type === 'buy' && order.price > rate_major.bids[0][0] && order.order_status !== 'F-FILLED' && order.order_type !== 'arb') {
-            this.info_log('cancel range order: %s %s %j', exchange, pair, order)
+            console.log('cancel range order: %s %s %j', exchange, pair, order)
             order.order_type = 'range-order'
             this.cancel_order(exchange, pair, order)
           }
@@ -929,10 +921,10 @@ module.exports = class Orders {
         _.set(this.open_orders, [exchange, pair], { open_orders: res.body, update_time: new Date() })
         previous_orders_processer(exchange, pair, res.body)
       } else if (_.get(this.open_orders, [exchange, pair, 'update_time']) < new Date().getTime() - this.interval_dict[exchange].open_orders) {
-        this.info_log('%s %s open orders expired: %j', exchange, pair, res)
+        console.log('%s %s open orders expired: %j', exchange, pair, res)
         this.open_orders[exchange] = _.omit(this.open_orders[exchange], [pair])
       } else if (res.error !== 'opening') {
-        this.error_log('%s %s open orders: %j', exchange, pair, res)
+        console.error('%s %s open orders: %j', exchange, pair, res)
       }
     }
     let all_open_orders_handler = (exchange, res) => {
@@ -947,12 +939,12 @@ module.exports = class Orders {
         for (let pair of this.exchange_pairs[exchange]) {
           if (_.get(this.open_orders, [exchange, pair, 'update_time']) < new Date().getTime() - this.interval_dict[exchange].open_orders) {
             if (!error_logged) {
-              this.info_log('%s all open orders expired: %j', exchange, res)
+              console.log('%s all open orders expired: %j', exchange, res)
               error_logged = true
             }
             this.open_orders[exchange] = _.omit(this.open_orders[exchange], [pair])
           } else if (res.error !== 'opening' && !error_logged) {
-            this.error_log('%s all open orders: %j', exchange, res)
+            console.error('%s all open orders: %j', exchange, res)
             error_logged = true
           }
         }
@@ -1031,10 +1023,10 @@ module.exports = class Orders {
           ) || 0
         )
       } else if (_.get(this.trades, [exchange, pair, 'update_time']) < new Date().getTime() - this.interval_dict[exchange].trades) {
-        this.info_log('%s %s trades expired: %j', exchange, pair, res)
+        console.log('%s %s trades expired: %j', exchange, pair, res)
         this.trades[exchange] = _.omit(this.trades[exchange], [pair])
       } else if (res.error !== 'opening') {
-        this.error_log('%s %s trades: %j', exchange, pair, res)
+        console.error('%s %s trades: %j', exchange, pair, res)
       }
     }
     let all_trades_handler = (exchange, res) => {
@@ -1056,12 +1048,12 @@ module.exports = class Orders {
         for (let pair of this.exchange_pairs[exchange]) {
           if (_.get(this.trades, [exchange, pair, 'update_time']) < new Date().getTime() - this.interval_dict[exchange].trades) {
             if (!error_logged) {
-              this.info_log('%s all trades expired: %j', exchange, res)
+              console.log('%s all trades expired: %j', exchange, res)
               error_logged = true
             }
             this.trades[exchange] = _.omit(this.trades[exchange], [pair])
           } else if (res.error !== 'opening' && !error_logged) {
-            this.error_log('%s all trades: %j', exchange, res)
+            console.error('%s all trades: %j', exchange, res)
             error_logged = true
           }
         }
@@ -1159,10 +1151,10 @@ module.exports = class Orders {
       if (res.success) {
         _.set(this.query_order, [exchange, pair], { query_order: res.body, update_time: new Date() })
       } else if (_.get(this.query_order, [exchange, pair, 'update_time']) < new Date().getTime() - this.interval_dict[exchange].query_order) {
-        this.info_log('%s %s query_order expired: %j', exchange, pair, res)
+        console.log('%s %s query_order expired: %j', exchange, pair, res)
         this.query_order[exchange] = _.omit(this.query_order[exchange], [pair])
       } else if (res.error !== 'opening') {
-        this.error_log('%s %s query_order: %j', exchange, pair, res)
+        console.error('%s %s query_order: %j', exchange, pair, res)
       }
     }
     let get_query_order_all = (Exchanges, exchange_pairs, interval_dict) => {
@@ -1318,7 +1310,7 @@ module.exports = class Orders {
          */
         throttled_process_rates()
       } else if (_.get(this.rates, [exchange, pair, 'update_time']) < new Date().getTime() - this.interval_dict[exchange].rates) {
-        this.info_log('%s %s rates expired: %j', exchange, pair, res)
+        console.log('%s %s rates expired: %j', exchange, pair, res)
         this.rates[exchange] = _.omit(this.rates[exchange], [pair])
         this.rates_observable.notify()
       }
@@ -1398,7 +1390,7 @@ module.exports = class Orders {
       if (res.success) {
         _.set(this.market_history, [exchange, pair], { data: res.body, update_time: new Date() })
       } else if (_.get(this.market_history, [exchange, pair, 'update_time']) < new Date().getTime() - this.interval_dict[exchange].market_history) {
-        this.info_log('%s %s market_history expired: %j', exchange, pair, res)
+        console.log('%s %s market_history expired: %j', exchange, pair, res)
         this.market_history[exchange] = _.omit(this.market_history[exchange], [pair])
       }
     }
@@ -1439,7 +1431,7 @@ module.exports = class Orders {
           _.set(this.ohlcv, [exchange, pair], { data: res.body, update_time: new Date() })
         }
       } else if (_.get(this.ohlcv, [exchange, pair, 'update_time']) < new Date().getTime() - this.interval_dict[exchange].ohlcv) {
-        this.info_log('%s %s ohlcv expired: %j', exchange, pair, res)
+        console.log('%s %s ohlcv expired: %j', exchange, pair, res)
         this.ohlcv[exchange] = _.omit(this.ohlcv[exchange], [pair])
       }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@icgio/icg-exchanges-wrapper",
-  "version": "1.14.112",
+  "version": "1.14.114",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -17,7 +17,7 @@
   },
   "homepage": "https://github.com/icgio/icg-exchanges-wrapper#readme",
   "dependencies": {
-    "@icgio/icg-exchanges": "^1.32.66",
+    "@icgio/icg-exchanges": "^1.32.67",
     "@icgio/icg-exchanges-data": "^1.10.57",
     "@icgio/icg-utils": "^1.9.20",
     "influx": "^5.10.0",