bybit-api 2.4.0-beta.1 → 3.0.1

package/lib/util/WsStore.d.ts

@@ -1,4 +1,5 @@
 import WebSocket from 'isomorphic-ws';
+import { WsKey } from '../types';
 import { DefaultLogger } from './logger';
 export declare enum WsConnectionStateEnum {
     INITIAL = 0,
@@ -11,7 +12,7 @@ export declare enum WsConnectionStateEnum {
 declare type WsTopic = string;
 /**
  * A "Set" is used to ensure we only subscribe to a topic once (tracking a list of unique topics we're expected to be connected to)
- * TODO: do any WS topics allow parameters? If so, we need a way to track those (see FTX implementation)
+ * Note: Accurate duplicate tracking only works for plaintext topics. E.g. JSON objects may not be seen as duplicates if keys are in different orders. If that's needed, check the FTX implementation.
  */
 declare type WsTopicList = Set<WsTopic>;
 interface WsStoredState {
@@ -23,6 +24,8 @@ interface WsStoredState {
     activePingTimer?: ReturnType<typeof setTimeout> | undefined;
     /** A timer tracking that an upstream heartbeat was sent, expecting a reply before it expires */
     activePongTimer?: ReturnType<typeof setTimeout> | undefined;
+    /** If a reconnection is in progress, this will have the timer for the delayed reconnect */
+    activeReconnectTimer?: ReturnType<typeof setTimeout> | undefined;
     /**
      * All the topics we are expected to be subscribed to (and we automatically resubscribe to if the connection drops)
      */
@@ -33,21 +36,21 @@ export default class WsStore {
     private logger;
     constructor(logger: typeof DefaultLogger);
     /** Get WS stored state for key, optionally create if missing */
-    get(key: string, createIfMissing?: true): WsStoredState;
-    get(key: string, createIfMissing?: false): WsStoredState | undefined;
-    getKeys(): string[];
-    create(key: string): WsStoredState | undefined;
-    delete(key: string): void;
-    hasExistingActiveConnection(key: string): boolean;
-    getWs(key: string): WebSocket | undefined;
-    setWs(key: string, wsConnection: WebSocket): WebSocket;
-    isWsOpen(key: string): boolean;
-    getConnectionState(key: string): WsConnectionStateEnum;
-    setConnectionState(key: string, state: WsConnectionStateEnum): void;
-    isConnectionState(key: string, state: WsConnectionStateEnum): boolean;
-    getTopics(key: string): WsTopicList;
+    get(key: WsKey, createIfMissing?: true): WsStoredState;
+    get(key: WsKey, createIfMissing?: false): WsStoredState | undefined;
+    getKeys(): WsKey[];
+    create(key: WsKey): WsStoredState | undefined;
+    delete(key: WsKey): void;
+    hasExistingActiveConnection(key: WsKey): boolean;
+    getWs(key: WsKey): WebSocket | undefined;
+    setWs(key: WsKey, wsConnection: WebSocket): WebSocket;
+    isWsOpen(key: WsKey): boolean;
+    getConnectionState(key: WsKey): WsConnectionStateEnum;
+    setConnectionState(key: WsKey, state: WsConnectionStateEnum): void;
+    isConnectionState(key: WsKey, state: WsConnectionStateEnum): boolean;
+    getTopics(key: WsKey): WsTopicList;
     getTopicsByKey(): Record<string, WsTopicList>;
-    addTopic(key: string, topic: WsTopic): WsTopicList;
-    deleteTopic(key: string, topic: WsTopic): boolean;
+    addTopic(key: WsKey, topic: WsTopic): WsTopicList;
+    deleteTopic(key: WsKey, topic: WsTopic): boolean;
 }
 export {};

package/lib/util/WsStore.js

@@ -9,6 +9,7 @@ var WsConnectionStateEnum;
     WsConnectionStateEnum[WsConnectionStateEnum["CONNECTED"] = 2] = "CONNECTED";
     WsConnectionStateEnum[WsConnectionStateEnum["CLOSING"] = 3] = "CLOSING";
     WsConnectionStateEnum[WsConnectionStateEnum["RECONNECTING"] = 4] = "RECONNECTING";
+    // ERROR = 5,
 })(WsConnectionStateEnum = exports.WsConnectionStateEnum || (exports.WsConnectionStateEnum = {}));
 class WsStore {
     constructor(logger) {

package/lib/util/WsStore.js.map

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

package/lib/util/node-support.d.ts

@@ -1 +1,2 @@
+/** This is async because the browser version uses a promise (browser-support) */
 export declare function signMessage(message: string, secret: string): Promise<string>;

package/lib/util/node-support.js

@@ -11,6 +11,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.signMessage = void 0;
 const crypto_1 = require("crypto");
+/** This is async because the browser version uses a promise (browser-support) */
 function signMessage(message, secret) {
     return __awaiter(this, void 0, void 0, function* () {
         return crypto_1.createHmac('sha256', secret).update(message).digest('hex');

package/lib/util/node-support.js.map

@@ -1 +1 @@
-{"version":3,"file":"node-support.js","sourceRoot":"","sources":["../../src/util/node-support.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,mCAAoC;AAEpC,SAAsB,WAAW,CAC/B,OAAe,EACf,MAAc;;QAEd,OAAO,mBAAU,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IACpE,CAAC;CAAA;AALD,kCAKC"}
+{"version":3,"file":"node-support.js","sourceRoot":"","sources":["../../src/util/node-support.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,mCAAoC;AAEpC,iFAAiF;AACjF,SAAsB,WAAW,CAC/B,OAAe,EACf,MAAc;;QAEd,OAAO,mBAAU,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IACpE,CAAC;CAAA;AALD,kCAKC"}

package/lib/util/requestUtils.d.ts

@@ -1,8 +1,12 @@
 export interface RestClientOptions {
+    /** Your API key */
+    key?: string;
+    /** Your API secret */
+    secret?: string;
+    /** Set to `true` to connect to testnet. Uses the live environment by default. */
+    testnet?: boolean;
     /** Override the max size of the request window (in ms) */
     recv_window?: number;
-    /** @deprecated Time sync is now disabled by default. To re-enable it, use enable_time_sync instead. */
-    disable_time_sync?: boolean;
     /** Disabled by default. This can help on machines with consistent latency problems. */
     enable_time_sync?: boolean;
     /** How often to sync time drift with bybit servers */
@@ -18,9 +22,9 @@ export interface RestClientOptions {
     parse_exceptions?: boolean;
 }
 export declare function serializeParams(params?: object, strict_validation?: boolean): string;
-export declare function getRestBaseUrl(useLivenet: boolean, restInverseOptions: RestClientOptions): string;
-export declare function isWsPong(response: any): any;
-export declare const agentSource = "bybitapinode";
+export declare function getRestBaseUrl(useTestnet: boolean, restInverseOptions: RestClientOptions): string;
+export declare function isWsPong(msg: any): boolean;
+export declare const APIID = "bybitapinode";
 /**
  * Used to switch how authentication/requests work under the hood (primarily for SPOT since it's different there)
  */

package/lib/util/requestUtils.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.REST_CLIENT_TYPE_ENUM = exports.agentSource = exports.isWsPong = exports.getRestBaseUrl = exports.serializeParams = void 0;
+exports.REST_CLIENT_TYPE_ENUM = exports.APIID = exports.isWsPong = exports.getRestBaseUrl = exports.serializeParams = void 0;
 function serializeParams(params = {}, strict_validation = false) {
     return Object.keys(params)
         .sort()
@@ -14,7 +14,7 @@ function serializeParams(params = {}, strict_validation = false) {
         .join('&');
 }
 exports.serializeParams = serializeParams;
-function getRestBaseUrl(useLivenet, restInverseOptions) {
+function getRestBaseUrl(useTestnet, restInverseOptions) {
     const exchangeBaseUrls = {
         livenet: 'https://api.bybit.com',
         testnet: 'https://api-testnet.bybit.com',
@@ -22,23 +22,32 @@ function getRestBaseUrl(useLivenet, restInverseOptions) {
     if (restInverseOptions.baseUrl) {
         return restInverseOptions.baseUrl;
     }
-    if (useLivenet === true) {
-        return exchangeBaseUrls.livenet;
+    if (useTestnet) {
+        return exchangeBaseUrls.testnet;
     }
-    return exchangeBaseUrls.testnet;
+    return exchangeBaseUrls.livenet;
 }
 exports.getRestBaseUrl = getRestBaseUrl;
-function isWsPong(response) {
-    if (response.pong || response.ping) {
+function isWsPong(msg) {
+    if (!msg) {
+        return false;
+    }
+    if (msg.pong || msg.ping) {
+        return true;
+    }
+    if (msg['op'] === 'pong') {
+        return true;
+    }
+    if (msg['ret_msg'] === 'pong') {
         return true;
     }
-    return (response.request &&
-        response.request.op === 'ping' &&
-        response.ret_msg === 'pong' &&
-        response.success === true);
+    return (msg.request &&
+        msg.request.op === 'ping' &&
+        msg.ret_msg === 'pong' &&
+        msg.success === true);
 }
 exports.isWsPong = isWsPong;
-exports.agentSource = 'bybitapinode';
+exports.APIID = 'bybitapinode';
 /**
  * Used to switch how authentication/requests work under the hood (primarily for SPOT since it's different there)
  */

package/lib/util/requestUtils.js.map

@@ -1 +1 @@
-{"version":3,"file":"requestUtils.js","sourceRoot":"","sources":["../../src/util/requestUtils.ts"],"names":[],"mappings":";;;AA0BA,SAAgB,eAAe,CAC7B,SAAiB,EAAE,EACnB,iBAAiB,GAAG,KAAK;IAEzB,OAAO,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC;SACvB,IAAI,EAAE;SACN,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE;QACX,MAAM,KAAK,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC;QAC1B,IAAI,iBAAiB,KAAK,IAAI,IAAI,OAAO,KAAK,KAAK,WAAW,EAAE;YAC9D,MAAM,IAAI,KAAK,CACb,uDAAuD,CACxD,CAAC;SACH;QACD,OAAO,GAAG,GAAG,IAAI,KAAK,EAAE,CAAC;IAC3B,CAAC,CAAC;SACD,IAAI,CAAC,GAAG,CAAC,CAAC;AACf,CAAC;AAhBD,0CAgBC;AAED,SAAgB,cAAc,CAC5B,UAAmB,EACnB,kBAAqC;IAErC,MAAM,gBAAgB,GAAG;QACvB,OAAO,EAAE,uBAAuB;QAChC,OAAO,EAAE,+BAA+B;KACzC,CAAC;IAEF,IAAI,kBAAkB,CAAC,OAAO,EAAE;QAC9B,OAAO,kBAAkB,CAAC,OAAO,CAAC;KACnC;IAED,IAAI,UAAU,KAAK,IAAI,EAAE;QACvB,OAAO,gBAAgB,CAAC,OAAO,CAAC;KACjC;IACD,OAAO,gBAAgB,CAAC,OAAO,CAAC;AAClC,CAAC;AAjBD,wCAiBC;AAED,SAAgB,QAAQ,CAAC,QAAa;IACpC,IAAI,QAAQ,CAAC,IAAI,IAAI,QAAQ,CAAC,IAAI,EAAE;QAClC,OAAO,IAAI,CAAC;KACb;IACD,OAAO,CACL,QAAQ,CAAC,OAAO;QAChB,QAAQ,CAAC,OAAO,CAAC,EAAE,KAAK,MAAM;QAC9B,QAAQ,CAAC,OAAO,KAAK,MAAM;QAC3B,QAAQ,CAAC,OAAO,KAAK,IAAI,CAC1B,CAAC;AACJ,CAAC;AAVD,4BAUC;AAEY,QAAA,WAAW,GAAG,cAAc,CAAC;AAE1C;;GAEG;AACU,QAAA,qBAAqB,GAAG;IACnC,YAAY,EAAE,cAAc;IAC5B,OAAO,EAAE,SAAS;IAClB,cAAc,EAAE,gBAAgB;IAChC,MAAM,EAAE,QAAQ;IAChB,IAAI,EAAE,MAAM;IACZ,EAAE,EAAE,IAAI;CACA,CAAC"}
+{"version":3,"file":"requestUtils.js","sourceRoot":"","sources":["../../src/util/requestUtils.ts"],"names":[],"mappings":";;;AAgCA,SAAgB,eAAe,CAC7B,SAAiB,EAAE,EACnB,iBAAiB,GAAG,KAAK;IAEzB,OAAO,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC;SACvB,IAAI,EAAE;SACN,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE;QACX,MAAM,KAAK,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC;QAC1B,IAAI,iBAAiB,KAAK,IAAI,IAAI,OAAO,KAAK,KAAK,WAAW,EAAE;YAC9D,MAAM,IAAI,KAAK,CACb,uDAAuD,CACxD,CAAC;SACH;QACD,OAAO,GAAG,GAAG,IAAI,KAAK,EAAE,CAAC;IAC3B,CAAC,CAAC;SACD,IAAI,CAAC,GAAG,CAAC,CAAC;AACf,CAAC;AAhBD,0CAgBC;AAED,SAAgB,cAAc,CAC5B,UAAmB,EACnB,kBAAqC;IAErC,MAAM,gBAAgB,GAAG;QACvB,OAAO,EAAE,uBAAuB;QAChC,OAAO,EAAE,+BAA+B;KACzC,CAAC;IAEF,IAAI,kBAAkB,CAAC,OAAO,EAAE;QAC9B,OAAO,kBAAkB,CAAC,OAAO,CAAC;KACnC;IAED,IAAI,UAAU,EAAE;QACd,OAAO,gBAAgB,CAAC,OAAO,CAAC;KACjC;IAED,OAAO,gBAAgB,CAAC,OAAO,CAAC;AAClC,CAAC;AAlBD,wCAkBC;AAED,SAAgB,QAAQ,CAAC,GAAQ;IAC/B,IAAI,CAAC,GAAG,EAAE;QACR,OAAO,KAAK,CAAC;KACd;IACD,IAAI,GAAG,CAAC,IAAI,IAAI,GAAG,CAAC,IAAI,EAAE;QACxB,OAAO,IAAI,CAAC;KACb;IAED,IAAI,GAAG,CAAC,IAAI,CAAC,KAAK,MAAM,EAAE;QACxB,OAAO,IAAI,CAAC;KACb;IAED,IAAI,GAAG,CAAC,SAAS,CAAC,KAAK,MAAM,EAAE;QAC7B,OAAO,IAAI,CAAC;KACb;IAED,OAAO,CACL,GAAG,CAAC,OAAO;QACX,GAAG,CAAC,OAAO,CAAC,EAAE,KAAK,MAAM;QACzB,GAAG,CAAC,OAAO,KAAK,MAAM;QACtB,GAAG,CAAC,OAAO,KAAK,IAAI,CACrB,CAAC;AACJ,CAAC;AAtBD,4BAsBC;AAEY,QAAA,KAAK,GAAG,cAAc,CAAC;AAEpC;;GAEG;AACU,QAAA,qBAAqB,GAAG;IACnC,YAAY,EAAE,cAAc;IAC5B,OAAO,EAAE,SAAS;IAClB,cAAc,EAAE,gBAAgB;IAChC,MAAM,EAAE,QAAQ;IAChB,IAAI,EAAE,MAAM;IACZ,EAAE,EAAE,IAAI;CACA,CAAC"}

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

@@ -1,8 +1,38 @@
-import { WsKey } from '../types';
-export declare const wsKeyInverse = "inverse";
-export declare const wsKeyLinearPrivate = "linearPrivate";
-export declare const wsKeyLinearPublic = "linearPublic";
-export declare const wsKeySpotPrivate = "spotPrivate";
-export declare const wsKeySpotPublic = "spotPublic";
-export declare function getLinearWsKeyForTopic(topic: string): WsKey;
-export declare function getSpotWsKeyForTopic(topic: string): WsKey;
+import { APIMarket, WsKey } from '../types';
+interface NetworkMapV3 {
+    livenet: string;
+    livenet2?: string;
+    testnet: string;
+    testnet2?: string;
+}
+declare type PublicPrivateNetwork = 'public' | 'private';
+export declare const WS_BASE_URL_MAP: Record<APIMarket | 'unifiedPerpUSDT' | 'unifiedPerpUSDC', Record<PublicPrivateNetwork, NetworkMapV3>>;
+export declare const WS_KEY_MAP: {
+    readonly inverse: "inverse";
+    readonly linearPrivate: "linearPrivate";
+    readonly linearPublic: "linearPublic";
+    readonly spotPrivate: "spotPrivate";
+    readonly spotPublic: "spotPublic";
+    readonly spotV3Private: "spotV3Private";
+    readonly spotV3Public: "spotV3Public";
+    readonly usdcOptionPrivate: "usdcOptionPrivate";
+    readonly usdcOptionPublic: "usdcOptionPublic";
+    readonly usdcPerpPrivate: "usdcPerpPrivate";
+    readonly usdcPerpPublic: "usdcPerpPublic";
+    readonly unifiedPrivate: "unifiedPrivate";
+    readonly unifiedOptionPublic: "unifiedOptionPublic";
+    readonly unifiedPerpUSDTPublic: "unifiedPerpUSDTPublic";
+    readonly unifiedPerpUSDCPublic: "unifiedPerpUSDCPublic";
+};
+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 getUsdcWsKeyForTopic(topic: string, subGroup: 'option' | 'perp'): WsKey;
+export declare const WS_ERROR_ENUM: {
+    NOT_AUTHENTICATED_SPOT_V3: string;
+    API_ERROR_GENERIC: string;
+    API_SIGN_AUTH_FAILED: string;
+    USDC_OPTION_AUTH_FAILED: string;
+};
+export declare function neverGuard(x: never, msg: string): Error;
+export {};

package/lib/util/websocket-util.js

@@ -1,39 +1,259 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getSpotWsKeyForTopic = exports.getLinearWsKeyForTopic = exports.wsKeySpotPublic = exports.wsKeySpotPrivate = exports.wsKeyLinearPublic = exports.wsKeyLinearPrivate = exports.wsKeyInverse = void 0;
-exports.wsKeyInverse = 'inverse';
-exports.wsKeyLinearPrivate = 'linearPrivate';
-exports.wsKeyLinearPublic = 'linearPublic';
-exports.wsKeySpotPrivate = 'spotPrivate';
-exports.wsKeySpotPublic = 'spotPublic';
-function getLinearWsKeyForTopic(topic) {
-    const privateLinearTopics = [
-        'position',
-        'execution',
-        'order',
-        'stop_order',
-        'wallet',
-    ];
-    if (privateLinearTopics.includes(topic)) {
-        return exports.wsKeyLinearPrivate;
+exports.neverGuard = exports.WS_ERROR_ENUM = exports.getUsdcWsKeyForTopic = exports.getWsKeyForTopic = 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: {
+            livenet: 'wss://stream.bybit.com/realtime',
+            testnet: 'wss://stream-testnet.bybit.com/realtime',
+        },
+        private: {
+            livenet: 'wss://stream.bybit.com/realtime',
+            testnet: 'wss://stream-testnet.bybit.com/realtime',
+        },
+    },
+    linear: {
+        public: {
+            livenet: 'wss://stream.bybit.com/realtime_public',
+            livenet2: 'wss://stream.bytick.com/realtime_public',
+            testnet: 'wss://stream-testnet.bybit.com/realtime_public',
+        },
+        private: {
+            livenet: 'wss://stream.bybit.com/realtime_private',
+            livenet2: 'wss://stream.bytick.com/realtime_private',
+            testnet: 'wss://stream-testnet.bybit.com/realtime_private',
+        },
+    },
+    spot: {
+        public: {
+            livenet: 'wss://stream.bybit.com/spot/quote/ws/v1',
+            livenet2: 'wss://stream.bybit.com/spot/quote/ws/v2',
+            testnet: 'wss://stream-testnet.bybit.com/spot/quote/ws/v1',
+            testnet2: 'wss://stream-testnet.bybit.com/spot/quote/ws/v2',
+        },
+        private: {
+            livenet: 'wss://stream.bybit.com/spot/ws',
+            testnet: 'wss://stream-testnet.bybit.com/spot/ws',
+        },
+    },
+    spotv3: {
+        public: {
+            livenet: 'wss://stream.bybit.com/spot/public/v3',
+            testnet: 'wss://stream-testnet.bybit.com/spot/public/v3',
+        },
+        private: {
+            livenet: 'wss://stream.bybit.com/spot/private/v3',
+            testnet: 'wss://stream-testnet.bybit.com/spot/private/v3',
+        },
+    },
+    usdcOption: {
+        public: {
+            livenet: 'wss://stream.bybit.com/trade/option/usdc/public/v1',
+            livenet2: 'wss://stream.bytick.com/trade/option/usdc/public/v1',
+            testnet: 'wss://stream-testnet.bybit.com/trade/option/usdc/public/v1',
+        },
+        private: {
+            livenet: 'wss://stream.bybit.com/trade/option/usdc/private/v1',
+            livenet2: 'wss://stream.bytick.com/trade/option/usdc/private/v1',
+            testnet: 'wss://stream-testnet.bybit.com/trade/option/usdc/private/v1',
+        },
+    },
+    usdcPerp: {
+        public: {
+            livenet: 'wss://stream.bybit.com/perpetual/ws/v1/realtime_public',
+            livenet2: 'wss://stream.bytick.com/perpetual/ws/v1/realtime_public',
+            testnet: 'wss://stream-testnet.bybit.com/perpetual/ws/v1/realtime_public',
+        },
+        private: {
+            livenet: 'wss://stream.bybit.com/trade/option/usdc/private/v1',
+            livenet2: 'wss://stream.bytick.com/trade/option/usdc/private/v1',
+            testnet: 'wss://stream-testnet.bybit.com/trade/option/usdc/private/v1',
+        },
+    },
+    unifiedOption: {
+        public: {
+            livenet: 'wss://stream.bybit.com/option/usdc/public/v3',
+            testnet: 'wss://stream-testnet.bybit.com/option/usdc/public/v3',
+        },
+        private: {
+            livenet: 'wss://stream.bybit.com/unified/private/v3',
+            testnet: 'wss://stream-testnet.bybit.com/unified/private/v3',
+        },
+    },
+    unifiedPerp: {
+        public: {
+            livenet: 'useBaseSpecificEndpoint',
+            testnet: 'useBaseSpecificEndpoint',
+        },
+        private: {
+            livenet: 'wss://stream.bybit.com/unified/private/v3',
+            testnet: 'wss://stream-testnet.bybit.com/unified/private/v3',
+        },
+    },
+    unifiedPerpUSDT: {
+        public: {
+            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',
+        },
+    },
+};
+exports.WS_KEY_MAP = {
+    inverse: 'inverse',
+    linearPrivate: 'linearPrivate',
+    linearPublic: 'linearPublic',
+    spotPrivate: 'spotPrivate',
+    spotPublic: 'spotPublic',
+    spotV3Private: 'spotV3Private',
+    spotV3Public: 'spotV3Public',
+    usdcOptionPrivate: 'usdcOptionPrivate',
+    usdcOptionPublic: 'usdcOptionPublic',
+    usdcPerpPrivate: 'usdcPerpPrivate',
+    usdcPerpPublic: 'usdcPerpPublic',
+    unifiedPrivate: 'unifiedPrivate',
+    unifiedOptionPublic: 'unifiedOptionPublic',
+    unifiedPerpUSDTPublic: 'unifiedPerpUSDTPublic',
+    unifiedPerpUSDCPublic: 'unifiedPerpUSDCPublic',
+};
+exports.WS_AUTH_ON_CONNECT_KEYS = [
+    exports.WS_KEY_MAP.spotV3Private,
+    exports.WS_KEY_MAP.usdcOptionPrivate,
+    exports.WS_KEY_MAP.usdcPerpPrivate,
+];
+exports.PUBLIC_WS_KEYS = [
+    exports.WS_KEY_MAP.linearPublic,
+    exports.WS_KEY_MAP.spotPublic,
+    exports.WS_KEY_MAP.spotV3Public,
+    exports.WS_KEY_MAP.usdcOptionPublic,
+    exports.WS_KEY_MAP.usdcPerpPublic,
+    exports.WS_KEY_MAP.unifiedOptionPublic,
+    exports.WS_KEY_MAP.unifiedPerpUSDTPublic,
+    exports.WS_KEY_MAP.unifiedPerpUSDCPublic,
+];
+/** 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',
+    // copy trading apis
+    'copyTradePosition',
+    'copyTradeOrder',
+    'copyTradeExecution',
+    'copyTradeWallet',
+    // usdc options
+    'user.openapi.option.position',
+    'user.openapi.option.trade',
+    'user.order',
+    'user.openapi.option.order',
+    'user.service',
+    'user.openapi.greeks',
+    'user.mmp.event',
+    // usdc perps
+    'user.openapi.perp.position',
+    'user.openapi.perp.trade',
+    'user.openapi.perp.order',
+    'user.service',
+    // unified margin
+    'user.position.unifiedAccount',
+    'user.execution.unifiedAccount',
+    'user.order.unifiedAccount',
+    'user.wallet.unifiedAccount',
+    'user.greeks.unifiedAccount',
+];
+function getWsKeyForTopic(market, topic, isPrivate) {
+    const isPrivateTopic = isPrivate === true || PRIVATE_TOPICS.includes(topic);
+    switch (market) {
+        case 'inverse': {
+            return exports.WS_KEY_MAP.inverse;
+        }
+        case 'linear': {
+            return isPrivateTopic
+                ? exports.WS_KEY_MAP.linearPrivate
+                : exports.WS_KEY_MAP.linearPublic;
+        }
+        case 'spot': {
+            return isPrivateTopic ? exports.WS_KEY_MAP.spotPrivate : exports.WS_KEY_MAP.spotPublic;
+        }
+        case 'spotv3': {
+            return isPrivateTopic
+                ? exports.WS_KEY_MAP.spotV3Private
+                : exports.WS_KEY_MAP.spotV3Public;
+        }
+        case 'usdcOption': {
+            return isPrivateTopic
+                ? exports.WS_KEY_MAP.usdcOptionPrivate
+                : exports.WS_KEY_MAP.usdcOptionPublic;
+        }
+        case 'usdcPerp': {
+            return isPrivateTopic
+                ? exports.WS_KEY_MAP.usdcPerpPrivate
+                : exports.WS_KEY_MAP.usdcPerpPublic;
+        }
+        case 'unifiedOption': {
+            return isPrivateTopic
+                ? exports.WS_KEY_MAP.unifiedPrivate
+                : exports.WS_KEY_MAP.unifiedOptionPublic;
+        }
+        case 'unifiedPerp': {
+            if (isPrivateTopic) {
+                return exports.WS_KEY_MAP.unifiedPrivate;
+            }
+            const upperTopic = topic.toUpperCase();
+            if (upperTopic.indexOf('USDT') !== -1) {
+                return exports.WS_KEY_MAP.unifiedPerpUSDTPublic;
+            }
+            if (upperTopic.indexOf('USDC') !== -1) {
+                return exports.WS_KEY_MAP.unifiedPerpUSDCPublic;
+            }
+            throw new Error(`Failed to determine wskey for unified perps topic: "${topic}`);
+        }
+        default: {
+            throw neverGuard(market, `getWsKeyForTopic(): Unhandled market`);
+        }
     }
-    return exports.wsKeyLinearPublic;
 }
-exports.getLinearWsKeyForTopic = getLinearWsKeyForTopic;
-function getSpotWsKeyForTopic(topic) {
-    const privateLinearTopics = [
-        'position',
-        'execution',
-        'order',
-        'stop_order',
-        'outboundAccountInfo',
-        'executionReport',
-        'ticketInfo',
-    ];
-    if (privateLinearTopics.includes(topic)) {
-        return exports.wsKeySpotPrivate;
+exports.getWsKeyForTopic = getWsKeyForTopic;
+function getUsdcWsKeyForTopic(topic, subGroup) {
+    const isPrivateTopic = PRIVATE_TOPICS.includes(topic);
+    if (subGroup === 'option') {
+        return isPrivateTopic
+            ? exports.WS_KEY_MAP.usdcOptionPrivate
+            : exports.WS_KEY_MAP.usdcOptionPublic;
     }
-    return exports.wsKeySpotPublic;
+    return isPrivateTopic
+        ? exports.WS_KEY_MAP.usdcOptionPrivate
+        : exports.WS_KEY_MAP.usdcOptionPublic;
+    // return isPrivateTopic
+    //   ? WS_KEY_MAP.usdcPerpPrivate
+    //   : WS_KEY_MAP.usdcPerpPublic;
 }
-exports.getSpotWsKeyForTopic = getSpotWsKeyForTopic;
+exports.getUsdcWsKeyForTopic = getUsdcWsKeyForTopic;
+exports.WS_ERROR_ENUM = {
+    NOT_AUTHENTICATED_SPOT_V3: '-1004',
+    API_ERROR_GENERIC: '10001',
+    API_SIGN_AUTH_FAILED: '10003',
+    USDC_OPTION_AUTH_FAILED: '3303006',
+};
+function neverGuard(x, msg) {
+    return new Error(`Unhandled value exception "x", ${msg}`);
+}
+exports.neverGuard = neverGuard;
 //# sourceMappingURL=websocket-util.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"websocket-util.js","sourceRoot":"","sources":["../../src/util/websocket-util.ts"],"names":[],"mappings":";;;AAEa,QAAA,YAAY,GAAG,SAAS,CAAC;AACzB,QAAA,kBAAkB,GAAG,eAAe,CAAC;AACrC,QAAA,iBAAiB,GAAG,cAAc,CAAC;AACnC,QAAA,gBAAgB,GAAG,aAAa,CAAC;AACjC,QAAA,eAAe,GAAG,YAAY,CAAC;AAE5C,SAAgB,sBAAsB,CAAC,KAAa;IAClD,MAAM,mBAAmB,GAAG;QAC1B,UAAU;QACV,WAAW;QACX,OAAO;QACP,YAAY;QACZ,QAAQ;KACT,CAAC;IACF,IAAI,mBAAmB,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE;QACvC,OAAO,0BAAkB,CAAC;KAC3B;IAED,OAAO,yBAAiB,CAAC;AAC3B,CAAC;AAbD,wDAaC;AAED,SAAgB,oBAAoB,CAAC,KAAa;IAChD,MAAM,mBAAmB,GAAG;QAC1B,UAAU;QACV,WAAW;QACX,OAAO;QACP,YAAY;QACZ,qBAAqB;QACrB,iBAAiB;QACjB,YAAY;KACb,CAAC;IAEF,IAAI,mBAAmB,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE;QACvC,OAAO,wBAAgB,CAAC;KACzB;IAED,OAAO,uBAAe,CAAC;AACzB,CAAC;AAhBD,oDAgBC"}
+{"version":3,"file":"websocket-util.js","sourceRoot":"","sources":["../../src/util/websocket-util.ts"],"names":[],"mappings":"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"}