@icgio/icg-exchanges-wrapper 1.14.254 → 1.14.256

package/README.md

@@ -1 +1,129 @@
-# icg-exchanges-wrapper
+# ICG Exchanges Wrapper
+
+High-level wrapper functions for the ICG exchanges package, providing simplified interfaces for common trading operations across multiple exchanges.
+
+## Features
+
+- **Multi-Exchange Operations**: Execute operations across multiple exchanges in parallel
+- **Unified Data Format**: Consistent response format regardless of exchange
+- **Order Management Middleware**: Advanced order placement with retries and validation
+- **WebSocket Data Client**: Real-time log streaming support
+- **Rate Data Aggregation**: Combine orderbook data from multiple sources
+
+## Installation
+
+```bash
+npm install @icgio/icg-exchanges-wrapper
+```
+
+## Usage
+
+### Functions Module
+
+```javascript
+const { functions } = require('@icgio/icg-exchanges-wrapper')
+
+// Get rates (orderbook) from multiple exchanges
+const rates = await functions.get_exchanges_rates(exchanges, pairs)
+
+// Get balances from multiple exchanges
+const balances = await functions.get_exchanges_balance(exchanges)
+
+// Get trade history
+const trades = await functions.get_exchanges_trades(exchanges, pairs)
+
+// Get open orders
+const open_orders = await functions.get_exchanges_open_orders(exchanges, pairs)
+
+// Get deposit history
+const deposits = await functions.get_exchanges_deposits(exchanges)
+
+// Get withdrawal history
+const withdrawals = await functions.get_exchanges_withdrawals(exchanges)
+
+// Get OHLCV data
+const ohlcv = await functions.get_exchanges_ohlcv(exchanges, pairs, interval)
+
+// Get market history
+const market_history = await functions.get_exchanges_market_history(exchanges, pairs)
+```
+
+### Orders Middleware
+
+```javascript
+const Orders = require('@icgio/icg-exchanges-wrapper').orders
+
+// Create an order manager instance
+const orders = new Orders(exchanges_config)
+
+// Place orders with advanced features
+await orders.place_order(exchange, pair, side, amount, price, options)
+
+// Cancel orders
+await orders.cancel_order(exchange, pair, order_id)
+
+// Get order status
+const status = await orders.get_order_status(exchange, pair, order_id)
+```
+
+### WebSocket Data Client
+
+```javascript
+const { ws_data_client, send_log } = require('@icgio/icg-exchanges-wrapper')
+
+// Send log messages via WebSocket
+send_log('info', 'Operation completed successfully')
+send_log('error', 'An error occurred')
+```
+
+## Project Structure
+
+```
+icg-exchanges-wrapper/
+├── index.js                  # Main entry point
+├── functions/
+│   ├── get-exchanges-balance.js              # Balance fetching
+│   ├── get-exchanges-deposits.js             # Deposit history
+│   ├── get-exchanges-open-orders.js          # Open orders
+│   ├── get-exchanges-rates-market-history-ohlcv.js  # Market data
+│   ├── get-exchanges-trades.js               # Trade history
+│   └── get-exchanges-withdrawals.js          # Withdrawal history
+├── middleware/
+│   ├── account.js            # Account middleware
+│   └── orders.js             # Order management middleware
+├── lib/
+│   └── ws-data-client.js     # WebSocket data client
+└── package.json
+```
+
+## Available Functions
+
+| Function | Description |
+|----------|-------------|
+| `get_exchanges_rates` | Fetch orderbook/rates from exchanges |
+| `get_exchanges_market_history` | Fetch recent trade history |
+| `get_exchanges_ohlcv` | Fetch OHLCV candlestick data |
+| `get_exchanges_balance` | Fetch account balances |
+| `get_exchanges_trades` | Fetch user trade history |
+| `get_exchanges_open_orders` | Fetch open orders |
+| `get_exchanges_deposits` | Fetch deposit history |
+| `get_exchanges_withdrawals` | Fetch withdrawal history |
+
+## Dependencies
+
+| Package | Purpose |
+|---------|---------|
+| `@icgio/icg-exchanges` | Exchange implementations |
+| `@icgio/icg-utils` | Utility functions |
+| `lodash` | Utility library |
+| `pg` | PostgreSQL client |
+
+## Code Style
+
+- CommonJS modules (`require()` / `module.exports`)
+- Variable naming: `snake_case`
+- Function naming: `snake_case`
+
+## License
+
+ISC License

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

@@ -25,11 +25,48 @@ const get_exchanges_rates = function (Exchanges, exchange_pair_dict, cb, ws_enab
       }
       if (Exchange.ws_market && ws_enabled) {
         let ws_promise = new Promise((resolve, reject) => {
+          if (!Exchange.ws || !Exchange.ws.market) {
+            console.error(`${Exchange_name} WebSocket not properly initialized`)
+            reject(new Error(`WebSocket not initialized for ${Exchange_name}`))
+            return
+          }
+
           Exchange.ws_market(exchange_pair_dict[Exchange_name])
 
+          const WS_TIMEOUT_MS = 30000 // 30 seconds timeout
+          const start_time = Date.now()
+          let check_count = 0
+          const MAX_CHECKS = 300 // 30 seconds / 100ms
+
           const check_status = () => {
+            check_count++
+            const elapsed = Date.now() - start_time
+
+            // Timeout check
+            if (elapsed > WS_TIMEOUT_MS || check_count > MAX_CHECKS) {
+              console.error(`WebSocket timeout for ${Exchange_name} after ${elapsed}ms`)
+              reject(new Error(`WebSocket timeout for ${Exchange_name}`))
+              return
+            }
+
+            // Safety check for WebSocket object
+            if (!Exchange.ws || !Exchange.ws.market) {
+              console.error(`${Exchange_name} WebSocket object missing during check`)
+              reject(new Error(`WebSocket object missing for ${Exchange_name}`))
+              return
+            }
+
             let all_pairs_opened = exchange_pair_dict[Exchange_name].every((pair) => {
-              return Exchange.ws.market.pair_status[pair] === 'opened' && Exchange.ws.market.asks_dict[pair].length > 0 && Exchange.ws.market.bids_dict[pair].length > 0
+              return (
+                Exchange.ws.market.pair_status &&
+                Exchange.ws.market.pair_status[pair] === 'opened' &&
+                Exchange.ws.market.asks_dict &&
+                Exchange.ws.market.asks_dict[pair] &&
+                Exchange.ws.market.asks_dict[pair].length > 0 &&
+                Exchange.ws.market.bids_dict &&
+                Exchange.ws.market.bids_dict[pair] &&
+                Exchange.ws.market.bids_dict[pair].length > 0
+              )
             })
             if (all_pairs_opened) {
               let rate_promises = exchange_pair_dict[Exchange_name].map((pair) => {
@@ -129,6 +166,7 @@ const get_exchanges_rates = function (Exchanges, exchange_pair_dict, cb, ws_enab
     })
     .catch((error) => {
       console.error('Error in fetching exchange rates:', error)
+      // Still call callback with available data even if some promises failed
       cb({ exchange_pair_rates, pair_exchange_rates })
     })
 }
@@ -154,13 +192,48 @@ const get_exchanges_market_history = function (Exchanges, exchange_pair_dict, ti
       }
       if (Exchange.ws_market && ws_enabled) {
         let ws_promise = new Promise((resolve, reject) => {
+          if (!Exchange.ws || !Exchange.ws.market) {
+            console.error(`${Exchange_name} WebSocket not properly initialized`)
+            reject(new Error(`WebSocket not initialized for ${Exchange_name}`))
+            return
+          }
+
           if (!first_time[Exchange_name]) {
             Exchange.ws_market(exchange_pair_dict[Exchange_name])
             first_time[Exchange_name] = true
           }
+
+          const WS_TIMEOUT_MS = 30000 // 30 seconds timeout
+          const start_time = Date.now()
+          let check_count = 0
+          const MAX_CHECKS = 300 // 30 seconds / 100ms
+
           const check_status = () => {
+            check_count++
+            const elapsed = Date.now() - start_time
+
+            // Timeout check
+            if (elapsed > WS_TIMEOUT_MS || check_count > MAX_CHECKS) {
+              console.error(`WebSocket timeout for ${Exchange_name} market history after ${elapsed}ms`)
+              reject(new Error(`WebSocket timeout for ${Exchange_name} market history`))
+              return
+            }
+
+            // Safety check for WebSocket object
+            if (!Exchange.ws || !Exchange.ws.market) {
+              console.error(`${Exchange_name} WebSocket object missing during check`)
+              reject(new Error(`WebSocket object missing for ${Exchange_name}`))
+              return
+            }
+
             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
+              return (
+                Exchange.ws.market.pair_status &&
+                Exchange.ws.market.pair_status[pair] === 'opened' &&
+                Exchange.ws.market.market_history_dict &&
+                Exchange.ws.market.market_history_dict[pair] &&
+                Exchange.ws.market.market_history_dict[pair].length >= 0
+              )
             })
             if (all_pairs_opened) {
               let market_history_promises = exchange_pair_dict[Exchange_name].map((pair) => {
@@ -237,6 +310,8 @@ let checked_ohlcv_exchange = {},
   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_status._callback_fired = false // Reset callback flag
   if (!Array.isArray(Exchanges)) {
     console.error('Exchanges should be an array')
     return
@@ -267,13 +342,17 @@ const get_exchanges_ohlcv = function (Exchanges, exchange_pair_dict, from_in_ms,
               }
             }
             _.set(ohlcv_status, [Exchange_name + pair], true)
-            if (!_.includes(_.values(ohlcv_status), false)) {
+            // Use a flag to prevent multiple callback calls
+            if (!_.includes(_.values(ohlcv_status), false) && !ohlcv_status._callback_fired) {
+              ohlcv_status._callback_fired = true
               cb({ exchange_pair_ohlcv, pair_exchange_ohlcv })
             }
           })
         } else {
           _.set(ohlcv_status, [Exchange_name + pair], true)
-          if (!_.includes(_.values(ohlcv_status), false)) {
+          // Use a flag to prevent multiple callback calls
+          if (!_.includes(_.values(ohlcv_status), false) && !ohlcv_status._callback_fired) {
+            ohlcv_status._callback_fired = true
             cb({ exchange_pair_ohlcv, pair_exchange_ohlcv })
           }
         }

package/middleware/account.js

@@ -130,11 +130,11 @@ module.exports = class Account {
         if (_.includes(constants.stablecoins, cur)) {
           profit.USD += position
         } else if (_.includes(['KRW'], cur)) {
-          profit.USD += position / this.forex_rates['KRWUSD']
+          profit.USD += position * this.forex_rates['KRWUSD']
         } else if (_.includes(['HKD'], cur)) {
-          profit.USD += position / this.forex_rates['HKDUSD']
+          profit.USD += position * this.forex_rates['HKDUSD']
         } else if (_.includes(['CNYT'], cur)) {
-          profit.USD += position / this.forex_rates['CNYUSD']
+          profit.USD += position * this.forex_rates['CNYUSD']
         } else {
           if (!cmc_rates[cur]) {
             console.log('get_exchange_profit rates_cmc %s does not exist', cur)

package/middleware/orders.js

@@ -199,7 +199,6 @@ module.exports = class Orders {
       market_history_check: true,
       ohlcv_check: false,
       cmc_rates_check: true,
-      all_orders_store: false,
     }
     if (this.function_enabled.balances_check) {
       this.check_balances()

package/package.json

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