chore: update js-utils with new ua-parser (#2358)

modules/RTC/ScreenObtainer.js

@@ -46,42 +46,7 @@ const ScreenObtainer = {
      * @private
      */
     _createObtainStreamMethod() {
-        if (browser.isNWJS()) {
-            return (onSuccess, onFailure) => {
-                window.JitsiMeetNW.obtainDesktopStream(
-                    onSuccess,
-                    (error, constraints) => {
-                        let jitsiError;
-
-                        // FIXME:
-                        // This is very very dirty fix for recognising that the
-                        // user have clicked the cancel button from the Desktop
-                        // sharing pick window. The proper solution would be to
-                        // detect this in the NWJS application by checking the
-                        // streamId === "". Even better solution would be to
-                        // stop calling GUM from the NWJS app and just pass the
-                        // streamId to lib-jitsi-meet. This way the desktop
-                        // sharing implementation for NWJS and chrome extension
-                        // will be the same and lib-jitsi-meet will be able to
-                        // control the constraints, check the streamId, etc.
-                        //
-                        // I cannot find documentation about "InvalidStateError"
-                        // but this is what we are receiving from GUM when the
-                        // streamId for the desktop sharing is "".
-
-                        if (error && error.name === 'InvalidStateError') {
-                            jitsiError = new JitsiTrackError(
-                                JitsiTrackErrors.SCREENSHARING_USER_CANCELED
-                            );
-                        } else {
-                            jitsiError = new JitsiTrackError(
-                                error, constraints, [ 'desktop' ]);
-                        }
-                        (typeof onFailure === 'function')
-                            && onFailure(jitsiError);
-                    });
-            };
-        } else if (browser.isElectron()) {
+        if (browser.isElectron()) {
             return this.obtainScreenOnElectron;
         } else if (browser.isReactNative() && browser.supportsGetDisplayMedia()) {
             return this.obtainScreenFromGetDisplayMediaRN;

modules/RTC/TraceablePeerConnection.js

@@ -1424,7 +1424,7 @@ const normalizePlanB = function(desc) {
  * @returns {Array<Object>} ssrcLines with removed lines referencing msid "-".
  */
 function replaceDefaultUnifiedPlanMsid(ssrcLines = []) {
-    if (!browser.isChrome() || !browser.isVersionGreaterThan(70)) {
+    if (!browser.isChromiumBased()) {
         return ssrcLines;
     }
 

modules/browser/BrowserCapabilities.js

@@ -32,29 +32,7 @@ export default class BrowserCapabilities extends BrowserDetection {
      * @returns {boolean}
      */
     isAndroidBrowser() {
-        const { userAgent } = navigator;
-
-        return !this.isReactNative() && userAgent.match(/Android/i);
-    }
-
-    /**
-     * Checks if the current browser is Chromium based, i.e., it's either Chrome / Chromium or uses it as its engine,
-     * but doesn't identify as Chrome.
-     *
-     * This includes the following browsers:
-     * - Chrome and Chromium.
-     * - Other browsers which use the Chrome engine, but are detected as Chrome, such as Brave and Vivaldi.
-     * - Browsers which are NOT Chrome but use it as their engine, and have custom detection code: Opera, Electron
-     *   and NW.JS.
-     * This excludes
-     * - Chrome on iOS since it uses WKWebView.
-     */
-    isChromiumBased() {
-        return (this.isChrome()
-            || this.isElectron()
-            || this.isNWJS()
-            || this.isOpera())
-            && !this.isWebKitBased();
+        return !this.isReactNative() && this.getOS() === 'Android';
     }
 
     /**
@@ -63,10 +41,7 @@ export default class BrowserCapabilities extends BrowserDetection {
      * @returns {boolean}
      */
     isIosBrowser() {
-        const { userAgent, maxTouchPoints, platform } = navigator;
-
-        return Boolean(userAgent.match(/iP(ad|hone|od)/i))
-            || (maxTouchPoints && maxTouchPoints > 2 && /MacIntel/.test(platform));
+        return !this.isReactNative() && this.getOS() === 'iOS';
     }
 
     /**
@@ -76,24 +51,6 @@ export default class BrowserCapabilities extends BrowserDetection {
         return this.isAndroidBrowser() || this.isIosBrowser() || this.isReactNative();
     }
 
-    /**
-     * Checks if the current browser is WebKit based. It's either
-     * Safari or uses WebKit as its engine.
-     *
-     * This includes Chrome and Firefox on iOS
-     *
-     * @returns {boolean}
-     */
-    isWebKitBased() {
-        // https://trac.webkit.org/changeset/236144/webkit/trunk/LayoutTests/webrtc/video-addLegacyTransceiver.html
-        return this._bowser.isEngine('webkit')
-            && typeof navigator.mediaDevices !== 'undefined'
-            && typeof navigator.mediaDevices.getUserMedia !== 'undefined'
-            && typeof window.RTCRtpTransceiver !== 'undefined'
-            // eslint-disable-next-line no-undef
-            && Object.keys(RTCRtpTransceiver.prototype).indexOf('currentDirection') > -1;
-    }
-
     /**
      * Checks whether current running context is a Trusted Web Application.
      *
@@ -113,7 +70,7 @@ export default class BrowserCapabilities extends BrowserDetection {
             return false;
         }
 
-        return (this.isChromiumBased() && this._getChromiumBasedVersion() >= MIN_REQUIRED_CHROME_VERSION)
+        return (this.isChromiumBased() && this.isEngineVersionGreaterThan(MIN_REQUIRED_CHROME_VERSION - 1))
             || this.isFirefox()
             || this.isReactNative()
             || this.isWebKitBased();
@@ -232,7 +189,7 @@ export default class BrowserCapabilities extends BrowserDetection {
      * @returns {boolean}
      */
     supportsTrackBasedStats() {
-        return this.isChromiumBased() && this.isVersionLessThan(112);
+        return this.isChromiumBased() && this.isEngineVersionLessThan(112);
     }
 
     /**
@@ -328,7 +285,7 @@ export default class BrowserCapabilities extends BrowserDetection {
     supportsUnifiedPlan() {
         // We do not want to enable unified plan on Electron clients that have Chromium version < 96 because of
         // performance and screensharing issues.
-        return !(this.isElectron() && (this._getChromiumBasedVersion() < 96));
+        return !(this.isElectron() && this.isEngineVersionLessThan(96));
     }
 
     /**
@@ -351,37 +308,6 @@ export default class BrowserCapabilities extends BrowserDetection {
         return !(this.isFirefox() && this.isVersionLessThan('96'));
     }
 
-    /**
-     * Returns the version of a Chromium based browser.
-     *
-     * @returns {Number}
-     */
-    _getChromiumBasedVersion() {
-        if (this.isChromiumBased()) {
-            // NW.JS doesn't expose the Chrome version in the UA string.
-            if (this.isNWJS()) {
-                // eslint-disable-next-line no-undef
-                return Number.parseInt(process.versions.chromium, 10);
-            }
-
-            // Here we process all browsers which use the Chrome engine but
-            // don't necessarily identify as Chrome. We cannot use the version
-            // comparing functions because the Electron, Opera and NW.JS
-            // versions are inconsequential here, as we need to know the actual
-            // Chrome engine version.
-            const ua = navigator.userAgent;
-
-            if (ua.match(/Chrome/)) {
-                const version
-                    = Number.parseInt(ua.match(/Chrome\/([\d.]+)/)[1], 10);
-
-                return version;
-            }
-        }
-
-        return -1;
-    }
-
     /**
      * Returns the version of a Safari browser.
      *
@@ -402,7 +328,7 @@ export default class BrowserCapabilities extends BrowserDetection {
      */
     _getIOSVersion() {
         if (this.isWebKitBased()) {
-            return Number.parseInt(this.getVersion(), 10);
+            return Number.parseInt(this.getOSVersion(), 10);
         }
 
         return -1;

package-lock.json

@@ -10,7 +10,7 @@
       "hasInstallScript": true,
       "license": "Apache-2.0",
       "dependencies": {
-        "@jitsi/js-utils": "2.1.3",
+        "@jitsi/js-utils": "2.2.0",
         "@jitsi/logger": "2.0.2",
         "@jitsi/rtcstats": "9.5.1",
         "@jitsi/sdp-interop": "git+https://github.com/jitsi/sdp-interop#3d49eb4aa26863a3f8d32d7581cdb4321244266b",
@@ -1998,13 +1998,31 @@
       }
     },
     "node_modules/@jitsi/js-utils": {
-      "version": "2.1.3",
-      "resolved": "https://registry.npmjs.org/@jitsi/js-utils/-/js-utils-2.1.3.tgz",
-      "integrity": "sha512-fXoNLu2JHQGPgzjCDG5qWPPStiXI+AxSzu1JIVY4dMULIFsw4a+doMgcjTIlSfB393J2xccKQYwZSejZUn9MEw==",
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/@jitsi/js-utils/-/js-utils-2.2.0.tgz",
+      "integrity": "sha512-C1dZikxS899o49nclZe9TeehmDykxj1bMwmjcJidzzkq7lI593frHJRntPwV43zeZH5X0QslqeBnzOJq8B0ZIA==",
       "dependencies": {
         "@hapi/bourne": "^3.0.0",
-        "bowser": "2.7.0",
-        "js-md5": "0.7.3"
+        "js-md5": "0.7.3",
+        "ua-parser-js": "1.0.35"
+      }
+    },
+    "node_modules/@jitsi/js-utils/node_modules/ua-parser-js": {
+      "version": "1.0.35",
+      "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-1.0.35.tgz",
+      "integrity": "sha512-fKnGuqmTBnIE+/KXSzCn4db8RTigUzw1AN0DmdU6hJovUTbYJKyqj+8Mt1c4VfRDnOVJnENmfYkIPZ946UrSAA==",
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/ua-parser-js"
+        },
+        {
+          "type": "paypal",
+          "url": "https://paypal.me/faisalman"
+        }
+      ],
+      "engines": {
+        "node": "*"
       }
     },
     "node_modules/@jitsi/logger": {
@@ -2677,11 +2695,6 @@
       "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
       "dev": true
     },
-    "node_modules/bowser": {
-      "version": "2.7.0",
-      "resolved": "https://registry.npmjs.org/bowser/-/bowser-2.7.0.tgz",
-      "integrity": "sha512-aIlMvstvu8x+34KEiOHD3AsBgdrzg6sxALYiukOWhFvGMbQI6TRP/iY0LMhUrHs56aD6P1G0Z7h45PUJaa5m9w=="
-    },
     "node_modules/brace-expansion": {
       "version": "1.1.11",
       "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
@@ -8757,13 +8770,20 @@
       "requires": {}
     },
     "@jitsi/js-utils": {
-      "version": "2.1.3",
-      "resolved": "https://registry.npmjs.org/@jitsi/js-utils/-/js-utils-2.1.3.tgz",
-      "integrity": "sha512-fXoNLu2JHQGPgzjCDG5qWPPStiXI+AxSzu1JIVY4dMULIFsw4a+doMgcjTIlSfB393J2xccKQYwZSejZUn9MEw==",
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/@jitsi/js-utils/-/js-utils-2.2.0.tgz",
+      "integrity": "sha512-C1dZikxS899o49nclZe9TeehmDykxj1bMwmjcJidzzkq7lI593frHJRntPwV43zeZH5X0QslqeBnzOJq8B0ZIA==",
       "requires": {
         "@hapi/bourne": "^3.0.0",
-        "bowser": "2.7.0",
-        "js-md5": "0.7.3"
+        "js-md5": "0.7.3",
+        "ua-parser-js": "1.0.35"
+      },
+      "dependencies": {
+        "ua-parser-js": {
+          "version": "1.0.35",
+          "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-1.0.35.tgz",
+          "integrity": "sha512-fKnGuqmTBnIE+/KXSzCn4db8RTigUzw1AN0DmdU6hJovUTbYJKyqj+8Mt1c4VfRDnOVJnENmfYkIPZ946UrSAA=="
+        }
       }
     },
     "@jitsi/logger": {
@@ -9349,11 +9369,6 @@
         }
       }
     },
-    "bowser": {
-      "version": "2.7.0",
-      "resolved": "https://registry.npmjs.org/bowser/-/bowser-2.7.0.tgz",
-      "integrity": "sha512-aIlMvstvu8x+34KEiOHD3AsBgdrzg6sxALYiukOWhFvGMbQI6TRP/iY0LMhUrHs56aD6P1G0Z7h45PUJaa5m9w=="
-    },
     "brace-expansion": {
       "version": "1.1.11",
       "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",

package.json

@@ -16,7 +16,7 @@
   "author": "",
   "readmeFilename": "README.md",
   "dependencies": {
-    "@jitsi/js-utils": "2.1.3",
+    "@jitsi/js-utils": "2.2.0",
     "@jitsi/logger": "2.0.2",
     "@jitsi/rtcstats": "9.5.1",
     "@jitsi/sdp-interop": "git+https://github.com/jitsi/sdp-interop#3d49eb4aa26863a3f8d32d7581cdb4321244266b",