bitget-api 1.1.4 → 2.0.0

package/lib/util/BaseWSClient.js

@@ -0,0 +1,395 @@
+"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.BaseWebsocketClient = void 0;
+const events_1 = __importDefault(require("events"));
+const isomorphic_ws_1 = __importDefault(require("isomorphic-ws"));
+const WsStore_1 = __importDefault(require("./WsStore"));
+const WsStore_types_1 = require("./WsStore.types");
+const logger_1 = require("./logger");
+const requestUtils_1 = require("./requestUtils");
+const websocket_util_1 = require("./websocket-util");
+const LOGGER_CATEGORY = { category: 'bitget-ws' };
+class BaseWebsocketClient extends events_1.default {
+    constructor(options, logger) {
+        super();
+        this.logger = logger || logger_1.DefaultLogger;
+        this.wsStore = new WsStore_1.default(this.logger);
+        this.options = Object.assign({ pongTimeout: 1000, pingInterval: 10000, reconnectTimeout: 500, recvWindow: 0 }, options);
+    }
+    /**
+     * Subscribe to topics & track/persist them. They will be automatically resubscribed to if the connection 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];
+        topics.forEach((topic) => {
+            var _a;
+            const wsKey = this.getWsKeyForTopic(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 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;
+                if (!isAuthenticated) {
+                    return this.requestSubscribeTopics(wsKey, topics.filter((topic) => !this.isPrivateChannel(topic)));
+                }
+                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)) {
+                return this.connect(wsKey);
+            }
+        });
+    }
+    /**
+     * Unsubscribe from topics & remove them from memory. They won't be re-subscribed to if the connection 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)
+     */
+    unsubscribe(wsTopics, isPrivateTopic) {
+        const topics = Array.isArray(wsTopics) ? wsTopics : [wsTopics];
+        topics.forEach((topic) => {
+            this.wsStore.deleteTopic(this.getWsKeyForTopic(topic, isPrivateTopic), topic);
+            const wsKey = this.getWsKeyForTopic(topic, isPrivateTopic);
+            // unsubscribe request only necessary if active connection exists
+            if (this.wsStore.isConnectionState(wsKey, WsStore_types_1.WsConnectionStateEnum.CONNECTED)) {
+                this.requestUnsubscribeTopics(wsKey, [topic]);
+            }
+        });
+    }
+    /** Get the WsStore that tracks websockets & topics */
+    getWsStore() {
+        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.clearTimers(wsKey);
+        const ws = this.getWs(wsKey);
+        ws === null || ws === void 0 ? void 0 : ws.close();
+        if (force) {
+            ws === null || ws === void 0 ? void 0 : ws.terminate();
+        }
+    }
+    closeAll(force) {
+        this.wsStore.getKeys().forEach((key) => {
+            this.close(key, force);
+        });
+    }
+    /**
+     * 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);
+            }
+            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 }));
+            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 }));
+                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 }));
+                break;
+        }
+        this.emit('response', Object.assign(Object.assign({}, error), { wsKey }));
+        this.emit('exception', Object.assign(Object.assign({}, error), { wsKey }));
+    }
+    /** 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, websocket_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 }));
+            }
+        });
+    }
+    reconnectWithDelay(wsKey, connectionDelayMs) {
+        this.clearTimers(wsKey);
+        if (this.wsStore.getConnectionState(wsKey) !==
+            WsStore_types_1.WsConnectionStateEnum.CONNECTING) {
+            this.setWsState(wsKey, WsStore_types_1.WsConnectionStateEnum.RECONNECTING);
+        }
+        this.wsStore.get(wsKey, true).activeReconnectTimer = setTimeout(() => {
+            this.logger.info('Reconnecting to websocket', Object.assign(Object.assign({}, LOGGER_CATEGORY), { wsKey }));
+            this.connect(wsKey);
+        }, connectionDelayMs);
+    }
+    ping(wsKey) {
+        if (this.wsStore.get(wsKey, true).activePongTimer) {
+            return;
+        }
+        this.clearPongTimer(wsKey);
+        this.logger.silly('Sending ping', Object.assign(Object.assign({}, LOGGER_CATEGORY), { wsKey }));
+        this.tryWsSend(wsKey, 'ping');
+        this.wsStore.get(wsKey, true).activePongTimer = setTimeout(() => {
+            var _a;
+            this.logger.info('Pong timeout - closing socket to reconnect', Object.assign(Object.assign({}, LOGGER_CATEGORY), { wsKey }));
+            (_a = this.getWs(wsKey)) === null || _a === void 0 ? void 0 : _a.terminate();
+            delete this.wsStore.get(wsKey, true).activePongTimer;
+        }, this.options.pongTimeout);
+    }
+    clearTimers(wsKey) {
+        this.clearPingTimer(wsKey);
+        this.clearPongTimer(wsKey);
+        const wsState = this.wsStore.get(wsKey);
+        if (wsState === null || wsState === void 0 ? void 0 : 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) {
+            clearInterval(wsState.activePingTimer);
+            wsState.activePingTimer = undefined;
+        }
+    }
+    // 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) {
+            clearTimeout(wsState.activePongTimer);
+            wsState.activePongTimer = undefined;
+        }
+    }
+    /**
+     * @private Use the `subscribe(topics)` method to subscribe to topics. Send WS message to subscribe to topics.
+     */
+    requestSubscribeTopics(wsKey, topics) {
+        if (!topics.length) {
+            return;
+        }
+        const maxTopicsPerEvent = this.getMaxTopicsPerSubscribeEvent(wsKey);
+        if (maxTopicsPerEvent && topics.length > maxTopicsPerEvent) {
+            this.logger.silly(`Subscribing to topics in batches of ${maxTopicsPerEvent}`);
+            for (var i = 0; i < topics.length; i += maxTopicsPerEvent) {
+                const batch = topics.slice(i, i + maxTopicsPerEvent);
+                this.logger.silly(`Subscribing to batch of ${batch.length}`);
+                this.requestSubscribeTopics(wsKey, batch);
+            }
+            this.logger.silly(`Finished batch subscribing to ${topics.length} topics`);
+            return;
+        }
+        const wsMessage = JSON.stringify({
+            op: 'subscribe',
+            args: topics,
+        });
+        this.tryWsSend(wsKey, wsMessage);
+    }
+    /**
+     * @private Use the `unsubscribe(topics)` method to unsubscribe from topics. Send WS message to unsubscribe from topics.
+     */
+    requestUnsubscribeTopics(wsKey, topics) {
+        if (!topics.length) {
+            return;
+        }
+        const maxTopicsPerEvent = this.getMaxTopicsPerSubscribeEvent(wsKey);
+        if (maxTopicsPerEvent && topics.length > maxTopicsPerEvent) {
+            this.logger.silly(`Unsubscribing to topics in batches of ${maxTopicsPerEvent}`);
+            for (var i = 0; i < topics.length; i += maxTopicsPerEvent) {
+                const batch = topics.slice(i, i + maxTopicsPerEvent);
+                this.logger.silly(`Unsubscribing to batch of ${batch.length}`);
+                this.requestUnsubscribeTopics(wsKey, batch);
+            }
+            this.logger.silly(`Finished batch unsubscribing to ${topics.length} topics`);
+            return;
+        }
+        const wsMessage = JSON.stringify({
+            op: 'unsubscribe',
+            args: topics,
+        });
+        this.tryWsSend(wsKey, wsMessage);
+    }
+    tryWsSend(wsKey, wsMessage) {
+        try {
+            this.logger.silly(`Sending upstream ws message: `, Object.assign(Object.assign({}, LOGGER_CATEGORY), { wsMessage,
+                wsKey }));
+            if (!wsKey) {
+                throw new Error('Cannot send message due to no known websocket for this wsKey');
+            }
+            const ws = this.getWs(wsKey);
+            if (!ws) {
+                throw new Error(`${wsKey} socket not connected yet, call "connectAll()" first then try again when the "open" event arrives`);
+            }
+            ws.send(wsMessage);
+        }
+        catch (e) {
+            this.logger.error(`Failed to send WS message`, Object.assign(Object.assign({}, 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);
+        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 (this.shouldAuthOnConnect(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) => !this.isPrivateChannel(topic));
+            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) => this.isPrivateChannel(topic));
+        if (privateTopics.length) {
+            this.subscribe(privateTopics, true);
+        }
+    }
+    onWsMessage(event, wsKey) {
+        try {
+            // any message can clear the pong timer - wouldn't get a message if the ws wasn't working
+            this.clearPongTimer(wsKey);
+            if ((0, requestUtils_1.isWsPong)(event)) {
+                this.logger.silly('Received pong', Object.assign(Object.assign({}, LOGGER_CATEGORY), { wsKey }));
+                return;
+            }
+            const msg = JSON.parse((event && event['data']) || event);
+            const emittableEvent = Object.assign(Object.assign({}, 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.emit('response', emittableEvent);
+                        this.emit('authenticated', emittableEvent);
+                        this.onWsAuthenticated(wsKey);
+                        return;
+                    }
+                }
+                if (msg['event']) {
+                    if (msg.event === 'error') {
+                        this.logger.error(`WS Error received`, Object.assign(Object.assign({}, LOGGER_CATEGORY), { wsKey, message: msg || 'no message', 
+                            // messageType: typeof msg,
+                            // messageString: JSON.stringify(msg),
+                            event }));
+                        this.emit('exception', emittableEvent);
+                        this.emit('response', emittableEvent);
+                        return;
+                    }
+                    return this.emit('response', emittableEvent);
+                }
+                if (msg['arg']) {
+                    return this.emit('update', emittableEvent);
+                }
+            }
+            this.logger.warning('Unhandled/unrecognised ws event message', Object.assign(Object.assign({}, LOGGER_CATEGORY), { message: msg || 'no message', 
+                // messageType: typeof msg,
+                // messageString: JSON.stringify(msg),
+                event,
+                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 }));
+        }
+    }
+    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.reconnectWithDelay(wsKey, this.options.reconnectTimeout);
+            this.emit('reconnect', { wsKey, event });
+        }
+        else {
+            this.setWsState(wsKey, WsStore_types_1.WsConnectionStateEnum.INITIAL);
+            this.emit('close', { wsKey, event });
+        }
+    }
+    getWs(wsKey) {
+        return this.wsStore.getWs(wsKey);
+    }
+    setWsState(wsKey, state) {
+        this.wsStore.setConnectionState(wsKey, state);
+    }
+}
+exports.BaseWebsocketClient = BaseWebsocketClient;
+//# sourceMappingURL=BaseWSClient.js.map

package/lib/util/BaseWSClient.js.map

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

package/lib/util/WsStore.d.ts

@@ -1,50 +1,15 @@
 import WebSocket from 'isomorphic-ws';
-import { WsTopic } from '../types';
 import { DefaultLogger } from './logger';
-export declare enum WsConnectionStateEnum {
-    INITIAL = 0,
-    CONNECTING = 1,
-    CONNECTED = 2,
-    CLOSING = 3,
-    RECONNECTING = 4
-}
-/** A "topic" is always a string */
-export declare type BitgetInstType = 'SP' | 'SPBL' | 'MC' | 'UMCBL' | 'DMCBL';
-export interface WsTopicSubscribeEventArgs {
-    instType: BitgetInstType;
-    channel: WsTopic;
-    /** The symbol, e.g. "BTCUSDT" */
-    instId: string;
-}
-declare type WsTopicList = Set<WsTopicSubscribeEventArgs>;
-interface WsStoredState {
-    /** The currently active websocket connection */
-    ws?: WebSocket;
-    /** The current lifecycle state of the connection (enum) */
-    connectionState?: WsConnectionStateEnum;
-    /** A timer that will send an upstream heartbeat (ping) when it expires */
-    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)
-     *
-     * A "Set" and a deep object match are used to ensure we only subscribe to a topic once (tracking a list of unique topics we're expected to be connected to)
-     */
-    subscribedTopics: WsTopicList;
-    isAuthenticated?: boolean;
-}
-export default class WsStore<WsKey extends string> {
+import { WsConnectionStateEnum, WsStoredState } from './WsStore.types';
+export default class WsStore<WsKey extends string, TWSTopicSubscribeEventArgs extends object> {
     private wsState;
     private logger;
     constructor(logger: typeof DefaultLogger);
     /** Get WS stored state for key, optionally create if missing */
-    get(key: WsKey, createIfMissing?: true): WsStoredState;
-    get(key: WsKey, createIfMissing?: false): WsStoredState | undefined;
+    get(key: WsKey, createIfMissing?: true): WsStoredState<TWSTopicSubscribeEventArgs>;
+    get(key: WsKey, createIfMissing?: false): WsStoredState<TWSTopicSubscribeEventArgs> | undefined;
     getKeys(): WsKey[];
-    create(key: WsKey): WsStoredState | undefined;
+    create(key: WsKey): WsStoredState<TWSTopicSubscribeEventArgs> | undefined;
     delete(key: WsKey): void;
     hasExistingActiveConnection(key: WsKey): boolean;
     getWs(key: WsKey): WebSocket | undefined;
@@ -53,10 +18,9 @@ export default class WsStore<WsKey extends string> {
     getConnectionState(key: WsKey): WsConnectionStateEnum;
     setConnectionState(key: WsKey, state: WsConnectionStateEnum): void;
     isConnectionState(key: WsKey, state: WsConnectionStateEnum): boolean;
-    getTopics(key: WsKey): WsTopicList;
-    getTopicsByKey(): Record<string, WsTopicList>;
-    getMatchingTopic(key: WsKey, topic: WsTopicSubscribeEventArgs): WsTopicSubscribeEventArgs | undefined;
-    addTopic(key: WsKey, topic: WsTopicSubscribeEventArgs): WsTopicList;
-    deleteTopic(key: WsKey, topic: WsTopicSubscribeEventArgs): WsTopicList;
+    getTopics(key: WsKey): Set<TWSTopicSubscribeEventArgs>;
+    getTopicsByKey(): Record<string, Set<TWSTopicSubscribeEventArgs>>;
+    getMatchingTopic(key: WsKey, topic: TWSTopicSubscribeEventArgs): TWSTopicSubscribeEventArgs | undefined;
+    addTopic(key: WsKey, topic: TWSTopicSubscribeEventArgs): Set<TWSTopicSubscribeEventArgs>;
+    deleteTopic(key: WsKey, topic: TWSTopicSubscribeEventArgs): Set<TWSTopicSubscribeEventArgs>;
 }
-export {};

package/lib/util/WsStore.js

@@ -1,16 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.WsConnectionStateEnum = void 0;
 const logger_1 = require("./logger");
-var WsConnectionStateEnum;
-(function (WsConnectionStateEnum) {
-    WsConnectionStateEnum[WsConnectionStateEnum["INITIAL"] = 0] = "INITIAL";
-    WsConnectionStateEnum[WsConnectionStateEnum["CONNECTING"] = 1] = "CONNECTING";
-    WsConnectionStateEnum[WsConnectionStateEnum["CONNECTED"] = 2] = "CONNECTED";
-    WsConnectionStateEnum[WsConnectionStateEnum["CLOSING"] = 3] = "CLOSING";
-    WsConnectionStateEnum[WsConnectionStateEnum["RECONNECTING"] = 4] = "RECONNECTING";
-    // ERROR = 5,
-})(WsConnectionStateEnum = exports.WsConnectionStateEnum || (exports.WsConnectionStateEnum = {}));
+const WsStore_types_1 = require("./WsStore.types");
 function isDeepObjectMatch(object1, object2) {
     for (const key in object1) {
         if (object1[key] !== object2[key]) {
@@ -41,7 +32,7 @@ class WsStore {
         }
         this.wsState[key] = {
             subscribedTopics: new Set(),
-            connectionState: WsConnectionStateEnum.INITIAL,
+            connectionState: WsStore_types_1.WsConnectionStateEnum.INITIAL,
         };
         return this.get(key);
     }

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/WsStore.types.d.ts

@@ -0,0 +1,26 @@
+export declare enum WsConnectionStateEnum {
+    INITIAL = 0,
+    CONNECTING = 1,
+    CONNECTED = 2,
+    CLOSING = 3,
+    RECONNECTING = 4
+}
+export interface WsStoredState<TWSTopicSubscribeEvent extends object> {
+    /** The currently active websocket connection */
+    ws?: WebSocket;
+    /** The current lifecycle state of the connection (enum) */
+    connectionState?: WsConnectionStateEnum;
+    /** A timer that will send an upstream heartbeat (ping) when it expires */
+    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 on this connection (and we automatically resubscribe to if the connection drops)
+     *
+     * A "Set" and a deep-object-match are used to ensure we only subscribe to a topic once (tracking a list of unique topics we're expected to be connected to)
+     */
+    subscribedTopics: Set<TWSTopicSubscribeEvent>;
+    isAuthenticated?: boolean;
+}

package/lib/util/WsStore.types.js

@@ -0,0 +1,13 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.WsConnectionStateEnum = void 0;
+var WsConnectionStateEnum;
+(function (WsConnectionStateEnum) {
+    WsConnectionStateEnum[WsConnectionStateEnum["INITIAL"] = 0] = "INITIAL";
+    WsConnectionStateEnum[WsConnectionStateEnum["CONNECTING"] = 1] = "CONNECTING";
+    WsConnectionStateEnum[WsConnectionStateEnum["CONNECTED"] = 2] = "CONNECTED";
+    WsConnectionStateEnum[WsConnectionStateEnum["CLOSING"] = 3] = "CLOSING";
+    WsConnectionStateEnum[WsConnectionStateEnum["RECONNECTING"] = 4] = "RECONNECTING";
+    // ERROR = 5,
+})(WsConnectionStateEnum = exports.WsConnectionStateEnum || (exports.WsConnectionStateEnum = {}));
+//# sourceMappingURL=WsStore.types.js.map

package/lib/util/WsStore.types.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"WsStore.types.js","sourceRoot":"","sources":["../../src/util/WsStore.types.ts"],"names":[],"mappings":";;;AAAA,IAAY,qBAOX;AAPD,WAAY,qBAAqB;IAC/B,uEAAW,CAAA;IACX,6EAAc,CAAA;IACd,2EAAa,CAAA;IACb,uEAAW,CAAA;IACX,iFAAgB,CAAA;IAChB,aAAa;AACf,CAAC,EAPW,qBAAqB,GAArB,6BAAqB,KAArB,6BAAqB,QAOhC"}

package/lib/util/requestUtils.d.ts

@@ -34,4 +34,5 @@ export declare const REST_CLIENT_TYPE_ENUM: {
     readonly spot: "spot";
     readonly futures: "futures";
     readonly broker: "broker";
+    readonly v2: "v2";
 };

package/lib/util/requestUtils.js

@@ -50,5 +50,6 @@ exports.REST_CLIENT_TYPE_ENUM = {
     spot: 'spot',
     futures: 'futures',
     broker: 'broker',
+    v2: 'v2',
 };
 //# sourceMappingURL=requestUtils.js.map

package/lib/util/requestUtils.js.map

@@ -1 +1 @@
-{"version":3,"file":"requestUtils.js","sourceRoot":"","sources":["../../src/util/requestUtils.ts"],"names":[],"mappings":";;;AAoCA,SAAgB,eAAe,CAC7B,MAAS,EACT,iBAAiB,GAAG,KAAK,EACzB,eAAwB,IAAI,EAC5B,aAAqB,EAAE;IAEvB,IAAI,CAAC,MAAM,EAAE;QACX,OAAO,EAAE,CAAC;KACX;IAED,MAAM,WAAW,GAAG,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC;SACpC,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,MAAM,YAAY,GAAG,YAAY,CAAC,CAAC,CAAC,kBAAkB,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;QACtE,OAAO,GAAG,GAAG,IAAI,YAAY,EAAE,CAAC;IAClC,CAAC,CAAC;SACD,IAAI,CAAC,GAAG,CAAC,CAAC;IAEb,iCAAiC;IACjC,OAAO,WAAW,CAAC,CAAC,CAAC,UAAU,GAAG,WAAW,CAAC,CAAC,CAAC,WAAW,CAAC;AAC9D,CAAC;AA1BD,0CA0BC;AAED,SAAgB,cAAc,CAC5B,UAAmB,EACnB,kBAAqC;IAErC,MAAM,gBAAgB,GAAG;QACvB,OAAO,EAAE,wBAAwB;QACjC,QAAQ,EAAE,yBAAyB;QACnC,OAAO,EAAE,mBAAmB;KAC7B,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;AAnBD,wCAmBC;AAED,SAAgB,QAAQ,CAAC,GAAQ;IAC/B,SAAS;IACT,IAAI,CAAA,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,IAAI,MAAK,MAAM,EAAE;QACxB,OAAO,IAAI,CAAC;KACb;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAND,4BAMC;AAED;;GAEG;AACU,QAAA,qBAAqB,GAAG;IACnC,IAAI,EAAE,MAAM;IACZ,OAAO,EAAE,SAAS;IAClB,MAAM,EAAE,QAAQ;CACR,CAAC"}
+{"version":3,"file":"requestUtils.js","sourceRoot":"","sources":["../../src/util/requestUtils.ts"],"names":[],"mappings":";;;AAoCA,SAAgB,eAAe,CAC7B,MAAS,EACT,iBAAiB,GAAG,KAAK,EACzB,eAAwB,IAAI,EAC5B,aAAqB,EAAE;IAEvB,IAAI,CAAC,MAAM,EAAE;QACX,OAAO,EAAE,CAAC;KACX;IAED,MAAM,WAAW,GAAG,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC;SACpC,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,MAAM,YAAY,GAAG,YAAY,CAAC,CAAC,CAAC,kBAAkB,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;QACtE,OAAO,GAAG,GAAG,IAAI,YAAY,EAAE,CAAC;IAClC,CAAC,CAAC;SACD,IAAI,CAAC,GAAG,CAAC,CAAC;IAEb,iCAAiC;IACjC,OAAO,WAAW,CAAC,CAAC,CAAC,UAAU,GAAG,WAAW,CAAC,CAAC,CAAC,WAAW,CAAC;AAC9D,CAAC;AA1BD,0CA0BC;AAED,SAAgB,cAAc,CAC5B,UAAmB,EACnB,kBAAqC;IAErC,MAAM,gBAAgB,GAAG;QACvB,OAAO,EAAE,wBAAwB;QACjC,QAAQ,EAAE,yBAAyB;QACnC,OAAO,EAAE,mBAAmB;KAC7B,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;AAnBD,wCAmBC;AAED,SAAgB,QAAQ,CAAC,GAAQ;IAC/B,SAAS;IACT,IAAI,CAAA,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,IAAI,MAAK,MAAM,EAAE;QACxB,OAAO,IAAI,CAAC;KACb;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAND,4BAMC;AAED;;GAEG;AACU,QAAA,qBAAqB,GAAG;IACnC,IAAI,EAAE,MAAM;IACZ,OAAO,EAAE,SAAS;IAClB,MAAM,EAAE,QAAQ;IAChB,EAAE,EAAE,IAAI;CACA,CAAC"}

package/lib/util/type-guards.d.ts

@@ -1,4 +1,4 @@
-import { WsAccountSnapshotUMCBL, WSPositionSnapshotUMCBL, WsSnapshotAccountEvent, WsSnapshotPositionsEvent } from '../types';
+import { MarginType, WsAccountSnapshotUMCBL, WSPositionSnapshotUMCBL, WsSnapshotAccountEvent, WsSnapshotPositionsEvent } from '../types';
 /** TypeGuard: event is an account update (balance) */
 export declare function isWsAccountSnapshotEvent(event: unknown): event is WsSnapshotAccountEvent;
 /** TypeGuard: event is a positions update */
@@ -7,3 +7,7 @@ export declare function isWsPositionsSnapshotEvent(event: unknown): event is WsS
 export declare function isWsFuturesAccountSnapshotEvent(event: unknown): event is WsAccountSnapshotUMCBL;
 /** TypeGuard: event is a UMCBL positions update */
 export declare function isWsFuturesPositionsSnapshotEvent(event: unknown): event is WSPositionSnapshotUMCBL;
+/**
+ * Simple guard for non-TypeScript users, throw a runtime error if value doesn't match type
+ */
+export declare function assertMarginType(marginType: string): marginType is MarginType;