airdcpp-apisocket 2.4.4 → 2.5.0-beta.1

package/dist/SocketBase.js

@@ -1,360 +1,352 @@
-"use strict";
-var __assign = (this && this.__assign) || function () {
-    __assign = Object.assign || function(t) {
-        for (var s, i = 1, n = arguments.length; i < n; i++) {
-            s = arguments[i];
-            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
-                t[p] = s[p];
-        }
-        return t;
-    };
-    return __assign.apply(this, arguments);
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-var ApiConstants_1 = __importDefault(require("./ApiConstants"));
-var SocketLogger_1 = __importDefault(require("./SocketLogger"));
-var SocketSubscriptionHandler_1 = __importDefault(require("./SocketSubscriptionHandler"));
-var SocketRequestHandler_1 = __importDefault(require("./SocketRequestHandler"));
-var invariant_1 = __importDefault(require("invariant"));
-var Promise_1 = __importDefault(require("./Promise"));
-// CONSTANTS
-var defaultOptions = {
-    autoReconnect: true,
-    reconnectInterval: 10,
-    userSession: false,
-};
-var ApiSocket = function (userOptions, WebSocketImpl) {
-    var options = __assign(__assign({}, defaultOptions), userOptions);
-    var ws = null;
-    var authToken = null;
-    var socket = null;
-    var reconnectTimer;
-    var forceNoAutoConnect = true;
-    var connectedCallback = null;
-    var sessionResetCallback = null;
-    var disconnectedCallback = null;
-    var logger = (0, SocketLogger_1.default)(options);
-    var subscriptions = (0, SocketSubscriptionHandler_1.default)(function () { return socket; }, logger, options);
-    var requests = (0, SocketRequestHandler_1.default)(function () { return socket; }, logger, options);
-    (0, invariant_1.default)(userOptions.url, '"url" must be defined in settings object');
-    var resetSession = function () {
-        if (authToken) {
-            if (sessionResetCallback) {
-                sessionResetCallback();
-            }
-            authToken = null;
-        }
-    };
-    var onClosed = function (event) {
-        if (event.wasClean) {
-            logger.info('Websocket was closed normally');
-        }
-        else {
-            logger.error("Websocket failed: " + event.reason + " (code: " + event.code + ")");
-        }
-        requests.onSocketDisconnected();
-        subscriptions.onSocketDisconnected();
-        ws = null;
-        if (disconnectedCallback) {
-            disconnectedCallback(event.reason, event.code, event.wasClean);
-        }
-        if (authToken && options.autoReconnect && !forceNoAutoConnect) {
-            setTimeout(function () {
-                if (forceNoAutoConnect) {
-                    return;
-                }
-                socket.reconnect()
-                    .catch(function (error) {
-                    logger.error('Reconnect failed for a closed socket', error.message);
-                });
-            });
-        }
-    };
-    var onMessage = function (event) {
-        var messageObj = JSON.parse(event.data);
-        if (messageObj.callback_id) {
-            // Callback
-            requests.handleMessage(messageObj);
-        }
-        else {
-            // Listener message
-            subscriptions.handleMessage(messageObj);
-        }
-    };
-    var setSocketHandlers = function () {
-        ws.onerror = function (event) {
-            logger.error("Websocket failed: " + event.reason);
-        };
-        ws.onclose = onClosed;
-        ws.onmessage = onMessage;
-    };
-    // Connect handler for creation of new session
-    var handlePasswordLogin = function (username, password) {
-        if (username === void 0) { username = options.username; }
-        if (password === void 0) { password = options.password; }
-        if (!username) {
-            throw '"username" option was not supplied for authentication';
-        }
-        if (!password) {
-            throw '"password" option was not supplied for authentication';
-        }
-        var data = {
-            username: username,
-            password: password,
-            grant_type: 'password',
-        };
-        return requests.postAuthenticate(ApiConstants_1.default.LOGIN_URL, data);
-    };
-    var handleRefreshTokenLogin = function (refreshToken) {
-        if (!refreshToken) {
-            throw '"refreshToken" option was not supplied for authentication';
-        }
-        var data = {
-            refresh_token: refreshToken,
-            grant_type: 'refresh_token',
-        };
-        return requests.postAuthenticate(ApiConstants_1.default.LOGIN_URL, data);
-    };
-    // Connect handler for associating socket with an existing session token
-    var handleAuthorizeToken = function () {
-        var data = {
-            auth_token: authToken,
-        };
-        return requests.postAuthenticate(ApiConstants_1.default.CONNECT_URL, data);
-    };
-    // Called after a successful authentication request
-    var onSocketAuthenticated = function (data) {
-        if (!authToken) {
-            // New session
-            logger.info('Login succeed');
-            authToken = data.auth_token;
-        }
-        else {
-            // Existing session
-            logger.info('Socket associated with an existing session');
-        }
-        if (connectedCallback) {
-            // Catch separately as we don't want an infinite reconnect loop
-            try {
-                connectedCallback(data);
-            }
-            catch (e) {
-                console.error('Error in socket connect handler', e.message);
-            }
-            requests.onSocketConnected();
-        }
-    };
-    // Send API authentication and handle the result
-    // Authentication handler should send the actual authentication request
-    var authenticate = function (resolve, reject, authenticationHandler, reconnectHandler) {
-        authenticationHandler()
-            .then(function (data) {
-            onSocketAuthenticated(data);
-            resolve(data);
-        })
-            .catch(function (error) {
-            if (error.code) {
-                if (authToken && error.code === 400 && options.autoReconnect) {
-                    // The session was lost (most likely the client was restarted)
-                    logger.info('Session lost, re-sending credentials');
-                    resetSession();
-                    authenticate(resolve, reject, handlePasswordLogin, reconnectHandler);
-                    return;
-                }
-                else if (error.code === 401) {
-                    // Invalid credentials, reset the token if we were reconnecting to avoid an infinite loop
-                    resetSession();
-                }
-                // Authentication was rejected
-                socket.disconnect(undefined, 'Authentication failed');
-            }
-            else {
-                // Socket was disconnected during the authentication
-                logger.info('Socket disconnected during authentication, reconnecting');
-                reconnectHandler();
-                return;
-            }
-            reject(error);
-        });
-    };
-    // Authentication handler should send the actual authentication request
-    var connectInternal = function (resolve, reject, authenticationHandler, reconnectOnFailure) {
-        if (reconnectOnFailure === void 0) { reconnectOnFailure = true; }
-        ws = new WebSocketImpl(options.url);
-        var scheduleReconnect = function () {
-            ws = null;
-            if (!reconnectOnFailure) {
-                reject('Cannot connect to the server');
-                return;
-            }
-            reconnectTimer = setTimeout(function () {
-                logger.info('Socket reconnecting');
-                connectInternal(resolve, reject, authenticationHandler, reconnectOnFailure);
-            }, options.reconnectInterval * 1000);
-        };
-        ws.onopen = function () {
-            logger.info('Socket connected');
-            setSocketHandlers();
-            authenticate(resolve, reject, authenticationHandler, scheduleReconnect);
-        };
-        ws.onerror = function (event) {
-            logger.error('Connecting socket failed');
-            scheduleReconnect();
-        };
-    };
-    // Authentication handler should send the actual authentication request
-    var startConnect = function (authenticationHandler, reconnectOnFailure) {
-        forceNoAutoConnect = false;
-        return new Promise_1.default(function (resolve, reject) {
-            logger.info('Starting socket connect');
-            connectInternal(resolve, reject, authenticationHandler, reconnectOnFailure);
-        });
-    };
-    // Is the socket connected and authorized?
-    var isConnected = function () {
-        return !!(ws && ws.readyState === (ws.OPEN || 1) && authToken);
-    };
-    // Is the socket connected but not possibly authorized?
-    var isConnecting = function () {
-        return !!(ws && !isConnected());
-    };
-    // Socket exists
-    var isActive = function () {
-        return !!ws;
-    };
-    var disableReconnect = function () {
-        clearTimeout(reconnectTimer);
-        forceNoAutoConnect = true;
-    };
-    var waitDisconnected = function (timeoutMs) {
-        if (timeoutMs === void 0) { timeoutMs = 2000; }
-        var checkInterval = 50;
-        var maxAttempts = timeoutMs > 0 ? timeoutMs / checkInterval : 0;
-        return new Promise_1.default(function (resolve, reject) {
-            var attempts = 0;
-            var wait = function () {
-                if (isActive()) {
-                    if (attempts >= maxAttempts) {
-                        logger.error("Socket disconnect timed out after " + timeoutMs + " ms");
-                        reject('Socket disconnect timed out');
-                    }
-                    else {
-                        setTimeout(wait, checkInterval);
-                        attempts++;
-                    }
-                }
-                else {
-                    resolve();
-                }
-            };
-            wait();
-        });
-    };
-    // Disconnects the socket but keeps the session token
-    var disconnect = function (autoConnect, reason) {
-        if (autoConnect === void 0) { autoConnect = false; }
-        if (reason === void 0) { reason = 'Manually disconnected by the client'; }
-        if (!ws) {
-            if (!forceNoAutoConnect) {
-                if (!autoConnect) {
-                    logger.verbose('Disconnecting a closed socket with auto reconnect enabled (cancel reconnect)');
-                    disableReconnect();
-                }
-                else {
-                    logger.verbose('Attempting to disconnect a closed socket with auto reconnect enabled (continue connecting)');
-                }
-            }
-            else {
-                logger.warn('Attempting to disconnect a closed socket (ignore)');
-                //throw 'Attempting to disconnect a closed socket';
-            }
-            return;
-        }
-        logger.info('Disconnecting socket');
-        if (!autoConnect) {
-            disableReconnect();
-        }
-        ws.close(1000, reason);
-    };
-    socket = __assign(__assign({ 
-        // Start connect
-        // Username and password are not required if those are available in socket options
-        connect: function (username, password, reconnectOnFailure) {
-            if (reconnectOnFailure === void 0) { reconnectOnFailure = true; }
-            if (isActive()) {
-                throw 'Connect may only be used for a closed socket';
-            }
-            resetSession();
-            return startConnect(function () { return handlePasswordLogin(username, password); }, reconnectOnFailure);
-        }, connectRefreshToken: function (refreshToken, reconnectOnFailure) {
-            if (reconnectOnFailure === void 0) { reconnectOnFailure = true; }
-            if (isActive()) {
-                throw 'Connect may only be used for a closed socket';
-            }
-            resetSession();
-            return startConnect(function () { return handleRefreshTokenLogin(refreshToken); }, reconnectOnFailure);
-        }, 
-        // Connect and attempt to associate the socket with an existing session
-        reconnect: function (token, reconnectOnFailure) {
-            if (token === void 0) { token = undefined; }
-            if (reconnectOnFailure === void 0) { reconnectOnFailure = true; }
-            if (isActive()) {
-                throw 'Reconnect may only be used for a closed socket';
-            }
-            if (token) {
-                authToken = token;
-            }
-            if (!authToken) {
-                throw 'No session token available for reconnecting';
-            }
-            logger.info('Reconnecting socket');
-            return startConnect(handleAuthorizeToken, reconnectOnFailure);
-        }, 
-        // Remove the associated API session and close the socket
-        logout: function () {
-            var resolver = Promise_1.default.pending();
-            socket.delete(ApiConstants_1.default.LOGOUT_URL)
-                .then(function (data) {
-                logger.info('Logout succeed');
-                resetSession();
-                resolver.resolve(data);
-                // Don't fire the disconnected event before resolver actions are handled
-                disconnect(undefined, 'Logged out');
-            })
-                .catch(function (error) {
-                logger.error('Logout failed', error);
-                resolver.reject(error);
-            });
-            return resolver.promise;
-        }, disconnect: disconnect, isConnecting: isConnecting, isConnected: isConnected, isActive: isActive, logger: logger, waitDisconnected: waitDisconnected, 
-        // Function to call each time the socket has been connected (and authorized)
-        set onConnected(handler) {
-            connectedCallback = handler;
-        },
-        // Function to call each time the stored session token was reset (manual logout/rejected reconnect)
-        set onSessionReset(handler) {
-            sessionResetCallback = handler;
-        },
-        // Function to call each time the socket has been disconnected
-        set onDisconnected(handler) {
-            disconnectedCallback = handler;
-        },
-        get onConnected() {
-            return connectedCallback;
-        },
-        get onSessionReset() {
-            return sessionResetCallback;
-        },
-        get onDisconnected() {
-            return disconnectedCallback;
-        },
-        get nativeSocket() {
-            return ws;
-        } }, subscriptions.socket), requests.socket);
-    return socket;
-};
-exports.default = ApiSocket;
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const ApiConstants_js_1 = __importDefault(require("./ApiConstants.js"));
+const SocketLogger_js_1 = __importDefault(require("./SocketLogger.js"));
+const SocketSubscriptionHandler_js_1 = __importDefault(require("./SocketSubscriptionHandler.js"));
+const SocketRequestHandler_js_1 = __importDefault(require("./SocketRequestHandler.js"));
+const invariant_1 = __importDefault(require("invariant"));
+const Promise_js_1 = __importDefault(require("./Promise.js"));
+// CONSTANTS
+const defaultOptions = {
+    autoReconnect: true,
+    reconnectInterval: 10,
+    userSession: false,
+};
+const ApiSocket = (userOptions, WebSocketImpl) => {
+    const options = {
+        ...defaultOptions,
+        ...userOptions
+    };
+    let ws = null;
+    let authToken = null;
+    let socket = null;
+    let reconnectTimer;
+    let forceNoAutoConnect = true;
+    let connectedCallback = null;
+    let sessionResetCallback = null;
+    let disconnectedCallback = null;
+    const logger = (0, SocketLogger_js_1.default)(options);
+    const subscriptions = (0, SocketSubscriptionHandler_js_1.default)(() => socket, logger, options);
+    const requests = (0, SocketRequestHandler_js_1.default)(() => socket, logger, options);
+    (0, invariant_1.default)(userOptions.url, '"url" must be defined in settings object');
+    const resetSession = () => {
+        if (authToken) {
+            if (sessionResetCallback) {
+                sessionResetCallback();
+            }
+            authToken = null;
+        }
+    };
+    const onClosed = (event) => {
+        if (event.wasClean) {
+            logger.info('Websocket was closed normally');
+        }
+        else {
+            logger.error(`Websocket failed: ${event.reason} (code: ${event.code})`);
+        }
+        requests.onSocketDisconnected();
+        subscriptions.onSocketDisconnected();
+        ws = null;
+        if (disconnectedCallback) {
+            disconnectedCallback(event.reason, event.code, event.wasClean);
+        }
+        if (authToken && options.autoReconnect && !forceNoAutoConnect) {
+            setTimeout(() => {
+                if (forceNoAutoConnect) {
+                    return;
+                }
+                socket.reconnect()
+                    .catch((error) => {
+                    logger.error('Reconnect failed for a closed socket', error.message);
+                });
+            });
+        }
+    };
+    const onMessage = (event) => {
+        const messageObj = JSON.parse(event.data);
+        if (messageObj.callback_id) {
+            // Callback
+            requests.handleMessage(messageObj);
+        }
+        else {
+            // Listener message
+            subscriptions.handleMessage(messageObj);
+        }
+    };
+    const setSocketHandlers = () => {
+        ws.onerror = (event) => {
+            logger.error(`Websocket failed: ${event.reason}`);
+        };
+        ws.onclose = onClosed;
+        ws.onmessage = onMessage;
+    };
+    // Connect handler for creation of new session
+    const handlePasswordLogin = (username = options.username, password = options.password) => {
+        if (!username) {
+            throw '"username" option was not supplied for authentication';
+        }
+        if (!password) {
+            throw '"password" option was not supplied for authentication';
+        }
+        const data = {
+            username,
+            password,
+            grant_type: 'password',
+        };
+        return requests.postAuthenticate(ApiConstants_js_1.default.LOGIN_URL, data);
+    };
+    const handleRefreshTokenLogin = (refreshToken) => {
+        if (!refreshToken) {
+            throw '"refreshToken" option was not supplied for authentication';
+        }
+        const data = {
+            refresh_token: refreshToken,
+            grant_type: 'refresh_token',
+        };
+        return requests.postAuthenticate(ApiConstants_js_1.default.LOGIN_URL, data);
+    };
+    // Connect handler for associating socket with an existing session token
+    const handleAuthorizeToken = () => {
+        const data = {
+            auth_token: authToken,
+        };
+        return requests.postAuthenticate(ApiConstants_js_1.default.CONNECT_URL, data);
+    };
+    // Called after a successful authentication request
+    const onSocketAuthenticated = (data) => {
+        if (!authToken) {
+            // New session
+            logger.info('Login succeed');
+            authToken = data.auth_token;
+        }
+        else {
+            // Existing session
+            logger.info('Socket associated with an existing session');
+        }
+        if (connectedCallback) {
+            // Catch separately as we don't want an infinite reconnect loop
+            try {
+                connectedCallback(data);
+            }
+            catch (e) {
+                console.error('Error in socket connect handler', e.message);
+            }
+            requests.onSocketConnected();
+        }
+    };
+    // Send API authentication and handle the result
+    // Authentication handler should send the actual authentication request
+    const authenticate = (resolve, reject, authenticationHandler, reconnectHandler) => {
+        authenticationHandler()
+            .then((data) => {
+            onSocketAuthenticated(data);
+            resolve(data);
+        })
+            .catch((error) => {
+            if (error.code) {
+                if (authToken && error.code === 400 && options.autoReconnect) {
+                    // The session was lost (most likely the client was restarted)
+                    logger.info('Session lost, re-sending credentials');
+                    resetSession();
+                    authenticate(resolve, reject, handlePasswordLogin, reconnectHandler);
+                    return;
+                }
+                else if (error.code === 401) {
+                    // Invalid credentials, reset the token if we were reconnecting to avoid an infinite loop
+                    resetSession();
+                }
+                // Authentication was rejected
+                socket.disconnect(undefined, 'Authentication failed');
+            }
+            else {
+                // Socket was disconnected during the authentication
+                logger.info('Socket disconnected during authentication, reconnecting');
+                reconnectHandler();
+                return;
+            }
+            reject(error);
+        });
+    };
+    // Authentication handler should send the actual authentication request
+    const connectInternal = (resolve, reject, authenticationHandler, reconnectOnFailure = true) => {
+        ws = new WebSocketImpl(options.url);
+        const scheduleReconnect = () => {
+            ws = null;
+            if (!reconnectOnFailure) {
+                reject('Cannot connect to the server');
+                return;
+            }
+            reconnectTimer = setTimeout(() => {
+                logger.info('Socket reconnecting');
+                connectInternal(resolve, reject, authenticationHandler, reconnectOnFailure);
+            }, options.reconnectInterval * 1000);
+        };
+        ws.onopen = () => {
+            logger.info('Socket connected');
+            setSocketHandlers();
+            authenticate(resolve, reject, authenticationHandler, scheduleReconnect);
+        };
+        ws.onerror = (event) => {
+            logger.error('Connecting socket failed');
+            scheduleReconnect();
+        };
+    };
+    // Authentication handler should send the actual authentication request
+    const startConnect = (authenticationHandler, reconnectOnFailure) => {
+        forceNoAutoConnect = false;
+        return new Promise_js_1.default((resolve, reject) => {
+            logger.info('Starting socket connect');
+            connectInternal(resolve, reject, authenticationHandler, reconnectOnFailure);
+        });
+    };
+    // Is the socket connected and authorized?
+    const isConnected = () => {
+        return !!(ws && ws.readyState === (ws.OPEN || 1) && authToken);
+    };
+    // Is the socket connected but not possibly authorized?
+    const isConnecting = () => {
+        return !!(ws && !isConnected());
+    };
+    // Socket exists
+    const isActive = () => {
+        return !!ws;
+    };
+    const disableReconnect = () => {
+        clearTimeout(reconnectTimer);
+        forceNoAutoConnect = true;
+    };
+    const waitDisconnected = (timeoutMs = 2000) => {
+        const checkInterval = 50;
+        const maxAttempts = timeoutMs > 0 ? timeoutMs / checkInterval : 0;
+        return new Promise_js_1.default((resolve, reject) => {
+            let attempts = 0;
+            const wait = () => {
+                if (isActive()) {
+                    if (attempts >= maxAttempts) {
+                        logger.error(`Socket disconnect timed out after ${timeoutMs} ms`);
+                        reject('Socket disconnect timed out');
+                    }
+                    else {
+                        setTimeout(wait, checkInterval);
+                        attempts++;
+                    }
+                }
+                else {
+                    resolve();
+                }
+            };
+            wait();
+        });
+    };
+    // Disconnects the socket but keeps the session token
+    const disconnect = (autoConnect = false, reason = 'Manually disconnected by the client') => {
+        if (!ws) {
+            if (!forceNoAutoConnect) {
+                if (!autoConnect) {
+                    logger.verbose('Disconnecting a closed socket with auto reconnect enabled (cancel reconnect)');
+                    disableReconnect();
+                }
+                else {
+                    logger.verbose('Attempting to disconnect a closed socket with auto reconnect enabled (continue connecting)');
+                }
+            }
+            else {
+                logger.warn('Attempting to disconnect a closed socket (ignore)');
+                //throw 'Attempting to disconnect a closed socket';
+            }
+            return;
+        }
+        logger.info('Disconnecting socket');
+        if (!autoConnect) {
+            disableReconnect();
+        }
+        ws.close(1000, reason);
+    };
+    socket = {
+        // Start connect
+        // Username and password are not required if those are available in socket options
+        connect: (username, password, reconnectOnFailure = true) => {
+            if (isActive()) {
+                throw 'Connect may only be used for a closed socket';
+            }
+            resetSession();
+            return startConnect(() => handlePasswordLogin(username, password), reconnectOnFailure);
+        },
+        connectRefreshToken: (refreshToken, reconnectOnFailure = true) => {
+            if (isActive()) {
+                throw 'Connect may only be used for a closed socket';
+            }
+            resetSession();
+            return startConnect(() => handleRefreshTokenLogin(refreshToken), reconnectOnFailure);
+        },
+        // Connect and attempt to associate the socket with an existing session
+        reconnect: (token = undefined, reconnectOnFailure = true) => {
+            if (isActive()) {
+                throw 'Reconnect may only be used for a closed socket';
+            }
+            if (token) {
+                authToken = token;
+            }
+            if (!authToken) {
+                throw 'No session token available for reconnecting';
+            }
+            logger.info('Reconnecting socket');
+            return startConnect(handleAuthorizeToken, reconnectOnFailure);
+        },
+        // Remove the associated API session and close the socket
+        logout: () => {
+            const resolver = Promise_js_1.default.pending();
+            socket.delete(ApiConstants_js_1.default.LOGOUT_URL)
+                .then((data) => {
+                logger.info('Logout succeed');
+                resetSession();
+                resolver.resolve(data);
+                // Don't fire the disconnected event before resolver actions are handled
+                disconnect(undefined, 'Logged out');
+            })
+                .catch((error) => {
+                logger.error('Logout failed', error);
+                resolver.reject(error);
+            });
+            return resolver.promise;
+        },
+        disconnect,
+        isConnecting,
+        isConnected,
+        isActive,
+        logger,
+        waitDisconnected,
+        // Function to call each time the socket has been connected (and authorized)
+        set onConnected(handler) {
+            connectedCallback = handler;
+        },
+        // Function to call each time the stored session token was reset (manual logout/rejected reconnect)
+        set onSessionReset(handler) {
+            sessionResetCallback = handler;
+        },
+        // Function to call each time the socket has been disconnected
+        set onDisconnected(handler) {
+            disconnectedCallback = handler;
+        },
+        get onConnected() {
+            return connectedCallback;
+        },
+        get onSessionReset() {
+            return sessionResetCallback;
+        },
+        get onDisconnected() {
+            return disconnectedCallback;
+        },
+        get nativeSocket() {
+            return ws;
+        },
+        ...subscriptions.socket,
+        ...requests.socket,
+    };
+    return socket;
+};
+exports.default = ApiSocket;
 //# sourceMappingURL=SocketBase.js.map