binance 2.1.6 → 2.2.0

package/lib/websocket-client.js

@@ -1,4 +1,23 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 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) {
@@ -12,7 +31,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.WebsocketClient = exports.parseRawWsMessage = exports.WsConnectionState = void 0;
+exports.WebsocketClient = exports.parseRawWsMessage = void 0;
 const events_1 = require("events");
 const isomorphic_ws_1 = __importDefault(require("isomorphic-ws"));
 const logger_1 = require("./logger");
@@ -21,7 +40,7 @@ const usdm_client_1 = require("./usdm-client");
 const beautifier_1 = __importDefault(require("./util/beautifier"));
 const requestUtils_1 = require("./util/requestUtils");
 const ws_utils_1 = require("./util/ws-utils");
-const WsStore_1 = __importDefault(require("./util/WsStore"));
+const WsStore_1 = __importStar(require("./util/WsStore"));
 const coinm_client_1 = require("./coinm-client");
 const wsBaseEndpoints = {
     spot: 'wss://stream.binance.com:9443',
@@ -32,22 +51,9 @@ const wsBaseEndpoints = {
     coinm: 'wss://dstream.binance.com',
     coinmTestnet: 'wss://dstream.binancefuture.com',
     options: 'wss://vstream.binance.com',
-    optionsTestnet: 'wss://testnetws.binanceops.com'
+    optionsTestnet: 'wss://testnetws.binanceops.com',
 };
 const loggerCategory = { category: 'binance-ws' };
-const READY_STATE_INITIAL = 0;
-const READY_STATE_CONNECTING = 1;
-const READY_STATE_CONNECTED = 2;
-const READY_STATE_CLOSING = 3;
-const READY_STATE_RECONNECTING = 4;
-var WsConnectionState;
-(function (WsConnectionState) {
-    WsConnectionState[WsConnectionState["READY_STATE_INITIAL"] = 0] = "READY_STATE_INITIAL";
-    WsConnectionState[WsConnectionState["READY_STATE_CONNECTING"] = 1] = "READY_STATE_CONNECTING";
-    WsConnectionState[WsConnectionState["READY_STATE_CONNECTED"] = 2] = "READY_STATE_CONNECTED";
-    WsConnectionState[WsConnectionState["READY_STATE_CLOSING"] = 3] = "READY_STATE_CLOSING";
-    WsConnectionState[WsConnectionState["READY_STATE_RECONNECTING"] = 4] = "READY_STATE_RECONNECTING";
-})(WsConnectionState = exports.WsConnectionState || (exports.WsConnectionState = {}));
 function throwUnhandledSwitch(x, msg) {
     throw new Error(msg);
 }
@@ -90,6 +96,8 @@ class WebsocketClient extends events_1.EventEmitter {
         this.options = Object.assign({ pongTimeout: 7500, pingInterval: 10000, reconnectTimeout: 500 }, options);
         this.listenKeyStateStore = {};
         this.wsUrlKeyMap = {};
+        // add default error handling so this doesn't crash node (if the user didn't set a handler)
+        this.on('error', () => { });
     }
     getRestClientOptions() {
         return Object.assign(Object.assign(Object.assign({}, this.options), this.options.restOptions), { api_key: this.options.api_key, api_secret: this.options.api_secret });
@@ -107,13 +115,9 @@ class WebsocketClient extends events_1.EventEmitter {
         if (typeof ws.on === 'function') {
             ws.on('ping', (event) => this.onWsPing(event, wsRefKey, ws, 'event'));
             ws.on('pong', (event) => this.onWsPong(event, wsRefKey, 'event'));
-            // ws.on('message', event => this.onWsMessage(event, wsRefKey, 'event'));
-            // ws.on('close', event => this.onWsClose(event, wsRefKey, ws, url));
-            // ws.on('error', event => this.onWsError(event, wsRefKey, ws));
-            // ws.on('open', event => this.onWsOpen(event, wsRefKey));
         }
         ws.onopen = (event) => this.onWsOpen(event, wsRefKey, url);
-        ws.onerror = (event) => this.onWsError(event, wsRefKey, ws);
+        ws.onerror = (event) => this.parseWsError('WS Error Event', event, wsRefKey, url);
         ws.onclose = (event) => this.onWsClose(event, wsRefKey, ws, url);
         ws.onmessage = (event) => this.onWsMessage(event, wsRefKey, 'function');
         // Not sure these work in the browser, the traditional event listeners are required for ping/pong frames in node
@@ -161,7 +165,7 @@ class WebsocketClient extends events_1.EventEmitter {
     }
     onWsOpen(ws, wsKey, wsUrl) {
         this.logger.silly(`onWsOpen(): ${wsUrl} : ${wsKey}`);
-        if (this.wsStore.isConnectionState(wsKey, READY_STATE_RECONNECTING)) {
+        if (this.wsStore.isConnectionState(wsKey, WsStore_1.WsConnectionStateEnum.RECONNECTING)) {
             this.logger.info('Websocket reconnected', Object.assign(Object.assign({}, loggerCategory), { wsKey }));
             this.emit('reconnected', { wsKey, ws });
         }
@@ -169,7 +173,7 @@ class WebsocketClient extends events_1.EventEmitter {
             this.logger.info('Websocket connected', Object.assign(Object.assign({}, loggerCategory), { wsKey }));
             this.emit('open', { wsKey, ws });
         }
-        this.setWsState(wsKey, READY_STATE_CONNECTED);
+        this.setWsState(wsKey, WsStore_1.WsConnectionStateEnum.CONNECTED);
         const topics = [...this.wsStore.getTopics(wsKey)];
         if (topics.length) {
             this.requestSubscribeTopics(wsKey, topics);
@@ -179,14 +183,7 @@ class WebsocketClient extends events_1.EventEmitter {
             if (wsState.activePingTimer) {
                 clearInterval(wsState.activePingTimer);
             }
-            wsState.activePingTimer = setInterval(() => this.sendPing(wsKey), this.options.pingInterval);
-        }
-    }
-    onWsError(error, wsKey, ws) {
-        this.logger.error('Websocket error', Object.assign(Object.assign({}, loggerCategory), { wsKey, error }));
-        this.parseWsError('Websocket error', error, wsKey);
-        if (this.wsStore.isConnectionState(wsKey, READY_STATE_CONNECTED)) {
-            this.emit('error', { error, wsKey, ws });
+            wsState.activePingTimer = setInterval(() => this.sendPing(wsKey, wsUrl), this.options.pingInterval);
         }
     }
     onWsClose(event, wsKey, ws, wsUrl) {
@@ -199,12 +196,12 @@ class WebsocketClient extends events_1.EventEmitter {
         if (isUserData) {
             this.wsStore.delete(wsKey);
         }
-        if (wsConnectionState !== READY_STATE_CLOSING) {
+        if (wsConnectionState !== WsStore_1.WsConnectionStateEnum.CLOSING) {
             this.reconnectWithDelay(wsKey, this.options.reconnectTimeout, wsUrl);
             this.emit('reconnecting', { wsKey, event, ws });
         }
         else {
-            this.setWsState(wsKey, READY_STATE_INITIAL);
+            this.setWsState(wsKey, WsStore_1.WsConnectionStateEnum.INITIAL);
             this.emit('close', { wsKey, event, ws });
         }
     }
@@ -240,7 +237,7 @@ class WebsocketClient extends events_1.EventEmitter {
                             'ORDER_TRADE_UPDATE',
                             'ACCOUNT_UPDATE',
                             'ORDER_TRADE_UPDATE',
-                            'ACCOUNT_CONFIG_UPDATE'
+                            'ACCOUNT_CONFIG_UPDATE',
                         ].includes(eventType)) {
                             this.emit('formattedUserDataMessage', beautifiedMessage);
                         }
@@ -252,7 +249,7 @@ class WebsocketClient extends events_1.EventEmitter {
                 this.emit('reply', {
                     type: event.type,
                     data: msg,
-                    wsKey
+                    wsKey,
                 });
                 return;
             }
@@ -264,14 +261,11 @@ class WebsocketClient extends events_1.EventEmitter {
             this.emit('error', { wsKey, error: e, rawEvent: event, source });
         }
     }
-    sendPing(wsKey) {
+    sendPing(wsKey, wsUrl) {
         this.clearPongTimer(wsKey);
         this.logger.silly('Sending ping', Object.assign(Object.assign({}, loggerCategory), { wsKey }));
         this.tryWsPing(wsKey);
-        this.wsStore.get(wsKey, true).activePongTimer = setTimeout(() => {
-            this.logger.info('Pong timeout - closing socket to reconnect', Object.assign(Object.assign({}, loggerCategory), { wsKey }));
-            this.close(wsKey, true);
-        }, this.options.pongTimeout);
+        this.wsStore.get(wsKey, true).activePongTimer = setTimeout(() => this.executeReconnectableClose(wsKey, 'Pong timeout', wsUrl), this.options.pongTimeout);
     }
     onWsPing(event, wsKey, ws, source) {
         this.logger.silly('Received ping, sending pong frame', Object.assign(Object.assign({}, loggerCategory), { wsKey,
@@ -285,14 +279,41 @@ class WebsocketClient extends events_1.EventEmitter {
             source }));
         this.clearPongTimer(wsKey);
     }
+    /**
+     * Closes a connection, if it's even open. If open, this will trigger a reconnect asynchronously.
+     * If closed, trigger a reconnect immediately
+     */
+    executeReconnectableClose(wsKey, reason, wsUrl) {
+        this.logger.info(`${reason} - closing socket to reconnect`, Object.assign(Object.assign({}, loggerCategory), { wsKey,
+            reason }));
+        const wasOpen = this.wsStore.isWsOpen(wsKey);
+        ws_utils_1.terminateWs(this.getWs(wsKey));
+        delete this.wsStore.get(wsKey, true).activePongTimer;
+        this.clearPingTimer(wsKey);
+        this.clearPongTimer(wsKey);
+        if (!wasOpen) {
+            this.logger.info(`${reason} - socket already closed - trigger immediate reconnect`, Object.assign(Object.assign({}, loggerCategory), { wsKey,
+                reason }));
+            this.reconnectWithDelay(wsKey, this.options.reconnectTimeout, wsUrl);
+        }
+    }
     close(wsKey, willReconnect) {
         var _a;
         this.logger.info('Closing connection', Object.assign(Object.assign({}, loggerCategory), { wsKey }));
-        this.setWsState(wsKey, willReconnect ? READY_STATE_RECONNECTING : READY_STATE_CLOSING);
+        this.setWsState(wsKey, willReconnect
+            ? WsStore_1.WsConnectionStateEnum.RECONNECTING
+            : WsStore_1.WsConnectionStateEnum.CLOSING);
         this.clearTimers(wsKey);
         (_a = this.getWs(wsKey)) === null || _a === void 0 ? void 0 : _a.close();
         ws_utils_1.terminateWs(this.getWs(wsKey));
     }
+    closeAll(force) {
+        const keys = this.wsStore.getKeys();
+        this.logger.info(`Closing all ws connections: ${keys}`);
+        keys.forEach((key) => {
+            this.close(key, force);
+        });
+    }
     closeWs(ws, willReconnect) {
         const wsKey = this.wsUrlKeyMap[ws.url];
         if (!wsKey) {
@@ -300,9 +321,11 @@ class WebsocketClient extends events_1.EventEmitter {
         }
         return this.close(wsKey, willReconnect);
     }
-    parseWsError(context, error, wsKey) {
+    parseWsError(context, error, wsKey, wsUrl) {
+        this.logger.error(context, Object.assign(Object.assign({}, loggerCategory), { wsKey, error }));
         if (!error.message) {
             this.logger.error(`${context} due to unexpected error: `, error);
+            this.emit('error', { error, wsKey, wsUrl });
             return;
         }
         switch (error.message) {
@@ -310,18 +333,32 @@ class WebsocketClient extends events_1.EventEmitter {
                 this.logger.error(`${context} due to 401 authorization failure.`, Object.assign(Object.assign({}, loggerCategory), { wsKey }));
                 break;
             default:
-                this.logger.error(`${context} due to unexpected response error: ${error.msg || error.message || error}`, Object.assign(Object.assign({}, loggerCategory), { wsKey, error }));
+                if (this.wsStore.getConnectionState(wsKey) !==
+                    WsStore_1.WsConnectionStateEnum.CLOSING) {
+                    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({}, loggerCategory), { wsKey, error }));
+                    this.executeReconnectableClose(wsKey, 'unhandled onWsError', wsUrl);
+                }
+                else {
+                    this.logger.info(`${wsKey} socket forcefully closed. Will not reconnect.`);
+                }
                 break;
         }
+        this.emit('error', { error, wsKey, wsUrl });
     }
     reconnectWithDelay(wsKey, connectionDelayMs, wsUrl) {
+        var _a;
         this.clearTimers(wsKey);
-        if (this.wsStore.getConnectionState(wsKey) !== READY_STATE_CONNECTING) {
-            this.setWsState(wsKey, READY_STATE_RECONNECTING);
+        if (this.wsStore.getConnectionState(wsKey) !==
+            WsStore_1.WsConnectionStateEnum.CONNECTING) {
+            this.setWsState(wsKey, WsStore_1.WsConnectionStateEnum.RECONNECTING);
         }
         this.logger.info('Reconnecting to websocket with delay...', Object.assign(Object.assign({}, loggerCategory), { wsKey,
             connectionDelayMs }));
-        setTimeout(() => {
+        if ((_a = this.wsStore.get(wsKey)) === null || _a === void 0 ? void 0 : _a.activeReconnectTimer) {
+            this.clearReconnectTimer(wsKey);
+        }
+        this.wsStore.get(wsKey, true).activeReconnectTimer = setTimeout(() => {
+            this.clearReconnectTimer(wsKey);
             if (wsKey.includes('userData')) {
                 const { market, symbol, isTestnet } = requestUtils_1.getContextFromWsKey(wsKey);
                 this.logger.info('Reconnecting to user data stream', Object.assign(Object.assign({}, loggerCategory), { wsKey,
@@ -340,6 +377,7 @@ class WebsocketClient extends events_1.EventEmitter {
     clearTimers(wsKey) {
         this.clearPingTimer(wsKey);
         this.clearPongTimer(wsKey);
+        this.clearReconnectTimer(wsKey);
     }
     // Send a ping at intervals
     clearPingTimer(wsKey) {
@@ -359,112 +397,20 @@ class WebsocketClient extends events_1.EventEmitter {
             wsState.activePongTimer = undefined;
         }
     }
+    // Timer tracking that a reconnect is about to happen / in progress
+    clearReconnectTimer(wsKey) {
+        const wsState = this.wsStore.get(wsKey);
+        if (wsState === null || wsState === void 0 ? void 0 : wsState.activeReconnectTimer) {
+            clearTimeout(wsState.activeReconnectTimer);
+            wsState.activeReconnectTimer = undefined;
+        }
+    }
     getWsBaseUrl(market, wsKey) {
         if (this.options.wsUrl) {
             return this.options.wsUrl;
         }
         return wsBaseEndpoints[market];
     }
-    //   // const networkKey = this.options.livenet ? 'livenet' : 'testnet';
-    //   // if (this.isLinear() || wsKey.startsWith('linear')){
-    //   //   if (wsKey === wsKeyLinearPublic) {
-    //   //     return linearEndpoints.public[networkKey];
-    //   //   }
-    //   //   if (wsKey === wsKeyLinearPrivate) {
-    //   //     return linearEndpoints.private[networkKey];
-    //   //   }
-    //   //   this.logger.error('Unhandled linear wsKey: ', { ...loggerCategory, wsKey });
-    //   //   return linearEndpoints[networkKey];
-    //   // }
-    //   // return inverseEndpoints[networkKey];
-    // }
-    // private getWsKeyForTopic(baseUrlKey: BinanceBaseUrlKey, topic: string) {
-    //   return isSpotBase(baseUrlKey) ? wsKeySpot : getLinearWsKeyForTopic(topic);
-    // }
-    // public subscribeSpotPublic(wsTopics: string[] | string) {
-    //   return this.subscribe('spot', wsTopics);
-    // }
-    // public unsubscribeSpotPublic(wsTopics: string[] | string) {
-    //   return this.unsubscribe('spot', wsTopics);
-    // }
-    // TODO: force these through single stream, instead of general one
-    /**
-     * Add topic/topics to WS subscription list
-     */
-    // public subscribe(baseUrlKey: BinanceBaseUrlKey, wsTopics: string[] | string) {
-    //   const topics = Array.isArray(wsTopics) ? wsTopics : [wsTopics];
-    //   topics.forEach(topic => this.wsStore.addTopic(
-    //     this.getWsKeyForTopic(baseUrlKey, topic),//wsKeySpot
-    //     topic
-    //   ));
-    //   // attempt to send subscription topic per websocket
-    //   this.wsStore.getKeys().forEach((wsKey: WsKey) => {
-    //     // if connected, send subscription request
-    //     if (this.wsStore.isConnectionState(wsKey, READY_STATE_CONNECTED)) {
-    //       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, READY_STATE_CONNECTING) &&
-    //       !this.wsStore.isConnectionState(wsKey, READY_STATE_RECONNECTING)
-    //     ) {
-    //       return this.connectSingleStream(wsKey);
-    //     }
-    //   });
-    // }
-    /**
-     * Remove topic/topics from WS subscription list
-     */
-    // public unsubscribe(baseUrlKey: BinanceBaseUrlKey, wsTopics: string[] | string) {
-    //   const topics = Array.isArray(wsTopics) ? wsTopics : [wsTopics];
-    //   topics.forEach(topic => this.wsStore.deleteTopic(
-    //     this.getWsKeyForTopic(baseUrlKey, topic),
-    //     topic
-    //   ));
-    //   this.wsStore.getKeys().forEach((wsKey: WsKey) => {
-    //     // unsubscribe request only necessary if active connection exists
-    //     if (this.wsStore.isConnectionState(wsKey, READY_STATE_CONNECTED)) {
-    //       this.requestUnsubscribeTopics(wsKey, topics);
-    //     }
-    //   });
-    // }
-    // /**
-    //  * Request connection of all dependent websockets, instead of waiting for automatic connection by library
-    //  */
-    // public connectAll(): Promise<WebSocket | undefined>[] | undefined {
-    //   return [this.connectSingleStream(wsKeySpot)];
-    //   // if (this.isInverse()) {
-    //   //   return [this.connect(wsKeySpot)];
-    //   // }
-    //   // if (this.isLinear()) {
-    //   //   return [this.connect(wsKeyLinearPublic), this.connect(wsKeyLinearPrivate)];
-    //   // }
-    // }
-    // private async connectSingleStream(streamName: string): Promise<WebSocket | undefined> {
-    //   try {
-    //     if (this.wsStore.isWsOpen(streamName)) {
-    //       this.logger.error('Refused to connect to ws with existing active connection', { ...loggerCategory, wsKey: streamName })
-    //       return this.wsStore.getWs(streamName);
-    //     }
-    //     if (this.wsStore.isConnectionState(streamName, READY_STATE_CONNECTING)) {
-    //       this.logger.error('Refused to connect to ws, connection attempt already active', { ...loggerCategory, wsKey: streamName })
-    //       return;
-    //     }
-    //     if (
-    //       !this.wsStore.getConnectionState(streamName) ||
-    //       this.wsStore.isConnectionState(streamName, READY_STATE_INITIAL)
-    //     ) {
-    //       this.setWsState(streamName, READY_STATE_CONNECTING);
-    //     }
-    //     const url = this.getWsUrl(streamName) + '/stream?';
-    //     //+ authParams;
-    //     const ws = this.connectToWsUrl(url, streamName);
-    //     return this.wsStore.setWs(streamName, ws);
-    //   } catch (err) {
-    //     this.parseWsError('Connection failed', err, streamName);
-    //     this.reconnectWithDelay(streamName, this.options.reconnectTimeout!);
-    //   }
-    // }
     getWs(wsKey) {
         return this.wsStore.getWs(wsKey);
     }
@@ -508,7 +454,7 @@ class WebsocketClient extends events_1.EventEmitter {
         const wsMessage = JSON.stringify({
             method: 'SUBSCRIBE',
             params: topics,
-            id: new Date().getTime()
+            id: new Date().getTime(),
         });
         this.tryWsSend(wsKey, wsMessage);
     }
@@ -519,7 +465,7 @@ class WebsocketClient extends events_1.EventEmitter {
         const wsMessage = JSON.stringify({
             op: 'UNSUBSCRIBE',
             params: topics,
-            id: new Date().getTime()
+            id: new Date().getTime(),
         });
         this.tryWsSend(wsKey, wsMessage);
     }
@@ -529,7 +475,7 @@ class WebsocketClient extends events_1.EventEmitter {
     requestListSubscriptions(wsKey, requestId) {
         const wsMessage = JSON.stringify({
             method: 'LIST_SUBSCRIPTIONS',
-            id: requestId
+            id: requestId,
         });
         this.tryWsSend(wsKey, wsMessage);
     }
@@ -540,7 +486,7 @@ class WebsocketClient extends events_1.EventEmitter {
         const wsMessage = JSON.stringify({
             method: 'SET_PROPERTY',
             params: [property, value],
-            id: requestId
+            id: requestId,
         });
         this.tryWsSend(wsKey, wsMessage);
     }
@@ -551,7 +497,7 @@ class WebsocketClient extends events_1.EventEmitter {
         const wsMessage = JSON.stringify({
             method: 'GET_PROPERTY',
             params: [property],
-            id: requestId
+            id: requestId,
         });
         this.tryWsSend(wsKey, wsMessage);
     }
@@ -569,7 +515,7 @@ class WebsocketClient extends events_1.EventEmitter {
             market,
             lastKeepAlive: 0,
             keepAliveTimer: undefined,
-            keepAliveFailures: 0
+            keepAliveFailures: 0,
         };
         return this.listenKeyStateStore[listenKey];
     }
@@ -949,7 +895,9 @@ class WebsocketClient extends events_1.EventEmitter {
             this.logger.silly('Existing spot user data connection in progress for listen key. Avoiding duplicate');
             return this.getWs(wsKey);
         }
-        this.setWsState(wsKey, isReconnecting ? READY_STATE_RECONNECTING : READY_STATE_CONNECTING);
+        this.setWsState(wsKey, isReconnecting
+            ? WsStore_1.WsConnectionStateEnum.RECONNECTING
+            : WsStore_1.WsConnectionStateEnum.CONNECTING);
         const ws = this.connectToWsUrl(this.getWsBaseUrl(market, wsKey) + `/ws/${listenKey}`, wsKey, forceNewConnection);
         // Start & store timer to keep alive listen key (and handle expiration)
         this.setKeepAliveListenKeyTimer(listenKey, market, ws, wsKey);
@@ -983,7 +931,9 @@ class WebsocketClient extends events_1.EventEmitter {
                     this.logger.silly('Existing margin user data connection in progress for listen key. Avoiding duplicate');
                     return this.getWs(wsKey);
                 }
-                this.setWsState(wsKey, isReconnecting ? READY_STATE_RECONNECTING : READY_STATE_CONNECTING);
+                this.setWsState(wsKey, isReconnecting
+                    ? WsStore_1.WsConnectionStateEnum.RECONNECTING
+                    : WsStore_1.WsConnectionStateEnum.CONNECTING);
                 const ws = this.connectToWsUrl(this.getWsBaseUrl(market, wsKey) + `/ws/${listenKey}`, wsKey, forceNewConnection);
                 // Start & store timer to keep alive listen key (and handle expiration)
                 this.setKeepAliveListenKeyTimer(listenKey, market, ws, wsKey);
@@ -1003,7 +953,7 @@ class WebsocketClient extends events_1.EventEmitter {
             try {
                 const lowerCaseSymbol = symbol.toLowerCase();
                 const { listenKey } = yield this.getSpotRestClient().getIsolatedMarginUserDataListenKey({
-                    symbol: lowerCaseSymbol
+                    symbol: lowerCaseSymbol,
                 });
                 const market = 'isolatedMargin';
                 const wsKey = requestUtils_1.getWsKeyWithContext(market, 'userData', lowerCaseSymbol, listenKey);
@@ -1011,7 +961,9 @@ class WebsocketClient extends events_1.EventEmitter {
                     this.logger.silly('Existing isolated margin user data connection in progress for listen key. Avoiding duplicate');
                     return this.getWs(wsKey);
                 }
-                this.setWsState(wsKey, isReconnecting ? READY_STATE_RECONNECTING : READY_STATE_CONNECTING);
+                this.setWsState(wsKey, isReconnecting
+                    ? WsStore_1.WsConnectionStateEnum.RECONNECTING
+                    : WsStore_1.WsConnectionStateEnum.CONNECTING);
                 const ws = this.connectToWsUrl(this.getWsBaseUrl(market, wsKey) + `/ws/${listenKey}`, wsKey, forceNewConnection);
                 // Start & store timer to keep alive listen key (and handle expiration)
                 this.setKeepAliveListenKeyTimer(listenKey, market, ws, wsKey, symbol);
@@ -1021,7 +973,7 @@ class WebsocketClient extends events_1.EventEmitter {
                 this.logger.error(`Failed to connect to isolated margin user data`, Object.assign(Object.assign({}, loggerCategory), { error: e, symbol }));
                 this.emit('error', {
                     wsKey: 'isolatedMargin' + '_' + 'userData',
-                    error: e
+                    error: e,
                 });
             }
         });
@@ -1047,7 +999,9 @@ class WebsocketClient extends events_1.EventEmitter {
                     return this.getWs(wsKey);
                 }
                 // Necessary so client knows this is a reconnect
-                this.setWsState(wsKey, isReconnecting ? READY_STATE_RECONNECTING : READY_STATE_CONNECTING);
+                this.setWsState(wsKey, isReconnecting
+                    ? WsStore_1.WsConnectionStateEnum.RECONNECTING
+                    : WsStore_1.WsConnectionStateEnum.CONNECTING);
                 const ws = this.connectToWsUrl(this.getWsBaseUrl(market, wsKey) + `/ws/${listenKey}`, wsKey, forceNewConnection);
                 // Start & store timer to keep alive listen key (and handle expiration)
                 this.setKeepAliveListenKeyTimer(listenKey, market, ws, wsKey, undefined, isTestnet);
@@ -1074,7 +1028,9 @@ class WebsocketClient extends events_1.EventEmitter {
                     return this.getWs(wsKey);
                 }
                 // Necessary so client knows this is a reconnect
-                this.setWsState(wsKey, isReconnecting ? READY_STATE_RECONNECTING : READY_STATE_CONNECTING);
+                this.setWsState(wsKey, isReconnecting
+                    ? WsStore_1.WsConnectionStateEnum.RECONNECTING
+                    : WsStore_1.WsConnectionStateEnum.CONNECTING);
                 const ws = this.connectToWsUrl(this.getWsBaseUrl(market, wsKey) + `/ws/${listenKey}`, wsKey, forceNewConnection);
                 // Start & store timer to keep alive listen key (and handle expiration)
                 this.setKeepAliveListenKeyTimer(listenKey, market, ws, wsKey, undefined, isTestnet);