@icgio/icg-exchanges 1.40.49 → 1.41.0

package/lib/exchanges/ascendex.js

@@ -479,9 +479,7 @@ module.exports = class Ascendex extends ExchangeBase {
     }
     this.private_limiter.process(get_trades_base, pair, timeframe_in_ms, cb)
   }
-  get_history_trades(pair, start_time_in_ms, end_time_in_ms, cb) {
-    this._get_history_trades_via_timeframe(pair, start_time_in_ms, end_time_in_ms, cb)
-  }
+  // get_history_trades — not implemented, no native absolute-window endpoint
   static get_min_amount(cb) {
     let min_cur_amount = {}
     needle.get(base_url + '/api/pro/v1/cash/products', (err, res, body) => {

package/lib/exchanges/biconomy.js

@@ -590,7 +590,7 @@ module.exports = class Biconomy extends ExchangeBase {
           for (const record of records) {
             const close_time_ms = Math.floor(parseFloat(record.ftime) * 1000)
             if (close_time_ms < start_time_in_ms) {
-              cb({ success: true, body: sort_history_rows(filter_history_in_range(rows, start_time_in_ms, end_time_in_ms)) })
+              cb({ success: true, body: utils.merge_trades_with_same_id(sort_history_rows(filter_history_in_range(rows, start_time_in_ms, end_time_in_ms))) })
               return
             }
             if (close_time_ms >= end_time_in_ms || parseFloat(record.deal_stock) <= 0) continue
@@ -612,7 +612,7 @@ module.exports = class Biconomy extends ExchangeBase {
           offset += limit
           await sleep(50)
         }
-        cb({ success: true, body: sort_history_rows(filter_history_in_range(rows, start_time_in_ms, end_time_in_ms)) })
+        cb({ success: true, body: utils.merge_trades_with_same_id(sort_history_rows(filter_history_in_range(rows, start_time_in_ms, end_time_in_ms))) })
       })().catch((error) => {
         cb({ success: false, error: error?.error || error_codes.other, body: error?.body })
       })

package/lib/exchanges/binance.js

@@ -715,6 +715,7 @@ module.exports = class Binance extends ExchangeBase {
         delay_ms: 250,
       })
       trades = sort_history_rows(filter_history_in_range(trades, start_time_in_ms, end_time_in_ms))
+      trades = utils.merge_trades_with_same_id(trades)
       cb({ success: true, body: trades })
     })().catch((error) => cb(error))
   }

package/lib/exchanges/bingx.js

@@ -591,7 +591,8 @@ module.exports = class Bingx extends ExchangeBase {
             }))
           },
         })
-        cb({ success: true, body: sort_history_rows(rows) })
+        const merged = utils.merge_trades_with_same_id(sort_history_rows(rows))
+        cb({ success: true, body: merged })
       })().catch((error) => {
         cb({ success: false, error: error_codes.other, body: error?.body })
       })

package/lib/exchanges/bitget.js

@@ -571,6 +571,7 @@ module.exports = class Bitget extends ExchangeBase {
         }
       }
       trades = sort_history_rows(filter_history_in_range(trades, start_time_in_ms, end_time_in_ms))
+      trades = utils.merge_trades_with_same_id(trades)
       cb({ success: true, body: trades })
     })().catch((error) => cb(error))
   }

package/lib/exchanges/bithumb.js

@@ -425,9 +425,7 @@ module.exports = class Bithumb extends ExchangeBase {
     }
     this.private_limiter.process(get_trades_base, pair, timeframe_in_ms, cb)
   }
-  get_history_trades(pair, start_time_in_ms, end_time_in_ms, cb) {
-    this._get_history_trades_via_timeframe(pair, start_time_in_ms, end_time_in_ms, cb)
-  }
+  // get_history_trades — not implemented, no native absolute-window endpoint
   get_trades_id_type(pair, id, type, timeframe_in_ms, cb) {
     let [cur, quote_cur] = utils.parse_pair(pair)
     let get_trades_id_type_base = (pair, id, timeframe_in_ms, cb) => {

package/lib/exchanges/bitkub.js

@@ -314,9 +314,7 @@ module.exports = class Bitkub extends ExchangeBase {
     }
     this.private_limiter.process(get_trades_base, pair, timeframe_in_ms, cb)
   }
-  get_history_trades(pair, start_time_in_ms, end_time_in_ms, cb) {
-    this._get_history_trades_via_timeframe(pair, start_time_in_ms, end_time_in_ms, cb)
-  }
+  // get_history_trades — not implemented, no native absolute-window endpoint
   _get_trades_page(pair, page, cb) {
     let get_trades_base = (pair, page, cb) => {
       let [api_key, secret_key] = this.api_secret_key

package/lib/exchanges/bitmart.js

@@ -10,6 +10,7 @@ const ExchangeBase = require('./exchange-base.js')
 
 const { error_codes } = require('../error_codes.json')
 const { utils, rate_limiter: Limiter } = require('@icgio/icg-utils')
+const { fetch_split_windows, sort_history_rows } = ExchangeBase.history_utils
 
 function parse_body(body) {
   if (body) {
@@ -529,38 +530,54 @@ module.exports = class Bitmart extends ExchangeBase {
   get_history_trades(pair, start_time_in_ms, end_time_in_ms, cb) {
     let get_history_trades_base = (pair, start_time_in_ms, end_time_in_ms, cb) => {
       let [api_key, secret_key] = this.api_secret_key
-      let params = {
-        endTime: end_time_in_ms,
-        limit: 200,
-        orderMode: 'spot',
-        startTime: start_time_in_ms,
-        symbol: pre_process_pair(pair),
-      }
-      let url = 'https://api-cloud.bitmart.com/spot/v4/query/trades'
-      let options = get_options(api_key, Date.now(), this.memo, params, secret_key)
-      needle.post(url, params, options, (err, res, body) => {
-        body = parse_body(body)
-        if (body && body.code === 1000 && body.data && Array.isArray(body.data)) {
-          let trades = body.data.map((t) => ({
-            order_id: t.orderId.toString(),
-            pair,
-            type: t.side,
-            price: parseFloat(t.price),
-            amount: parseFloat(t.size),
-            total: parseFloat(t.notional),
-            open_time: new Date(t.createTime),
-            close_time: new Date(t.updateTime),
-            fees: {
-              [post_process_cur(t.feeCoinName)]: parseFloat(t.fee),
-            },
-          }))
-          trades = utils.merge_trades_with_same_id(trades)
-          cb({ success: true, body: trades })
-        } else if (body) {
-          cb({ success: false, error: error_codes.other, body })
-        } else {
-          cb({ success: false, error: error_codes.timeout })
-        }
+      ;(async () => {
+        const rows = await fetch_split_windows({
+          start_ms: start_time_in_ms,
+          stop_ms: end_time_in_ms,
+          initial_window_ms: Math.max(end_time_in_ms - start_time_in_ms, 60 * 1000),
+          page_limit: 200,
+          fetch_window: async (window_start_ms, window_stop_ms) =>
+            await new Promise((resolve, reject) => {
+              let params = {
+                endTime: window_stop_ms - 1,
+                limit: 200,
+                orderMode: 'spot',
+                startTime: window_start_ms,
+                symbol: pre_process_pair(pair),
+              }
+              let url = 'https://api-cloud.bitmart.com/spot/v4/query/trades'
+              let options = get_options(api_key, Date.now(), this.memo, params, secret_key)
+              needle.post(url, params, options, (err, res, body) => {
+                body = parse_body(body)
+                if (body && body.code === 1000 && body.data && Array.isArray(body.data)) {
+                  resolve(
+                    body.data.map((t) => ({
+                      order_id: t.orderId.toString(),
+                      pair,
+                      type: t.side,
+                      price: parseFloat(t.price),
+                      amount: parseFloat(t.size),
+                      total: parseFloat(t.notional),
+                      open_time: new Date(t.createTime),
+                      close_time: new Date(t.updateTime),
+                      fees: {
+                        [post_process_cur(t.feeCoinName)]: parseFloat(t.fee),
+                      },
+                      ...(t.tradeRole != null ? { role: t.tradeRole } : {}),
+                    })),
+                  )
+                } else if (body) {
+                  reject({ error: error_codes.other, body })
+                } else {
+                  reject({ error: error_codes.timeout })
+                }
+              })
+            }),
+        })
+        const merged = utils.merge_trades_with_same_id(rows)
+        cb({ success: true, body: sort_history_rows(merged) })
+      })().catch((error) => {
+        cb({ success: false, error: error?.error || error_codes.other, body: error?.body })
       })
     }
     this.private_limiter.process(get_history_trades_base, pair, start_time_in_ms, end_time_in_ms, cb)

package/lib/exchanges/bitmex.js

@@ -751,6 +751,7 @@ module.exports = class Bitmex extends ExchangeBase {
         delay_ms: 250,
       })
       trades = sort_history_rows(filter_history_in_range(trades, start_time_in_ms, end_time_in_ms))
+      trades = utils.merge_trades_with_same_id(trades)
       cb({ success: true, body: trades })
     })().catch((error) => cb(error))
   }

package/lib/exchanges/bitrue.js

@@ -567,7 +567,8 @@ module.exports = class Bitrue extends ExchangeBase {
               })
             }),
         })
-        cb({ success: true, body: sort_history_rows(rows) })
+        const merged = utils.merge_trades_with_same_id(sort_history_rows(rows))
+        cb({ success: true, body: merged })
       })().catch((error) => {
         cb({ success: false, error: error?.error || error_codes.other, body: error?.body })
       })

package/lib/exchanges/bitstamp.js

@@ -438,6 +438,7 @@ module.exports = class Bitstamp extends ExchangeBase {
         await sleep(250)
       }
       trades = sort_history_rows(filter_history_in_range(trades, start_time_in_ms, end_time_in_ms))
+      trades = utils.merge_trades_with_same_id(trades)
       cb({ success: true, body: trades })
     })().catch((error) => cb(error))
   }

package/lib/exchanges/blofin.js

@@ -653,6 +653,7 @@ module.exports = class Blofin extends ExchangeBase {
         delay_ms: 250,
       })
       trades = sort_history_rows(filter_history_in_range(trades, start_time_in_ms, end_time_in_ms))
+      trades = utils.merge_trades_with_same_id(trades)
       cb({ success: true, body: trades })
     })().catch((error) => cb(error))
   }

package/lib/exchanges/btse.js

@@ -489,9 +489,7 @@ module.exports = class Btse extends ExchangeBase {
     }
     this.private_limiter.process(get_trades_base, pair, timeframe_in_ms, cb)
   }
-  get_history_trades(pair, start_time_in_ms, end_time_in_ms, cb) {
-    this._get_history_trades_via_timeframe(pair, start_time_in_ms, end_time_in_ms, cb)
-  }
+  // get_history_trades — not implemented, no native absolute-window endpoint
   get_all_deposits(timeframe_in_ms, cb) {
     let get_all_deposits_base = (timeframe_in_ms, cb) => {
       let [api_key, secret_key] = this.api_secret_key

package/lib/exchanges/bybit.js

@@ -10,6 +10,7 @@ const ExchangeWs = require('./exchange-ws.js')
 
 const { error_codes } = require('../error_codes.json')
 const { utils, rate_limiter: Limiter } = require('@icgio/icg-utils')
+const { fetch_split_windows, sort_history_rows } = ExchangeBase.history_utils
 
 function get_options(api_key, sign, timestamp) {
   let options = {
@@ -540,41 +541,53 @@ module.exports = class Bybit extends ExchangeBase {
   get_history_trades(pair, start_time_in_ms, end_time_in_ms, cb) {
     let get_history_trades_base = (pair, start_time_in_ms, end_time_in_ms, cb) => {
       let [api_key, secret_key] = this.api_secret_key
-      let params = {
-        category: 'spot',
-        symbol: pre_process_pair(pair),
-        startTime: start_time_in_ms,
-        endTime: end_time_in_ms,
-        limit: 100,
-      }
-      const timestamp = Date.now().toString()
-      let sign = get_signature_bybitv5('GET', api_key, secret_key, params, timestamp)
-      let options = get_options(api_key, sign, timestamp)
-      let url = 'https://api.bybit.com/v5/execution/list?' + qs.stringify(params)
-      needle.get(url, options, (err, res, body) => {
-        if (body && body.retCode === 0 && Array.isArray(body.result.list)) {
-          let res = body.result.list.map((t) => {
-            const trade = {
-              order_id: t.orderId,
-              pair,
-              type: t.side.toLowerCase(),
-              price: parseFloat(t.execPrice),
-              amount: parseFloat(t.execQty),
-              total: parseFloat(t.execPrice) * parseFloat(t.execQty),
-              fees: {
-                [post_process_cur(t.feeCurrency)]: parseFloat(t.execFee),
-              },
-              close_time: new Date(parseInt(t.execTime)),
-            }
-            return trade
-          })
-          res = utils.merge_trades_with_same_id(res)
-          cb({ success: true, body: res })
-        } else if (body) {
-          cb({ success: false, error: error_codes.other, body })
-        } else {
-          cb({ success: false, error: error_codes.timeout })
-        }
+      ;(async () => {
+        const rows = await fetch_split_windows({
+          start_ms: start_time_in_ms,
+          stop_ms: end_time_in_ms,
+          initial_window_ms: Math.max(end_time_in_ms - start_time_in_ms, 60 * 1000),
+          page_limit: 100,
+          fetch_window: async (window_start_ms, window_stop_ms) =>
+            await new Promise((resolve, reject) => {
+              let params = {
+                category: 'spot',
+                symbol: pre_process_pair(pair),
+                startTime: window_start_ms,
+                endTime: window_stop_ms,
+                limit: 100,
+              }
+              const timestamp = Date.now().toString()
+              let sign = get_signature_bybitv5('GET', api_key, secret_key, params, timestamp)
+              let options = get_options(api_key, sign, timestamp)
+              let url = 'https://api.bybit.com/v5/execution/list?' + qs.stringify(params)
+              needle.get(url, options, (err, res, body) => {
+                if (body && body.retCode === 0 && Array.isArray(body.result.list)) {
+                  resolve(
+                    body.result.list.map((t) => ({
+                      order_id: t.orderId,
+                      pair,
+                      type: t.side.toLowerCase(),
+                      price: parseFloat(t.execPrice),
+                      amount: parseFloat(t.execQty),
+                      total: parseFloat(t.execPrice) * parseFloat(t.execQty),
+                      fees: {
+                        [post_process_cur(t.feeCurrency)]: parseFloat(t.execFee),
+                      },
+                      close_time: new Date(parseInt(t.execTime)),
+                    })),
+                  )
+                } else if (body) {
+                  reject({ error: error_codes.other, body })
+                } else {
+                  reject({ error: error_codes.timeout })
+                }
+              })
+            }),
+        })
+        const merged = utils.merge_trades_with_same_id(rows)
+        cb({ success: true, body: sort_history_rows(merged) })
+      })().catch((error) => {
+        cb({ success: false, error: error?.error || error_codes.other, body: error?.body })
       })
     }
     this.private_limiter.process(get_history_trades_base, pair, start_time_in_ms, end_time_in_ms, cb)