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

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

@@ -1,8 +1,77 @@
-import _asyncToGenerator from '@babel/runtime/helpers/asyncToGenerator';
-import _slicedToArray from '@babel/runtime/helpers/slicedToArray';
-import _regeneratorRuntime from '@babel/runtime/regenerator';
-import { checkAvailability, getItem, Emitter, getGlobal, setItem, removeItem } from '@monterosa/sdk-util';
-import _defineProperty from '@babel/runtime/helpers/defineProperty';
+import { checkAvailability, getItem, Emitter, getGlobal, getErrorMessage } from '@monterosa/sdk-util';
+import { storageRead, storageWrite, storageRemove } from '@monterosa/sdk-storage-kit';
+import { getParentApplication } from '@monterosa/sdk-launcher-kit';
+
+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';
@@ -41,7 +110,7 @@ var getSettingFor = name => {
 };
 var getSettingForMethods = () => {
   var value = getSettingFor(ARG_OVERRIDE_METHODS);
-  if (value !== false) {
+  if (typeof value === 'string') {
     return value.split(',');
   }
   return undefined;
@@ -50,7 +119,7 @@ var ENMASSE_OVERRIDE_METHODS = getSettingForMethods();
 var ENMASSE_DEBUG = getSettingFor(ARG_DEBUG);
 var ENMASSE_CONFIG = getSettingFor(ARG_CONFIG);
 
-var version = "0.19.0-rc.6";
+var version = "2.0.0-rc.2";
 
 /* eslint no-bitwise: "off" */
 var TYPE_PROTOCOL = 1; // 0000 0000 0001
@@ -1250,21 +1319,56 @@ var Enmasse = (() => {
    * Private methods
    */
 
-  var storeSession = id => {
-    if (checkAvailability()) {
-      setItem(PARAM_SESSION_ID, id);
+  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 recoverSession = () => {
-    if (checkAvailability()) {
-      return getItem(PARAM_SESSION_ID);
+  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)));
     }
-    return null;
+    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 = () => {
+  var resetSession = async () => {
     sessionId = null;
-    if (checkAvailability()) {
-      removeItem(PARAM_SESSION_ID);
+    try {
+      await storageRemove(PARAM_SESSION_ID);
+    } catch (err) {
+      console.error("Failed to remove session from shared storage: ".concat(getErrorMessage(err)));
     }
   };
   var validateSession = id =>
@@ -1366,7 +1470,7 @@ var Enmasse = (() => {
         break;
     }
   };
-  var handleConnectionManagerMessage = message => {
+  var handleConnectionManagerMessage = async message => {
     log(TYPE_PROTOCOL, 'Enmasse::handleConnectionManagerMessage', message);
     var data = parseSSCP(message);
     switch (data.klass) {
@@ -1385,7 +1489,7 @@ var Enmasse = (() => {
           if (sessionId === null) {
             var _data$body = _slicedToArray(data.body, 1);
             sessionId = _data$body[0];
-            storeSession(sessionId);
+            await storeSession(sessionId);
           }
           setTime(time);
           queue.stash();
@@ -1435,6 +1539,16 @@ var Enmasse = (() => {
     self.send(channel, 'avgcounter', data);
   };
 
+  /**
+   * @internal
+   */
+  self.PARAM_SESSION_ID = PARAM_SESSION_ID;
+
+  /**
+   * @internal
+   */
+  self.resetSession = resetSession;
+
   /*
    * Public methods
    */
@@ -1493,99 +1607,64 @@ var Enmasse = (() => {
     }
     self.send(sysChannel, SSCP_KLASS_LOGOUT);
   };
-  self.init = /*#__PURE__*/function () {
-    var _init = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
-      var config,
-        response,
-        status,
-        text,
-        data,
-        isSuccess,
-        _args = arguments;
-      return _regeneratorRuntime.wrap(function _callee$(_context) {
-        while (1) {
-          switch (_context.prev = _context.next) {
-            case 0:
-              config = _args.length > 0 && _args[0] !== undefined ? _args[0] : () => {};
-              // config file is passed either as GET parameter or via constructor
-              configFile = !ENMASSE_CONFIG ? config.config || null : ENMASSE_CONFIG;
-              info = config.info || [];
-              sessionId = recoverSession();
-              if (typeof config.forceSecure === 'boolean') {
-                forceSecure = config.forceSecure;
-              }
-              if (!(configFile === null)) {
-                _context.next = 7;
-                break;
-              }
-              throw 'EnMasse config file is not set';
-            case 7:
-              // If session id has invalid format
-              if (sessionId !== null && !validateSession(sessionId)) {
-                resetSession();
-              }
-              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);
-              _context.prev = 13;
-              _context.next = 16;
-              return fetch(configFile);
-            case 16:
-              response = _context.sent;
-              status = response.status, text = response.statusText;
-              _context.prev = 18;
-              _context.next = 21;
-              return response.json();
-            case 21:
-              data = _context.sent;
-              _context.next = 28;
-              break;
-            case 24:
-              _context.prev = 24;
-              _context.t0 = _context["catch"](18);
-              self.trigger(self.ON_ERROR, "Invalid JSON from config ".concat(configFile));
-              return _context.abrupt("return");
-            case 28:
-              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));
-              }
-              _context.next = 37;
-              break;
-            case 34:
-              _context.prev = 34;
-              _context.t1 = _context["catch"](13);
-              self.trigger(self.ON_ERROR, "Error loading config: ".concat(_context.t1.message));
-            case 37:
-            case "end":
-              return _context.stop();
-          }
-        }
-      }, _callee, null, [[13, 34], [18, 24]]);
-    }));
-    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;
     }
-    return init;
-  }();
+    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();
+    }
+    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