bitget-api 2.3.6 → 3.0.0

package/{lib/websocket-client.js → dist/cjs/websocket-client-legacy-v1.js}

@@ -1,34 +1,39 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.WebsocketClient = void 0;
+exports.WebsocketClientLegacyV1 = void 0;
 /* eslint-disable @typescript-eslint/no-unsafe-declaration-merging */
 const events_1 = require("events");
 const isomorphic_ws_1 = __importDefault(require("isomorphic-ws"));
-const util_1 = require("./util");
-const WsStore_1 = __importDefault(require("./util/WsStore"));
-const WsStore_types_1 = require("./util/WsStore.types");
+const logger_js_1 = require("./util/logger.js");
+const requestUtils_js_1 = require("./util/requestUtils.js");
+const webCryptoAPI_js_1 = require("./util/webCryptoAPI.js");
+const websocket_util_js_1 = require("./util/websocket-util.js");
+const WsStore_js_1 = __importDefault(require("./util/WsStore.js"));
+const WsStore_types_js_1 = require("./util/WsStore.types.js");
 const LOGGER_CATEGORY = { category: 'bitget-ws' };
 /**
  * @deprecated use WebsocketClientV2 instead
  */
-class WebsocketClient extends events_1.EventEmitter {
+class WebsocketClientLegacyV1 extends events_1.EventEmitter {
+    logger;
+    options;
+    wsStore;
     constructor(options, logger) {
         super();
-        this.logger = logger || util_1.DefaultLogger;
-        this.wsStore = new WsStore_1.default(this.logger);
-        this.options = Object.assign({ pongTimeout: 1000, pingInterval: 10000, reconnectTimeout: 500, recvWindow: 0 }, options);
+        this.logger = logger || logger_js_1.DefaultLogger;
+        this.wsStore = new WsStore_js_1.default(this.logger);
+        this.options = {
+            pongTimeout: 1000,
+            pingInterval: 10000,
+            reconnectTimeout: 500,
+            recvWindow: 0,
+            authPrivateConnectionsOnConnect: true,
+            authPrivateRequests: false,
+            ...options,
+        };
     }
     /**
      * Subscribe to topics & track/persist them. They will be automatically resubscribed to if the connection drops/reconnects.
@@ -38,24 +43,22 @@ class WebsocketClient extends events_1.EventEmitter {
     subscribe(wsTopics, isPrivateTopic) {
         const topics = Array.isArray(wsTopics) ? wsTopics : [wsTopics];
         topics.forEach((topic) => {
-            var _a;
-            const wsKey = (0, util_1.getWsKeyForTopic)(topic, isPrivateTopic);
+            const wsKey = (0, websocket_util_js_1.getWsKeyForTopicV1)(topic, isPrivateTopic);
             // Persist this topic to the expected topics list
             this.wsStore.addTopic(wsKey, topic);
-            // TODO: tidy up unsubscribe too, also in other connectors
             // if connected, send subscription request
-            if (this.wsStore.isConnectionState(wsKey, WsStore_types_1.WsConnectionStateEnum.CONNECTED)) {
+            if (this.wsStore.isConnectionState(wsKey, WsStore_types_js_1.WsConnectionStateEnum.CONNECTED)) {
                 // if not authenticated, dont sub to private topics yet.
                 // This'll happen automatically once authenticated
-                const isAuthenticated = (_a = this.wsStore.get(wsKey)) === null || _a === void 0 ? void 0 : _a.isAuthenticated;
+                const isAuthenticated = this.wsStore.get(wsKey)?.isAuthenticated;
                 if (!isAuthenticated) {
-                    return this.requestSubscribeTopics(wsKey, topics.filter((topic) => !(0, util_1.isPrivateChannel)(topic.channel)));
+                    return this.requestSubscribeTopics(wsKey, topics.filter((topic) => !(0, websocket_util_js_1.isPrivateChannel)(topic.channel)));
                 }
                 return this.requestSubscribeTopics(wsKey, topics);
             }
             // start connection process if it hasn't yet begun. Topics are automatically subscribed to on-connect
-            if (!this.wsStore.isConnectionState(wsKey, WsStore_types_1.WsConnectionStateEnum.CONNECTING) &&
-                !this.wsStore.isConnectionState(wsKey, WsStore_types_1.WsConnectionStateEnum.RECONNECTING)) {
+            if (!this.wsStore.isConnectionState(wsKey, WsStore_types_js_1.WsConnectionStateEnum.CONNECTING) &&
+                !this.wsStore.isConnectionState(wsKey, WsStore_types_js_1.WsConnectionStateEnum.RECONNECTING)) {
                 return this.connect(wsKey);
             }
         });
@@ -67,11 +70,10 @@ class WebsocketClient extends events_1.EventEmitter {
      */
     unsubscribe(wsTopics, isPrivateTopic) {
         const topics = Array.isArray(wsTopics) ? wsTopics : [wsTopics];
-        topics.forEach((topic) => this.wsStore.deleteTopic((0, util_1.getWsKeyForTopic)(topic, isPrivateTopic), topic));
-        // TODO: should this really happen on each wsKey?? seems weird
+        topics.forEach((topic) => this.wsStore.deleteTopic((0, websocket_util_js_1.getWsKeyForTopicV1)(topic, isPrivateTopic), topic));
         this.wsStore.getKeys().forEach((wsKey) => {
             // unsubscribe request only necessary if active connection exists
-            if (this.wsStore.isConnectionState(wsKey, WsStore_types_1.WsConnectionStateEnum.CONNECTED)) {
+            if (this.wsStore.isConnectionState(wsKey, WsStore_types_js_1.WsConnectionStateEnum.CONNECTED)) {
                 this.requestUnsubscribeTopics(wsKey, topics);
             }
         });
@@ -81,13 +83,13 @@ class WebsocketClient extends events_1.EventEmitter {
         return this.wsStore;
     }
     close(wsKey, force) {
-        this.logger.info('Closing connection', Object.assign(Object.assign({}, LOGGER_CATEGORY), { wsKey }));
-        this.setWsState(wsKey, WsStore_types_1.WsConnectionStateEnum.CLOSING);
+        this.logger.info('Closing connection', { ...LOGGER_CATEGORY, wsKey });
+        this.setWsState(wsKey, WsStore_types_js_1.WsConnectionStateEnum.CLOSING);
         this.clearTimers(wsKey);
         const ws = this.getWs(wsKey);
-        ws === null || ws === void 0 ? void 0 : ws.close();
+        ws?.close();
         if (force) {
-            (0, util_1.safeTerminateWs)(ws);
+            (0, websocket_util_js_1.safeTerminateWs)(ws);
         }
     }
     closeAll(force) {
@@ -99,88 +101,104 @@ class WebsocketClient extends events_1.EventEmitter {
      * Request connection of all dependent (public & private) websockets, instead of waiting for automatic connection by library
      */
     connectAll() {
-        return [this.connect(util_1.WS_KEY_MAP.spotv1), this.connect(util_1.WS_KEY_MAP.mixv1)];
+        return [this.connect(websocket_util_js_1.WS_KEY_MAP.spotv1), this.connect(websocket_util_js_1.WS_KEY_MAP.mixv1)];
     }
     /**
      * Request connection to a specific websocket, instead of waiting for automatic connection.
      */
-    connect(wsKey) {
-        return __awaiter(this, void 0, void 0, function* () {
-            try {
-                if (this.wsStore.isWsOpen(wsKey)) {
-                    this.logger.error('Refused to connect to ws with existing active connection', Object.assign(Object.assign({}, LOGGER_CATEGORY), { wsKey }));
-                    return this.wsStore.getWs(wsKey);
-                }
-                if (this.wsStore.isConnectionState(wsKey, WsStore_types_1.WsConnectionStateEnum.CONNECTING)) {
-                    this.logger.error('Refused to connect to ws, connection attempt already active', Object.assign(Object.assign({}, LOGGER_CATEGORY), { wsKey }));
-                    return;
-                }
-                if (!this.wsStore.getConnectionState(wsKey) ||
-                    this.wsStore.isConnectionState(wsKey, WsStore_types_1.WsConnectionStateEnum.INITIAL)) {
-                    this.setWsState(wsKey, WsStore_types_1.WsConnectionStateEnum.CONNECTING);
-                }
-                const url = this.getWsUrl(wsKey); // + authParams;
-                const ws = this.connectToWsUrl(url, wsKey);
-                return this.wsStore.setWs(wsKey, ws);
+    async connect(wsKey) {
+        try {
+            if (this.wsStore.isWsOpen(wsKey)) {
+                this.logger.error('Refused to connect to ws with existing active connection', { ...LOGGER_CATEGORY, wsKey });
+                return this.wsStore.getWs(wsKey);
+            }
+            if (this.wsStore.isConnectionState(wsKey, WsStore_types_js_1.WsConnectionStateEnum.CONNECTING)) {
+                this.logger.error('Refused to connect to ws, connection attempt already active', { ...LOGGER_CATEGORY, wsKey });
+                return;
             }
-            catch (err) {
-                this.parseWsError('Connection failed', err, wsKey);
-                this.reconnectWithDelay(wsKey, this.options.reconnectTimeout);
+            if (!this.wsStore.getConnectionState(wsKey) ||
+                this.wsStore.isConnectionState(wsKey, WsStore_types_js_1.WsConnectionStateEnum.INITIAL)) {
+                this.setWsState(wsKey, WsStore_types_js_1.WsConnectionStateEnum.CONNECTING);
             }
-        });
+            const url = this.getWsUrl(wsKey); // + authParams;
+            const ws = this.connectToWsUrl(url, wsKey);
+            return this.wsStore.setWs(wsKey, ws);
+        }
+        catch (err) {
+            this.parseWsError('Connection failed', err, wsKey);
+            this.reconnectWithDelay(wsKey, this.options.reconnectTimeout);
+        }
     }
     parseWsError(context, error, wsKey) {
         if (!error.message) {
             this.logger.error(`${context} due to unexpected error: `, error);
-            this.emit('response', Object.assign(Object.assign({}, error), { wsKey }));
-            this.emit('exception', Object.assign(Object.assign({}, error), { wsKey }));
+            this.emit('response', { ...error, wsKey });
+            this.emit('exception', { ...error, wsKey });
             return;
         }
         switch (error.message) {
             case 'Unexpected server response: 401':
-                this.logger.error(`${context} due to 401 authorization failure.`, Object.assign(Object.assign({}, LOGGER_CATEGORY), { wsKey }));
+                this.logger.error(`${context} due to 401 authorization failure.`, {
+                    ...LOGGER_CATEGORY,
+                    wsKey,
+                });
                 break;
             default:
-                this.logger.error(`${context} due to unexpected response error: "${(error === null || error === void 0 ? void 0 : error.msg) || (error === null || error === void 0 ? void 0 : error.message) || error}"`, Object.assign(Object.assign({}, LOGGER_CATEGORY), { wsKey, error }));
+                this.logger.error(`${context} due to unexpected response error: "${error?.msg || error?.message || error}"`, { ...LOGGER_CATEGORY, wsKey, error });
                 break;
         }
-        this.emit('response', Object.assign(Object.assign({}, error), { wsKey }));
-        this.emit('exception', Object.assign(Object.assign({}, error), { wsKey }));
+        this.emit('response', { ...error, wsKey });
+        this.emit('exception', { ...error, wsKey });
+    }
+    async getWsAuthSignature(apiKey, apiSecret, apiPass, recvWindow = 0) {
+        if (!apiKey || !apiSecret || !apiPass) {
+            throw new Error('Cannot auth - missing api key, secret or passcode in config');
+        }
+        const signatureExpiresAt = ((Date.now() + recvWindow) / 1000).toFixed(0);
+        const signature = await (0, webCryptoAPI_js_1.signMessage)(signatureExpiresAt + 'GET' + '/user/verify', apiSecret, 'base64', 'SHA-256');
+        return {
+            expiresAt: Number(signatureExpiresAt),
+            signature,
+        };
     }
     /** Get a signature, build the auth request and send it */
-    sendAuthRequest(wsKey) {
-        return __awaiter(this, void 0, void 0, function* () {
-            try {
-                const { apiKey, apiSecret, apiPass, recvWindow } = this.options;
-                const { signature, expiresAt } = yield (0, util_1.getWsAuthSignature)(apiKey, apiSecret, apiPass, recvWindow);
-                this.logger.info('Sending auth request...', Object.assign(Object.assign({}, LOGGER_CATEGORY), { wsKey }));
-                const request = {
-                    op: 'login',
-                    args: [
-                        {
-                            apiKey: this.options.apiKey,
-                            passphrase: this.options.apiPass,
-                            timestamp: expiresAt,
-                            sign: signature,
-                        },
-                    ],
-                };
-                // console.log('ws auth req', request);
-                return this.tryWsSend(wsKey, JSON.stringify(request));
-            }
-            catch (e) {
-                this.logger.silly(e, Object.assign(Object.assign({}, LOGGER_CATEGORY), { wsKey }));
-            }
-        });
+    async sendAuthRequest(wsKey) {
+        try {
+            const { apiKey, apiSecret, apiPass, recvWindow } = this.options;
+            const { signature, expiresAt } = await this.getWsAuthSignature(apiKey, apiSecret, apiPass, recvWindow);
+            this.logger.info('Sending auth request...', {
+                ...LOGGER_CATEGORY,
+                wsKey,
+            });
+            const request = {
+                op: 'login',
+                args: [
+                    {
+                        apiKey: this.options.apiKey,
+                        passphrase: this.options.apiPass,
+                        timestamp: expiresAt,
+                        sign: signature,
+                    },
+                ],
+            };
+            // console.log('ws auth req', request);
+            return this.tryWsSend(wsKey, JSON.stringify(request));
+        }
+        catch (e) {
+            this.logger.trace(e, { ...LOGGER_CATEGORY, wsKey });
+        }
     }
     reconnectWithDelay(wsKey, connectionDelayMs) {
         this.clearTimers(wsKey);
         if (this.wsStore.getConnectionState(wsKey) !==
-            WsStore_types_1.WsConnectionStateEnum.CONNECTING) {
-            this.setWsState(wsKey, WsStore_types_1.WsConnectionStateEnum.RECONNECTING);
+            WsStore_types_js_1.WsConnectionStateEnum.CONNECTING) {
+            this.setWsState(wsKey, WsStore_types_js_1.WsConnectionStateEnum.RECONNECTING);
         }
         this.wsStore.get(wsKey, true).activeReconnectTimer = setTimeout(() => {
-            this.logger.info('Reconnecting to websocket', Object.assign(Object.assign({}, LOGGER_CATEGORY), { wsKey }));
+            this.logger.info('Reconnecting to websocket', {
+                ...LOGGER_CATEGORY,
+                wsKey,
+            });
             this.connect(wsKey);
         }, connectionDelayMs);
     }
@@ -189,11 +207,14 @@ class WebsocketClient extends events_1.EventEmitter {
             return;
         }
         this.clearPongTimer(wsKey);
-        this.logger.silly('Sending ping', Object.assign(Object.assign({}, LOGGER_CATEGORY), { wsKey }));
+        this.logger.trace('Sending ping', { ...LOGGER_CATEGORY, wsKey });
         this.tryWsSend(wsKey, 'ping');
         this.wsStore.get(wsKey, true).activePongTimer = setTimeout(() => {
-            this.logger.info('Pong timeout - closing socket to reconnect', Object.assign(Object.assign({}, LOGGER_CATEGORY), { wsKey }));
-            (0, util_1.safeTerminateWs)(this.getWs(wsKey), true);
+            this.logger.info('Pong timeout - closing socket to reconnect', {
+                ...LOGGER_CATEGORY,
+                wsKey,
+            });
+            (0, websocket_util_js_1.safeTerminateWs)(this.getWs(wsKey), true);
             delete this.wsStore.get(wsKey, true).activePongTimer;
         }, this.options.pongTimeout);
     }
@@ -201,14 +222,14 @@ class WebsocketClient extends events_1.EventEmitter {
         this.clearPingTimer(wsKey);
         this.clearPongTimer(wsKey);
         const wsState = this.wsStore.get(wsKey);
-        if (wsState === null || wsState === void 0 ? void 0 : wsState.activeReconnectTimer) {
+        if (wsState?.activeReconnectTimer) {
             clearTimeout(wsState.activeReconnectTimer);
         }
     }
     // Send a ping at intervals
     clearPingTimer(wsKey) {
         const wsState = this.wsStore.get(wsKey);
-        if (wsState === null || wsState === void 0 ? void 0 : wsState.activePingTimer) {
+        if (wsState?.activePingTimer) {
             clearInterval(wsState.activePingTimer);
             wsState.activePingTimer = undefined;
         }
@@ -216,7 +237,7 @@ class WebsocketClient extends events_1.EventEmitter {
     // Expect a pong within a time limit
     clearPongTimer(wsKey) {
         const wsState = this.wsStore.get(wsKey);
-        if (wsState === null || wsState === void 0 ? void 0 : wsState.activePongTimer) {
+        if (wsState?.activePongTimer) {
             clearTimeout(wsState.activePongTimer);
             wsState.activePongTimer = undefined;
         }
@@ -228,15 +249,15 @@ class WebsocketClient extends events_1.EventEmitter {
         if (!topics.length) {
             return;
         }
-        const maxTopicsPerEvent = (0, util_1.getMaxTopicsPerSubscribeEvent)(wsKey);
+        const maxTopicsPerEvent = (0, websocket_util_js_1.getMaxTopicsPerSubscribeEvent)(wsKey);
         if (maxTopicsPerEvent && topics.length > maxTopicsPerEvent) {
-            this.logger.silly(`Subscribing to topics in batches of ${maxTopicsPerEvent}`);
+            this.logger.trace(`Subscribing to topics in batches of ${maxTopicsPerEvent}`);
             for (let i = 0; i < topics.length; i += maxTopicsPerEvent) {
                 const batch = topics.slice(i, i + maxTopicsPerEvent);
-                this.logger.silly(`Subscribing to batch of ${batch.length}`);
+                this.logger.trace(`Subscribing to batch of ${batch.length}`);
                 this.requestSubscribeTopics(wsKey, batch);
             }
-            this.logger.silly(`Finished batch subscribing to ${topics.length} topics`);
+            this.logger.trace(`Finished batch subscribing to ${topics.length} topics`);
             return;
         }
         const wsMessage = JSON.stringify({
@@ -252,15 +273,15 @@ class WebsocketClient extends events_1.EventEmitter {
         if (!topics.length) {
             return;
         }
-        const maxTopicsPerEvent = (0, util_1.getMaxTopicsPerSubscribeEvent)(wsKey);
+        const maxTopicsPerEvent = (0, websocket_util_js_1.getMaxTopicsPerSubscribeEvent)(wsKey);
         if (maxTopicsPerEvent && topics.length > maxTopicsPerEvent) {
-            this.logger.silly(`Unsubscribing to topics in batches of ${maxTopicsPerEvent}`);
+            this.logger.trace(`Unsubscribing to topics in batches of ${maxTopicsPerEvent}`);
             for (let i = 0; i < topics.length; i += maxTopicsPerEvent) {
                 const batch = topics.slice(i, i + maxTopicsPerEvent);
-                this.logger.silly(`Unsubscribing to batch of ${batch.length}`);
+                this.logger.trace(`Unsubscribing to batch of ${batch.length}`);
                 this.requestUnsubscribeTopics(wsKey, batch);
             }
-            this.logger.silly(`Finished batch unsubscribing to ${topics.length} topics`);
+            this.logger.trace(`Finished batch unsubscribing to ${topics.length} topics`);
             return;
         }
         const wsMessage = JSON.stringify({
@@ -271,8 +292,11 @@ class WebsocketClient extends events_1.EventEmitter {
     }
     tryWsSend(wsKey, wsMessage) {
         try {
-            this.logger.silly('Sending upstream ws message: ', Object.assign(Object.assign({}, LOGGER_CATEGORY), { wsMessage,
-                wsKey }));
+            this.logger.trace('Sending upstream ws message: ', {
+                ...LOGGER_CATEGORY,
+                wsMessage,
+                wsKey,
+            });
             if (!wsKey) {
                 throw new Error('Cannot send message due to no known websocket for this wsKey');
             }
@@ -283,50 +307,57 @@ class WebsocketClient extends events_1.EventEmitter {
             ws.send(wsMessage);
         }
         catch (e) {
-            this.logger.error('Failed to send WS message', Object.assign(Object.assign({}, LOGGER_CATEGORY), { wsMessage,
-                wsKey, exception: e }));
+            this.logger.error('Failed to send WS message', {
+                ...LOGGER_CATEGORY,
+                wsMessage,
+                wsKey,
+                exception: e,
+            });
         }
     }
     connectToWsUrl(url, wsKey) {
-        var _a;
-        this.logger.silly(`Opening WS connection to URL: ${url}`, Object.assign(Object.assign({}, LOGGER_CATEGORY), { wsKey }));
-        const agent = (_a = this.options.requestOptions) === null || _a === void 0 ? void 0 : _a.agent;
-        const ws = new isomorphic_ws_1.default(url, undefined, agent ? { agent } : undefined);
+        this.logger.trace(`Opening WS connection to URL: ${url}`, {
+            ...LOGGER_CATEGORY,
+            wsKey,
+        });
+        const { protocols = [], ...wsOptions } = this.options.wsOptions || {};
+        const ws = new isomorphic_ws_1.default(url, protocols, wsOptions);
         ws.onopen = (event) => this.onWsOpen(event, wsKey);
         ws.onmessage = (event) => this.onWsMessage(event, wsKey);
         ws.onerror = (event) => this.parseWsError('websocket error', event, wsKey);
         ws.onclose = (event) => this.onWsClose(event, wsKey);
         return ws;
     }
-    onWsOpen(event, wsKey) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (this.wsStore.isConnectionState(wsKey, WsStore_types_1.WsConnectionStateEnum.CONNECTING)) {
-                this.logger.info('Websocket connected', Object.assign(Object.assign({}, LOGGER_CATEGORY), { wsKey }));
-                this.emit('open', { wsKey, event });
-            }
-            else if (this.wsStore.isConnectionState(wsKey, WsStore_types_1.WsConnectionStateEnum.RECONNECTING)) {
-                this.logger.info('Websocket reconnected', Object.assign(Object.assign({}, LOGGER_CATEGORY), { wsKey }));
-                this.emit('reconnected', { wsKey, event });
-            }
-            this.setWsState(wsKey, WsStore_types_1.WsConnectionStateEnum.CONNECTED);
-            // Some websockets require an auth packet to be sent after opening the connection
-            if (util_1.WS_AUTH_ON_CONNECT_KEYS.includes(wsKey)) {
-                yield this.sendAuthRequest(wsKey);
-            }
-            // Reconnect to topics known before it connected
-            // Private topics will be resubscribed to once reconnected
-            const topics = [...this.wsStore.getTopics(wsKey)];
-            const publicTopics = topics.filter((topic) => !(0, util_1.isPrivateChannel)(topic.channel));
-            this.requestSubscribeTopics(wsKey, publicTopics);
-            this.wsStore.get(wsKey, true).activePingTimer = setInterval(() => this.ping(wsKey), this.options.pingInterval);
-        });
+    async onWsOpen(event, wsKey) {
+        if (this.wsStore.isConnectionState(wsKey, WsStore_types_js_1.WsConnectionStateEnum.CONNECTING)) {
+            this.logger.info('Websocket connected', {
+                ...LOGGER_CATEGORY,
+                wsKey,
+            });
+            this.emit('open', { wsKey, event });
+        }
+        else if (this.wsStore.isConnectionState(wsKey, WsStore_types_js_1.WsConnectionStateEnum.RECONNECTING)) {
+            this.logger.info('Websocket reconnected', { ...LOGGER_CATEGORY, wsKey });
+            this.emit('reconnected', { wsKey, event });
+        }
+        this.setWsState(wsKey, WsStore_types_js_1.WsConnectionStateEnum.CONNECTED);
+        // Some websockets require an auth packet to be sent after opening the connection
+        if (websocket_util_js_1.WS_AUTH_ON_CONNECT_KEYS.includes(wsKey)) {
+            await this.sendAuthRequest(wsKey);
+        }
+        // Reconnect to topics known before it connected
+        // Private topics will be resubscribed to once reconnected
+        const topics = [...this.wsStore.getTopics(wsKey)];
+        const publicTopics = topics.filter((topic) => !(0, websocket_util_js_1.isPrivateChannel)(topic.channel));
+        this.requestSubscribeTopics(wsKey, publicTopics);
+        this.wsStore.get(wsKey, true).activePingTimer = setInterval(() => this.ping(wsKey), this.options.pingInterval);
     }
     /** Handle subscription to private topics _after_ authentication successfully completes asynchronously */
     onWsAuthenticated(wsKey) {
         const wsState = this.wsStore.get(wsKey, true);
         wsState.isAuthenticated = true;
         const topics = [...this.wsStore.getTopics(wsKey)];
-        const privateTopics = topics.filter((topic) => (0, util_1.isPrivateChannel)(topic.channel));
+        const privateTopics = topics.filter((topic) => (0, websocket_util_js_1.isPrivateChannel)(topic.channel));
         if (privateTopics.length) {
             this.subscribe(privateTopics, true);
         }
@@ -335,16 +366,19 @@ class WebsocketClient extends events_1.EventEmitter {
         try {
             // any message can clear the pong timer - wouldn't get a message if the ws wasn't working
             this.clearPongTimer(wsKey);
-            if ((0, util_1.isWsPong)(event)) {
-                this.logger.silly('Received pong', Object.assign(Object.assign({}, LOGGER_CATEGORY), { wsKey }));
+            if ((0, requestUtils_js_1.isWsPong)(event)) {
+                this.logger.trace('Received pong', { ...LOGGER_CATEGORY, wsKey });
                 return;
             }
             const msg = JSON.parse((event && event['data']) || event);
-            const emittableEvent = Object.assign(Object.assign({}, msg), { wsKey });
+            const emittableEvent = { ...msg, wsKey };
             if (typeof msg === 'object') {
                 if (typeof msg['code'] === 'number') {
                     if (msg.event === 'login' && msg.code === 0) {
-                        this.logger.info('Successfully authenticated WS client', Object.assign(Object.assign({}, LOGGER_CATEGORY), { wsKey }));
+                        this.logger.info('Successfully authenticated WS client', {
+                            ...LOGGER_CATEGORY,
+                            wsKey,
+                        });
                         this.emit('response', emittableEvent);
                         this.emit('authenticated', emittableEvent);
                         this.onWsAuthenticated(wsKey);
@@ -353,10 +387,14 @@ class WebsocketClient extends events_1.EventEmitter {
                 }
                 if (msg['event']) {
                     if (msg.event === 'error') {
-                        this.logger.error('WS Error received', Object.assign(Object.assign({}, LOGGER_CATEGORY), { wsKey, message: msg || 'no message', 
+                        this.logger.error('WS Error received', {
+                            ...LOGGER_CATEGORY,
+                            wsKey,
+                            message: msg || 'no message',
                             // messageType: typeof msg,
                             // messageString: JSON.stringify(msg),
-                            event }));
+                            event,
+                        });
                         this.emit('exception', emittableEvent);
                         this.emit('response', emittableEvent);
                         return;
@@ -367,27 +405,37 @@ class WebsocketClient extends events_1.EventEmitter {
                     return this.emit('update', emittableEvent);
                 }
             }
-            this.logger.warning('Unhandled/unrecognised ws event message', Object.assign(Object.assign({}, LOGGER_CATEGORY), { message: msg || 'no message', 
+            this.logger.info('Unhandled/unrecognised ws event message', {
+                ...LOGGER_CATEGORY,
+                message: msg || 'no message',
                 // messageType: typeof msg,
                 // messageString: JSON.stringify(msg),
                 event,
-                wsKey }));
+                wsKey,
+            });
             // fallback emit anyway
             return this.emit('update', emittableEvent);
         }
         catch (e) {
-            this.logger.error('Failed to parse ws event message', Object.assign(Object.assign({}, LOGGER_CATEGORY), { error: e, event,
-                wsKey }));
+            this.logger.error('Failed to parse ws event message', {
+                ...LOGGER_CATEGORY,
+                error: e,
+                event,
+                wsKey,
+            });
         }
     }
     onWsClose(event, wsKey) {
-        this.logger.info('Websocket connection closed', Object.assign(Object.assign({}, LOGGER_CATEGORY), { wsKey }));
-        if (this.wsStore.getConnectionState(wsKey) !== WsStore_types_1.WsConnectionStateEnum.CLOSING) {
+        this.logger.info('Websocket connection closed', {
+            ...LOGGER_CATEGORY,
+            wsKey,
+        });
+        if (this.wsStore.getConnectionState(wsKey) !== WsStore_types_js_1.WsConnectionStateEnum.CLOSING) {
             this.reconnectWithDelay(wsKey, this.options.reconnectTimeout);
             this.emit('reconnect', { wsKey, event });
         }
         else {
-            this.setWsState(wsKey, WsStore_types_1.WsConnectionStateEnum.INITIAL);
+            this.setWsState(wsKey, WsStore_types_js_1.WsConnectionStateEnum.INITIAL);
             this.emit('close', { wsKey, event });
         }
     }
@@ -403,19 +451,26 @@ class WebsocketClient extends events_1.EventEmitter {
         }
         const networkKey = 'livenet';
         switch (wsKey) {
-            case util_1.WS_KEY_MAP.spotv1: {
-                return util_1.WS_BASE_URL_MAP.spotv1.all[networkKey];
+            case websocket_util_js_1.WS_KEY_MAP.spotv1: {
+                return websocket_util_js_1.WS_BASE_URL_MAP.spotv1.all[networkKey];
             }
-            case util_1.WS_KEY_MAP.mixv1: {
-                return util_1.WS_BASE_URL_MAP.mixv1.all[networkKey];
+            case websocket_util_js_1.WS_KEY_MAP.mixv1: {
+                return websocket_util_js_1.WS_BASE_URL_MAP.mixv1.all[networkKey];
             }
-            case util_1.WS_KEY_MAP.v2Private:
-            case util_1.WS_KEY_MAP.v2Public: {
+            case websocket_util_js_1.WS_KEY_MAP.v2Private:
+            case websocket_util_js_1.WS_KEY_MAP.v2Public: {
                 throw new Error('Use the WebsocketClientV2 for V2 websockets');
             }
+            case websocket_util_js_1.WS_KEY_MAP.v3Private:
+            case websocket_util_js_1.WS_KEY_MAP.v3Public: {
+                throw new Error('Use the WebsocketClientV3 for V3 websockets');
+            }
             default: {
-                this.logger.error('getWsUrl(): Unhandled wsKey: ', Object.assign(Object.assign({}, LOGGER_CATEGORY), { wsKey }));
-                throw (0, util_1.neverGuard)(wsKey, 'getWsUrl(): Unhandled wsKey');
+                this.logger.error('getWsUrl(): Unhandled wsKey: ', {
+                    ...LOGGER_CATEGORY,
+                    wsKey,
+                });
+                throw (0, websocket_util_js_1.neverGuard)(wsKey, 'getWsUrl(): Unhandled wsKey');
             }
         }
     }
@@ -450,5 +505,5 @@ class WebsocketClient extends events_1.EventEmitter {
         });
     }
 }
-exports.WebsocketClient = WebsocketClient;
-//# sourceMappingURL=websocket-client.js.map
+exports.WebsocketClientLegacyV1 = WebsocketClientLegacyV1;
+//# sourceMappingURL=websocket-client-legacy-v1.js.map

package/dist/cjs/websocket-client-legacy-v1.js.map

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