@icgio/icg-exchanges-wrapper 1.14.102 → 1.14.103

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

@@ -134,11 +134,12 @@ const get_exchanges_rates = function (Exchanges, exchange_pair_dict, cb, ws_enab
     })
 }
 
-let checked_market_history = {},
-  exchange_pair_market_history = {},
+let exchange_pair_market_history = {},
   pair_exchange_market_history = {}
 const get_exchanges_market_history = function (Exchanges, exchange_pair_dict, timeframe_in_ms, cb, ws_enabled = true) {
-  checked_market_history = {}
+  let checked_market_history = {}
+  let promises = []
+
   if (!Array.isArray(Exchanges)) {
     console.error('Exchanges should be an array')
     return
@@ -149,16 +150,62 @@ const get_exchanges_market_history = function (Exchanges, exchange_pair_dict, ti
         continue
       }
       checked_market_history[Exchange_name] = true
+
       if (!exchange_pair_dict[Exchange_name]) {
         continue
       }
+
       if (Exchange.ws_market && ws_enabled) {
-        if (!first_time[Exchange_name]) {
-          Exchange.ws_market(exchange_pair_dict[Exchange_name])
-          first_time[Exchange_name] = true
-        } else {
-          for (let pair of exchange_pair_dict[Exchange_name]) {
-            Exchange.market_history_ws(pair, timeframe_in_ms, function (res) {
+        let ws_promise = new Promise((resolve, reject) => {
+          if (!first_time[Exchange_name]) {
+            Exchange.ws_market(exchange_pair_dict[Exchange_name])
+            first_time[Exchange_name] = true
+          }
+
+          const check_status = () => {
+            let all_pairs_opened = exchange_pair_dict[Exchange_name].every((pair) => {
+              return Exchange.ws.market.pair_status[pair] === 'opened' && Exchange.ws.market.market_history_dict[pair].length >= 0
+            })
+
+            if (all_pairs_opened) {
+              let market_history_promises = exchange_pair_dict[Exchange_name].map((pair) => {
+                return new Promise((rate_resolve) => {
+                  Exchange.market_history_ws(pair, timeframe_in_ms, function (res) {
+                    if (res.success) {
+                      _.set(exchange_pair_market_history, [Exchange_name, pair], res.body)
+                      _.set(pair_exchange_market_history, [pair, Exchange_name], res.body)
+                    } else {
+                      if (exchange_pair_market_history[Exchange_name]) {
+                        delete exchange_pair_market_history[Exchange_name][pair]
+                      }
+                      if (pair_exchange_market_history[pair]) {
+                        delete pair_exchange_market_history[pair][Exchange_name]
+                      }
+                    }
+                    rate_resolve()
+                  })
+                })
+              })
+
+              Promise.all(market_history_promises)
+                .then(() => resolve())
+                .catch((err) => {
+                  console.error(`Error in market_history_ws for ${Exchange_name}:`, err)
+                  resolve()
+                })
+            } else {
+              setTimeout(check_status, 100)
+            }
+          }
+
+          check_status()
+        })
+
+        promises.push(ws_promise)
+      } else if (Exchange.market_history) {
+        let market_history_promises = exchange_pair_dict[Exchange_name].map((pair) => {
+          return new Promise((resolve) => {
+            Exchange.market_history(pair, timeframe_in_ms, function (res) {
               if (res.success) {
                 _.set(exchange_pair_market_history, [Exchange_name, pair], res.body)
                 _.set(pair_exchange_market_history, [pair, Exchange_name], res.body)
@@ -170,29 +217,24 @@ const get_exchanges_market_history = function (Exchanges, exchange_pair_dict, ti
                   delete pair_exchange_market_history[pair][Exchange_name]
                 }
               }
+              resolve()
             })
-          }
-        }
-      } else if (Exchange.market_history) {
-        for (let pair of exchange_pair_dict[Exchange_name]) {
-          Exchange.market_history(pair, timeframe_in_ms, function (res) {
-            if (res.success) {
-              _.set(exchange_pair_market_history, [Exchange_name, pair], res.body)
-              _.set(pair_exchange_market_history, [pair, Exchange_name], res.body)
-            } else {
-              if (exchange_pair_market_history[Exchange_name]) {
-                delete exchange_pair_market_history[Exchange_name][pair]
-              }
-              if (pair_exchange_market_history[pair]) {
-                delete pair_exchange_market_history[pair][Exchange_name]
-              }
-            }
           })
-        }
+        })
+
+        promises = promises.concat(market_history_promises)
       }
     }
   }
-  cb({ exchange_pair_market_history, pair_exchange_market_history })
+
+  Promise.all(promises)
+    .then(() => {
+      cb({ exchange_pair_market_history, pair_exchange_market_history })
+    })
+    .catch((error) => {
+      console.error('Error in fetching market history:', error)
+      cb({ exchange_pair_market_history, pair_exchange_market_history })
+    })
 }
 
 let checked_ohlcv_exchange = {},

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@icgio/icg-exchanges-wrapper",
-  "version": "1.14.102",
+  "version": "1.14.103",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -17,7 +17,7 @@
   },
   "homepage": "https://github.com/icgio/icg-exchanges-wrapper#readme",
   "dependencies": {
-    "@icgio/icg-exchanges": "^1.32.56",
+    "@icgio/icg-exchanges": "^1.32.58",
     "@icgio/icg-exchanges-data": "^1.10.55",
     "@icgio/icg-utils": "^1.9.16",
     "influx": "^5.10.0",