binance 3.4.4 → 3.5.1

package/lib/websocket-client.d.ts

@@ -128,7 +128,7 @@ export declare class WebsocketClient extends BaseWebsocketClient<WsKey, WsReques
     /**
      * @returns The WS URL to connect to for this WS key
      */
-    getWsUrl(wsKey: WsKey, connectionType?: 'market' | 'userData'): Promise<string>;
+    getWsUrl(wsKey: WsKey, connectionType?: 'public' | 'market' | 'private'): Promise<string>;
     private signMessage;
     /**
      * Handles request sign, if connection isn't authenticated yet.
@@ -230,7 +230,7 @@ export declare class WebsocketClient extends BaseWebsocketClient<WsKey, WsReques
      *
      * Note: the wsKey parameter is optional, but can be used to connect to other environments for this product group.
      */
-    subscribeUsdFuturesUserDataStream(wsKey?: WsKey, // usdm | usdmTestnet
+    subscribeUsdFuturesUserDataStream(wsKey?: WsKey, // usdm | usdmPrivate | usdmTestnet
     forceNewConnection?: boolean, miscState?: MiscUserDataConnectionState): Promise<WSConnectedResult | undefined>;
     unsubscribeUsdFuturesUserDataStream(wsKey?: WsKey): Promise<void>;
     /**
@@ -288,52 +288,52 @@ export declare class WebsocketClient extends BaseWebsocketClient<WsKey, WsReques
     /**
      * Subscribe to aggregate trades for a symbol in a market category
      */
-    subscribeAggregateTrades(symbol: string, market: 'spot' | 'usdm' | 'coinm'): Promise<unknown>;
+    subscribeAggregateTrades(symbol: string, market: 'spot' | 'usdm' | 'coinm', wsKeyOverride?: WsKey): Promise<unknown>;
     /**
      * Subscribe to trades for a symbol in a market category
      * IMPORTANT: This topic for usdm and coinm is not listed in the api docs and might stop working without warning
      */
-    subscribeTrades(symbol: string, market: 'spot' | 'usdm' | 'coinm'): Promise<unknown>;
+    subscribeTrades(symbol: string, market: 'spot' | 'usdm' | 'coinm', wsKeyOverride?: WsKey): Promise<unknown>;
     /**
      * Subscribe to coin index for a symbol in COINM Futures markets
      */
-    subscribeCoinIndexPrice(symbol: string, updateSpeedMs?: 1000 | 3000): Promise<unknown>;
+    subscribeCoinIndexPrice(symbol: string, updateSpeedMs?: 1000 | 3000, wsKeyOverride?: WsKey): Promise<unknown>;
     /**
      * Subscribe to mark price for a symbol in a market category
      */
-    subscribeMarkPrice(symbol: string, market: 'usdm' | 'coinm', updateSpeedMs?: 1000 | 3000): Promise<unknown>;
+    subscribeMarkPrice(symbol: string, market: 'usdm' | 'coinm', updateSpeedMs?: 1000 | 3000, wsKeyOverride?: WsKey): Promise<unknown>;
     /**
      * Subscribe to mark price for all symbols in a market category
      */
-    subscribeAllMarketMarkPrice(market: 'usdm' | 'coinm', updateSpeedMs?: 1000 | 3000): Promise<unknown>;
+    subscribeAllMarketMarkPrice(market: 'usdm' | 'coinm', updateSpeedMs?: 1000 | 3000, wsKeyOverride?: WsKey): Promise<unknown>;
     /**
      * Subscribe to klines(candles) for a symbol in a market category
      */
-    subscribeKlines(symbol: string, interval: KlineInterval, market: 'spot' | 'usdm' | 'coinm'): Promise<unknown>;
+    subscribeKlines(symbol: string, interval: KlineInterval, market: 'spot' | 'usdm' | 'coinm', wsKeyOverride?: WsKey): Promise<unknown>;
     /**
      * Subscribe to continuous contract klines(candles) for a symbol futures
      */
-    subscribeContinuousContractKlines(symbol: string, contractType: 'perpetual' | 'current_quarter' | 'next_quarter', interval: KlineInterval, market: 'usdm' | 'coinm'): Promise<unknown>;
+    subscribeContinuousContractKlines(symbol: string, contractType: 'perpetual' | 'current_quarter' | 'next_quarter', interval: KlineInterval, market: 'usdm' | 'coinm', wsKeyOverride?: WsKey): Promise<unknown>;
     /**
      * Subscribe to index klines(candles) for a symbol in a coinm futures
      */
-    subscribeIndexKlines(symbol: string, interval: KlineInterval): Promise<unknown>;
+    subscribeIndexKlines(symbol: string, interval: KlineInterval, wsKeyOverride?: WsKey): Promise<unknown>;
     /**
      * Subscribe to index klines(candles) for a symbol in a coinm futures
      */
-    subscribeMarkPriceKlines(symbol: string, interval: KlineInterval): Promise<unknown>;
+    subscribeMarkPriceKlines(symbol: string, interval: KlineInterval, wsKeyOverride?: WsKey): Promise<unknown>;
     /**
      * Subscribe to mini 24hr ticker for a symbol in market category.
      */
-    subscribeSymbolMini24hrTicker(symbol: string, market: 'spot' | 'usdm' | 'coinm'): Promise<unknown>;
+    subscribeSymbolMini24hrTicker(symbol: string, market: 'spot' | 'usdm' | 'coinm', wsKeyOverride?: WsKey): Promise<unknown>;
     /**
      * Subscribe to mini 24hr mini ticker in market category.
      */
-    subscribeAllMini24hrTickers(market: 'spot' | 'usdm' | 'coinm'): Promise<unknown>;
+    subscribeAllMini24hrTickers(market: 'spot' | 'usdm' | 'coinm', wsKeyOverride?: WsKey): Promise<unknown>;
     /**
      * Subscribe to 24hr ticker for a symbol in any market.
      */
-    subscribeSymbol24hrTicker(symbol: string, market: 'spot' | 'usdm' | 'coinm'): Promise<unknown>;
+    subscribeSymbol24hrTicker(symbol: string, market: 'spot' | 'usdm' | 'coinm', wsKeyOverride?: WsKey): Promise<unknown>;
     /**
      * Subscribe to Alpha Trading WebSocket Market Data streams.
      * Base URL: wss://nbstream.binance.com/w3w/wsa/stream
@@ -364,7 +364,7 @@ export declare class WebsocketClient extends BaseWebsocketClient<WsKey, WsReques
     /**
      * Subscribe to 24hr ticker in any market.
      */
-    subscribeAll24hrTickers(market: 'spot' | 'usdm' | 'coinm'): Promise<unknown>;
+    subscribeAll24hrTickers(market: 'spot' | 'usdm' | 'coinm', wsKeyOverride?: WsKey): Promise<unknown>;
     /**
      * Subscribe to rolling window ticker statistics for all market symbols,
      * computed over multiple windows. Note that only tickers that have
@@ -374,23 +374,23 @@ export declare class WebsocketClient extends BaseWebsocketClient<WsKey, WsReques
      * - Supported window sizes: 1h,4h,1d.
      * - Supported markets: spot
      */
-    subscribeAllRollingWindowTickers(market: 'spot', windowSize: '1h' | '4h' | '1d'): Promise<unknown>;
+    subscribeAllRollingWindowTickers(market: 'spot', windowSize: '1h' | '4h' | '1d', wsKeyOverride?: WsKey): Promise<unknown>;
     /**
      * Subscribe to best bid/ask for symbol in spot markets.
      */
-    subscribeSymbolBookTicker(symbol: string, market: 'spot' | 'usdm' | 'coinm'): Promise<unknown>;
+    subscribeSymbolBookTicker(symbol: string, market: 'spot' | 'usdm' | 'coinm', wsKeyOverride?: WsKey): Promise<unknown>;
     /**
      * Subscribe to best bid/ask for all symbols in spot markets.
      */
-    subscribeAllBookTickers(market: 'usdm' | 'coinm'): Promise<unknown>;
+    subscribeAllBookTickers(market: 'usdm' | 'coinm', wsKeyOverride?: WsKey): Promise<unknown>;
     /**
      * Subscribe to best bid/ask for symbol in spot markets.
      */
-    subscribeSymbolLiquidationOrders(symbol: string, market: 'usdm' | 'coinm'): Promise<unknown>;
+    subscribeSymbolLiquidationOrders(symbol: string, market: 'usdm' | 'coinm', wsKeyOverride?: WsKey): Promise<unknown>;
     /**
      * Subscribe to best bid/ask for all symbols in spot markets.
      */
-    subscribeAllLiquidationOrders(market: 'usdm' | 'coinm'): Promise<unknown>;
+    subscribeAllLiquidationOrders(market: 'usdm' | 'coinm', wsKeyOverride?: WsKey): Promise<unknown>;
     /**
      * Subscribe to partial book depths (snapshots).
      *
@@ -398,7 +398,7 @@ export declare class WebsocketClient extends BaseWebsocketClient<WsKey, WsReques
      * - spot only supports 1000ms or 100ms for updateMs
      * - futures only support 100, 250 or 500ms for updateMs
      */
-    subscribePartialBookDepths(symbol: string, levels: 5 | 10 | 20, updateMs: 100 | 250 | 500 | 1000, market: 'spot' | 'usdm' | 'coinm'): Promise<unknown>;
+    subscribePartialBookDepths(symbol: string, levels: 5 | 10 | 20, updateMs: 100 | 250 | 500 | 1000, market: 'spot' | 'usdm' | 'coinm', wsKeyOverride?: WsKey): Promise<unknown>;
     /**
      * Subscribe to orderbook depth updates to locally manage an order book.
      *
@@ -407,11 +407,11 @@ export declare class WebsocketClient extends BaseWebsocketClient<WsKey, WsReques
      * - Spot: https://binance-docs.github.io/apidocs/spot/en/#diff-depth-stream
      * - USDM Futures: https://binance-docs.github.io/apidocs/futures/en/#diff-book-depth-streams
      */
-    subscribeDiffBookDepth(symbol: string, updateMs: 100 | 250 | 500 | 1000 | undefined, market: 'spot' | 'usdm' | 'coinm'): Promise<unknown>;
+    subscribeDiffBookDepth(symbol: string, updateMs: 100 | 250 | 500 | 1000 | undefined, market: 'spot' | 'usdm' | 'coinm', wsKeyOverride?: WsKey): Promise<unknown>;
     /**
      * Subscribe to best bid/ask for all symbols in spot markets.
      */
-    subscribeContractInfoStream(market: 'usdm' | 'coinm'): Promise<unknown>;
+    subscribeContractInfoStream(market: 'usdm' | 'coinm', wsKeyOverride?: WsKey): Promise<unknown>;
     /**
      * --------------------------
      * SPOT market websocket streams
@@ -420,41 +420,41 @@ export declare class WebsocketClient extends BaseWebsocketClient<WsKey, WsReques
     /**
      * Subscribe to aggregate trades for a symbol in spot markets.
      */
-    subscribeSpotAggregateTrades(symbol: string): Promise<unknown>;
+    subscribeSpotAggregateTrades(symbol: string, wsKeyOverride?: WsKey): Promise<unknown>;
     /**
      * Subscribe to trades for a symbol in spot markets.
      */
-    subscribeSpotTrades(symbol: string): Promise<unknown>;
+    subscribeSpotTrades(symbol: string, wsKeyOverride?: WsKey): Promise<unknown>;
     /**
      * Subscribe to candles for a symbol in spot markets.
      */
-    subscribeSpotKline(symbol: string, interval: KlineInterval): Promise<unknown>;
+    subscribeSpotKline(symbol: string, interval: KlineInterval, wsKeyOverride?: WsKey): Promise<unknown>;
     /**
      * Subscribe to mini 24hr ticker for a symbol in spot markets.
      */
-    subscribeSpotSymbolMini24hrTicker(symbol: string): Promise<unknown>;
+    subscribeSpotSymbolMini24hrTicker(symbol: string, wsKeyOverride?: WsKey): Promise<unknown>;
     /**
      * Subscribe to mini 24hr mini ticker in spot markets.
      */
-    subscribeSpotAllMini24hrTickers(): Promise<unknown>;
+    subscribeSpotAllMini24hrTickers(wsKeyOverride?: WsKey): Promise<unknown>;
     /**
      * Subscribe to 24hr ticker for a symbol in spot markets.
      */
-    subscribeSpotSymbol24hrTicker(symbol: string): Promise<unknown>;
+    subscribeSpotSymbol24hrTicker(symbol: string, wsKeyOverride?: WsKey): Promise<unknown>;
     /**
      * Subscribe to 24hr ticker in spot markets.
      */
-    subscribeSpotAll24hrTickers(): Promise<unknown>;
+    subscribeSpotAll24hrTickers(wsKeyOverride?: WsKey): Promise<unknown>;
     /**
      * Subscribe to best bid/ask for symbol in spot markets.
      */
-    subscribeSpotSymbolBookTicker(symbol: string): Promise<unknown>;
+    subscribeSpotSymbolBookTicker(symbol: string, wsKeyOverride?: WsKey): Promise<unknown>;
     /**
      * Subscribe to top bid/ask levels for symbol in spot markets.
      */
-    subscribeSpotPartialBookDepth(symbol: string, levels: 5 | 10 | 20, updateMs?: 1000 | 100): Promise<unknown>;
+    subscribeSpotPartialBookDepth(symbol: string, levels: 5 | 10 | 20, updateMs?: 1000 | 100, wsKeyOverride?: WsKey): Promise<unknown>;
     /**
      * Subscribe to spot orderbook depth updates to locally manage an order book.
      */
-    subscribeSpotDiffBookDepth(symbol: string, updateMs?: 1000 | 100): Promise<unknown>;
+    subscribeSpotDiffBookDepth(symbol: string, updateMs?: 1000 | 100, wsKeyOverride?: WsKey): Promise<unknown>;
 }

package/lib/websocket-client.js

@@ -915,10 +915,11 @@ class WebsocketClient extends BaseWSClient_1.BaseWebsocketClient {
      * Note: the wsKey parameter is optional, but can be used to connect to other environments for this product group.
      */
     subscribeUsdFuturesUserDataStream() {
-        return __awaiter(this, arguments, void 0, function* (wsKey = 'usdm', // usdm | usdmTestnet
+        return __awaiter(this, arguments, void 0, function* (wsKey = websocket_util_1.WS_KEY_MAP.usdmPrivate, // usdm | usdmPrivate | usdmTestnet
         forceNewConnection, miscState) {
             try {
-                const isTestnet = wsKey === websocket_util_1.WS_KEY_MAP.usdmTestnet;
+                const isTestnet = wsKey === websocket_util_1.WS_KEY_MAP.usdmTestnet ||
+                    wsKey === websocket_util_1.WS_KEY_MAP.usdmTestnetPrivate;
                 const restClient = this.restClientCache.getUSDMRestClient(this.getRestClientOptions(), this.options.requestOptions);
                 const { listenKey } = yield restClient.getFuturesUserDataListenKey();
                 const market = isTestnet ? 'usdmTestnet' : 'usdm';
@@ -931,7 +932,7 @@ class WebsocketClient extends BaseWSClient_1.BaseWebsocketClient {
             }
         });
     }
-    unsubscribeUsdFuturesUserDataStream(wsKey = 'usdm') {
+    unsubscribeUsdFuturesUserDataStream(wsKey = websocket_util_1.WS_KEY_MAP.usdmPrivate) {
         return this.closeUserDataStream(wsKey, 'usdm');
     }
     /**
@@ -1205,114 +1206,114 @@ class WebsocketClient extends BaseWSClient_1.BaseWebsocketClient {
     /**
      * Subscribe to aggregate trades for a symbol in a market category
      */
-    subscribeAggregateTrades(symbol, market) {
+    subscribeAggregateTrades(symbol, market, wsKeyOverride) {
         const lowerCaseSymbol = symbol.toLowerCase();
         const streamName = 'aggTrade';
-        const wsKey = (0, websocket_util_1.resolveWsKeyForLegacyMarket)(market);
+        const wsKey = wsKeyOverride || (0, websocket_util_1.getWsKeyForProductGroup)(market, streamName);
         return this.subscribe(`${lowerCaseSymbol}@${streamName}`, wsKey);
     }
     /**
      * Subscribe to trades for a symbol in a market category
      * IMPORTANT: This topic for usdm and coinm is not listed in the api docs and might stop working without warning
      */
-    subscribeTrades(symbol, market) {
+    subscribeTrades(symbol, market, wsKeyOverride) {
         const lowerCaseSymbol = symbol.toLowerCase();
         const streamName = 'trade';
-        const wsKey = (0, websocket_util_1.resolveWsKeyForLegacyMarket)(market);
+        const wsKey = wsKeyOverride || (0, websocket_util_1.getWsKeyForProductGroup)(market, streamName);
         return this.subscribe(`${lowerCaseSymbol}@${streamName}`, wsKey);
     }
     /**
      * Subscribe to coin index for a symbol in COINM Futures markets
      */
-    subscribeCoinIndexPrice(symbol, updateSpeedMs = 3000) {
+    subscribeCoinIndexPrice(symbol, updateSpeedMs = 3000, wsKeyOverride) {
         const lowerCaseSymbol = symbol.toLowerCase();
         const streamName = 'indexPrice';
         const speedSuffix = updateSpeedMs === 1000 ? '@1s' : '';
         const market = 'coinm';
-        const wsKey = (0, websocket_util_1.resolveWsKeyForLegacyMarket)(market);
+        const wsKey = wsKeyOverride || (0, websocket_util_1.getWsKeyForProductGroup)(market, streamName);
         return this.subscribe(`${lowerCaseSymbol}@${streamName}${speedSuffix}`, wsKey);
     }
     /**
      * Subscribe to mark price for a symbol in a market category
      */
-    subscribeMarkPrice(symbol, market, updateSpeedMs = 3000) {
+    subscribeMarkPrice(symbol, market, updateSpeedMs = 3000, wsKeyOverride) {
         const lowerCaseSymbol = symbol.toLowerCase();
         const streamName = 'markPrice';
         const speedSuffix = updateSpeedMs === 1000 ? '@1s' : '';
-        const wsKey = (0, websocket_util_1.resolveWsKeyForLegacyMarket)(market);
+        const wsKey = wsKeyOverride || (0, websocket_util_1.getWsKeyForProductGroup)(market, streamName);
         return this.subscribe(`${lowerCaseSymbol}@${streamName}${speedSuffix}`, wsKey);
     }
     /**
      * Subscribe to mark price for all symbols in a market category
      */
-    subscribeAllMarketMarkPrice(market, updateSpeedMs = 3000) {
+    subscribeAllMarketMarkPrice(market, updateSpeedMs = 3000, wsKeyOverride) {
         const streamName = '!markPrice@arr';
         const speedSuffix = updateSpeedMs === 1000 ? '@1s' : '';
-        const wsKey = (0, websocket_util_1.resolveWsKeyForLegacyMarket)(market);
+        const wsKey = wsKeyOverride || (0, websocket_util_1.getWsKeyForProductGroup)(market, streamName);
         return this.subscribe(`${streamName}${speedSuffix}`, wsKey);
     }
     /**
      * Subscribe to klines(candles) for a symbol in a market category
      */
-    subscribeKlines(symbol, interval, market) {
+    subscribeKlines(symbol, interval, market, wsKeyOverride) {
         const lowerCaseSymbol = symbol.toLowerCase();
         const streamName = 'kline';
-        const wsKey = (0, websocket_util_1.resolveWsKeyForLegacyMarket)(market);
+        const wsKey = wsKeyOverride || (0, websocket_util_1.getWsKeyForProductGroup)(market, streamName);
         return this.subscribe(`${lowerCaseSymbol}@${streamName}_${interval}`, wsKey);
     }
     /**
      * Subscribe to continuous contract klines(candles) for a symbol futures
      */
-    subscribeContinuousContractKlines(symbol, contractType, interval, market) {
+    subscribeContinuousContractKlines(symbol, contractType, interval, market, wsKeyOverride) {
         const lowerCaseSymbol = symbol.toLowerCase();
         const streamName = 'continuousKline';
-        const wsKey = (0, websocket_util_1.resolveWsKeyForLegacyMarket)(market);
+        const wsKey = wsKeyOverride || (0, websocket_util_1.getWsKeyForProductGroup)(market, streamName);
         return this.subscribe(`${lowerCaseSymbol}_${contractType}@${streamName}_${interval}`, wsKey);
     }
     /**
      * Subscribe to index klines(candles) for a symbol in a coinm futures
      */
-    subscribeIndexKlines(symbol, interval) {
+    subscribeIndexKlines(symbol, interval, wsKeyOverride) {
         const lowerCaseSymbol = symbol.toLowerCase();
         const streamName = 'indexPriceKline';
         const market = 'coinm';
-        const wsKey = (0, websocket_util_1.resolveWsKeyForLegacyMarket)(market);
+        const wsKey = wsKeyOverride || (0, websocket_util_1.getWsKeyForProductGroup)(market, streamName);
         return this.subscribe(`${lowerCaseSymbol}@${streamName}_${interval}`, wsKey);
     }
     /**
      * Subscribe to index klines(candles) for a symbol in a coinm futures
      */
-    subscribeMarkPriceKlines(symbol, interval) {
+    subscribeMarkPriceKlines(symbol, interval, wsKeyOverride) {
         const lowerCaseSymbol = symbol.toLowerCase();
         const streamName = 'markPriceKline';
         const market = 'coinm';
-        const wsKey = (0, websocket_util_1.resolveWsKeyForLegacyMarket)(market);
+        const wsKey = wsKeyOverride || (0, websocket_util_1.getWsKeyForProductGroup)(market, streamName);
         return this.subscribe(`${lowerCaseSymbol}@${streamName}_${interval}`, wsKey);
     }
     /**
      * Subscribe to mini 24hr ticker for a symbol in market category.
      */
-    subscribeSymbolMini24hrTicker(symbol, market) {
+    subscribeSymbolMini24hrTicker(symbol, market, wsKeyOverride) {
         const lowerCaseSymbol = symbol.toLowerCase();
         const streamName = 'miniTicker';
-        const wsKey = (0, websocket_util_1.resolveWsKeyForLegacyMarket)(market);
+        const wsKey = wsKeyOverride || (0, websocket_util_1.getWsKeyForProductGroup)(market, streamName);
         return this.subscribe(`${lowerCaseSymbol}@${streamName}`, wsKey);
     }
     /**
      * Subscribe to mini 24hr mini ticker in market category.
      */
-    subscribeAllMini24hrTickers(market) {
+    subscribeAllMini24hrTickers(market, wsKeyOverride) {
         const streamName = 'miniTicker';
-        const wsKey = (0, websocket_util_1.resolveWsKeyForLegacyMarket)(market);
+        const wsKey = wsKeyOverride || (0, websocket_util_1.getWsKeyForProductGroup)(market, streamName);
         return this.subscribe(`!${streamName}@arr`, wsKey);
     }
     /**
      * Subscribe to 24hr ticker for a symbol in any market.
      */
-    subscribeSymbol24hrTicker(symbol, market) {
+    subscribeSymbol24hrTicker(symbol, market, wsKeyOverride) {
         const lowerCaseSymbol = symbol.toLowerCase();
         const streamName = 'ticker';
-        const wsKey = (0, websocket_util_1.resolveWsKeyForLegacyMarket)(market);
+        const wsKey = wsKeyOverride || (0, websocket_util_1.getWsKeyForProductGroup)(market, streamName);
         return this.subscribe(`${lowerCaseSymbol}@${streamName}`, wsKey);
     }
     /**
@@ -1358,9 +1359,9 @@ class WebsocketClient extends BaseWSClient_1.BaseWebsocketClient {
     /**
      * Subscribe to 24hr ticker in any market.
      */
-    subscribeAll24hrTickers(market) {
+    subscribeAll24hrTickers(market, wsKeyOverride) {
         const streamName = 'ticker';
-        const wsKey = (0, websocket_util_1.resolveWsKeyForLegacyMarket)(market);
+        const wsKey = wsKeyOverride || (0, websocket_util_1.getWsKeyForProductGroup)(market, streamName);
         return this.subscribe(`!${streamName}@arr`, wsKey);
     }
     /**
@@ -1372,43 +1373,43 @@ class WebsocketClient extends BaseWSClient_1.BaseWebsocketClient {
      * - Supported window sizes: 1h,4h,1d.
      * - Supported markets: spot
      */
-    subscribeAllRollingWindowTickers(market, windowSize) {
+    subscribeAllRollingWindowTickers(market, windowSize, wsKeyOverride) {
         const streamName = 'ticker';
-        const wsKey = (0, websocket_util_1.resolveWsKeyForLegacyMarket)(market);
+        const wsKey = wsKeyOverride || (0, websocket_util_1.getWsKeyForProductGroup)(market, streamName);
         return this.subscribe(`!${streamName}_${windowSize}@arr`, wsKey);
     }
     /**
      * Subscribe to best bid/ask for symbol in spot markets.
      */
-    subscribeSymbolBookTicker(symbol, market) {
+    subscribeSymbolBookTicker(symbol, market, wsKeyOverride) {
         const lowerCaseSymbol = symbol.toLowerCase();
         const streamName = 'bookTicker';
-        const wsKey = (0, websocket_util_1.resolveWsKeyForLegacyMarket)(market);
+        const wsKey = wsKeyOverride || (0, websocket_util_1.getWsKeyForProductGroup)(market, streamName);
         return this.subscribe(`${lowerCaseSymbol}@${streamName}`, wsKey);
     }
     /**
      * Subscribe to best bid/ask for all symbols in spot markets.
      */
-    subscribeAllBookTickers(market) {
+    subscribeAllBookTickers(market, wsKeyOverride) {
         const streamName = 'bookTicker';
-        const wsKey = (0, websocket_util_1.resolveWsKeyForLegacyMarket)(market);
+        const wsKey = wsKeyOverride || (0, websocket_util_1.getWsKeyForProductGroup)(market, streamName);
         return this.subscribe(`!${streamName}`, wsKey);
     }
     /**
      * Subscribe to best bid/ask for symbol in spot markets.
      */
-    subscribeSymbolLiquidationOrders(symbol, market) {
+    subscribeSymbolLiquidationOrders(symbol, market, wsKeyOverride) {
         const lowerCaseSymbol = symbol.toLowerCase();
         const streamName = 'forceOrder';
-        const wsKey = (0, websocket_util_1.resolveWsKeyForLegacyMarket)(market);
+        const wsKey = wsKeyOverride || (0, websocket_util_1.getWsKeyForProductGroup)(market, streamName);
         return this.subscribe(`${lowerCaseSymbol}@${streamName}`, wsKey);
     }
     /**
      * Subscribe to best bid/ask for all symbols in spot markets.
      */
-    subscribeAllLiquidationOrders(market) {
+    subscribeAllLiquidationOrders(market, wsKeyOverride) {
         const streamName = 'forceOrder@arr';
-        const wsKey = (0, websocket_util_1.resolveWsKeyForLegacyMarket)(market);
+        const wsKey = wsKeyOverride || (0, websocket_util_1.getWsKeyForProductGroup)(market, streamName);
         return this.subscribe(`!${streamName}`, wsKey);
     }
     /**
@@ -1418,10 +1419,10 @@ class WebsocketClient extends BaseWSClient_1.BaseWebsocketClient {
      * - spot only supports 1000ms or 100ms for updateMs
      * - futures only support 100, 250 or 500ms for updateMs
      */
-    subscribePartialBookDepths(symbol, levels, updateMs, market) {
+    subscribePartialBookDepths(symbol, levels, updateMs, market, wsKeyOverride) {
         const lowerCaseSymbol = symbol.toLowerCase();
         const streamName = 'depth';
-        const wsKey = (0, websocket_util_1.resolveWsKeyForLegacyMarket)(market);
+        const wsKey = wsKeyOverride || (0, websocket_util_1.getWsKeyForProductGroup)(market, streamName);
         const updateMsSuffx = typeof updateMs === 'number' ? `@${updateMs}ms` : '';
         return this.subscribe(`${lowerCaseSymbol}@${streamName}${levels}${updateMsSuffx}`, wsKey);
     }
@@ -1433,19 +1434,19 @@ class WebsocketClient extends BaseWSClient_1.BaseWebsocketClient {
      * - Spot: https://binance-docs.github.io/apidocs/spot/en/#diff-depth-stream
      * - USDM Futures: https://binance-docs.github.io/apidocs/futures/en/#diff-book-depth-streams
      */
-    subscribeDiffBookDepth(symbol, updateMs = 100, market) {
+    subscribeDiffBookDepth(symbol, updateMs = 100, market, wsKeyOverride) {
         const lowerCaseSymbol = symbol.toLowerCase();
         const streamName = 'depth';
-        const wsKey = (0, websocket_util_1.resolveWsKeyForLegacyMarket)(market);
+        const wsKey = wsKeyOverride || (0, websocket_util_1.getWsKeyForProductGroup)(market, streamName);
         const updateMsSuffx = typeof updateMs === 'number' ? `@${updateMs}ms` : '';
         return this.subscribe(`${lowerCaseSymbol}@${streamName}${updateMsSuffx}`, wsKey);
     }
     /**
      * Subscribe to best bid/ask for all symbols in spot markets.
      */
-    subscribeContractInfoStream(market) {
+    subscribeContractInfoStream(market, wsKeyOverride) {
         const streamName = '!contractInfo';
-        const wsKey = (0, websocket_util_1.resolveWsKeyForLegacyMarket)(market);
+        const wsKey = wsKeyOverride || (0, websocket_util_1.getWsKeyForProductGroup)(market, streamName);
         return this.subscribe(`${streamName}`, wsKey);
     }
     /**
@@ -1456,62 +1457,62 @@ class WebsocketClient extends BaseWSClient_1.BaseWebsocketClient {
     /**
      * Subscribe to aggregate trades for a symbol in spot markets.
      */
-    subscribeSpotAggregateTrades(symbol) {
-        return this.subscribeAggregateTrades(symbol, 'spot');
+    subscribeSpotAggregateTrades(symbol, wsKeyOverride) {
+        return this.subscribeAggregateTrades(symbol, 'spot', wsKeyOverride);
     }
     /**
      * Subscribe to trades for a symbol in spot markets.
      */
-    subscribeSpotTrades(symbol) {
-        return this.subscribeTrades(symbol, 'spot');
+    subscribeSpotTrades(symbol, wsKeyOverride) {
+        return this.subscribeTrades(symbol, 'spot', wsKeyOverride);
     }
     /**
      * Subscribe to candles for a symbol in spot markets.
      */
-    subscribeSpotKline(symbol, interval) {
-        return this.subscribeKlines(symbol, interval, 'spot');
+    subscribeSpotKline(symbol, interval, wsKeyOverride) {
+        return this.subscribeKlines(symbol, interval, 'spot', wsKeyOverride);
     }
     /**
      * Subscribe to mini 24hr ticker for a symbol in spot markets.
      */
-    subscribeSpotSymbolMini24hrTicker(symbol) {
-        return this.subscribeSymbolMini24hrTicker(symbol, 'spot');
+    subscribeSpotSymbolMini24hrTicker(symbol, wsKeyOverride) {
+        return this.subscribeSymbolMini24hrTicker(symbol, 'spot', wsKeyOverride);
     }
     /**
      * Subscribe to mini 24hr mini ticker in spot markets.
      */
-    subscribeSpotAllMini24hrTickers() {
-        return this.subscribeAllMini24hrTickers('spot');
+    subscribeSpotAllMini24hrTickers(wsKeyOverride) {
+        return this.subscribeAllMini24hrTickers('spot', wsKeyOverride);
     }
     /**
      * Subscribe to 24hr ticker for a symbol in spot markets.
      */
-    subscribeSpotSymbol24hrTicker(symbol) {
-        return this.subscribeSymbol24hrTicker(symbol, 'spot');
+    subscribeSpotSymbol24hrTicker(symbol, wsKeyOverride) {
+        return this.subscribeSymbol24hrTicker(symbol, 'spot', wsKeyOverride);
     }
     /**
      * Subscribe to 24hr ticker in spot markets.
      */
-    subscribeSpotAll24hrTickers() {
-        return this.subscribeAll24hrTickers('spot');
+    subscribeSpotAll24hrTickers(wsKeyOverride) {
+        return this.subscribeAll24hrTickers('spot', wsKeyOverride);
     }
     /**
      * Subscribe to best bid/ask for symbol in spot markets.
      */
-    subscribeSpotSymbolBookTicker(symbol) {
-        return this.subscribeSymbolBookTicker(symbol, 'spot');
+    subscribeSpotSymbolBookTicker(symbol, wsKeyOverride) {
+        return this.subscribeSymbolBookTicker(symbol, 'spot', wsKeyOverride);
     }
     /**
      * Subscribe to top bid/ask levels for symbol in spot markets.
      */
-    subscribeSpotPartialBookDepth(symbol, levels, updateMs = 1000) {
-        return this.subscribePartialBookDepths(symbol, levels, updateMs, 'spot');
+    subscribeSpotPartialBookDepth(symbol, levels, updateMs = 1000, wsKeyOverride) {
+        return this.subscribePartialBookDepths(symbol, levels, updateMs, 'spot', wsKeyOverride);
     }
     /**
      * Subscribe to spot orderbook depth updates to locally manage an order book.
      */
-    subscribeSpotDiffBookDepth(symbol, updateMs = 1000) {
-        return this.subscribeDiffBookDepth(symbol, updateMs, 'spot');
+    subscribeSpotDiffBookDepth(symbol, updateMs = 1000, wsKeyOverride) {
+        return this.subscribeDiffBookDepth(symbol, updateMs, 'spot', wsKeyOverride);
     }
 }
 exports.WebsocketClient = WebsocketClient;