feat(Analytics): Multiple analytics handlers support

JitsiConference.js

@@ -12,7 +12,6 @@ var JitsiDTMFManager = require('./modules/DTMF/JitsiDTMFManager');
 import JitsiTrackError from "./JitsiTrackError";
 import * as JitsiTrackErrors from "./JitsiTrackErrors";
 import * as JitsiTrackEvents from "./JitsiTrackEvents";
-var Settings = require("./modules/settings/Settings");
 var ComponentsVersions = require("./modules/version/ComponentsVersions");
 var GlobalOnErrorHandler = require("./modules/util/GlobalOnErrorHandler");
 var JitsiConferenceEventManager = require("./JitsiConferenceEventManager");
@@ -41,7 +40,6 @@ function JitsiConference(options) {
         throw new Error(errmsg);
     }
     this.eventEmitter = new EventEmitter();
-    this.settings = new Settings();
     this.options = options;
     this.eventManager = new JitsiConferenceEventManager(this);
     this._init(options);
@@ -99,8 +97,7 @@ JitsiConference.prototype._init = function (options) {
         this.eventManager.setupXMPPListeners();
     }
 
-    this.room = this.xmpp.createRoom(this.options.name, this.options.config,
-        this.settings);
+    this.room = this.xmpp.createRoom(this.options.name, this.options.config);
 
     this.room.updateDeviceAvailability(RTC.getDeviceAvailability());
 
@@ -927,7 +924,7 @@ function (jingleSession, jingleOffer, now) {
     // do not wait for XMPPEvents.PEERCONNECTION_READY, as it may never
     // happen in case if user doesn't have or denied permission to
     // both camera and microphone.
-    this.statistics.startCallStats(jingleSession, this.settings);
+    this.statistics.startCallStats(jingleSession);
     this.statistics.startRemoteStats(jingleSession.peerconnection);
 };
 

JitsiMeetJS.js

@@ -21,6 +21,7 @@ var Resolutions = require("./service/RTC/Resolutions");
 var ScriptUtil = require("./modules/util/ScriptUtil");
 var GlobalOnErrorHandler = require("./modules/util/GlobalOnErrorHandler");
 var RTCBrowserType = require("./modules/RTC/RTCBrowserType");
+import Settings from "./modules/settings/Settings";
 
 // The amount of time to wait until firing
 // JitsiMediaDevicesEvents.PERMISSION_PROMPT_IS_SHOWN event
@@ -95,7 +96,11 @@ var LibJitsiMeet = {
     init: function (options) {
         let logObject, attr;
         Statistics.init(options);
+
         this.analytics = Statistics.analytics;
+        if(options.enableAnalyticsLogging === true) {
+            this.analytics.init(RTCBrowserType.getBrowserName());
+        }
 
         if (options.enableWindowOnErrorHandler) {
             GlobalOnErrorHandler.addHandler(
@@ -339,6 +344,14 @@ var LibJitsiMeet = {
         Statistics.reportGlobalError(error);
     },
 
+    /**
+     * Returns current machine id saved from the local storage.
+     * @returns {string} the machine id
+     */
+    getMachineId: function() {
+        return Settings.getMachineId();
+    },
+
     /**
      * Represents a hub/namespace for utility functionality which may be of
      * interest to LibJitsiMeet clients.

doc/API.md

@@ -51,8 +51,8 @@ The ```options``` parameter is JS object with the following properties:
     10. disableSimulcast - boolean property. Enables/disables simulcast.
     11. enableWindowOnErrorHandler - boolean property (default false). Enables/disables attaching global onerror handler (window.onerror).
     12. disableThirdPartyRequests - if true - callstats will be disabled and the callstats API won't be included.
-    13. analyticsScriptUrl - (optional) custom url to search for the analytics lib, if missing js file will be expected to be next to the library file (the location it is sourced from)
-    14. callStatsCustomScriptUrl - (optional) custom url to access callstats client script 
+    13. enableAnalyticsLogging - boolean property (default false). Enables/disables analytics logging.
+    14. callStatsCustomScriptUrl - (optional) custom url to access callstats client script
     15. callStatsConfIDNamespace - (optional) a namespace to prepend the callstats conference ID with. Defaults to the window.location.hostname
 
 * ```JitsiMeetJS.JitsiConnection``` - the ```JitsiConnection``` constructor. You can use that to create new server connection.

modules/settings/Settings.js

@@ -1,5 +1,7 @@
-var logger = require("jitsi-meet-logger").getLogger(__filename);
-var UsernameGenerator = require('../util/UsernameGenerator');
+import {getLogger} from "jitsi-meet-logger";
+const logger = getLogger(__filename);
+
+import UsernameGenerator from "../util/UsernameGenerator";
 
 /**
  * Gets the localStorage of the browser. (Technically, gets the localStorage of
@@ -8,14 +10,15 @@ var UsernameGenerator = require('../util/UsernameGenerator');
  * @returns {Storage} the local Storage object (if any)
  */
 function getLocalStorage() {
-    var global = typeof window == 'undefined' ? this : window;
+    let global = typeof window == 'undefined' ? this : window;
     return global.localStorage;
 }
 
+function _p8() {
+    return (Math.random().toString(16) + "000000000").substr(2, 8);
+}
+
 function generateUniqueId() {
-    function _p8() {
-        return (Math.random().toString(16) + "000000000").substr(2, 8);
-    }
     return _p8() + _p8() + _p8() + _p8();
 }
 
@@ -24,7 +27,7 @@ function generateUniqueId() {
  * @returns {string} random unique id
  */
 function generateJitsiMeetId() {
-    var jitsiMeetId = generateUniqueId();
+    let jitsiMeetId = generateUniqueId();
     logger.log("generated id", jitsiMeetId);
 
     return jitsiMeetId;
@@ -35,90 +38,92 @@ function generateJitsiMeetId() {
  * @returns {string} fake random username
  */
 function generateCallStatsUsername() {
-    var username = UsernameGenerator.generateUsername();
+    let username = UsernameGenerator.generateUsername();
     logger.log('generated callstats uid', username);
 
     return username;
 }
 
-function Settings() {
-    this.userId;
-    this.callStatsUserName;
-
-    var 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();
+class Settings {
+    constructor() {
+        this.userId;
+        this.callStatsUserName;
+
+        var 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();
+        }
     }
-}
 
-/**
- * Save settings to localStorage if browser supports that.
- */
-Settings.prototype.save = function () {
-    var localStorage = getLocalStorage();
-    if (localStorage) {
-        localStorage.setItem('jitsiMeetId', this.userId);
-        localStorage.setItem('callStatsUserName', this.callStatsUserName);
+    /**
+     * Save settings to localStorage if browser supports that.
+     */
+    save () {
+        var localStorage = getLocalStorage();
+        if (localStorage) {
+            localStorage.setItem('jitsiMeetId', this.userId);
+            localStorage.setItem('callStatsUserName', this.callStatsUserName);
+        }
     }
-};
 
-/**
- * Returns current user id.
- * @returns {string} user id
- */
-Settings.prototype.getUserId = function () {
-    return this.userId;
-};
+    /**
+     * Returns current machine id.
+     * @returns {string} machine id
+     */
+    getMachineId () {
+        return this.userId;
+    }
 
-/**
- * Returns fake username for callstats
- * @returns {string} fake username for callstats
- */
-Settings.prototype.getCallStatsUserName = function () {
-    return this.callStatsUserName;
-};
+    /**
+     * Returns fake username for callstats
+     * @returns {string} fake username for callstats
+     */
+    getCallStatsUserName () {
+        return this.callStatsUserName;
+    }
 
-/**
- * Save current session id.
- * @param {string} sessionId session id
- */
-Settings.prototype.setSessionId = function (sessionId) {
-    var localStorage = getLocalStorage();
-    if (localStorage) {
-        if (sessionId) {
-            localStorage.setItem('sessionId', sessionId);
-        } else {
-            localStorage.removeItem('sessionId');
+    /**
+     * Save current session id.
+     * @param {string} sessionId session id
+     */
+    setSessionId (sessionId) {
+        let localStorage = getLocalStorage();
+        if (localStorage) {
+            if (sessionId) {
+                localStorage.setItem('sessionId', sessionId);
+            } else {
+                localStorage.removeItem('sessionId');
+            }
         }
     }
-};
 
-/**
- * Clear current session id.
- */
-Settings.prototype.clearSessionId = function () {
-    this.setSessionId(undefined);
-};
+    /**
+     * Clear current session id.
+     */
+    clearSessionId () {
+        this.setSessionId(undefined);
+    }
 
-/**
- * Returns current session id.
- * @returns {string} current session id
- */
-Settings.prototype.getSessionId = function () {
-    // We may update sessionId in localStorage from another JitsiConference
-    // instance and that's why we should always re-read it.
-    var localStorage = getLocalStorage();
-    return localStorage ? localStorage.getItem('sessionId') : undefined;
-};
-
-module.exports = Settings;
+    /**
+     * 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.
+        let localStorage = getLocalStorage();
+        return localStorage ? localStorage.getItem('sessionId') : undefined;
+    }
+}
+
+export default new Settings();

modules/statistics/AnalyticsAdapter.js

@@ -1,100 +1,110 @@
-var RTCBrowserType = require("../RTC/RTCBrowserType");
+/**
+ * Interface for analytics handlers.
+ */
+class AnalyticsAbstract {
+    sendEvent() {}
+}
+
+/**
+ * Handler that caches all the events.
+ * @extends AnalyticsAbstract
+ */
+class CacheAnalytics extends AnalyticsAbstract {
+    constructor() {
+        super();
+        // some events may happen before init or implementation script download
+        // in this case we accumulate them in this array and send them on init
+        this.eventCache = [];
+    }
 
-function NoopAnalytics() {}
-NoopAnalytics.prototype.sendEvent = function () {};
+    /**
+     * Cache analytics event.
+     * @param {String} action the name of the event
+     * @param {Object} data can be any JSON object
+     */
+    sendEvent(action, data = {}) {
+        this.eventCache.push({
+            action: action,
+            data: data
+        });
+    }
 
-function AnalyticsAdapter() {
-    this.browserName = RTCBrowserType.getBrowserName();
     /**
-     * Map of properties that will be added to every event
+     * Clears the cached events.
+     * @returns {Array} with the cached events.
      */
-    this.permanentProperties = {};
+    drainCachedEvents() {
+        let eventCacheCopy = this.eventCache.slice();
+        this.eventCache = [];
+        return eventCacheCopy;
+    }
+
 }
 
-// some events may happen before init or implementation script download
-// in this case we accumulate them in this array and send them on init
-AnalyticsAdapter.eventsQueue = [];
+let cacheAnalytics = new CacheAnalytics();
 
 /**
- * Sends analytics event.
- * @param {String} action the name of the event
- * @param {Object} data can be any JSON object
+ * This class will store and manage the handlers that are going to be used.
  */
-AnalyticsAdapter.prototype.sendEvent = function (action, data = {}) {
-    if(this._checkAnalyticsAndMaybeCacheEvent(action, data)) {
-        data.browserName = this.browserName;
-        try {
-            this.analytics.sendEvent(action,
-                Object.assign({}, this.permanentProperties, data));
-        } catch (ignored) { // eslint-disable-line no-empty
-        }
-    }
-};
+class AnalyticsAdapter {
+    constructor() {
+        this.analyticsHandlers = new Set();
 
-/**
- * Since we asynchronously load the integration of the analytics API and the
- * analytics API may asynchronously load its implementation (e.g. Google
- * Analytics), we cannot make the decision with respect to which analytics
- * implementation we will use here and we have to postpone it i.e. we will make
- * a lazy decision, will wait for loaded or dispose methods to be called.
- * in the meantime we accumulate any events received. We should call this
- * method before trying to send the event.
- * @param action
- * @param data
- */
-AnalyticsAdapter.prototype._checkAnalyticsAndMaybeCacheEvent
-= function (action, data) {
-    if (this.analytics === null || typeof this.analytics === 'undefined') {
-        // missing this.analytics but have window implementation, let's use it
-        if (window.Analytics) {
-            this.loaded();
-        }
-        else {
-            AnalyticsAdapter.eventsQueue.push({
-                action: action,
-                data: data
-            });
-            // stored, lets break here
-            return false;
-        }
+        /**
+         * Map of properties that will be added to every event
+         */
+        this.permanentProperties = Object.create(null);
     }
-    return true;
-};
 
+    /**
+     * Initializes the AnalyticsAdapter. Adds the cacheAnalytics handler to
+     * cache all the events until we have other handlers that are going to send
+     * them.
+     */
+    init(browserName) {
+        this.browserName = browserName;
+        this.analyticsHandlers.add(cacheAnalytics);
+    }
 
-/**
- * Dispose analytics. Clears any available queue element and sets
- * NoopAnalytics to be used.
- */
-AnalyticsAdapter.prototype.dispose = function () {
-    this.analytics = new NoopAnalytics();
-    AnalyticsAdapter.eventsQueue.length = 0;
-};
-
-/**
- * Adds map of properties that will be added to every event.
- * @param {Object} properties the map of properties
- */
-AnalyticsAdapter.prototype.addPermanentProperties = function (properties) {
-    this.permanentProperties
-        = Object.assign(this.permanentProperties, properties);
-};
+    /**
+     * Sends analytics event.
+     * @param {String} action the name of the event
+     * @param {Object} data can be any JSON object
+     */
+    sendEvent(action, data = {}) {
+        let modifiedData = Object.assign(
+            {browserName: this.browserName}, this.permanentProperties, data);
+        this.analyticsHandlers.forEach(
+            analytics => analytics.sendEvent(action, modifiedData));
+    }
 
-/**
- * Loaded analytics script. Sens queued events.
- */
-AnalyticsAdapter.prototype.loaded = function () {
-    var AnalyticsImpl = window.Analytics || NoopAnalytics;
+    /**
+     * Dispose analytics. Clears all handlers.
+     */
+    dispose() {
+        cacheAnalytics.drainCachedEvents();
+        this.analyticsHandlers.clear();
+    }
 
-    this.analytics = new AnalyticsImpl();
+    /**
+     * Sets the handlers that are going to be used to send analytics and send
+     * the cached events.
+     * @param {Array} handlers the handlers
+     */
+    setAnalyticsHandlers (handlers) {
+        this.analyticsHandlers = new Set(handlers);
+        cacheAnalytics.drainCachedEvents().forEach(
+            ev => this.sendEvent(ev.action, ev.data));
+    }
 
-    // new analytics lets send all events if any
-    if (AnalyticsAdapter.eventsQueue.length) {
-        AnalyticsAdapter.eventsQueue.forEach(function (event) {
-            this.sendEvent(event.action, event.data);
-        }.bind(this));
-        AnalyticsAdapter.eventsQueue.length = 0;
+    /**
+     * Adds map of properties that will be added to every event.
+     * @param {Object} properties the map of properties
+     */
+    addPermanentProperties (properties) {
+        this.permanentProperties
+            = Object.assign(this.permanentProperties, properties);
     }
-};
+}
 
-module.exports = new AnalyticsAdapter();
+export default new AnalyticsAdapter();

modules/statistics/CallStats.js

@@ -1,6 +1,7 @@
 /* global $, Strophe, callstats */
 var logger = require("jitsi-meet-logger").getLogger(__filename);
 var GlobalOnErrorHandler = require("../util/GlobalOnErrorHandler");
+import Settings from "../settings/Settings";
 
 var jsSHA = require('jssha');
 var io = require('socket.io-client');
@@ -138,11 +139,9 @@ function _try_catch (f) {
 /**
  * Creates new CallStats instance that handles all callstats API calls.
  * @param peerConnection {JingleSessionPC} the session object
- * @param Settings {Settings} the settings instance. Declared in
- * /modules/settings/Settings.js
  * @param options {object} credentials for callstats.
  */
-var CallStats = _try_catch(function(jingleSession, Settings, options) {
+var CallStats = _try_catch(function(jingleSession, options) {
     try{
         CallStats.feedbackEnabled = false;
         callStats = new callstats($, io, jsSHA); // eslint-disable-line new-cap
@@ -153,7 +152,7 @@ var CallStats = _try_catch(function(jingleSession, Settings, options) {
             aliasName: Strophe.getResourceFromJid(jingleSession.room.myroomjid),
             userName: Settings.getCallStatsUserName()
         };
-        
+
         // The confID is case sensitive!!!
         this.confID = options.callStatsConfIDNamespace + "/" + options.roomName;
 

modules/statistics/statistics.js

@@ -1,5 +1,5 @@
 /* global require */
-var AnalyticsAdapter = require("./AnalyticsAdapter");
+import analytics from "./AnalyticsAdapter";
 var CallStats = require("./CallStats");
 var EventEmitter = require("events");
 import JitsiTrackError from "../../JitsiTrackError";
@@ -34,30 +34,6 @@ function loadCallStatsAPI(customScriptUrl) {
     // have loaded by the time we needed it (i.e. CallStats.init is invoked).
 }
 
-// Load the integration of a third-party analytics API such as Google Analytics.
-// Since we cannot guarantee the quality of the third-party service (e.g. their
-// server may take noticeably long time to respond), it is in our best interest
-// (in the sense that the intergration of the analytics API is important to us
-// but not enough to allow it to prevent people from joining a conference) to
-// download the API asynchronously. Additionally, Google Analytics will download
-// its implementation asynchronously anyway so it makes sense to append the
-// loading on our side rather than prepend it.
-function loadAnalytics(customScriptUrl) {
-    // if we have a custom script url passed as parameter we don't want to
-    // search it relatively near the library
-    ScriptUtil.loadScript(
-        customScriptUrl ? customScriptUrl : 'analytics.js',
-        /* async */ true,
-        /* prepend */ false,
-        /* relativeURL */ customScriptUrl ? false : true,
-        /* loadCallback */ function () {
-            Statistics.analytics.loaded();
-        },
-        /* errorCallback */ function () {
-            Statistics.analytics.dispose();
-        });
-}
-
 /**
  * callstats strips any additional fields from Error except for "name", "stack",
  * "message" and "constraintName". So we need to bundle additional information
@@ -100,10 +76,6 @@ Statistics.init = function (options) {
 
     Statistics.disableThirdPartyRequests = options.disableThirdPartyRequests;
 
-    if (Statistics.disableThirdPartyRequests !== true)
-        loadAnalytics(options.analyticsScriptUrl);
-    else // if not enable make sure we dispose any event that goes in the queue
-        Statistics.analytics.dispose();
 };
 
 function Statistics(xmpp, options) {
@@ -127,7 +99,7 @@ function Statistics(xmpp, options) {
 Statistics.audioLevelsEnabled = false;
 Statistics.audioLevelsInterval = 200;
 Statistics.disableThirdPartyRequests = false;
-Statistics.analytics = AnalyticsAdapter;
+Statistics.analytics = analytics;
 
 /**
  * Array of callstats instances. Used to call Statistics static methods and
@@ -222,14 +194,12 @@ Statistics.prototype.stopRemoteStats = function () {
 /**
  * Initializes the callstats.io API.
  * @param peerConnection {JingleSessionPC} the session object
- * @param Settings {Settings} the settings instance. Declared in
- * /modules/settings/Settings.js
  */
-Statistics.prototype.startCallStats = function (session, settings) {
+Statistics.prototype.startCallStats = function (session) {
     if(this.callStatsIntegrationEnabled && !this.callStatsStarted) {
         // Here we overwrite the previous instance, but it must be bound to
         // the new PeerConnection
-        this.callstats = new CallStats(session, settings, this.options);
+        this.callstats = new CallStats(session, this.options);
         Statistics.callsStatsInstances.push(this.callstats);
         this.callStatsStarted = true;
     }

modules/xmpp/ChatRoom.js

@@ -61,7 +61,7 @@ function filterNodeFromPresenceJSON(pres, nodeName){
     return res;
 }
 
-function ChatRoom(connection, jid, password, XMPP, options, settings) {
+function ChatRoom(connection, jid, password, XMPP, options) {
     this.eventEmitter = new EventEmitter();
     this.xmpp = XMPP;
     this.connection = connection;
@@ -78,7 +78,7 @@ function ChatRoom(connection, jid, password, XMPP, options, settings) {
     this.noBridgeAvailable = false;
     this.options = options || {};
     this.moderator = new Moderator(this.roomjid, this.xmpp, this.eventEmitter,
-        settings, {connection: this.xmpp.options, conference: this.options});
+        {connection: this.xmpp.options, conference: this.options});
     this.initPresenceMap();
     this.session = null;
     this.lastPresences = {};

modules/xmpp/moderator.js

@@ -5,6 +5,7 @@ var XMPPEvents = require("../../service/xmpp/XMPPEvents");
 var AuthenticationEvents
     = require("../../service/authentication/AuthenticationEvents");
 var GlobalOnErrorHandler = require("../util/GlobalOnErrorHandler");
+import Settings from "../settings/Settings";
 
 function createExpBackoffTimer(step) {
     var count = 1;
@@ -21,14 +22,13 @@ function createExpBackoffTimer(step) {
     };
 }
 
-function Moderator(roomName, xmpp, emitter, settings, options) {
+function Moderator(roomName, xmpp, emitter, options) {
     this.roomName = roomName;
     this.xmppService = xmpp;
     this.getNextTimeout = createExpBackoffTimer(1000);
     this.getNextErrorTimeout = createExpBackoffTimer(1000);
     // External authentication stuff
     this.externalAuthEnabled = false;
-    this.settings = settings;
     this.options = options;
 
     // Sip gateway can be enabled by configuring Jigasi host in config.js or
@@ -50,7 +50,7 @@ function Moderator(roomName, xmpp, emitter, settings, options) {
                     event.origin);
                 return;
             }
-            settings.setSessionId(event.data.sessionId);
+            Settings.setSessionId(event.data.sessionId);
             // After popup is closed we will authenticate
         }
     }
@@ -109,8 +109,8 @@ Moderator.prototype.createConferenceIq =  function () {
     var elem = $iq({to: this.getFocusComponent(), type: 'set'});
 
     // Session Id used for authentication
-    var sessionId = this.settings.getSessionId();
-    var machineUID = this.settings.getUserId();
+    var sessionId = Settings.getSessionId();
+    var machineUID = Settings.getMachineId();
 
     logger.info(
             "Session ID: " + sessionId + " machine UID: " + machineUID);
@@ -251,7 +251,7 @@ Moderator.prototype.parseSessionId =  function (resultIq) {
     var sessionId = $(resultIq).find('conference').attr('session-id');
     if (sessionId) {
         logger.info('Received sessionId:  ' + sessionId);
-        this.settings.setSessionId(sessionId);
+        Settings.setSessionId(sessionId);
     }
 };
 
@@ -307,15 +307,10 @@ Moderator.prototype.allocateConferenceFocus =  function (callback) {
     // Try to use focus user JID from the config
     this.setFocusUserJid(this.options.connection.focusUserJid);
     // Send create conference IQ
-    var self = this;
     this.connection.sendIQ(
         this.createConferenceIq(),
-        function (result) {
-            self._allocateConferenceFocusSuccess(result, callback);
-        },
-        function (error) {
-            self._allocateConferenceFocusError(error, callback);
-        });
+        result => this._allocateConferenceFocusSuccess(result, callback),
+        error => this._allocateConferenceFocusError(error, callback));
     // XXX We're pressed for time here because we're beginning a complex and/or
     // lengthy conference-establishment process which supposedly involves
     // multiple RTTs. We don't have the time to wait for Strophe to decide to
@@ -333,17 +328,15 @@ Moderator.prototype.allocateConferenceFocus =  function (callback) {
  * successful allocation of the conference focus
  */
 Moderator.prototype._allocateConferenceFocusError = function (error, callback) {
-    var self = this;
-
     // If the session is invalid, remove and try again without session ID to get
     // a new one
     var invalidSession = $(error).find('>error>session-invalid').length;
     if (invalidSession) {
         logger.info("Session expired! - removing");
-        self.settings.clearSessionId();
+        Settings.clearSessionId();
     }
     if ($(error).find('>error>graceful-shutdown').length) {
-        self.eventEmitter.emit(XMPPEvents.GRACEFUL_SHUTDOWN);
+        this.eventEmitter.emit(XMPPEvents.GRACEFUL_SHUTDOWN);
         return;
     }
     // Check for error returned by the reservation system
@@ -356,7 +349,7 @@ Moderator.prototype._allocateConferenceFocusError = function (error, callback) {
         if (errorTextNode) {
             errorMsg = errorTextNode.text();
         }
-        self.eventEmitter.emit(
+        this.eventEmitter.emit(
                 XMPPEvents.RESERVATION_ERROR, errorCode, errorMsg);
         return;
     }
@@ -364,43 +357,37 @@ Moderator.prototype._allocateConferenceFocusError = function (error, callback) {
     if ($(error).find('>error>not-authorized').length) {
         logger.warn("Unauthorized to start the conference", error);
         var toDomain = Strophe.getDomainFromJid(error.getAttribute('to'));
-        if (toDomain !== self.options.connection.hosts.anonymousdomain) {
+        if (toDomain !== this.options.connection.hosts.anonymousdomain) {
             //FIXME "is external" should come either from the focus or config.js
-            self.externalAuthEnabled = true;
+            this.externalAuthEnabled = true;
         }
-        self.eventEmitter.emit(
+        this.eventEmitter.emit(
                 XMPPEvents.AUTHENTICATION_REQUIRED,
-                function () {
-                    self.allocateConferenceFocus(callback);
-                });
+                () => this.allocateConferenceFocus(callback));
         return;
     }
     if(this.retries >= this.maxRetries) {
-        self.eventEmitter.emit(
+        this.eventEmitter.emit(
                 XMPPEvents.ALLOCATE_FOCUS_MAX_RETRIES_ERROR);
         return;
     }
     this.retries++;
-    var waitMs = self.getNextErrorTimeout();
+    var waitMs = this.getNextErrorTimeout();
     var errmsg = "Focus error, retry after "+ waitMs;
     GlobalOnErrorHandler.callErrorHandler(new Error(errmsg));
     logger.error(errmsg, error);
     // Show message
-    var focusComponent = self.getFocusComponent();
+    var focusComponent = this.getFocusComponent();
     var retrySec = waitMs / 1000;
     //FIXME: message is duplicated ? Do not show in case of session invalid
     // which means just a retry
     if (!invalidSession) {
-        self.eventEmitter.emit(
+        this.eventEmitter.emit(
                 XMPPEvents.FOCUS_DISCONNECTED, focusComponent, retrySec);
     }
     // Reset response timeout
-    self.getNextTimeout(true);
-    window.setTimeout(
-            function () {
-                self.allocateConferenceFocus(callback);
-            },
-            waitMs);
+    this.getNextTimeout(true);
+    window.setTimeout( () => this.allocateConferenceFocus(callback), waitMs);
 };
 
 /**
@@ -428,24 +415,19 @@ Moderator.prototype._allocateConferenceFocusSuccess = function (
     } else {
         var waitMs = this.getNextTimeout();
         logger.info("Waiting for the focus... " + waitMs);
-        var self = this;
-        window.setTimeout(
-                function () {
-                    self.allocateConferenceFocus(callback);
-                },
-                waitMs);
+        window.setTimeout(() => this.allocateConferenceFocus(callback),
+            waitMs);
     }
 };
 
 Moderator.prototype.authenticate = function () {
-    var self = this;
-    return new Promise(function (resolve, reject) {
-        self.connection.sendIQ(
-            self.createConferenceIq(),
-            function (result) {
-                self.parseSessionId(result);
+    return new Promise((resolve, reject) => {
+        this.connection.sendIQ(
+            this.createConferenceIq(),
+            result => {
+                this.parseSessionId(result);
                 resolve();
-            }, function (error) {
+            }, error => {
                 var code = $(error).find('>error').attr('code');
                 reject(error, code);
             }
@@ -469,7 +451,7 @@ Moderator.prototype._getLoginUrl = function (popup, urlCb, failureCb) {
     var attrs = {
         xmlns: 'http://jitsi.org/protocol/focus',
         room: this.roomName,
-        'machine-uid': this.settings.getUserId()
+        'machine-uid': Settings.getMachineId()
     };
     var str = 'auth url'; // for logger
     if (popup) {
@@ -511,7 +493,7 @@ Moderator.prototype.getPopupLoginUrl = function (urlCallback, failureCallback) {
 
 Moderator.prototype.logout =  function (callback) {
     var iq = $iq({to: this.getFocusComponent(), type: 'set'});
-    var sessionId = this.settings.getSessionId();
+    var sessionId = Settings.getSessionId();
     if (!sessionId) {
         callback();
         return;
@@ -528,7 +510,7 @@ Moderator.prototype.logout =  function (callback) {
                 logoutUrl = decodeURIComponent(logoutUrl);
             }
             logger.info("Log out OK, url: " + logoutUrl, result);
-            this.settings.clearSessionId();
+            Settings.clearSessionId();
             callback(logoutUrl);
         }.bind(this),
         function (error) {

modules/xmpp/strophe.emuc.js

@@ -31,7 +31,7 @@ class MucConnectionPlugin extends ConnectionPlugin {
             'http://jitsi.org/jitmeet/audio', 'iq', 'set',null,null);
     }
 
-    createRoom (jid, password, options, settings) {
+    createRoom (jid, password, options) {
         const roomJid = Strophe.getBareJidFromJid(jid);
         if (this.rooms[roomJid]) {
             const errmsg = "You are already in the room!";
@@ -39,7 +39,7 @@ class MucConnectionPlugin extends ConnectionPlugin {
             throw new Error(errmsg);
         }
         this.rooms[roomJid] = new ChatRoom(this.connection, jid,
-            password, this.xmpp, options, settings);
+            password, this.xmpp, options);
         return this.rooms[roomJid];
     }
 

modules/xmpp/xmpp.js

@@ -251,7 +251,7 @@ export default class XMPP {
         return this._connect(jid, password);
     }
 
-    createRoom (roomName, options, settings) {
+    createRoom (roomName, options) {
         // By default MUC nickname is the resource part of the JID
         let mucNickname = Strophe.getNodeFromJid(this.connection.jid);
         let roomjid = roomName  + "@" + this.options.hosts.muc + "/";
@@ -273,8 +273,7 @@ export default class XMPP {
 
         roomjid += mucNickname;
 
-        return this.connection.emuc.createRoom(roomjid, null, options,
-            settings);
+        return this.connection.emuc.createRoom(roomjid, null, options);
     }
 
     addListener (type, listener) {