extract safari version for internal usage

src/js/common_shim.js

@@ -353,7 +353,8 @@ export function removeExtmapAllowMixed(window, browserDetails) {
   if (browserDetails.browser === 'chrome' && browserDetails.version >= 71) {
     return;
   }
-  if (browserDetails.browser === 'safari' && browserDetails.version >= 605) {
+  if (browserDetails.browser === 'safari' &&
+      browserDetails._safariVersion >= 13.1) {
     return;
   }
   const nativeSRD = window.RTCPeerConnection.prototype.setRemoteDescription;

src/js/utils.js

@@ -21,7 +21,7 @@ let deprecationWarnings_ = true;
  */
 export function extractVersion(uastring, expr, pos) {
   const match = uastring.match(expr);
-  return match && match.length >= pos && parseInt(match[pos], 10);
+  return match && match.length >= pos && parseFloat(match[pos], 10);
 }
 
 // Wraps the peerconnection event eventNameToWrap in a function
@@ -173,24 +173,27 @@ export function detectBrowser(window) {
 
   if (navigator.mozGetUserMedia) { // Firefox.
     result.browser = 'firefox';
-    result.version = extractVersion(navigator.userAgent,
-      /Firefox\/(\d+)\./, 1);
+    result.version = parseInt(extractVersion(navigator.userAgent,
+      /Firefox\/(\d+)\./, 1));
   } else if (navigator.webkitGetUserMedia ||
       (window.isSecureContext === false && window.webkitRTCPeerConnection)) {
     // Chrome, Chromium, Webview, Opera.
     // Version matches Chrome/WebRTC version.
     // Chrome 74 removed webkitGetUserMedia on http as well so we need the
     // more complicated fallback to webkitRTCPeerConnection.
     result.browser = 'chrome';
-    result.version = extractVersion(navigator.userAgent,
-      /Chrom(e|ium)\/(\d+)\./, 2);
+    result.version = parseInt(extractVersion(navigator.userAgent,
+      /Chrom(e|ium)\/(\d+)\./, 2));
   } else if (window.RTCPeerConnection &&
       navigator.userAgent.match(/AppleWebKit\/(\d+)\./)) { // Safari.
     result.browser = 'safari';
-    result.version = extractVersion(navigator.userAgent,
-      /AppleWebKit\/(\d+)\./, 1);
+    result.version = parseInt(extractVersion(navigator.userAgent,
+      /AppleWebKit\/(\d+)\./, 1));
     result.supportsUnifiedPlan = window.RTCRtpTransceiver &&
         'currentDirection' in window.RTCRtpTransceiver.prototype;
+    // Only for internal usage.
+    result._safariVersion = extractVersion(navigator.userAgent,
+      /Version\/(\d+(\.?\d+))/);
   } else { // Default fallthrough: not supported.
     result.browser = 'Not a supported browser.';
     return result;

test/unit/detectBrowser.test.js

@@ -69,5 +69,6 @@ describe('detectBrowser', () => {
     const browserDetails = detectBrowser(window);
     expect(browserDetails.browser).toEqual('safari');
     expect(browserDetails.version).toEqual(604);
+    // expect(browserDetails._safariVersion).toEqual(10.2);
   });
 });

test/unit/extmap-allow-mixed.test.js

@@ -33,7 +33,7 @@ describe('removal of extmap-allow-mixed', () => {
       window.RTCPeerConnection.prototype.setRemoteDescription = function() {
         return origSetRemoteDescription.apply(this, arguments);
       };
-      browserDetails = {browser: 'chrome', version: '88'};
+      browserDetails = {browser: 'chrome', version: 88};
     });
 
     it('does not remove the extmap-allow-mixed line after Chrome 71', () => {
@@ -66,11 +66,11 @@ describe('removal of extmap-allow-mixed', () => {
       window.RTCPeerConnection.prototype.setRemoteDescription = function() {
         return origSetRemoteDescription.apply(this, arguments);
       };
-      browserDetails = {browser: 'safari', version: '605'};
+      browserDetails = {browser: 'safari', version: 605};
     });
 
-    it('does not remove the extmap-allow-mixed line after 605', () => {
-      browserDetails.version = 605;
+    it('does not remove the extmap-allow-mixed line after 13.1', () => {
+      browserDetails._safariVersion = 13.1;
       shim.removeExtmapAllowMixed(window, browserDetails);
 
       const pc = new window.RTCPeerConnection();
@@ -80,8 +80,8 @@ describe('removal of extmap-allow-mixed', () => {
         .toEqual('\n' + sdp);
     });
 
-    it('does remove the extmap-allow-mixed line before 605', () => {
-      browserDetails.version = 604;
+    it('does remove the extmap-allow-mixed line before 13.1', () => {
+      browserDetails._safariVersion = 13.0;
       shim.removeExtmapAllowMixed(window, browserDetails);
 
       const pc = new window.RTCPeerConnection();

test/unit/extractVersion.test.js

@@ -111,7 +111,7 @@ describe('extractVersion', () => {
     });
   });
 
-  describe('Safari regular expression', () => {
+  describe('Webkit regular expression', () => {
     const expr = /AppleWebKit\/(\d+)/;
     it('matches the webkit version', () => {
       ua = 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_12_4) ' +
@@ -144,5 +144,13 @@ describe('extractVersion', () => {
       expect(extractVersion(ua, expr, 1)).toBe(null);
     });
   });
+  describe('Safari regular expression', () => {
+    const expr = /Version\/(\d+(\.?\d+))/;
+    it('extracts the Safari version', () => {
+      ua = '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';
+      expect(extractVersion(ua, expr, 1)).toBe(10.2);
+    });
+  });
 });