prefer navigator.userAgentData for browser detection

fixes #764,#1017
webrtcHacks · Jun 13, 2022 · ac9c676 · ac9c676
1 parent 95d813f
commit ac9c676
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 0 deletions.
diff --git a/src/js/utils.js b/src/js/utils.js
@@ -160,6 +160,16 @@ export function detectBrowser(window) {
 
   const {navigator} = window;
 
+  // Prefer navigator.userAgentData.
+  if (navigator.userAgentData && navigator.userAgentData.brands) {
+    const chromium = navigator.userAgentData.brands.find((brand) => {
+      return brand.brand === 'Chromium';
+    });
+    if (chromium) {
+      return {browser: 'chrome', version: chromium.version};
+    }
+  }
+
   if (navigator.mozGetUserMedia) { // Firefox.
     result.browser = 'firefox';
     result.version = extractVersion(navigator.userAgent,

diff --git a/test/unit/detectBrowser.js b/test/unit/detectBrowser.js
@@ -53,6 +53,18 @@ describe('detectBrowser', () => {
     expect(browserDetails.version).to.equal(95);
   });
 
+  it('detects Chrome if navigator.userAgentData exist', () => {
+    navigator.userAgentData = {brands: [{brand: 'Chromium', version: 102}]};
+    // Use the wrong UA string for Firefox.
+    navigator.userAgent = 'Mozilla/5.0 (X11; Ubuntu; Linux x86_64; ' +
+        'rv:44.0) Gecko/20100101 Firefox/44.0';
+    navigator.mozGetUserMedia = function() {};
+
+    const browserDetails = detectBrowser(window);
+    expect(browserDetails.browser).to.equal('chrome');
+    expect(browserDetails.version).to.equal(102);
+  });
+
   it('detects Safari if window.RTCPeerConnection exists', () => {
     navigator.userAgent = 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_12_4) ' +
           'AppleWebKit/604.1.6 (KHTML, like Gecko) Version/10.2 Safari/604.1.6';