@monterosa/sdk-enmasse-kit 0.18.9 → 0.18.10

package/dist/index.esm2017.js

@@ -20,102 +20,88 @@ var SSCP_KLASS_LOGIN = 'login';
 var SSCP_KLASS_LOGIN_OK = 'login_ok';
 var SSCP_KLASS_LOGIN_FAIL = 'login_fail';
 var SSCP_KLASS_COUNTER = 'counter';
-
 var getSettingFor = name => {
   if (checkAvailability()) {
     var value = getItem(name);
-
     if (value !== null) {
       return value;
     }
-  } // Guarding the use of the window object in environments where it might not be
-  // available, such as during server - side rendering in a framework like Next.js
-
+  }
 
+  // Guarding the use of the window object in environments where it might not be
+  // available, such as during server - side rendering in a framework like Next.js
   if (typeof window === 'undefined') {
     return null;
   }
-
   var _URL = new URL(window.location.href),
-      searchParams = _URL.searchParams;
-
+    searchParams = _URL.searchParams;
   if (searchParams.has(name)) {
     return searchParams.get(name);
   }
-
   return false;
 };
-
 var getSettingForMethods = () => {
   var value = getSettingFor(ARG_OVERRIDE_METHODS);
-
   if (typeof value === 'string') {
     return value.split(',');
   }
-
   return undefined;
 };
-
 var ENMASSE_OVERRIDE_METHODS = getSettingForMethods();
 var ENMASSE_DEBUG = getSettingFor(ARG_DEBUG);
 var ENMASSE_CONFIG = getSettingFor(ARG_CONFIG);
 
-var version = "0.18.9";
+var version = "0.18.10";
 
 /* eslint no-bitwise: "off" */
 var TYPE_PROTOCOL = 1; // 0000 0000 0001
-
 var TYPE_MANAGER = 2; // 0000 0000 0010
-
 var TYPE_TRANSPORT = 4; // 0000 0000 0100
-
 var TYPE_DRIVER = 8; // 0000 0000 1000
-
 var TYPE_QUEUE = 16; // 0000 0001 0000
-
 var TYPE_TIME = 32; // 0000 0010 0000
-
 var TYPE_MANAGER_EXTRA = 64; // 0000 0100 0000
-
 var TYPE_DRIVER_EXTRA = 128; // 0000 1000 0000
-
 var TYPE_SERVICE = 256; // 0001 0000 0000
 
 var LEVELS = {
   brief: TYPE_PROTOCOL,
   full: TYPE_PROTOCOL | TYPE_MANAGER | TYPE_TRANSPORT | TYPE_DRIVER,
   exhaustive: TYPE_PROTOCOL | TYPE_MANAGER | TYPE_MANAGER_EXTRA | TYPE_TRANSPORT | TYPE_DRIVER | TYPE_DRIVER_EXTRA | TYPE_QUEUE | TYPE_TIME | TYPE_SERVICE
-}; // eslint-disable-next-line
+};
 
+// eslint-disable-next-line
 var log = () => {};
-
 if (ENMASSE_DEBUG) {
   log = function log() {
     if (typeof console === 'undefined' || !console.log) {
       return;
-    } // parse arguments
-    // var args = Array.prototype.slice.call(arguments);
-    // the first argument is the debug type
+    }
 
+    // parse arguments
+    // var args = Array.prototype.slice.call(arguments);
 
+    // the first argument is the debug type
     for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
       args[_key] = arguments[_key];
     }
+    var type = args[0];
 
-    var type = args[0]; // the rest of arguments are arbitrary data
+    // the rest of arguments are arbitrary data
+    var rest = args.slice(1);
 
-    var rest = args.slice(1); // const time = ['getMinutes', 'getSeconds']
+    // const time = ['getMinutes', 'getSeconds']
     //   .map((f) => new Date()[f]())
     //   .map((v) => (v < 10 ? '0' : '') + v)
     //   .join(':');
+
     // add current time
     // rest.unshift(time);
-    // do not log if mask doesn't contain current type
 
+    // do not log if mask doesn't contain current type
     if ((LEVELS[ENMASSE_DEBUG] & type) === 0) {
       return;
     }
-
     console.log(...rest);
   };
 }
@@ -124,120 +110,109 @@ class Queue {
   constructor() {
     var config = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
     // the main storage for messages
-    this.queue = []; // stash of the queue
+    this.queue = [];
 
+    // stash of the queue
     this.stashed = [];
     this.running = false;
-    this.runner = typeof config.runner === 'function' ? config.runner : null; // list of channels we subscribed to
+    this.runner = typeof config.runner === 'function' ? config.runner : null;
 
+    // list of channels we subscribed to
     this.subscriptions = [];
   }
-
   push(message) {
     var force = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
     log(TYPE_QUEUE, 'Queue::push', message, force);
     var klass = message.klass,
-        channel = message.channel;
-
+      channel = message.channel;
     if (!force) {
       switch (klass) {
         case SSCP_KLASS_LOGIN:
         case SSCP_KLASS_AUTHR:
           break;
-
         case SSCP_KLASS_SUB:
           if (this.subscriptions.indexOf(channel) === -1) {
             this.subscriptions.push(channel);
           } else {
             return;
           }
-
           break;
-
         case SSCP_KLASS_UNSUB:
           {
             var index = this.subscriptions.indexOf(channel);
-
             if (index !== -1) {
               this.subscriptions.splice(index, 1);
             } else {
               return;
             }
-
             break;
           }
-
         default:
           if (this.subscriptions.indexOf(channel) === -1) {
             return;
           }
-
           break;
       }
     }
-
     this.queue.push(message);
   }
-
   getSubscriptions() {
     return this.subscriptions;
   }
-
   run() {
-    log(TYPE_QUEUE, 'Queue::run', "running=".concat(this.running, ", head=").concat(this.queue[0])); // abort if whether
+    log(TYPE_QUEUE, 'Queue::run', "running=".concat(this.running, ", head=").concat(this.queue[0]));
+
+    // abort if whether
     // 1. runner function is not set
     // 2. OR queue is already running
     // 3. OR there is no messages in the queue
-
     if (this.runner === null || this.running || !this.queue[0]) {
       return;
     }
-
     this.running = true;
     this.runner(this.queue.shift());
   }
-
   success() {
     log(TYPE_QUEUE, 'Queue::success');
     this.running = false;
     this.run();
   }
-
   failure() {
     log(TYPE_QUEUE, 'Queue::failure');
     this.running = false;
   }
-
   stash() {
     log(TYPE_QUEUE, 'Queue::stash');
-    var item; // eslint-disable-next-line
+    var item;
 
+    // eslint-disable-next-line
     while (undefined !== (item = this.queue.shift())) {
       this.stashed.push(item);
     }
   }
-
   unstash() {
     log(TYPE_QUEUE, 'Queue::unstash');
-    var item; // eslint-disable-next-line
+    var item;
 
+    // eslint-disable-next-line
     while (undefined !== (item = this.stashed.shift())) {
       this.queue.push(item);
     }
   }
-
 }
 
-var local = () => new Date() / 1000; // Server time default to local time
-
+// Returns current local timestamp
+var local = () => new Date() / 1000;
 
-var serverTime = local(); // Time when the server time was received on the client
+// Server time default to local time
+var serverTime = local();
 
+// Time when the server time was received on the client
 var clientTimeAtSync = local();
 var setTime = newTime => {
   log(TYPE_TIME, 'Time::setTime', newTime);
-  serverTime = newTime; // offset = local() - time;
-
+  serverTime = newTime;
+  // offset = local() - time;
   clientTimeAtSync = local();
 };
 var now = () => {
@@ -246,9 +221,6 @@ var now = () => {
 };
 
 class Transport extends Emitter {
-  // generic events
-  // connection state events
-  // states
   constructor() {
     super();
     this.state = this.STATE_DISCONNECTED;
@@ -256,27 +228,19 @@ class Transport extends Emitter {
     this.bind = this.on;
     this.unbind = this.off;
   }
-
 }
-
+// generic events
 _defineProperty(Transport, "ON_READY", 'ready');
-
 _defineProperty(Transport, "ON_MESSAGE", 'message');
-
+// connection state events
 _defineProperty(Transport, "ON_CONNECTED", 'connected');
-
 _defineProperty(Transport, "ON_CONNECT_FAILED", 'connect_failed');
-
 _defineProperty(Transport, "ON_CONNECT_LOST", 'connect_lost');
-
 _defineProperty(Transport, "ON_DISCONNECTED", 'disconnected');
-
+// states
 _defineProperty(Transport, "STATE_CONNECTED", 'connected');
-
 _defineProperty(Transport, "STATE_CONNECTING", 'connecting');
-
 _defineProperty(Transport, "STATE_DISCONNECTED", 'disconnected');
-
 _defineProperty(Transport, "STATE_DISCONNECTING", 'disconnecting');
 
 class Driver extends Emitter {
@@ -287,30 +251,22 @@ class Driver extends Emitter {
     this.bind = this.on;
     this.unbind = this.off;
   }
-
   connect() {}
+  disconnect() {}
 
-  disconnect() {} // Arguments:
+  // Arguments:
   //
   // data = null
   // success = () => {}
   // failure = () => {}
-
-
   send() {}
-
   init() {
     this.trigger(Driver.ON_READY);
   }
-
 }
-
 _defineProperty(Driver, "ON_READY", 'ready');
-
 _defineProperty(Driver, "ON_MESSAGE", 'message');
-
 _defineProperty(Driver, "ON_CONNECTED", 'connected');
-
 _defineProperty(Driver, "ON_DISCONNECTED", 'disconnected');
 
 var globals$1 = getGlobal();
@@ -321,9 +277,9 @@ class XHRDriver extends Driver {
     this.config = config;
     this.requests = {};
     this.requestIdx = 0;
-  } // CORS request wrapper
-
+  }
 
+  // CORS request wrapper
   _request(url) {
     var success = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : () => {};
     var failure = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : () => {};
@@ -333,7 +289,6 @@ class XHRDriver extends Driver {
     var self = this;
     var xhr = new XMLHttpRequest();
     var method = 'POST';
-
     if (typeof XDomainRequest !== 'undefined') {
       xhr = new XDomainRequest();
       xhr.open(method, url);
@@ -343,134 +298,105 @@ class XHRDriver extends Driver {
     } else {
       return null;
     }
-
     xhr._idx = this.requestIdx;
-
     xhr.onload = function onLoad() {
       log(TYPE_DRIVER_EXTRA, "XHRDriver::request::onload idx=".concat(xhr._idx, ", response=").concat(this.responseText));
-
       if (this.responseText.length > 0) {
         success(self._parseResponse(this.responseText));
       } else {
         failure(this.responseText);
       }
     };
-
     xhr.onerror = function onError() {
       log(TYPE_DRIVER_EXTRA, "XHRDriver::request::onerror idx=".concat(xhr._idx, ", response=").concat(this.responseText));
       failure(this.responseText);
-    }; // XHR doesn't trigger onabort event in IE < 10
+    };
+
+    // XHR doesn't trigger onabort event in IE < 10
     // attaching custom abort handler and execute
     // it manually on each abort() call
-
-
     xhr._onabort = () => {
       log(TYPE_DRIVER_EXTRA, "XHRDriver::request::onabort idx=".concat(xhr._idx));
       abort();
     };
-
     return xhr;
   }
-
   _parseResponse(response) {
     var data = {};
     var chunks = response.split('&');
-
     for (var i = 0, l = chunks.length; i < l; i++) {
       var _chunks$i$split = chunks[i].split('='),
-          _chunks$i$split2 = _slicedToArray(_chunks$i$split, 2),
-          key = _chunks$i$split2[0],
-          value = _chunks$i$split2[1];
-
+        _chunks$i$split2 = _slicedToArray(_chunks$i$split, 2),
+        key = _chunks$i$split2[0],
+        value = _chunks$i$split2[1];
       var normalisedValue = decodeURIComponent(value.replace('\0', ''));
-
       if (key in data) {
         if (data[key].constructor !== Array) {
           data[key] = [data[key]];
         }
-
         data[key].push(normalisedValue);
       } else {
         data[key] = normalisedValue;
       }
     }
-
     return data;
   }
-
   _removeRequest(idx) {
     log(TYPE_DRIVER_EXTRA, 'XHRDriver::removeRequest', idx);
-
     if (Object.prototype.hasOwnProperty.call(this.requests, idx)) {
       delete this.requests[idx];
     }
   }
-
   connect() {
     log(TYPE_DRIVER, 'XHRDriver::connect');
-
     if (this.connected) {
       log(TYPE_DRIVER, 'XHRDriver::connect already been connected!');
       return;
     }
-
     this.connected = true;
     this.trigger(XHRDriver.ON_CONNECTED);
   }
-
   disconnect() {
     log(TYPE_DRIVER, 'XHRDriver::disconnect');
-
     if (this.connected) {
       // abort all requests
       for (var idx in this.requests) {
         if (Object.prototype.hasOwnProperty.call(this.requests, idx) && this.requests[idx].abort) {
           this.requests[idx].abort();
-
           if (this.requests[idx]._onabort) {
             this.requests[idx]._onabort();
           }
-
           this._removeRequest(idx);
         }
       }
-
       this.connected = false;
     }
-
     this.trigger(XHRDriver.ON_DISCONNECTED);
   }
-
   send(url, data) {
     var success = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : () => {};
     var failure = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : () => {};
     log(TYPE_DRIVER, 'XHRDriver::send', data);
     var xhr;
     var retry = 1;
-
     var send = () => {
       // eslint-disable-next-line
       xhr = this._request(url, onSuccess, onFailure, onAbort);
-      this.requests[xhr._idx] = xhr; // fixes aborting requests in IE
+      this.requests[xhr._idx] = xhr;
 
+      // fixes aborting requests in IE
       setTimeout(() => {
         xhr.send(data);
       }, 0);
     };
-
     var onSuccess = response => {
       log(TYPE_DRIVER, 'XHRDriver::success', data);
-
       this._removeRequest(xhr._idx);
-
       success(response);
     };
-
     var onFailure = response => {
       log(TYPE_DRIVER, 'XHRDriver::failure, retry: ', retry);
-
       this._removeRequest(xhr._idx);
-
       if (retry <= this.config.request_retries) {
         setTimeout(() => {
           send();
@@ -480,22 +406,16 @@ class XHRDriver extends Driver {
         failure(response);
       }
     };
-
     var onAbort = () => {
       log(TYPE_DRIVER, 'XHRDriver::abort', data);
-
       this._removeRequest(xhr._idx);
-
       failure();
     };
-
     send();
   }
-
   static hasSupport() {
     return 'XDomainRequest' in globals$1 || 'withCredentials' in new XMLHttpRequest();
   }
-
 }
 
 /* eslint class-methods-use-this: "off" */
@@ -506,53 +426,41 @@ class WebSocketDriver extends Driver {
     this.websocket = null;
     this.closeTimeout = null;
   }
-
   _onMessage(e) {
     log(TYPE_DRIVER, 'WebSocketDriver::onMessage', e.data);
     this.trigger(WebSocketDriver.ON_MESSAGE, e.data);
   }
-
   _onOpen() {
     log(TYPE_DRIVER, 'WebSocketDriver::onOpen');
     this.connected = true;
     this.trigger(WebSocketDriver.ON_CONNECTED);
   }
-
   _onClose() {
     log(TYPE_DRIVER, 'WebSocketDriver::onClose');
-
     this._disconnect();
   }
-
   _onError() {
     log(TYPE_DRIVER, 'WebSocketDriver::onError');
   }
-
   _disconnect() {
     log(TYPE_DRIVER, 'WebSocketDriver::disconnect');
-    this.connected = false; // reset handlers if websocket was created
+    this.connected = false;
 
+    // reset handlers if websocket was created
     if (this.websocket !== null) {
       this.websocket.onmessage = () => {};
-
       this.websocket.onopen = () => {};
-
       this.websocket.onclose = () => {};
-
       this.websocket.onerror = () => {};
-
       this.websocket = null;
     }
-
     clearTimeout(this.closeTimeout);
     this.trigger(WebSocketDriver.ON_DISCONNECTED);
   }
-
   connect(host, port, secure) {
     if (this.connected) {
       return;
     }
-
     log(TYPE_DRIVER, 'WebSocketDriver::connect', host, port);
     var url = "".concat(secure ? 'wss' : 'ws', "://").concat(host, ":").concat(port, "/ws");
     this.websocket = new WebSocket(url);
@@ -561,33 +469,29 @@ class WebSocketDriver extends Driver {
     this.websocket.onclose = this._onClose.bind(this);
     this.websocket.onerror = this._onError.bind(this);
   }
-
   disconnect() {
     log(TYPE_DRIVER, 'WebSocketDriver::disconnect');
-
     if (this.connected) {
       // ON_DISCONNECTED will be triggered at onClose event
-      this.websocket.close(); // websocket does not fire onclose if network connection is lost
-      // set timeout to force fire ON_DISCONNECTED event
+      this.websocket.close();
 
+      // websocket does not fire onclose if network connection is lost
+      // set timeout to force fire ON_DISCONNECTED event
       this.closeTimeout = setTimeout(this._disconnect.bind(this), 750);
     } else {
       // disconnect instantly if websocket wasn't connected or still connecting
       this._disconnect();
     }
   }
-
   send(data) {
     var success = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : () => {};
     log(TYPE_DRIVER, 'WebSocketDriver::send', data);
     this.websocket.send(data);
     success();
   }
-
   static hasSupport() {
     return 'WebSocket' in globals;
   }
-
 }
 
 var COMMAND_CONNECT = 'connect';
@@ -602,6 +506,7 @@ class ProxyTransport extends Transport {
     this.host = config.host || null;
     this.port = config.port || null;
     this.secure = config.secure || false;
+
     /*
      * Proxy properties
      * host and port should be always preserved on connect and reconnect
@@ -616,65 +521,51 @@ class ProxyTransport extends Transport {
     this.driver.bind(Driver.ON_CONNECTED, this._handleDriverConnected.bind(this));
     this.driver.bind(Driver.ON_DISCONNECTED, this._handleDriverDisconnected.bind(this));
   }
-
   _url() {
     return "".concat(this.secure ? 'https' : 'http', "://") + "".concat(this.proxyIp ? this.proxyIp : this.host, ":") + "".concat(this.port, "/") + "".concat(this.childId !== null ? "".concat(this.childId, "/") : '') + "?_r=".concat(new Date().getTime());
   }
-
   _request() {
     var params = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '';
     var success = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : () => {};
     var failure = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : () => {};
     var self = this;
-
     var onSuccess = response => {
       // fire ON_MESSAGE event unless sscp message is empty
       if (response.sscp.constructor === String) {
         response.sscp = [response.sscp];
       }
-
       for (var i = 0, l = response.sscp.length; i < l; i++) {
         if (response.sscp[i] !== '') {
           self.trigger(ProxyTransport.ON_MESSAGE, response.sscp[i]);
         }
       }
-
       success(response);
     };
-
     var onFailure = () => {
       switch (self.state) {
         case ProxyTransport.STATE_CONNECTED:
           self.state = ProxyTransport.STATE_DISCONNECTING;
           self.trigger(ProxyTransport.ON_CONNECT_FAILED);
           break;
-
         case ProxyTransport.STATE_CONNECTING:
           self.state = ProxyTransport.STATE_DISCONNECTING;
           self.trigger(ProxyTransport.ON_CONNECT_FAILED);
           break;
-
         case ProxyTransport.STATE_DISCONNECTING:
           self.state = ProxyTransport.STATE_DISCONNECTED;
           self.trigger(ProxyTransport.ON_DISCONNECTED);
           break;
       }
-
       failure();
     };
-
     this.driver.send(this._url(), params, onSuccess, onFailure);
   }
-
   _poll() {
     var params = "command=".concat(COMMAND_POLL) + "&clientid=".concat(this.clientId) + "&sid=".concat(this.sessionId);
-
     this._request(params, this._poll.bind(this));
   }
-
   _connect() {
     var self = this;
-
     var onSuccess = response => {
       self.proxyIp = response.proxy;
       self.clientId = parseInt(response.clientid, 10);
@@ -682,78 +573,63 @@ class ProxyTransport extends Transport {
       self.sessionId = response.sid;
       self.state = ProxyTransport.STATE_CONNECTED;
       self.trigger(ProxyTransport.ON_CONNECTED);
-
       self._poll();
     };
-
     var onFailure = () => {
       self.state = ProxyTransport.STATE_DISCONNECTED;
       self.trigger(ProxyTransport.ON_CONNECT_FAILED);
     };
-
     var params = "command=".concat(COMMAND_CONNECT);
-
     this._request(params, onSuccess, onFailure);
   }
-
   _handleDriverReady() {
     this.trigger(ProxyTransport.ON_READY);
   }
-
   _handleDriverConnected() {
     this._connect();
   }
-
   _handleDriverDisconnected() {
     log(TYPE_TRANSPORT, 'ProxyTransport::handleDriverDisconnected');
     var state = this.state;
     this.state = ProxyTransport.STATE_DISCONNECTED;
-
     switch (state) {
       case ProxyTransport.STATE_CONNECTED:
         this.trigger(ProxyTransport.ON_CONNECT_LOST);
         break;
-
       case ProxyTransport.STATE_CONNECTING:
         this.trigger(ProxyTransport.ON_CONNECT_FAILED);
         break;
-
       case ProxyTransport.STATE_DISCONNECTING:
         this.trigger(ProxyTransport.ON_DISCONNECTED);
         break;
     }
   }
-
   send(sscp) {
     var success = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : () => {};
     var failure = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : () => {};
     log(TYPE_TRANSPORT, 'ProxyTransport::send', sscp);
     var params = "command=".concat(COMMAND_PASS) + "&clientid=".concat(this.clientId) + "&sscp=".concat(sscp) + "&sid=".concat(this.sessionId);
-
     this._request(params, success, failure);
   }
-
   connect() {
     log(TYPE_TRANSPORT, 'ProxyTransport::connect', this.host, this.port);
     this.state = ProxyTransport.STATE_CONNECTING;
     this.driver.connect();
   }
-
   disconnect() {
-    log(TYPE_TRANSPORT, 'ProxyTransport::disconnect'); // drop proxy settings
+    log(TYPE_TRANSPORT, 'ProxyTransport::disconnect');
 
+    // drop proxy settings
     this.proxyIp = null;
     this.childId = null;
     this.sessionId = null;
     this.state = ProxyTransport.STATE_DISCONNECTING;
     this.driver.disconnect();
   }
-
   init() {
     log(TYPE_TRANSPORT, 'ProxyTransport::init');
     this.driver.init();
   }
-
 }
 
 class SocketTransport extends Transport {
@@ -770,72 +646,59 @@ class SocketTransport extends Transport {
     this.driver.bind(Driver.ON_CONNECTED, this._handleDriverConnected.bind(this));
     this.driver.bind(Driver.ON_DISCONNECTED, this._handleDriverDisconnected.bind(this));
   }
-
   _handleDriverReady() {
     log(TYPE_TRANSPORT, 'SocketTransport::_handleDriverReady');
     this.trigger(SocketTransport.ON_READY);
   }
-
   _handleDriverMessage(message) {
     log(TYPE_TRANSPORT, 'SocketTransport::handleDriverMessage');
     this.trigger(SocketTransport.ON_MESSAGE, message);
   }
-
   _handleDriverConnected() {
     log(TYPE_TRANSPORT, 'SocketTransport::handleDriverConnected');
     this.state = SocketTransport.STATE_CONNECTED;
     this.trigger(SocketTransport.ON_CONNECTED);
   }
-
   _handleDriverDisconnected() {
     log(TYPE_TRANSPORT, 'SocketTransport::handleDriverDisconnected');
     var state = this.state;
     this.state = SocketTransport.STATE_DISCONNECTED;
-
     switch (state) {
       case SocketTransport.STATE_CONNECTED:
         this.trigger(SocketTransport.ON_CONNECT_LOST);
         break;
-
       case SocketTransport.STATE_CONNECTING:
         this.trigger(SocketTransport.ON_CONNECT_FAILED);
         break;
-
       case SocketTransport.STATE_DISCONNECTING:
         this.trigger(SocketTransport.ON_DISCONNECTED);
         break;
     }
   }
-
   send(sscp) {
     var success = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : () => {};
     var failure = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : () => {};
     log(TYPE_TRANSPORT, 'SocketTransport::send', sscp);
     this.driver.send(sscp, success, failure);
   }
-
   connect() {
     log(TYPE_TRANSPORT, 'SocketTransport::connect', this.host, this.port);
     this.state = SocketTransport.STATE_CONNECTING;
     this.driver.connect(this.host, this.port, this.secure);
   }
-
   disconnect() {
     log(TYPE_TRANSPORT, 'SocketTransport::disconnect');
     this.state = SocketTransport.STATE_DISCONNECTING;
     this.driver.disconnect();
   }
-
   init() {
     log(TYPE_TRANSPORT, 'SocketTransport::init');
     this.driver.init();
   }
-
 }
 
 var METHOD_PROXY = 'proxy';
 var METHOD_WEBSOCKET = 'websocket';
-
 class TransportManager extends Emitter {
   constructor() {
     super();
@@ -844,32 +707,34 @@ class TransportManager extends Emitter {
     this.unbind = this.off;
     this.ON_READY = 'ready';
     this.config = null;
-    this.idx = 0; // list of connection types pairs: transport - driver
+    this.idx = 0;
 
+    // list of connection types pairs: transport - driver
     this.methods = {};
     this.transports = {};
     this.loaded = 0;
     this.sequence = [];
     this.allowed = [];
-    this.secure = true; // Guarding the use of the window object in environments where it might
+    this.secure = true;
+
+    // Guarding the use of the window object in environments where it might
     // not be available, such as during server - side rendering in a framework
     // like Next.js
-
     if (typeof window !== 'undefined') {
       this.secure = window.location.protocol.indexOf('https') === 0;
-    } // list of connection methods which where unsuccessful
-
+    }
 
+    // list of connection methods which where unsuccessful
     this.unsuccessful = [];
   }
-
   _instantiate() {
-    log(TYPE_MANAGER, 'TransportManager::instantiate'); // instantiate all transports
+    log(TYPE_MANAGER, 'TransportManager::instantiate');
 
+    // instantiate all transports
     this.allowed.forEach(method => {
-      var config = this._getMethodConfig(method); // pick the random host
-
+      var config = this._getMethodConfig(method);
 
+      // pick the random host
       var host = config.hosts[Math.floor(Math.random() * config.hosts.length)];
       var TransportKlass = this.methods[method].transport;
       var DriverKlass = this.methods[method].driver;
@@ -881,57 +746,48 @@ class TransportManager extends Emitter {
       });
       this.transports[method] = transport;
       transport.bind(Transport.ON_READY, this._handleTransportReady.bind(this));
-    }, this); // initialise all transports
+    }, this);
 
+    // initialise all transports
     for (var method in this.transports) {
       if (Object.prototype.hasOwnProperty.call(this.transports, method)) {
         this.transports[method].init();
       }
     }
   }
-
   _getMethodConfig(method) {
     return this.config.methods.find(item => item.type === method);
   }
-
   _handleTransportReady() {
     this.loaded += 1;
-
     if (this.loaded === this.allowed.length) {
       this.trigger(this.ON_READY);
     }
   }
-
   current() {
     return this.transports[this.allowed[this.idx]];
   }
-
   next() {
     this.idx += 1;
-
     if (this.idx >= this.allowed.length) {
       return false;
     }
-
     return this.current();
   }
-
   reset() {
     this.allowed = [];
-    this.unsuccessful = []; // gather all methods in one array in correct connection sequence
+    this.unsuccessful = [];
 
+    // gather all methods in one array in correct connection sequence
     for (var i = 0, l = this.sequence.length; i < l; i += 1) {
       // shift method's idx by the value of the current method idx
       var method = this.sequence[(i + this.idx) % l];
-
       if (this.methods[method].driver.hasSupport()) {
         this.allowed.push(method);
       }
     }
-
     this.idx = 0;
   }
-
   addUnsuccessful(transport) {
     for (var method in this.transports) {
       if (Object.prototype.hasOwnProperty.call(this.transports, method) && this.transports[method] === transport) {
@@ -939,7 +795,6 @@ class TransportManager extends Emitter {
       }
     }
   }
-
   init() {
     var config = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
     this.config = config;
@@ -955,63 +810,58 @@ class TransportManager extends Emitter {
       driver: WebSocketDriver,
       transport: SocketTransport
     };
-
     if (ENMASSE_OVERRIDE_METHODS) {
       this.sequence = ENMASSE_OVERRIDE_METHODS;
     } else {
       this.config.methods.forEach(method => this.sequence.push(method.type), this);
-    } // remove unsupported methods
+    }
 
+    // remove unsupported methods
     /* eslint-disable */
-
-
     this.sequence = this.sequence.filter(item => Object.prototype.hasOwnProperty.call(this.methods, item));
     /* eslint-enable */
 
     this.reset();
-
     this._instantiate();
   }
-
 }
-
 var TransportManager$1 = new TransportManager();
 
 /* eslint @typescript-eslint/no-use-before-define: ["error", { "variables": false }] */
-
 var ConnectionManager = (() => {
   var self = new Emitter();
   self.trigger = self.emit;
   self.bind = self.on;
   self.unbind = self.off;
+
   /*
    * Constants
    */
-
   var CONNECT_DELAYS = [0, 3, 5, 10, 20, 30, 45, 60];
+
   /*
    * States
    */
-
   self.STATE_DISCONNECTED = 'state_disconnected';
   self.STATE_DISCONNECTING = 'state_disconnecting';
   self.STATE_CONNECTING = 'state_connecting';
   self.STATE_CONNECTED = 'state_connected';
+
   /*
    * Events
    */
-
   self.ON_MESSAGE = 'message';
   self.ON_STATE = 'state';
+
   /*
    * Private variables
    */
-
   var config = null;
   var state = self.STATE_DISCONNECTED;
   var transport = null;
-  var attempt = 1; // Timestamp to track when the app was backgrounded
+  var attempt = 1;
 
+  // Timestamp to track when the app was backgrounded
   var backgroundedAt = null;
   var inactivityTimeout = {
     start() {
@@ -1023,23 +873,19 @@ var ConnectionManager = (() => {
         }
       }, 1000);
     },
-
     stop() {
       log(TYPE_MANAGER_EXTRA, 'ConnectionManager::inactivityTimeout::stop');
       clearInterval(this.interval);
     },
-
     reset() {
       log(TYPE_MANAGER_EXTRA, 'ConnectionManager::inactivityTimeout::reset');
       this.stop();
       this.start();
     },
-
     resolve() {
       log(TYPE_MANAGER_EXTRA, 'ConnectionManager::inactivityTimeout::resolve');
       disconnectingOnConnectLost();
     }
-
   };
   var connectTimeout = {
     start() {
@@ -1048,21 +894,17 @@ var ConnectionManager = (() => {
         this.resolve();
       }, config.connect_timeout * 1000);
     },
-
     stop() {
       log(TYPE_MANAGER_EXTRA, 'ConnectionManager::connectTimeout::stop');
       clearTimeout(this.timeout);
     },
-
     resolve() {
       log(TYPE_MANAGER_EXTRA, 'ConnectionManager::connectTimeout::resolve');
       disconnectingOnConnectFailed();
     }
-
   };
   var connectDelay = {
     active: false,
-
     start(delay) {
       log(TYPE_MANAGER_EXTRA, 'ConnectionManager::connectDelay::start');
       this.active = true;
@@ -1070,21 +912,17 @@ var ConnectionManager = (() => {
         this.resolve();
       }, delay * 1000);
     },
-
     stop() {
       log(TYPE_MANAGER_EXTRA, 'ConnectionManager::connectDelay::stop');
       this.active = false;
       clearTimeout(this.timeout);
     },
-
     resolve() {
       log(TYPE_MANAGER_EXTRA, 'ConnectionManager::connectDelay::resolve');
       this.stop();
       connect();
     }
-
   };
-
   var initTransport = newTransport => {
     log(TYPE_MANAGER, 'ConnectionManager::initTransport');
     transport = newTransport;
@@ -1094,14 +932,11 @@ var ConnectionManager = (() => {
     transport.bind(Transport.ON_CONNECT_LOST, handleTransportConnectLost);
     transport.bind(Transport.ON_DISCONNECTED, handleTransportDisconnected);
   };
-
   var teardownTransport = () => {
     log(TYPE_MANAGER, 'ConnectionManager::teardownTransport');
-
     if (transport === null) {
       return;
     }
-
     transport.unbind(Transport.ON_MESSAGE, handleTransportMessage);
     transport.unbind(Transport.ON_CONNECTED, handleTransportConnected);
     transport.unbind(Transport.ON_CONNECT_FAILED, handleTransportConnectFailed);
@@ -1109,11 +944,9 @@ var ConnectionManager = (() => {
     transport.unbind(Transport.ON_DISCONNECTED, handleTransportDisconnected);
     transport = null;
   };
-
   var handleTransportMessage = message => {
     log(TYPE_MANAGER, 'ConnectionManager::handleTransportMessage', message);
     var messages = message.split('\0');
-
     for (var i = 0; i < messages.length; i += 1) {
       if (messages[i].length > 0) {
         inactivityTimeout.reset();
@@ -1122,86 +955,71 @@ var ConnectionManager = (() => {
       }
     }
   };
-
   var handleTransportConnected = () => {
     log(TYPE_MANAGER, 'ConnectionManager::handleTransportConnected');
     setStateToConnected();
   };
-
   var handleTransportConnectFailed = () => {
     log(TYPE_MANAGER, 'ConnectionManager::handleTransportConnectFailed');
     disconnectingOnConnectFailed();
   };
-
   var handleTransportConnectLost = () => {
     log(TYPE_MANAGER, 'ConnectionManager::handleTransportConnectLost');
     disconnectingOnConnectLost();
   };
-
   var handleTransportDisconnected = () => {
     log(TYPE_MANAGER, 'ConnectionManager::handleTransportDisconnected');
-
     switch (state) {
       case self.STATE_CONNECTED:
         disconnectedOnConnectLost();
         break;
-
       case self.STATE_CONNECTING:
         disconnectedOnConnectFailed();
         break;
-
       case self.STATE_DISCONNECTING:
         setStateToDisconnected();
         break;
     }
   };
-
   var disconnectingOnConnectFailed = () => {
     log(TYPE_MANAGER, 'ConnectionManager::disconnectingOnConnectFailed()');
     disconnect();
   };
-
   var disconnectingOnConnectLost = () => {
     log(TYPE_MANAGER, 'ConnectionManager::disconnectingOnConnectLost()');
     disconnect();
   };
-
   var disconnectedOnConnectLost = () => {
     log(TYPE_MANAGER, 'ConnectionManager::disconnectedOnConnectLost()');
-    teardownTransport(); // automatically reconnect
+    teardownTransport();
 
+    // automatically reconnect
     setStateToConnecting();
   };
-
   var disconnectedOnConnectFailed = () => {
     log(TYPE_MANAGER, 'ConnectionManager::disconnectedOnConnectFailed()');
     TransportManager$1.addUnsuccessful(transport);
     teardownTransport();
-
     if (TransportManager$1.next() === false) {
       setStateToConnecting();
     } else {
       connect();
     }
   };
-
   var setStateToConnecting = () => {
     log(TYPE_MANAGER, 'ConnectionManager::setStateToConnecting()');
     var delay;
-
     if (attempt >= CONNECT_DELAYS.length) {
       delay = CONNECT_DELAYS[CONNECT_DELAYS.length - 1];
     } else {
       delay = CONNECT_DELAYS[attempt - 1];
     }
-
     state = self.STATE_CONNECTING;
     self.trigger(self.ON_STATE, state, attempt, delay);
     TransportManager$1.reset();
     attempt += 1;
     connectDelay.start(delay);
   };
-
   var setStateToConnected = () => {
     log(TYPE_MANAGER, 'ConnectionManager::setStateToConnected()');
     attempt = 1;
@@ -1212,14 +1030,12 @@ var ConnectionManager = (() => {
     state = self.STATE_CONNECTED;
     self.trigger(self.ON_STATE, state);
   };
-
   var setStateToDisconnecting = () => {
     log(TYPE_MANAGER, 'ConnectionManager::setStateToDisconnecting()');
     state = self.STATE_DISCONNECTING;
     self.trigger(self.ON_STATE, state);
     disconnect();
   };
-
   var setStateToDisconnected = () => {
     log(TYPE_MANAGER, 'ConnectionManager::setStateToDisconnected()');
     attempt = 1;
@@ -1228,7 +1044,6 @@ var ConnectionManager = (() => {
     state = self.STATE_DISCONNECTED;
     self.trigger(self.ON_STATE, state);
   };
-
   var connect = () => {
     if (state === self.STATE_CONNECTING) {
       connectTimeout.start();
@@ -1236,18 +1051,17 @@ var ConnectionManager = (() => {
       transport.connect();
     }
   };
-
   var disconnect = () => {
     inactivityTimeout.stop();
     connectTimeout.stop();
     connectDelay.stop();
-
     if (transport) {
       transport.disconnect();
     } else {
       setStateToDisconnected();
     }
   };
+
   /**
    * Handles changes in the document's visibility state (visible/hidden).
    *
@@ -1260,56 +1074,46 @@ var ConnectionManager = (() => {
    * Note on Safari (ios and desktop) and Firefox quirk: visibilitychange event is fired
    * immidiately when the page is loaded, even if the page is visible.
    */
-
-
   var handleVisibilityChange = () => {
     log(TYPE_MANAGER, 'ConnectionManager::handleVisibilityChange()', document.visibilityState);
-
     switch (document.visibilityState) {
       case 'visible':
         if (backgroundedAt === null) {
           return;
         }
-
         if (state !== self.STATE_CONNECTED) {
           return;
         }
-
         if (Date.now() - backgroundedAt > config.background_timeout * 1000) {
           log(TYPE_MANAGER, 'ConnectionManager::handleVisibilityChange()', 'disconnecting due to background timeout');
           disconnect();
         }
-
         backgroundedAt = null;
         break;
-
       case 'hidden':
         backgroundedAt = Date.now();
         break;
     }
   };
-
   var handleNetworkStatus = () => {
     if (!navigator.onLine && state === self.STATE_CONNECTED) {
       log(TYPE_MANAGER, 'ConnectionManager::handleNetworkStatus()', 'disconnecting due to network loss');
       disconnect();
     }
   };
-
   self.connect = () => {
-    log(TYPE_MANAGER, 'ConnectionManager::connect()'); // resolve connect instantly if the process has been already postponed
+    log(TYPE_MANAGER, 'ConnectionManager::connect()');
 
+    // resolve connect instantly if the process has been already postponed
     if (connectDelay.active) {
       connectDelay.resolve();
     } else if (state === self.STATE_DISCONNECTED) {
       setStateToConnecting();
     }
-
     window.addEventListener('online', handleNetworkStatus);
     window.addEventListener('offline', handleNetworkStatus);
     window.addEventListener('visibilitychange', handleVisibilityChange);
   };
-
   self.disconnect = () => {
     log(TYPE_MANAGER, 'ConnectionManager::disconnect()');
     setStateToDisconnecting();
@@ -1317,29 +1121,21 @@ var ConnectionManager = (() => {
     window.removeEventListener('offline', handleNetworkStatus);
     window.removeEventListener('visibilitychange', handleVisibilityChange);
   };
-
   self.send = (sscp, success, failure) => {
     log(TYPE_MANAGER, 'ConnectionManager::send', sscp);
-
     success = success || (() => {});
-
     failure = failure || (() => {});
-
     transport.send(sscp, success, failure);
   };
-
   self.getConnectAttempt = () => attempt;
-
   self.init = cfg => {
     log(TYPE_MANAGER, 'ConnectionManager::init()', cfg);
     config = cfg;
   };
-
   return self;
 })();
 
 /* eslint-disable no-console */
-
 class Demographics extends Emitter {
   constructor() {
     super(...arguments);
@@ -1348,46 +1144,40 @@ class Demographics extends Emitter {
     this.bind = this.on;
     this.unbind = this.off;
   }
-
   addCounter(channel, eventId, segment, counter) {
     var round = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : null;
     var min = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : null;
     var max = arguments.length > 6 && arguments[6] !== undefined ? arguments[6] : null;
     log(TYPE_SERVICE, 'Demographics::addCounter', channel, eventId, segment, counter, round, min, max);
-
     if (!channel) {
       return;
     }
-
     if (!eventId) {
       return;
     }
-
     if (!segment || segment.constructor !== Array || !segment.length || segment.length % 2 !== 0) {
       return;
     }
-
     if (counter !== parseInt(counter, 10)) {
       return;
     }
-
     var keys = segment.filter((v, i) => (i + 1) % 2).join(':');
     var values = segment.filter((v, i) => i % 2).join(':');
     this.trigger(this.ON_ADD_COUNTER, channel, [eventId, min, max, round, keys, values, counter]);
   }
-
 }
-
 var Demographics$1 = new Demographics();
 
 var Enmasse = (() => {
   /*
    * Link to the scope
    */
+
   var self = new Emitter();
   self.trigger = self.emit;
   self.bind = self.on;
   self.unbind = self.off;
+
   /*
    * Constants
    */
@@ -1411,196 +1201,175 @@ var Enmasse = (() => {
   self.STATE_DISCONNECTED = 'disconnected';
   self.STATE_CONNECTED = 'connected';
   self.STATE_CONNECTING = 'connecting';
-  self.Demographics = Demographics$1; // var CALLBACK_NAME       = "__enmasse_callback";
+  self.Demographics = Demographics$1;
+
+  // var CALLBACK_NAME       = "__enmasse_callback";
   // var CONFIG_TIMEOUT      = 5000;
 
   var PARAM_SESSION_ID = 'enmasse_session_id';
+
   /*
    * Enmasse properties
    */
+
   // Link to the config file.
+  var configFile = null;
 
-  var configFile = null; // list of arbitray data passed into handshake
+  // list of arbitray data passed into handshake
   // message along with the protocol version
+  var info = [];
 
-  var info = []; // session id is generated by server and passed
+  // session id is generated by server and passed
   // on client on handshake
+  var sessionId = null;
 
-  var sessionId = null; // out messages queue
+  // out messages queue
+  var queue = null;
 
-  var queue = null; // current state of the state machine
-
-  var state = self.STATE_DISCONNECTED; // system channel
+  // current state of the state machine
+  var state = self.STATE_DISCONNECTED;
 
-  var sysChannel = null; // force secure connection
+  // system channel
+  var sysChannel = null;
 
-  var forceSecure = false; // sign in promise object
+  // force secure connection
+  var forceSecure = false;
 
+  // sign in promise object
   var loginContext = {
     inProgress: false,
     success: () => {},
     failure: () => {}
   };
+
   /*
    * Private methods
    */
 
   var storeSession = /*#__PURE__*/function () {
-    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(id) {
-      return _regeneratorRuntime.wrap(function _callee$(_context) {
-        while (1) {
-          switch (_context.prev = _context.next) {
-            case 0:
-              _context.prev = 0;
-              _context.next = 3;
-              return storageWrite(PARAM_SESSION_ID, id);
-
-            case 3:
-              _context.next = 8;
-              break;
-
-            case 5:
-              _context.prev = 5;
-              _context.t0 = _context["catch"](0);
-              console.error("Failed to persist session to shared storage: ".concat(getErrorMessage(_context.t0)));
-
-            case 8:
-            case "end":
-              return _context.stop();
-          }
+    var _ref = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee(id) {
+      var _t;
+      return _regeneratorRuntime.wrap(function (_context) {
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            _context.prev = 0;
+            _context.next = 1;
+            return storageWrite(PARAM_SESSION_ID, id);
+          case 1:
+            _context.next = 3;
+            break;
+          case 2:
+            _context.prev = 2;
+            _t = _context["catch"](0);
+            console.error("Failed to persist session to shared storage: ".concat(getErrorMessage(_t)));
+          case 3:
+          case "end":
+            return _context.stop();
         }
-      }, _callee, null, [[0, 5]]);
+      }, _callee, null, [[0, 2]]);
     }));
-
     return function storeSession(_x) {
       return _ref.apply(this, arguments);
     };
   }();
-
   var restoreSession = /*#__PURE__*/function () {
-    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
-      var restoredId;
-      return _regeneratorRuntime.wrap(function _callee2$(_context2) {
-        while (1) {
-          switch (_context2.prev = _context2.next) {
-            case 0:
-              restoredId = null; // Read session from shared storage
-
-              _context2.prev = 1;
-              _context2.next = 4;
-              return storageRead(PARAM_SESSION_ID);
-
-            case 4:
-              restoredId = _context2.sent;
-              _context2.next = 10;
+    var _ref2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
+      var restoredId, _t2, _t3;
+      return _regeneratorRuntime.wrap(function (_context2) {
+        while (1) switch (_context2.prev = _context2.next) {
+          case 0:
+            restoredId = null; // Read session from shared storage
+            _context2.prev = 1;
+            _context2.next = 2;
+            return storageRead(PARAM_SESSION_ID);
+          case 2:
+            restoredId = _context2.sent;
+            _context2.next = 4;
+            break;
+          case 3:
+            _context2.prev = 3;
+            _t2 = _context2["catch"](1);
+            console.error("Failed to read session from shared storage: ".concat(getErrorMessage(_t2)));
+          case 4:
+            if (!(restoredId !== null)) {
+              _context2.next = 5;
               break;
-
-            case 7:
-              _context2.prev = 7;
-              _context2.t0 = _context2["catch"](1);
-              console.error("Failed to read session from shared storage: ".concat(getErrorMessage(_context2.t0)));
-
-            case 10:
-              if (!(restoredId !== null)) {
-                _context2.next = 12;
-                break;
-              }
-
-              return _context2.abrupt("return", restoredId);
-
-            case 12:
-              if (!(getParentApplication() === null)) {
-                _context2.next = 14;
-                break;
-              }
-
-              return _context2.abrupt("return", null);
-
-            case 14:
-              try {
-                restoredId = getItem(PARAM_SESSION_ID);
-              } catch (err) {
-                console.error("Failed to read local session during migration: ".concat(getErrorMessage(err)));
-              }
-
-              if (!(restoredId === null)) {
-                _context2.next = 17;
-                break;
-              }
-
-              return _context2.abrupt("return", null);
-
-            case 17:
-              _context2.prev = 17;
-              _context2.next = 20;
-              return storageWrite(PARAM_SESSION_ID, restoredId);
-
-            case 20:
-              _context2.next = 25;
+            }
+            return _context2.abrupt("return", restoredId);
+          case 5:
+            if (!(getParentApplication() === null)) {
+              _context2.next = 6;
               break;
-
-            case 22:
-              _context2.prev = 22;
-              _context2.t1 = _context2["catch"](17);
-              console.error("Failed to persist session to shared storage during migration: ".concat(getErrorMessage(_context2.t1)));
-
-            case 25:
-              return _context2.abrupt("return", restoredId);
-
-            case 26:
-            case "end":
-              return _context2.stop();
-          }
+            }
+            return _context2.abrupt("return", null);
+          case 6:
+            try {
+              restoredId = getItem(PARAM_SESSION_ID);
+            } catch (err) {
+              console.error("Failed to read local session during migration: ".concat(getErrorMessage(err)));
+            }
+            if (!(restoredId === null)) {
+              _context2.next = 7;
+              break;
+            }
+            return _context2.abrupt("return", null);
+          case 7:
+            _context2.prev = 7;
+            _context2.next = 8;
+            return storageWrite(PARAM_SESSION_ID, restoredId);
+          case 8:
+            _context2.next = 10;
+            break;
+          case 9:
+            _context2.prev = 9;
+            _t3 = _context2["catch"](7);
+            console.error("Failed to persist session to shared storage during migration: ".concat(getErrorMessage(_t3)));
+          case 10:
+            return _context2.abrupt("return", restoredId);
+          case 11:
+          case "end":
+            return _context2.stop();
         }
-      }, _callee2, null, [[1, 7], [17, 22]]);
+      }, _callee2, null, [[1, 3], [7, 9]]);
     }));
-
     return function restoreSession() {
       return _ref2.apply(this, arguments);
     };
   }();
-
   var resetSession = /*#__PURE__*/function () {
-    var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3() {
-      return _regeneratorRuntime.wrap(function _callee3$(_context3) {
-        while (1) {
-          switch (_context3.prev = _context3.next) {
-            case 0:
-              sessionId = null;
-              _context3.prev = 1;
-              _context3.next = 4;
-              return storageRemove(PARAM_SESSION_ID);
-
-            case 4:
-              _context3.next = 9;
-              break;
-
-            case 6:
-              _context3.prev = 6;
-              _context3.t0 = _context3["catch"](1);
-              console.error("Failed to remove session from shared storage: ".concat(getErrorMessage(_context3.t0)));
-
-            case 9:
-            case "end":
-              return _context3.stop();
-          }
+    var _ref3 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee3() {
+      var _t4;
+      return _regeneratorRuntime.wrap(function (_context3) {
+        while (1) switch (_context3.prev = _context3.next) {
+          case 0:
+            sessionId = null;
+            _context3.prev = 1;
+            _context3.next = 2;
+            return storageRemove(PARAM_SESSION_ID);
+          case 2:
+            _context3.next = 4;
+            break;
+          case 3:
+            _context3.prev = 3;
+            _t4 = _context3["catch"](1);
+            console.error("Failed to remove session from shared storage: ".concat(getErrorMessage(_t4)));
+          case 4:
+          case "end":
+            return _context3.stop();
         }
-      }, _callee3, null, [[1, 6]]);
+      }, _callee3, null, [[1, 3]]);
     }));
-
     return function resetSession() {
       return _ref3.apply(this, arguments);
     };
   }();
-
-  var validateSession = id => // eslint-disable-next-line
+  var validateSession = id =>
+  // eslint-disable-next-line
   /^[a-f\d]{8}\-[a-f\d]{4}\-[a-f\d]{4}-[a-f\d]{4}\-[a-f\d]{12}$/i.test(id);
-
   var finaliseLogin = callback => {
     if (loginContext.inProgress === false) {
       return;
     }
-
     loginContext = {
       inProgress: false,
       success: () => {},
@@ -1608,15 +1377,12 @@ var Enmasse = (() => {
     };
     callback();
   };
-
   var resolveLogin = () => {
     finaliseLogin(loginContext.success);
   };
-
   var rejectLogin = () => {
     finaliseLogin(loginContext.failure);
   };
-
   var setStateToDisconnected = () => {
     log(TYPE_PROTOCOL, 'Enmasse::setStateToDisconnected()');
     state = self.STATE_DISCONNECTED;
@@ -1624,21 +1390,18 @@ var Enmasse = (() => {
     rejectLogin();
     self.trigger(self.ON_STATE, state);
   };
-
   var setStateToConnected = () => {
     log(TYPE_PROTOCOL, 'Enmasse::setStateToConnected()');
     var time = now();
     state = self.STATE_CONNECTED;
     self.trigger(self.ON_STATE, state, time);
   };
-
   var setStateToConnecting = (attempt, delay) => {
     log(TYPE_PROTOCOL, 'Enmasse::setStateToConnecting()');
     state = self.STATE_CONNECTING;
     rejectLogin();
     self.trigger(self.ON_STATE, state, attempt, delay);
   };
-
   var parseSSCP = sscp => {
     var data = {
       channel: 0,
@@ -1647,22 +1410,17 @@ var Enmasse = (() => {
       body: []
     };
     var separator1 = sscp.indexOf('/');
-
     if (separator1 !== -1) {
       var separator2 = sscp.indexOf('/', separator1 + 1);
-
       if (separator2 !== -1) {
         data.channel = sscp.substr(0, separator1);
         data.klass = sscp.substr(separator1 + 1, separator2 - separator1 - 1);
         var separator3 = sscp.indexOf('/', separator2 + 1);
-
         if (separator3 !== -1) {
           data.sent_at = parseInt(sscp.substr(separator2 + 1, separator3 - separator2 - 1), 10);
           var body = sscp.substr(separator3 + 1);
-
           if (body !== '') {
             var values = body.split('|');
-
             for (var i = 0, l = values.length; i < l; i += 1) {
               data.body[i] = decodeURIComponent(values[i]);
             }
@@ -1670,159 +1428,131 @@ var Enmasse = (() => {
         }
       }
     }
-
     return data;
   };
-
   var stringifySSCP = message => [message.channel, message.klass, Math.floor(new Date() / 1000), message.body.join('|')].join('/');
-
   var runner = message => {
     var success = () => {
       queue.success();
     };
-
     var failure = () => {
       queue.failure();
     };
-
     ConnectionManager.send(stringifySSCP(message), success, failure);
   };
-
   var handleTransportManagerReady = () => {
     log(TYPE_PROTOCOL, 'Enmasse::handleTransportManagerReady');
     self.trigger(self.ON_READY);
   };
-
   var handleConnectionManagerState = function handleConnectionManagerState() {
     for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
       args[_key] = arguments[_key];
     }
-
     log(TYPE_PROTOCOL, 'Enmasse::handleConnectionManagerState', args);
-
     switch (args[0]) {
       // case ConnectionManager.STATE_DISCONNECTING:
       // break;
       case ConnectionManager.STATE_DISCONNECTED:
         setStateToDisconnected();
         break;
-
       case ConnectionManager.STATE_CONNECTING:
         setStateToConnecting(args[1], args[2]);
         break;
-
       case ConnectionManager.STATE_CONNECTED:
         break;
     }
   };
-
   var handleConnectionManagerMessage = /*#__PURE__*/function () {
-    var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee4(message) {
-      var data, time, clientInfo, _data$body, subscriptions;
-
-      return _regeneratorRuntime.wrap(function _callee4$(_context4) {
-        while (1) {
-          switch (_context4.prev = _context4.next) {
-            case 0:
-              log(TYPE_PROTOCOL, 'Enmasse::handleConnectionManagerMessage', message);
-              data = parseSSCP(message);
-              _context4.t0 = data.klass;
-              _context4.next = _context4.t0 === SSCP_KLASS_AUTH ? 5 : _context4.t0 === SSCP_KLASS_AUTHOK ? 19 : _context4.t0 === SSCP_KLASS_LOGIN_OK ? 25 : _context4.t0 === SSCP_KLASS_LOGIN_FAIL ? 27 : _context4.t0 === SSCP_KLASS_PING ? 29 : _context4.t0 === SSCP_KLASS_EOC ? 30 : 32;
+    var _ref4 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee4(message) {
+      var data, time, clientInfo, _data$body, subscriptions, _t5;
+      return _regeneratorRuntime.wrap(function (_context4) {
+        while (1) switch (_context4.prev = _context4.next) {
+          case 0:
+            log(TYPE_PROTOCOL, 'Enmasse::handleConnectionManagerMessage', message);
+            data = parseSSCP(message);
+            _t5 = data.klass;
+            _context4.next = _t5 === SSCP_KLASS_AUTH ? 1 : _t5 === SSCP_KLASS_AUTHOK ? 3 : _t5 === SSCP_KLASS_LOGIN_OK ? 4 : _t5 === SSCP_KLASS_LOGIN_FAIL ? 5 : _t5 === SSCP_KLASS_PING ? 6 : _t5 === SSCP_KLASS_EOC ? 7 : 8;
+            break;
+          case 1:
+            time = data.sent_at;
+            clientInfo = ["enmassejs-".concat(self.VERSION), navigator.userAgent].concat(info); // store system channel
+            sysChannel = data.channel;
+
+            // url encode each client info item
+            clientInfo.forEach((item, idx) => {
+              clientInfo[idx] = encodeURIComponent(item);
+            });
+            if (!(sessionId === null)) {
+              _context4.next = 2;
               break;
-
-            case 5:
-              time = data.sent_at;
-              clientInfo = ["enmassejs-".concat(self.VERSION), navigator.userAgent].concat(info); // store system channel
-
-              sysChannel = data.channel; // url encode each client info item
-
-              clientInfo.forEach((item, idx) => {
-                clientInfo[idx] = encodeURIComponent(item);
-              });
-
-              if (!(sessionId === null)) {
-                _context4.next = 14;
-                break;
-              }
-
-              _data$body = _slicedToArray(data.body, 1);
-              sessionId = _data$body[0];
-              _context4.next = 14;
-              return storeSession(sessionId);
-
-            case 14:
-              setTime(time);
-              queue.stash();
+            }
+            _data$body = _slicedToArray(data.body, 1);
+            sessionId = _data$body[0];
+            _context4.next = 2;
+            return storeSession(sessionId);
+          case 2:
+            setTime(time);
+            queue.stash();
+            queue.push({
+              channel: sysChannel,
+              klass: SSCP_KLASS_AUTHR,
+              body: [sessionId, self.PROTOCOL_VERSION, clientInfo.join(',')]
+            }, true);
+            queue.run();
+            return _context4.abrupt("continue", 9);
+          case 3:
+            // We have to resubscribe to the previously
+            // subscribed channels after the reconnect.
+            subscriptions = queue.getSubscriptions();
+            subscriptions.forEach(channel => {
               queue.push({
-                channel: sysChannel,
-                klass: SSCP_KLASS_AUTHR,
-                body: [sessionId, self.PROTOCOL_VERSION, clientInfo.join(',')]
+                channel,
+                klass: SSCP_KLASS_SUB,
+                body: []
               }, true);
-              queue.run();
-              return _context4.abrupt("break", 34);
-
-            case 19:
-              // We have to resubscribe to the previously
-              // subscribed channels after the reconnect.
-              subscriptions = queue.getSubscriptions();
-              subscriptions.forEach(channel => {
-                queue.push({
-                  channel,
-                  klass: SSCP_KLASS_SUB,
-                  body: []
-                }, true);
-              });
-              queue.unstash();
-              queue.run();
-              setStateToConnected();
-              return _context4.abrupt("break", 34);
-
-            case 25:
-              resolveLogin();
-              return _context4.abrupt("break", 34);
-
-            case 27:
-              rejectLogin();
-              return _context4.abrupt("break", 34);
-
-            case 29:
-              return _context4.abrupt("break", 34);
-
-            case 30:
-              self.trigger(self.ON_EOC, data.channel);
-              return _context4.abrupt("break", 34);
-
-            case 32:
-              self.trigger(self.ON_MESSAGE, data);
-              return _context4.abrupt("break", 34);
-
-            case 34:
-            case "end":
-              return _context4.stop();
-          }
+            });
+            queue.unstash();
+            queue.run();
+            setStateToConnected();
+            return _context4.abrupt("continue", 9);
+          case 4:
+            resolveLogin();
+            return _context4.abrupt("continue", 9);
+          case 5:
+            rejectLogin();
+            return _context4.abrupt("continue", 9);
+          case 6:
+            return _context4.abrupt("continue", 9);
+          case 7:
+            self.trigger(self.ON_EOC, data.channel);
+            return _context4.abrupt("continue", 9);
+          case 8:
+            self.trigger(self.ON_MESSAGE, data);
+            return _context4.abrupt("continue", 9);
+          case 9:
+          case "end":
+            return _context4.stop();
         }
       }, _callee4);
     }));
-
     return function handleConnectionManagerMessage(_x2) {
       return _ref4.apply(this, arguments);
     };
   }();
-
   var handleDemographicsCounter = (channel, data) => {
     self.send(channel, 'avgcounter', data);
   };
+
   /**
    * @internal
    */
-
-
   self.PARAM_SESSION_ID = PARAM_SESSION_ID;
+
   /**
    * @internal
    */
-
   self.resetSession = resetSession;
+
   /*
    * Public methods
    */
@@ -1831,12 +1561,10 @@ var Enmasse = (() => {
     log(TYPE_PROTOCOL, 'Enmasse::connect');
     ConnectionManager.connect();
   };
-
   self.disconnect = () => {
     log(TYPE_PROTOCOL, 'Enmasse:disconnect');
     ConnectionManager.disconnect();
   };
-
   self.send = (channel, klass, body) => {
     log(TYPE_PROTOCOL, 'Enmasse::send', channel, klass, body);
     body = body || [];
@@ -1845,37 +1573,28 @@ var Enmasse = (() => {
       klass,
       body
     });
-
     if (state === self.STATE_CONNECTED) {
       queue.run();
     }
   };
-
   self.getSessionId = () => sessionId;
-
   self.getState = () => state;
-
   self.subscribe = channel => {
     self.send(channel, SSCP_KLASS_SUB);
   };
-
   self.unsubscribe = channel => {
     self.send(channel, SSCP_KLASS_UNSUB);
   };
-
   self.login = function (userId, timestamp, signature) {
     var success = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : () => {};
     var failure = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : () => {};
-
     if (sysChannel === null) {
       return;
     }
-
     if (loginContext.inProgress) {
       console.warn('Login is already in progress');
       return;
     }
-
     loginContext = {
       inProgress: true,
       success,
@@ -1883,133 +1602,110 @@ var Enmasse = (() => {
     };
     self.send(sysChannel, SSCP_KLASS_LOGIN, [userId, timestamp, signature]);
   };
-
   self.signIn = function () {
-    console.warn( // eslint-disable-next-line
+    console.warn(// eslint-disable-next-line
     "signIn() method is deprecated and will be removed in future versions. Please use login() method instead");
-
     for (var _len2 = arguments.length, args = new Array(_len2), _key2 = 0; _key2 < _len2; _key2++) {
       args[_key2] = arguments[_key2];
     }
-
     self.login(args);
   };
-
   self.init = /*#__PURE__*/function () {
-    var _init = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee5() {
+    var _init = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee5() {
       var config,
-          response,
-          status,
-          text,
-          data,
-          isSuccess,
-          _args5 = arguments;
-      return _regeneratorRuntime.wrap(function _callee5$(_context5) {
-        while (1) {
-          switch (_context5.prev = _context5.next) {
-            case 0:
-              config = _args5.length > 0 && _args5[0] !== undefined ? _args5[0] : () => {};
-              // config file is passed either as GET parameter or via constructor
-              configFile = !ENMASSE_CONFIG ? config.config || null : ENMASSE_CONFIG;
-              info = config.info || [];
-              _context5.next = 5;
-              return restoreSession();
-
-            case 5:
-              sessionId = _context5.sent;
-
-              if (typeof config.forceSecure === 'boolean') {
-                forceSecure = config.forceSecure;
-              }
-
-              if (!(configFile === null)) {
-                _context5.next = 9;
-                break;
-              }
-
-              throw 'Enmasse config file is not set';
-
-            case 9:
-              if (!(sessionId !== null && !validateSession(sessionId))) {
-                _context5.next = 12;
-                break;
-              }
-
-              _context5.next = 12;
-              return resetSession();
-
-            case 12:
-              queue = new Queue({
-                runner
-              });
-              TransportManager$1.bind(TransportManager$1.ON_READY, handleTransportManagerReady);
-              ConnectionManager.bind(ConnectionManager.ON_STATE, handleConnectionManagerState);
-              ConnectionManager.bind(ConnectionManager.ON_MESSAGE, handleConnectionManagerMessage);
-              Demographics$1.bind(Demographics$1.ON_ADD_COUNTER, handleDemographicsCounter);
-              _context5.prev = 17;
-              _context5.next = 20;
-              return fetch(configFile);
-
-            case 20:
-              response = _context5.sent;
-              status = response.status, text = response.statusText;
-              _context5.prev = 22;
-              _context5.next = 25;
-              return response.json();
-
-            case 25:
-              data = _context5.sent;
-              _context5.next = 32;
+        response,
+        status,
+        text,
+        data,
+        isSuccess,
+        _args5 = arguments,
+        _t7;
+      return _regeneratorRuntime.wrap(function (_context5) {
+        while (1) switch (_context5.prev = _context5.next) {
+          case 0:
+            config = _args5.length > 0 && _args5[0] !== undefined ? _args5[0] : () => {};
+            // config file is passed either as GET parameter or via constructor
+            configFile = !ENMASSE_CONFIG ? config.config || null : ENMASSE_CONFIG;
+            info = config.info || [];
+            _context5.next = 1;
+            return restoreSession();
+          case 1:
+            sessionId = _context5.sent;
+            if (typeof config.forceSecure === 'boolean') {
+              forceSecure = config.forceSecure;
+            }
+            if (!(configFile === null)) {
+              _context5.next = 2;
               break;
-
-            case 28:
-              _context5.prev = 28;
-              _context5.t0 = _context5["catch"](22);
-              self.trigger(self.ON_ERROR, "Invalid JSON from config ".concat(configFile));
-              return _context5.abrupt("return");
-
-            case 32:
-              isSuccess = status >= 200 && status <= 300 || // If you conclude with an XMLHttpRequest receiving status=0 and
-              // statusText=null, this means the request was not allowed to be
-              // performed.
-              // https://developer.mozilla.org/en-US/docs/Web/API/XMLHttpRequest/Using_XMLHttpRequest#xmlhttprequests_being_stopped
-              status === 0 && !!text || status === '';
-              data.forceSecure = forceSecure;
-
-              if (data.background_timeout === undefined) {
-                data.background_timeout = 0;
-              }
-
-              if (isSuccess) {
-                ConnectionManager.init(data);
-                TransportManager$1.init(data);
-              } else {
-                self.trigger(self.ON_ERROR, "Failed to load config ".concat(configFile));
-              }
-
-              _context5.next = 41;
+            }
+            throw 'Enmasse config file is not set';
+          case 2:
+            if (!(sessionId !== null && !validateSession(sessionId))) {
+              _context5.next = 3;
               break;
-
-            case 38:
-              _context5.prev = 38;
-              _context5.t1 = _context5["catch"](17);
-              self.trigger(self.ON_ERROR, "Error loading config: ".concat(_context5.t1.message));
-
-            case 41:
-            case "end":
-              return _context5.stop();
-          }
+            }
+            _context5.next = 3;
+            return resetSession();
+          case 3:
+            queue = new Queue({
+              runner
+            });
+            TransportManager$1.bind(TransportManager$1.ON_READY, handleTransportManagerReady);
+            ConnectionManager.bind(ConnectionManager.ON_STATE, handleConnectionManagerState);
+            ConnectionManager.bind(ConnectionManager.ON_MESSAGE, handleConnectionManagerMessage);
+            Demographics$1.bind(Demographics$1.ON_ADD_COUNTER, handleDemographicsCounter);
+            _context5.prev = 4;
+            _context5.next = 5;
+            return fetch(configFile);
+          case 5:
+            response = _context5.sent;
+            status = response.status, text = response.statusText;
+            _context5.prev = 6;
+            _context5.next = 7;
+            return response.json();
+          case 7:
+            data = _context5.sent;
+            _context5.next = 9;
+            break;
+          case 8:
+            _context5.prev = 8;
+            _context5["catch"](6);
+            self.trigger(self.ON_ERROR, "Invalid JSON from config ".concat(configFile));
+            return _context5.abrupt("return");
+          case 9:
+            isSuccess = status >= 200 && status <= 300 ||
+            // If you conclude with an XMLHttpRequest receiving status=0 and
+            // statusText=null, this means the request was not allowed to be
+            // performed.
+            // https://developer.mozilla.org/en-US/docs/Web/API/XMLHttpRequest/Using_XMLHttpRequest#xmlhttprequests_being_stopped
+            status === 0 && !!text || status === '';
+            data.forceSecure = forceSecure;
+            if (data.background_timeout === undefined) {
+              data.background_timeout = 0;
+            }
+            if (isSuccess) {
+              ConnectionManager.init(data);
+              TransportManager$1.init(data);
+            } else {
+              self.trigger(self.ON_ERROR, "Failed to load config ".concat(configFile));
+            }
+            _context5.next = 11;
+            break;
+          case 10:
+            _context5.prev = 10;
+            _t7 = _context5["catch"](4);
+            self.trigger(self.ON_ERROR, "Error loading config: ".concat(_t7.message));
+          case 11:
+          case "end":
+            return _context5.stop();
         }
-      }, _callee5, null, [[17, 38], [22, 28]]);
+      }, _callee5, null, [[4, 10], [6, 8]]);
     }));
-
     function init() {
       return _init.apply(this, arguments);
     }
-
     return init;
   }();
-
   return self;
 })();