ua-browser 1.0.1 → 1.1.0

package/dist/index.mjs

@@ -1,6 +1,6 @@
 // package.json
 var package_default = {
-  version: "1.0.1"};
+  version: "1.1.0"};
 
 // src/constants/browsers.ts
 var BROWSER_DEFS = [
@@ -162,7 +162,10 @@ var ENGINE_DEFS = [
   { name: "Trident", detect: /(Trident|NET CLR)/ },
   { name: "Presto", detect: /Presto/ },
   { name: "Gecko", detect: /Gecko\// },
-  { name: "WebKit", detect: /AppleWebKit/ }
+  { name: "WebKit", detect: /AppleWebKit/ },
+  // ArkWeb is HarmonyOS Next's rendering engine; only present in UAs that explicitly contain the
+  // token. It must come last so it overrides the WebKit entry that also matches those UAs.
+  { name: "ArkWeb", detect: /ArkWeb/ }
 ];
 
 // src/detectors/engine.ts
@@ -193,23 +196,31 @@ var OS_DEFS = [
   { name: "Symbian", detect: /Symbian/, versionPattern: null },
   { name: "MeeGo", detect: /MeeGo/, versionPattern: null },
   { name: "BlackBerry", detect: /(BlackBerry|RIM)/, versionPattern: null },
-  { name: "Windows Phone", detect: /(IEMobile|Windows Phone)/, versionPattern: /Windows Phone(?: OS)? ([\d.]+)/ },
   { name: "FreeBSD", detect: /FreeBSD/, versionPattern: null },
   { name: "Debian", detect: /Debian/, versionPattern: /Debian\/([\d.]+)/ },
   { name: "Ubuntu", detect: /Ubuntu/, versionPattern: null },
-  { name: "Chrome OS", detect: /CrOS/, 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_.]+)/ },
+  { 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: /Android ([\d.]+)[;)]/,
-    versionLookup: { "10": "2" }
+    versionPattern: [/HarmonyOS[\s/]([\d.]+)/, /Android ([\d.]+)[;)]/],
+    versionLookup: { "10": "2", "11": "3", "12": "3", "13": "4" }
   },
-  { name: "Android", detect: /(Android|Adr)/, versionPattern: /(?:Android|Adr) ([\d.]+)/ },
+  // 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/,
@@ -225,7 +236,8 @@ var OS_DEFS = [
       "5.1": "XP",
       "5.0": "2000"
     }
-  }
+  },
+  { name: "Windows Phone", detect: /(IEMobile|Windows Phone)/, versionPattern: /Windows Phone(?: OS)? ([\d.]+)/ }
 ];
 
 // src/detectors/os.ts
@@ -239,7 +251,7 @@ function detectOs(ua, windowsVersion) {
   if (!matchedDef) return { os: "unknown", osVersion: "unknown" };
   let osVersion = "unknown";
   if (matchedDef.versionPattern) {
-    const raw = extractVersion(ua, matchedDef.versionPattern);
+    const raw = Array.isArray(matchedDef.versionPattern) ? extractVersionFromPatterns(ua, matchedDef.versionPattern) : extractVersion(ua, matchedDef.versionPattern);
     if (raw !== null) {
       const normalised = raw.replace(/_/g, ".");
       if (matchedDef.versionLookup) {
@@ -249,6 +261,8 @@ function detectOs(ua, windowsVersion) {
         } else if (matchedDef.name === "Windows") {
           const n = parseInt(normalised, 10);
           osVersion = isNaN(n) ? "unknown" : n.toString();
+        } else {
+          osVersion = normalised;
         }
       } else {
         osVersion = normalised;
@@ -340,7 +354,33 @@ var ARCH_DEFS = [
 ];
 
 // src/detectors/arch.ts
-function detectArch(ua) {
+function detectArch(ua, ctx) {
+  if (ctx == null ? void 0 : ctx.highEntropyData) {
+    const { architecture, bitness } = ctx.highEntropyData;
+    if (architecture === "arm") {
+      return bitness === "64" ? "arm64" : "arm";
+    }
+    if (architecture === "x86") {
+      return bitness === "64" ? "x86_64" : "x86";
+    }
+  }
+  const renderer = ctx == null ? void 0 : ctx.webglRenderer;
+  if (renderer) {
+    if (/Apple\s+(M\d|A\d{1,2}[A-Z]?)\b/i.test(renderer) || /APPLE M\d/i.test(renderer)) {
+      return "arm64";
+    }
+    if (/\b(Intel|AMD|NVIDIA|Radeon)\b/i.test(renderer)) {
+      return "x86_64";
+    }
+  }
+  const platform = ctx == null ? void 0 : ctx.platform;
+  if (platform) {
+    if (/iPhone|iPad|iPod/.test(platform)) return "arm64";
+    if (/arm64|aarch64/i.test(platform)) return "arm64";
+    if (/arm/i.test(platform)) return "arm";
+    if (/Win64|WOW64|x86_64/i.test(platform)) return "x86_64";
+    if (/Win32|i686/i.test(platform)) return "x86";
+  }
   for (const def of ARCH_DEFS) {
     if (def.detect.test(ua)) {
       return def.name;
@@ -355,6 +395,13 @@ function detectHeadless(ua) {
   return HEADLESS_PATTERN.test(ua);
 }
 
+// src/detectors/webview.ts
+function isWebview(ua) {
+  if (/; wv/.test(ua)) return true;
+  if (/like Mac OS X/.test(ua) && !/Version\//.test(ua) && !/Safari\//.test(ua)) return true;
+  return false;
+}
+
 // src/utils/navigator.ts
 function getNavContext() {
   if (typeof navigator === "undefined") {
@@ -379,16 +426,19 @@ function getLanguage(nav) {
 
 // src/parse.ts
 function parseUA(ua, options = {}) {
-  var _a, _b, _c, _d, _e;
-  const { nav, windowsVersion } = options;
+  var _a, _b, _c, _d, _e, _f, _g, _h;
+  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, osVersion } = detectOs(ua, windowsVersion);
-  const device = detectDevice(ua, nav);
-  const arch = detectArch(ua);
+  const { os, osVersion: rawOsVersion } = detectOs(ua, effectiveWindowsVersion);
+  let osVersion = rawOsVersion;
+  const device = detectDevice(ua, effectiveNav);
+  const arch = detectArch(ua, options.ctx);
+  const nav = effectiveNav;
   const { isBot, botName } = detectBot(ua);
   const isHeadless = detectHeadless(ua);
   const language = nav ? getLanguage(nav) : "unknown";
-  const platform = (_a = nav == null ? void 0 : nav.platform) != null ? _a : "unknown";
+  const platform = (_d = nav == null ? void 0 : nav.platform) != null ? _d : "unknown";
   let browser = rawBrowser;
   let version = rawVersion;
   if (nav) {
@@ -410,7 +460,7 @@ function parseUA(ua, options = {}) {
           }
         }
         if (is360) {
-          const saveDataEnabled = ((_b = nav.connection) == null ? void 0 : _b.saveData) === true;
+          const saveDataEnabled = ((_e = nav.connection) == null ? void 0 : _e.saveData) === true;
           if (getMimeType(nav, "application/gameplugin") || !saveDataEnabled) {
             browser = "360SE";
           } else {
@@ -423,8 +473,8 @@ function parseUA(ua, options = {}) {
   }
   if (browser === "Baidu" && /(Opera|OPR|OPT)/.test(ua)) {
     browser = "Opera";
-    const opVer = (_d = (_c = /OPR\/([\d.]+)/.exec(ua)) != null ? _c : /OPT\/([\d.]+)/.exec(ua)) != null ? _d : /Opera\/([\d.]+)/.exec(ua);
-    version = (_e = opVer == null ? void 0 : opVer[1]) != null ? _e : "unknown";
+    const opVer = (_g = (_f = /OPR\/([\d.]+)/.exec(ua)) != null ? _f : /OPT\/([\d.]+)/.exec(ua)) != null ? _g : /Opera\/([\d.]+)/.exec(ua);
+    version = (_h = opVer == null ? void 0 : opVer[1]) != null ? _h : "unknown";
   }
   if (browser === "Chrome" && /\S+Browser\//.test(ua)) {
     const m = /(\S+Browser)\/([\d.]+)/.exec(ua);
@@ -449,6 +499,12 @@ function parseUA(ua, options = {}) {
     } catch (e) {
     }
   }
+  if (os === "iOS" && browser === "Safari") {
+    const m = /Version\/([\d.]+)/.exec(ua);
+    if (m && parseInt(m[1], 10) > parseInt(osVersion, 10)) {
+      osVersion = m[1];
+    }
+  }
   const engine = detectEngine(ua, browser, version);
   return {
     browser,
@@ -458,7 +514,7 @@ function parseUA(ua, options = {}) {
     osVersion,
     device,
     arch,
-    isWebview: /; wv/.test(ua),
+    isWebview: isWebview(ua),
     isHeadless,
     isBot,
     botName,
@@ -482,9 +538,165 @@ async function getWindowsVersion(nav) {
   }
 }
 
+// src/utils/env-context.ts
+var OS_FONTS = [
+  ".AppleSystemUIFont",
+  "Segoe UI",
+  "Noto Color Emoji",
+  "Ubuntu",
+  "HarmonyOS Sans"
+];
+function probeFonts() {
+  try {
+    const canvas = document.createElement("canvas");
+    const ctx = canvas.getContext("2d");
+    if (!ctx) return {};
+    const TEST = "mmmmmmmmmmlli";
+    ctx.font = "72px monospace";
+    const baseline = ctx.measureText(TEST).width;
+    const result = {};
+    for (const font of OS_FONTS) {
+      ctx.font = `72px '${font}', monospace`;
+      result[font] = ctx.measureText(TEST).width !== baseline;
+    }
+    return result;
+  } catch (e) {
+    return {};
+  }
+}
+function getWebGLInfo() {
+  var _a;
+  try {
+    const canvas = document.createElement("canvas");
+    const gl = (_a = canvas.getContext("webgl")) != null ? _a : canvas.getContext("experimental-webgl");
+    if (!gl) return {};
+    const ext = gl.getExtension("WEBGL_debug_renderer_info");
+    if (!ext) return {};
+    return {
+      renderer: gl.getParameter(ext.UNMASKED_RENDERER_WEBGL),
+      vendor: gl.getParameter(ext.UNMASKED_VENDOR_WEBGL)
+    };
+  } catch (e) {
+    return {};
+  }
+}
+function getPointerType() {
+  try {
+    if (window.matchMedia("(pointer: coarse)").matches) return "coarse";
+    if (window.matchMedia("(pointer: fine)").matches) return "fine";
+    if (window.matchMedia("(pointer: none)").matches) return "none";
+  } catch (e) {
+  }
+  return void 0;
+}
+function getHoverCapability() {
+  try {
+    return window.matchMedia("(hover: hover)").matches;
+  } catch (e) {
+    return void 0;
+  }
+}
+function deriveWindowsVersion(platformVersion) {
+  var _a;
+  if (!platformVersion) return null;
+  const major = parseInt((_a = platformVersion.split(".")[0]) != null ? _a : "0", 10);
+  return isNaN(major) ? null : major >= 13 ? "11" : "10";
+}
+async function getEnvContext() {
+  const base = getNavContext();
+  const ctx = { ...base };
+  if (typeof navigator !== "undefined") {
+    ctx.hardwareConcurrency = navigator.hardwareConcurrency;
+    ctx.deviceMemory = navigator.deviceMemory;
+  }
+  if (typeof window !== "undefined") {
+    ctx.devicePixelRatio = window.devicePixelRatio;
+    ctx.pointerType = getPointerType();
+    ctx.hoverCapability = getHoverCapability();
+    ctx.fontProbes = probeFonts();
+    const { renderer, vendor } = getWebGLInfo();
+    if (renderer !== void 0) ctx.webglRenderer = renderer;
+    if (vendor !== void 0) ctx.webglVendor = vendor;
+  }
+  if (base.userAgentData) {
+    try {
+      const data = await base.userAgentData.getHighEntropyValues([
+        "architecture",
+        "bitness",
+        "model",
+        "platformVersion",
+        "fullVersionList"
+      ]);
+      ctx.highEntropyData = {
+        architecture: data["architecture"],
+        bitness: data["bitness"],
+        model: data["model"],
+        platformVersion: data["platformVersion"],
+        fullVersionList: data["fullVersionList"]
+      };
+      if (base.userAgentData.platform === "Windows") {
+        ctx.windowsVersion = deriveWindowsVersion(data["platformVersion"]);
+      }
+    } catch (e) {
+    }
+  }
+  return ctx;
+}
+
+// src/parse-headers.ts
+var ACCEPT_CH = [
+  "Sec-CH-UA-Arch",
+  "Sec-CH-UA-Bitness",
+  "Sec-CH-UA-Platform-Version",
+  "Sec-CH-UA-Model",
+  "Sec-CH-UA-Full-Version-List"
+].join(", ");
+function unquote(value) {
+  if (value == null) return void 0;
+  return value.replace(/^"|"$/g, "").trim() || void 0;
+}
+function deriveWindowsVersion2(platformVersion) {
+  var _a;
+  if (!platformVersion) return null;
+  const major = parseInt((_a = platformVersion.split(".")[0]) != null ? _a : "0", 10);
+  return isNaN(major) ? null : major >= 13 ? "11" : "10";
+}
+function parseHeaders(headers) {
+  var _a, _b;
+  const normalised = {};
+  for (const key of Object.keys(headers)) {
+    normalised[key.toLowerCase()] = headers[key];
+  }
+  const get = (name) => {
+    const v = normalised[name.toLowerCase()];
+    return Array.isArray(v) ? v[0] : v;
+  };
+  const ua = (_a = get("user-agent")) != null ? _a : "";
+  const architecture = unquote(get("sec-ch-ua-arch"));
+  const bitness = unquote(get("sec-ch-ua-bitness"));
+  const model = unquote(get("sec-ch-ua-model"));
+  const platformVersion = unquote(get("sec-ch-ua-platform-version"));
+  const platform = (_b = unquote(get("sec-ch-ua-platform"))) != null ? _b : "";
+  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;
+  const isMobile = get("sec-ch-ua-mobile") === "?1";
+  const windowsVersion = platform === "Windows" ? deriveWindowsVersion2(platformVersion) : null;
+  const ctx = {
+    userAgent: ua,
+    platform,
+    language: "",
+    maxTouchPoints: isMobile ? 1 : 0,
+    highEntropyData: Object.keys(highEntropyData).length > 0 ? highEntropyData : void 0,
+    windowsVersion
+  };
+  return parseUA(ua, { ctx });
+}
+
 // src/index.ts
 var { version: VERSION } = package_default;
-var isWebview = (ua) => /; wv/.test(ua);
 var isWechatMiniapp = () => {
   try {
     return typeof __wxjs_environment !== "undefined" && __wxjs_environment === "miniprogram";
@@ -502,6 +714,6 @@ uaBrowser.getLanguage = () => getLanguage(getNavContext());
 uaBrowser.VERSION = VERSION;
 var src_default = uaBrowser;
 
-export { VERSION, src_default as default, detectArch, detectBot, detectHeadless, getLanguage, getNavContext, getWindowsVersion, isWebview, isWechatMiniapp, parseUA };
+export { ACCEPT_CH, VERSION, src_default as default, detectArch, detectBot, detectHeadless, getEnvContext, getLanguage, getNavContext, getWindowsVersion, isWebview, isWechatMiniapp, parseHeaders, parseUA };
 //# sourceMappingURL=index.mjs.map
 //# sourceMappingURL=index.mjs.map