Ref/move feature flags init

JitsiConnection.js

@@ -1,5 +1,6 @@
 import JitsiConference from './JitsiConference';
 import * as JitsiConnectionEvents from './JitsiConnectionEvents';
+import FeatureFlags from './modules/flags/FeatureFlags';
 import Statistics from './modules/statistics/statistics';
 import XMPP from './modules/xmpp/xmpp';
 import {
@@ -21,6 +22,10 @@ export default function JitsiConnection(appID, token, options) {
     this.appID = appID;
     this.token = token;
     this.options = options;
+
+    // Initialize the feature flags so that they are advertised through the disco-info.
+    FeatureFlags.init(options.flags || {});
+
     this.xmpp = new XMPP(options, token);
 
     /* eslint-disable max-params */

JitsiMeetJS.ts

@@ -150,10 +150,6 @@ export default {
 
         Settings.init(options.externalStorage);
         Statistics.init(options);
-        const flags = options.flags || {};
-
-        // Configure the feature flags.
-        FeatureFlags.init(flags);
 
         // Initialize global window.connectionTimes
         // FIXME do not use 'window'

modules/flags/FeatureFlags.js → modules/flags/FeatureFlags.ts

@@ -1,22 +1,22 @@
-
 import browser from '../browser';
 
 /**
  * A global module for accessing information about different feature flags state.
  */
 class FeatureFlags {
+    private _runInLiteMode: boolean;
+    private _ssrcRewriting: boolean;
+
     /**
      * Configures the module.
      *
      * @param {object} flags - The feature flags.
      * @param {boolean=} flags.runInLiteMode - Enables lite mode for testing to disable media decoding.
      * @param {boolean=} flags.ssrcRewritingEnabled - Use SSRC rewriting.
-     * @param {boolean=} flags.enableJoinAsVisitor - Enable joining as a visitor.
      */
-    init(flags) {
+    init(flags: { runInLiteMode?: boolean | undefined; ssrcRewritingEnabled?: boolean | undefined; }) {
         this._runInLiteMode = Boolean(flags.runInLiteMode);
         this._ssrcRewriting = Boolean(flags.ssrcRewritingEnabled);
-        this._joinAsVisitor = Boolean(flags.enableJoinAsVisitor ?? true);
     }
 
     /**
@@ -26,25 +26,17 @@ class FeatureFlags {
      *
      * @returns {boolean}
      */
-    isRunInLiteModeEnabled() {
+    isRunInLiteModeEnabled(): boolean {
         return this._runInLiteMode && browser.supportsInsertableStreams();
     }
 
     /**
      * Checks if the clients supports re-writing of the SSRCs on the media streams by the bridge.
      * @returns {boolean}
      */
-    isSsrcRewritingSupported() {
+    isSsrcRewritingSupported(): boolean {
         return this._ssrcRewriting;
     }
-
-    /**
-     * Checks if the clients supports joining as a visitor.
-     * @returns {boolean}
-     */
-    isJoinAsVisitorSupported() {
-        return this._joinAsVisitor;
-    }
 }
 
 export default new FeatureFlags();

modules/xmpp/moderator.js

@@ -4,7 +4,6 @@ import $ from 'jquery';
 import { $iq } from 'strophe.js';
 
 import { CONNECTION_REDIRECTED } from '../../JitsiConnectionEvents';
-import FeatureFlags from '../flags/FeatureFlags';
 import Settings from '../settings/Settings';
 import Listenable from '../util/Listenable';
 
@@ -190,7 +189,7 @@ export default class Moderator extends Listenable {
             conferenceRequest.sessionId = sessionId;
         }
 
-        if (FeatureFlags.isJoinAsVisitorSupported() && !config.iAmRecorder && !config.iAmSipGateway) {
+        if (!config.iAmRecorder && !config.iAmSipGateway) {
             conferenceRequest.properties['visitors-version'] = 1;
 
             if (this.options.preferVisitor) {

modules/xmpp/xmpp.js

@@ -263,9 +263,7 @@ export default class XMPP extends Listenable {
         // the version added in moderator.js, this one here is mostly defined
         // for keeping stats, since it is not made available to jocofo at
         // the time of the initial conference-request.
-        if (FeatureFlags.isJoinAsVisitorSupported()) {
-            this.caps.addFeature('http://jitsi.org/visitors-1');
-        }
+        this.caps.addFeature('http://jitsi.org/visitors-1');
     }
 
     /**