Added firefox version checker

commit_hash:09b73b1011ddc5cafdda4315131de56e3c6b368c

Author: cvgalagan

src/utils/browser/__tests__/browser.spec.ts

@@ -21,7 +21,7 @@ import {
     isIOS,
     isAndroidWebView,
 } from '../browser';
-import { isFF, isGecko } from '../firefox';
+import { isFF, isGecko, getFFVersion } from '../firefox';
 
 describe('browser Utils', () => {
     const win = (obj: any = {}) => {
@@ -352,6 +352,41 @@ describe('browser Utils', () => {
         ).to.be.true;
     });
 
+    it('isFFVersion', () => {
+        chai.assert(
+            getFFVersion(win('Something')) === 0,
+            'false for something that not looks like Firefox',
+        );
+        chai.assert(
+            getFFVersion(ffWin()) === 123,
+            'true if Firefox and version >= requested one',
+        );
+        chai.expect(
+            getFFVersion(ffWin()),
+            'false if Firefox and version < requested one',
+        ).to.be.lt(200);
+    });
+
+    it('returns Firefox version for Windows UA', () => {
+        const ctx = win({
+            navigator: {
+                userAgent:
+                    'Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:147.0) Gecko/20100101 Firefox/147.0',
+            },
+        });
+        chai.expect(getFFVersion(ctx)).to.eq(147);
+    });
+
+    it('returns Firefox version for macOS UA', () => {
+        const ctx = win({
+            navigator: {
+                userAgent:
+                    'Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:148.0) Gecko/20100101 Firefox/148.0',
+            },
+        });
+        chai.expect(getFFVersion(ctx)).to.eq(148);
+    });
+
     it('check isIOS', () => {
         chai.expect(
             isIOS(

src/utils/browser/browser.ts

@@ -4,7 +4,7 @@ import { indexOfWin } from 'src/utils/array/utils';
 import { cSome } from 'src/utils/array/some';
 import { cReduce } from 'src/utils/array/reduce';
 import { ctxPath, getPath, isUndefined } from 'src/utils/object';
-import { isFF, isFFVersionRegExp } from 'src/utils/browser/firefox';
+import { getFFVersion } from 'src/utils/browser/firefox';
 import { MIN_EDGE_VERSION, MIN_FIREFOX_VERSION } from 'src/utils/browser/const';
 import {
     bind,
@@ -254,22 +254,11 @@ export const isEdgeMinVersion = (ctx: Window, minVersion: number) => {
     return false;
 };
 
-export const isFFVersion = (ctx: Window, minVersion: number) => {
-    if (isFF(ctx) && minVersion) {
-        const agent = getAgent(ctx);
-        const version = agent.match(isFFVersionRegExp);
-        if (version && version.length) {
-            return +version[1] >= minVersion;
-        }
-    }
-    return false;
-};
-
 // All tracking protection browsers: intellectual TP, enhanced TP, etc
 export const isTP = memo((ctx: Window) => {
     return (
         isITP(ctx) ||
-        isFFVersion(ctx, MIN_FIREFOX_VERSION) ||
+        getFFVersion(ctx) >= MIN_FIREFOX_VERSION ||
         isEdgeMinVersion(ctx, MIN_EDGE_VERSION)
     );
 });

src/utils/browser/firefox.ts

@@ -1,8 +1,9 @@
 import { getPath } from 'src/utils/object/path';
 import { memo } from 'src/utils/function/memo';
 import { bindArg } from 'src/utils/function/bind/bind';
-import { checkUserAgent } from './utils';
+import { checkUserAgent, getAgent } from './utils';
 import { isNil } from '../object/assertions';
+import { parseDecimalInt } from '../number/number';
 
 export const isGecko = memo(bindArg(/gecko/, checkUserAgent));
 export const isFFVersionRegExp = /Firefox\/([0-9]+)/i;
@@ -18,3 +19,15 @@ export const isFF = memo((ctx: Window) => {
         hasFFVersion
     );
 });
+
+export const getFFVersion = (ctx: Window): number => {
+    if (isFF(ctx)) {
+        const agent = getAgent(ctx);
+        const version = agent.match(isFFVersionRegExp);
+        if (version && version.length) {
+            return parseDecimalInt(version[1]);
+        }
+        return 1;
+    }
+    return 0;
+};