native-fn 1.0.37 → 1.0.39

package/dist/plugin/platform/index.mjs

@@ -28,53 +28,75 @@ var Engines;
     Engines["Tasman"] = "Tasman";
     Engines["Gecko"] = "Gecko";
 })(Engines || (Engines = {}));
-var OS_RESOLVER_MAP = (function () {
-    function resolveIOSOrMacVersion(str) {
-        if (str === undefined)
-            return '';
-        return str.replace(/_/g, '.');
-    }
-    function resolveWindowsVersion(str) {
-        if (str === undefined)
-            return '';
-        var mapped = {
-            '4.90': 'ME',
-            'NT3.51': 'NT 3.11',
-            'NT4.0': 'NT 4.0',
-            'NT 5.0': '2000',
-            'NT 5.1': 'XP',
-            'NT 5.2': 'XP',
-            'NT 6.0': 'Vista',
-            'NT 6.1': '7',
-            'NT 6.2': '8',
-            'NT 6.3': '8.1',
-            'NT 6.4': '10',
-            'NT 10.0': '10',
-            'ARM': 'RT'
-        }[str];
-        if (mapped !== undefined)
-            return mapped;
-        return str;
-    }
-    function resolveVersion(str) {
-        if (str === undefined)
-            return '';
-        return str;
-    }
-    return [
-        [/android\w*[-\/.; ]?([\d.]*)/i, OS.Android, Devices.Mobile, resolveVersion],
-        [/microsoft windows (vista|xp)/i, OS.Windows, Devices.Desktop, resolveVersion],
-        [/windows (?:phone(?: os)?|mobile|iot)[\/ ]?([.\w ]*)/i, OS.Windows, Devices.Desktop, resolveWindowsVersion],
-        [/windows nt 6\.2; (arm)/i, OS.Windows, Devices.Desktop, resolveWindowsVersion],
-        [/windows[\/ ]([ntce\d. ]+\w)(?!.+xbox)/i, OS.Windows, Devices.Desktop, resolveWindowsVersion],
-        [/(?:win(?=[39n])|win 9x )([nt\d.]+)/i, OS.Windows, Devices.Desktop, resolveWindowsVersion],
-        [/[adehimnop]{4,7}\b(?:.*os (\w+) like mac|; opera)/i, OS.iOS, Devices.Mobile, resolveIOSOrMacVersion],
-        [/(?:ios;fbsv\/|iphone.+ios[\/ ])([\d.]+)/i, OS.iOS, Devices.Mobile, resolveIOSOrMacVersion],
-        [/cfnetwork\/.+darwin/i, OS.iOS, Devices.Mobile, resolveVersion],
-        [/mac os x ?([\w. ]*)/i, OS.MacOS, Devices.Desktop, resolveIOSOrMacVersion],
-        [/(?:macintosh|mac_powerpc\b)(?!.+haiku)/i, OS.MacOS, Devices.Desktop, resolveIOSOrMacVersion],
-    ];
-})();
+var Browsers;
+(function (Browsers) {
+    Browsers["Unknown"] = "Unknown";
+    Browsers["Chrome"] = "Chrome";
+    Browsers["Safari"] = "Safari";
+    Browsers["Edge"] = "Edge";
+    Browsers["Firefox"] = "Firefox";
+    Browsers["Opera"] = "Opera";
+    Browsers["IE"] = "IE";
+    Browsers["SamsungInternet"] = "SamsungInternet";
+})(Browsers || (Browsers = {}));
+var DEVICE_NAME = Devices.Unknown;
+var OS_NAME = OS.Unknown;
+var OS_VERSION = '';
+var ENGINE_NAME = Engines.Unknown;
+var ENGINE_VERSION = '';
+var BROWSER_NAME = Browsers.Unknown;
+var BROWSER_VERSION = '';
+function resolveWindowsVersion(string) {
+    if (string === undefined)
+        return '';
+    var mapped = {
+        '4.90': 'ME',
+        'NT3.51': 'NT 3.11',
+        'NT4.0': 'NT 4.0',
+        'NT 5.0': '2000',
+        'NT 5.1': 'XP',
+        'NT 5.2': 'XP',
+        'NT 6.0': 'Vista',
+        'NT 6.1': '7',
+        'NT 6.2': '8',
+        'NT 6.3': '8.1',
+        'NT 6.4': '10',
+        'NT 10.0': '10',
+        'ARM': 'RT'
+    }[string];
+    if (mapped !== undefined)
+        return mapped;
+    return string;
+}
+function resolveUnderscoreVersion(string) {
+    if (string === undefined)
+        return '';
+    return string.replace(/_/g, '.');
+}
+function resolveVersion(string, resolver) {
+    if (typeof resolver === 'function')
+        return resolver(string);
+    if (typeof resolver === 'string')
+        return resolver;
+    if (string === undefined)
+        return '';
+    return string;
+}
+var OS_RESOLVER_MAP = [
+    [/windows nt (6\.[23]); arm/i, OS.Windows, resolveWindowsVersion],
+    [/windows (?:phone|mobile|iot)(?: os)?[\/ ]?([\d.]*( se)?)/i, OS.Windows, resolveWindowsVersion],
+    [/windows[\/ ](1[01]|2000|3\.1|7|8(\.1)?|9[58]|me|server 20\d\d( r2)?|vista|xp)/i, OS.Windows, resolveWindowsVersion],
+    [/windows nt ?([\d.)]*)(?!.+xbox)/i, OS.Windows, resolveWindowsVersion],
+    [/\bwin(?=3| ?9|n)(?:nt| 9x )?([\d.;]*)/i, OS.Windows, resolveWindowsVersion],
+    [/windows ce\/?([\d.]*)/i, OS.Windows, resolveWindowsVersion],
+    [/[adehimnop]{4,7}\b(?:.*os (\w+) like mac|; opera)/i, OS.iOS, resolveUnderscoreVersion],
+    [/(?:ios;fbsv|ios(?=.+ip(?:ad|hone))|ip(?:ad|hone)(?: |.+i(?:pad)?)os)[\/ ]([\w.]+)/i, OS.iOS, resolveUnderscoreVersion],
+    [/cfnetwork\/.+darwin/i, OS.iOS, resolveUnderscoreVersion],
+    [/mac os x ?([\w. ]*)/i, OS.MacOS, resolveUnderscoreVersion],
+    [/(?:macintosh|mac_powerpc\b)(?!.+(haiku|morphos))/i, OS.MacOS, resolveUnderscoreVersion],
+    [/droid ([\w.]+)\b.+(android[- ]x86)/i, OS.Android],
+    [/android\w*[-\/.; ]?([\d.]*)/i, OS.Android],
+];
 var ENGINE_RESOLVER_MAP = [
     [/windows.+ edge\/([\w.]+)/i, Engines.EdgeHTML],
     [/arkweb\/([\w.]+)/i, Engines.ArkWeb],
@@ -87,22 +109,50 @@ var ENGINE_RESOLVER_MAP = [
     [/tasman[\/ ]\(?([\w.]+)/i, Engines.Tasman],
     [/rv:([\w.]{1,9})\b.+gecko/i, Engines.Gecko]
 ];
-var OS_NAME = OS.Unknown;
-var OS_VERSION = '';
-var DEVICE_NAME = Devices.Unknown;
-var ENGINE_NAME = Engines.Unknown;
-var ENGINE_VERSION = '';
+var BROWSER_RESOLVER_MAP = [
+    [/\b(?:crmo|crios)\/([\w.]+)/i, Browsers.Chrome],
+    [/webview.+edge\/([\w.]+)/i, Browsers.Edge],
+    [/edg(?:e|ios|a)?\/([\w.]+)/i, Browsers.Edge],
+    [/opera mini\/([-\w.]+)/i, Browsers.Opera],
+    [/opera [mobileta]{3,6}\b.+version\/([-\w.]+)/i, Browsers.Opera],
+    [/opera(?:.+version\/|[\/ ]+)([\w.]+)/i, Browsers.Opera],
+    [/opios[\/ ]+([\w.]+)/i, Browsers.Opera],
+    [/\bop(?:rg)?x\/([\w.]+)/i, Browsers.Opera],
+    [/\bopr\/([\w.]+)/i, Browsers.Opera],
+    [/iemobile(?:browser|boat|jet)[\/ ]?([\d.]*)/i, Browsers.IE],
+    [/(?:ms|\()ie ([\w.]+)/i, Browsers.IE],
+    [/trident.+rv[: ]([\w.]{1,9})\b.+like gecko/i, Browsers.IE],
+    [/\bfocus\/([\w.]+)/i, Browsers.Firefox],
+    [/\bopt\/([\w.]+)/i, Browsers.Opera],
+    [/coast\/([\w.]+)/i, Browsers.Opera],
+    [/fxios\/([\w.-]+)/i, Browsers.Firefox],
+    [/samsungbrowser\/([\w.]+)/i, Browsers.SamsungInternet],
+    [/headlesschrome(?:\/([\w.]+)| )/i, Browsers.Chrome],
+    [/wv\).+chrome\/([\w.]+).+edgw\//i, Browsers.Edge],
+    [/ wv\).+(chrome)\/([\w.]+)/i, Browsers.Chrome],
+    [/chrome\/([\w.]+) mobile/i, Browsers.Chrome],
+    [/chrome\/v?([\w.]+)/i, Browsers.Chrome],
+    [/version\/([\w.,]+) .*mobile(?:\/\w+ | ?)safari/i, Browsers.Safari],
+    [/iphone .*mobile(?:\/\w+ | ?)safari/i, Browsers.Safari],
+    [/version\/([\w.,]+) .*safari/i, Browsers.Safari],
+    [/webkit.+?(?:mobile ?safari|safari)(\/[\w.]+)/i, Browsers.Safari, '1'],
+    [/(?:mobile|tablet);.*firefox\/([\w.-]+)/i, Browsers.Firefox],
+    [/mobile vr; rv:([\w.]+)\).+firefox/i, Browsers.Firefox],
+    [/firefox\/([\w.]+)/i, Browsers.Firefox],
+];
 for (var i = 0; i < OS_RESOLVER_MAP.length; i++) {
     var map = OS_RESOLVER_MAP[i];
     var regexp = map[0];
     var os = map[1];
-    var device = map[2];
-    var resolver = map[3];
+    var resolver = map[2];
     var matched = USER_AGENT.match(regexp);
     if (matched !== null) {
         OS_NAME = os;
-        OS_VERSION = resolver(matched[1]);
-        DEVICE_NAME = device;
+        OS_VERSION = resolveVersion(matched[1], resolver);
+        if (os === OS.iOS || os === OS.Android)
+            DEVICE_NAME = Devices.Mobile;
+        else if (os === OS.Windows || os === OS.MacOS)
+            DEVICE_NAME = Devices.Desktop;
         break;
     }
 }
@@ -110,15 +160,28 @@ for (var i = 0; i < ENGINE_RESOLVER_MAP.length; i++) {
     var map = ENGINE_RESOLVER_MAP[i];
     var regexp = map[0];
     var engine = map[1];
+    var resolver = map[2];
     var matched = USER_AGENT.match(regexp);
     if (matched !== null) {
         ENGINE_NAME = engine;
-        ENGINE_VERSION = matched[1];
+        ENGINE_VERSION = resolveVersion(matched[1], resolver);
+        break;
+    }
+}
+for (var i = 0; i < BROWSER_RESOLVER_MAP.length; i++) {
+    var map = BROWSER_RESOLVER_MAP[i];
+    var regexp = map[0];
+    var browser = map[1];
+    var resolver = map[2];
+    var matched = USER_AGENT.match(regexp);
+    if (matched !== null) {
+        BROWSER_NAME = browser;
+        BROWSER_VERSION = resolveVersion(matched[1], resolver);
         break;
     }
 }
 var RENDERER = (function () {
-    var canvas = document.createElement('canvas');
+    var canvas = globalThis.document.createElement('canvas');
     if (typeof canvas.getContext !== 'function')
         return '';
     var context = canvas.getContext('webgl2') || canvas.getContext('experimental-webgl') || canvas.getContext('webgl');
@@ -135,34 +198,73 @@ var RENDERER = (function () {
         return '';
     }
 })();
+var IS_WEBVIEW = /; ?wv|applewebkit(?!.*safari)/i.test(USER_AGENT);
 var IS_MOBILE = DEVICE_NAME === Devices.Mobile;
 var IS_DESKTOP = DEVICE_NAME === Devices.Desktop;
 var IS_STANDALONE = (function () {
     if (OS_NAME === OS.iOS)
-        return 'standalone' in navigator && navigator.standalone;
+        return 'standalone' in navigator && !!navigator.standalone;
     else
-        return window.matchMedia('(display-mode: standalone)').matches;
+        return globalThis.matchMedia('(display-mode: standalone)').matches;
 })();
-var IS_WEBVIEW = /; ?wv|applewebkit(?!.*safari)/i.test(USER_AGENT);
 
 var Platform = {
     os: OS_NAME,
     device: DEVICE_NAME,
     engine: ENGINE_NAME,
+    browser: BROWSER_NAME,
     osVersion: OS_VERSION,
     engineVersion: ENGINE_VERSION,
+    browserVersion: BROWSER_VERSION,
     renderer: RENDERER,
     isWebview: IS_WEBVIEW,
     isMobile: IS_MOBILE,
     isDesktop: IS_DESKTOP,
     isStandalone: IS_STANDALONE,
 };
+function normalizeBrand(entry) {
+    if (entry === null || entry === undefined)
+        return { brand: '', version: '' };
+    if (typeof entry === 'string')
+        return { brand: entry, version: '' };
+    return { brand: entry.brand, version: entry.version };
+}
+var navigatorWithUserAgentData = navigator;
+if (navigatorWithUserAgentData.userAgentData !== undefined && navigatorWithUserAgentData.userAgentData.getHighEntropyValues !== undefined) {
+    navigatorWithUserAgentData
+        .userAgentData
+        .getHighEntropyValues(['brands', 'fullVersionList', 'mobile', 'model', 'platform', 'platformVersion', 'architecture', 'formFactors', 'bitness', 'uaFullVersion', 'wow64'])
+        .then(function (result) {
+        var brands = result.fullVersionList || result.brands || [];
+        var platformVersion = result.platformVersion;
+        for (var i = 0; i < brands.length; i++) {
+            var brand = normalizeBrand(brands[i]);
+            var brandName = brand.brand;
+            var brandVersion = brand.version;
+            if (/not.a.brand/i.test(brandName))
+                continue;
+            if (brandName === "Chromium")
+                Platform.engineVersion = brandVersion;
+        }
+        if (typeof platformVersion === 'string') {
+            if (Platform.os === OS.Windows && parseInt(platformVersion.replace(/[^\d.]/g, '').split('.')[0], 10) >= 13)
+                Platform.osVersion = '11';
+            else
+                Platform.osVersion = platformVersion;
+        }
+    });
+}
 
 var NativePlatformPlugin = {
     installed: false,
     name: 'Platform',
     module: Platform,
-    Constants: {},
+    Constants: {
+        OS: OS,
+        Devices: Devices,
+        Engines: Engines,
+        Browsers: Browsers,
+    },
     Errors: {}
 };
 

package/dist/plugin/platform/index.umd.js

@@ -34,53 +34,75 @@
         Engines["Tasman"] = "Tasman";
         Engines["Gecko"] = "Gecko";
     })(Engines || (Engines = {}));
-    var OS_RESOLVER_MAP = (function () {
-        function resolveIOSOrMacVersion(str) {
-            if (str === undefined)
-                return '';
-            return str.replace(/_/g, '.');
-        }
-        function resolveWindowsVersion(str) {
-            if (str === undefined)
-                return '';
-            var mapped = {
-                '4.90': 'ME',
-                'NT3.51': 'NT 3.11',
-                'NT4.0': 'NT 4.0',
-                'NT 5.0': '2000',
-                'NT 5.1': 'XP',
-                'NT 5.2': 'XP',
-                'NT 6.0': 'Vista',
-                'NT 6.1': '7',
-                'NT 6.2': '8',
-                'NT 6.3': '8.1',
-                'NT 6.4': '10',
-                'NT 10.0': '10',
-                'ARM': 'RT'
-            }[str];
-            if (mapped !== undefined)
-                return mapped;
-            return str;
-        }
-        function resolveVersion(str) {
-            if (str === undefined)
-                return '';
-            return str;
-        }
-        return [
-            [/android\w*[-\/.; ]?([\d.]*)/i, OS.Android, Devices.Mobile, resolveVersion],
-            [/microsoft windows (vista|xp)/i, OS.Windows, Devices.Desktop, resolveVersion],
-            [/windows (?:phone(?: os)?|mobile|iot)[\/ ]?([.\w ]*)/i, OS.Windows, Devices.Desktop, resolveWindowsVersion],
-            [/windows nt 6\.2; (arm)/i, OS.Windows, Devices.Desktop, resolveWindowsVersion],
-            [/windows[\/ ]([ntce\d. ]+\w)(?!.+xbox)/i, OS.Windows, Devices.Desktop, resolveWindowsVersion],
-            [/(?:win(?=[39n])|win 9x )([nt\d.]+)/i, OS.Windows, Devices.Desktop, resolveWindowsVersion],
-            [/[adehimnop]{4,7}\b(?:.*os (\w+) like mac|; opera)/i, OS.iOS, Devices.Mobile, resolveIOSOrMacVersion],
-            [/(?:ios;fbsv\/|iphone.+ios[\/ ])([\d.]+)/i, OS.iOS, Devices.Mobile, resolveIOSOrMacVersion],
-            [/cfnetwork\/.+darwin/i, OS.iOS, Devices.Mobile, resolveVersion],
-            [/mac os x ?([\w. ]*)/i, OS.MacOS, Devices.Desktop, resolveIOSOrMacVersion],
-            [/(?:macintosh|mac_powerpc\b)(?!.+haiku)/i, OS.MacOS, Devices.Desktop, resolveIOSOrMacVersion],
-        ];
-    })();
+    var Browsers;
+    (function (Browsers) {
+        Browsers["Unknown"] = "Unknown";
+        Browsers["Chrome"] = "Chrome";
+        Browsers["Safari"] = "Safari";
+        Browsers["Edge"] = "Edge";
+        Browsers["Firefox"] = "Firefox";
+        Browsers["Opera"] = "Opera";
+        Browsers["IE"] = "IE";
+        Browsers["SamsungInternet"] = "SamsungInternet";
+    })(Browsers || (Browsers = {}));
+    var DEVICE_NAME = Devices.Unknown;
+    var OS_NAME = OS.Unknown;
+    var OS_VERSION = '';
+    var ENGINE_NAME = Engines.Unknown;
+    var ENGINE_VERSION = '';
+    var BROWSER_NAME = Browsers.Unknown;
+    var BROWSER_VERSION = '';
+    function resolveWindowsVersion(string) {
+        if (string === undefined)
+            return '';
+        var mapped = {
+            '4.90': 'ME',
+            'NT3.51': 'NT 3.11',
+            'NT4.0': 'NT 4.0',
+            'NT 5.0': '2000',
+            'NT 5.1': 'XP',
+            'NT 5.2': 'XP',
+            'NT 6.0': 'Vista',
+            'NT 6.1': '7',
+            'NT 6.2': '8',
+            'NT 6.3': '8.1',
+            'NT 6.4': '10',
+            'NT 10.0': '10',
+            'ARM': 'RT'
+        }[string];
+        if (mapped !== undefined)
+            return mapped;
+        return string;
+    }
+    function resolveUnderscoreVersion(string) {
+        if (string === undefined)
+            return '';
+        return string.replace(/_/g, '.');
+    }
+    function resolveVersion(string, resolver) {
+        if (typeof resolver === 'function')
+            return resolver(string);
+        if (typeof resolver === 'string')
+            return resolver;
+        if (string === undefined)
+            return '';
+        return string;
+    }
+    var OS_RESOLVER_MAP = [
+        [/windows nt (6\.[23]); arm/i, OS.Windows, resolveWindowsVersion],
+        [/windows (?:phone|mobile|iot)(?: os)?[\/ ]?([\d.]*( se)?)/i, OS.Windows, resolveWindowsVersion],
+        [/windows[\/ ](1[01]|2000|3\.1|7|8(\.1)?|9[58]|me|server 20\d\d( r2)?|vista|xp)/i, OS.Windows, resolveWindowsVersion],
+        [/windows nt ?([\d.)]*)(?!.+xbox)/i, OS.Windows, resolveWindowsVersion],
+        [/\bwin(?=3| ?9|n)(?:nt| 9x )?([\d.;]*)/i, OS.Windows, resolveWindowsVersion],
+        [/windows ce\/?([\d.]*)/i, OS.Windows, resolveWindowsVersion],
+        [/[adehimnop]{4,7}\b(?:.*os (\w+) like mac|; opera)/i, OS.iOS, resolveUnderscoreVersion],
+        [/(?:ios;fbsv|ios(?=.+ip(?:ad|hone))|ip(?:ad|hone)(?: |.+i(?:pad)?)os)[\/ ]([\w.]+)/i, OS.iOS, resolveUnderscoreVersion],
+        [/cfnetwork\/.+darwin/i, OS.iOS, resolveUnderscoreVersion],
+        [/mac os x ?([\w. ]*)/i, OS.MacOS, resolveUnderscoreVersion],
+        [/(?:macintosh|mac_powerpc\b)(?!.+(haiku|morphos))/i, OS.MacOS, resolveUnderscoreVersion],
+        [/droid ([\w.]+)\b.+(android[- ]x86)/i, OS.Android],
+        [/android\w*[-\/.; ]?([\d.]*)/i, OS.Android],
+    ];
     var ENGINE_RESOLVER_MAP = [
         [/windows.+ edge\/([\w.]+)/i, Engines.EdgeHTML],
         [/arkweb\/([\w.]+)/i, Engines.ArkWeb],
@@ -93,22 +115,50 @@
         [/tasman[\/ ]\(?([\w.]+)/i, Engines.Tasman],
         [/rv:([\w.]{1,9})\b.+gecko/i, Engines.Gecko]
     ];
-    var OS_NAME = OS.Unknown;
-    var OS_VERSION = '';
-    var DEVICE_NAME = Devices.Unknown;
-    var ENGINE_NAME = Engines.Unknown;
-    var ENGINE_VERSION = '';
+    var BROWSER_RESOLVER_MAP = [
+        [/\b(?:crmo|crios)\/([\w.]+)/i, Browsers.Chrome],
+        [/webview.+edge\/([\w.]+)/i, Browsers.Edge],
+        [/edg(?:e|ios|a)?\/([\w.]+)/i, Browsers.Edge],
+        [/opera mini\/([-\w.]+)/i, Browsers.Opera],
+        [/opera [mobileta]{3,6}\b.+version\/([-\w.]+)/i, Browsers.Opera],
+        [/opera(?:.+version\/|[\/ ]+)([\w.]+)/i, Browsers.Opera],
+        [/opios[\/ ]+([\w.]+)/i, Browsers.Opera],
+        [/\bop(?:rg)?x\/([\w.]+)/i, Browsers.Opera],
+        [/\bopr\/([\w.]+)/i, Browsers.Opera],
+        [/iemobile(?:browser|boat|jet)[\/ ]?([\d.]*)/i, Browsers.IE],
+        [/(?:ms|\()ie ([\w.]+)/i, Browsers.IE],
+        [/trident.+rv[: ]([\w.]{1,9})\b.+like gecko/i, Browsers.IE],
+        [/\bfocus\/([\w.]+)/i, Browsers.Firefox],
+        [/\bopt\/([\w.]+)/i, Browsers.Opera],
+        [/coast\/([\w.]+)/i, Browsers.Opera],
+        [/fxios\/([\w.-]+)/i, Browsers.Firefox],
+        [/samsungbrowser\/([\w.]+)/i, Browsers.SamsungInternet],
+        [/headlesschrome(?:\/([\w.]+)| )/i, Browsers.Chrome],
+        [/wv\).+chrome\/([\w.]+).+edgw\//i, Browsers.Edge],
+        [/ wv\).+(chrome)\/([\w.]+)/i, Browsers.Chrome],
+        [/chrome\/([\w.]+) mobile/i, Browsers.Chrome],
+        [/chrome\/v?([\w.]+)/i, Browsers.Chrome],
+        [/version\/([\w.,]+) .*mobile(?:\/\w+ | ?)safari/i, Browsers.Safari],
+        [/iphone .*mobile(?:\/\w+ | ?)safari/i, Browsers.Safari],
+        [/version\/([\w.,]+) .*safari/i, Browsers.Safari],
+        [/webkit.+?(?:mobile ?safari|safari)(\/[\w.]+)/i, Browsers.Safari, '1'],
+        [/(?:mobile|tablet);.*firefox\/([\w.-]+)/i, Browsers.Firefox],
+        [/mobile vr; rv:([\w.]+)\).+firefox/i, Browsers.Firefox],
+        [/firefox\/([\w.]+)/i, Browsers.Firefox],
+    ];
     for (var i = 0; i < OS_RESOLVER_MAP.length; i++) {
         var map = OS_RESOLVER_MAP[i];
         var regexp = map[0];
         var os = map[1];
-        var device = map[2];
-        var resolver = map[3];
+        var resolver = map[2];
         var matched = USER_AGENT.match(regexp);
         if (matched !== null) {
             OS_NAME = os;
-            OS_VERSION = resolver(matched[1]);
-            DEVICE_NAME = device;
+            OS_VERSION = resolveVersion(matched[1], resolver);
+            if (os === OS.iOS || os === OS.Android)
+                DEVICE_NAME = Devices.Mobile;
+            else if (os === OS.Windows || os === OS.MacOS)
+                DEVICE_NAME = Devices.Desktop;
             break;
         }
     }
@@ -116,15 +166,28 @@
         var map = ENGINE_RESOLVER_MAP[i];
         var regexp = map[0];
         var engine = map[1];
+        var resolver = map[2];
         var matched = USER_AGENT.match(regexp);
         if (matched !== null) {
             ENGINE_NAME = engine;
-            ENGINE_VERSION = matched[1];
+            ENGINE_VERSION = resolveVersion(matched[1], resolver);
+            break;
+        }
+    }
+    for (var i = 0; i < BROWSER_RESOLVER_MAP.length; i++) {
+        var map = BROWSER_RESOLVER_MAP[i];
+        var regexp = map[0];
+        var browser = map[1];
+        var resolver = map[2];
+        var matched = USER_AGENT.match(regexp);
+        if (matched !== null) {
+            BROWSER_NAME = browser;
+            BROWSER_VERSION = resolveVersion(matched[1], resolver);
             break;
         }
     }
     var RENDERER = (function () {
-        var canvas = document.createElement('canvas');
+        var canvas = globalThis.document.createElement('canvas');
         if (typeof canvas.getContext !== 'function')
             return '';
         var context = canvas.getContext('webgl2') || canvas.getContext('experimental-webgl') || canvas.getContext('webgl');
@@ -141,34 +204,73 @@
             return '';
         }
     })();
+    var IS_WEBVIEW = /; ?wv|applewebkit(?!.*safari)/i.test(USER_AGENT);
     var IS_MOBILE = DEVICE_NAME === Devices.Mobile;
     var IS_DESKTOP = DEVICE_NAME === Devices.Desktop;
     var IS_STANDALONE = (function () {
         if (OS_NAME === OS.iOS)
-            return 'standalone' in navigator && navigator.standalone;
+            return 'standalone' in navigator && !!navigator.standalone;
         else
-            return window.matchMedia('(display-mode: standalone)').matches;
+            return globalThis.matchMedia('(display-mode: standalone)').matches;
     })();
-    var IS_WEBVIEW = /; ?wv|applewebkit(?!.*safari)/i.test(USER_AGENT);
 
     var Platform = {
         os: OS_NAME,
         device: DEVICE_NAME,
         engine: ENGINE_NAME,
+        browser: BROWSER_NAME,
         osVersion: OS_VERSION,
         engineVersion: ENGINE_VERSION,
+        browserVersion: BROWSER_VERSION,
         renderer: RENDERER,
         isWebview: IS_WEBVIEW,
         isMobile: IS_MOBILE,
         isDesktop: IS_DESKTOP,
         isStandalone: IS_STANDALONE,
     };
+    function normalizeBrand(entry) {
+        if (entry === null || entry === undefined)
+            return { brand: '', version: '' };
+        if (typeof entry === 'string')
+            return { brand: entry, version: '' };
+        return { brand: entry.brand, version: entry.version };
+    }
+    var navigatorWithUserAgentData = navigator;
+    if (navigatorWithUserAgentData.userAgentData !== undefined && navigatorWithUserAgentData.userAgentData.getHighEntropyValues !== undefined) {
+        navigatorWithUserAgentData
+            .userAgentData
+            .getHighEntropyValues(['brands', 'fullVersionList', 'mobile', 'model', 'platform', 'platformVersion', 'architecture', 'formFactors', 'bitness', 'uaFullVersion', 'wow64'])
+            .then(function (result) {
+            var brands = result.fullVersionList || result.brands || [];
+            var platformVersion = result.platformVersion;
+            for (var i = 0; i < brands.length; i++) {
+                var brand = normalizeBrand(brands[i]);
+                var brandName = brand.brand;
+                var brandVersion = brand.version;
+                if (/not.a.brand/i.test(brandName))
+                    continue;
+                if (brandName === "Chromium")
+                    Platform.engineVersion = brandVersion;
+            }
+            if (typeof platformVersion === 'string') {
+                if (Platform.os === OS.Windows && parseInt(platformVersion.replace(/[^\d.]/g, '').split('.')[0], 10) >= 13)
+                    Platform.osVersion = '11';
+                else
+                    Platform.osVersion = platformVersion;
+            }
+        });
+    }
 
     var NativePlatformPlugin = {
         installed: false,
         name: 'Platform',
         module: Platform,
-        Constants: {},
+        Constants: {
+            OS: OS,
+            Devices: Devices,
+            Engines: Engines,
+            Browsers: Browsers,
+        },
         Errors: {}
     };
 

package/dist/plugin/platform/index.umd.min.js

@@ -1 +1 @@
-!function(e,n){"object"==typeof exports&&"undefined"!=typeof module?module.exports=n():"function"==typeof define&&define.amd?define(n):(e="undefined"!=typeof globalThis?globalThis:e||self).Platform=n()}(this,(function(){"use strict";var e,n,i,o=navigator.userAgent;!function(e){e.Unknown="Unknown",e.Android="Android",e.iOS="iOS",e.Windows="Windows",e.MacOS="MacOS"}(e||(e={})),function(e){e.Unknown="Unknown",e.Mobile="Mobile",e.Desktop="Desktop"}(n||(n={})),function(e){e.Unknown="Unknown",e.EdgeHTML="EdgeHTML",e.ArkWeb="ArkWeb",e.Blink="Blink",e.Presto="Presto",e.WebKit="WebKit",e.Trident="Trident",e.NetFront="NetFront",e.KHTML="KHTML",e.Tasman="Tasman",e.Gecko="Gecko"}(i||(i={}));for(var t=function(){function i(e){return void 0===e?"":e.replace(/_/g,".")}function o(e){if(void 0===e)return"";var n={"4.90":"ME","NT3.51":"NT 3.11","NT4.0":"NT 4.0","NT 5.0":"2000","NT 5.1":"XP","NT 5.2":"XP","NT 6.0":"Vista","NT 6.1":"7","NT 6.2":"8","NT 6.3":"8.1","NT 6.4":"10","NT 10.0":"10",ARM:"RT"}[e];return void 0!==n?n:e}function t(e){return void 0===e?"":e}return[[/android\w*[-\/.; ]?([\d.]*)/i,e.Android,n.Mobile,t],[/microsoft windows (vista|xp)/i,e.Windows,n.Desktop,t],[/windows (?:phone(?: os)?|mobile|iot)[\/ ]?([.\w ]*)/i,e.Windows,n.Desktop,o],[/windows nt 6\.2; (arm)/i,e.Windows,n.Desktop,o],[/windows[\/ ]([ntce\d. ]+\w)(?!.+xbox)/i,e.Windows,n.Desktop,o],[/(?:win(?=[39n])|win 9x )([nt\d.]+)/i,e.Windows,n.Desktop,o],[/[adehimnop]{4,7}\b(?:.*os (\w+) like mac|; opera)/i,e.iOS,n.Mobile,i],[/(?:ios;fbsv\/|iphone.+ios[\/ ])([\d.]+)/i,e.iOS,n.Mobile,i],[/cfnetwork\/.+darwin/i,e.iOS,n.Mobile,t],[/mac os x ?([\w. ]*)/i,e.MacOS,n.Desktop,i],[/(?:macintosh|mac_powerpc\b)(?!.+haiku)/i,e.MacOS,n.Desktop,i]]}(),r=[[/windows.+ edge\/([\w.]+)/i,i.EdgeHTML],[/arkweb\/([\w.]+)/i,i.ArkWeb],[/webkit\/537\.36.+chrome\/(?!27)([\w.]+)/i,i.Blink],[/presto\/([\w.]+)/i,i.Presto],[/webkit\/([\w.]+)/i,i.WebKit],[/trident\/([\w.]+)/i,i.Trident],[/netfront\/([\w.]+)/i,i.NetFront],[/khtml[\/ ]\(?([\w.]+)/i,i.KHTML],[/tasman[\/ ]\(?([\w.]+)/i,i.Tasman],[/rv:([\w.]{1,9})\b.+gecko/i,i.Gecko]],a=e.Unknown,s="",d=n.Unknown,w=i.Unknown,l="",c=0;c<t.length;c++){var f=(m=t[c])[0],k=m[1],u=m[2],b=m[3];if(null!==(p=o.match(f))){a=k,s=b(p[1]),d=u;break}}for(c=0;c<r.length;c++){f=(m=r[c])[0];var m,p,g=m[1];if(null!==(p=o.match(f))){w=g,l=p[1];break}}var T=function(){var e=document.createElement("canvas");if("function"!=typeof e.getContext)return"";var n=e.getContext("webgl2")||e.getContext("experimental-webgl")||e.getContext("webgl");if(null===n)return"";if(n instanceof WebGLRenderingContext||"getParameter"in n&&"function"==typeof n.getParameter){var i=n.getExtension("WEBGL_debug_renderer_info");return null===i?n.getParameter(n.RENDERER):n.getParameter(i.UNMASKED_RENDERER_WEBGL)}return""}(),v=d===n.Mobile,M=d===n.Desktop,N=a===e.iOS?"standalone"in navigator&&navigator.standalone:window.matchMedia("(display-mode: standalone)").matches,W=/; ?wv|applewebkit(?!.*safari)/i.test(o);return{installed:!1,name:"Platform",module:{os:a,device:d,engine:w,osVersion:s,engineVersion:l,renderer:T,isWebview:W,isMobile:v,isDesktop:M,isStandalone:N},Constants:{},Errors:{}}}));
+!function(e,i){"object"==typeof exports&&"undefined"!=typeof module?module.exports=i():"function"==typeof define&&define.amd?define(i):(e="undefined"!=typeof globalThis?globalThis:e||self).Platform=i()}(this,(function(){"use strict";var e,i,n,o,r=navigator.userAgent;!function(e){e.Unknown="Unknown",e.Android="Android",e.iOS="iOS",e.Windows="Windows",e.MacOS="MacOS"}(e||(e={})),function(e){e.Unknown="Unknown",e.Mobile="Mobile",e.Desktop="Desktop"}(i||(i={})),function(e){e.Unknown="Unknown",e.EdgeHTML="EdgeHTML",e.ArkWeb="ArkWeb",e.Blink="Blink",e.Presto="Presto",e.WebKit="WebKit",e.Trident="Trident",e.NetFront="NetFront",e.KHTML="KHTML",e.Tasman="Tasman",e.Gecko="Gecko"}(n||(n={})),function(e){e.Unknown="Unknown",e.Chrome="Chrome",e.Safari="Safari",e.Edge="Edge",e.Firefox="Firefox",e.Opera="Opera",e.IE="IE",e.SamsungInternet="SamsungInternet"}(o||(o={}));var t=i.Unknown,a=e.Unknown,s="",d=n.Unknown,w="",f=o.Unknown,l="";function b(e){if(void 0===e)return"";var i={"4.90":"ME","NT3.51":"NT 3.11","NT4.0":"NT 4.0","NT 5.0":"2000","NT 5.1":"XP","NT 5.2":"XP","NT 6.0":"Vista","NT 6.1":"7","NT 6.2":"8","NT 6.3":"8.1","NT 6.4":"10","NT 10.0":"10",ARM:"RT"}[e];return void 0!==i?i:e}function m(e){return void 0===e?"":e.replace(/_/g,".")}function g(e,i){return"function"==typeof i?i(e):"string"==typeof i?i:void 0===e?"":e}for(var c=[[/windows nt (6\.[23]); arm/i,e.Windows,b],[/windows (?:phone|mobile|iot)(?: os)?[\/ ]?([\d.]*( se)?)/i,e.Windows,b],[/windows[\/ ](1[01]|2000|3\.1|7|8(\.1)?|9[58]|me|server 20\d\d( r2)?|vista|xp)/i,e.Windows,b],[/windows nt ?([\d.)]*)(?!.+xbox)/i,e.Windows,b],[/\bwin(?=3| ?9|n)(?:nt| 9x )?([\d.;]*)/i,e.Windows,b],[/windows ce\/?([\d.]*)/i,e.Windows,b],[/[adehimnop]{4,7}\b(?:.*os (\w+) like mac|; opera)/i,e.iOS,m],[/(?:ios;fbsv|ios(?=.+ip(?:ad|hone))|ip(?:ad|hone)(?: |.+i(?:pad)?)os)[\/ ]([\w.]+)/i,e.iOS,m],[/cfnetwork\/.+darwin/i,e.iOS,m],[/mac os x ?([\w. ]*)/i,e.MacOS,m],[/(?:macintosh|mac_powerpc\b)(?!.+(haiku|morphos))/i,e.MacOS,m],[/droid ([\w.]+)\b.+(android[- ]x86)/i,e.Android],[/android\w*[-\/.; ]?([\d.]*)/i,e.Android]],p=[[/windows.+ edge\/([\w.]+)/i,n.EdgeHTML],[/arkweb\/([\w.]+)/i,n.ArkWeb],[/webkit\/537\.36.+chrome\/(?!27)([\w.]+)/i,n.Blink],[/presto\/([\w.]+)/i,n.Presto],[/webkit\/([\w.]+)/i,n.WebKit],[/trident\/([\w.]+)/i,n.Trident],[/netfront\/([\w.]+)/i,n.NetFront],[/khtml[\/ ]\(?([\w.]+)/i,n.KHTML],[/tasman[\/ ]\(?([\w.]+)/i,n.Tasman],[/rv:([\w.]{1,9})\b.+gecko/i,n.Gecko]],u=[[/\b(?:crmo|crios)\/([\w.]+)/i,o.Chrome],[/webview.+edge\/([\w.]+)/i,o.Edge],[/edg(?:e|ios|a)?\/([\w.]+)/i,o.Edge],[/opera mini\/([-\w.]+)/i,o.Opera],[/opera [mobileta]{3,6}\b.+version\/([-\w.]+)/i,o.Opera],[/opera(?:.+version\/|[\/ ]+)([\w.]+)/i,o.Opera],[/opios[\/ ]+([\w.]+)/i,o.Opera],[/\bop(?:rg)?x\/([\w.]+)/i,o.Opera],[/\bopr\/([\w.]+)/i,o.Opera],[/iemobile(?:browser|boat|jet)[\/ ]?([\d.]*)/i,o.IE],[/(?:ms|\()ie ([\w.]+)/i,o.IE],[/trident.+rv[: ]([\w.]{1,9})\b.+like gecko/i,o.IE],[/\bfocus\/([\w.]+)/i,o.Firefox],[/\bopt\/([\w.]+)/i,o.Opera],[/coast\/([\w.]+)/i,o.Opera],[/fxios\/([\w.-]+)/i,o.Firefox],[/samsungbrowser\/([\w.]+)/i,o.SamsungInternet],[/headlesschrome(?:\/([\w.]+)| )/i,o.Chrome],[/wv\).+chrome\/([\w.]+).+edgw\//i,o.Edge],[/ wv\).+(chrome)\/([\w.]+)/i,o.Chrome],[/chrome\/([\w.]+) mobile/i,o.Chrome],[/chrome\/v?([\w.]+)/i,o.Chrome],[/version\/([\w.,]+) .*mobile(?:\/\w+ | ?)safari/i,o.Safari],[/iphone .*mobile(?:\/\w+ | ?)safari/i,o.Safari],[/version\/([\w.,]+) .*safari/i,o.Safari],[/webkit.+?(?:mobile ?safari|safari)(\/[\w.]+)/i,o.Safari,"1"],[/(?:mobile|tablet);.*firefox\/([\w.-]+)/i,o.Firefox],[/mobile vr; rv:([\w.]+)\).+firefox/i,o.Firefox],[/firefox\/([\w.]+)/i,o.Firefox]],v=0;v<c.length;v++){var h=(x=c[v])[0],k=x[1],T=x[2];if(null!==(S=r.match(h))){a=k,s=g(S[1],T),k===e.iOS||k===e.Android?t=i.Mobile:k!==e.Windows&&k!==e.MacOS||(t=i.Desktop);break}}for(v=0;v<p.length;v++){h=(x=p[v])[0];var E=x[1];T=x[2];if(null!==(S=r.match(h))){d=E,w=g(S[1],T);break}}for(v=0;v<u.length;v++){h=(x=u[v])[0];var x,S,O=x[1];T=x[2];if(null!==(S=r.match(h))){f=O,l=g(S[1],T);break}}var M=function(){var e=globalThis.document.createElement("canvas");if("function"!=typeof e.getContext)return"";var i=e.getContext("webgl2")||e.getContext("experimental-webgl")||e.getContext("webgl");if(null===i)return"";if(i instanceof WebGLRenderingContext||"getParameter"in i&&"function"==typeof i.getParameter){var n=i.getExtension("WEBGL_debug_renderer_info");return null===n?i.getParameter(i.RENDERER):i.getParameter(n.UNMASKED_RENDERER_WEBGL)}return""}(),W=/; ?wv|applewebkit(?!.*safari)/i.test(r),N=t===i.Mobile,A=t===i.Desktop,C=a===e.iOS?"standalone"in navigator&&!!navigator.standalone:globalThis.matchMedia("(display-mode: standalone)").matches,V={os:a,device:t,engine:d,browser:f,osVersion:s,engineVersion:w,browserVersion:l,renderer:M,isWebview:W,isMobile:N,isDesktop:A,isStandalone:C};var y=navigator;return void 0!==y.userAgentData&&void 0!==y.userAgentData.getHighEntropyValues&&y.userAgentData.getHighEntropyValues(["brands","fullVersionList","mobile","model","platform","platformVersion","architecture","formFactors","bitness","uaFullVersion","wow64"]).then((function(i){for(var n,o=i.fullVersionList||i.brands||[],r=i.platformVersion,t=0;t<o.length;t++){var a=null==(n=o[t])?{brand:"",version:""}:"string"==typeof n?{brand:n,version:""}:{brand:n.brand,version:n.version},s=a.brand,d=a.version;/not.a.brand/i.test(s)||"Chromium"===s&&(V.engineVersion=d)}"string"==typeof r&&(V.os===e.Windows&&parseInt(r.replace(/[^\d.]/g,"").split(".")[0],10)>=13?V.osVersion="11":V.osVersion=r)})),{installed:!1,name:"Platform",module:V,Constants:{OS:e,Devices:i,Engines:n,Browsers:o},Errors:{}}}));