@icgio/icg-exchanges-wrapper 1.14.265 → 1.14.267

package/middleware/account.js

@@ -59,21 +59,26 @@ module.exports = class Account {
       })
     }
   }
-  get_rate_usd(cur, cmc_rates) {
-    // Unified rate resolution: forex_rates first, then cmc_rates fallback
+  get_rate_usd(cur, crypto_rates) {
+    // Unified rate resolution: forex_rates first, then crypto_rates fallback
     if (this.forex_rates[cur]) {
       return this.forex_rates[cur]
     }
+    // Check if crypto_rates exists before accessing it
+    if (!crypto_rates) {
+      console.log('get_rate_usd crypto_rates is undefined for %s', cur)
+      return 0
+    }
     // Log warnings for missing/expired CMC rates
-    if (!cmc_rates[cur]) {
+    if (!crypto_rates[cur]) {
       console.log('get_rate_usd rates_cmc %s does not exist', cur)
-    } else if (cmc_rates[cur].update_time < new Date().getTime() - CMC_RATES_EXPIRY_TIMEOUT) {
+    } else if (crypto_rates[cur].update_time < new Date().getTime() - CMC_RATES_EXPIRY_TIMEOUT) {
       // some currencies like USDT are updating slow
       console.log('get_rate_usd rates_cmc %s expired', cur)
     }
-    return _.get(cmc_rates, [cur, 'USD'], 0)
+    return _.get(crypto_rates, [cur, 'USD'], 0)
   }
-  get_depth(rates, cmc_rates, percentages) {
+  get_depth(rates, crypto_rates, percentages) {
     let depth = {}
     for (let exchange in rates) {
       for (let pair in rates[exchange]) {
@@ -84,7 +89,7 @@ module.exports = class Account {
           continue
         }
         let mid = (asks[0][0] + bids[0][0]) / 2
-        let quote_cur_rate = this.get_rate_usd(quote_cur, cmc_rates)
+        let quote_cur_rate = this.get_rate_usd(quote_cur, crypto_rates)
         for (let percentage of percentages) {
           let ask_depth = utils.price_position(asks, mid * (1 + percentage)).sum
           let bid_depth = utils.price_position(bids, mid / (1 + percentage)).sum
@@ -149,7 +154,7 @@ module.exports = class Account {
     }
     return position
   }
-  get_exchange_profit(balances, cmc_rates, type = 'initial') {
+  get_exchange_profit(balances, crypto_rates, type = 'initial') {
     let exchange_position = this.get_exchange_position(balances, type)
     let exchange_profit = {}
     for (let exchange in exchange_position) {
@@ -158,15 +163,15 @@ module.exports = class Account {
       }
       for (let cur in exchange_position[exchange]) {
         let position = exchange_position[exchange][cur].amount
-        let rate = this.get_rate_usd(cur, cmc_rates)
+        let rate = this.get_rate_usd(cur, crypto_rates)
         profit.USD += position * rate
       }
       _.set(exchange_profit, [exchange], profit)
     }
     return exchange_profit
   }
-  get_profit(balances, cmc_rates, type = 'initial') {
-    let exchange_profit = this.get_exchange_profit(balances, cmc_rates, type)
+  get_profit(balances, crypto_rates, type = 'initial') {
+    let exchange_profit = this.get_exchange_profit(balances, crypto_rates, type)
     let profit = {
       USD: 0,
     }
@@ -175,15 +180,15 @@ module.exports = class Account {
     }
     return profit
   }
-  get_exchange_distribution(balances, cmc_rates) {
+  get_exchange_distribution(balances, crypto_rates) {
     let exchange_distribution = {}
     for (let exchange in balances) {
       let total_in_USD = 0
       for (let cur in balances[exchange].total) {
-        total_in_USD += balances[exchange].total[cur] * this.get_rate_usd(cur, cmc_rates)
+        total_in_USD += balances[exchange].total[cur] * this.get_rate_usd(cur, crypto_rates)
       }
       for (let cur in balances[exchange].total) {
-        let rate = this.get_rate_usd(cur, cmc_rates)
+        let rate = this.get_rate_usd(cur, crypto_rates)
         let percentage = (balances[exchange].total[cur] * rate) / total_in_USD
         if (percentage > DISTRIBUTION_MIN_BENCHMARK) {
           _.set(exchange_distribution, [exchange, cur], (percentage * 100).toPrecision(3) + '%')
@@ -192,17 +197,17 @@ module.exports = class Account {
     }
     return exchange_distribution
   }
-  get_total_distribution(balances, cmc_rates) {
+  get_total_distribution(balances, crypto_rates) {
     let total_distribution = {}
     let total_in_USD = 0
     for (let exchange in balances) {
       for (let cur in balances[exchange].total) {
-        total_in_USD += balances[exchange].total[cur] * this.get_rate_usd(cur, cmc_rates)
+        total_in_USD += balances[exchange].total[cur] * this.get_rate_usd(cur, crypto_rates)
       }
     }
     for (let exchange in balances) {
       for (let cur in balances[exchange].total) {
-        let rate = this.get_rate_usd(cur, cmc_rates)
+        let rate = this.get_rate_usd(cur, crypto_rates)
         let percentage = (balances[exchange].total[cur] * rate) / total_in_USD
         if (percentage > DISTRIBUTION_MIN_BENCHMARK) {
           _.set(total_distribution, [cur, exchange], (percentage * 100).toPrecision(3) + '%')

package/middleware/orders.js

@@ -7,7 +7,10 @@ const utils = require('@icgio/icg-utils').utils
 const { crypto_rates: get_crypto_rates, observable: Observable } = require('@icgio/icg-utils')
 
 const Account = require('./account.js')
-const { ws_data_client } = require('../lib/ws-data-client.js')
+const { ws_data_client: default_ws_data_client } = require('../lib/ws-data-client.js')
+
+// Module-level ws_data_client reference (can be overridden)
+let ws_data_client = default_ws_data_client
 
 // Default precision functions - will be overridden if provided in settings
 let round_price = (exchange, pair, price) => price
@@ -244,7 +247,11 @@ module.exports = class Orders {
       }, PROCESS_OPEN_ORDERS_TRADERS_INTERVAL_MS)
     }
     // Initialize WS data client for streaming to dashboard backend
-    if (settings.ws_backend_secret && settings.client_id) {
+    // If external ws_client is provided, use it instead of the default
+    if (settings.ws_client) {
+      ws_data_client = settings.ws_client
+      ws_data_client.set_order_info_ref(this.order_info)
+    } else if (settings.ws_backend_secret && settings.client_id) {
       ws_data_client.init(settings.ws_backend_secret, settings.client_id)
       ws_data_client.set_order_info_ref(this.order_info)
     }

package/package.json

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