ua-browser 1.4.0-beta.0 → 1.4.0

package/README.en.md

@@ -182,6 +182,8 @@ import {
   detectBot,            // standalone bot detection
   detectBrowser,        // standalone browser detection
   detectOS,             // standalone OS detection
+  detectEngine,         // standalone rendering engine detection
+  detectDevice,         // standalone device type detection
   detectArch,           // standalone CPU architecture detection
   detectHeadless,       // standalone headless browser detection
   satisfies,            // condition-matching helper

package/README.md

@@ -164,6 +164,8 @@ import {
   detectBot,            // 独立爬虫检测
   detectBrowser,        // 独立浏览器检测
   detectOS,             // 独立操作系统检测
+  detectEngine,         // 独立渲染引擎检测
+  detectDevice,         // 独立设备类型检测
   detectArch,           // 独立 CPU 架构检测
   detectHeadless,       // 独立无头浏览器检测
   satisfies,            // 条件匹配辅助函数

package/dist/index.cjs

@@ -4,7 +4,86 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 // package.json
 var package_default = {
-  version: "1.4.0-beta.0"};
+  version: "1.4.0"};
+
+// 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: "MacOS",
+    detect: /Macintosh/,
+    versionPattern: /Mac OS X -?([\d_.]+)/,
+    versionNames: {
+      "10.9": "Mavericks",
+      "10.10": "Yosemite",
+      "10.11": "El Capitan",
+      "10.12": "Sierra",
+      "10.13": "High Sierra",
+      "10.14": "Mojave",
+      "10.15": "Catalina",
+      "11": "Big Sur",
+      "12": "Monterey",
+      "13": "Ventura",
+      "14": "Sonoma",
+      "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: "HarmonyOS",
+    detect: /HarmonyOS/,
+    versionPattern: [/HarmonyOS[\s/]([\d.]+)/, /Android ([\d.]+)[;)]/],
+    versionLookup: { "10": "2", "11": "3", "12": "3", "13": "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: "Windows",
+    detect: /Windows/,
+    versionPattern: /Windows NT ([\d.]+)/,
+    versionLookup: {
+      "10": "10",
+      "6.4": "10",
+      "6.3": "8.1",
+      "6.2": "8",
+      "6.1": "7",
+      "6.0": "Vista",
+      "5.2": "XP",
+      "5.1": "XP",
+      "5.0": "2000"
+    },
+    versionNames: {
+      "7": "Windows 7",
+      "8": "Windows 8",
+      "8.1": "Windows 8.1",
+      "10": "Windows 10",
+      "11": "Windows 11"
+    }
+  },
+  { name: "Windows Phone", detect: /(IEMobile|Windows Phone)/, versionPattern: /Windows Phone(?: OS)? ([\d.]+)/ }
+];
 
 // src/constants/browsers.ts
 var BROWSER_DEFS = [
@@ -151,7 +230,7 @@ function detectBrowser(ua) {
       }
     }
   }
-  if (!best) return { browser: "unknown", version: "unknown" };
+  if (!best) return { browser: "unknown", version: "unknown", browserType: "unknown", priority: 0 };
   let version = null;
   if (best.chromeLookup) {
     version = lookupFromChromeVersion(ua, best.chromeLookup);
@@ -160,7 +239,9 @@ function detectBrowser(ua) {
     const patterns = Array.isArray(best.versionPattern) ? best.versionPattern : [best.versionPattern];
     version = extractVersionFromPatterns(ua, patterns);
   }
-  return { browser: best.name, version: version != null ? version : "unknown" };
+  const p = best.priority;
+  const browserType = p >= 500 ? "app" : p >= 300 ? "brand" : "browser";
+  return { browser: best.name, version: version != null ? version : "unknown", browserType, priority: p };
 }
 
 // src/constants/engines.ts
@@ -176,8 +257,22 @@ var ENGINE_DEFS = [
 ];
 
 // src/detectors/engine.ts
+var ENGINE_VERSION_RE = {
+  WebKit: /AppleWebKit\/([\d.]+)/,
+  Blink: /AppleWebKit\/([\d.]+)/,
+  ArkWeb: /AppleWebKit\/([\d.]+)/,
+  Gecko: /Gecko\/([\d.]+)/,
+  Trident: /Trident\/([\d.]+)/,
+  Presto: /Presto\/([\d.]+)/,
+  KHTML: /KHTML\/([\d.]+)/
+};
 function detectEngine(ua, browser, version) {
-  var _a, _b;
+  var _a, _b, _c, _d;
+  if (browser === void 0 || version === void 0) {
+    const b = detectBrowser(ua);
+    browser = browser != null ? browser : b.browser;
+    version = version != null ? version : b.version;
+  }
   let engine = "unknown";
   for (const def of ENGINE_DEFS) {
     if (def.detect.test(ua)) {
@@ -194,64 +289,19 @@ function detectEngine(ua, browser, version) {
   if (browser === "Edge") {
     engine = parseInt(version, 10) > 75 ? "Blink" : "EdgeHTML";
   }
-  return engine;
+  const engineVersion = ENGINE_VERSION_RE[engine] ? (_d = (_c = ENGINE_VERSION_RE[engine].exec(ua)) == null ? void 0 : _c[1]) != null ? _d : "unknown" : "unknown";
+  return { engine, engineVersion };
 }
 
-// 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: "MacOS", detect: /Macintosh/, versionPattern: /Mac OS X -?([\d_.]+)/ },
-  // 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: "HarmonyOS",
-    detect: /HarmonyOS/,
-    versionPattern: [/HarmonyOS[\s/]([\d.]+)/, /Android ([\d.]+)[;)]/],
-    versionLookup: { "10": "2", "11": "3", "12": "3", "13": "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: "Windows",
-    detect: /Windows/,
-    versionPattern: /Windows NT ([\d.]+)/,
-    versionLookup: {
-      "10": "10",
-      "6.4": "10",
-      "6.3": "8.1",
-      "6.2": "8",
-      "6.1": "7",
-      "6.0": "Vista",
-      "5.2": "XP",
-      "5.1": "XP",
-      "5.0": "2000"
-    }
-  },
-  { name: "Windows Phone", detect: /(IEMobile|Windows Phone)/, versionPattern: /Windows Phone(?: OS)? ([\d.]+)/ }
-];
-
 // src/detectors/os.ts
+function lookupVersionName(map, version) {
+  const parts = version.split(".");
+  for (let len = parts.length; len >= 1; len--) {
+    const key = parts.slice(0, len).join(".");
+    if (Object.prototype.hasOwnProperty.call(map, key)) return map[key];
+  }
+  return "unknown";
+}
 function detectOs(ua, windowsVersion) {
   let matchedDef = null;
   for (const def of OS_DEFS) {
@@ -259,7 +309,7 @@ function detectOs(ua, windowsVersion) {
       matchedDef = def;
     }
   }
-  if (!matchedDef) return { os: "unknown", osVersion: "unknown" };
+  if (!matchedDef) return { os: "unknown", osVersion: "unknown", osVersionName: "unknown" };
   let osVersion = "unknown";
   if (matchedDef.versionPattern) {
     const raw = Array.isArray(matchedDef.versionPattern) ? extractVersionFromPatterns(ua, matchedDef.versionPattern) : extractVersion(ua, matchedDef.versionPattern);
@@ -283,7 +333,8 @@ function detectOs(ua, windowsVersion) {
   if (matchedDef.name === "Windows" && windowsVersion) {
     osVersion = windowsVersion;
   }
-  return { os: matchedDef.name, osVersion };
+  const osVersionName = matchedDef.versionNames ? lookupVersionName(matchedDef.versionNames, osVersion) : "unknown";
+  return { os: matchedDef.name, osVersion, osVersionName };
 }
 
 // src/constants/devices.ts
@@ -348,57 +399,93 @@ function detectDevice(ua, nav) {
   }
   return (_b = (_a = hwDetect()) != null ? _a : uaDetect()) != null ? _b : "PC";
 }
+var VENDOR_MAP = [
+  [/^SM-|^GT-|^SGH-|^SCH-|^SHW-|^SPH-|^SAMSUNG /i, "Samsung"],
+  [/^Pixel |^Nexus /, "Google"],
+  [/^moto |^motorola /i, "Motorola"],
+  [/^HONOR /i, "Honor"],
+  [/^ELS-|^LYA-|^HMA-|^VOG-|^ANA-|^CLT-|^JNY-|^NOH-|^PLK-|^BAH-|^BKL-|^COL-|^DUB-|^FIG-|^KIW-|^MAR-|^VTR-|^WAS-/i, "Huawei"],
+  [/^CPH/, "OPPO"],
+  [/^RMX/, "Realme"],
+  [/^V\d{4}[A-Z]|^vivo /i, "Vivo"],
+  [/^iqoo/i, "Vivo"],
+  [/^Redmi |^POCO |^Mi /, "Xiaomi"],
+  [/^2\d{9}|^2\d{3}[A-Z]/, "Xiaomi"],
+  [/^OnePlus |^IN2|^KB2|^LE2/i, "OnePlus"],
+  [/^LM-|^LGE |^LG-/i, "LG"],
+  [/^HTC/i, "HTC"],
+  [/^Nokia/i, "Nokia"],
+  [/^XQ-/, "Sony"],
+  [/^ASUS_|^ZB6|^ZS6|^ZE[56]/i, "Asus"],
+  [/^Quest /i, "Meta"]
+];
+var ANDROID_MODEL_RE = /Android [0-9.]+;(?:\s*U;)?(?:\s*[a-z]{2}[-_][a-zA-Z]{2,4};)?\s*([^;)]+?)(?:\s+Build\/|[;)])/;
+function detectVendorModel(ua) {
+  if (/visionOS/.test(ua)) return { vendor: "Apple", model: "Apple Vision Pro" };
+  if (/iPhone/.test(ua)) return { vendor: "Apple", model: "iPhone" };
+  if (/iPad/.test(ua)) return { vendor: "Apple", model: "iPad" };
+  if (/iPod/.test(ua)) return { vendor: "Apple", model: "iPod touch" };
+  const m = ANDROID_MODEL_RE.exec(ua);
+  if (m) {
+    const model = m[1].trim();
+    for (const [re, vendor] of VENDOR_MAP) {
+      if (re.test(model)) return { vendor, model };
+    }
+    return { vendor: "unknown", model };
+  }
+  return { vendor: "unknown", model: "unknown" };
+}
 
 // src/constants/bots.ts
 var BOT_DEFS = [
   // Search engines
-  { name: "Googlebot", detect: /Googlebot/ },
-  { name: "Bingbot", detect: /(bingbot|BingPreview)/ },
-  { name: "Baiduspider", detect: /(Baiduspider|BaiduMobaider)/ },
-  { name: "Bytespider", detect: /Bytespider/ },
-  { name: "YandexBot", detect: /YandexBot/ },
-  { name: "DuckDuckBot", detect: /DuckDuckBot/ },
-  { name: "Slurp", detect: /Slurp/ },
-  { name: "Sogou", detect: /(Sogou|sogou).*[Ss]pider/ },
-  { name: "360Spider", detect: /360Spider/ },
-  { name: "PetalBot", detect: /PetalBot/ },
-  { name: "Applebot-Extended", detect: /Applebot-Extended/ },
-  { name: "Applebot", detect: /Applebot/ },
+  { name: "Googlebot", detect: /Googlebot/, category: "search-engine" },
+  { name: "Bingbot", detect: /(bingbot|BingPreview)/, category: "search-engine" },
+  { name: "Baiduspider", detect: /(Baiduspider|BaiduMobaider)/, category: "search-engine" },
+  { name: "Bytespider", detect: /Bytespider/, category: "search-engine" },
+  { name: "YandexBot", detect: /YandexBot/, category: "search-engine" },
+  { name: "DuckDuckBot", detect: /DuckDuckBot/, category: "search-engine" },
+  { name: "Slurp", detect: /Slurp/, category: "search-engine" },
+  { name: "Sogou", detect: /(Sogou|sogou).*[Ss]pider/, category: "search-engine" },
+  { name: "360Spider", detect: /360Spider/, category: "search-engine" },
+  { name: "PetalBot", detect: /PetalBot/, category: "search-engine" },
+  { name: "Applebot-Extended", detect: /Applebot-Extended/, category: "search-engine" },
+  { name: "Applebot", detect: /Applebot/, category: "search-engine" },
   // Social media crawlers
-  { name: "Facebookbot", detect: /(facebookexternalhit|FacebookBot)/ },
-  { name: "Twitterbot", detect: /Twitterbot/ },
-  { name: "LinkedInBot", detect: /LinkedInBot/ },
-  { name: "PinterestBot", detect: /Pinterest/ },
+  { 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" },
   // Messaging link preview bots
-  { name: "Slackbot", detect: /Slackbot/ },
-  { name: "Discordbot", detect: /Discordbot/ },
-  { name: "TelegramBot", detect: /TelegramBot/ },
-  { name: "WhatsApp", detect: /WhatsApp/ },
+  { name: "Slackbot", detect: /Slackbot/, category: "link-preview" },
+  { name: "Discordbot", detect: /Discordbot/, category: "link-preview" },
+  { name: "TelegramBot", detect: /TelegramBot/, category: "link-preview" },
+  { name: "WhatsApp", detect: /WhatsApp/, category: "link-preview" },
   // SEO tools
-  { name: "SemrushBot", detect: /SemrushBot/ },
-  { name: "AhrefsBot", detect: /AhrefsBot/ },
-  { name: "MJ12bot", detect: /MJ12bot/ },
-  { name: "ScreamingFrog", detect: /Screaming Frog/ },
-  { name: "DataForSeoBot", detect: /DataForSeoBot/ },
+  { name: "SemrushBot", detect: /SemrushBot/, category: "seo-tool" },
+  { name: "AhrefsBot", detect: /AhrefsBot/, category: "seo-tool" },
+  { name: "MJ12bot", detect: /MJ12bot/, category: "seo-tool" },
+  { name: "ScreamingFrog", detect: /Screaming Frog/, category: "seo-tool" },
+  { name: "DataForSeoBot", detect: /DataForSeoBot/, category: "seo-tool" },
   // AI / LLM crawlers
-  { name: "GPTBot", detect: /GPTBot/ },
-  { name: "OAI-SearchBot", detect: /OAI-SearchBot/ },
-  { name: "ChatGPT-User", detect: /ChatGPT-User/ },
-  { name: "ClaudeBot", detect: /ClaudeBot/ },
-  { name: "PerplexityBot", detect: /PerplexityBot/ },
-  { name: "CCBot", detect: /CCBot/ },
-  { name: "AdsBot", detect: /AdsBot-Google/ },
-  { name: "Google-Extended", detect: /Google-Extended/ },
-  { name: "Meta-ExternalAgent", detect: /meta-externalagent/i },
-  { name: "Amazonbot", detect: /Amazonbot/ },
-  { name: "Diffbot", detect: /Diffbot/ },
-  { name: "cohere-ai", detect: /cohere-ai/ },
-  { name: "YouBot", detect: /YouBot/ },
+  { name: "GPTBot", detect: /GPTBot/, category: "ai-llm" },
+  { name: "OAI-SearchBot", detect: /OAI-SearchBot/, category: "ai-llm" },
+  { name: "ChatGPT-User", detect: /ChatGPT-User/, category: "ai-llm" },
+  { name: "ClaudeBot", detect: /ClaudeBot/, category: "ai-llm" },
+  { name: "PerplexityBot", detect: /PerplexityBot/, category: "ai-llm" },
+  { name: "CCBot", detect: /CCBot/, category: "ai-llm" },
+  { name: "AdsBot", detect: /AdsBot-Google/, category: "ai-llm" },
+  { name: "Google-Extended", detect: /Google-Extended/, category: "ai-llm" },
+  { name: "Meta-ExternalAgent", detect: /meta-externalagent/i, category: "ai-llm" },
+  { name: "Amazonbot", detect: /Amazonbot/, category: "ai-llm" },
+  { name: "Diffbot", detect: /Diffbot/, category: "ai-llm" },
+  { name: "cohere-ai", detect: /cohere-ai/, category: "ai-llm" },
+  { name: "YouBot", detect: /YouBot/, category: "ai-llm" },
   // Monitoring / archiving
-  { name: "UptimeRobot", detect: /UptimeRobot/ },
-  { name: "ia_archiver", detect: /ia_archiver/ },
+  { name: "UptimeRobot", detect: /UptimeRobot/, category: "monitoring" },
+  { name: "ia_archiver", detect: /ia_archiver/, category: "monitoring" },
   // Generic catch-all (must be last)
-  { name: "GenericBot", detect: /(bot|crawler|spider|crawling|scraper)/i }
+  { name: "GenericBot", detect: /(bot|crawler|spider|crawling|scraper)/i, category: "generic" }
 ];
 
 // src/detectors/bot.ts
@@ -406,10 +493,10 @@ function detectBot(ua, customDefs) {
   const defs = customDefs ? [...BOT_DEFS.slice(0, -1), ...customDefs, BOT_DEFS[BOT_DEFS.length - 1]] : BOT_DEFS;
   for (const def of defs) {
     if (def.detect.test(ua)) {
-      return { isBot: true, botName: def.name };
+      return { isBot: true, botName: def.name, botCategory: def.category };
     }
   }
-  return { isBot: false, botName: "unknown" };
+  return { isBot: false, botName: "unknown", botCategory: "unknown" };
 }
 
 // src/constants/arch.ts
@@ -553,14 +640,22 @@ function platformFromUA(ua) {
   }
   return "unknown";
 }
+function normalizeBCP47(raw) {
+  const parts = raw.replace(/_/g, "-").split("-");
+  return parts.map((p, i) => {
+    if (i === 0) return p.toLowerCase();
+    if (p.length === 4) return p[0].toUpperCase() + p.slice(1).toLowerCase();
+    return p.toUpperCase();
+  }).join("-");
+}
 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]);
   const re = /[;(]\s*([a-z]{2,3}(?:[-_][A-Za-z]{2,4})+)\s*[;)]/g;
   let m;
   while ((m = re.exec(ua)) !== null) {
     const parts = m[1].replace(/_/g, "-").split("-");
-    if (parts.length >= 2) {
-      return `${parts[0].toLowerCase()}-${parts.slice(1).map((p) => p.toUpperCase()).join("-")}`;
-    }
+    if (parts.length >= 2) return normalizeBCP47(m[1]);
   }
   return "unknown";
 }
@@ -568,14 +663,15 @@ function parseUA(ua, options = {}) {
   var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p;
   const effectiveNav = (_a = options.ctx) != null ? _a : options.nav;
   const effectiveWindowsVersion = (_c = (_b = options.ctx) == null ? void 0 : _b.windowsVersion) != null ? _c : options.windowsVersion;
-  const { browser: rawBrowser, version: rawVersion } = detectBrowser(ua);
-  const { os: rawOs, osVersion: rawOsVersion } = detectOs(ua, effectiveWindowsVersion);
+  const { browser: rawBrowser, version: rawVersion, browserType } = detectBrowser(ua);
+  const { os: rawOs, osVersion: rawOsVersion, osVersionName } = detectOs(ua, effectiveWindowsVersion);
   let os = rawOs;
   let osVersion = rawOsVersion;
   const device = detectDevice(ua, effectiveNav);
+  const { vendor, model } = detectVendorModel(ua);
   const arch = detectArch(ua, (_d = options.ctx) != null ? _d : effectiveNav);
   const nav = effectiveNav;
-  const { isBot, botName } = detectBot(ua, options.customBotDefs);
+  const { isBot, botName, botCategory } = detectBot(ua, options.customBotDefs);
   const isHeadless = detectHeadless(ua);
   const language = options.language || ((nav == null ? void 0 : nav.language) || (nav == null ? void 0 : nav.browserLanguage) ? getLanguage(nav) : "") || languageFromUA(ua);
   const platform = (nav == null ? void 0 : nav.platform) || platformFromUA(ua);
@@ -672,22 +768,39 @@ function parseUA(ua, options = {}) {
       }
     }
   }
-  const engine = detectEngine(ua, browser, version);
+  const { engine, engineVersion } = detectEngine(ua, browser, version);
   const versionMajor = parseInt((_l = version.split(".")[0]) != null ? _l : "0", 10) || 0;
   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;
+    const map = (_a2 = OS_DEFS.find((d) => d.name === os)) == null ? void 0 : _a2.versionNames;
+    if (!map) return "unknown";
+    const parts = osVersion.split(".");
+    for (let len = parts.length; len >= 1; len--) {
+      const key = parts.slice(0, len).join(".");
+      if (Object.prototype.hasOwnProperty.call(map, key)) return map[key];
+    }
+    return "unknown";
+  })() : osVersionName;
   return {
     browser,
     version,
     versionMajor,
+    browserType: browser === "Brave" ? "browser" : browserType,
     engine,
+    engineVersion,
     os,
     osVersion,
+    osVersionName: finalOsVersionName,
     device,
+    vendor,
+    model,
     arch,
     isWebview: isWebview(ua),
     isHeadless,
     isBot,
     botName,
+    botCategory,
     language,
     platform,
     connectionType
@@ -953,8 +1066,11 @@ exports.default = src_default;
 exports.detectArch = detectArch;
 exports.detectBot = detectBot;
 exports.detectBrowser = detectBrowser;
+exports.detectDevice = detectDevice;
+exports.detectEngine = detectEngine;
 exports.detectHeadless = detectHeadless;
 exports.detectOS = detectOs;
+exports.detectVendorModel = detectVendorModel;
 exports.getEnvContext = getEnvContext;
 exports.getLanguage = getLanguage;
 exports.getNavContext = getNavContext;