@icgio/icg-exchanges-wrapper 1.20.0 → 1.21.0

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

@@ -225,10 +225,14 @@ const get_exchanges_rates = function (Exchanges, exchange_pair_dict, cb, ws_enab
                         Exchange.ws.market.pair_status[pair] === 'opened' &&
                         Exchange.ws.market.asks_dict &&
                         Exchange.ws.market.asks_dict[pair] &&
-                        (typeof Exchange.ws.market.asks_dict[pair].length === 'function' ? Exchange.ws.market.asks_dict[pair].length() : Exchange.ws.market.asks_dict[pair].length) > 0 &&
+                        (typeof Exchange.ws.market.asks_dict[pair].length === 'function'
+                          ? Exchange.ws.market.asks_dict[pair].length()
+                          : Exchange.ws.market.asks_dict[pair].length) > 0 &&
                         Exchange.ws.market.bids_dict &&
                         Exchange.ws.market.bids_dict[pair] &&
-                        (typeof Exchange.ws.market.bids_dict[pair].length === 'function' ? Exchange.ws.market.bids_dict[pair].length() : Exchange.ws.market.bids_dict[pair].length) > 0
+                        (typeof Exchange.ws.market.bids_dict[pair].length === 'function'
+                          ? Exchange.ws.market.bids_dict[pair].length()
+                          : Exchange.ws.market.bids_dict[pair].length) > 0
 
                       if (pair_ready) {
                         // Pair is ready, try to get rate
@@ -677,15 +681,12 @@ const get_exchanges_market_history = function (Exchanges, exchange_pair_dict, ti
     })
 }
 
-let checked_ohlcv_exchange = {},
-  ohlcv_status = {},
-  ohlcv_callback_fired = false, // Separate flag to prevent multiple callback calls
-  exchange_pair_ohlcv = {},
-  pair_exchange_ohlcv = {}
-const get_exchanges_ohlcv = function (Exchanges, exchange_pair_dict, from_in_ms, to_in_ms, cb) {
-  checked_ohlcv_exchange = {}
-  ohlcv_status = {}
-  ohlcv_callback_fired = false // Reset callback flag (separate from ohlcv_status to not pollute _.values())
+const get_exchanges_ohlcv = function (Exchanges, exchange_pair_dict, from_in_ms, to_in_ms, interval, cb) {
+  const checked_ohlcv_exchange = {}
+  const ohlcv_status = {}
+  let ohlcv_callback_fired = false
+  const exchange_pair_ohlcv = {}
+  const pair_exchange_ohlcv = {}
   if (!Array.isArray(Exchanges)) {
     console.error('Exchanges should be an array')
     return
@@ -702,7 +703,7 @@ const get_exchanges_ohlcv = function (Exchanges, exchange_pair_dict, from_in_ms,
       for (let pair of exchange_pair_dict[Exchange_name]) {
         _.set(ohlcv_status, [Exchange_name + pair], false)
         if (Exchange.ohlcv) {
-          Exchange.ohlcv(pair, from_in_ms, to_in_ms, function (res) {
+          Exchange.ohlcv(pair, from_in_ms, to_in_ms, interval, function (res) {
             if (res.success) {
               set_pair_data(exchange_pair_ohlcv, pair_exchange_ohlcv, Exchange_name, pair, res.body)
             } else {

package/middleware/orders.js

@@ -1576,7 +1576,7 @@ module.exports = class Orders {
         this.ws_market_first_time = {}
       }
       for (let exchange in exchange_pairs) {
-        if (Exchanges[exchange].ws_market && Exchanges[exchange].exchange_type === 'spot') {
+        if (Exchanges[exchange].ws_market) {
           if (!this.ws_market_first_time[exchange]) {
             Exchanges[exchange].ws_market(exchange_pairs[exchange], this.ws_market_options)
             this.ws_market_first_time[exchange] = true
@@ -1676,13 +1676,13 @@ module.exports = class Orders {
           if (Exchanges[exchange].ohlcv) {
             const ohlcv_from_timetamp = new Date().floorHours(1).addHours(-OHLCV_DEFAULT_PAST_HOURS).getTime()
             const ohlcv_to_timestamp = new Date().floorHours(1).getTime()
-            Exchanges[exchange].ohlcv(pair, ohlcv_from_timetamp, ohlcv_to_timestamp, (res) => {
+            Exchanges[exchange].ohlcv(pair, ohlcv_from_timetamp, ohlcv_to_timestamp, '1h', (res) => {
               ohlcv_handler(exchange, pair, res)
             })
             setInterval(() => {
               const ohlcv_from_timetamp = new Date().floorHours(1).addHours(-OHLCV_DEFAULT_PAST_HOURS).getTime()
               const ohlcv_to_timestamp = new Date().floorHours(1).getTime()
-              Exchanges[exchange].ohlcv(pair, ohlcv_from_timetamp, ohlcv_to_timestamp, (res) => {
+              Exchanges[exchange].ohlcv(pair, ohlcv_from_timetamp, ohlcv_to_timestamp, '1h', (res) => {
                 ohlcv_handler(exchange, pair, res)
               })
             }, interval_dict[exchange].ohlcv)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@icgio/icg-exchanges-wrapper",
-  "version": "1.20.0",
+  "version": "1.21.0",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -17,7 +17,7 @@
   },
   "homepage": "https://github.com/icgio/icg-exchanges-wrapper#readme",
   "dependencies": {
-    "@icgio/icg-exchanges": "^1.44.0",
+    "@icgio/icg-exchanges": "^1.45.0",
     "@icgio/icg-utils": "^1.9.61",
     "lodash": "^4.17.23",
     "pg": "^8.17.2"