[RN] Delay the generating of machineId

Because the implementation of LocalStorage in jitsi-meet at the time
of this writing is asynchronous with respect to loading and saving,
delay the generation of machineId in order to allow LocalStorage to
load any previously saved value.

JitsiMeetJS.js

@@ -462,7 +462,7 @@ export default {
      * @returns {string} the machine id
      */
     getMachineId() {
-        return Settings.getMachineId();
+        return Settings.machineId;
     },
 
     /**

modules/settings/Settings.js

@@ -3,123 +3,77 @@ const logger = getLogger(__filename);
 
 import UsernameGenerator from '../util/UsernameGenerator';
 
-/**
- * Gets the localStorage of the browser. (Technically, gets the localStorage of
- * the global object because there may be no browser but React Native for
- * example).
- * @returns {Storage} the local Storage object (if any)
- */
-function getLocalStorage() {
-
-    // eslint-disable-next-line no-invalid-this
-    const global = typeof window === 'undefined' ? this : window;
-    let storage;
+let _callStatsUserName;
 
-    try {
-        storage = global.localStorage;
-    } catch (error) {
-        logger.error(error);
-    }
-
-    return storage;
-}
-
-/**
- *
- */
-function _p8() {
-    return `${Math.random().toString(16)}000000000`.substr(2, 8);
-}
+let _machineId;
 
 /**
  *
  */
-function generateUniqueId() {
-    return _p8() + _p8() + _p8() + _p8();
-}
-
-/**
- * Generate unique id.
- * @returns {string} random unique id
- */
-function generateJitsiMeetId() {
-    const jitsiMeetId = generateUniqueId();
-
-    logger.log('generated id', jitsiMeetId);
-
-    return jitsiMeetId;
-}
-
-/**
- * Generate fake username for callstats.
- * @returns {string} fake random username
- */
-function generateCallStatsUsername() {
-    const username = UsernameGenerator.generateUsername();
-
-    logger.log('generated callstats uid', username);
-
-    return username;
-}
-
-/**
- *
- */
-class Settings {
+export default {
     /**
-     *
+     * Returns fake username for callstats
+     * @returns {string} fake username for callstats
      */
-    constructor() {
-        const localStorage = getLocalStorage();
+    get callStatsUserName() {
+        if (!_callStatsUserName) {
+            const localStorage = getLocalStorage();
 
-        if (localStorage) {
-            this.userId
-                = localStorage.getItem('jitsiMeetId') || generateJitsiMeetId();
-            this.callStatsUserName
-                = localStorage.getItem('callStatsUserName')
-                    || generateCallStatsUsername();
-
-            this.save();
-        } else {
-            logger.log('localStorage is not supported');
-            this.userId = generateJitsiMeetId();
-            this.callStatsUserName = generateCallStatsUsername();
+            if (localStorage) {
+                _callStatsUserName = localStorage.getItem('callStatsUserName');
+            }
+            if (!_callStatsUserName) {
+                _callStatsUserName = generateCallStatsUserName();
+                if (localStorage) {
+                    localStorage.setItem(
+                        'callStatsUserName',
+                        _callStatsUserName);
+                }
+            }
         }
-    }
 
-    /**
-     * Save settings to localStorage if browser supports that.
-     */
-    save() {
-        const localStorage = getLocalStorage();
-
-        if (localStorage) {
-            localStorage.setItem('jitsiMeetId', this.userId);
-            localStorage.setItem('callStatsUserName', this.callStatsUserName);
-        }
-    }
+        return _callStatsUserName;
+    },
 
     /**
      * Returns current machine id.
      * @returns {string} machine id
      */
-    getMachineId() {
-        return this.userId;
-    }
+    get machineId() {
+        if (!_machineId) {
+            const localStorage = getLocalStorage();
+
+            if (localStorage) {
+                _machineId = localStorage.getItem('jitsiMeetId');
+            }
+            if (!_machineId) {
+                _machineId = generateJitsiMeetId();
+                if (localStorage) {
+                    localStorage.setItem('jitsiMeetId', _machineId);
+                }
+            }
+        }
+
+        return _machineId;
+    },
 
     /**
-     * Returns fake username for callstats
-     * @returns {string} fake username for callstats
+     * Returns current session id.
+     * @returns {string} current session id
      */
-    getCallStatsUserName() {
-        return this.callStatsUserName;
-    }
+    get sessionId() {
+        // We may update sessionId in localStorage from another JitsiConference
+        // instance and that's why we should always re-read it.
+        const localStorage = getLocalStorage();
+
+        return localStorage ? localStorage.getItem('sessionId') : undefined;
+    },
 
     /**
      * Save current session id.
      * @param {string} sessionId session id
      */
-    setSessionId(sessionId) {
+    set sessionId(sessionId) {
         const localStorage = getLocalStorage();
 
         if (localStorage) {
@@ -130,26 +84,61 @@ class Settings {
             }
         }
     }
+};
 
-    /**
-     * Clear current session id.
-     */
-    clearSessionId() {
-        this.setSessionId(undefined);
-    }
+/**
+ * Generate fake username for callstats.
+ * @returns {string} fake random username
+ */
+function generateCallStatsUserName() {
+    const username = UsernameGenerator.generateUsername();
 
-    /**
-     * Returns current session id.
-     * @returns {string} current session id
-     */
-    getSessionId() {
-        // We may update sessionId in localStorage from another JitsiConference
-        // instance and that's why we should always re-read it.
-        const localStorage = getLocalStorage();
+    logger.log('generated callstats uid', username);
 
+    return username;
+}
 
-        return localStorage ? localStorage.getItem('sessionId') : undefined;
+/**
+ * Generate unique id.
+ * @returns {string} random unique id
+ */
+function generateJitsiMeetId() {
+    const jitsiMeetId = generateUniqueId();
+
+    logger.log('generated id', jitsiMeetId);
+
+    return jitsiMeetId;
+}
+
+/**
+ * Gets the localStorage of the browser. (Technically, gets the localStorage of
+ * the global object because there may be no browser but React Native for
+ * example).
+ * @returns {Storage} the local Storage object (if any)
+ */
+function getLocalStorage() {
+    let storage;
+
+    try {
+        // eslint-disable-next-line no-invalid-this
+        storage = (window || this).localStorage;
+    } catch (error) {
+        logger.error(error);
     }
+
+    return storage;
 }
 
-export default new Settings();
+/**
+ *
+ */
+function generateUniqueId() {
+    return _p8() + _p8() + _p8() + _p8();
+}
+
+/**
+ *
+ */
+function _p8() {
+    return `${Math.random().toString(16)}000000000`.substr(2, 8);
+}

modules/statistics/AnalyticsAdapter.js

@@ -70,7 +70,7 @@ class AnalyticsAdapter {
         this.permanentProperties = Object.create(null);
 
         this.addPermanentProperties(
-            { callstatsname: Settings.getCallStatsUserName() });
+            { callstatsname: Settings.callStatsUserName });
     }
 
     /**

modules/statistics/statistics.js

@@ -310,7 +310,7 @@ Statistics.prototype.startCallStats = function(tpc, remoteUserID) {
     }
 
     if (!CallStats.isBackendInitialized()) {
-        const userName = Settings.getCallStatsUserName();
+        const userName = Settings.callStatsUserName;
 
         if (!CallStats.initBackend({
             callStatsID: this.options.callStatsID,

modules/xmpp/moderator.js

@@ -78,7 +78,7 @@ export default function Moderator(roomName, xmpp, emitter, options) {
 
                 return;
             }
-            Settings.setSessionId(event.data.sessionId);
+            Settings.sessionId = event.data.sessionId;
 
             // After popup is closed we will authenticate
         }
@@ -143,8 +143,8 @@ Moderator.prototype.createConferenceIq = function() {
         type: 'set' });
 
     // Session Id used for authentication
-    const sessionId = Settings.getSessionId();
-    const machineUID = Settings.getMachineId();
+    const { sessionId } = Settings;
+    const machineUID = Settings.machineId;
 
     logger.info(`Session ID: ${sessionId} machine UID: ${machineUID}`);
 
@@ -276,7 +276,7 @@ Moderator.prototype.parseSessionId = function(resultIq) {
 
     if (sessionId) {
         logger.info(`Received sessionId:  ${sessionId}`);
-        Settings.setSessionId(sessionId);
+        Settings.sessionId = sessionId;
     }
 };
 
@@ -363,7 +363,7 @@ Moderator.prototype._allocateConferenceFocusError = function(error, callback) {
 
     if (invalidSession) {
         logger.info('Session expired! - removing');
-        Settings.clearSessionId();
+        Settings.sessionId = undefined;
     }
     if ($(error).find('>error>graceful-shutdown').length) {
         this.eventEmitter.emit(XMPPEvents.GRACEFUL_SHUTDOWN);
@@ -495,7 +495,7 @@ Moderator.prototype._getLoginUrl = function(popup, urlCb, failureCb) {
     const attrs = {
         xmlns: 'http://jitsi.org/protocol/focus',
         room: this.roomName,
-        'machine-uid': Settings.getMachineId()
+        'machine-uid': Settings.machineId
     };
     let str = 'auth url'; // for logger
 
@@ -542,7 +542,7 @@ Moderator.prototype.getPopupLoginUrl = function(urlCallback, failureCallback) {
 Moderator.prototype.logout = function(callback) {
     const iq = $iq({ to: this.getFocusComponent(),
         type: 'set' });
-    const sessionId = Settings.getSessionId();
+    const { sessionId } = Settings;
 
     if (!sessionId) {
         callback();
@@ -563,7 +563,7 @@ Moderator.prototype.logout = function(callback) {
                 logoutUrl = decodeURIComponent(logoutUrl);
             }
             logger.info(`Log out OK, url: ${logoutUrl}`, result);
-            Settings.clearSessionId();
+            Settings.sessionId = undefined;
             callback(logoutUrl);
         },
         error => {