ua-browser 1.4.0 → 1.4.1

package/dist/index.mjs

@@ -1,24 +1,23 @@
 // package.json
 var package_default = {
-  version: "1.4.0"};
+  version: "1.4.1"};
 
 // src/constants/os.ts
 var OS_DEFS = [
-  { name: "WebOS", detect: /hpwOS/, versionPattern: /hpwOS\/([\d.]+)/ },
-  { name: "Symbian", detect: /Symbian/, versionPattern: null },
-  { name: "MeeGo", detect: /MeeGo/, versionPattern: null },
-  { name: "BlackBerry", detect: /(BlackBerry|RIM)/, versionPattern: null },
-  { name: "FreeBSD", detect: /FreeBSD/, versionPattern: null },
-  { name: "Debian", detect: /Debian/, versionPattern: /Debian\/([\d.]+)/ },
-  { name: "Ubuntu", detect: /Ubuntu/, versionPattern: null },
-  // Linux must come before Chrome OS: Chrome OS UAs contain "X11", so Linux matches first,
-  // then Chrome OS overrides it.
-  { name: "Linux", detect: /(Linux|X11)/, versionPattern: null },
-  { name: "Chrome OS", detect: /CrOS/, versionPattern: null },
-  { name: "Tizen", detect: /Tizen/, versionPattern: /Tizen ([\d.]+)/ },
-  { name: "iOS", detect: /like Mac OS X/, versionPattern: /OS ([\d_]+) like/ },
+  { name: "WebOS", priority: 20, detect: /hpwOS/, versionPattern: /hpwOS\/([\d.]+)/ },
+  { name: "Symbian", priority: 20, detect: /Symbian/, versionPattern: null },
+  { name: "MeeGo", priority: 20, detect: /MeeGo/, versionPattern: null },
+  { name: "BlackBerry", priority: 20, detect: /(BlackBerry|RIM)/, versionPattern: null },
+  { name: "FreeBSD", priority: 20, detect: /FreeBSD/, versionPattern: null },
+  { name: "Debian", priority: 20, detect: /Debian/, versionPattern: /Debian\/([\d.]+)/ },
+  { name: "Ubuntu", priority: 20, detect: /Ubuntu/, versionPattern: null },
+  { name: "Linux", priority: 10, detect: /(Linux|X11)/, versionPattern: null },
+  { name: "Chrome OS", priority: 30, detect: /CrOS/, versionPattern: null },
+  { name: "Tizen", priority: 20, detect: /Tizen/, versionPattern: /Tizen ([\d.]+)/ },
+  { name: "iOS", priority: 20, detect: /like Mac OS X/, versionPattern: /OS ([\d_]+) like/ },
   {
     name: "MacOS",
+    priority: 20,
     detect: /Macintosh/,
     versionPattern: /Mac OS X -?([\d_.]+)/,
     versionNames: {
@@ -36,27 +35,21 @@ var OS_DEFS = [
       "15": "Sequoia"
     }
   },
-  // visionOS / tvOS must come AFTER iOS: their UAs also contain "like Mac OS X",
-  // so they need to override iOS via the last-match-wins iteration.
-  { name: "visionOS", detect: /visionOS/, versionPattern: /visionOS ([\d_]+)/ },
-  { name: "tvOS", detect: /Apple TV/, versionPattern: /OS ([\d_]+) like/ },
-  { name: "Android", detect: /(Android|Adr)/, versionPattern: /(?:Android|Adr) ([\d.]+)/ },
-  // HarmonyOS must come after Android: HarmonyOS UAs include "Android", so Android matches
-  // first, then HarmonyOS overrides it. versionPattern tries direct extraction first (5.0+
-  // pure HarmonyOS UAs don't have Android token), then falls back to Android version + lookup.
+  { name: "visionOS", priority: 30, detect: /visionOS/, versionPattern: /visionOS ([\d_]+)/ },
+  { name: "tvOS", priority: 30, detect: /Apple TV/, versionPattern: /OS ([\d_]+) like/ },
+  { name: "Android", priority: 20, detect: /(Android|Adr)/, versionPattern: /(?:Android|Adr) ([\d.]+)/ },
   {
     name: "HarmonyOS",
+    priority: 30,
     detect: /HarmonyOS/,
     versionPattern: [/HarmonyOS[\s/]([\d.]+)/, /Android ([\d.]+)[;)]/],
-    versionLookup: { "10": "2", "11": "3", "12": "3", "13": "4" }
+    versionLookup: { "10": "2", "11": "3", "12": "3", "13": "4", "14": "4" }
   },
-  // OpenHarmony (open-source base) must come after HarmonyOS to override any earlier match.
-  { name: "OpenHarmony", detect: /OpenHarmony/, versionPattern: /OpenHarmony[\s/]([\d.]+)/ },
-  { name: "KaiOS", detect: /KAIOS/, versionPattern: /KAIOS\/([\d.]+)/ },
-  // Windows must come before Windows Phone: Windows Phone UAs contain "Windows", so Windows
-  // matches first, then Windows Phone overrides it.
+  { name: "OpenHarmony", priority: 30, detect: /OpenHarmony/, versionPattern: /OpenHarmony[\s/]([\d.]+)/ },
+  { name: "KaiOS", priority: 30, detect: /KAIOS/, versionPattern: /KAIOS\/([\d.]+)/ },
   {
     name: "Windows",
+    priority: 10,
     detect: /Windows/,
     versionPattern: /Windows NT ([\d.]+)/,
     versionLookup: {
@@ -78,7 +71,7 @@ var OS_DEFS = [
       "11": "Windows 11"
     }
   },
-  { name: "Windows Phone", detect: /(IEMobile|Windows Phone)/, versionPattern: /Windows Phone(?: OS)? ([\d.]+)/ }
+  { name: "Windows Phone", priority: 30, detect: /(IEMobile|Windows Phone)/, versionPattern: /Windows Phone(?: OS)? ([\d.]+)/ }
 ];
 
 // src/constants/browsers.ts
@@ -300,9 +293,11 @@ function lookupVersionName(map, version) {
 }
 function detectOs(ua, windowsVersion) {
   let matchedDef = null;
+  let bestPriority = -1;
   for (const def of OS_DEFS) {
-    if (def.detect.test(ua)) {
+    if (def.detect.test(ua) && def.priority > bestPriority) {
       matchedDef = def;
+      bestPriority = def.priority;
     }
   }
   if (!matchedDef) return { os: "unknown", osVersion: "unknown", osVersionName: "unknown" };
@@ -451,7 +446,7 @@ var BOT_DEFS = [
   { name: "Facebookbot", detect: /(facebookexternalhit|FacebookBot)/, category: "social" },
   { name: "Twitterbot", detect: /Twitterbot/, category: "social" },
   { name: "LinkedInBot", detect: /LinkedInBot/, category: "social" },
-  { name: "PinterestBot", detect: /Pinterest/, category: "social" },
+  { name: "PinterestBot", detect: /Pinterestbot/i, category: "social" },
   // Messaging link preview bots
   { name: "Slackbot", detect: /Slackbot/, category: "link-preview" },
   { name: "Discordbot", detect: /Discordbot/, category: "link-preview" },
@@ -580,6 +575,7 @@ var BRAND_TO_BROWSER = [
   ["Microsoft Edge", "Edge"],
   ["Opera", "Opera"],
   ["Vivaldi", "Vivaldi"],
+  ["Brave", "Brave"],
   ["Google Chrome", "Chrome"],
   ["Chromium", "Chromium"]
 ];
@@ -644,6 +640,82 @@ function normalizeBCP47(raw) {
     return p.toUpperCase();
   }).join("-");
 }
+var ISO_639_1 = /* @__PURE__ */ new Set([
+  "af",
+  "am",
+  "ar",
+  "az",
+  "be",
+  "bg",
+  "bn",
+  "bs",
+  "ca",
+  "cs",
+  "cy",
+  "da",
+  "de",
+  "el",
+  "en",
+  "es",
+  "et",
+  "eu",
+  "fa",
+  "fi",
+  "fr",
+  "ga",
+  "gl",
+  "gu",
+  "he",
+  "hi",
+  "hr",
+  "hu",
+  "hy",
+  "id",
+  "is",
+  "it",
+  "ja",
+  "ka",
+  "kk",
+  "km",
+  "kn",
+  "ko",
+  "lt",
+  "lv",
+  "mk",
+  "ml",
+  "mn",
+  "mr",
+  "ms",
+  "mt",
+  "my",
+  "nb",
+  "ne",
+  "nl",
+  "no",
+  "pa",
+  "pl",
+  "pt",
+  "ro",
+  "ru",
+  "si",
+  "sk",
+  "sl",
+  "sq",
+  "sr",
+  "sv",
+  "sw",
+  "ta",
+  "te",
+  "th",
+  "tl",
+  "tr",
+  "uk",
+  "ur",
+  "uz",
+  "vi",
+  "zh",
+  "zu"
+]);
 function languageFromUA(ua) {
   const kwMatch = /\bLanguage\/([a-zA-Z]{2,3}(?:[-_][a-zA-Z]{2,4}){1,2})\b/i.exec(ua);
   if (kwMatch) return normalizeBCP47(kwMatch[1]);
@@ -653,6 +725,10 @@ function languageFromUA(ua) {
     const parts = m[1].replace(/_/g, "-").split("-");
     if (parts.length >= 2) return normalizeBCP47(m[1]);
   }
+  const bare = /[;(]\s*([a-z]{2,3})\s*[;)]/g;
+  while ((m = bare.exec(ua)) !== null) {
+    if (ISO_639_1.has(m[1])) return m[1];
+  }
   return "unknown";
 }
 function parseUA(ua, options = {}) {
@@ -709,20 +785,8 @@ function parseUA(ua, options = {}) {
     const opVer = (_h = (_g = /OPR\/([\d.]+)/.exec(ua)) != null ? _g : /OPT\/([\d.]+)/.exec(ua)) != null ? _h : /Opera\/([\d.]+)/.exec(ua);
     version = (_i = opVer == null ? void 0 : opVer[1]) != null ? _i : "unknown";
   }
-  if (browser === "Chrome" && /\S+Browser\//.test(ua)) {
-    const m = /(\S+Browser)\/([\d.]+)/.exec(ua);
-    if (m) {
-      browser = m[1];
-      version = m[2];
-    }
-  }
-  if (browser === "Firefox" && nav) {
-    try {
-      if (typeof clientInformation !== "undefined" || typeof u2f === "undefined") {
-        browser = "Firefox Nightly";
-      }
-    } catch (e) {
-    }
+  if (browser === "Firefox" && /Firefox\/[\d.]+a\d/.test(ua)) {
+    browser = "Firefox Nightly";
   }
   if (os === "iOS" && browser === "Safari") {
     const m = /Version\/([\d.]+)/.exec(ua);
@@ -765,7 +829,8 @@ function parseUA(ua, options = {}) {
     }
   }
   const { engine, engineVersion } = detectEngine(ua, browser, version);
-  const versionMajor = parseInt((_l = version.split(".")[0]) != null ? _l : "0", 10) || 0;
+  const major = parseInt((_l = version.split(".")[0]) != null ? _l : "", 10);
+  const versionMajor = Number.isNaN(major) ? 0 : major;
   const connectionType = (_p = (_o = (_n = (_m = options.ctx) != null ? _m : options.nav) == null ? void 0 : _n.connection) == null ? void 0 : _o.effectiveType) != null ? _p : "unknown";
   const finalOsVersionName = os === "MacOS" || os === "Windows" ? (() => {
     var _a2;
@@ -1006,7 +1071,7 @@ function deriveWindowsVersion2(platformVersion) {
   return isNaN(major) ? null : major >= 13 ? "11" : "10";
 }
 function parseHeaders(headers) {
-  var _a, _b, _c, _d, _e;
+  var _a, _b, _c, _d, _e, _f;
   const normalised = {};
   for (const key of Object.keys(headers)) {
     normalised[key.toLowerCase()] = headers[key];
@@ -1023,12 +1088,24 @@ function parseHeaders(headers) {
   const model = unquote(get("sec-ch-ua-model"));
   const platformVersion = unquote(get("sec-ch-ua-platform-version"));
   const platform = (_e = unquote(get("sec-ch-ua-platform"))) != null ? _e : "";
+  const fullVersionListRaw = get("sec-ch-ua-full-version-list");
+  const fullVersionList = [];
+  if (fullVersionListRaw) {
+    const re = /"([^"]+)";v="([^"]+)"/g;
+    let m;
+    while ((m = re.exec(fullVersionListRaw)) !== null) {
+      fullVersionList.push({ brand: m[1], version: m[2] });
+    }
+  }
   const highEntropyData = {};
   if (architecture !== void 0) highEntropyData.architecture = architecture;
   if (bitness !== void 0) highEntropyData.bitness = bitness;
   if (model !== void 0) highEntropyData.model = model;
   if (platformVersion !== void 0) highEntropyData.platformVersion = platformVersion;
+  if (fullVersionList.length > 0) highEntropyData.fullVersionList = fullVersionList;
   const isMobile = get("sec-ch-ua-mobile") === "?1";
+  const secCHUA = (_f = get("sec-ch-ua")) != null ? _f : "";
+  const hasBrave = /"Brave"/.test(secCHUA);
   const windowsVersion = platform === "Windows" ? deriveWindowsVersion2(platformVersion) : null;
   const ctx = {
     userAgent: ua,
@@ -1036,7 +1113,8 @@ function parseHeaders(headers) {
     language,
     maxTouchPoints: isMobile ? 1 : 0,
     highEntropyData: Object.keys(highEntropyData).length > 0 ? highEntropyData : void 0,
-    windowsVersion
+    windowsVersion,
+    hasBrave
   };
   return parseUA(ua, { ctx });
 }