ccxt 4.3.84 → 4.3.85

package/js/src/pro/bitget.js

@@ -442,6 +442,35 @@ export default class bitget extends bitgetRest {
          */
         return await this.watchOrderBookForSymbols([symbol], limit, params);
     }
+    async unWatchOrderBook(symbol, params = {}) {
+        /**
+         * @method
+         * @name bitget#unWatchOrderBook
+         * @description unsubscribe from the orderbook channel
+         * @see https://www.bitget.com/api-doc/spot/websocket/public/Depth-Channel
+         * @see https://www.bitget.com/api-doc/contract/websocket/public/Order-Book-Channel
+         * @param {string} symbol unified symbol of the market to fetch the order book for
+         * @param {int} [params.limit] orderbook limit, default is undefined
+         * @returns {object} A dictionary of [order book structures]{@link https://docs.ccxt.com/#/?id=order-book-structure} indexed by market symbols
+         */
+        await this.loadMarkets();
+        const market = this.market(symbol);
+        const messageHash = 'unsubscribe:orderbook:' + market['symbol'];
+        let channel = 'books';
+        const limit = this.safeInteger(params, 'limit');
+        if ((limit === 1) || (limit === 5) || (limit === 15)) {
+            params = this.omit(params, 'limit');
+            channel += limit.toString();
+        }
+        let instType = undefined;
+        [instType, params] = this.getInstType(market, params);
+        const args = {
+            'instType': instType,
+            'channel': channel,
+            'instId': market['id'],
+        };
+        return await this.unWatchPublic(messageHash, args, params);
+    }
     async watchOrderBookForSymbols(symbols, limit = undefined, params = {}) {
         /**
          * @method
@@ -565,10 +594,11 @@ export default class bitget extends bitgetRest {
                 const calculatedChecksum = this.crc32(payload, true);
                 const responseChecksum = this.safeInteger(rawOrderBook, 'checksum');
                 if (calculatedChecksum !== responseChecksum) {
-                    delete client.subscriptions[messageHash];
-                    delete this.orderbooks[symbol];
-                    const error = new ChecksumError(this.id + ' ' + this.orderbookChecksumMessage(symbol));
-                    client.reject(error, messageHash);
+                    // if (messageHash in client.subscriptions) {
+                    //     // delete client.subscriptions[messageHash];
+                    //     // delete this.orderbooks[symbol];
+                    // }
+                    this.spawn(this.handleCheckSumError, client, symbol, messageHash);
                     return;
                 }
             }
@@ -581,6 +611,11 @@ export default class bitget extends bitgetRest {
         }
         client.resolve(this.orderbooks[symbol], messageHash);
     }
+    async handleCheckSumError(client, symbol, messageHash) {
+        await this.unWatchOrderBook(symbol);
+        const error = new ChecksumError(this.id + ' ' + this.orderbookChecksumMessage(symbol));
+        client.reject(error, messageHash);
+    }
     handleDelta(bookside, delta) {
         const bidAsk = this.parseBidAsk(delta, 0, 1);
         // we store the string representations in the orderbook for checksum calculation
@@ -1627,6 +1662,15 @@ export default class bitget extends bitgetRest {
         const message = this.extend(request, params);
         return await this.watch(url, messageHash, message, messageHash);
     }
+    async unWatchPublic(messageHash, args, params = {}) {
+        const url = this.urls['api']['ws']['public'];
+        const request = {
+            'op': 'unsubscribe',
+            'args': [args],
+        };
+        const message = this.extend(request, params);
+        return await this.watch(url, messageHash, message, messageHash);
+    }
     async watchPublicMultiple(messageHashes, argsArray, params = {}) {
         const url = this.urls['api']['ws']['public'];
         const request = {
@@ -1747,6 +1791,17 @@ export default class bitget extends bitgetRest {
         //        "event": "subscribe",
         //        "arg": { instType: 'SPOT', channel: "account", instId: "default" }
         //    }
+        // unsubscribe
+        //    {
+        //        "op":"unsubscribe",
+        //        "args":[
+        //          {
+        //            "instType":"USDT-FUTURES",
+        //            "channel":"ticker",
+        //            "instId":"BTCUSDT"
+        //          }
+        //        ]
+        //    }
         //
         if (this.handleErrorMessage(client, message)) {
             return;
@@ -1769,6 +1824,10 @@ export default class bitget extends bitgetRest {
             this.handleSubscriptionStatus(client, message);
             return;
         }
+        if (event === 'unsubscribe') {
+            this.handleUnSubscriptionStatus(client, message);
+            return;
+        }
         const methods = {
             'ticker': this.handleTicker,
             'trade': this.handleTrades,
@@ -1812,4 +1871,54 @@ export default class bitget extends bitgetRest {
         //
         return message;
     }
+    handleUnSubscriptionStatus(client, message) {
+        //
+        //  {
+        //      "op":"unsubscribe",
+        //      "args":[
+        //        {
+        //          "instType":"USDT-FUTURES",
+        //          "channel":"ticker",
+        //          "instId":"BTCUSDT"
+        //        },
+        //        {
+        //          "instType":"USDT-FUTURES",
+        //          "channel":"candle1m",
+        //          "instId":"BTCUSDT"
+        //        }
+        //      ]
+        //  }
+        //  or
+        // {"event":"unsubscribe","arg":{"instType":"SPOT","channel":"books","instId":"BTCUSDT"}}
+        //
+        let argsList = this.safeList(message, 'args');
+        if (argsList === undefined) {
+            argsList = [this.safeDict(message, 'arg', {})];
+        }
+        for (let i = 0; i < argsList.length; i++) {
+            const arg = argsList[i];
+            const channel = this.safeString(arg, 'channel');
+            if (channel === 'books') {
+                // for now only unWatchOrderBook is supporteod
+                const instType = this.safeStringLower(arg, 'instType');
+                const type = (instType === 'spot') ? 'spot' : 'contract';
+                const instId = this.safeString(arg, 'instId');
+                const market = this.safeMarket(instId, undefined, undefined, type);
+                const symbol = market['symbol'];
+                const messageHash = 'unsubscribe:orderbook:' + market['symbol'];
+                const subMessageHash = 'orderbook:' + symbol;
+                if (symbol in this.orderbooks) {
+                    delete this.orderbooks[symbol];
+                }
+                if (subMessageHash in client.subscriptions) {
+                    delete client.subscriptions[subMessageHash];
+                }
+                if (messageHash in client.subscriptions) {
+                    delete client.subscriptions[messageHash];
+                }
+                client.resolve(true, messageHash);
+            }
+        }
+        return message;
+    }
 }

package/js/src/pro/okx.js

@@ -442,9 +442,16 @@ export default class okx extends okxRest {
          */
         await this.loadMarkets();
         symbols = this.marketSymbols(symbols, undefined, true, true);
-        let messageHash = 'liquidations';
+        const messageHash = 'liquidations';
+        const messageHashes = [];
         if (symbols !== undefined) {
-            messageHash += '::' + symbols.join(',');
+            for (let i = 0; i < symbols.length; i++) {
+                const symbol = symbols[i];
+                messageHashes.push(messageHash + '::' + symbol);
+            }
+        }
+        else {
+            messageHashes.push(messageHash);
         }
         const market = this.getMarketFromSymbols(symbols);
         let type = undefined;
@@ -458,9 +465,16 @@ export default class okx extends okxRest {
         }
         const uppercaseType = type.toUpperCase();
         const request = {
-            'instType': uppercaseType,
+            'op': 'subscribe',
+            'args': [
+                {
+                    'channel': channel,
+                    'instType': uppercaseType,
+                },
+            ],
         };
-        const newLiquidations = await this.subscribe('public', messageHash, channel, undefined, this.extend(request, params));
+        const url = this.getUrl(channel, 'public');
+        const newLiquidations = await this.watchMultiple(url, messageHashes, request, messageHashes);
         if (this.newUpdates) {
             return newLiquidations;
         }
@@ -1396,6 +1410,13 @@ export default class okx extends okxRest {
         for (let i = 0; i < data.length; i++) {
             const rawPosition = data[i];
             const position = this.parsePosition(rawPosition);
+            if (position['contracts'] === 0) {
+                position['side'] = 'long';
+                const shortPosition = this.clone(position);
+                shortPosition['side'] = 'short';
+                cache.append(shortPosition);
+                newPositions.push(shortPosition);
+            }
             newPositions.push(position);
             cache.append(position);
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ccxt",
-  "version": "4.3.84",
+  "version": "4.3.85",
   "description": "A JavaScript / TypeScript / Python / C# / PHP cryptocurrency trading library with support for 100+ exchanges",
   "unpkg": "dist/ccxt.browser.min.js",
   "type": "module",