ref(browser): Use js-utils.

modules/browser/BrowserCapabilities.js

@@ -1,7 +1,9 @@
-import BrowserDetection from './BrowserDetection';
-import capabilitiesDB from './capabilities.json';
+import { getLogger } from 'jitsi-meet-logger';
+import { BrowserDetection } from 'js-utils';
 
-// TODO: All methods should use capabilities.json when possible.
+const logger = getLogger(__filename);
+
+// TODO: Move this code to js-utils.
 
 // NOTE: Now we are extending BrowserDetection in order to preserve
 // RTCBrowserType interface but maybe it worth exporting BrowserCapabilities
@@ -13,52 +15,11 @@ import capabilitiesDB from './capabilities.json';
 export default class BrowserCapabilities extends BrowserDetection {
     /**
      * Creates new BrowserCapabilities instance.
-     *
-     * @param {boolean} [isUsingIFrame] - True if Jitsi Meet is loaded in iframe
-     * and false otherwise.
-     * @param {Object} [browserInfo] - Information about the browser.
-     * @param {string} browserInfo.name - The name of the browser.
-     * @param {string} browserInfo.version - The version of the browser.
      */
-    constructor(isUsingIFrame = false, browserInfo) {
-        super(browserInfo);
-
-        const browserCapabilities = capabilitiesDB[this.getName()] || [];
-        let capabilitiesByVersion;
-
-        for (let i = 0; i < browserCapabilities.length; i++) {
-            const capabilities = browserCapabilities[i];
-
-            if (typeof capabilities !== 'object') {
-                // eslint-disable-next-line no-continue
-                continue;
-            }
-
-            const version = capabilities.version;
-
-            if (!version || !this.isVersionGreaterThan(version)) {
-                capabilitiesByVersion = capabilities;
-                break;
-            }
-        }
-
-        if (!capabilitiesByVersion || !capabilitiesByVersion.capabilities) {
-            this._capabilities = { isSupported: false };
-        } else if (isUsingIFrame) {
-            this._capabilities = {
-                ...capabilitiesByVersion.capabilities,
-                ...capabilitiesByVersion.iframeCapabilities
-            };
-        } else {
-            this._capabilities = capabilitiesByVersion.capabilities;
-        }
-
-        if (typeof this._capabilities.isSupported === 'undefined') {
-            // we have some capabilities but isSupported property is not filled.
-            this._capabilities.isSupported = true;
-        } else if (this._capabilities.isSupported === false) {
-            this._capabilities = { isSupported: false };
-        }
+    constructor() {
+        super();
+        logger.info(
+            `This appears to be ${this.getName()}, ver: ${this.getVersion()}`);
     }
 
     /**
@@ -96,15 +57,6 @@ export default class BrowserCapabilities extends BrowserDetection {
             && !this.isVersionLessThan('11');
     }
 
-    /**
-     * Checks whether the browser is supported by Jitsi Meet.
-     *
-     * @returns {boolean}
-     */
-    isSupported() {
-        return this._capabilities.isSupported;
-    }
-
     /**
      * Checks if Temasys RTC plugin is used.
      * @returns {boolean}
@@ -131,25 +83,6 @@ export default class BrowserCapabilities extends BrowserDetection {
         return this.isChrome() || this.isElectron();
     }
 
-
-    /**
-     * Checks whether the browser supports incoming audio.
-     *
-     * @returns {boolean}
-     */
-    supportsAudioIn() {
-        return this._capabilities.audioIn || false;
-    }
-
-    /**
-     * Checks whether the browser supports outgoing audio.
-     *
-     * @returns {boolean}
-     */
-    supportsAudioOut() {
-        return this._capabilities.audioOut || false;
-    }
-
     /**
      * Checks if the current browser reports upload and download bandwidth
      * statistics.
@@ -205,15 +138,6 @@ export default class BrowserCapabilities extends BrowserDetection {
         return !this.isFirefox();
     }
 
-    /**
-     * Checks whether the browser supports screen sharing.
-     *
-     * @returns {boolean}
-     */
-    supportsScreenSharing() {
-        return this._capabilities.screenSharing || false;
-    }
-
     /**
      * Whether jitsi-meet supports simulcast on the current browser.
      * @returns {boolean}
@@ -241,24 +165,6 @@ export default class BrowserCapabilities extends BrowserDetection {
         return !this.isSafariWithWebrtc();
     }
 
-    /**
-     * Checks whether the browser supports incomming video.
-     *
-     * @returns {boolean}
-     */
-    supportsVideoIn() {
-        return this._capabilities.videoIn || false;
-    }
-
-    /**
-     * Checks whether the browser supports incomming video.
-     *
-     * @returns {boolean}
-     */
-    supportsVideoOut() {
-        return this._capabilities.videoOut || false;
-    }
-
     /**
      * Checks if the browser uses plan B.
      *

modules/browser/BrowserDetection.js

@@ -1,302 +0,0 @@
-import bowser from 'bowser';
-import { getLogger } from 'jitsi-meet-logger';
-
-import {
-    CHROME,
-    OPERA,
-    FIREFOX,
-    INTERNET_EXPLORER,
-    EDGE,
-    SAFARI,
-    NWJS,
-    ELECTRON,
-    REACT_NATIVE
-} from './browsers';
-
-const logger = getLogger(__filename);
-
-/**
- * Maps the names of the browsers from bowser to the internal names defined in
- * ./browsers.js
- */
-const bowserNameToJitsiName = {
-    'Chrome': CHROME,
-    'Chromium': CHROME,
-    'Opera': OPERA,
-    'Firefox': FIREFOX,
-    'Internet Explorer': INTERNET_EXPLORER,
-    'Microsoft Edge': EDGE,
-    'Safari': SAFARI
-};
-
-/**
- * Detects Electron environment.
- *
- * @returns {Object} - The name (ELECTRON) and version.
- */
-function _detectElectron() {
-    const userAgent = navigator.userAgent;
-
-    if (userAgent.match(/Electron/)) {
-        const version = userAgent.match(/Electron\/([\d.]+)/)[1];
-
-        logger.info(`This appears to be Electron, ver: ${version}`);
-
-        return {
-            name: ELECTRON,
-            version
-        };
-    }
-}
-
-/**
- * Detects NWJS environment.
- *
- * @returns {Object} - The name (NWJS) and version.
- */
-function _detectNWJS() {
-    const userAgent = navigator.userAgent;
-
-    if (userAgent.match(/JitsiMeetNW/)) {
-        const version = userAgent.match(/JitsiMeetNW\/([\d.]+)/)[1];
-
-        logger.info(`This appears to be JitsiMeetNW, ver: ${version}`);
-
-        return {
-            name: NWJS,
-            version
-        };
-    }
-}
-
-/**
- * Detects React Native environment.
- * @returns {Object} - The name (REACT_NATIVE) and version
- */
-function _detectReactNative() {
-    const match
-        = navigator.userAgent.match(/\b(react[ \t_-]*native)(?:\/(\S+))?/i);
-    let version;
-
-    // If we're remote debugging a React Native app, it may be treated as
-    // Chrome. Check navigator.product as well and always return some version
-    // even if we can't get the real one.
-
-    if (match || navigator.product === 'ReactNative') {
-        let name;
-
-        if (match && match.length > 2) {
-            name = match[1];
-            version = match[2];
-        }
-        name || (name = 'react-native');
-        version || (version = 'unknown');
-        logger.info(`This appears to be ${name}, ver: ${version}`);
-
-        return {
-            name: REACT_NATIVE,
-            version
-        };
-    }
-}
-
-/**
- * Returns information about the current browser.
- *
- * @returns {Object} - The name and version of the browser.
- */
-function _detect() {
-    let browserInfo;
-    const detectors = [
-        _detectReactNative,
-        _detectElectron,
-        _detectNWJS
-    ];
-
-    // Try all browser detectors
-    for (let i = 0; i < detectors.length; i++) {
-        browserInfo = detectors[i]();
-        if (browserInfo) {
-            return browserInfo;
-        }
-    }
-
-    const { name, version } = bowser;
-
-    if (name in bowserNameToJitsiName) {
-        logger.info(`This appears to be ${name}, ver: ${version}`);
-
-        return {
-            name: bowserNameToJitsiName[name],
-            version
-        };
-    }
-
-    logger.warn('Browser type defaults to Safari ver 1');
-
-    return {
-        name: SAFARI,
-        version: '1'
-    };
-}
-
-/**
- * Implements browser detection.
- */
-export default class BrowserDetection {
-    /**
-     * Creates new BrowserDetection instance.
-     *
-     * @param {Object} [browserInfo] - Information about the browser.
-     * @param {string} browserInfo.name - The name of the browser.
-     * @param {string} browserInfo.version - The version of the browser.
-     */
-    constructor(browserInfo = _detect()) {
-        const { name, version } = browserInfo;
-
-        this._name = name;
-        this._version = version;
-    }
-
-    /**
-     * Gets current browser name.
-     * @returns {string}
-     */
-    getName() {
-        return this._name;
-    }
-
-    /**
-     * Checks if current browser is Chrome.
-     * @returns {boolean}
-     */
-    isChrome() {
-        return this._name === CHROME;
-    }
-
-    /**
-     * Checks if current browser is Opera.
-     * @returns {boolean}
-     */
-    isOpera() {
-        return this._name === OPERA;
-    }
-
-    /**
-     * Checks if current browser is Firefox.
-     * @returns {boolean}
-     */
-    isFirefox() {
-        return this._name === FIREFOX;
-    }
-
-    /**
-     * Checks if current browser is Internet Explorer.
-     * @returns {boolean}
-     */
-    isIExplorer() {
-        return this._name === INTERNET_EXPLORER;
-    }
-
-    /**
-     * Checks if current browser is Microsoft Edge.
-     * @returns {boolean}
-     */
-    isEdge() {
-        return this._name === EDGE;
-    }
-
-    /**
-     * Checks if current browser is Safari.
-     * @returns {boolean}
-     */
-    isSafari() {
-        return this._name === SAFARI;
-    }
-
-    /**
-     * Checks if current environment is NWJS.
-     * @returns {boolean}
-     */
-    isNWJS() {
-        return this._name === NWJS;
-    }
-
-    /**
-     * Checks if current environment is Electron.
-     * @returns {boolean}
-     */
-    isElectron() {
-        return this._name === ELECTRON;
-    }
-
-    /**
-     * Checks if current environment is React Native.
-     * @returns {boolean}
-     */
-    isReactNative() {
-        return this._name === REACT_NATIVE;
-    }
-
-    /**
-     * Returns the version of the current browser.
-     * @returns {string}
-     */
-    getVersion() {
-        return this._version;
-    }
-
-    /**
-     * Compares the passed version with the current browser version.
-     * {@see https://github.com/lancedikson/bowser}
-     */
-    static compareVersions = bowser.compareVersions;
-
-    /**
-     * Compares the passed version with the current browser version.
-     *
-     * @param {string} version - The version to compare with.
-     * @returns {number|undefined} - Returns 0 if the version is equal to the
-     * current one, 1 if the version is greater than the current one, -1 if the
-     * version is lower than the current one and undefined if the current
-     * browser version is unknown.
-     */
-    compareVersion(version) {
-        if (this._version) {
-            return bowser.compareVersions([ version, this._version ]);
-        }
-    }
-
-    /**
-     * Compares the passed version with the current browser version.
-     *
-     * @param {string} version - The version to compare with.
-     * @returns {boolean|undefined} - Returns true if the current version is
-     * greater than the passed version and false otherwise.
-     */
-    isVersionGreaterThan(version) {
-        return this.compareVersion(version) === -1;
-    }
-
-    /**
-     * Compares the passed version with the current browser version.
-     *
-     * @param {string} version - The version to compare with.
-     * @returns {boolean|undefined} - Returns true if the current version is
-     * lower than the passed version and false otherwise.
-     */
-    isVersionLessThan(version) {
-        return this.compareVersion(version) === 1;
-    }
-
-    /**
-     * Compares the passed version with the current browser version.
-     *
-     * @param {string} version - The version to compare with.
-     * @returns {boolean|undefined} - Returns true if the current version is
-     * equal to the passed version and false otherwise.
-     */
-    isVersionEqualTo(version) {
-        return this.compareVersion(version) === 0;
-    }
-}

modules/browser/browsers.js

@@ -1,21 +0,0 @@
-// TODO: Maybe fix the values to 'Chrome', 'Internet Explorer', etc. Currently
-// this values needs to be as they are becuse they are going to analytics,
-// callstats, etc.
-
-export const CHROME = 'chrome';
-
-export const OPERA = 'opera';
-
-export const FIREFOX = 'firefox';
-
-export const INTERNET_EXPLORER = 'iexplorer';
-
-export const EDGE = 'edge';
-
-export const SAFARI = 'safari';
-
-export const NWJS = 'nwjs';
-
-export const ELECTRON = 'electron';
-
-export const REACT_NATIVE = 'react-native';

modules/browser/index.js

@@ -1,4 +1,3 @@
 import BrowserCapabilities from './BrowserCapabilities';
 
-export * as browsers from './browsers';
 export default new BrowserCapabilities();

modules/statistics/RTPStatsCollector.js

@@ -1,4 +1,6 @@
-import browser, { browsers } from '../browser';
+import browser from '../browser';
+import { browsers } from 'js-utils';
+
 import * as StatisticsEvents from '../../service/statistics/Events';
 
 const GlobalOnErrorHandler = require('../util/GlobalOnErrorHandler');

package-lock.json

@@ -1346,8 +1346,7 @@
     "bowser": {
       "version": "1.9.1",
       "resolved": "https://registry.npmjs.org/bowser/-/bowser-1.9.1.tgz",
-      "integrity": "sha512-UXti1JB6oK8hO983AImunnV6j/fqAEeDlPXh99zhsP5g32oLbxJJ6qcOaUesR+tqqhnUVQHlRJyD0dfiV0Hxaw==",
-      "dev": true
+      "integrity": "sha512-UXti1JB6oK8hO983AImunnV6j/fqAEeDlPXh99zhsP5g32oLbxJJ6qcOaUesR+tqqhnUVQHlRJyD0dfiV0Hxaw=="
     },
     "brace-expansion": {
       "version": "1.1.8",
@@ -4017,6 +4016,12 @@
       "integrity": "sha1-mGbfOVECEw449/mWvOtlRDIJwls=",
       "dev": true
     },
+    "js-utils": {
+      "version": "github:jitsi/js-utils#fa6eb93d1792b75e25bf84b97e51672e70d900de",
+      "requires": {
+        "bowser": "1.9.1"
+      }
+    },
     "js-yaml": {
       "version": "3.10.0",
       "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.10.0.tgz",
@@ -5823,7 +5828,7 @@
       "resolved": "https://registry.npmjs.org/rtcpeerconnection-shim/-/rtcpeerconnection-shim-1.2.5.tgz",
       "integrity": "sha512-2oLVHZZMk/TsU9JqgrQYwdkOsDOeIalM3STqWjI1LtXrSrInHdig6CysSoTmEublMxnuy/F2i5NXE6tiIh9tZQ==",
       "requires": {
-        "sdp": "2.5.0"
+        "sdp": "2.6.0"
       }
     },
     "run-async": {
@@ -5874,9 +5879,9 @@
       }
     },
     "sdp": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/sdp/-/sdp-2.5.0.tgz",
-      "integrity": "sha512-4HT7gdxA+AZHl5LDdiLpagFKBS5qAKFYE71CPSNrr+2dCFg9iKXY4JSIhHKZHVnwJAzZ/4jA+z1nam4U+LoYug=="
+      "version": "2.6.0",
+      "resolved": "https://registry.npmjs.org/sdp/-/sdp-2.6.0.tgz",
+      "integrity": "sha512-/q5nUDSqvfh+P5pvb4Ez1IsF6F9aLLgslHrSDSltqvUuS7raTY9ROjbGJTyvGSYRs99FY59c8Od1lT7WVaiNAw=="
     },
     "sdp-interop": {
       "version": "0.1.12",
@@ -6881,7 +6886,7 @@
       "version": "github:webrtc/adapter#1eec19782b4058d186341263e7d049cea3e3290a",
       "requires": {
         "rtcpeerconnection-shim": "1.2.5",
-        "sdp": "2.5.0"
+        "sdp": "2.6.0"
       }
     },
     "which": {

package.json

@@ -19,6 +19,7 @@
     "async": "0.9.0",
     "current-executing-script": "0.1.3",
     "jitsi-meet-logger": "github:jitsi/jitsi-meet-logger#6fff754a77a56ab52499f3559105a15886942a1e",
+    "js-utils": "github:jitsi/js-utils#fa6eb93d1792b75e25bf84b97e51672e70d900de",
     "react-native-callstats": "3.27.0",
     "sdp-interop": "0.1.12",
     "sdp-simulcast": "0.2.1",
@@ -34,7 +35,6 @@
     "babel-loader": "7.1.2",
     "babel-preset-env": "1.6.1",
     "babel-preset-stage-1": "6.24.1",
-    "bowser": "1.9.1",
     "core-js": "2.5.1",
     "eslint": "4.12.1",
     "eslint-config-jitsi": "github:jitsi/eslint-config-jitsi#v0.1",

webpack.config.js

@@ -43,7 +43,7 @@ const config = {
 
             exclude: [
                 `${__dirname}/modules/RTC/adapter.screenshare.js`,
-                `${__dirname}/node_modules/`
+                new RegExp(`${__dirname}/node_modules/(?!js-utils)`)
             ],
             loader: 'babel-loader',
             options: {