@monterosa/sdk-enmasse-kit 2.0.0-rc.1 → 2.0.0-rc.2

package/dist/{index.esm.js → index.js}

@@ -1,10 +1,77 @@
-import _slicedToArray from '@babel/runtime/helpers/slicedToArray';
-import _asyncToGenerator from '@babel/runtime/helpers/asyncToGenerator';
-import _regeneratorRuntime from '@babel/runtime/regenerator';
 import { checkAvailability, getItem, Emitter, getGlobal, getErrorMessage } from '@monterosa/sdk-util';
-import { storageWrite, storageRead, storageRemove } from '@monterosa/sdk-storage-kit';
+import { storageRead, storageWrite, storageRemove } from '@monterosa/sdk-storage-kit';
 import { getParentApplication } from '@monterosa/sdk-launcher-kit';
-import _defineProperty from '@babel/runtime/helpers/defineProperty';
+
+function _arrayLikeToArray(r, a) {
+  (null == a || a > r.length) && (a = r.length);
+  for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e];
+  return n;
+}
+function _arrayWithHoles(r) {
+  if (Array.isArray(r)) return r;
+}
+function _defineProperty(e, r, t) {
+  return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, {
+    value: t,
+    enumerable: !0,
+    configurable: !0,
+    writable: !0
+  }) : e[r] = t, e;
+}
+function _iterableToArrayLimit(r, l) {
+  var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"];
+  if (null != t) {
+    var e,
+      n,
+      i,
+      u,
+      a = [],
+      f = !0,
+      o = !1;
+    try {
+      if (i = (t = t.call(r)).next, 0 === l) {
+        if (Object(t) !== t) return;
+        f = !1;
+      } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0);
+    } catch (r) {
+      o = !0, n = r;
+    } finally {
+      try {
+        if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return;
+      } finally {
+        if (o) throw n;
+      }
+    }
+    return a;
+  }
+}
+function _nonIterableRest() {
+  throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
+}
+function _slicedToArray(r, e) {
+  return _arrayWithHoles(r) || _iterableToArrayLimit(r, e) || _unsupportedIterableToArray(r, e) || _nonIterableRest();
+}
+function _toPrimitive(t, r) {
+  if ("object" != typeof t || !t) return t;
+  var e = t[Symbol.toPrimitive];
+  if (void 0 !== e) {
+    var i = e.call(t, r || "default");
+    if ("object" != typeof i) return i;
+    throw new TypeError("@@toPrimitive must return a primitive value.");
+  }
+  return ("string" === r ? String : Number)(t);
+}
+function _toPropertyKey(t) {
+  var i = _toPrimitive(t, "string");
+  return "symbol" == typeof i ? i : i + "";
+}
+function _unsupportedIterableToArray(r, a) {
+  if (r) {
+    if ("string" == typeof r) return _arrayLikeToArray(r, a);
+    var t = {}.toString.call(r).slice(8, -1);
+    return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0;
+  }
+}
 
 var ARG_OVERRIDE_METHODS = 'enmasse_override_methods';
 var ARG_DEBUG = 'enmasse_debug';
@@ -52,7 +119,7 @@ var ENMASSE_OVERRIDE_METHODS = getSettingForMethods();
 var ENMASSE_DEBUG = getSettingFor(ARG_DEBUG);
 var ENMASSE_CONFIG = getSettingFor(ARG_CONFIG);
 
-var version = "2.0.0-rc.1";
+var version = "2.0.0-rc.2";
 
 /* eslint no-bitwise: "off" */
 var TYPE_PROTOCOL = 1; // 0000 0000 0001
@@ -1252,127 +1319,58 @@ var Enmasse = (() => {
    * 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();
-          }
-        }
-      }, _callee, null, [[0, 5]]);
-    }));
-    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;
-              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;
-              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();
-          }
-        }
-      }, _callee2, null, [[1, 7], [17, 22]]);
-    }));
-    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();
-          }
-        }
-      }, _callee3, null, [[1, 6]]);
-    }));
-    return function resetSession() {
-      return _ref3.apply(this, arguments);
-    };
-  }();
+  var storeSession = async id => {
+    try {
+      await storageWrite(PARAM_SESSION_ID, id);
+    } catch (err) {
+      console.error("Failed to persist session to shared storage: ".concat(getErrorMessage(err)));
+    }
+  };
+  var restoreSession = async () => {
+    var restoredId = null;
+
+    // Read session from shared storage
+    try {
+      restoredId = await storageRead(PARAM_SESSION_ID);
+    } catch (err) {
+      console.error("Failed to read session from shared storage: ".concat(getErrorMessage(err)));
+    }
+    if (restoredId !== null) {
+      return restoredId;
+    }
+
+    /**
+     * Further down is a special case when we try to restore session id from the
+     * local storage and save it to the shared storage. This could happen in
+     * previous versions of the SDK when we didn't have a shared storage.
+     */
+
+    if (getParentApplication() === null) {
+      return null;
+    }
+    try {
+      restoredId = getItem(PARAM_SESSION_ID);
+    } catch (err) {
+      console.error("Failed to read local session during migration: ".concat(getErrorMessage(err)));
+    }
+    if (restoredId === null) {
+      return null;
+    }
+    try {
+      await storageWrite(PARAM_SESSION_ID, restoredId);
+    } catch (err) {
+      console.error("Failed to persist session to shared storage during migration: ".concat(getErrorMessage(err)));
+    }
+    return restoredId;
+  };
+  var resetSession = async () => {
+    sessionId = null;
+    try {
+      await storageRemove(PARAM_SESSION_ID);
+    } catch (err) {
+      console.error("Failed to remove session from shared storage: ".concat(getErrorMessage(err)));
+    }
+  };
   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);
@@ -1472,85 +1470,71 @@ var Enmasse = (() => {
         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;
-              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();
-              queue.push({
-                channel: sysChannel,
-                klass: SSCP_KLASS_AUTHR,
-                body: [sessionId, self.PROTOCOL_VERSION, clientInfo.join(',')]
-              }, 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();
+  var handleConnectionManagerMessage = async message => {
+    log(TYPE_PROTOCOL, 'Enmasse::handleConnectionManagerMessage', message);
+    var data = parseSSCP(message);
+    switch (data.klass) {
+      case SSCP_KLASS_AUTH:
+        {
+          var time = data.sent_at;
+          var 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) {
+            var _data$body = _slicedToArray(data.body, 1);
+            sessionId = _data$body[0];
+            await storeSession(sessionId);
           }
+          setTime(time);
+          queue.stash();
+          queue.push({
+            channel: sysChannel,
+            klass: SSCP_KLASS_AUTHR,
+            body: [sessionId, self.PROTOCOL_VERSION, clientInfo.join(',')]
+          }, true);
+          queue.run();
+          break;
         }
-      }, _callee4);
-    }));
-    return function handleConnectionManagerMessage(_x2) {
-      return _ref4.apply(this, arguments);
-    };
-  }();
+      case SSCP_KLASS_AUTHOK:
+        {
+          // We have to resubscribe to the previously
+          // subscribed channels after the reconnect.
+          var subscriptions = queue.getSubscriptions();
+          subscriptions.forEach(channel => {
+            queue.push({
+              channel,
+              klass: SSCP_KLASS_SUB,
+              body: []
+            }, true);
+          });
+          queue.unstash();
+          queue.run();
+          setStateToConnected();
+          break;
+        }
+      case SSCP_KLASS_LOGIN_OK:
+        resolveLogin();
+        break;
+      case SSCP_KLASS_LOGIN_FAIL:
+        rejectLogin();
+        break;
+      case SSCP_KLASS_PING:
+        // ignoring ping message handling
+        break;
+      case SSCP_KLASS_EOC:
+        self.trigger(self.ON_EOC, data.channel);
+        break;
+      default:
+        self.trigger(self.ON_MESSAGE, data);
+        break;
+    }
+  };
   var handleDemographicsCounter = (channel, data) => {
     self.send(channel, 'avgcounter', data);
   };
@@ -1623,105 +1607,64 @@ var Enmasse = (() => {
     }
     self.send(sysChannel, SSCP_KLASS_LOGOUT);
   };
-  self.init = /*#__PURE__*/function () {
-    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;
-              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;
-              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();
-          }
-        }
-      }, _callee5, null, [[17, 38], [22, 28]]);
-    }));
-    function init() {
-      return _init.apply(this, arguments);
+  self.init = async function init() {
+    var config = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : () => {};
+    // config file is passed either as GET parameter or via constructor
+    configFile = !ENMASSE_CONFIG ? config.config || null : ENMASSE_CONFIG;
+    info = config.info || [];
+    sessionId = await restoreSession();
+    if (typeof config.forceSecure === 'boolean') {
+      forceSecure = config.forceSecure;
+    }
+    if (configFile === null) {
+      // eslint-disable-next-line
+      throw 'EnMasse config file is not set';
+    }
+
+    // If session id has invalid format
+    if (sessionId !== null && !validateSession(sessionId)) {
+      await resetSession();
     }
-    return init;
-  }();
+    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);
+    try {
+      var response = await fetch(configFile);
+      var status = response.status,
+        text = response.statusText;
+      var data;
+      try {
+        data = await response.json();
+      } catch (jsonErr) {
+        self.trigger(self.ON_ERROR, "Invalid JSON from config ".concat(configFile));
+        return;
+      }
+      var 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));
+      }
+    } catch (err) {
+      self.trigger(self.ON_ERROR, "Error loading config: ".concat(err.message));
+    }
+  };
   return self;
 })();
 
 export { Enmasse as default };
-//# sourceMappingURL=index.esm.js.map
+//# sourceMappingURL=index.js.map