@monterosa/sdk-enmasse-kit 0.18.2 → 0.18.3

package/dist/index.cjs.js

@@ -1,6 +1,8 @@
 'use strict';
 
 var sdkUtil = require('@monterosa/sdk-util');
+var sdkStorageKit = require('@monterosa/sdk-storage-kit');
+var sdkLauncherKit = require('@monterosa/sdk-launcher-kit');
 
 const ARG_OVERRIDE_METHODS = 'enmasse_override_methods';
 const ARG_DEBUG = 'enmasse_debug';
@@ -56,7 +58,7 @@ const ENMASSE_OVERRIDE_METHODS = getSettingForMethods();
 const ENMASSE_DEBUG = getSettingFor(ARG_DEBUG);
 const ENMASSE_CONFIG = getSettingFor(ARG_CONFIG);
 
-var version = "0.18.2";
+var version = "0.18.3";
 
 /* eslint no-bitwise: "off" */
 
@@ -1695,25 +1697,78 @@ const Enmasse = (() => {
    * Private methods
    */
 
-  const storeSession = (id) => {
-    if (sdkUtil.checkAvailability()) {
-      sdkUtil.setItem(PARAM_SESSION_ID, id);
+  const storeSession = async (id) => {
+    try {
+      await sdkStorageKit.storageWrite(PARAM_SESSION_ID, id);
+    } catch (err) {
+      console.error(
+        `Failed to persist session to shared storage: ${sdkUtil.getErrorMessage(err)}`,
+      );
     }
   };
 
-  const recoverSession = () => {
-    if (sdkUtil.checkAvailability()) {
-      return sdkUtil.getItem(PARAM_SESSION_ID);
+  const restoreSession = async () => {
+    let restoredId = null;
+
+    // Read session from shared storage
+    try {
+      restoredId = await sdkStorageKit.storageRead(PARAM_SESSION_ID);
+    } catch (err) {
+      console.error(
+        `Failed to read session from shared storage: ${sdkUtil.getErrorMessage(err)}`,
+      );
+    }
+
+    if (restoredId !== null) {
+      return restoredId;
     }
 
-    return null;
+    /**
+     * 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 (sdkLauncherKit.getParentApplication() === null) {
+      return null;
+    }
+
+    try {
+      restoredId = sdkUtil.getItem(PARAM_SESSION_ID);
+    } catch (err) {
+      console.error(
+        `Failed to read local session during migration: ${sdkUtil.getErrorMessage(
+          err,
+        )}`,
+      );
+    }
+
+    if (restoredId === null) {
+      return null;
+    }
+
+    try {
+      await sdkStorageKit.storageWrite(PARAM_SESSION_ID, restoredId);
+    } catch (err) {
+      console.error(
+        `Failed to persist session to shared storage during migration: ${sdkUtil.getErrorMessage(
+          err,
+        )}`,
+      );
+    }
+
+    return restoredId;
   };
 
-  const resetSession = () => {
+  const resetSession = async () => {
     sessionId = null;
 
-    if (sdkUtil.checkAvailability()) {
-      sdkUtil.removeItem(PARAM_SESSION_ID);
+    try {
+      await sdkStorageKit.storageRemove(PARAM_SESSION_ID);
+    } catch (err) {
+      console.error(
+        `Failed to remove session from shared storage: ${sdkUtil.getErrorMessage(err)}`,
+      );
     }
   };
 
@@ -1858,7 +1913,7 @@ const Enmasse = (() => {
     }
   };
 
-  const handleConnectionManagerMessage = (message) => {
+  const handleConnectionManagerMessage = async (message) => {
     log(
       TYPE_PROTOCOL,
       'Enmasse::handleConnectionManagerMessage',
@@ -1886,7 +1941,7 @@ const Enmasse = (() => {
 
         if (sessionId === null) {
           [sessionId] = data.body;
-          storeSession(sessionId);
+          await storeSession(sessionId);
         }
 
         setTime(time);
@@ -1950,6 +2005,16 @@ const Enmasse = (() => {
     self.send(channel, 'avgcounter', data);
   };
 
+  /**
+   * @internal
+   */
+  self.PARAM_SESSION_ID = PARAM_SESSION_ID;
+
+  /**
+   * @internal
+   */
+  self.resetSession = resetSession;
+
   /*
    * Public methods
    */
@@ -2028,7 +2093,7 @@ const Enmasse = (() => {
     // config file is passed either as GET parameter or via constructor
     configFile = !ENMASSE_CONFIG ? config.config || null : ENMASSE_CONFIG;
     info = config.info || [];
-    sessionId = recoverSession();
+    sessionId = await restoreSession();
 
     if (typeof config.forceSecure === 'boolean') {
       forceSecure = config.forceSecure;
@@ -2041,7 +2106,7 @@ const Enmasse = (() => {
 
     // If session id has invalid format
     if (sessionId !== null && !validateSession(sessionId)) {
-      resetSession();
+      await resetSession();
     }
 
     queue = new Queue({