ccxt 4.2.25 → 4.2.26

package/dist/cjs/ccxt.js

@@ -174,7 +174,7 @@ var woo$1 = require('./src/pro/woo.js');
 
 //-----------------------------------------------------------------------------
 // this is updated by vss.js when building
-const version = '4.2.25';
+const version = '4.2.26';
 Exchange["default"].ccxtVersion = version;
 const exchanges = {
     'ace': ace,

package/dist/cjs/src/base/Exchange.js

@@ -1252,15 +1252,13 @@ class Exchange {
                         client.throttle(cost).then(() => {
                             client.send(message);
                         }).catch((e) => {
-                            delete client.subscriptions[subscribeHash];
-                            future.reject(e);
+                            client.onError(e);
                         });
                     }
                     else {
                         client.send(message)
                             .catch((e) => {
-                            delete client.subscriptions[subscribeHash];
-                            future.reject(e);
+                            client.onError(e);
                         });
                     }
                 }

package/dist/cjs/src/base/ws/Client.js

@@ -145,7 +145,10 @@ class Client {
             }
             else {
                 if (this.ping) {
-                    this.send(this.ping(this));
+                    this.send(this.ping(this))
+                        .catch((error) => {
+                        this.onError(error);
+                    });
                 }
                 else if (platform.isNode) {
                     // can't do this inside browser

package/dist/cjs/src/bingx.js

@@ -55,6 +55,7 @@ class bingx extends bingx$1 {
                 'fetchLeverage': true,
                 'fetchLiquidations': false,
                 'fetchMarkets': true,
+                'fetchMarkOHLCV': true,
                 'fetchMyLiquidations': true,
                 'fetchOHLCV': true,
                 'fetchOpenInterest': true,
@@ -159,6 +160,7 @@ class bingx extends bingx$1 {
                         'private': {
                             'get': {
                                 'positionSide/dual': 1,
+                                'market/markPriceKlines': 1,
                             },
                             'post': {
                                 'positionSide/dual': 1,
@@ -684,6 +686,7 @@ class bingx extends bingx$1 {
          * @see https://bingx-api.github.io/docs/#/swapV2/market-api.html#K-Line%20Data
          * @see https://bingx-api.github.io/docs/#/spot/market-api.html#Candlestick%20chart%20data
          * @see https://bingx-api.github.io/docs/#/swapV2/market-api.html#%20K-Line%20Data
+         * @see https://bingx-api.github.io/docs/#/en-us/swapV2/market-api.html#K-Line%20Data%20-%20Mark%20Price
          * @param {string} symbol unified symbol of the market to fetch OHLCV data for
          * @param {string} timeframe the length of time each candle represents
          * @param {int} [since] timestamp in ms of the earliest candle to fetch
@@ -720,7 +723,14 @@ class bingx extends bingx$1 {
             response = await this.spotV1PublicGetMarketKline(this.extend(request, params));
         }
         else {
-            response = await this.swapV3PublicGetQuoteKlines(this.extend(request, params));
+            const price = this.safeString(params, 'price');
+            params = this.omit(params, 'price');
+            if (price === 'mark') {
+                response = await this.swapV1PrivateGetMarketMarkPriceKlines(this.extend(request, params));
+            }
+            else {
+                response = await this.swapV3PublicGetQuoteKlines(this.extend(request, params));
+            }
         }
         //
         //    {
@@ -739,6 +749,24 @@ class bingx extends bingx$1 {
         //        ]
         //    }
         //
+        // fetchMarkOHLCV
+        //
+        //    {
+        //        "code": 0,
+        //        "msg": "",
+        //        "data": [
+        //            {
+        //                "open": "42191.7",
+        //                "close": "42189.5",
+        //                "high": "42196.5",
+        //                "low": "42189.5",
+        //                "volume": "0.00",
+        //                "openTime": 1706508840000,
+        //                "closeTime": 1706508840000
+        //            }
+        //        ]
+        //    }
+        //
         let ohlcvs = this.safeValue(response, 'data', []);
         if (!Array.isArray(ohlcvs)) {
             ohlcvs = [ohlcvs];
@@ -755,6 +783,18 @@ class bingx extends bingx$1 {
         //        "volume": "167.44",
         //        "time": 1666584000000
         //    }
+        //
+        // fetchMarkOHLCV
+        //
+        //    {
+        //        "open": "42191.7",
+        //        "close": "42189.5",
+        //        "high": "42196.5",
+        //        "low": "42189.5",
+        //        "volume": "0.00",
+        //        "openTime": 1706508840000,
+        //        "closeTime": 1706508840000
+        //    }
         // spot
         //    [
         //        1691402580000,
@@ -778,7 +818,7 @@ class bingx extends bingx$1 {
             ];
         }
         return [
-            this.safeInteger(ohlcv, 'time'),
+            this.safeInteger2(ohlcv, 'time', 'closeTime'),
             this.safeNumber(ohlcv, 'open'),
             this.safeNumber(ohlcv, 'high'),
             this.safeNumber(ohlcv, 'low'),
@@ -2235,10 +2275,10 @@ class bingx extends bingx$1 {
         const clientOrderId = this.safeStringN(order, ['clientOrderID', 'origClientOrderId', 'c']);
         let stopLoss = this.safeValue(order, 'stopLoss');
         let stopLossPrice = undefined;
-        if (stopLoss !== undefined) {
+        if ((stopLoss !== undefined) && (stopLoss !== '')) {
             stopLossPrice = this.safeNumber(stopLoss, 'stopLoss');
         }
-        if ((stopLoss !== undefined) && (typeof stopLoss !== 'number')) {
+        if ((stopLoss !== undefined) && (typeof stopLoss !== 'number') && (stopLoss !== '')) {
             //  stopLoss: '{"stopPrice":50,"workingType":"MARK_PRICE","type":"STOP_MARKET","quantity":1}',
             if (typeof stopLoss === 'string') {
                 stopLoss = this.parseJson(stopLoss);
@@ -2247,10 +2287,10 @@ class bingx extends bingx$1 {
         }
         let takeProfit = this.safeValue(order, 'takeProfit');
         let takeProfitPrice = undefined;
-        if (takeProfit !== undefined) {
+        if (takeProfit !== undefined && (takeProfit !== '')) {
             takeProfitPrice = this.safeNumber(takeProfit, 'takeProfit');
         }
-        if ((takeProfit !== undefined) && (typeof takeProfit !== 'number')) {
+        if ((takeProfit !== undefined) && (typeof takeProfit !== 'number') && (takeProfit !== '')) {
             //  takeProfit: '{"stopPrice":150,"workingType":"MARK_PRICE","type":"TAKE_PROFIT_MARKET","quantity":1}',
             if (typeof takeProfit === 'string') {
                 takeProfit = this.parseJson(takeProfit);

package/dist/cjs/src/pro/bingx.js

@@ -17,7 +17,7 @@ class bingx extends bingx$1 {
                 'watchOHLCV': true,
                 'watchOrders': true,
                 'watchMyTrades': true,
-                'watchTicker': false,
+                'watchTicker': true,
                 'watchTickers': false,
                 'watchBalance': true,
             },
@@ -72,6 +72,151 @@ class bingx extends bingx$1 {
             },
         });
     }
+    async watchTicker(symbol, params = {}) {
+        /**
+         * @method
+         * @name bingx#watchTicker
+         * @description watches a price ticker, a statistical calculation with the information calculated over the past 24 hours for a specific market
+         * @see https://bingx-api.github.io/docs/#/en-us/swapV2/socket/market.html#Subscribe%20to%2024-hour%20price%20changes
+         * @param {string} symbol unified symbol of the market to fetch the ticker for
+         * @param {object} [params] extra parameters specific to the exchange API endpoint
+         * @returns {object} a [ticker structure]{@link https://docs.ccxt.com/#/?id=ticker-structure}
+         */
+        await this.loadMarkets();
+        const market = this.market(symbol);
+        const [marketType, query] = this.handleMarketTypeAndParams('watchTrades', market, params);
+        const url = this.safeValue(this.urls['api']['ws'], marketType);
+        if (url === undefined) {
+            throw new errors.BadRequest(this.id + ' watchTrades is not supported for ' + marketType + ' markets.');
+        }
+        const messageHash = market['id'] + '@ticker';
+        const uuid = this.uuid();
+        const request = {
+            'id': uuid,
+            'dataType': messageHash,
+        };
+        if (marketType === 'swap') {
+            request['reqType'] = 'sub';
+        }
+        return await this.watch(url, messageHash, this.extend(request, query), messageHash);
+    }
+    handleTicker(client, message) {
+        //
+        // swap
+        //
+        //     {
+        //         "code": 0,
+        //         "dataType": "BTC-USDT@ticker",
+        //         "data": {
+        //             "e": "24hTicker",
+        //             "E": 1706498923556,
+        //             "s": "BTC-USDT",
+        //             "p": "346.4",
+        //             "P": "0.82",
+        //             "c": "42432.5",
+        //             "L": "0.0529",
+        //             "h": "42855.4",
+        //             "l": "41578.3",
+        //             "v": "64310.9754",
+        //             "q": "2728360284.15",
+        //             "o": "42086.1",
+        //             "O": 1706498922655,
+        //             "C": 1706498883023,
+        //             "A": "42437.8",
+        //             "a": "1.4160",
+        //             "B": "42437.1",
+        //             "b": "2.5747"
+        //         }
+        //     }
+        //
+        // spot
+        //
+        //     {
+        //         "code": 0,
+        //         "timestamp": 1706506795473,
+        //         "data": {
+        //             "e": "24hTicker",
+        //             "E": 1706506795472,
+        //             "s": "BTC-USDT",
+        //             "p": -372.12,
+        //             "P": "-0.87%",
+        //             "o": 42548.95,
+        //             "h": 42696.1,
+        //             "l": 41621.29,
+        //             "c": 42176.83,
+        //             "v": 4943.33,
+        //             "q": 208842236.5,
+        //             "O": 1706420395472,
+        //             "C": 1706506795472,
+        //             "A": 42177.23,
+        //             "a": 5.14484,
+        //             "B": 42176.38,
+        //             "b": 5.36117
+        //         }
+        //     }
+        //
+        const data = this.safeValue(message, 'data', {});
+        const marketId = this.safeString(data, 's');
+        // const marketId = messageHash.split('@')[0];
+        const isSwap = client.url.indexOf('swap') >= 0;
+        const marketType = isSwap ? 'swap' : 'spot';
+        const market = this.safeMarket(marketId, undefined, undefined, marketType);
+        const symbol = market['symbol'];
+        const ticker = this.parseWsTicker(data, market);
+        this.tickers[symbol] = ticker;
+        const messageHash = market['id'] + '@ticker';
+        client.resolve(ticker, messageHash);
+    }
+    parseWsTicker(message, market = undefined) {
+        //
+        //     {
+        //         "e": "24hTicker",
+        //         "E": 1706498923556,
+        //         "s": "BTC-USDT",
+        //         "p": "346.4",
+        //         "P": "0.82",
+        //         "c": "42432.5",
+        //         "L": "0.0529",
+        //         "h": "42855.4",
+        //         "l": "41578.3",
+        //         "v": "64310.9754",
+        //         "q": "2728360284.15",
+        //         "o": "42086.1",
+        //         "O": 1706498922655,
+        //         "C": 1706498883023,
+        //         "A": "42437.8",
+        //         "a": "1.4160",
+        //         "B": "42437.1",
+        //         "b": "2.5747"
+        //     }
+        //
+        const timestamp = this.safeInteger(message, 'ts');
+        const marketId = this.safeString(message, 's');
+        market = this.safeMarket(marketId, market);
+        const close = this.safeString(message, 'c');
+        return this.safeTicker({
+            'symbol': market['symbol'],
+            'timestamp': timestamp,
+            'datetime': this.iso8601(timestamp),
+            'high': this.safeString(message, 'h'),
+            'low': this.safeString(message, 'l'),
+            'bid': this.safeString(message, 'B'),
+            'bidVolume': this.safeString(message, 'b'),
+            'ask': this.safeString(message, 'A'),
+            'askVolume': this.safeString(message, 'a'),
+            'vwap': undefined,
+            'open': this.safeString(message, 'o'),
+            'close': close,
+            'last': close,
+            'previousClose': undefined,
+            'change': this.safeString(message, 'p'),
+            'percentage': undefined,
+            'average': undefined,
+            'baseVolume': this.safeString(message, 'v'),
+            'quoteVolume': this.safeString(message, 'q'),
+            'info': message,
+        }, market);
+    }
     async watchTrades(symbol, since = undefined, limit = undefined, params = {}) {
         /**
          * @method
@@ -908,6 +1053,10 @@ class bingx extends bingx$1 {
             this.handleOrderBook(client, message);
             return;
         }
+        if (dataType.indexOf('@ticker') >= 0) {
+            this.handleTicker(client, message);
+            return;
+        }
         if (dataType.indexOf('@trade') >= 0) {
             this.handleTrades(client, message);
             return;
@@ -938,6 +1087,11 @@ class bingx extends bingx$1 {
                 this.handleMyTrades(client, message);
             }
         }
+        const msgData = this.safeValue(message, 'data');
+        const msgEvent = this.safeString(msgData, 'e');
+        if (msgEvent === '24hTicker') {
+            this.handleTicker(client, message);
+        }
     }
 }
 

package/js/ccxt.d.ts

@@ -4,7 +4,7 @@ import * as functions from './src/base/functions.js';
 import * as errors from './src/base/errors.js';
 import type { Market, Trade, Fee, Ticker, OrderBook, Order, Transaction, Tickers, Currency, Balance, DepositAddress, WithdrawalResponse, DepositAddressResponse, OHLCV, Balances, PartialBalances, Dictionary, MinMax, Position, FundingRateHistory, Liquidation, FundingHistory, MarginMode, Greeks } from './src/base/types.js';
 import { BaseError, ExchangeError, PermissionDenied, AccountNotEnabled, AccountSuspended, ArgumentsRequired, BadRequest, BadSymbol, MarginModeAlreadySet, BadResponse, NullResponse, InsufficientFunds, InvalidAddress, InvalidOrder, OrderNotFound, OrderNotCached, CancelPending, OrderImmediatelyFillable, OrderNotFillable, DuplicateOrderId, NotSupported, NetworkError, DDoSProtection, RateLimitExceeded, ExchangeNotAvailable, OnMaintenance, InvalidNonce, RequestTimeout, AuthenticationError, AddressPending, NoChange } from './src/base/errors.js';
-declare const version = "4.2.24";
+declare const version = "4.2.25";
 import ace from './src/ace.js';
 import alpaca from './src/alpaca.js';
 import ascendex from './src/ascendex.js';

package/js/ccxt.js

@@ -38,7 +38,7 @@ import * as errors from './src/base/errors.js';
 import { BaseError, ExchangeError, PermissionDenied, AccountNotEnabled, AccountSuspended, ArgumentsRequired, BadRequest, BadSymbol, MarginModeAlreadySet, BadResponse, NullResponse, InsufficientFunds, InvalidAddress, InvalidOrder, OrderNotFound, OrderNotCached, CancelPending, OrderImmediatelyFillable, OrderNotFillable, DuplicateOrderId, NotSupported, NetworkError, DDoSProtection, RateLimitExceeded, ExchangeNotAvailable, OnMaintenance, InvalidNonce, RequestTimeout, AuthenticationError, AddressPending, NoChange } from './src/base/errors.js';
 //-----------------------------------------------------------------------------
 // this is updated by vss.js when building
-const version = '4.2.25';
+const version = '4.2.26';
 Exchange.ccxtVersion = version;
 //-----------------------------------------------------------------------------
 import ace from './src/ace.js';

package/js/src/abstract/bingx.d.ts

@@ -23,6 +23,7 @@ interface Exchange {
     spotV3PrivateGetCapitalWithdrawHistory(params?: {}): Promise<implicitReturnType>;
     spotV3PrivatePostPostAssetTransfer(params?: {}): Promise<implicitReturnType>;
     swapV1PrivateGetPositionSideDual(params?: {}): Promise<implicitReturnType>;
+    swapV1PrivateGetMarketMarkPriceKlines(params?: {}): Promise<implicitReturnType>;
     swapV1PrivatePostPositionSideDual(params?: {}): Promise<implicitReturnType>;
     swapV2PublicGetServerTime(params?: {}): Promise<implicitReturnType>;
     swapV2PublicGetQuoteContracts(params?: {}): Promise<implicitReturnType>;

package/js/src/base/Exchange.js

@@ -1246,15 +1246,13 @@ export default class Exchange {
                         client.throttle(cost).then(() => {
                             client.send(message);
                         }).catch((e) => {
-                            delete client.subscriptions[subscribeHash];
-                            future.reject(e);
+                            client.onError(e);
                         });
                     }
                     else {
                         client.send(message)
                             .catch((e) => {
-                            delete client.subscriptions[subscribeHash];
-                            future.reject(e);
+                            client.onError(e);
                         });
                     }
                 }

package/js/src/base/ws/Client.js

@@ -144,7 +144,10 @@ export default class Client {
             }
             else {
                 if (this.ping) {
-                    this.send(this.ping(this));
+                    this.send(this.ping(this))
+                        .catch((error) => {
+                        this.onError(error);
+                    });
                 }
                 else if (isNode) {
                     // can't do this inside browser

package/js/src/bingx.js

@@ -58,6 +58,7 @@ export default class bingx extends Exchange {
                 'fetchLeverage': true,
                 'fetchLiquidations': false,
                 'fetchMarkets': true,
+                'fetchMarkOHLCV': true,
                 'fetchMyLiquidations': true,
                 'fetchOHLCV': true,
                 'fetchOpenInterest': true,
@@ -162,6 +163,7 @@ export default class bingx extends Exchange {
                         'private': {
                             'get': {
                                 'positionSide/dual': 1,
+                                'market/markPriceKlines': 1,
                             },
                             'post': {
                                 'positionSide/dual': 1,
@@ -687,6 +689,7 @@ export default class bingx extends Exchange {
          * @see https://bingx-api.github.io/docs/#/swapV2/market-api.html#K-Line%20Data
          * @see https://bingx-api.github.io/docs/#/spot/market-api.html#Candlestick%20chart%20data
          * @see https://bingx-api.github.io/docs/#/swapV2/market-api.html#%20K-Line%20Data
+         * @see https://bingx-api.github.io/docs/#/en-us/swapV2/market-api.html#K-Line%20Data%20-%20Mark%20Price
          * @param {string} symbol unified symbol of the market to fetch OHLCV data for
          * @param {string} timeframe the length of time each candle represents
          * @param {int} [since] timestamp in ms of the earliest candle to fetch
@@ -723,7 +726,14 @@ export default class bingx extends Exchange {
             response = await this.spotV1PublicGetMarketKline(this.extend(request, params));
         }
         else {
-            response = await this.swapV3PublicGetQuoteKlines(this.extend(request, params));
+            const price = this.safeString(params, 'price');
+            params = this.omit(params, 'price');
+            if (price === 'mark') {
+                response = await this.swapV1PrivateGetMarketMarkPriceKlines(this.extend(request, params));
+            }
+            else {
+                response = await this.swapV3PublicGetQuoteKlines(this.extend(request, params));
+            }
         }
         //
         //    {
@@ -742,6 +752,24 @@ export default class bingx extends Exchange {
         //        ]
         //    }
         //
+        // fetchMarkOHLCV
+        //
+        //    {
+        //        "code": 0,
+        //        "msg": "",
+        //        "data": [
+        //            {
+        //                "open": "42191.7",
+        //                "close": "42189.5",
+        //                "high": "42196.5",
+        //                "low": "42189.5",
+        //                "volume": "0.00",
+        //                "openTime": 1706508840000,
+        //                "closeTime": 1706508840000
+        //            }
+        //        ]
+        //    }
+        //
         let ohlcvs = this.safeValue(response, 'data', []);
         if (!Array.isArray(ohlcvs)) {
             ohlcvs = [ohlcvs];
@@ -758,6 +786,18 @@ export default class bingx extends Exchange {
         //        "volume": "167.44",
         //        "time": 1666584000000
         //    }
+        //
+        // fetchMarkOHLCV
+        //
+        //    {
+        //        "open": "42191.7",
+        //        "close": "42189.5",
+        //        "high": "42196.5",
+        //        "low": "42189.5",
+        //        "volume": "0.00",
+        //        "openTime": 1706508840000,
+        //        "closeTime": 1706508840000
+        //    }
         // spot
         //    [
         //        1691402580000,
@@ -781,7 +821,7 @@ export default class bingx extends Exchange {
             ];
         }
         return [
-            this.safeInteger(ohlcv, 'time'),
+            this.safeInteger2(ohlcv, 'time', 'closeTime'),
             this.safeNumber(ohlcv, 'open'),
             this.safeNumber(ohlcv, 'high'),
             this.safeNumber(ohlcv, 'low'),
@@ -2238,10 +2278,10 @@ export default class bingx extends Exchange {
         const clientOrderId = this.safeStringN(order, ['clientOrderID', 'origClientOrderId', 'c']);
         let stopLoss = this.safeValue(order, 'stopLoss');
         let stopLossPrice = undefined;
-        if (stopLoss !== undefined) {
+        if ((stopLoss !== undefined) && (stopLoss !== '')) {
             stopLossPrice = this.safeNumber(stopLoss, 'stopLoss');
         }
-        if ((stopLoss !== undefined) && (typeof stopLoss !== 'number')) {
+        if ((stopLoss !== undefined) && (typeof stopLoss !== 'number') && (stopLoss !== '')) {
             //  stopLoss: '{"stopPrice":50,"workingType":"MARK_PRICE","type":"STOP_MARKET","quantity":1}',
             if (typeof stopLoss === 'string') {
                 stopLoss = this.parseJson(stopLoss);
@@ -2250,10 +2290,10 @@ export default class bingx extends Exchange {
         }
         let takeProfit = this.safeValue(order, 'takeProfit');
         let takeProfitPrice = undefined;
-        if (takeProfit !== undefined) {
+        if (takeProfit !== undefined && (takeProfit !== '')) {
             takeProfitPrice = this.safeNumber(takeProfit, 'takeProfit');
         }
-        if ((takeProfit !== undefined) && (typeof takeProfit !== 'number')) {
+        if ((takeProfit !== undefined) && (typeof takeProfit !== 'number') && (takeProfit !== '')) {
             //  takeProfit: '{"stopPrice":150,"workingType":"MARK_PRICE","type":"TAKE_PROFIT_MARKET","quantity":1}',
             if (typeof takeProfit === 'string') {
                 takeProfit = this.parseJson(takeProfit);

package/js/src/pro/bingx.d.ts

@@ -1,8 +1,11 @@
 import bingxRest from '../bingx.js';
-import type { Int, OHLCV, Str, OrderBook, Order, Trade, Balances } from '../base/types.js';
+import type { Int, OHLCV, Str, OrderBook, Order, Trade, Balances, Ticker } from '../base/types.js';
 import Client from '../base/ws/Client.js';
 export default class bingx extends bingxRest {
     describe(): any;
+    watchTicker(symbol: string, params?: {}): Promise<Ticker>;
+    handleTicker(client: Client, message: any): void;
+    parseWsTicker(message: any, market?: any): Ticker;
     watchTrades(symbol: string, since?: Int, limit?: Int, params?: {}): Promise<Trade[]>;
     handleTrades(client: Client, message: any): void;
     watchOrderBook(symbol: string, limit?: Int, params?: {}): Promise<OrderBook>;