Beautify URLProcessor

modules/config/URLProcessor.js

@@ -1,69 +1,93 @@
 /* global config, interfaceConfig, loggingConfig */
 
-const logger = require("jitsi-meet-logger").getLogger(__filename);
+import { parseURLParams } from '../../react/features/base/config';
-
-import { getConfigParamsFromUrl } from '../../react/features/base/config';
 
 import configUtils from './Util';
 
-// Parsing config params from URL hash.
+const logger = require("jitsi-meet-logger").getLogger(__filename);
-const URL_PARAMS = getConfigParamsFromUrl(window.location);
 
-var URLProcessor = {
+/**
-    setConfigParametersFromUrl: function () {
+ *  URL params with this prefix should be merged to config.
-        // Convert 'params' to JSON object
+ */
-        // We have:
+const CONFIG_PREFIX = 'config.';
-        // {
+
-        //   "config.disableAudioLevels": false,
+/**
-        //   "config.channelLastN": -1,
+ *  URL params with this prefix should be merged to interface config.
-        //   "interfaceConfig.APP_NAME": "Jitsi Meet"
+ */
-        // }
+const INTERFACE_CONFIG_PREFIX = 'interfaceConfig.';
-        // We want to have:
+
-        // {
+/**
-        //   "config": {
+ * Config keys to be ignored.
-        //     "disableAudioLevels": false,
+ *
-        //     "channelLastN": -1
+ * @type Set
-        //   },
+ */
-        //   interfaceConfig: {
+const KEYS_TO_IGNORE = new Set([
-        //     APP_NAME: "Jitsi Meet"
+    'analyticsScriptUrls',
-        //   }
+    'callStatsCustomScriptUrl'
-        // }
+]);
-        var configJSON = {
+
-            config: {},
+/**
-            interfaceConfig: {},
+ *  URL params with this prefix should be merged to logging config.
-            loggingConfig: {}
+ */
-        };
+const LOGGING_CONFIG_PREFIX = 'loggingConfig.';
-        for (var key in URL_PARAMS) {
+
-            if (typeof key !== "string") {
+/**
-                logger.warn("Invalid config key: ", key);
+ * Convert 'URL_PARAMS' to JSON object
-                continue;
+ * We have:
-            }
+ * {
-            var confObj = null, confKey;
+ *      "config.disableAudioLevels": false,
-            if (key.indexOf("config.") === 0) {
+ *      "config.channelLastN": -1,
+ *      "interfaceConfig.APP_NAME": "Jitsi Meet"
+ * }
+ * We want to have:
+ * {
+ *      "config": {
+ *          "disableAudioLevels": false,
+ *          "channelLastN": -1
+ *      },
+ *      interfaceConfig: {
+ *          "APP_NAME": "Jitsi Meet"
+ *      }
+ * }
+ */
+export function setConfigParametersFromUrl() {
+    // Parsing config params from URL hash.
+    const params = parseURLParams(window.location);
+
+    const configJSON = {
+        config: {},
+        interfaceConfig: {},
+        loggingConfig: {}
+    };
+
+    for (const key in params) {
+        if (typeof key === 'string') {
+            let confObj = null;
+            let confKey;
+
+            if (key.indexOf(CONFIG_PREFIX) === 0) {
                 confObj = configJSON.config;
-                confKey = key.substr("config.".length);
+                confKey = key.substr(CONFIG_PREFIX.length);
 
-                // prevent passing some parameters which can inject scripts
+            } else if (key.indexOf(INTERFACE_CONFIG_PREFIX) === 0) {
-                if (confKey === 'analyticsScriptUrls'
-                    || confKey === 'callStatsCustomScriptUrl')
-                    continue;
-
-            } else if (key.indexOf("interfaceConfig.") === 0) {
                 confObj = configJSON.interfaceConfig;
-                confKey = key.substr("interfaceConfig.".length);
+                confKey
-            } else if (key.indexOf("loggingConfig.") === 0) {
+                    = key.substr(INTERFACE_CONFIG_PREFIX.length);
+            } else if (key.indexOf(LOGGING_CONFIG_PREFIX) === 0) {
                 confObj = configJSON.loggingConfig;
-                confKey = key.substr("loggingConfig.".length);
+                confKey = key.substr(LOGGING_CONFIG_PREFIX.length);
             }
 
-            if (!confObj)
+            // prevent passing some parameters which can inject scripts
-                continue;
+            if (confObj && !KEYS_TO_IGNORE.has(confKey)) {
-
+                confObj[confKey] = params[key];
-            confObj[confKey] = URL_PARAMS[key];
+            }
+        } else {
+            logger.warn('Invalid config key: ', key);
         }
-        configUtils.overrideConfigJSON(
-            config, interfaceConfig, loggingConfig, configJSON);
     }
-};
 
-module.exports = URLProcessor;
+    configUtils.overrideConfigJSON(
+        config, interfaceConfig, loggingConfig,
+        configJSON);
+}

react/features/base/lib-jitsi-meet/functions.js

@@ -1,6 +1,8 @@
 import { loadScript } from '../../base/util';
 
-import URLProcessor from '../../../../modules/config/URLProcessor';
+import {
+    setConfigParametersFromUrl
+} from '../../../../modules/config/URLProcessor';
 
 import JitsiMeetJS from './_';
 
@@ -44,7 +46,7 @@ export function loadConfig(host: string, path: string = '/config.js') {
         // but URLProcessor still deals with the global variables config,
         // interfaceConfig, and loggingConfig and loadConfig. As the latter will
         // surely change in the future, so will the former then.
-        URLProcessor.setConfigParametersFromUrl();
+        setConfigParametersFromUrl();
 
         return Promise.resolve(window.config);
     }