bybit-api 3.5.0-beta.0 → 3.5.1

package/lib/util/websocket-util.d.ts

@@ -1,4 +1,4 @@
-import { APIMarket, WsKey } from '../types';
+import { APIMarket, CategoryV5, WsKey } from '../types';
 interface NetworkMapV3 {
     livenet: string;
     livenet2?: string;
@@ -6,7 +6,17 @@ interface NetworkMapV3 {
     testnet2?: string;
 }
 declare type PublicPrivateNetwork = 'public' | 'private';
-export declare const WS_BASE_URL_MAP: Record<APIMarket | 'unifiedPerpUSDT' | 'unifiedPerpUSDC', Record<PublicPrivateNetwork, NetworkMapV3>>;
+/**
+ * The following WS keys are logical.
+ *
+ * They're not directly used as a market. They usually have one private endpoint but many public ones,
+ * so they need a bit of extra handling for seamless messaging between endpoints.
+ *
+ * For the unified keys, the "split" happens using the symbol. Symbols suffixed with USDT are obviously USDT topics.
+ * For the v5 endpoints, the subscribe/unsubscribe call must specify the category the subscription should route to.
+ */
+declare type PublicOnlyWsKeys = 'unifiedPerpUSDT' | 'unifiedPerpUSDC' | 'v5SpotPublic' | 'v5LinearPublic' | 'v5InversePublic' | 'v5OptionPublic';
+export declare const WS_BASE_URL_MAP: Record<APIMarket, Record<PublicPrivateNetwork, NetworkMapV3>> & Record<PublicOnlyWsKeys, Record<'public', NetworkMapV3>>;
 export declare const WS_KEY_MAP: {
     readonly inverse: "inverse";
     readonly linearPrivate: "linearPrivate";
@@ -27,10 +37,17 @@ export declare const WS_KEY_MAP: {
     readonly contractUSDTPrivate: "contractUSDTPrivate";
     readonly contractInversePublic: "contractInversePublic";
     readonly contractInversePrivate: "contractInversePrivate";
+    readonly v5SpotPublic: "v5SpotPublic";
+    readonly v5LinearPublic: "v5LinearPublic";
+    readonly v5InversePublic: "v5InversePublic";
+    readonly v5OptionPublic: "v5OptionPublic";
+    readonly v5Private: "v5Private";
 };
 export declare const WS_AUTH_ON_CONNECT_KEYS: WsKey[];
 export declare const PUBLIC_WS_KEYS: string[];
-export declare function getWsKeyForTopic(market: APIMarket, topic: string, isPrivate?: boolean): WsKey;
+export declare function isPrivateWsTopic(topic: string): boolean;
+export declare function getWsKeyForTopic(market: APIMarket, topic: string, isPrivate?: boolean, category?: CategoryV5): WsKey;
+export declare function getWsUrl(wsKey: WsKey, wsUrl: string | undefined, isTestnet: boolean): string;
 export declare function getMaxTopicsPerSubscribeEvent(market: APIMarket): number | null;
 export declare function getUsdcWsKeyForTopic(topic: string, subGroup: 'option' | 'perp'): WsKey;
 export declare const WS_ERROR_ENUM: {

package/lib/util/websocket-util.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.neverGuard = exports.WS_ERROR_ENUM = exports.getUsdcWsKeyForTopic = exports.getMaxTopicsPerSubscribeEvent = exports.getWsKeyForTopic = exports.PUBLIC_WS_KEYS = exports.WS_AUTH_ON_CONNECT_KEYS = exports.WS_KEY_MAP = exports.WS_BASE_URL_MAP = void 0;
+exports.neverGuard = exports.WS_ERROR_ENUM = exports.getUsdcWsKeyForTopic = exports.getMaxTopicsPerSubscribeEvent = exports.getWsUrl = exports.getWsKeyForTopic = exports.isPrivateWsTopic = exports.PUBLIC_WS_KEYS = exports.WS_AUTH_ON_CONNECT_KEYS = exports.WS_KEY_MAP = exports.WS_BASE_URL_MAP = void 0;
 exports.WS_BASE_URL_MAP = {
     inverse: {
         public: {
@@ -95,20 +95,12 @@ exports.WS_BASE_URL_MAP = {
             livenet: 'wss://stream.bybit.com/contract/usdt/public/v3',
             testnet: 'wss://stream-testnet.bybit.com/contract/usdt/public/v3',
         },
-        private: {
-            livenet: 'useUnifiedEndpoint',
-            testnet: 'useUnifiedEndpoint',
-        },
     },
     unifiedPerpUSDC: {
         public: {
             livenet: 'wss://stream.bybit.com/contract/usdc/public/v3',
             testnet: 'wss://stream-testnet.bybit.com/contract/usdc/public/v3',
         },
-        private: {
-            livenet: 'useUnifiedEndpoint',
-            testnet: 'useUnifiedEndpoint',
-        },
     },
     contractUSDT: {
         public: {
@@ -130,6 +122,40 @@ exports.WS_BASE_URL_MAP = {
             testnet: 'wss://stream-testnet.bybit.com/contract/private/v3',
         },
     },
+    v5: {
+        public: {
+            livenet: 'public topics are routed internally via the public wskeys',
+            testnet: 'public topics are routed internally via the public wskeys',
+        },
+        private: {
+            livenet: 'wss://stream.bybit.com/v5/private',
+            testnet: 'wss://stream-testnet.bybit.com/v5/private',
+        },
+    },
+    v5SpotPublic: {
+        public: {
+            livenet: 'wss://stream.bybit.com/v5/public/spot',
+            testnet: 'wss://stream-testnet.bybit.com/v5/public/spot',
+        },
+    },
+    v5LinearPublic: {
+        public: {
+            livenet: 'wss://stream.bybit.com/v5/public/linear',
+            testnet: 'wss://stream-testnet.bybit.com/v5/public/linear',
+        },
+    },
+    v5InversePublic: {
+        public: {
+            livenet: 'wss://stream.bybit.com/v5/public/inverse',
+            testnet: 'wss://stream-testnet.bybit.com/v5/public/inverse',
+        },
+    },
+    v5OptionPublic: {
+        public: {
+            livenet: 'wss://stream.bybit.com/v5/public/option',
+            testnet: 'wss://stream-testnet.bybit.com/v5/public/option',
+        },
+    },
 };
 exports.WS_KEY_MAP = {
     inverse: 'inverse',
@@ -151,6 +177,11 @@ exports.WS_KEY_MAP = {
     contractUSDTPrivate: 'contractUSDTPrivate',
     contractInversePublic: 'contractInversePublic',
     contractInversePrivate: 'contractInversePrivate',
+    v5SpotPublic: 'v5SpotPublic',
+    v5LinearPublic: 'v5LinearPublic',
+    v5InversePublic: 'v5InversePublic',
+    v5OptionPublic: 'v5OptionPublic',
+    v5Private: 'v5Private',
 };
 exports.WS_AUTH_ON_CONNECT_KEYS = [
     exports.WS_KEY_MAP.spotV3Private,
@@ -159,6 +190,7 @@ exports.WS_AUTH_ON_CONNECT_KEYS = [
     exports.WS_KEY_MAP.unifiedPrivate,
     exports.WS_KEY_MAP.contractUSDTPrivate,
     exports.WS_KEY_MAP.contractInversePrivate,
+    exports.WS_KEY_MAP.v5Private,
 ];
 exports.PUBLIC_WS_KEYS = [
     exports.WS_KEY_MAP.linearPublic,
@@ -171,14 +203,14 @@ exports.PUBLIC_WS_KEYS = [
     exports.WS_KEY_MAP.unifiedPerpUSDCPublic,
     exports.WS_KEY_MAP.contractUSDTPublic,
     exports.WS_KEY_MAP.contractInversePublic,
+    exports.WS_KEY_MAP.v5SpotPublic,
+    exports.WS_KEY_MAP.v5LinearPublic,
+    exports.WS_KEY_MAP.v5InversePublic,
+    exports.WS_KEY_MAP.v5OptionPublic,
 ];
 /** Used to automatically determine if a sub request should be to the public or private ws (when there's two) */
 const PRIVATE_TOPICS = [
-    'position',
-    'execution',
-    'order',
     'stop_order',
-    'wallet',
     'outboundAccountInfo',
     'executionReport',
     'ticketInfo',
@@ -211,8 +243,18 @@ const PRIVATE_TOPICS = [
     'user.execution.contractAccount',
     'user.order.contractAccount',
     'user.wallet.contractAccount',
+    // v5
+    'position',
+    'execution',
+    'order',
+    'wallet',
+    'greeks',
 ];
-function getWsKeyForTopic(market, topic, isPrivate) {
+function isPrivateWsTopic(topic) {
+    return PRIVATE_TOPICS.includes(topic);
+}
+exports.isPrivateWsTopic = isPrivateWsTopic;
+function getWsKeyForTopic(market, topic, isPrivate, category) {
     const isPrivateTopic = isPrivate === true || PRIVATE_TOPICS.includes(topic);
     switch (market) {
         case 'inverse': {
@@ -270,12 +312,126 @@ function getWsKeyForTopic(market, topic, isPrivate) {
                 ? exports.WS_KEY_MAP.contractUSDTPrivate
                 : exports.WS_KEY_MAP.contractUSDTPublic;
         }
+        case 'v5': {
+            if (isPrivateTopic) {
+                return exports.WS_KEY_MAP.v5Private;
+            }
+            switch (category) {
+                case 'spot': {
+                    return exports.WS_KEY_MAP.v5SpotPublic;
+                }
+                case 'linear': {
+                    return exports.WS_KEY_MAP.v5LinearPublic;
+                }
+                case 'inverse': {
+                    return exports.WS_KEY_MAP.v5InversePublic;
+                }
+                case 'option': {
+                    return exports.WS_KEY_MAP.v5OptionPublic;
+                }
+                case undefined: {
+                    throw new Error('Category cannot be undefined');
+                }
+                default: {
+                    throw neverGuard(category, 'getWsKeyForTopic(v5): Unhandled v5 category');
+                }
+            }
+        }
         default: {
             throw neverGuard(market, 'getWsKeyForTopic(): Unhandled market');
         }
     }
 }
 exports.getWsKeyForTopic = getWsKeyForTopic;
+function getWsUrl(wsKey, wsUrl, isTestnet) {
+    if (wsUrl) {
+        return wsUrl;
+    }
+    const networkKey = isTestnet ? 'testnet' : 'livenet';
+    switch (wsKey) {
+        case exports.WS_KEY_MAP.linearPublic: {
+            return exports.WS_BASE_URL_MAP.linear.public[networkKey];
+        }
+        case exports.WS_KEY_MAP.linearPrivate: {
+            return exports.WS_BASE_URL_MAP.linear.private[networkKey];
+        }
+        case exports.WS_KEY_MAP.spotPublic: {
+            return exports.WS_BASE_URL_MAP.spot.public[networkKey];
+        }
+        case exports.WS_KEY_MAP.spotPrivate: {
+            return exports.WS_BASE_URL_MAP.spot.private[networkKey];
+        }
+        case exports.WS_KEY_MAP.spotV3Public: {
+            return exports.WS_BASE_URL_MAP.spotv3.public[networkKey];
+        }
+        case exports.WS_KEY_MAP.spotV3Private: {
+            return exports.WS_BASE_URL_MAP.spotv3.private[networkKey];
+        }
+        case exports.WS_KEY_MAP.inverse: {
+            // private and public are on the same WS connection
+            return exports.WS_BASE_URL_MAP.inverse.public[networkKey];
+        }
+        case exports.WS_KEY_MAP.usdcOptionPublic: {
+            return exports.WS_BASE_URL_MAP.usdcOption.public[networkKey];
+        }
+        case exports.WS_KEY_MAP.usdcOptionPrivate: {
+            return exports.WS_BASE_URL_MAP.usdcOption.private[networkKey];
+        }
+        case exports.WS_KEY_MAP.usdcPerpPublic: {
+            return exports.WS_BASE_URL_MAP.usdcPerp.public[networkKey];
+        }
+        case exports.WS_KEY_MAP.usdcPerpPrivate: {
+            return exports.WS_BASE_URL_MAP.usdcPerp.private[networkKey];
+        }
+        case exports.WS_KEY_MAP.unifiedOptionPublic: {
+            return exports.WS_BASE_URL_MAP.unifiedOption.public[networkKey];
+        }
+        case exports.WS_KEY_MAP.unifiedPerpUSDTPublic: {
+            return exports.WS_BASE_URL_MAP.unifiedPerpUSDT.public[networkKey];
+        }
+        case exports.WS_KEY_MAP.unifiedPerpUSDCPublic: {
+            return exports.WS_BASE_URL_MAP.unifiedPerpUSDC.public[networkKey];
+        }
+        case exports.WS_KEY_MAP.unifiedPrivate: {
+            return exports.WS_BASE_URL_MAP.unifiedPerp.private[networkKey];
+        }
+        case exports.WS_KEY_MAP.contractInversePrivate: {
+            return exports.WS_BASE_URL_MAP.contractInverse.private[networkKey];
+        }
+        case exports.WS_KEY_MAP.contractInversePublic: {
+            return exports.WS_BASE_URL_MAP.contractInverse.public[networkKey];
+        }
+        case exports.WS_KEY_MAP.contractUSDTPrivate: {
+            return exports.WS_BASE_URL_MAP.contractUSDT.private[networkKey];
+        }
+        case exports.WS_KEY_MAP.contractUSDTPublic: {
+            return exports.WS_BASE_URL_MAP.contractUSDT.public[networkKey];
+        }
+        case exports.WS_KEY_MAP.v5Private: {
+            return exports.WS_BASE_URL_MAP.v5.private[networkKey];
+        }
+        case exports.WS_KEY_MAP.v5SpotPublic: {
+            return exports.WS_BASE_URL_MAP.v5SpotPublic.public[networkKey];
+        }
+        case exports.WS_KEY_MAP.v5LinearPublic: {
+            return exports.WS_BASE_URL_MAP.v5LinearPublic.public[networkKey];
+        }
+        case exports.WS_KEY_MAP.v5InversePublic: {
+            return exports.WS_BASE_URL_MAP.v5InversePublic.public[networkKey];
+        }
+        case exports.WS_KEY_MAP.v5OptionPublic: {
+            return exports.WS_BASE_URL_MAP.v5OptionPublic.public[networkKey];
+        }
+        default: {
+            this.logger.error('getWsUrl(): Unhandled wsKey: ', {
+                category: 'bybit-ws',
+                wsKey,
+            });
+            throw neverGuard(wsKey, 'getWsUrl(): Unhandled wsKey');
+        }
+    }
+}
+exports.getWsUrl = getWsUrl;
 function getMaxTopicsPerSubscribeEvent(market) {
     switch (market) {
         case 'inverse':
@@ -286,7 +442,8 @@ function getMaxTopicsPerSubscribeEvent(market) {
         case 'unifiedPerp':
         case 'spot':
         case 'contractInverse':
-        case 'contractUSDT': {
+        case 'contractUSDT':
+        case 'v5': {
             return null;
         }
         case 'spotv3': {

package/lib/util/websocket-util.js.map

@@ -1 +1 @@
-{"version":3,"file":"websocket-util.js","sourceRoot":"","sources":["../../src/util/websocket-util.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"websocket-util.js","sourceRoot":"","sources":["../../src/util/websocket-util.ts"],"names":[],"mappings":"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"}

package/lib/websocket-client.d.ts

@@ -2,7 +2,7 @@
 import { EventEmitter } from 'events';
 import WebSocket from 'isomorphic-ws';
 import WsStore from './util/WsStore';
-import { KlineInterval, WSClientConfigurableOptions, WsKey, WsTopic } from './types';
+import { CategoryV5, KlineInterval, WSClientConfigurableOptions, WsKey, WsTopic } from './types';
 import { DefaultLogger } from './util';
 export declare type WsClientEvent = 'open' | 'update' | 'close' | 'error' | 'reconnect' | 'reconnected' | 'response';
 interface WebsocketClientEvents {
@@ -43,14 +43,38 @@ export declare class WebsocketClient extends EventEmitter {
     private options;
     private wsStore;
     constructor(options: WSClientConfigurableOptions, logger?: typeof DefaultLogger);
+    /** Get the WsStore that tracks websockets & topics */
+    getWsStore(): WsStore;
+    isTestnet(): boolean;
     /**
-     * Subscribe to topics & track/persist them. They will be automatically resubscribed to if the connection drops/reconnects.
-     * @param wsTopics topic or list of topics
+     * Subscribe to V5 topics & track/persist them.
+     * @param wsTopics - topic or list of topics
+     * @param category - the API category this topic is for (e.g. "linear"). The value is only important when connecting to public topics and will be ignored for private topics.
+     * @param isPrivateTopic - optional - the library will try to detect private topics, you can use this to mark a topic as private (if the topic isn't recognised yet)
+     */
+    subscribeV5(wsTopics: WsTopic[] | WsTopic, category: CategoryV5, isPrivateTopic?: boolean): void;
+    /**
+     * Subscribe to V1-V3 topics & track/persist them.
+     *
+     * Note: for public V5 topics use the `subscribeV5()` method.
+     *
+     * Topics will be automatically resubscribed to if the connection resets/drops/reconnects.
+     * @param wsTopics - topic or list of topics
      * @param isPrivateTopic optional - the library will try to detect private topics, you can use this to mark a topic as private (if the topic isn't recognised yet)
      */
     subscribe(wsTopics: WsTopic[] | WsTopic, isPrivateTopic?: boolean): void;
     /**
-     * Unsubscribe from topics & remove them from memory. They won't be re-subscribed to if the connection reconnects.
+     * Unsubscribe from V5 topics & remove them from memory. They won't be re-subscribed to if the connection reconnects.
+     * @param wsTopics - topic or list of topics
+     * @param category - the API category this topic is for (e.g. "linear"). The value is only important when connecting to public topics and will be ignored for private topics.
+     * @param isPrivateTopic - optional - the library will try to detect private topics, you can use this to mark a topic as private (if the topic isn't recognised yet)
+     */
+    unsubscribeV5(wsTopics: WsTopic[] | WsTopic, category: CategoryV5, isPrivateTopic?: boolean): void;
+    /**
+     * Unsubscribe from V1-V3 topics & remove them from memory. They won't be re-subscribed to if the connection reconnects.
+     *
+     * Note: For public V5 topics, use `unsubscribeV5()` instead!
+     *
      * @param wsTopics topic or list of topics
      * @param isPrivateTopic optional - the library will try to detect private topics, you can use this to mark a topic as private (if the topic isn't recognised yet)
      */
@@ -60,9 +84,6 @@ export declare class WebsocketClient extends EventEmitter {
      * I've removed this for ftx and it's working great, tempted to remove this here
      */
     private prepareRESTClient;
-    /** Get the WsStore that tracks websockets & topics */
-    getWsStore(): WsStore;
-    isTestnet(): boolean;
     close(wsKey: WsKey, force?: boolean): void;
     closeAll(force?: boolean): void;
     /**
@@ -105,7 +126,6 @@ export declare class WebsocketClient extends EventEmitter {
     private onWsClose;
     private getWs;
     private setWsState;
-    private getWsUrl;
     private wrongMarketError;
     /** @deprecated use "market: 'spotv3" client */
     subscribePublicSpotTrades(symbol: string, binary?: boolean): void;

package/lib/websocket-client.js

@@ -28,6 +28,7 @@ const contract_client_1 = require("./contract-client");
 const node_support_1 = require("./util/node-support");
 const WsStore_1 = __importDefault(require("./util/WsStore"));
 const util_1 = require("./util");
+const rest_client_v5_1 = require("./rest-client-v5");
 const loggerCategory = { category: 'bybit-ws' };
 // eslint-disable-next-line no-redeclare
 class WebsocketClient extends events_1.EventEmitter {
@@ -42,13 +43,54 @@ class WebsocketClient extends events_1.EventEmitter {
         // eslint-disable-next-line @typescript-eslint/no-empty-function
         this.on('error', () => { });
     }
+    /** Get the WsStore that tracks websockets & topics */
+    getWsStore() {
+        return this.wsStore;
+    }
+    isTestnet() {
+        return this.options.testnet === true;
+    }
     /**
-     * Subscribe to topics & track/persist them. They will be automatically resubscribed to if the connection drops/reconnects.
-     * @param wsTopics topic or list of topics
+     * Subscribe to V5 topics & track/persist them.
+     * @param wsTopics - topic or list of topics
+     * @param category - the API category this topic is for (e.g. "linear"). The value is only important when connecting to public topics and will be ignored for private topics.
+     * @param isPrivateTopic - optional - the library will try to detect private topics, you can use this to mark a topic as private (if the topic isn't recognised yet)
+     */
+    subscribeV5(wsTopics, category, isPrivateTopic) {
+        const topics = Array.isArray(wsTopics) ? wsTopics : [wsTopics];
+        topics.forEach((topic) => {
+            const wsKey = util_1.getWsKeyForTopic(this.options.market, topic, isPrivateTopic, category);
+            // Persist topic for reconnects
+            this.wsStore.addTopic(wsKey, topic);
+            // if connected, send subscription request
+            if (this.wsStore.isConnectionState(wsKey, util_1.WsConnectionStateEnum.CONNECTED)) {
+                return this.requestSubscribeTopics(wsKey, [topic]);
+            }
+            // start connection process if it hasn't yet begun. Topics are automatically subscribed to on-connect
+            if (!this.wsStore.isConnectionState(wsKey, util_1.WsConnectionStateEnum.CONNECTING) &&
+                !this.wsStore.isConnectionState(wsKey, util_1.WsConnectionStateEnum.RECONNECTING)) {
+                return this.connect(wsKey);
+            }
+        });
+    }
+    /**
+     * Subscribe to V1-V3 topics & track/persist them.
+     *
+     * Note: for public V5 topics use the `subscribeV5()` method.
+     *
+     * Topics will be automatically resubscribed to if the connection resets/drops/reconnects.
+     * @param wsTopics - topic or list of topics
      * @param isPrivateTopic optional - the library will try to detect private topics, you can use this to mark a topic as private (if the topic isn't recognised yet)
      */
     subscribe(wsTopics, isPrivateTopic) {
         const topics = Array.isArray(wsTopics) ? wsTopics : [wsTopics];
+        if (this.options.market === 'v5') {
+            topics.forEach((topic) => {
+                if (!util_1.isPrivateWsTopic(topic)) {
+                    throw new Error('For public "v5" websocket topics, use the subscribeV5() method & provide the category parameter');
+                }
+            });
+        }
         topics.forEach((topic) => {
             const wsKey = util_1.getWsKeyForTopic(this.options.market, topic, isPrivateTopic);
             // Persist topic for reconnects
@@ -65,12 +107,40 @@ class WebsocketClient extends events_1.EventEmitter {
         });
     }
     /**
-     * Unsubscribe from topics & remove them from memory. They won't be re-subscribed to if the connection reconnects.
+     * Unsubscribe from V5 topics & remove them from memory. They won't be re-subscribed to if the connection reconnects.
+     * @param wsTopics - topic or list of topics
+     * @param category - the API category this topic is for (e.g. "linear"). The value is only important when connecting to public topics and will be ignored for private topics.
+     * @param isPrivateTopic - optional - the library will try to detect private topics, you can use this to mark a topic as private (if the topic isn't recognised yet)
+     */
+    unsubscribeV5(wsTopics, category, isPrivateTopic) {
+        const topics = Array.isArray(wsTopics) ? wsTopics : [wsTopics];
+        topics.forEach((topic) => {
+            const wsKey = util_1.getWsKeyForTopic(this.options.market, topic, isPrivateTopic, category);
+            // Remove topic from persistence for reconnects
+            this.wsStore.deleteTopic(wsKey, topic);
+            // unsubscribe request only necessary if active connection exists
+            if (this.wsStore.isConnectionState(wsKey, util_1.WsConnectionStateEnum.CONNECTED)) {
+                this.requestUnsubscribeTopics(wsKey, [topic]);
+            }
+        });
+    }
+    /**
+     * Unsubscribe from V1-V3 topics & remove them from memory. They won't be re-subscribed to if the connection reconnects.
+     *
+     * Note: For public V5 topics, use `unsubscribeV5()` instead!
+     *
      * @param wsTopics topic or list of topics
      * @param isPrivateTopic optional - the library will try to detect private topics, you can use this to mark a topic as private (if the topic isn't recognised yet)
      */
     unsubscribe(wsTopics, isPrivateTopic) {
         const topics = Array.isArray(wsTopics) ? wsTopics : [wsTopics];
+        if (this.options.market === 'v5') {
+            topics.forEach((topic) => {
+                if (!util_1.isPrivateWsTopic(topic)) {
+                    throw new Error('For public "v5" websocket topics, use the unsubscribeV5() method & provide the category parameter');
+                }
+            });
+        }
         topics.forEach((topic) => {
             const wsKey = util_1.getWsKeyForTopic(this.options.market, topic, isPrivateTopic);
             // Remove topic from persistence for reconnects
@@ -122,18 +192,15 @@ class WebsocketClient extends events_1.EventEmitter {
                 this.restClient = new contract_client_1.ContractClient(this.options.restOptions, this.options.requestOptions);
                 break;
             }
+            case 'v5': {
+                this.restClient = new rest_client_v5_1.RestClientV5(this.options.restOptions, this.options.requestOptions);
+                break;
+            }
             default: {
                 throw util_1.neverGuard(this.options.market, 'prepareRESTClient(): Unhandled market');
             }
         }
     }
-    /** Get the WsStore that tracks websockets & topics */
-    getWsStore() {
-        return this.wsStore;
-    }
-    isTestnet() {
-        return this.options.testnet === true;
-    }
     close(wsKey, force) {
         this.logger.info('Closing connection', Object.assign(Object.assign({}, loggerCategory), { wsKey }));
         this.setWsState(wsKey, util_1.WsConnectionStateEnum.CLOSING);
@@ -172,6 +239,9 @@ class WebsocketClient extends events_1.EventEmitter {
             case 'contractInverse': {
                 return [...this.connectPublic(), this.connectPrivate()];
             }
+            case 'v5': {
+                return [this.connectPrivate()];
+            }
             default: {
                 throw util_1.neverGuard(this.options.market, 'connectAll(): Unhandled market');
             }
@@ -210,6 +280,14 @@ class WebsocketClient extends events_1.EventEmitter {
                 return [this.connect(util_1.WS_KEY_MAP.contractUSDTPublic)];
             case 'contractInverse':
                 return [this.connect(util_1.WS_KEY_MAP.contractInversePublic)];
+            case 'v5': {
+                return [
+                    this.connect(util_1.WS_KEY_MAP.v5SpotPublic),
+                    this.connect(util_1.WS_KEY_MAP.v5LinearPublic),
+                    this.connect(util_1.WS_KEY_MAP.v5InversePublic),
+                    this.connect(util_1.WS_KEY_MAP.v5OptionPublic),
+                ];
+            }
             default: {
                 throw util_1.neverGuard(this.options.market, 'connectPublic(): Unhandled market');
             }
@@ -243,6 +321,9 @@ class WebsocketClient extends events_1.EventEmitter {
                 return this.connect(util_1.WS_KEY_MAP.contractUSDTPrivate);
             case 'contractInverse':
                 return this.connect(util_1.WS_KEY_MAP.contractInversePrivate);
+            case 'v5': {
+                return this.connect(util_1.WS_KEY_MAP.v5Private);
+            }
             default: {
                 throw util_1.neverGuard(this.options.market, 'connectPrivate(): Unhandled market');
             }
@@ -264,8 +345,8 @@ class WebsocketClient extends events_1.EventEmitter {
                     this.setWsState(wsKey, util_1.WsConnectionStateEnum.CONNECTING);
                 }
                 const authParams = yield this.getAuthParams(wsKey);
-                const url = this.getWsUrl(wsKey) + authParams;
-                const ws = this.connectToWsUrl(url, wsKey);
+                const url = util_1.getWsUrl(wsKey, this.options.wsUrl, this.isTestnet());
+                const ws = this.connectToWsUrl(url + authParams, wsKey);
                 return this.wsStore.setWs(wsKey, ws);
             }
             catch (err) {
@@ -593,78 +674,8 @@ class WebsocketClient extends events_1.EventEmitter {
     setWsState(wsKey, state) {
         this.wsStore.setConnectionState(wsKey, state);
     }
-    getWsUrl(wsKey) {
-        if (this.options.wsUrl) {
-            return this.options.wsUrl;
-        }
-        const networkKey = this.isTestnet() ? 'testnet' : 'livenet';
-        switch (wsKey) {
-            case util_1.WS_KEY_MAP.linearPublic: {
-                return util_1.WS_BASE_URL_MAP.linear.public[networkKey];
-            }
-            case util_1.WS_KEY_MAP.linearPrivate: {
-                return util_1.WS_BASE_URL_MAP.linear.private[networkKey];
-            }
-            case util_1.WS_KEY_MAP.spotPublic: {
-                return util_1.WS_BASE_URL_MAP.spot.public[networkKey];
-            }
-            case util_1.WS_KEY_MAP.spotPrivate: {
-                return util_1.WS_BASE_URL_MAP.spot.private[networkKey];
-            }
-            case util_1.WS_KEY_MAP.spotV3Public: {
-                return util_1.WS_BASE_URL_MAP.spotv3.public[networkKey];
-            }
-            case util_1.WS_KEY_MAP.spotV3Private: {
-                return util_1.WS_BASE_URL_MAP.spotv3.private[networkKey];
-            }
-            case util_1.WS_KEY_MAP.inverse: {
-                // private and public are on the same WS connection
-                return util_1.WS_BASE_URL_MAP.inverse.public[networkKey];
-            }
-            case util_1.WS_KEY_MAP.usdcOptionPublic: {
-                return util_1.WS_BASE_URL_MAP.usdcOption.public[networkKey];
-            }
-            case util_1.WS_KEY_MAP.usdcOptionPrivate: {
-                return util_1.WS_BASE_URL_MAP.usdcOption.private[networkKey];
-            }
-            case util_1.WS_KEY_MAP.usdcPerpPublic: {
-                return util_1.WS_BASE_URL_MAP.usdcPerp.public[networkKey];
-            }
-            case util_1.WS_KEY_MAP.usdcPerpPrivate: {
-                return util_1.WS_BASE_URL_MAP.usdcPerp.private[networkKey];
-            }
-            case util_1.WS_KEY_MAP.unifiedOptionPublic: {
-                return util_1.WS_BASE_URL_MAP.unifiedOption.public[networkKey];
-            }
-            case util_1.WS_KEY_MAP.unifiedPerpUSDTPublic: {
-                return util_1.WS_BASE_URL_MAP.unifiedPerpUSDT.public[networkKey];
-            }
-            case util_1.WS_KEY_MAP.unifiedPerpUSDCPublic: {
-                return util_1.WS_BASE_URL_MAP.unifiedPerpUSDC.public[networkKey];
-            }
-            case util_1.WS_KEY_MAP.unifiedPrivate: {
-                return util_1.WS_BASE_URL_MAP.unifiedPerp.private[networkKey];
-            }
-            case util_1.WS_KEY_MAP.contractInversePrivate: {
-                return util_1.WS_BASE_URL_MAP.contractInverse.private[networkKey];
-            }
-            case util_1.WS_KEY_MAP.contractInversePublic: {
-                return util_1.WS_BASE_URL_MAP.contractInverse.public[networkKey];
-            }
-            case util_1.WS_KEY_MAP.contractUSDTPrivate: {
-                return util_1.WS_BASE_URL_MAP.contractUSDT.private[networkKey];
-            }
-            case util_1.WS_KEY_MAP.contractUSDTPublic: {
-                return util_1.WS_BASE_URL_MAP.contractUSDT.public[networkKey];
-            }
-            default: {
-                this.logger.error('getWsUrl(): Unhandled wsKey: ', Object.assign(Object.assign({}, loggerCategory), { wsKey }));
-                throw util_1.neverGuard(wsKey, 'getWsUrl(): Unhandled wsKey');
-            }
-        }
-    }
     wrongMarketError(market) {
-        return new Error(`This WS client was instanced for the ${this.options.market} market. Make another WebsocketClient instance with "market: '${market}' to listen to spot topics`);
+        return new Error(`This WS client was instanced for the ${this.options.market} market. Make another WebsocketClient instance with "market: '${market}'" to listen to ${market} topics`);
     }
     /** @deprecated use "market: 'spotv3" client */
     subscribePublicSpotTrades(symbol, binary) {