@socket-mesh/client 17.1.4 → 18.0.3

package/README.md

@@ -135,7 +135,7 @@ let options = {
   hostname: 'securedomain.com',
   secure: true,
   port: 443,
-  rejectUnauthorized: false // Only necessary during debug if using a self-signed certificate
+  wsOptions: { rejectUnauthorized: false } // Only necessary during debug if using a self-signed certificate
 };
 // Initiate the connection to the server
 let socket = socketClusterClient.create(options);
@@ -155,11 +155,9 @@ let options = {
   hostname: '127.0.0.1',
   autoConnect: true,
   secure: false,
-  rejectUnauthorized: false,
   connectTimeout: 10000, //milliseconds
   ackTimeout: 10000, //milliseconds
   channelPrefix: null,
-  disconnectOnUnload: true,
   autoReconnectOptions: {
     initialDelay: 10000, //milliseconds
     randomness: 10000, //milliseconds
@@ -169,6 +167,7 @@ let options = {
   authEngine: null,
   codecEngine: null,
   subscriptionRetryOptions: {},
+	wsOptions: { rejectUnauthorized: false },
   query: {
     yourparam: 'hello'
   }

package/auth.js

@@ -1,12 +1,3 @@
-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());
-    });
-};
 export class LocalStorageAuthEngine {
     constructor() {
         this._internalStorage = {};
@@ -15,52 +6,44 @@ export class LocalStorageAuthEngine {
     _checkLocalStorageEnabled() {
         let err;
         try {
-            // Some browsers will throw an error here if localStorage is disabled.
-            global.localStorage;
             // Safari, in Private Browsing Mode, looks like it supports localStorage but all calls to setItem
             // throw QuotaExceededError. We're going to detect this and avoid hard to debug edge cases.
-            global.localStorage.setItem('__scLocalStorageTest', "1");
-            global.localStorage.removeItem('__scLocalStorageTest');
+            localStorage.setItem('__scLocalStorageTest', "1");
+            localStorage.removeItem('__scLocalStorageTest');
         }
         catch (e) {
             err = e;
         }
         return !err;
     }
-    saveToken(name, token) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (this.isLocalStorageEnabled && global.localStorage) {
-                global.localStorage.setItem(name, token);
-            }
-            else {
-                this._internalStorage[name] = token;
-            }
-            return token;
-        });
+    async saveToken(name, token) {
+        if (this.isLocalStorageEnabled) {
+            localStorage.setItem(name, token);
+        }
+        else {
+            this._internalStorage[name] = token;
+        }
+        return token;
     }
-    removeToken(name) {
-        return __awaiter(this, void 0, void 0, function* () {
-            let loadPromise = this.loadToken(name);
-            if (this.isLocalStorageEnabled && global.localStorage) {
-                global.localStorage.removeItem(name);
-            }
-            else {
-                delete this._internalStorage[name];
-            }
-            return loadPromise;
-        });
+    async removeToken(name) {
+        let loadPromise = this.loadToken(name);
+        if (this.isLocalStorageEnabled) {
+            localStorage.removeItem(name);
+        }
+        else {
+            delete this._internalStorage[name];
+        }
+        return loadPromise;
     }
-    loadToken(name) {
-        return __awaiter(this, void 0, void 0, function* () {
-            let token;
-            if (this.isLocalStorageEnabled && global.localStorage) {
-                token = global.localStorage.getItem(name);
-            }
-            else {
-                token = this._internalStorage[name] || null;
-            }
-            return token;
-        });
+    async loadToken(name) {
+        let token;
+        if (this.isLocalStorageEnabled) {
+            token = localStorage.getItem(name);
+        }
+        else {
+            token = this._internalStorage[name] || null;
+        }
+        return token;
     }
 }
 //# sourceMappingURL=auth.js.map

package/auth.js.map

@@ -1 +1 @@
-{"version":3,"file":"auth.js","sourceRoot":"","sources":["../src/auth.ts"],"names":[],"mappings":";;;;;;;;;AAmBA,MAAM,OAAO,sBAAsB;IAIlC;QACC,IAAI,CAAC,gBAAgB,GAAG,EAAE,CAAC;QAC3B,IAAI,CAAC,qBAAqB,GAAG,IAAI,CAAC,yBAAyB,EAAE,CAAC;IAC/D,CAAC;IAEO,yBAAyB;QAChC,IAAI,GAAG,CAAC;QAER,IAAI;YACH,sEAAsE;YACtE,MAAM,CAAC,YAAY,CAAC;YAEpB,iGAAiG;YACjG,2FAA2F;YAC3F,MAAM,CAAC,YAAY,CAAC,OAAO,CAAC,sBAAsB,EAAE,GAAG,CAAC,CAAC;YACzD,MAAM,CAAC,YAAY,CAAC,UAAU,CAAC,sBAAsB,CAAC,CAAC;SACvD;QAAC,OAAO,CAAC,EAAE;YACX,GAAG,GAAG,CAAC,CAAC;SACR;QAED,OAAO,CAAC,GAAG,CAAC;IACb,CAAC;IAEK,SAAS,CAAC,IAAY,EAAE,KAAa;;YAC1C,IAAI,IAAI,CAAC,qBAAqB,IAAI,MAAM,CAAC,YAAY,EAAE;gBACtD,MAAM,CAAC,YAAY,CAAC,OAAO,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;aACzC;iBAAM;gBACN,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC;aACpC;YACD,OAAO,KAAK,CAAC;QACd,CAAC;KAAA;IAEK,WAAW,CAAC,IAAY;;YAC7B,IAAI,WAAW,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;YAEvC,IAAI,IAAI,CAAC,qBAAqB,IAAI,MAAM,CAAC,YAAY,EAAE;gBACtD,MAAM,CAAC,YAAY,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;aACrC;iBAAM;gBACN,OAAO,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC;aACnC;YAED,OAAO,WAAW,CAAC;QACpB,CAAC;KAAA;IAEK,SAAS,CAAC,IAAY;;YAC3B,IAAI,KAAK,CAAC;YAEV,IAAI,IAAI,CAAC,qBAAqB,IAAI,MAAM,CAAC,YAAY,EAAE;gBACtD,KAAK,GAAG,MAAM,CAAC,YAAY,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;aAC1C;iBAAM;gBACN,KAAK,GAAG,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC;aAC5C;YAED,OAAO,KAAK,CAAC;QACd,CAAC;KAAA;CACD"}
+{"version":3,"file":"auth.js","sourceRoot":"","sources":["../src/auth.ts"],"names":[],"mappings":"AAmBA,MAAM,OAAO,sBAAsB;IAIlC;QACC,IAAI,CAAC,gBAAgB,GAAG,EAAE,CAAC;QAC3B,IAAI,CAAC,qBAAqB,GAAG,IAAI,CAAC,yBAAyB,EAAE,CAAC;IAC/D,CAAC;IAEO,yBAAyB;QAChC,IAAI,GAAG,CAAC;QAER,IAAI;YACH,iGAAiG;YACjG,2FAA2F;YAC3F,YAAY,CAAC,OAAO,CAAC,sBAAsB,EAAE,GAAG,CAAC,CAAC;YAClD,YAAY,CAAC,UAAU,CAAC,sBAAsB,CAAC,CAAC;SAChD;QAAC,OAAO,CAAC,EAAE;YACX,GAAG,GAAG,CAAC,CAAC;SACR;QAED,OAAO,CAAC,GAAG,CAAC;IACb,CAAC;IAED,KAAK,CAAC,SAAS,CAAC,IAAY,EAAE,KAAa;QAC1C,IAAI,IAAI,CAAC,qBAAqB,EAAE;YAC/B,YAAY,CAAC,OAAO,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;SAClC;aAAM;YACN,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC;SACpC;QACD,OAAO,KAAK,CAAC;IACd,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,IAAY;QAC7B,IAAI,WAAW,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;QAEvC,IAAI,IAAI,CAAC,qBAAqB,EAAE;YAC/B,YAAY,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;SAC9B;aAAM;YACN,OAAO,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC;SACnC;QAED,OAAO,WAAW,CAAC;IACpB,CAAC;IAED,KAAK,CAAC,SAAS,CAAC,IAAY;QAC3B,IAAI,KAAK,CAAC;QAEV,IAAI,IAAI,CAAC,qBAAqB,EAAE;YAC/B,KAAK,GAAG,YAAY,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;SACnC;aAAM;YACN,KAAK,GAAG,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC;SAC5C;QAED,OAAO,KAAK,CAAC;IACd,CAAC;CACD"}

package/client-options.d.ts

@@ -1,4 +1,4 @@
-import { AuthEngine } from "./auth";
+import { AuthEngine } from "./auth.js";
 import { CodecEngine } from "@socket-mesh/formatter";
 import * as ws from "ws";
 export type ProtocolVersions = 1 | 2;
@@ -14,6 +14,7 @@ export interface ClientOptions {
     host?: string;
     hostname?: string;
     secure?: boolean;
+    usabilityMode?: boolean;
     port?: number;
     path?: string;
     protocolScheme?: string;
@@ -25,7 +26,6 @@ export interface ClientOptions {
     autoConnect?: boolean;
     autoReconnect?: boolean;
     autoReconnectOptions?: AutoReconnectOptions;
-    disconnectOnUnload?: boolean;
     timestampRequests?: boolean;
     timestampParam?: string;
     authEngine?: AuthEngine | null;

package/clientsocket.d.ts

@@ -1,13 +1,13 @@
-import { ClientOptions, ProtocolVersions } from "./client-options";
+import { ClientOptions, ProtocolVersions } from "./client-options.js";
 import { DemuxedConsumableStream, StreamDemuxWrapper } from "@socket-mesh/stream-demux";
-import { AuthEngine, AuthStatus } from "./auth";
+import { AuthEngine, AuthStatus } from "./auth.js";
 import { AuthState, AuthToken, SignedAuthToken } from "@socket-mesh/auth";
 import { CodecEngine } from "@socket-mesh/formatter";
-import { Transport } from "./transport";
+import { Transport } from "./transport.js";
 import * as ws from "ws";
 import { Client, ChannelDetails } from "@socket-mesh/channel";
-import { SocketState } from "./socket-state";
-import { AuthStateChanged, AuthTokenRemoved, Authenticated, Closed, Connected, Connecting, Deauthenticated, ErrorOccured, KickedOut, MessageReceived, SubscribeFailed, SubscribeStateChanged, Subscribed, Unsubscribed } from "./events";
+import { SocketState } from "./socket-state.js";
+import { AuthStateChanged, AuthTokenRemoved, Authenticated, Closed, Connected, Connecting, Deauthenticated, ErrorOccured, KickedOut, MessageReceived, SubscribeFailed, SubscribeStateChanged, Subscribed, Unsubscribed } from "./events.js";
 export declare class ClientSocket extends Client<any> {
     auth: AuthEngine;
     authTokenName?: string;
@@ -20,7 +20,6 @@ export declare class ClientSocket extends Client<any> {
     batchOnHandshakeDuration: number;
     clientId?: string;
     id: string | null;
-    disconnectOnUnload: boolean;
     pendingReconnect: boolean;
     pendingReconnectTimeout: number;
     preparingPendingSubscriptions: boolean;
@@ -44,15 +43,15 @@ export declare class ClientSocket extends Client<any> {
     private _procedureDemux;
     private _reconnectTimeoutRef?;
     private readonly _outboundBuffer;
-    constructor(socketOptions: ClientOptions);
+    constructor(socketOptions?: ClientOptions);
+    uri(): string;
     getBackpressure(): number;
-    private _handleBrowserUnload;
     private _setAuthToken;
     private _removeAuthToken;
     getState(): SocketState;
     getBytesReceived(): unknown;
     deauthenticate(): Promise<void>;
-    connect(): void;
+    connect(socketOptions?: ClientOptions): void;
     reconnect(code?: number, reason?: string): void;
     disconnect(code?: number, reason?: string): void;
     private _changeToUnauthenticatedStateAndClearTokens;
@@ -80,7 +79,7 @@ export declare class ClientSocket extends Client<any> {
     transmit(event: string, data?: any, options?: {
         ackTimeout?: number;
     }): Promise<void>;
-    invoke<T>(event: string, data: any, options?: {
+    invoke<T>(event: string, data?: any, options?: {
         ackTimeout?: number;
     }): Promise<T>;
     transmitPublish(channelName: string, data: any): Promise<void>;

package/clientsocket.js

@@ -1,25 +1,15 @@
-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());
-    });
-};
 import { StreamDemux, StreamDemuxWrapper } from "@socket-mesh/stream-demux";
-import { LocalStorageAuthEngine } from "./auth";
+import { LocalStorageAuthEngine } from "./auth.js";
 import { AuthState } from "@socket-mesh/auth";
 import formatter from "@socket-mesh/formatter";
-import { Transport } from "./transport";
+import { Transport } from "./transport.js";
 import { List, Item } from "linked-list";
 import cloneDeep from "clone-deep";
 import { Buffer } from "buffer";
-import { wait } from "./wait";
+import { wait } from "./wait.js";
 import { ChannelState, Client } from "@socket-mesh/channel";
-import { SocketState } from "./socket-state";
+import { SocketState } from "./socket-state.js";
 import { hydrateError, InvalidArgumentsError, InvalidMessageError, SocketProtocolError, TimeoutError, BadConnectionError, socketProtocolIgnoreStatuses, socketProtocolErrorStatuses } from "@socket-mesh/errors";
-const isBrowser = typeof window !== 'undefined';
 class EventNode extends Item {
     constructor() {
         super();
@@ -43,7 +33,6 @@ export class ClientSocket extends Client {
             ackTimeout: 10000,
             timestampRequests: false,
             timestampParam: 't',
-            authTokenName: 'socketcluster.authToken',
             binaryType: 'arraybuffer',
             batchOnHandshake: false,
             batchOnHandshakeDuration: 100,
@@ -52,6 +41,10 @@ export class ClientSocket extends Client {
             wsOptions: {},
             cloneData: false
         }, socketOptions);
+        if (opts.authTokenName == null) {
+            const authHostString = opts.host ? `.${opts.host}` : `.${opts.hostname || 'localhost'}${opts.port ? `:${opts.port}` : ''}`;
+            opts.authTokenName = `socketcluster.authToken${authHostString}`;
+        }
         this.version = opts.version || null;
         this.protocolVersion = opts.protocolVersion;
         this.signedAuthToken = null;
@@ -64,7 +57,6 @@ export class ClientSocket extends Client {
         this.connectTimeout = opts.connectTimeout;
         this.ackTimeout = opts.ackTimeout;
         this.channelPrefix = opts.channelPrefix || null;
-        this.disconnectOnUnload = opts.disconnectOnUnload == null ? true : opts.disconnectOnUnload;
         this.authTokenName = opts.authTokenName;
         // pingTimeout will be connectTimeout at the start, but it will
         // be updated with values provided by the 'connect' event
@@ -133,75 +125,38 @@ export class ClientSocket extends Client {
             this.codec = formatter;
         }
         if (this.options.protocol) {
-            let protocolOptionError = new InvalidArgumentsError('The "protocol" option does not affect socketcluster-client - ' +
-                'If you want to utilize SSL/TLS, use "secure" option instead');
+            let protocolOptionError = new InvalidArgumentsError('The protocol option does not affect socketcluster-client - ' +
+                'If you want to utilize SSL/TLS, use the secure option instead');
             this._onError(protocolOptionError);
         }
         this.options.query = opts.query || {};
-        if (isBrowser && this.disconnectOnUnload && global.addEventListener && global.removeEventListener) {
-            this._handleBrowserUnload();
-        }
         if (this.options.autoConnect) {
             this.connect();
         }
     }
+    uri() {
+        return Transport.computeUri(this.options);
+    }
+    ;
     getBackpressure() {
         return Math.max(this.getListenerBackpressure(), this.receiver.getBackpressure(), this.procedure.getBackpressure(), this.getChannelBackpressure());
     }
-    _handleBrowserUnload() {
-        return __awaiter(this, void 0, void 0, function* () {
-            let unloadHandler = () => {
-                this.disconnect();
-            };
-            let isUnloadHandlerAttached = false;
-            let attachUnloadHandler = () => {
-                if (!isUnloadHandlerAttached) {
-                    isUnloadHandlerAttached = true;
-                    global.addEventListener('beforeunload', unloadHandler, false);
-                }
-            };
-            let detachUnloadHandler = () => {
-                if (isUnloadHandlerAttached) {
-                    isUnloadHandlerAttached = false;
-                    global.removeEventListener('beforeunload', unloadHandler, false);
-                }
-            };
-            (() => __awaiter(this, void 0, void 0, function* () {
-                let consumer = this.listen('connecting').createConsumer();
-                while (true) {
-                    let packet = yield consumer.next();
-                    if (packet.done)
-                        break;
-                    attachUnloadHandler();
-                }
-            }))();
-            (() => __awaiter(this, void 0, void 0, function* () {
-                let consumer = this.listen('close').createConsumer();
-                while (true) {
-                    let packet = yield consumer.next();
-                    if (packet.done)
-                        break;
-                    detachUnloadHandler();
-                }
-            }))();
-        });
-    }
     _setAuthToken(data) {
         this._changeToAuthenticatedState(data.token);
-        (() => __awaiter(this, void 0, void 0, function* () {
+        (async () => {
             try {
-                yield this.auth.saveToken(this.authTokenName, data.token, {});
+                await this.auth.saveToken(this.authTokenName, data.token, {});
             }
             catch (err) {
                 this._onError(err);
             }
-        }))();
+        })();
     }
     _removeAuthToken() {
-        (() => __awaiter(this, void 0, void 0, function* () {
+        (async () => {
             let oldAuthToken;
             try {
-                oldAuthToken = yield this.auth.removeToken(this.authTokenName);
+                oldAuthToken = await this.auth.removeToken(this.authTokenName);
             }
             catch (err) {
                 // Non-fatal error - Do not close the connection
@@ -209,7 +164,7 @@ export class ClientSocket extends Client {
                 return;
             }
             this.emit('removeAuthToken', { oldAuthToken });
-        }))();
+        })();
         this._changeToUnauthenticatedStateAndClearTokens();
     }
     getState() {
@@ -218,27 +173,34 @@ export class ClientSocket extends Client {
     getBytesReceived() {
         return this.transport.getBytesReceived();
     }
-    deauthenticate() {
-        return __awaiter(this, void 0, void 0, function* () {
-            (() => __awaiter(this, void 0, void 0, function* () {
-                let oldAuthToken;
-                try {
-                    oldAuthToken = yield this.auth.removeToken(this.authTokenName);
-                }
-                catch (err) {
-                    this._onError(err);
-                    return;
-                }
-                this.emit('removeAuthToken', { oldAuthToken });
-            }))();
-            if (this.state !== SocketState.CLOSED) {
-                this.transmit('#removeAuthToken');
+    async deauthenticate() {
+        (async () => {
+            let oldAuthToken;
+            try {
+                oldAuthToken = await this.auth.removeToken(this.authTokenName);
             }
-            this._changeToUnauthenticatedStateAndClearTokens();
-            yield wait(0);
-        });
+            catch (err) {
+                this._onError(err);
+                return;
+            }
+            this.emit('removeAuthToken', { oldAuthToken });
+        })();
+        if (this.state !== SocketState.CLOSED) {
+            this.transmit('#removeAuthToken');
+        }
+        this._changeToUnauthenticatedStateAndClearTokens();
+        await wait(0);
     }
-    connect() {
+    connect(socketOptions) {
+        if (socketOptions) {
+            if (this.state !== SocketState.CLOSED) {
+                this.disconnect(1000, 'Socket was disconnected by the client to initiate a new connection');
+            }
+            this.options = {
+                ...this.options,
+                ...socketOptions
+            };
+        }
         if (this.state === SocketState.CLOSED) {
             this.pendingReconnect = false;
             this.pendingReconnectTimeout = null;
@@ -343,7 +305,9 @@ export class ClientSocket extends Client {
         return Buffer.from(decodedString, 'utf8').toString('base64');
     }
     _extractAuthTokenData(signedAuthToken) {
-        let tokenParts = (signedAuthToken || '').split('.');
+        if (typeof signedAuthToken !== 'string')
+            return null;
+        let tokenParts = signedAuthToken.split('.');
         let encodedTokenData = tokenParts[1];
         if (encodedTokenData != null) {
             let tokenData = encodedTokenData;
@@ -364,53 +328,51 @@ export class ClientSocket extends Client {
         return this.signedAuthToken;
     }
     // Perform client-initiated authentication by providing an encrypted token string.
-    authenticate(signedAuthToken) {
-        return __awaiter(this, void 0, void 0, function* () {
-            let authStatus;
-            try {
-                authStatus = yield this.invoke('#authenticate', signedAuthToken);
-            }
-            catch (err) {
-                if (err.name !== 'BadConnectionError' && err.name !== 'TimeoutError') {
-                    // In case of a bad/closed connection or a timeout, we maintain the last
-                    // known auth state since those errors don't mean that the token is invalid.
-                    this._changeToUnauthenticatedStateAndClearTokens();
-                }
-                yield wait(0);
-                throw err;
-            }
-            if ((authStatus === null || authStatus === void 0 ? void 0 : authStatus.isAuthenticated) != null) {
-                // If authStatus is correctly formatted (has an isAuthenticated property),
-                // then we will rehydrate the authError.
-                if (authStatus.authError) {
-                    authStatus.authError = hydrateError(authStatus.authError);
-                }
+    async authenticate(signedAuthToken) {
+        let authStatus;
+        try {
+            authStatus = await this.invoke('#authenticate', signedAuthToken);
+        }
+        catch (err) {
+            if (err.name !== 'BadConnectionError' && err.name !== 'TimeoutError') {
+                // In case of a bad/closed connection or a timeout, we maintain the last
+                // known auth state since those errors don't mean that the token is invalid.
+                this._changeToUnauthenticatedStateAndClearTokens();
             }
-            else {
-                // Some errors like BadConnectionError and TimeoutError will not pass a valid
-                // authStatus object to the current function, so we need to create it ourselves.
-                authStatus = {
-                    isAuthenticated: this.authState,
-                    authError: null
-                };
+            await wait(0);
+            throw err;
+        }
+        if (authStatus?.isAuthenticated != null) {
+            // If authStatus is correctly formatted (has an isAuthenticated property),
+            // then we will rehydrate the authError.
+            if (authStatus.authError) {
+                authStatus.authError = hydrateError(authStatus.authError);
             }
-            if (authStatus.isAuthenticated) {
-                this._changeToAuthenticatedState(signedAuthToken);
+        }
+        else {
+            // Some errors like BadConnectionError and TimeoutError will not pass a valid
+            // authStatus object to the current function, so we need to create it ourselves.
+            authStatus = {
+                isAuthenticated: this.authState,
+                authError: null
+            };
+        }
+        if (authStatus.isAuthenticated) {
+            this._changeToAuthenticatedState(signedAuthToken);
+        }
+        else {
+            this._changeToUnauthenticatedStateAndClearTokens();
+        }
+        (async () => {
+            try {
+                await this.auth.saveToken(this.authTokenName, signedAuthToken, {});
             }
-            else {
-                this._changeToUnauthenticatedStateAndClearTokens();
+            catch (err) {
+                this._onError(err);
             }
-            (() => __awaiter(this, void 0, void 0, function* () {
-                try {
-                    yield this.auth.saveToken(this.authTokenName, signedAuthToken, {});
-                }
-                catch (err) {
-                    this._onError(err);
-                }
-            }))();
-            yield wait(0);
-            return authStatus;
-        });
+        })();
+        await wait(0);
+        return authStatus;
     }
     _tryReconnect(initialDelay) {
         let exponent = this.connectAttempts++;
@@ -468,9 +430,12 @@ export class ClientSocket extends Client {
         }
         // If the user invokes the callback while in autoSubscribeOnConnect mode, it
         // won't break anything.
-        this.emit('connect', Object.assign(Object.assign({}, status), { processPendingSubscriptions: () => {
+        this.emit('connect', {
+            ...status,
+            processPendingSubscriptions: () => {
                 this.processPendingSubscriptions();
-            } }));
+            }
+        });
         if (this.state === SocketState.OPEN) {
             this._flushOutboundBuffer();
         }
@@ -497,7 +462,7 @@ export class ClientSocket extends Client {
             let callback = eventObject.callback;
             if (callback) {
                 delete eventObject.callback;
-                let errorMessage = `Event "${eventObject.event}" was aborted due to a bad connection`;
+                let errorMessage = `Event ${eventObject.event} was aborted due to a bad connection`;
                 let error = new BadConnectionError(errorMessage, failureType);
                 callback.call(eventObject, error, eventObject);
             }
@@ -526,7 +491,7 @@ export class ClientSocket extends Client {
         this.emit('close', { code, reason });
         if (!socketProtocolIgnoreStatuses[code]) {
             let closeMessage;
-            if (reason) {
+            if (typeof reason === 'string') {
                 closeMessage = 'Socket connection closed with status code ' + code + ' and reason: ' + reason;
             }
             else {
@@ -559,7 +524,10 @@ export class ClientSocket extends Client {
         }
     }
     _onInboundTransmit(event, data) {
+        data = data || {};
         if (event === '#publish') {
+            if (typeof data.channel !== 'string')
+                return;
             let undecoratedChannelName = this._undecorateChannelName(data.channel);
             let isSubscribed = this.isSubscribed(undecoratedChannelName, true);
             if (isSubscribed) {
@@ -567,6 +535,8 @@ export class ClientSocket extends Client {
             }
         }
         else if (event === '#kickOut') {
+            if (typeof data.channel !== 'string')
+                return;
             let undecoratedChannelName = this._undecorateChannelName(data.channel);
             let channel = this._channelMap[undecoratedChannelName];
             if (channel) {
@@ -598,7 +568,9 @@ export class ClientSocket extends Client {
                 request.end();
             }
             else {
-                request.error(new InvalidMessageError('No token data provided by #setAuthToken event'));
+                let error = new InvalidMessageError('No token data provided by #setAuthToken event');
+                delete error.stack;
+                request.error(error);
             }
         }
         else if (procedure === '#removeAuthToken') {
@@ -634,7 +606,7 @@ export class ClientSocket extends Client {
         let callback = eventObject.callback;
         if (callback) {
             delete eventObject.callback;
-            let error = new TimeoutError(`Event response for "${eventObject.event}" timed out`);
+            let error = new TimeoutError(`Event response for ${eventObject.event} event timed out`);
             callback.call(eventObject, error, eventObject);
         }
         // Cleanup any pending response callback in the transport layer too.
@@ -716,7 +688,10 @@ export class ClientSocket extends Client {
             this._channelEventDemux.write(`${channelName}/subscribe`, {
                 subscriptionOptions
             });
-            this.emit('subscribeStateChange', Object.assign({ channel: channelName }, stateChangeData));
+            this.emit('subscribeStateChange', {
+                channel: channelName,
+                ...stateChangeData
+            });
             this.emit('subscribe', {
                 channel: channelName,
                 subscriptionOptions
@@ -821,7 +796,10 @@ export class ClientSocket extends Client {
             if (channel.options.data) {
                 subscriptionOptions.data = channel.options.data;
             }
-            channel._pendingSubscriptionCid = this.transport.invokeRaw('#subscribe', Object.assign({ channel: this._decorateChannelName(channel.name) }, subscriptionOptions), options, (err) => {
+            channel._pendingSubscriptionCid = this.transport.invokeRaw('#subscribe', {
+                channel: this._decorateChannelName(channel.name),
+                ...subscriptionOptions
+            }, options, (err) => {
                 if (err) {
                     if (err.name === 'BadConnectionError') {
                         // In case of a failed connection, keep the subscription
@@ -858,7 +836,10 @@ export class ClientSocket extends Client {
             };
             this._channelEventDemux.write(`${channelName}/subscribeStateChange`, stateChangeData);
             this._channelEventDemux.write(`${channelName}/unsubscribe`, {});
-            this.emit('subscribeStateChange', Object.assign({ channel: channelName }, stateChangeData));
+            this.emit('subscribeStateChange', {
+                channel: channelName,
+                ...stateChangeData
+            });
             this.emit('unsubscribe', { channel: channelName });
         }
         if (setAsPending) {