@icgio/icg-exchanges-wrapper 1.9.154 → 1.9.156

package/functions/get-exchanges-rates-market-history-ohlcv.js

@@ -125,26 +125,28 @@ module.exports.get_exchanges_market_history = function (Exchanges, exchange_pair
   cb({ exchange_pair_market_history, pair_exchange_market_history })
 }
 
-let checked_ohlcv = {},
+let checked_ohlcv_exchange = {},
+  ohlcv_status = {},
   exchange_pair_ohlcv = {},
   pair_exchange_ohlcv = {}
 module.exports.get_exchanges_ohlcv = function (Exchanges, exchange_pair_dict, from_in_ms, to_in_ms, cb) {
-  checked_ohlcv = {}
+  checked_ohlcv_exchange = {}
   if (!Array.isArray(Exchanges)) {
     console.error('Exchanges should be an array')
     return
   } else {
     for (let Exchange of Exchanges) {
       let Exchange_name = _.upperFirst(Exchange.name)
-      if (checked_ohlcv[Exchange_name]) {
+      if (checked_ohlcv_exchange[Exchange_name]) {
         continue
       }
-      checked_ohlcv[Exchange_name] = true
+      checked_ohlcv_exchange[Exchange_name] = true
       if (!exchange_pair_dict[Exchange_name]) {
         continue
       }
-      if (Exchange.ohlcv) {
-        for (let pair of exchange_pair_dict[Exchange_name]) {
+      for (let pair of exchange_pair_dict[Exchange_name]) {
+        _.set(ohlcv_status, [exchange + pair], false)
+        if (Exchange.ohlcv) {
           Exchange.ohlcv(pair, from_in_ms, to_in_ms, function (res) {
             if (res.success) {
               _.set(exchange_pair_ohlcv, [Exchange_name, pair], res.body)
@@ -157,10 +159,18 @@ module.exports.get_exchanges_ohlcv = function (Exchanges, exchange_pair_dict, fr
                 delete pair_exchange_ohlcv[pair][Exchange_name]
               }
             }
+            _.set(ohlcv_status, [exchange + pair], true)
+            if (!_.includes(_.values(ohlcv_status), false)) {
+              cb({ exchange_pair_ohlcv, pair_exchange_ohlcv })
+            }
           })
+        } else {
+          _.set(ohlcv_status, [exchange + pair], true)
+          if (!_.includes(_.values(ohlcv_status), false)) {
+            cb({ exchange_pair_ohlcv, pair_exchange_ohlcv })
+          }
         }
       }
     }
   }
-  cb({ exchange_pair_ohlcv, pair_exchange_ohlcv })
 }

package/functions/get-exchanges-trades.js

@@ -3,32 +3,31 @@ const _ = require('lodash')
 const INVALID_EXCHANGES_LIST = ['Bitforex', 'Thinkbit', 'Kkcoin']
 const TRADES_TIMEFRAME = 10 * 60 * 1000
 
-let first_time = {}, exchange_pair_trades = {}, status = {}
-module.exports.get_exchanges_trades = function (Exchanges, exchange_pair_dict, cb, ws_enabled=true) {
+let first_time = {},
+  exchange_pair_trades = {},
+  trades_status = {}
+module.exports.get_exchanges_trades = function (Exchanges, exchange_pair_dict, cb, ws_enabled = true) {
   if (!Array.isArray(Exchanges)) {
     console.error('Exchanges should be an array')
     return
   } else {
     for (let exchange of Exchanges) {
-      let exchange_name = exchange.name, exchange_id = exchange.exchange_id
+      let exchange_name = exchange.name,
+        exchange_id = exchange.exchange_id
       if (!exchange_pair_dict[exchange_name]) {
         continue
       }
       let pair_list = exchange_pair_dict[exchange_name]
       for (let pair of pair_list) {
-        _.set(status, [exchange + pair], false)
+        _.set(trades_status, [exchange + pair], false)
       }
       if (_.includes(INVALID_EXCHANGES_LIST, exchange_name)) {
         continue
       } else if (exchange.get_all_trades_ws) {
-        if (exchange.ws_status().trading === 'n-opened')
-          exchange.ws_account()
+        if (exchange.ws_trades_status().trading === 'n-opened') exchange.ws_account()
         exchange.get_all_trades_ws(TRADES_TIMEFRAME, function (res) {
-          for (let pair of pair_list) {
-            _.set(status, [exchange + pair], true)
-          }
           if (res.success) {
-            res.body(trade => {
+            res.body((trade) => {
               let pair = trade.pair
               if (!_.get(exchange_pair_trades, [exchange, pair])) {
                 _.set(exchange_pair_trades, [exchange_id, pair], [])
@@ -41,38 +40,39 @@ module.exports.get_exchanges_trades = function (Exchanges, exchange_pair_dict, c
               delete exchange_pair_trades[exchange]
             }
           }
-          if (!_.includes(_.values(status), false)) {
+          for (let pair of pair_list) {
+            _.set(trades_status, [exchange + pair], true)
+          }
+          if (!_.includes(_.values(trades_status), false)) {
             cb(exchange_pair_trades)
           }
         })
       } else if (exchange.get_all_trades) {
         exchange.get_all_trades(TRADES_TIMEFRAME, function (res) {
-          for (let pair of pair_list) {
-            _.set(status, [exchange + pair], true)
-          }
           if (res.success) {
-            res.body(trade => {
+            res.body((trade) => {
               let pair = trade.pair
               if (!_.get(exchange_pair_trades, [exchange_id, pair])) {
                 _.set(exchange_pair_trades, [exchange_id, pair], [])
               }
               exchange_pair_trades[exchange][pair].push(trade)
-            })     
+            })
           } else {
             if (exchange_pair_trades[exchange]) {
               delete exchange_pair_trades[exchange][pair]
             }
           }
-          if (!_.includes(_.values(status), false)) {
+          for (let pair of pair_list) {
+            _.set(trades_status, [exchange + pair], true)
+          }
+          if (!_.includes(_.values(trades_status), false)) {
             cb(exchange_pair_trades)
-          }     
+          }
         })
       } else if (exchange.get_trades_ws) {
-        if (exchange.ws_status().trading === 'n-opened')
-          exchange.ws_account()
+        if (exchange.ws_trades_status().trading === 'n-opened') exchange.ws_account()
         for (let pair of pair_list) {
           exchange.get_trades_ws(pair, TRADES_TIMEFRAME, function (res) {
-            _.set(status, [exchange + pair], true)
             if (res.success) {
               _.set(exchange_pair_trades, [exchange_id, pair], res.body)
             } else {
@@ -80,7 +80,8 @@ module.exports.get_exchanges_trades = function (Exchanges, exchange_pair_dict, c
                 delete exchange_pair_trades[exchange][pair]
               }
             }
-            if (!_.includes(_.values(status), false)) {
+            _.set(trades_status, [exchange + pair], true)
+            if (!_.includes(_.values(trades_status), false)) {
               cb(exchange_pair_trades)
             }
           })
@@ -88,7 +89,6 @@ module.exports.get_exchanges_trades = function (Exchanges, exchange_pair_dict, c
       } else if (exchange.get_trades) {
         for (let pair of pair_list) {
           exchange.get_trades(pair, TRADES_TIMEFRAME, function (res) {
-            _.set(status, [exchange + pair], true)
             if (res.success) {
               _.set(exchange_pair_trades, [exchange_id, pair], res.body)
             } else {
@@ -96,7 +96,8 @@ module.exports.get_exchanges_trades = function (Exchanges, exchange_pair_dict, c
                 delete exchange_pair_trades[exchange][pair]
               }
             }
-            if (!_.includes(_.values(status), false)) {
+            _.set(trades_status, [exchange + pair], true)
+            if (!_.includes(_.values(trades_status), false)) {
               cb(exchange_pair_trades)
             }
           })
@@ -104,4 +105,4 @@ module.exports.get_exchanges_trades = function (Exchanges, exchange_pair_dict, c
       }
     }
   }
-}
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@icgio/icg-exchanges-wrapper",
-  "version": "1.9.154",
+  "version": "1.9.156",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -17,7 +17,7 @@
   },
   "homepage": "https://github.com/icgio/icg-exchanges-wrapper#readme",
   "dependencies": {
-    "@icgio/icg-exchanges": "^1.27.108",
+    "@icgio/icg-exchanges": "^1.27.109",
     "@icgio/icg-exchanges-data": "^1.6.57",
     "@icgio/icg-utils": "^1.7.30",
     "influx": "^5.7.0",