Bump version 2.0.7

- G-Cloud https://www.logitechg.com/en-ch/shop/p/cloud-handheld-gaming

CHANGELOG.md

@@ -23,8 +23,12 @@
 - **Support for Custom/Predefined Extensions:**
   - Pass custom regexes or predefined extensions as a list to `UAParser()`
 
-- **Support for CLI Parsing:**
-  - Parse a user-agent directly from the command line using `npx ua-parser-js "[User-Agent]"`
+- **Support for CLI Processing:**
+  - Directly parse user-agent strings from the command line:
+    `npx ua-parser-js "<User-Agent>"`
+  - Process batch data from files: 
+    `npx ua-parser-js --input-file=log.txt >> result.json` or
+    `npx ua-parser-js --input-file=log.txt --output-file=result.json`
 
 - **Enhanced Detection with Client Hints:**
   - `withClientHints()`: Improves detection accuracy by leveraging client hints
@@ -50,21 +54,66 @@
     - `browser.name`, `browser.type`, `cpu.architecture`, `device.type`, `device.vendor`, `engine.name`, `os.name`
 
   - **`'ua-parser-js/extensions'`**: Predefined extensions for various use cases:
-    - `Bots`, `Crawlers`, `CLIs`, `Emails`, `ExtraDevices`, `Fetchers`, `InApps`, `Libraries`, `Mediaplayers`
+    - `Bots`, `Crawlers`, `CLIs`, `Emails`, `ExtraDevices`, `Fetchers`, `InApps`, `Libraries`, `Mediaplayers`, `Vehicles`
 
   - **`'ua-parser-js/helpers'`**: Provides utility methods to extend detection functionality:
-    - `getDeviceVendor()`: Guesses the device vendor based on its model name
-    - `isAppleSilicon()`: Detects Apple Silicon device properties
-    - `isAIBot()`: Checks if the user-agent is an AI bot
+    - `isFrozenUA()`: Checks if the user-agent matches a frozen/reduced user-agent pattern
+
+  - **`'ua-parser-js/bot-detection'`**:
+    - `isAIAssistant()`: Checks if the user-agent is an AI assistant
+    - `isAICrawler()`: Checks if the user-agent is an AI crawler
     - `isBot()`: Checks if the user-agent is a bot
+
+  - **`'ua-parser-js/browser-detection'`**:
     - `isChromeFamily()`: Checks if the browser is Chrome-based (uses Blink engine) — e.g., New Opera, New Edge, Vivaldi, Brave, Arc, etc.
     - `isElectron()`: Detects if current window is running within Electron
     - `isFromEU()`: Detects if current browser's timezone is from an EU country
-    - `isFrozenUA()`: Checks if the user-agent matches a frozen/reduced user-agent pattern
     - `isStandalonePWA()`: Detects if current window is a standalone PWA
 
+  - **`'ua-parser-js/device-detection'`**:
+    - `getDeviceVendor()`: Guesses the device vendor based on its model name
+    - `isAppleSilicon()`: Detects Apple Silicon device properties
+
 --- 
 
+## Version 2.0.7
+
+- Add support for chaining `withClientHints()` & `withFeatureCheck()`
+- Add new browser: Atlas, Steam
+- Add new device vendor: Anbernic, Logitech, Valve
+- Improve device detection: Xiaomi
+- Improve OS detection: iOS
+- Split `helpers` submodule into several new submodules:
+    - `bot-detection`:
+        - `isAIAssistant()`
+        - `isAICrawler()`
+        - `isBot()`
+    - `browser-detection`
+        - `isChromeFamily()`
+        - `isElectron()`
+        - `isFromEU()`
+        - `isStandalonePWA()`
+    - `device-detection`
+        - `getDeviceVendor()`
+        - `isAppleSilicon()`
+- Update `extensions` submodule:
+    - Add new fetcher: Nova Act
+    - Add new library: Bun, Dart, Deno, hackney, Node.js, rest-client, undici
+
+## Version 2.0.6
+- Add new CLI feature: processing batch user-agent data from file and output as JSON
+- Fix `setUA()`: trim leading space from user-agent string input
+- Replace `undici` dependency with node's internal `Headers`
+- Add new browser: Bing, Qwant
+- Add new device vendor: Hisense, Wiko
+- Improve browser detection: Mozilla, Pale Moon
+- Improve CPU detection: 68k
+- Improve device detection: Apple, BlackBerry, Huawei, Nokia, Xiaomi
+- Improve OS detection: iOS 26
+- `extensions` submodule:
+    - Add new fetcher: Discordbot, KeybaseBot, Slackbot, Slackbot-LinkExpanding, Slack-ImgProxy, Twitterbot
+    - Add new crawler: Qwantbot-news, SurdotlyBot, SwiftBot
+
 ## Version 2.0.5
 
 - Add new browser: Zalo

README.md

@@ -1,5 +1,11 @@
+#### Featured Sponsors
+
+[![https://ref.wisprflow.ai/Rxj3n8H](https://github.com/user-attachments/assets/e39fc98d-5d1b-4f7b-a355-4648e1f79a94)](https://ref.wisprflow.ai/Rxj3n8H)
+
+---
+
 [![https://uaparser.dev](https://raw.githubusercontent.com/faisalman/ua-parser-js/gh-pages/images/uap-header.png)](https://uaparser.dev)
-[![https://uaparser.dev](https://github.com/user-attachments/assets/9f30f3d4-5cfe-441c-8f86-ead7c955f940)](https://uaparser.dev)
+[![https://uaparser.dev](https://github.com/user-attachments/assets/a626166c-17cc-45e3-8ff6-d7e948a5ded0)](https://uaparser.dev)
 [![https://uaparser.dev](https://github.com/user-attachments/assets/50da50fc-7c8a-46e3-a2bc-6a8249914372)](https://uaparser.dev)
 [![https://uaparser.dev](https://github.com/user-attachments/assets/9f2aaff0-a9b4-4ac9-bdf3-eea8081a2582)](https://uaparser.dev)
     
@@ -12,7 +18,7 @@
 <a href="https://www.npmjs.com/package/ua-parser-js"><img src="https://img.shields.io/npm/v/ua-parser-js.svg?logo=npm&color=red&style=for-the-badge"></a>
 <a href="https://cdnjs.com/libraries/UAParser.js"><img src="https://img.shields.io/cdnjs/v/UAParser.js.svg?color=orange&style=for-the-badge"></a>
 <img src="https://img.shields.io/ossf-scorecard/github.com/faisalman/ua-parser-js?label=openssf%20scorecard&style=for-the-badge">
-<a target="_blank" href="https://discord.gg/stt86vmr"><img alt="Discord invite" src="https://dcbadge.limes.pink/api/server/https://discord.gg/stt86vmr"></a>
+<a target="_blank" href="https://discord.com/channels/1406959509087453236/1406959509930381375"><img alt="Discord invite" src="https://dcbadge.limes.pink/api/server/https://discord.com/channels/1406959509087453236/1406959509930381375"></a>
 </p>
 
 # UAParser.js
@@ -52,7 +58,7 @@ see what's new & breaking.
             <td>PRO Enterprise</td>
         </tr>
         <tr>
-            <td>Browser detection</td>
+            <td>Browser Detection</td>
             <td><a href="#demo" title="Basic detection">⚠️</a></td>
             <td>✅</td>
             <td>✅</td>
@@ -60,7 +66,7 @@ see what's new & breaking.
             <td>✅</td>
         </tr>
         <tr>
-            <td>CPU detection</td>
+            <td>CPU Detection</td>
             <td><a href="#demo" title="Basic detection">⚠️</a></td>
             <td>✅</td>
             <td>✅</td>
@@ -68,7 +74,7 @@ see what's new & breaking.
             <td>✅</td>
         </tr>
         <tr>
-            <td>Device detection</td>
+            <td>Device Detection</td>
             <td><a href="#demo" title="Basic detection">⚠️</a></td>
             <td>✅</td>
             <td>✅</td>
@@ -76,7 +82,7 @@ see what's new & breaking.
             <td>✅</td>
         </tr>
         <tr>
-            <td>Engine detection</td>
+            <td>Rendering Engine Detection</td>
             <td><a href="#demo" title="Basic detection">⚠️</a></td>
             <td>✅</td>
             <td>✅</td>
@@ -92,7 +98,7 @@ see what's new & breaking.
             <td>✅</td>
         </tr>
         <tr>
-            <td>Bot detection</td>
+            <td>Enhanced+ Accuracy</td>
             <td>❌</td>
             <td>✅</td>
             <td>✅</td>
@@ -100,7 +106,7 @@ see what's new & breaking.
             <td>✅</td>
         </tr>
         <tr>
-            <td>AI Bot detection</td>
+            <td>Bot Detection</td>
             <td>❌</td>
             <td>✅</td>
             <td>✅</td>
@@ -108,7 +114,7 @@ see what's new & breaking.
             <td>✅</td>
         </tr>
         <tr>
-            <td>Extras (Apps, Libs, Emails, Media Players, etc) detection</td>
+            <td>AI Detection</td>
             <td>❌</td>
             <td>✅</td>
             <td>✅</td>
@@ -116,7 +122,7 @@ see what's new & breaking.
             <td>✅</td>
         </tr>
         <tr>
-            <td>Enhanced detection result</td>
+            <td>Extra Detections (Apps, Libs, Emails, Media Players, Crawlers, and more)</td>
             <td>❌</td>
             <td>✅</td>
             <td>✅</td>
@@ -124,7 +130,7 @@ see what's new & breaking.
             <td>✅</td>
         </tr>
         <tr>
-            <td>Client Hints support</td>
+            <td>Client Hints Support</td>
             <td>❌</td>
             <td>✅</td>
             <td>✅</td>
@@ -132,7 +138,7 @@ see what's new & breaking.
             <td>✅</td>
         </tr>
         <tr>
-            <td>CommonJS support</td>
+            <td>CommonJS Support</td>
             <td>✅</td>
             <td>✅</td>
             <td>✅</td>
@@ -140,7 +146,7 @@ see what's new & breaking.
             <td>✅</td>
         </tr>
         <tr>
-            <td>ES modules support</td>
+            <td>ESM Support</td>
             <td>❌</td>
             <td>✅</td>
             <td>✅</td>
@@ -148,15 +154,15 @@ see what's new & breaking.
             <td>✅</td>
         </tr>
         <tr>
-            <td>TypeScript declarations</td>
-            <td><a href="#demo" title="Community version">⚠️</a></td>
+            <td>TypeScript Definitions</td>
+            <td><a href="#demo" title="Community version">✅</a></td>
             <td>✅</td>
             <td>✅</td>
             <td>✅</td>
             <td>✅</td>
         </tr>
         <tr>
-            <td>npm module available</td>
+            <td>npm Module Available</td>
             <td>✅</td>
             <td>✅</td>
             <td>✅</td>
@@ -164,7 +170,7 @@ see what's new & breaking.
             <td>✅</td>
         </tr>
         <tr>
-            <td>Direct downloads available</td>
+            <td>Direct Downloads Available</td>
             <td>✅</td>
             <td>✅</td>
             <td>✅</td>
@@ -172,7 +178,7 @@ see what's new & breaking.
             <td>✅</td>
         </tr>
         <tr>
-            <td>Allows commercial usage</td>
+            <td>Commercial Use Allowed</td>
             <td>✅</td>
             <td>✅</td>
             <td>❌</td>
@@ -180,7 +186,7 @@ see what's new & breaking.
             <td>✅</td>
         </tr>
         <tr>
-            <td>Permissive (non-copyleft) license</td>
+            <td>Permissive (non-Copyleft) License</td>
             <td>✅</td>
             <td><strong title="Copyleft license">❌</strong></td>
             <td>✅</td>
@@ -188,7 +194,7 @@ see what's new & breaking.
             <td>✅</td>
         </tr>
         <tr>
-            <td>No open-source obligations</td>
+            <td>No Open-Source Obligations</td>
             <td>✅</td>
             <td><strong title="Copyleft license">❌</strong></td>
             <td>✅</td>
@@ -196,7 +202,7 @@ see what's new & breaking.
             <td>✅</td>
         </tr>
         <tr>
-            <td>Unlimited end-products</td>
+            <td>Unlimited End-Products</td>
             <td>✅</td>
             <td>✅</td>
             <td>✅</td>
@@ -204,7 +210,7 @@ see what's new & breaking.
             <td>✅</td>
         </tr>
         <tr>
-            <td>Unlimited deployments</td>
+            <td>Unlimited Deployments</td>
             <td>✅</td>
             <td>✅</td>
             <td>✅</td>
@@ -212,7 +218,7 @@ see what's new & breaking.
             <td>✅</td>
         </tr>
         <tr>
-            <td>1-year product support</td>
+            <td>1-year Product Support</td>
             <td>❌</td>
             <td>❌</td>
             <td>✅</td>
@@ -220,7 +226,7 @@ see what's new & breaking.
             <td>✅</td>
         </tr>
         <tr>
-            <td>Lifetime updates</td>
+            <td>Lifetime Updates</td>
             <td>✅</td>
             <td>✅</td>
             <td>✅</td>
@@ -271,4 +277,4 @@ Support the **open-source editions** of UAParser.js through one of the following
 )](https://store.faisalman.com/buy/3d71f2f3-cf4d-473c-892a-9d4497c890be)
 
 <a href="https://opencollective.com/ua-parser-js"><img src="https://opencollective.com/ua-parser-js/organizations.svg?avatarHeight=64"></a>
-<a href="https://opencollective.com/ua-parser-js"><img src="https://opencollective.com/ua-parser-js/individuals.svg?avatarHeight=64"></a>
+<a href="https://opencollective.com/ua-parser-js"><img src="https://opencollective.com/ua-parser-js/individuals.svg?avatarHeight=64"></a>

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "ua-parser-js",
-  "version": "2.0.5",
+  "version": "2.0.7",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "ua-parser-js",
-      "version": "2.0.5",
+      "version": "2.0.7",
       "funding": [
         {
           "type": "opencollective",
@@ -25,8 +25,7 @@
       "dependencies": {
         "detect-europe-js": "^0.1.2",
         "is-standalone-pwa": "^0.1.1",
-        "ua-is-frozen": "^0.1.2",
-        "undici": "^7.12.0"
+        "ua-is-frozen": "^0.1.2"
       },
       "bin": {
         "ua-parser-js": "script/cli.js"
@@ -34,7 +33,7 @@
       "devDependencies": {
         "@babel/parser": "7.15.8",
         "@babel/traverse": "7.23.2",
-        "@playwright/test": "^1.49.0",
+        "@playwright/test": "^1.57.0",
         "jshint": "~2.13.6",
         "mocha": "~8.2.0",
         "requirejs": "2.3.2",
@@ -344,12 +343,13 @@
       }
     },
     "node_modules/@playwright/test": {
-      "version": "1.49.0",
-      "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.49.0.tgz",
-      "integrity": "sha512-DMulbwQURa8rNIQrf94+jPJQ4FmOVdpE5ZppRNvWVjvhC+6sOeo28r8MgIpQRYouXRtt/FCCXU7zn20jnHR4Qw==",
+      "version": "1.57.0",
+      "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.57.0.tgz",
+      "integrity": "sha512-6TyEnHgd6SArQO8UO2OMTxshln3QMWBtPGrOCgs3wVEmQmwyuNtB10IZMfmYDE0riwNR1cu4q+pPcxMVtaG3TA==",
       "dev": true,
+      "license": "Apache-2.0",
       "dependencies": {
-        "playwright": "1.49.0"
+        "playwright": "1.57.0"
       },
       "bin": {
         "playwright": "cli.js"
@@ -2043,12 +2043,13 @@
       }
     },
     "node_modules/playwright": {
-      "version": "1.49.0",
-      "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.49.0.tgz",
-      "integrity": "sha512-eKpmys0UFDnfNb3vfsf8Vx2LEOtflgRebl0Im2eQQnYMA4Aqd+Zw8bEOB+7ZKvN76901mRnqdsiOGKxzVTbi7A==",
+      "version": "1.57.0",
+      "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.57.0.tgz",
+      "integrity": "sha512-ilYQj1s8sr2ppEJ2YVadYBN0Mb3mdo9J0wQ+UuDhzYqURwSoW4n1Xs5vs7ORwgDGmyEh33tRMeS8KhdkMoLXQw==",
       "dev": true,
+      "license": "Apache-2.0",
       "dependencies": {
-        "playwright-core": "1.49.0"
+        "playwright-core": "1.57.0"
       },
       "bin": {
         "playwright": "cli.js"
@@ -2061,10 +2062,11 @@
       }
     },
     "node_modules/playwright-core": {
-      "version": "1.49.0",
-      "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.49.0.tgz",
-      "integrity": "sha512-R+3KKTQF3npy5GTiKH/T+kdhoJfJojjHESR1YEWhYuEKRVfVaxH3+4+GvXE5xyCngCxhxnykk0Vlah9v8fs3jA==",
+      "version": "1.57.0",
+      "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.57.0.tgz",
+      "integrity": "sha512-agTcKlMw/mjBWOnD6kFZttAAGHgi/Nw0CZ2o6JqWSbMlI219lAFLZZCyqByTsvVAJq5XA5H8cA6PrvBRpBWEuQ==",
       "dev": true,
+      "license": "Apache-2.0",
       "bin": {
         "playwright-core": "cli.js"
       },
@@ -2078,6 +2080,7 @@
       "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
       "dev": true,
       "hasInstallScript": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "darwin"
@@ -2693,15 +2696,6 @@
         "node": ">=0.8.0"
       }
     },
-    "node_modules/undici": {
-      "version": "7.12.0",
-      "resolved": "https://registry.npmjs.org/undici/-/undici-7.12.0.tgz",
-      "integrity": "sha512-GrKEsc3ughskmGA9jevVlIOPMiiAHJ4OFUtaAH+NhfTUSiZ1wMPIQqQvAJUrJspFXJt3EBWgpAeoHEDVT1IBug==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=20.18.1"
-      }
-    },
     "node_modules/validate-npm-package-license": {
       "version": "3.0.4",
       "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz",

package.json

@@ -1,25 +1,25 @@
 {
   "title": "UAParser.js",
   "name": "ua-parser-js",
-  "version": "2.0.5",
+  "version": "2.0.7",
   "author": "Faisal Salman <f@faisalman.com> (http://faisalman.com)",
   "description": "Detect Browser, Engine, OS, CPU, and Device type/model from User-Agent & Client Hints data. Supports browser & node.js environment",
   "keywords": [
     "user-agent",
     "client-hints",
-    "parser",
     "browser",
     "engine",
     "os",
     "device",
     "cpu",
-    "jquery-plugin",
-    "ecosystem:jquery",
     "ua-parser-js",
     "browser-detection",
     "device-detection",
     "os-detection",
-    "bot-detection"
+    "bot-detection",
+    "ai-detection",
+    "app-detection",
+    "crawler-detection"
   ],
   "homepage": "https://uaparser.dev",
   "contributors": [
@@ -190,6 +190,21 @@
       "import": "./src/main/ua-parser.mjs",
       "types": "./src/main/ua-parser.d.ts"
     },
+    "./bot-detection": {
+      "require": "./src/bot-detection/bot-detection.js",
+      "import": "./src/bot-detection/bot-detection.mjs",
+      "types": "./src/bot-detection/bot-detection.d.ts"
+    },
+    "./browser-detection": {
+      "require": "./src/browser-detection/browser-detection.js",
+      "import": "./src/browser-detection/browser-detection.mjs",
+      "types": "./src/browser-detection/browser-detection.d.ts"
+    },
+    "./device-detection": {
+      "require": "./src/device-detection/device-detection.js",
+      "import": "./src/device-detection/device-detection.mjs",
+      "types": "./src/device-detection/device-detection.d.ts"
+    },
     "./enums": {
       "require": "./src/enums/ua-parser-enums.js",
       "import": "./src/enums/ua-parser-enums.mjs",
@@ -220,19 +235,18 @@
     "test:eslint": "eslint src && eslint script",
     "test:jshint": "jshint src/main",
     "test:lockfile-lint": "npx lockfile-lint -p package-lock.json",
-    "test:mocha": "mocha test/unit",
+    "test:mocha": "mocha --recursive test/unit",
     "test:playwright": "npx playwright install && playwright test test/e2e --browser all"
   },
   "dependencies": {
     "detect-europe-js": "^0.1.2",
     "is-standalone-pwa": "^0.1.1",
-    "ua-is-frozen": "^0.1.2",
-    "undici": "^7.12.0"
+    "ua-is-frozen": "^0.1.2"
   },
   "devDependencies": {
     "@babel/parser": "7.15.8",
     "@babel/traverse": "7.23.2",
-    "@playwright/test": "^1.49.0",
+    "@playwright/test": "^1.57.0",
     "jshint": "~2.13.6",
     "mocha": "~8.2.0",
     "requirejs": "2.3.2",

script/build-esm.js

@@ -40,6 +40,24 @@ const files = [
             ...defaultReplacements.mjs
         ]
     },
+    {
+        src : 'src/bot-detection/bot-detection.js',
+        dest :'src/bot-detection/bot-detection.mjs',
+        title : 'Generated ESM version of ua-parser-js/bot-detection',
+        replacements : [...defaultReplacements.mjs]
+    },
+    {
+        src : 'src/browser-detection/browser-detection.js',
+        dest :'src/browser-detection/browser-detection.mjs',
+        title : 'Generated ESM version of ua-parser-js/browser-detection',
+        replacements : [...defaultReplacements.mjs]
+    },
+    {
+        src : 'src/device-detection/device-detection.js',
+        dest :'src/device-detection/device-detection.mjs',
+        title : 'Generated ESM version of ua-parser-js/device-detection',
+        replacements : [...defaultReplacements.mjs]
+    },
     {
         src : 'src/enums/ua-parser-enums.js',
         dest :'src/enums/ua-parser-enums.mjs',

script/cli.js

@@ -1,4 +1,94 @@
 #!/usr/bin/env node
 
-const UAParser = require('ua-parser-js');
-console.log(JSON.stringify(process.argv.slice(2).map(ua => UAParser(ua)), null, 4));
+try {    
+    const fs = require('node:fs');
+    const path = require('node:path');
+    const { performance } = require('node:perf_hooks');
+    const readline = require('node:readline');
+    const { parseArgs } = require('node:util');
+    const UAParser = require('../src/main/ua-parser');
+    const { Bots, Emails, ExtraDevices, InApps, Vehicles } = require('../src/extensions/ua-parser-extensions');
+
+    if (!process.argv[2].startsWith('-')) {
+
+        const results = process.argv.slice(2).map(ua => UAParser(ua, [Bots, Emails, ExtraDevices, InApps, Vehicles]));
+        console.log(JSON.stringify(results, null, 4));
+        process.exit(0);
+
+    } else if (['-h', '--help'].includes(process.argv[2])) {
+
+        console.log('Usage: npx ua-parser-js <string>');
+        console.log('   or  npx ua-parser-js --input-file <filepath> [--output-file <filepath>]');
+        console.log('-i, --input-file');
+        console.log('-o, --output-file');
+        process.exit(0);
+
+    } else {
+
+        const startPerf = performance.now();
+        const {
+            values: { 
+                'input-file': inputFile, 
+                'output-file': outputFile 
+            },
+        } = parseArgs({
+            options: {
+                'input-file': { type: 'string', short: 'i' },
+                'output-file': { type: 'string', short: 'o' }
+            }
+        });
+
+        if (!inputFile) {
+            console.error('Input file must be present');
+            process.exit(1);
+        }
+
+        const inputPath = path.resolve(__dirname, inputFile);
+        const outputPath = outputFile ? path.resolve(__dirname, outputFile) : null;
+
+        if (!fs.existsSync(inputPath)) {
+            console.error(`Input file not found: ${inputPath}`);
+            process.exit(1);
+        }
+
+        const inputStream = fs.createReadStream(inputPath, 'utf8');
+        const rl = readline.createInterface({
+            input: inputStream,
+            crlfDelay: Infinity
+        });
+
+        const outputStream = outputPath ? fs.createWriteStream(outputPath, { encoding : 'utf8' }) : process.stdout;
+
+        const uap = new UAParser([Bots, Emails, ExtraDevices, InApps, Vehicles]);
+        let lineNumber = 0;
+
+        outputStream.write('[\n');
+
+        rl.on('line', line => {
+            const result = uap.setUA(line).getResult();
+            const json = JSON.stringify(result, null, 4);
+            if (lineNumber > 0) outputStream.write(',\n');
+            outputStream.write(json);
+            lineNumber++;
+        });
+
+        rl.on('close', () => {
+            outputStream.write('\n]');
+            if (outputPath) {
+                outputStream.end(() => {
+                    const finishPerf = performance.now();
+                    console.log(`Done!`);
+                    console.log(`Number of lines found: ${lineNumber}`);
+                    console.log(`Task finished in: ${(finishPerf - startPerf).toFixed(3)}ms`);
+                    console.log(`Output written to: ${outputPath}`);
+                    process.exit(0);
+                });
+            } else {
+                process.exit(0);
+            }
+        });
+    }
+} catch (err) {
+    console.error(err);
+    process.exit(1);
+}

src/bot-detection/bot-detection.d.ts

@@ -0,0 +1,7 @@
+// Type definitions for bot-detection submodule of UAParser.js v2.0.7
+// Project: https://github.com/faisalman/ua-parser-js
+// Definitions by: Faisal Salman <https://github.com/faisalman>
+
+export function isAIAssistant(ua: string): boolean;
+export function isAICrawler(ua: string): boolean;
+export function isBot(ua: string): boolean;

src/bot-detection/bot-detection.js

@@ -0,0 +1,188 @@
+//////////////////////////////////////////////////
+/*  bot-detection submodule of UAParser.js v2.0.7
+    https://github.com/faisalman/ua-parser-js
+    Author: Faisal Salman <f@faisalman.com>
+    AGPLv3 License */
+/////////////////////////////////////////////////
+
+/*jshint esversion: 6 */ 
+
+const { UAParser } = require('../main/ua-parser');
+const { Bots, Crawlers, Fetchers } = require('../extensions/ua-parser-extensions');
+const { BrowserType, Extension } = require('../enums/ua-parser-enums');
+const { Crawler, Fetcher } = Extension.BrowserName;
+
+class BotList {
+    constructor(ext, prop, list) {
+        this.ext = ext;
+        this.prop = prop;
+        this.list = list.map(x => x.toLowerCase());
+    }
+    includes(ua) {
+        return this.list.includes(
+            (typeof ua === 'string' ? 
+                new UAParser(ua, this.ext).getBrowser() : 
+                ua.browser
+            )[this.prop]?.toLowerCase());
+    }
+}
+
+const BotTypes = new BotList(Bots, 'type', [
+    BrowserType.CLI, 
+    BrowserType.CRAWLER, 
+    BrowserType.FETCHER, 
+    BrowserType.LIBRARY
+]);
+
+const AIAssistants = new BotList(Fetchers, 'name', [
+
+    // Amazon
+    Fetcher.AMAZON_NOVA_ACT,
+
+    // Anthropic
+    Fetcher.ANTHROPIC_CLAUDE_USER,
+
+    // Cohere
+    Fetcher.COHERE_AI,
+
+    // DuckDuckGo
+    Fetcher.DUCKDUCKGO_ASSISTBOT,
+
+    // Google
+    Fetcher.GOOGLE_GEMINI_DEEP_RESEARCH,
+
+    // Mistral AI
+    Fetcher.MISTRALAI_USER,
+
+    // OpenAI
+    Fetcher.OPENAI_CHATGPT_USER,
+
+    // Perplexity
+    Fetcher.PERPLEXITY_USER
+]);
+
+const AICrawlers = new BotList(Crawlers, 'name', [
+
+    // AI2
+    Crawler.AI2_BOT,
+
+    // Amazon
+    Crawler.AMAZON_BOT,
+
+    // Anthropic
+    Crawler.ANTHROPIC_AI,
+    Crawler.ANTHROPIC_CLAUDE_BOT,
+    Crawler.ANTHROPIC_CLAUDE_SEARCHBOT,
+    Crawler.ANTHROPIC_CLAUDE_WEB,
+
+    // Apple
+    Crawler.APPLE_BOT,
+    Crawler.APPLE_BOT_EXTENDED,
+
+    // Brave
+    Crawler.BRAVE_BOT,
+
+    // ByteDance
+    Crawler.BYTEDANCE_BYTESPIDER,
+    Crawler.BYTEDANCE_TIKTOKSPIDER,
+
+    // Cohere
+    Crawler.COHERE_TRAINING_DATA_CRAWLER,
+
+    // Common Crawl
+    Crawler.COMMON_CRAWL_CCBOT,    
+
+    // Coveo
+    Crawler.COVEO_BOT,
+
+    // DataForSeo
+    Crawler.DATAFORSEO_BOT,
+
+    // DeepSeek
+    Crawler.DEEPSEEK_BOT,
+
+    // Diffbot
+    Crawler.DIFFBOT,
+
+    // Google
+    Crawler.GOOGLE_EXTENDED,
+    Crawler.GOOGLE_OTHER,
+    Crawler.GOOGLE_OTHER_IMAGE,
+    Crawler.GOOGLE_OTHER_VIDEO,
+    Crawler.GOOGLE_CLOUDVERTEXBOT,
+
+    // Hive AI
+    Crawler.HIVE_IMAGESIFTBOT,
+
+    // Huawei
+    Crawler.HUAWEI_PETALBOT,
+    Crawler.HUAWEI_PANGUBOT,
+
+    // Hugging Face
+    Crawler.HUGGINGFACE_BOT,
+
+    // Kangaroo
+    Crawler.KANGAROO_BOT,
+
+    // Mendable.ai
+    Crawler.FIRECRAWL_AGENT,
+
+    // Meta
+    Crawler.META_FACEBOOKBOT,
+    Crawler.META_EXTERNALAGENT,
+
+    // OpenAI
+    Crawler.OPENAI_GPTBOT,
+    Crawler.OPENAI_SEARCH_BOT,
+
+    // Perplexity
+    Crawler.PERPLEXITY_BOT,
+
+    // Replicate
+    Crawler.REPLICATE_BOT,
+
+    // Runpod
+    Crawler.RUNPOD_BOT,
+
+    // SB Intuitions
+    Crawler.SB_INTUITIONS_BOT,
+
+    // Semrush
+    Crawler.SEMRUSH_BOT_CONTENTSHAKE,
+
+    // Timpi
+    Crawler.TIMPI_BOT,
+
+    // Together AI
+    Crawler.TOGETHER_BOT,
+
+    // Velen.io
+    Crawler.HUNTER_VELENPUBLICWEBCRAWLER,
+
+    // Vercel
+    Crawler.VERCEL_V0BOT,
+
+    // Webz.io
+    Crawler.WEBZIO_OMGILI,
+    Crawler.WEBZIO_OMGILI_BOT,
+    Crawler.WEBZIO_EXTENDED,
+
+    // X
+    Crawler.XAI_BOT,
+
+    // You.com
+    Crawler.YOU_BOT,
+
+    // Zhipu AI
+    Crawler.ZHIPU_CHATGLM_SPIDER
+]);
+
+const isBot = ua => BotTypes.includes(ua);
+const isAIAssistant = ua => AIAssistants.includes(ua);
+const isAICrawler = ua => AICrawlers.includes(ua);
+
+module.exports = {
+    isAIAssistant, 
+    isAICrawler,
+    isBot
+}

src/bot-detection/bot-detection.mjs

@@ -0,0 +1,192 @@
+// Generated ESM version of ua-parser-js/bot-detection
+// DO NOT EDIT THIS FILE!
+// Source: /src/bot-detection/bot-detection.js
+
+//////////////////////////////////////////////////
+/*  bot-detection submodule of UAParser.js v2.0.7
+    https://github.com/faisalman/ua-parser-js
+    Author: Faisal Salman <f@faisalman.com>
+    AGPLv3 License */
+/////////////////////////////////////////////////
+
+/*jshint esversion: 6 */ 
+
+import { UAParser } from '../main/ua-parser.mjs';
+import { Bots, Crawlers, Fetchers } from '../extensions/ua-parser-extensions.mjs';
+import { BrowserType, Extension } from '../enums/ua-parser-enums.mjs';
+const { Crawler, Fetcher } = Extension.BrowserName;
+
+class BotList {
+    constructor(ext, prop, list) {
+        this.ext = ext;
+        this.prop = prop;
+        this.list = list.map(x => x.toLowerCase());
+    }
+    includes(ua) {
+        return this.list.includes(
+            (typeof ua === 'string' ? 
+                new UAParser(ua, this.ext).getBrowser() : 
+                ua.browser
+            )[this.prop]?.toLowerCase());
+    }
+}
+
+const BotTypes = new BotList(Bots, 'type', [
+    BrowserType.CLI, 
+    BrowserType.CRAWLER, 
+    BrowserType.FETCHER, 
+    BrowserType.LIBRARY
+]);
+
+const AIAssistants = new BotList(Fetchers, 'name', [
+
+    // Amazon
+    Fetcher.AMAZON_NOVA_ACT,
+
+    // Anthropic
+    Fetcher.ANTHROPIC_CLAUDE_USER,
+
+    // Cohere
+    Fetcher.COHERE_AI,
+
+    // DuckDuckGo
+    Fetcher.DUCKDUCKGO_ASSISTBOT,
+
+    // Google
+    Fetcher.GOOGLE_GEMINI_DEEP_RESEARCH,
+
+    // Mistral AI
+    Fetcher.MISTRALAI_USER,
+
+    // OpenAI
+    Fetcher.OPENAI_CHATGPT_USER,
+
+    // Perplexity
+    Fetcher.PERPLEXITY_USER
+]);
+
+const AICrawlers = new BotList(Crawlers, 'name', [
+
+    // AI2
+    Crawler.AI2_BOT,
+
+    // Amazon
+    Crawler.AMAZON_BOT,
+
+    // Anthropic
+    Crawler.ANTHROPIC_AI,
+    Crawler.ANTHROPIC_CLAUDE_BOT,
+    Crawler.ANTHROPIC_CLAUDE_SEARCHBOT,
+    Crawler.ANTHROPIC_CLAUDE_WEB,
+
+    // Apple
+    Crawler.APPLE_BOT,
+    Crawler.APPLE_BOT_EXTENDED,
+
+    // Brave
+    Crawler.BRAVE_BOT,
+
+    // ByteDance
+    Crawler.BYTEDANCE_BYTESPIDER,
+    Crawler.BYTEDANCE_TIKTOKSPIDER,
+
+    // Cohere
+    Crawler.COHERE_TRAINING_DATA_CRAWLER,
+
+    // Common Crawl
+    Crawler.COMMON_CRAWL_CCBOT,    
+
+    // Coveo
+    Crawler.COVEO_BOT,
+
+    // DataForSeo
+    Crawler.DATAFORSEO_BOT,
+
+    // DeepSeek
+    Crawler.DEEPSEEK_BOT,
+
+    // Diffbot
+    Crawler.DIFFBOT,
+
+    // Google
+    Crawler.GOOGLE_EXTENDED,
+    Crawler.GOOGLE_OTHER,
+    Crawler.GOOGLE_OTHER_IMAGE,
+    Crawler.GOOGLE_OTHER_VIDEO,
+    Crawler.GOOGLE_CLOUDVERTEXBOT,
+
+    // Hive AI
+    Crawler.HIVE_IMAGESIFTBOT,
+
+    // Huawei
+    Crawler.HUAWEI_PETALBOT,
+    Crawler.HUAWEI_PANGUBOT,
+
+    // Hugging Face
+    Crawler.HUGGINGFACE_BOT,
+
+    // Kangaroo
+    Crawler.KANGAROO_BOT,
+
+    // Mendable.ai
+    Crawler.FIRECRAWL_AGENT,
+
+    // Meta
+    Crawler.META_FACEBOOKBOT,
+    Crawler.META_EXTERNALAGENT,
+
+    // OpenAI
+    Crawler.OPENAI_GPTBOT,
+    Crawler.OPENAI_SEARCH_BOT,
+
+    // Perplexity
+    Crawler.PERPLEXITY_BOT,
+
+    // Replicate
+    Crawler.REPLICATE_BOT,
+
+    // Runpod
+    Crawler.RUNPOD_BOT,
+
+    // SB Intuitions
+    Crawler.SB_INTUITIONS_BOT,
+
+    // Semrush
+    Crawler.SEMRUSH_BOT_CONTENTSHAKE,
+
+    // Timpi
+    Crawler.TIMPI_BOT,
+
+    // Together AI
+    Crawler.TOGETHER_BOT,
+
+    // Velen.io
+    Crawler.HUNTER_VELENPUBLICWEBCRAWLER,
+
+    // Vercel
+    Crawler.VERCEL_V0BOT,
+
+    // Webz.io
+    Crawler.WEBZIO_OMGILI,
+    Crawler.WEBZIO_OMGILI_BOT,
+    Crawler.WEBZIO_EXTENDED,
+
+    // X
+    Crawler.XAI_BOT,
+
+    // You.com
+    Crawler.YOU_BOT,
+
+    // Zhipu AI
+    Crawler.ZHIPU_CHATGLM_SPIDER
+]);
+
+const isBot = ua => BotTypes.includes(ua);
+const isAIAssistant = ua => AIAssistants.includes(ua);
+const isAICrawler = ua => AICrawlers.includes(ua);
+
+export {
+    isAIAssistant, 
+    isAICrawler,
+    isBot
+}

src/browser-detection/browser-detection.d.ts

@@ -0,0 +1,10 @@
+// Type definitions for browser-detection submodule of UAParser.js v2.0.7
+// Project: https://github.com/faisalman/ua-parser-js
+// Definitions by: Faisal Salman <https://github.com/faisalman>
+
+import type { IResult } from "../main/ua-parser";
+
+export function isChromeFamily(resultOrUA: IResult | string): boolean;
+export function isElectron(): boolean;
+export function isFromEU(): boolean;
+export function isStandalonePWA(): boolean;

src/browser-detection/browser-detection.js

@@ -0,0 +1,30 @@
+//////////////////////////////////////////////////////
+/*  browser-detection submodule of UAParser.js v2.0.7
+    https://github.com/faisalman/ua-parser-js
+    Author: Faisal Salman <f@faisalman.com>
+    AGPLv3 License */
+/////////////////////////////////////////////////////
+
+/*jshint esversion: 6 */ 
+
+const { UAParser } = require('../main/ua-parser');
+const { EngineName } = require('../enums/ua-parser-enums');
+const { isStandalonePWA } = require('is-standalone-pwa');
+const { isFromEU } = require('detect-europe-js');
+
+const isChromeFamily = val => !!(
+    (typeof val === 'string' ? 
+        new UAParser(val).getEngine() : 
+        val.engine
+    )?.is(EngineName.BLINK));
+
+const isElectron = () => !!(
+    process?.versions?.hasOwnProperty('electron') ||    // node.js
+    / electron\//i.test(navigator?.userAgent));         // browser
+
+module.exports = { 
+    isChromeFamily,
+    isElectron,
+    isFromEU,
+    isStandalonePWA
+}

src/browser-detection/browser-detection.mjs

@@ -0,0 +1,34 @@
+// Generated ESM version of ua-parser-js/browser-detection
+// DO NOT EDIT THIS FILE!
+// Source: /src/browser-detection/browser-detection.js
+
+//////////////////////////////////////////////////////
+/*  browser-detection submodule of UAParser.js v2.0.7
+    https://github.com/faisalman/ua-parser-js
+    Author: Faisal Salman <f@faisalman.com>
+    AGPLv3 License */
+/////////////////////////////////////////////////////
+
+/*jshint esversion: 6 */ 
+
+import { UAParser } from '../main/ua-parser.mjs';
+import { EngineName } from '../enums/ua-parser-enums.mjs';
+import { isStandalonePWA } from 'is-standalone-pwa';
+import { isFromEU } from 'detect-europe-js';
+
+const isChromeFamily = val => !!(
+    (typeof val === 'string' ? 
+        new UAParser(val).getEngine() : 
+        val.engine
+    )?.is(EngineName.BLINK));
+
+const isElectron = () => !!(
+    process?.versions?.hasOwnProperty('electron') ||    // node.js
+    / electron\//i.test(navigator?.userAgent));         // browser
+
+export { 
+    isChromeFamily,
+    isElectron,
+    isFromEU,
+    isStandalonePWA
+}

src/device-detection/device-detection.d.ts

@@ -0,0 +1,8 @@
+// Type definitions for device-detection submodule of UAParser.js v2.0.7
+// Project: https://github.com/faisalman/ua-parser-js
+// Definitions by: Faisal Salman <https://github.com/faisalman>
+
+import type { IResult } from "../main/ua-parser";
+
+export function getDeviceVendor(model: string): string | undefined;
+export function isAppleSilicon(resultOrUA: IResult | string): boolean;

src/device-detection/device-detection.js

@@ -0,0 +1,43 @@
+/////////////////////////////////////////////////////
+/*  device-detection submodule of UAParser.js v2.0.7
+    https://github.com/faisalman/ua-parser-js
+    Author: Faisal Salman <f@faisalman.com>
+    AGPLv3 License */
+////////////////////////////////////////////////////
+
+/*jshint esversion: 6 */ 
+
+const { UAParser } = require('../main/ua-parser');
+const { CPUArch, OSName  } = require('../enums/ua-parser-enums');
+
+const getDeviceVendor = (model) => new UAParser(`Mozilla/5.0 (Linux; Android 10; ${model}) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/100.0.0.0 Safari/537.36`).getDevice().vendor;
+
+const isAppleSilicon = (val) => {
+    const { os, cpu } = typeof val !== 'string' ? val : {
+        os: new UAParser(val).getOS(),
+        cpu: new UAParser(val).getCPU() 
+    };
+    if (os.is(OSName.MACOS)) {
+        if (cpu.is(CPUArch.ARM)) {
+            return true;
+        } else if (typeof window !== 'undefined') {
+            try {
+                const canvas = document.createElement('canvas');
+                const webgl = canvas.getContext('webgl2') || 
+                                canvas.getContext('webgl') || 
+                                canvas.getContext('experimental-webgl');
+                return webgl
+                        .getParameter(webgl.getExtension('WEBGL_debug_renderer_info').UNMASKED_RENDERER_WEBGL)
+                        .match(/apple m\d/i);
+            } catch {
+                return false;
+            }
+        }
+    }
+    return false;
+}
+
+module.exports = { 
+    getDeviceVendor,
+    isAppleSilicon
+}

src/device-detection/device-detection.mjs

@@ -0,0 +1,47 @@
+// Generated ESM version of ua-parser-js/device-detection
+// DO NOT EDIT THIS FILE!
+// Source: /src/device-detection/device-detection.js
+
+/////////////////////////////////////////////////////
+/*  device-detection submodule of UAParser.js v2.0.7
+    https://github.com/faisalman/ua-parser-js
+    Author: Faisal Salman <f@faisalman.com>
+    AGPLv3 License */
+////////////////////////////////////////////////////
+
+/*jshint esversion: 6 */ 
+
+import { UAParser } from '../main/ua-parser.mjs';
+import { CPUArch, OSName  } from '../enums/ua-parser-enums.mjs';
+
+const getDeviceVendor = (model) => new UAParser(`Mozilla/5.0 (Linux; Android 10; ${model}) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/100.0.0.0 Safari/537.36`).getDevice().vendor;
+
+const isAppleSilicon = (val) => {
+    const { os, cpu } = typeof val !== 'string' ? val : {
+        os: new UAParser(val).getOS(),
+        cpu: new UAParser(val).getCPU() 
+    };
+    if (os.is(OSName.MACOS)) {
+        if (cpu.is(CPUArch.ARM)) {
+            return true;
+        } else if (typeof window !== 'undefined') {
+            try {
+                const canvas = document.createElement('canvas');
+                const webgl = canvas.getContext('webgl2') || 
+                                canvas.getContext('webgl') || 
+                                canvas.getContext('experimental-webgl');
+                return webgl
+                        .getParameter(webgl.getExtension('WEBGL_debug_renderer_info').UNMASKED_RENDERER_WEBGL)
+                        .match(/apple m\d/i);
+            } catch {
+                return false;
+            }
+        }
+    }
+    return false;
+}
+
+export { 
+    getDeviceVendor,
+    isAppleSilicon
+}

src/enums/ua-parser-enums.d.ts

@@ -3,7 +3,7 @@
 // Source: /src/enums/ua-parser-enums.js
 
 ///////////////////////////////////////////////
-/*  Enums for UAParser.js v2.0.5
+/*  Enums for UAParser.js v2.0.7
     https://github.com/faisalman/ua-parser-js
     Author: Faisal Salman <f@faisalman.com>
     AGPLv3 License */
@@ -19,11 +19,13 @@ export const BrowserName: Readonly<{
     AMAYA: 'Amaya',
     ANDROID: 'Android Browser',
     ARORA: 'Arora',
+    ATLAS: 'Atlas',
     AVANT: 'Avant',
     AVAST: 'Avast Secure Browser',
     AVG: 'AVG Secure Browser',
     BAIDU: 'Baidu Browser',
     BASILISK: 'Basilisk',
+    BING: 'Bing',
     BLAZER: 'Blazer',
     BOLT: 'Bolt',
     BOWSER: 'Bowser',
@@ -129,6 +131,7 @@ export const BrowserName: Readonly<{
     QUARK: 'Quark',
     QUPZILLA: 'QupZilla',
     QUTEBROWSER: 'qutebrowser',
+    QWANT: 'Qwant',
     REKONQ: 'rekonq',
     ROCKMELT: 'Rockmelt',
     SAFARI: 'Safari',
@@ -145,6 +148,7 @@ export const BrowserName: Readonly<{
     SNAPCHAT: 'Snapchat',
     SOGOU_EXPLORER: 'Sogou Explorer',
     SOGOU_MOBILE: 'Sogou Mobile',
+    STEAM: 'Steam',
     SURF: 'Surf',
     SWIFTFOX: 'Swiftfox',
     TESLA: 'Tesla',
@@ -226,8 +230,9 @@ export const DeviceVendor: Readonly<{
     ACER: 'Acer',
     ADVAN: 'Advan',
     ALCATEL: 'Alcatel',
-    APPLE: 'Apple',
     AMAZON: 'Amazon',
+    ANBERNIC: 'Anbernic',
+    APPLE: 'Apple',
     ARCHOS: 'Archos',
     ASUS: 'ASUS',
     ATT: 'AT&T',
@@ -243,6 +248,7 @@ export const DeviceVendor: Readonly<{
     GEEKSPHONE: 'GeeksPhone',
     GENERIC: 'Generic',
     GOOGLE: 'Google',
+    HISENSE: 'Hisense',
     HMD: 'HMD',
     HP: 'HP',
     HTC: 'HTC',
@@ -255,6 +261,7 @@ export const DeviceVendor: Readonly<{
     LAVA: 'Lava',
     LENOVO: 'Lenovo',
     LG: 'LG',
+    LOGITECH: 'Logitech',
     MEIZU: 'Meizu',
     MICROMAX: 'Micromax',
     MICROSOFT: 'Microsoft',
@@ -288,9 +295,11 @@ export const DeviceVendor: Readonly<{
     TECNO: 'TECNO',
     TESLA: 'Tesla',
     ULEFONE: 'Ulefone',
+    VALVE: 'Valve',
     VIVO: 'Vivo',
     VIZIO: 'Vizio',
     VODAFONE: 'Vodafone',
+    WIKO: 'Wiko',
     XBOX: 'Xbox',
     XIAOMI: 'Xiaomi',
     ZEBRA: 'Zebra',
@@ -489,6 +498,7 @@ export const Extension: Readonly<{
             DUCKDUCKGO_BOT: 'DuckDuckBot',
             DUCKDUCKGO_FAVICONS_BOT: 'DuckDuckGo-Favicons-Bot',
             ELASTIC: 'Elastic',
+            ELASTIC_SWIFTYPE_BOT: 'Swiftbot',
             EXALEAD_EXABOT: 'Exabot',
             FIRECRAWL_AGENT: 'FirecrawlAgent',
             FREESPOKE: 'Freespoke',
@@ -538,6 +548,7 @@ export const Extension: Readonly<{
             PERPLEXITY_BOT: 'PerplexityBot',
             QIHOO_360_SPIDER: '360Spider',
             QWANT_BOT: 'Qwantbot',
+            QWANT_BOT_NEWS: 'Qwantbot-news',
             REPLICATE_BOT: 'Replicate-Bot',
             RUNPOD_BOT: 'RunPod-Bot',
             SB_INTUITIONS_BOT: 'SBIntuitionsBot',
@@ -551,6 +562,7 @@ export const Extension: Readonly<{
             SOGOU_PIC_SPIDER: 'Sogou Pic Spider',
             SOGOU_WEB_SPIDER: 'Sogou web spider',
             STARTPAGE: 'Startpage',
+            SURLY_BOT: 'SurdotlyBot',
             TIMPI_BOT: 'Timpibot',
             TOGETHER_BOT: 'Together-Bot',
             TURNITIN_BOT: 'TurnitinBot',
@@ -624,6 +636,7 @@ export const Extension: Readonly<{
         },
         Fetcher: {
             AHREFS_SITEAUDIT: 'AhrefsSiteAudit',
+            AMAZON_NOVA_ACT: 'NovaAct',
             ANTHROPIC_CLAUDE_USER: 'Claude-User',
             ASANA: 'Asana',
             BETTER_UPTIME_BOT: 'Better Uptime Bot',
@@ -631,6 +644,7 @@ export const Extension: Readonly<{
             BLUESKY: 'Bluesky',
             BUFFER_LINKPREVIEWBOT: 'BufferLinkPreviewBot',
             COHERE_AI: 'Cohere-AI',
+            DISCORD_BOT: 'Discordbot',
             DUCKDUCKGO_ASSISTBOT: 'DuckAssistBot',
             GOOGLE_CHROME_LIGHTHOUSE: 'Chrome-Lighthouse',
             GOOGLE_FEEDFETCHER: 'FeedFetcher-Google',
@@ -643,6 +657,7 @@ export const Extension: Readonly<{
             HUBSPOT_PAGE_FETCHER: 'HubSpot Page Fetcher',
             IFRAMELY: 'Iframely',
             KAKAOTALK_SCRAP: 'kakaotalk-scrap',
+            KEYBASE_BOT: 'KeybaseBot',
             META_EXTERNALFETCHER: 'meta-externalfetcher',
             META_WHATSAPP: 'WhatsApp',
             MICROSOFT_BINGPREVIEW: 'BingPreview',
@@ -654,6 +669,9 @@ export const Extension: Readonly<{
             PERPLEXITY_USER: 'Perplexity-User',
             PINTEREST_BOT: 'Pinterestbot',
             SEMRUSH_SITEAUDITBOT: 'SiteAuditBot',
+            SLACK_BOT: 'Slackbot',
+            SLACK_BOT_LINKEXPANDING: 'Slackbot-LinkExpanding',
+            SLACK_IMGPROXY: 'Slack-ImgProxy',
             SNAP_URL_PREVIEW: 'Snap URL Preview',
             SKYPE_URIPREVIEW: 'SkypeUriPreview',
             TELEGRAM_BOT: 'TelegramBot',
@@ -663,6 +681,7 @@ export const Extension: Readonly<{
             VERCEL_BOT: 'Vercelbot',
             VERCEL_FLAGS: 'vercelflags',
             VERCEL_TRACING: 'verceltracing',
+            X_TWITTERBOT: 'Twitterbot',
             YANDEX_CALENDAR: 'YandexCalendar',
             YANDEX_DIRECT: 'YandexDirect',
             YANDEX_DIRECTDYN: 'YandexDirectDyn',
@@ -695,9 +714,13 @@ export const Extension: Readonly<{
             AIOHTTP: 'aiohttp',
             APACHE_HTTPCLIENT: 'Apache-HttpClient',
             AXIOS: 'axios',
+            BUN: 'Bun',
+            DART: 'Dart',
+            DENO: 'Deno',
             GO_HTTP_CLIENT: 'go-http-client',
             GOT: 'got',
             GUZZLEHTTP: 'GuzzleHttp',
+            HACKNEY: 'hackney',
             JAVA: 'Java',
             JAVA_HTTPCLIENT: 'Java-http-client',
             JSDOM: 'jsdom',
@@ -705,16 +728,19 @@ export const Extension: Readonly<{
             LUA_RESTY_HTTP: 'lua-resty-http',
             NEEDLE: 'Needle',
             NUTCH: 'Nutch',
-            OKHTTP: 'OkHttp',
             NODE_FETCH: 'node-fetch',
+            NODE_JS: 'Node.js',
             NODE_SUPERAGENT: 'node-superagent',
+            OKHTTP: 'OkHttp',
             PHP_SOAP: 'PHP-SOAP',
             POSTMAN_RUNTIME: 'PostmanRuntime',
             PYTHON_HTTPX: 'python-httpx',
             PYTHON_URLLIB: 'python-urllib',
             PYTHON_URLLIB3: 'python-urllib3',
             PYTHON_REQUESTS: 'python-requests',
-            SCRAPY: 'Scrapy'
+            REST_CLIENT: 'rest-client',
+            SCRAPY: 'Scrapy',
+            UNDICI: 'undici'
         }
     },
     DeviceVendor: {

src/enums/ua-parser-enums.js

@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////
-/*  Enums for UAParser.js v2.0.5
+/*  Enums for UAParser.js v2.0.7
     https://github.com/faisalman/ua-parser-js
     Author: Faisal Salman <f@faisalman.com>
     AGPLv3 License */
@@ -15,11 +15,13 @@ const BrowserName = Object.freeze({
     AMAYA: 'Amaya',
     ANDROID: 'Android Browser',
     ARORA: 'Arora',
+    ATLAS: 'Atlas',
     AVANT: 'Avant',
     AVAST: 'Avast Secure Browser',
     AVG: 'AVG Secure Browser',
     BAIDU: 'Baidu Browser',
     BASILISK: 'Basilisk',
+    BING: 'Bing',
     BLAZER: 'Blazer',
     BOLT: 'Bolt',
     BOWSER: 'Bowser',
@@ -125,6 +127,7 @@ const BrowserName = Object.freeze({
     QUARK: 'Quark',
     QUPZILLA: 'QupZilla',
     QUTEBROWSER: 'qutebrowser',
+    QWANT: 'Qwant',
     REKONQ: 'rekonq',
     ROCKMELT: 'Rockmelt',
     SAFARI: 'Safari',
@@ -141,6 +144,7 @@ const BrowserName = Object.freeze({
     SNAPCHAT: 'Snapchat',
     SOGOU_EXPLORER: 'Sogou Explorer',
     SOGOU_MOBILE: 'Sogou Mobile',
+    STEAM: 'Steam',
     SURF: 'Surf',
     SWIFTFOX: 'Swiftfox',
     TESLA: 'Tesla',
@@ -222,8 +226,9 @@ const DeviceVendor = Object.freeze({
     ACER: 'Acer',
     ADVAN: 'Advan',
     ALCATEL: 'Alcatel',
-    APPLE: 'Apple',
     AMAZON: 'Amazon',
+    ANBERNIC: 'Anbernic',
+    APPLE: 'Apple',
     ARCHOS: 'Archos',
     ASUS: 'ASUS',
     ATT: 'AT&T',
@@ -239,6 +244,7 @@ const DeviceVendor = Object.freeze({
     GEEKSPHONE: 'GeeksPhone',
     GENERIC: 'Generic',
     GOOGLE: 'Google',
+    HISENSE: 'Hisense',
     HMD: 'HMD',
     HP: 'HP',
     HTC: 'HTC',
@@ -251,6 +257,7 @@ const DeviceVendor = Object.freeze({
     LAVA: 'Lava',
     LENOVO: 'Lenovo',
     LG: 'LG',
+    LOGITECH: 'Logitech',
     MEIZU: 'Meizu',
     MICROMAX: 'Micromax',
     MICROSOFT: 'Microsoft',
@@ -284,9 +291,11 @@ const DeviceVendor = Object.freeze({
     TECNO: 'TECNO',
     TESLA: 'Tesla',
     ULEFONE: 'Ulefone',
+    VALVE: 'Valve',
     VIVO: 'Vivo',
     VIZIO: 'Vizio',
     VODAFONE: 'Vodafone',
+    WIKO: 'Wiko',
     XBOX: 'Xbox',
     XIAOMI: 'Xiaomi',
     ZEBRA: 'Zebra',
@@ -485,6 +494,7 @@ const Extension = Object.freeze({
             DUCKDUCKGO_BOT: 'DuckDuckBot',
             DUCKDUCKGO_FAVICONS_BOT: 'DuckDuckGo-Favicons-Bot',
             ELASTIC: 'Elastic',
+            ELASTIC_SWIFTYPE_BOT: 'Swiftbot',
             EXALEAD_EXABOT: 'Exabot',
             FIRECRAWL_AGENT: 'FirecrawlAgent',
             FREESPOKE: 'Freespoke',
@@ -534,6 +544,7 @@ const Extension = Object.freeze({
             PERPLEXITY_BOT: 'PerplexityBot',
             QIHOO_360_SPIDER: '360Spider',
             QWANT_BOT: 'Qwantbot',
+            QWANT_BOT_NEWS: 'Qwantbot-news',
             REPLICATE_BOT: 'Replicate-Bot',
             RUNPOD_BOT: 'RunPod-Bot',
             SB_INTUITIONS_BOT: 'SBIntuitionsBot',
@@ -547,6 +558,7 @@ const Extension = Object.freeze({
             SOGOU_PIC_SPIDER: 'Sogou Pic Spider',
             SOGOU_WEB_SPIDER: 'Sogou web spider',
             STARTPAGE: 'Startpage',
+            SURLY_BOT: 'SurdotlyBot',
             TIMPI_BOT: 'Timpibot',
             TOGETHER_BOT: 'Together-Bot',
             TURNITIN_BOT: 'TurnitinBot',
@@ -620,6 +632,7 @@ const Extension = Object.freeze({
         },
         Fetcher: {
             AHREFS_SITEAUDIT: 'AhrefsSiteAudit',
+            AMAZON_NOVA_ACT: 'NovaAct',
             ANTHROPIC_CLAUDE_USER: 'Claude-User',
             ASANA: 'Asana',
             BETTER_UPTIME_BOT: 'Better Uptime Bot',
@@ -627,6 +640,7 @@ const Extension = Object.freeze({
             BLUESKY: 'Bluesky',
             BUFFER_LINKPREVIEWBOT: 'BufferLinkPreviewBot',
             COHERE_AI: 'Cohere-AI',
+            DISCORD_BOT: 'Discordbot',
             DUCKDUCKGO_ASSISTBOT: 'DuckAssistBot',
             GOOGLE_CHROME_LIGHTHOUSE: 'Chrome-Lighthouse',
             GOOGLE_FEEDFETCHER: 'FeedFetcher-Google',
@@ -639,6 +653,7 @@ const Extension = Object.freeze({
             HUBSPOT_PAGE_FETCHER: 'HubSpot Page Fetcher',
             IFRAMELY: 'Iframely',
             KAKAOTALK_SCRAP: 'kakaotalk-scrap',
+            KEYBASE_BOT: 'KeybaseBot',
             META_EXTERNALFETCHER: 'meta-externalfetcher',
             META_WHATSAPP: 'WhatsApp',
             MICROSOFT_BINGPREVIEW: 'BingPreview',
@@ -650,6 +665,9 @@ const Extension = Object.freeze({
             PERPLEXITY_USER: 'Perplexity-User',
             PINTEREST_BOT: 'Pinterestbot',
             SEMRUSH_SITEAUDITBOT: 'SiteAuditBot',
+            SLACK_BOT: 'Slackbot',
+            SLACK_BOT_LINKEXPANDING: 'Slackbot-LinkExpanding',
+            SLACK_IMGPROXY: 'Slack-ImgProxy',
             SNAP_URL_PREVIEW: 'Snap URL Preview',
             SKYPE_URIPREVIEW: 'SkypeUriPreview',
             TELEGRAM_BOT: 'TelegramBot',
@@ -659,6 +677,7 @@ const Extension = Object.freeze({
             VERCEL_BOT: 'Vercelbot',
             VERCEL_FLAGS: 'vercelflags',
             VERCEL_TRACING: 'verceltracing',
+            X_TWITTERBOT: 'Twitterbot',
             YANDEX_CALENDAR: 'YandexCalendar',
             YANDEX_DIRECT: 'YandexDirect',
             YANDEX_DIRECTDYN: 'YandexDirectDyn',
@@ -691,9 +710,13 @@ const Extension = Object.freeze({
             AIOHTTP: 'aiohttp',
             APACHE_HTTPCLIENT: 'Apache-HttpClient',
             AXIOS: 'axios',
+            BUN: 'Bun',
+            DART: 'Dart',
+            DENO: 'Deno',
             GO_HTTP_CLIENT: 'go-http-client',
             GOT: 'got',
             GUZZLEHTTP: 'GuzzleHttp',
+            HACKNEY: 'hackney',
             JAVA: 'Java',
             JAVA_HTTPCLIENT: 'Java-http-client',
             JSDOM: 'jsdom',
@@ -701,16 +724,19 @@ const Extension = Object.freeze({
             LUA_RESTY_HTTP: 'lua-resty-http',
             NEEDLE: 'Needle',
             NUTCH: 'Nutch',
-            OKHTTP: 'OkHttp',
             NODE_FETCH: 'node-fetch',
+            NODE_JS: 'Node.js',
             NODE_SUPERAGENT: 'node-superagent',
+            OKHTTP: 'OkHttp',
             PHP_SOAP: 'PHP-SOAP',
             POSTMAN_RUNTIME: 'PostmanRuntime',
             PYTHON_HTTPX: 'python-httpx',
             PYTHON_URLLIB: 'python-urllib',
             PYTHON_URLLIB3: 'python-urllib3',
             PYTHON_REQUESTS: 'python-requests',
-            SCRAPY: 'Scrapy'
+            REST_CLIENT: 'rest-client',
+            SCRAPY: 'Scrapy',
+            UNDICI: 'undici'
         }
     },
     DeviceVendor: {

src/enums/ua-parser-enums.mjs

@@ -3,7 +3,7 @@
 // Source: /src/enums/ua-parser-enums.js
 
 ///////////////////////////////////////////////
-/*  Enums for UAParser.js v2.0.5
+/*  Enums for UAParser.js v2.0.7
     https://github.com/faisalman/ua-parser-js
     Author: Faisal Salman <f@faisalman.com>
     AGPLv3 License */
@@ -19,11 +19,13 @@ const BrowserName = Object.freeze({
     AMAYA: 'Amaya',
     ANDROID: 'Android Browser',
     ARORA: 'Arora',
+    ATLAS: 'Atlas',
     AVANT: 'Avant',
     AVAST: 'Avast Secure Browser',
     AVG: 'AVG Secure Browser',
     BAIDU: 'Baidu Browser',
     BASILISK: 'Basilisk',
+    BING: 'Bing',
     BLAZER: 'Blazer',
     BOLT: 'Bolt',
     BOWSER: 'Bowser',
@@ -129,6 +131,7 @@ const BrowserName = Object.freeze({
     QUARK: 'Quark',
     QUPZILLA: 'QupZilla',
     QUTEBROWSER: 'qutebrowser',
+    QWANT: 'Qwant',
     REKONQ: 'rekonq',
     ROCKMELT: 'Rockmelt',
     SAFARI: 'Safari',
@@ -145,6 +148,7 @@ const BrowserName = Object.freeze({
     SNAPCHAT: 'Snapchat',
     SOGOU_EXPLORER: 'Sogou Explorer',
     SOGOU_MOBILE: 'Sogou Mobile',
+    STEAM: 'Steam',
     SURF: 'Surf',
     SWIFTFOX: 'Swiftfox',
     TESLA: 'Tesla',
@@ -226,8 +230,9 @@ const DeviceVendor = Object.freeze({
     ACER: 'Acer',
     ADVAN: 'Advan',
     ALCATEL: 'Alcatel',
-    APPLE: 'Apple',
     AMAZON: 'Amazon',
+    ANBERNIC: 'Anbernic',
+    APPLE: 'Apple',
     ARCHOS: 'Archos',
     ASUS: 'ASUS',
     ATT: 'AT&T',
@@ -243,6 +248,7 @@ const DeviceVendor = Object.freeze({
     GEEKSPHONE: 'GeeksPhone',
     GENERIC: 'Generic',
     GOOGLE: 'Google',
+    HISENSE: 'Hisense',
     HMD: 'HMD',
     HP: 'HP',
     HTC: 'HTC',
@@ -255,6 +261,7 @@ const DeviceVendor = Object.freeze({
     LAVA: 'Lava',
     LENOVO: 'Lenovo',
     LG: 'LG',
+    LOGITECH: 'Logitech',
     MEIZU: 'Meizu',
     MICROMAX: 'Micromax',
     MICROSOFT: 'Microsoft',
@@ -288,9 +295,11 @@ const DeviceVendor = Object.freeze({
     TECNO: 'TECNO',
     TESLA: 'Tesla',
     ULEFONE: 'Ulefone',
+    VALVE: 'Valve',
     VIVO: 'Vivo',
     VIZIO: 'Vizio',
     VODAFONE: 'Vodafone',
+    WIKO: 'Wiko',
     XBOX: 'Xbox',
     XIAOMI: 'Xiaomi',
     ZEBRA: 'Zebra',
@@ -489,6 +498,7 @@ const Extension = Object.freeze({
             DUCKDUCKGO_BOT: 'DuckDuckBot',
             DUCKDUCKGO_FAVICONS_BOT: 'DuckDuckGo-Favicons-Bot',
             ELASTIC: 'Elastic',
+            ELASTIC_SWIFTYPE_BOT: 'Swiftbot',
             EXALEAD_EXABOT: 'Exabot',
             FIRECRAWL_AGENT: 'FirecrawlAgent',
             FREESPOKE: 'Freespoke',
@@ -538,6 +548,7 @@ const Extension = Object.freeze({
             PERPLEXITY_BOT: 'PerplexityBot',
             QIHOO_360_SPIDER: '360Spider',
             QWANT_BOT: 'Qwantbot',
+            QWANT_BOT_NEWS: 'Qwantbot-news',
             REPLICATE_BOT: 'Replicate-Bot',
             RUNPOD_BOT: 'RunPod-Bot',
             SB_INTUITIONS_BOT: 'SBIntuitionsBot',
@@ -551,6 +562,7 @@ const Extension = Object.freeze({
             SOGOU_PIC_SPIDER: 'Sogou Pic Spider',
             SOGOU_WEB_SPIDER: 'Sogou web spider',
             STARTPAGE: 'Startpage',
+            SURLY_BOT: 'SurdotlyBot',
             TIMPI_BOT: 'Timpibot',
             TOGETHER_BOT: 'Together-Bot',
             TURNITIN_BOT: 'TurnitinBot',
@@ -624,6 +636,7 @@ const Extension = Object.freeze({
         },
         Fetcher: {
             AHREFS_SITEAUDIT: 'AhrefsSiteAudit',
+            AMAZON_NOVA_ACT: 'NovaAct',
             ANTHROPIC_CLAUDE_USER: 'Claude-User',
             ASANA: 'Asana',
             BETTER_UPTIME_BOT: 'Better Uptime Bot',
@@ -631,6 +644,7 @@ const Extension = Object.freeze({
             BLUESKY: 'Bluesky',
             BUFFER_LINKPREVIEWBOT: 'BufferLinkPreviewBot',
             COHERE_AI: 'Cohere-AI',
+            DISCORD_BOT: 'Discordbot',
             DUCKDUCKGO_ASSISTBOT: 'DuckAssistBot',
             GOOGLE_CHROME_LIGHTHOUSE: 'Chrome-Lighthouse',
             GOOGLE_FEEDFETCHER: 'FeedFetcher-Google',
@@ -643,6 +657,7 @@ const Extension = Object.freeze({
             HUBSPOT_PAGE_FETCHER: 'HubSpot Page Fetcher',
             IFRAMELY: 'Iframely',
             KAKAOTALK_SCRAP: 'kakaotalk-scrap',
+            KEYBASE_BOT: 'KeybaseBot',
             META_EXTERNALFETCHER: 'meta-externalfetcher',
             META_WHATSAPP: 'WhatsApp',
             MICROSOFT_BINGPREVIEW: 'BingPreview',
@@ -654,6 +669,9 @@ const Extension = Object.freeze({
             PERPLEXITY_USER: 'Perplexity-User',
             PINTEREST_BOT: 'Pinterestbot',
             SEMRUSH_SITEAUDITBOT: 'SiteAuditBot',
+            SLACK_BOT: 'Slackbot',
+            SLACK_BOT_LINKEXPANDING: 'Slackbot-LinkExpanding',
+            SLACK_IMGPROXY: 'Slack-ImgProxy',
             SNAP_URL_PREVIEW: 'Snap URL Preview',
             SKYPE_URIPREVIEW: 'SkypeUriPreview',
             TELEGRAM_BOT: 'TelegramBot',
@@ -663,6 +681,7 @@ const Extension = Object.freeze({
             VERCEL_BOT: 'Vercelbot',
             VERCEL_FLAGS: 'vercelflags',
             VERCEL_TRACING: 'verceltracing',
+            X_TWITTERBOT: 'Twitterbot',
             YANDEX_CALENDAR: 'YandexCalendar',
             YANDEX_DIRECT: 'YandexDirect',
             YANDEX_DIRECTDYN: 'YandexDirectDyn',
@@ -695,9 +714,13 @@ const Extension = Object.freeze({
             AIOHTTP: 'aiohttp',
             APACHE_HTTPCLIENT: 'Apache-HttpClient',
             AXIOS: 'axios',
+            BUN: 'Bun',
+            DART: 'Dart',
+            DENO: 'Deno',
             GO_HTTP_CLIENT: 'go-http-client',
             GOT: 'got',
             GUZZLEHTTP: 'GuzzleHttp',
+            HACKNEY: 'hackney',
             JAVA: 'Java',
             JAVA_HTTPCLIENT: 'Java-http-client',
             JSDOM: 'jsdom',
@@ -705,16 +728,19 @@ const Extension = Object.freeze({
             LUA_RESTY_HTTP: 'lua-resty-http',
             NEEDLE: 'Needle',
             NUTCH: 'Nutch',
-            OKHTTP: 'OkHttp',
             NODE_FETCH: 'node-fetch',
+            NODE_JS: 'Node.js',
             NODE_SUPERAGENT: 'node-superagent',
+            OKHTTP: 'OkHttp',
             PHP_SOAP: 'PHP-SOAP',
             POSTMAN_RUNTIME: 'PostmanRuntime',
             PYTHON_HTTPX: 'python-httpx',
             PYTHON_URLLIB: 'python-urllib',
             PYTHON_URLLIB3: 'python-urllib3',
             PYTHON_REQUESTS: 'python-requests',
-            SCRAPY: 'Scrapy'
+            REST_CLIENT: 'rest-client',
+            SCRAPY: 'Scrapy',
+            UNDICI: 'undici'
         }
     },
     DeviceVendor: {

src/extensions/ua-parser-extensions.js

@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////
-/*  Extensions for UAParser.js v2.0.5
+/*  Extensions for UAParser.js v2.0.7
     https://github.com/faisalman/ua-parser-js
     Author: Faisal Salman <f@faisalman.com>
     AGPLv3 License */
@@ -63,8 +63,10 @@ const Crawlers = Object.freeze({
             // PerplexityBot - https://perplexity.ai/perplexitybot
             // SBIntuitionsBot - https://www.sbintuitions.co.jp/bot/
             // SeznamBot - http://napoveda.seznam.cz/seznambot-intro
+            // SurdotlyBot - http://sur.ly/bot.html
+            // Swiftbot - https://swiftype.com/swiftbot
             // YepBot - https://yep.com/yepbot/
-            /((?:adidx|ahrefs|amazon|bing|brave|cc|contx|coveo|criteo|dot|duckduck(?:go-favicons-)?|exa|facebook|gpt|iask|kagi|kangaroo |linkedin|mj12|mojeek|oai-search|onespot-scraper|perplexity|sbintuitions|semrush|seznam|yep)bot)\/([\w\.-]+)/i,
+            /((?:adidx|ahrefs|amazon|bing|brave|cc|contx|coveo|criteo|dot|duckduck(?:go-favicons-)?|exa|facebook|gpt|iask|kagi|kangaroo |linkedin|mj12|mojeek|oai-search|onespot-scraper|perplexity|sbintuitions|semrush|seznam|surdotly|swift|yep)bot)\/([\w\.-]+)/i,
 
             // Algolia Crawler
             /(algolia crawler(?: renderscript)?)\/?([\w\.]*)/i,
@@ -98,7 +100,7 @@ const Crawlers = Object.freeze({
             /(oncrawl) mobile\/([\w\.]+)/i,
 
             // Qwantbot - https://help.qwant.com/bot
-            /(qwantbot)[-\w]*\/?([\w\.]*)/i,
+            /(qwantbot(?:-news)?)[-\w]*\/?([\w\.]*)/i,
 
             // SemrushBot - http://www.semrush.com/bot.html
             /((?:semrush|splitsignal)bot[-abcfimostw]*)\/?([\w\.-]*)/i,
@@ -256,7 +258,7 @@ const Emails = Object.freeze({
 const Fetchers = Object.freeze({
     browser : [
         [
-            // Asana / Bitlybot / Better Uptime / BingPreview / Blueno / Cohere-AI / HubSpot Page Fetcher / kakaotalk-scrap / Mastodon / MicrosoftPreview / Pinterestbot / Redditbot / Rogerbot / SiteAuditBot / Telegrambot / Twitterbot / UptimeRobot
+            // Asana / Bitlybot / Better Uptime / BingPreview / Blueno / Cohere-AI / HubSpot Page Fetcher / kakaotalk-scrap / Mastodon / MicrosoftPreview / Pinterestbot / Redditbot / Rogerbot / SiteAuditBot / Telegrambot / Twitterbot / UptimeRobot / WhatsApp
             // AhrefsSiteAudit - https://ahrefs.com/robot/site-audit
             // Buffer Link Preview Bot - https://scraper.buffer.com/about/bots/link-preview-bot
             // ChatGPT-User - https://platform.openai.com/docs/plugins/bot
@@ -266,25 +268,25 @@ const Fetchers = Object.freeze({
             // Perplexity-User - https://docs.perplexity.ai/guides/bots
             // MistralAI-User - https://docs.mistral.ai/robots/
             // Yandex Bots - https://yandex.com/bots
-            /(asana|ahrefssiteaudit|(?:bing|microsoft)preview|blueno|(?:chatgpt|claude|mistralai|perplexity)-user|cohere-ai|hubspot page fetcher|mastodon|(?:bitly|bufferlinkpreview|discord|duckassist|linkedin|pinterest|reddit|roger|siteaudit|twitter|uptimero|zoom)bot|google-site-verification|iframely|kakaotalk-scrap|meta-externalfetcher|y!?j-dlc|yandex(?:calendar|direct(?:dyn)?|fordomain|pagechecker|searchshop)|yadirectfetcher)\/([\w\.]+)/i,
+            /(asana|ahrefssiteaudit|(?:bing|microsoft)preview|blueno|(?:chatgpt|claude|mistralai|perplexity)-user|cohere-ai|hubspot page fetcher|mastodon|(?:bitly|bufferlinkpreview|discord|duckassist|linkedin|pinterest|reddit|roger|siteaudit|twitter|uptimero|zoom)bot|google-site-verification|iframely|kakaotalk-scrap|meta-externalfetcher|y!?j-dlc|yandex(?:calendar|direct(?:dyn)?|fordomain|pagechecker|searchshop)|yadirectfetcher|whatsapp)\/([\w\.]+)/i,
 
             // Bluesky
             /(bluesky) cardyb\/([\w\.]+)/i,
 
+            // Nova Act - https://github.com/aws/nova-act
+            /agent-(novaact)\/([\w\.]+)/i,
+
             // Skype
             /(skypeuripreview) preview\/([\w\.]+)/i,
 
             // Slackbot - https://api.slack.com/robots
-            /(slack(?:bot)?(?:-imgproxy|-linkexpanding)?) ([\w\.]+)/i,
-            
-            // WhatsApp
-            /(whatsapp)\/([\w\.]+)/i
+            /(slack(?:bot)?(?:-imgproxy|-linkexpanding)?) ([\w\.]+)/i
         ], 
         [NAME, VERSION, [TYPE, FETCHER]],
 
         [
-            // Google Bots / Chrome-Lighthouse / Gemini-Deep-Research / Snapchat / Vercelbot / Yandex Bots
-            /((?:better uptime |telegram|vercel)bot|chrome-lighthouse|feedfetcher-google|gemini-deep-research|google(?:imageproxy|-read-aloud|-pagerenderer|producer)|snap url preview|vercel(flags|tracing|-(favicon|screenshot)-bot)|yandex(?:sitelinks|userproxy))/i
+            // Google Bots / Chrome-Lighthouse / Gemini-Deep-Research / KeybaseBot / Snapchat / Vercelbot / Yandex Bots
+            /((?:better uptime |keybase|telegram|vercel)bot|chrome-lighthouse|feedfetcher-google|gemini-deep-research|google(?:imageproxy|-read-aloud|-pagerenderer|producer)|snap url preview|vercel(flags|tracing|-(favicon|screenshot)-bot)|yandex(?:sitelinks|userproxy))/i
         ], 
         [NAME, [TYPE, FETCHER]],
     ],
@@ -387,13 +389,15 @@ const MediaPlayers = Object.freeze({
 
 const Libraries = Object.freeze({
     browser : [
-        // Apache-HttpClient/Axios/go-http-client/got/GuzzleHttp/Java[-HttpClient]/jsdom/libwww-perl/lua-resty-http/Needle/node-fetch/OkHttp/PHP-SOAP/PostmanRuntime/python-urllib/python-requests/Scrapy/superagent
         [
-            /^(apache-httpclient|axios|(?:go|java)-http-client|got|guzzlehttp|java|libwww-perl|lua-resty-http|needle|node-(?:fetch|superagent)|okhttp|php-soap|postmanruntime|python-(?:httpx|urllib[23]?|requests)|scrapy)\/([\w\.]+)/i,
+            // Apache-HttpClient/Axios/Bun/Dart/go-http-client/got/GuzzleHttp/hackney/Java[-HttpClient]/jsdom/libwww-perl/lua-resty-http/Needle/Node.js/node-fetch/OkHttp/PHP-SOAP/PostmanRuntime/python-urllib/python-requests/rest-client/Scrapy/superagent
+            /^(apache-httpclient|axios|bun|dart|deno|(?:go|java)-http-client|got|guzzlehttp|hackney|java|libwww-perl|lua-resty-http|needle|node(?:\.js|-fetch|-superagent)|okhttp|php-soap|postmanruntime|python-(?:httpx|urllib[23]?|requests)|rest-client|scrapy)\/([\w\.]+)/i,
             /(adobeair|aiohttp|jsdom)\/([\w\.]+)/i,
             /(nutch)-([\w\.-]+)(\(|$)/i,
             /\((java)\/([\w\.]+)/i
-        ], [NAME, VERSION, [TYPE, LIBRARY]]
+        ], [NAME, VERSION, [TYPE, LIBRARY]], [
+            /(node-fetch|undici)/i
+        ], [NAME, [TYPE, LIBRARY]]
     ]
 });
 

src/extensions/ua-parser-extensions.mjs

@@ -3,7 +3,7 @@
 // Source: /src/extensions/ua-parser-extensions.js
 
 ///////////////////////////////////////////////
-/*  Extensions for UAParser.js v2.0.5
+/*  Extensions for UAParser.js v2.0.7
     https://github.com/faisalman/ua-parser-js
     Author: Faisal Salman <f@faisalman.com>
     AGPLv3 License */
@@ -67,8 +67,10 @@ const Crawlers = Object.freeze({
             // PerplexityBot - https://perplexity.ai/perplexitybot
             // SBIntuitionsBot - https://www.sbintuitions.co.jp/bot/
             // SeznamBot - http://napoveda.seznam.cz/seznambot-intro
+            // SurdotlyBot - http://sur.ly/bot.html
+            // Swiftbot - https://swiftype.com/swiftbot
             // YepBot - https://yep.com/yepbot/
-            /((?:adidx|ahrefs|amazon|bing|brave|cc|contx|coveo|criteo|dot|duckduck(?:go-favicons-)?|exa|facebook|gpt|iask|kagi|kangaroo |linkedin|mj12|mojeek|oai-search|onespot-scraper|perplexity|sbintuitions|semrush|seznam|yep)bot)\/([\w\.-]+)/i,
+            /((?:adidx|ahrefs|amazon|bing|brave|cc|contx|coveo|criteo|dot|duckduck(?:go-favicons-)?|exa|facebook|gpt|iask|kagi|kangaroo |linkedin|mj12|mojeek|oai-search|onespot-scraper|perplexity|sbintuitions|semrush|seznam|surdotly|swift|yep)bot)\/([\w\.-]+)/i,
 
             // Algolia Crawler
             /(algolia crawler(?: renderscript)?)\/?([\w\.]*)/i,
@@ -102,7 +104,7 @@ const Crawlers = Object.freeze({
             /(oncrawl) mobile\/([\w\.]+)/i,
 
             // Qwantbot - https://help.qwant.com/bot
-            /(qwantbot)[-\w]*\/?([\w\.]*)/i,
+            /(qwantbot(?:-news)?)[-\w]*\/?([\w\.]*)/i,
 
             // SemrushBot - http://www.semrush.com/bot.html
             /((?:semrush|splitsignal)bot[-abcfimostw]*)\/?([\w\.-]*)/i,
@@ -260,7 +262,7 @@ const Emails = Object.freeze({
 const Fetchers = Object.freeze({
     browser : [
         [
-            // Asana / Bitlybot / Better Uptime / BingPreview / Blueno / Cohere-AI / HubSpot Page Fetcher / kakaotalk-scrap / Mastodon / MicrosoftPreview / Pinterestbot / Redditbot / Rogerbot / SiteAuditBot / Telegrambot / Twitterbot / UptimeRobot
+            // Asana / Bitlybot / Better Uptime / BingPreview / Blueno / Cohere-AI / HubSpot Page Fetcher / kakaotalk-scrap / Mastodon / MicrosoftPreview / Pinterestbot / Redditbot / Rogerbot / SiteAuditBot / Telegrambot / Twitterbot / UptimeRobot / WhatsApp
             // AhrefsSiteAudit - https://ahrefs.com/robot/site-audit
             // Buffer Link Preview Bot - https://scraper.buffer.com/about/bots/link-preview-bot
             // ChatGPT-User - https://platform.openai.com/docs/plugins/bot
@@ -270,25 +272,25 @@ const Fetchers = Object.freeze({
             // Perplexity-User - https://docs.perplexity.ai/guides/bots
             // MistralAI-User - https://docs.mistral.ai/robots/
             // Yandex Bots - https://yandex.com/bots
-            /(asana|ahrefssiteaudit|(?:bing|microsoft)preview|blueno|(?:chatgpt|claude|mistralai|perplexity)-user|cohere-ai|hubspot page fetcher|mastodon|(?:bitly|bufferlinkpreview|discord|duckassist|linkedin|pinterest|reddit|roger|siteaudit|twitter|uptimero|zoom)bot|google-site-verification|iframely|kakaotalk-scrap|meta-externalfetcher|y!?j-dlc|yandex(?:calendar|direct(?:dyn)?|fordomain|pagechecker|searchshop)|yadirectfetcher)\/([\w\.]+)/i,
+            /(asana|ahrefssiteaudit|(?:bing|microsoft)preview|blueno|(?:chatgpt|claude|mistralai|perplexity)-user|cohere-ai|hubspot page fetcher|mastodon|(?:bitly|bufferlinkpreview|discord|duckassist|linkedin|pinterest|reddit|roger|siteaudit|twitter|uptimero|zoom)bot|google-site-verification|iframely|kakaotalk-scrap|meta-externalfetcher|y!?j-dlc|yandex(?:calendar|direct(?:dyn)?|fordomain|pagechecker|searchshop)|yadirectfetcher|whatsapp)\/([\w\.]+)/i,
 
             // Bluesky
             /(bluesky) cardyb\/([\w\.]+)/i,
 
+            // Nova Act - https://github.com/aws/nova-act
+            /agent-(novaact)\/([\w\.]+)/i,
+
             // Skype
             /(skypeuripreview) preview\/([\w\.]+)/i,
 
             // Slackbot - https://api.slack.com/robots
-            /(slack(?:bot)?(?:-imgproxy|-linkexpanding)?) ([\w\.]+)/i,
-            
-            // WhatsApp
-            /(whatsapp)\/([\w\.]+)/i
+            /(slack(?:bot)?(?:-imgproxy|-linkexpanding)?) ([\w\.]+)/i
         ], 
         [NAME, VERSION, [TYPE, FETCHER]],
 
         [
-            // Google Bots / Chrome-Lighthouse / Gemini-Deep-Research / Snapchat / Vercelbot / Yandex Bots
-            /((?:better uptime |telegram|vercel)bot|chrome-lighthouse|feedfetcher-google|gemini-deep-research|google(?:imageproxy|-read-aloud|-pagerenderer|producer)|snap url preview|vercel(flags|tracing|-(favicon|screenshot)-bot)|yandex(?:sitelinks|userproxy))/i
+            // Google Bots / Chrome-Lighthouse / Gemini-Deep-Research / KeybaseBot / Snapchat / Vercelbot / Yandex Bots
+            /((?:better uptime |keybase|telegram|vercel)bot|chrome-lighthouse|feedfetcher-google|gemini-deep-research|google(?:imageproxy|-read-aloud|-pagerenderer|producer)|snap url preview|vercel(flags|tracing|-(favicon|screenshot)-bot)|yandex(?:sitelinks|userproxy))/i
         ], 
         [NAME, [TYPE, FETCHER]],
     ],
@@ -391,13 +393,15 @@ const MediaPlayers = Object.freeze({
 
 const Libraries = Object.freeze({
     browser : [
-        // Apache-HttpClient/Axios/go-http-client/got/GuzzleHttp/Java[-HttpClient]/jsdom/libwww-perl/lua-resty-http/Needle/node-fetch/OkHttp/PHP-SOAP/PostmanRuntime/python-urllib/python-requests/Scrapy/superagent
         [
-            /^(apache-httpclient|axios|(?:go|java)-http-client|got|guzzlehttp|java|libwww-perl|lua-resty-http|needle|node-(?:fetch|superagent)|okhttp|php-soap|postmanruntime|python-(?:httpx|urllib[23]?|requests)|scrapy)\/([\w\.]+)/i,
+            // Apache-HttpClient/Axios/Bun/Dart/go-http-client/got/GuzzleHttp/hackney/Java[-HttpClient]/jsdom/libwww-perl/lua-resty-http/Needle/Node.js/node-fetch/OkHttp/PHP-SOAP/PostmanRuntime/python-urllib/python-requests/rest-client/Scrapy/superagent
+            /^(apache-httpclient|axios|bun|dart|deno|(?:go|java)-http-client|got|guzzlehttp|hackney|java|libwww-perl|lua-resty-http|needle|node(?:\.js|-fetch|-superagent)|okhttp|php-soap|postmanruntime|python-(?:httpx|urllib[23]?|requests)|rest-client|scrapy)\/([\w\.]+)/i,
             /(adobeair|aiohttp|jsdom)\/([\w\.]+)/i,
             /(nutch)-([\w\.-]+)(\(|$)/i,
             /\((java)\/([\w\.]+)/i
-        ], [NAME, VERSION, [TYPE, LIBRARY]]
+        ], [NAME, VERSION, [TYPE, LIBRARY]], [
+            /(node-fetch|undici)/i
+        ], [NAME, [TYPE, LIBRARY]]
     ]
 });
 

src/helpers/ua-parser-helpers.d.ts

@@ -4,12 +4,37 @@
 
 import type { IResult } from "../main/ua-parser";
 
-export function getDeviceVendor(model: string): string | undefined;
-export function isAppleSilicon(resultOrUA: IResult | string): boolean;
-export function isAIBot(resultOrUA: IResult | string): boolean;
-export function isBot(resultOrUA: IResult | string): boolean;
-export function isChromeFamily(resultOrUA: IResult | string): boolean;
-export function isElectron(): boolean;
-export function isFromEU(): boolean;
 export function isFrozenUA(ua: string): boolean;
-export function isStandalonePWA(): boolean;
+
+/**
+ * @deprecated Moved to `device-detection` submodule
+ */
+export function getDeviceVendor(model: string): string | undefined;
+/**
+ * @deprecated Moved to `device-detection` submodule
+ */
+export function isAppleSilicon(resultOrUA: IResult | string): boolean;
+/**
+ * @deprecated Moved to `bot-detection` submodule
+ */
+export function isAIBot(resultOrUA: IResult | string): boolean;
+/**
+ * @deprecated Moved to `bot-detection` submodule
+ */
+export function isBot(resultOrUA: IResult | string): boolean;
+/**
+ * @deprecated Moved to `browser-detection` submodule
+ */
+export function isChromeFamily(resultOrUA: IResult | string): boolean;
+/**
+ * @deprecated Moved to `browser-detection` submodule
+ */
+export function isElectron(): boolean;
+/**
+ * @deprecated Moved to `browser-detection` submodule
+ */
+export function isFromEU(): boolean;
+/**
+ * @deprecated Moved to `browser-detection` submodule
+ */
+export function isStandalonePWA(): boolean;

src/helpers/ua-parser-helpers.js

@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////
-/*  Helpers for UAParser.js v2.0.5
+/*  Helpers for UAParser.js v2.0.7
     https://github.com/faisalman/ua-parser-js
     Author: Faisal Salman <f@faisalman.com>
     AGPLv3 License */
@@ -8,169 +8,52 @@
 /*jshint esversion: 6 */ 
 
 const { UAParser } = require('../main/ua-parser');
-const { CPUArch, OSName, EngineName, Extension, BrowserType } = require('../enums/ua-parser-enums');
-const { Bots, Crawlers } = require('../extensions/ua-parser-extensions');
-const { isFromEU } = require('detect-europe-js');
+const { EngineName } = require('../enums/ua-parser-enums');
+const { getDeviceVendor: _getDeviceVendor, isAppleSilicon: _isAppleSilicon } = require('../device-detection/device-detection');
+const { isBot: _isBot, isAICrawler } = require('../bot-detection/bot-detection');
+const { isChromeFamily: _isChromeFamily, isElectron: _isElectron, isStandalonePWA: _isStandalonePWA } = require('../browser-detection/browser-detection');
+const { isFromEU: _isFromEU } = require('../browser-detection/browser-detection');
 const { isFrozenUA } = require('ua-is-frozen');
-const { isStandalonePWA } = require('is-standalone-pwa');
-const { Crawler } = Extension.BrowserName;
 
-const toResult = (value, head, ext) => typeof value === 'string' ? UAParser(value, head, ext) : value;
+/**
+ * @deprecated Moved to `device-detection` submodule
+ */
+const getDeviceVendor = _getDeviceVendor;
 
-const getDeviceVendor = (model) => UAParser(`Mozilla/5.0 (Linux; Android 10; ${model}) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/100.0.0.0 Safari/537.36`).device.vendor;
+/**
+ * @deprecated Moved to `device-detection` submodule
+ */
+const isAppleSilicon = _isAppleSilicon;
 
-const isAppleSilicon = (resultOrUA) => {
-    const res = toResult(resultOrUA);
-    if (res.os.is(OSName.MACOS)) {
-        if (res.cpu.is(CPUArch.ARM)) {
-            return true;
-        }
-        if (typeof resultOrUA !== 'string' && typeof window !== 'undefined') {
-            try {
-                const canvas = document.createElement('canvas');
-                const webgl = canvas.getContext('webgl2') || canvas.getContext('webgl') || canvas.getContext('experimental-webgl');
-                const debug = webgl.getExtension('WEBGL_debug_renderer_info');
-                const renderer = webgl.getParameter(debug.UNMASKED_RENDERER_WEBGL);
-                if (renderer.match(/apple m\d/i)) {
-                    return true;
-                }
-            } catch {
-                return false;
-            }
-        }
-    }
-    return false;
-}
+/**
+ * @deprecated Moved to `bot-detection` submodule
+ */
+const isAIBot = isAICrawler;
 
-const isAIBot = (resultOrUA) => [
+/**
+ * @deprecated Moved to `bot-detection` submodule
+ */
+const isBot = _isBot;
 
-    // AI2
-    Crawler.AI2_BOT,
+/**
+ * @deprecated Moved to `browser-detection` submodule
+ */
+const isChromeFamily = _isChromeFamily;
 
-    // Amazon
-    Crawler.AMAZON_BOT,
+/**
+ * @deprecated Moved to `browser-detection` submodule
+ */
+const isElectron = () => _isElectron;
 
-    // Anthropic
-    Crawler.ANTHROPIC_AI,
-    Crawler.ANTHROPIC_CLAUDE_BOT,
-    Crawler.ANTHROPIC_CLAUDE_SEARCHBOT,
-    Crawler.ANTHROPIC_CLAUDE_WEB,
+/**
+ * @deprecated Moved to `browser-detection` submodule
+ */
+const isFromEU = _isFromEU;
 
-    // Apple
-    Crawler.APPLE_BOT,
-    Crawler.APPLE_BOT_EXTENDED,
-
-    // Brave
-    Crawler.BRAVE_BOT,
-
-    // ByteDance
-    Crawler.BYTEDANCE_BYTESPIDER,
-    Crawler.BYTEDANCE_TIKTOKSPIDER,
-
-    // Cohere
-    Crawler.COHERE_TRAINING_DATA_CRAWLER,
-
-    // Common Crawl
-    Crawler.COMMON_CRAWL_CCBOT,
-    
-    // Coveo
-    Crawler.COVEO_BOT,
-
-    // DataForSeo
-    Crawler.DATAFORSEO_BOT,
-
-    // DeepSeek
-    Crawler.DEEPSEEK_BOT,
-
-    // Diffbot
-    Crawler.DIFFBOT,
-
-    // Google
-    Crawler.GOOGLE_EXTENDED,
-    Crawler.GOOGLE_OTHER,
-    Crawler.GOOGLE_OTHER_IMAGE,
-    Crawler.GOOGLE_OTHER_VIDEO,
-    Crawler.GOOGLE_CLOUDVERTEXBOT,
-
-    // Hive AI
-    Crawler.HIVE_IMAGESIFTBOT,
-
-    // Huawei
-    Crawler.HUAWEI_PETALBOT,
-    Crawler.HUAWEI_PANGUBOT,
-
-    // Hugging Face
-    Crawler.HUGGINGFACE_BOT,
-
-    // Kangaroo
-    Crawler.KANGAROO_BOT,
-
-    // Mendable.ai
-    Crawler.FIRECRAWL_AGENT,
-
-    // Meta
-    Crawler.META_FACEBOOKBOT,
-    Crawler.META_EXTERNALAGENT,
-
-    // OpenAI
-    Crawler.OPENAI_GPTBOT,
-    Crawler.OPENAI_SEARCH_BOT,
-
-    // Perplexity
-    Crawler.PERPLEXITY_BOT,
-
-    // Replicate
-    Crawler.REPLICATE_BOT,
-
-    // Runpod
-    Crawler.RUNPOD_BOT,
-
-    // SB Intuitions
-    Crawler.SB_INTUITIONS_BOT,
-
-    // Semrush
-    Crawler.SEMRUSH_BOT_CONTENTSHAKE,
-
-    // Timpi
-    Crawler.TIMPI_BOT,
-
-    // Together AI
-    Crawler.TOGETHER_BOT,
-
-    // Velen.io
-    Crawler.HUNTER_VELENPUBLICWEBCRAWLER,
-
-    // Vercel
-    Crawler.VERCEL_V0BOT,
-
-    // Webz.io
-    Crawler.WEBZIO_OMGILI,
-    Crawler.WEBZIO_OMGILI_BOT,
-    Crawler.WEBZIO_EXTENDED,
-
-    // X
-    Crawler.XAI_BOT,
-
-    // You.com
-    Crawler.YOU_BOT,
-
-    // Zhipu AI
-    Crawler.ZHIPU_CHATGLM_SPIDER
-    ]
-    .map((s) => s.toLowerCase())
-    .includes(String(toResult(resultOrUA, Crawlers).browser.name).toLowerCase());
-
-const isBot = (resultOrUA) => [
-    BrowserType.CLI, 
-    BrowserType.CRAWLER, 
-    BrowserType.FETCHER, 
-    BrowserType.LIBRARY
-    ].includes(toResult(resultOrUA, Bots).browser.type);
-
-const isChromeFamily = (resultOrUA) => toResult(resultOrUA).engine.is(EngineName.BLINK);
-
-const isElectron = () => !!(process?.versions?.hasOwnProperty('electron') ||    // node.js
-                            / electron\//i.test(navigator?.userAgent));         // browser
+/**
+ * @deprecated Moved to `browser-detection` submodule
+ */
+const isStandalonePWA = _isStandalonePWA;
 
 module.exports = { 
     getDeviceVendor,

src/helpers/ua-parser-helpers.mjs

@@ -3,7 +3,7 @@
 // Source: /src/helpers/ua-parser-helpers.js
 
 ///////////////////////////////////////////////
-/*  Helpers for UAParser.js v2.0.5
+/*  Helpers for UAParser.js v2.0.7
     https://github.com/faisalman/ua-parser-js
     Author: Faisal Salman <f@faisalman.com>
     AGPLv3 License */
@@ -12,169 +12,52 @@
 /*jshint esversion: 6 */ 
 
 import { UAParser } from '../main/ua-parser.mjs';
-import { CPUArch, OSName, EngineName, Extension, BrowserType } from '../enums/ua-parser-enums.mjs';
-import { Bots, Crawlers } from '../extensions/ua-parser-extensions.mjs';
-import { isFromEU } from 'detect-europe-js';
+import { EngineName } from '../enums/ua-parser-enums.mjs';
+import { getDeviceVendor: _getDeviceVendor, isAppleSilicon: _isAppleSilicon } from '../device-detection/device-detection.mjs';
+import { isBot: _isBot, isAICrawler } from '../bot-detection/bot-detection.mjs';
+import { isChromeFamily: _isChromeFamily, isElectron: _isElectron, isStandalonePWA: _isStandalonePWA } from '../browser-detection/browser-detection.mjs';
+import { isFromEU: _isFromEU } from '../browser-detection/browser-detection.mjs';
 import { isFrozenUA } from 'ua-is-frozen';
-import { isStandalonePWA } from 'is-standalone-pwa';
-const { Crawler } = Extension.BrowserName;
 
-const toResult = (value, head, ext) => typeof value === 'string' ? UAParser(value, head, ext) : value;
+/**
+ * @deprecated Moved to `device-detection` submodule
+ */
+const getDeviceVendor = _getDeviceVendor;
 
-const getDeviceVendor = (model) => UAParser(`Mozilla/5.0 (Linux; Android 10; ${model}) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/100.0.0.0 Safari/537.36`).device.vendor;
+/**
+ * @deprecated Moved to `device-detection` submodule
+ */
+const isAppleSilicon = _isAppleSilicon;
 
-const isAppleSilicon = (resultOrUA) => {
-    const res = toResult(resultOrUA);
-    if (res.os.is(OSName.MACOS)) {
-        if (res.cpu.is(CPUArch.ARM)) {
-            return true;
-        }
-        if (typeof resultOrUA !== 'string' && typeof window !== 'undefined') {
-            try {
-                const canvas = document.createElement('canvas');
-                const webgl = canvas.getContext('webgl2') || canvas.getContext('webgl') || canvas.getContext('experimental-webgl');
-                const debug = webgl.getExtension('WEBGL_debug_renderer_info');
-                const renderer = webgl.getParameter(debug.UNMASKED_RENDERER_WEBGL);
-                if (renderer.match(/apple m\d/i)) {
-                    return true;
-                }
-            } catch {
-                return false;
-            }
-        }
-    }
-    return false;
-}
+/**
+ * @deprecated Moved to `bot-detection` submodule
+ */
+const isAIBot = isAICrawler;
 
-const isAIBot = (resultOrUA) => [
+/**
+ * @deprecated Moved to `bot-detection` submodule
+ */
+const isBot = _isBot;
 
-    // AI2
-    Crawler.AI2_BOT,
+/**
+ * @deprecated Moved to `browser-detection` submodule
+ */
+const isChromeFamily = _isChromeFamily;
 
-    // Amazon
-    Crawler.AMAZON_BOT,
+/**
+ * @deprecated Moved to `browser-detection` submodule
+ */
+const isElectron = () => _isElectron;
 
-    // Anthropic
-    Crawler.ANTHROPIC_AI,
-    Crawler.ANTHROPIC_CLAUDE_BOT,
-    Crawler.ANTHROPIC_CLAUDE_SEARCHBOT,
-    Crawler.ANTHROPIC_CLAUDE_WEB,
+/**
+ * @deprecated Moved to `browser-detection` submodule
+ */
+const isFromEU = _isFromEU;
 
-    // Apple
-    Crawler.APPLE_BOT,
-    Crawler.APPLE_BOT_EXTENDED,
-
-    // Brave
-    Crawler.BRAVE_BOT,
-
-    // ByteDance
-    Crawler.BYTEDANCE_BYTESPIDER,
-    Crawler.BYTEDANCE_TIKTOKSPIDER,
-
-    // Cohere
-    Crawler.COHERE_TRAINING_DATA_CRAWLER,
-
-    // Common Crawl
-    Crawler.COMMON_CRAWL_CCBOT,
-    
-    // Coveo
-    Crawler.COVEO_BOT,
-
-    // DataForSeo
-    Crawler.DATAFORSEO_BOT,
-
-    // DeepSeek
-    Crawler.DEEPSEEK_BOT,
-
-    // Diffbot
-    Crawler.DIFFBOT,
-
-    // Google
-    Crawler.GOOGLE_EXTENDED,
-    Crawler.GOOGLE_OTHER,
-    Crawler.GOOGLE_OTHER_IMAGE,
-    Crawler.GOOGLE_OTHER_VIDEO,
-    Crawler.GOOGLE_CLOUDVERTEXBOT,
-
-    // Hive AI
-    Crawler.HIVE_IMAGESIFTBOT,
-
-    // Huawei
-    Crawler.HUAWEI_PETALBOT,
-    Crawler.HUAWEI_PANGUBOT,
-
-    // Hugging Face
-    Crawler.HUGGINGFACE_BOT,
-
-    // Kangaroo
-    Crawler.KANGAROO_BOT,
-
-    // Mendable.ai
-    Crawler.FIRECRAWL_AGENT,
-
-    // Meta
-    Crawler.META_FACEBOOKBOT,
-    Crawler.META_EXTERNALAGENT,
-
-    // OpenAI
-    Crawler.OPENAI_GPTBOT,
-    Crawler.OPENAI_SEARCH_BOT,
-
-    // Perplexity
-    Crawler.PERPLEXITY_BOT,
-
-    // Replicate
-    Crawler.REPLICATE_BOT,
-
-    // Runpod
-    Crawler.RUNPOD_BOT,
-
-    // SB Intuitions
-    Crawler.SB_INTUITIONS_BOT,
-
-    // Semrush
-    Crawler.SEMRUSH_BOT_CONTENTSHAKE,
-
-    // Timpi
-    Crawler.TIMPI_BOT,
-
-    // Together AI
-    Crawler.TOGETHER_BOT,
-
-    // Velen.io
-    Crawler.HUNTER_VELENPUBLICWEBCRAWLER,
-
-    // Vercel
-    Crawler.VERCEL_V0BOT,
-
-    // Webz.io
-    Crawler.WEBZIO_OMGILI,
-    Crawler.WEBZIO_OMGILI_BOT,
-    Crawler.WEBZIO_EXTENDED,
-
-    // X
-    Crawler.XAI_BOT,
-
-    // You.com
-    Crawler.YOU_BOT,
-
-    // Zhipu AI
-    Crawler.ZHIPU_CHATGLM_SPIDER
-    ]
-    .map((s) => s.toLowerCase())
-    .includes(String(toResult(resultOrUA, Crawlers).browser.name).toLowerCase());
-
-const isBot = (resultOrUA) => [
-    BrowserType.CLI, 
-    BrowserType.CRAWLER, 
-    BrowserType.FETCHER, 
-    BrowserType.LIBRARY
-    ].includes(toResult(resultOrUA, Bots).browser.type);
-
-const isChromeFamily = (resultOrUA) => toResult(resultOrUA).engine.is(EngineName.BLINK);
-
-const isElectron = () => !!(process?.versions?.hasOwnProperty('electron') ||    // node.js
-                            / electron\//i.test(navigator?.userAgent));         // browser
+/**
+ * @deprecated Moved to `browser-detection` submodule
+ */
+const isStandalonePWA = _isStandalonePWA;
 
 export { 
     getDeviceVendor,

src/main/ua-parser.d.ts

@@ -1,8 +1,7 @@
-// Type definitions for UAParser.js v2.0.5
+// Type definitions for UAParser.js v2.0.7
 // Project: https://github.com/faisalman/ua-parser-js
 // Definitions by: Faisal Salman <https://github.com/faisalman>
 
-import type { Headers } from "undici";
 import { BrowserType, CPUArch, DeviceType, EngineName } from "../enums/ua-parser-enums";
 
 declare namespace UAParser {

src/main/ua-parser.js

@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////////
-/* UAParser.js v2.0.5
+/* UAParser.js v2.0.7
    Copyright © 2012-2025 Faisal Salman <f@faisalman.com>
    AGPLv3 License *//*
    Detect Browser, Engine, OS, CPU, and Device type/model from User-Agent data.
@@ -19,26 +19,26 @@
     // Constants
     /////////////
 
-    var LIBVERSION  = '2.0.5',
+    var LIBVERSION  = '2.0.7',
         UA_MAX_LENGTH = 500,
         USER_AGENT  = 'user-agent',
         EMPTY       = '',
         UNKNOWN     = '?',
-
-        // typeof
-        FUNC_TYPE   = 'function',
-        UNDEF_TYPE  = 'undefined',
-        OBJ_TYPE    = 'object',
-        STR_TYPE    = 'string',
+        TYPEOF = {
+            FUNCTION    : 'function',
+            OBJECT      : 'object',
+            STRING      : 'string',
+            UNDEFINED   : 'undefined'
+        },
 
         // properties
-        UA_BROWSER  = 'browser',
-        UA_CPU      = 'cpu',
-        UA_DEVICE   = 'device',
-        UA_ENGINE   = 'engine',
-        UA_OS       = 'os',
-        UA_RESULT   = 'result',
-        
+        BROWSER     = 'browser',
+        CPU         = 'cpu',
+        DEVICE      = 'device',
+        ENGINE      = 'engine',
+        OS          = 'os',
+        RESULT      = 'result',
+
         NAME        = 'name',
         TYPE        = 'type',
         VENDOR      = 'vendor',
@@ -66,16 +66,16 @@
         PLATFORM    = 'platform',
         PLATFORMVER = 'platformVersion',
         BITNESS     = 'bitness',
-        CH_HEADER   = 'sec-ch-ua',
-        CH_HEADER_FULL_VER_LIST = CH_HEADER + '-full-version-list',
-        CH_HEADER_ARCH      = CH_HEADER + '-arch',
-        CH_HEADER_BITNESS   = CH_HEADER + '-' + BITNESS,
-        CH_HEADER_FORM_FACTORS = CH_HEADER + '-form-factors',
-        CH_HEADER_MOBILE    = CH_HEADER + '-' + MOBILE,
-        CH_HEADER_MODEL     = CH_HEADER + '-' + MODEL,
-        CH_HEADER_PLATFORM  = CH_HEADER + '-' + PLATFORM,
-        CH_HEADER_PLATFORM_VER = CH_HEADER_PLATFORM + '-version',
-        CH_ALL_VALUES       = [BRANDS, FULLVERLIST, MOBILE, MODEL, PLATFORM, PLATFORMVER, ARCHITECTURE, FORMFACTORS, BITNESS],
+        CH          = 'sec-ch-ua',
+        CH_FULL_VER_LIST= CH + '-full-version-list',
+        CH_ARCH         = CH + '-arch',
+        CH_BITNESS      = CH + '-' + BITNESS,
+        CH_FORM_FACTORS = CH + '-form-factors',
+        CH_MOBILE       = CH + '-' + MOBILE,
+        CH_MODEL        = CH + '-' + MODEL,
+        CH_PLATFORM     = CH + '-' + PLATFORM,
+        CH_PLATFORM_VER = CH_PLATFORM + '-version',
+        CH_ALL_VALUES   = [BRANDS, FULLVERLIST, MOBILE, MODEL, PLATFORM, PLATFORMVER, ARCHITECTURE, FORMFACTORS, BITNESS],
 
         // device vendors
         AMAZON      = 'Amazon',
@@ -114,7 +114,7 @@
         // os
         WINDOWS     = 'Windows';
    
-    var isWindow            = typeof window !== UNDEF_TYPE,
+    var isWindow            = typeof window !== TYPEOF.UNDEFINED,
         NAVIGATOR           = (isWindow && window.navigator) ? 
                                 window.navigator : 
                                 undefined,
@@ -150,7 +150,7 @@
             return enums;
         },
         has = function (str1, str2) {
-            if (typeof str1 === OBJ_TYPE && str1.length > 0) {
+            if (typeof str1 === TYPEOF.OBJECT && str1.length > 0) {
                 for (var i in str1) {
                     if (lowerize(str2) == lowerize(str1[i])) return true;
                 }
@@ -164,7 +164,7 @@
             }
         },
         isString = function (val) {
-            return typeof val === STR_TYPE;
+            return typeof val === TYPEOF.STRING;
         },
         itemListToArray = function (header) {
             if (!header) return undefined;
@@ -191,7 +191,7 @@
                 if (!arr.hasOwnProperty(i)) continue;
 
                 var propName = arr[i];
-                if (typeof propName == OBJ_TYPE && propName.length == 2) {
+                if (typeof propName == TYPEOF.OBJECT && propName.length == 2) {
                     this[propName[0]] = propName[1];
                 } else {
                     this[propName] = undefined;
@@ -206,10 +206,8 @@
             return strip(/\\?\"/g, str); 
         },
         trim = function (str, len) {
-            if (isString(str)) {
-                str = strip(/^\s\s*/, str);
-                return typeof len === UNDEF_TYPE ? str : str.substring(0, UA_MAX_LENGTH);
-            }
+            str = strip(/^\s\s*/, String(str));
+            return typeof len === TYPEOF.UNDEFINED ? str : str.substring(0, len);
     };
 
     ///////////////
@@ -240,9 +238,9 @@
                             match = matches[++k];
                             q = props[p];
                             // check if given property is actually array
-                            if (typeof q === OBJ_TYPE && q.length > 0) {
+                            if (typeof q === TYPEOF.OBJECT && q.length > 0) {
                                 if (q.length === 2) {
-                                    if (typeof q[1] == FUNC_TYPE) {
+                                    if (typeof q[1] == TYPEOF.FUNCTION) {
                                         // assign modified match
                                         this[q[0]] = q[1].call(this, match);
                                     } else {
@@ -251,7 +249,7 @@
                                     }
                                 } else if (q.length >= 3) {
                                     // Check whether q[1] FUNCTION or REGEX
-                                    if (typeof q[1] === FUNC_TYPE && !(q[1].exec && q[1].test)) {
+                                    if (typeof q[1] === TYPEOF.FUNCTION && !(q[1].exec && q[1].test)) {
                                         if (q.length > 3) {
                                             this[q[0]] = match ? q[1].apply(this, q.slice(2)) : undefined;
                                         } else {
@@ -283,7 +281,7 @@
 
             for (var i in map) {
                 // check if current value is array
-                if (typeof map[i] === OBJ_TYPE && map[i].length > 0) {
+                if (typeof map[i] === TYPEOF.OBJECT && map[i].length > 0) {
                     for (var j = 0; j < map[i].length; j++) {
                         if (has(map[i][j], str)) {
                             return (i === UNKNOWN) ? undefined : i;
@@ -377,10 +375,11 @@
             /(avant|iemobile|slim(?:browser|boat|jet))[\/ ]?([\d\.]*)/i,        // Avant/IEMobile/SlimBrowser/SlimBoat/Slimjet
             /(?:ms|\()(ie) ([\w\.]+)/i,                                         // Internet Explorer
 
-            // Blink/Webkit/KHTML based                                         // Flock/RockMelt/Midori/Epiphany/Silk/Skyfire/Bolt/Iron/Iridium/PhantomJS/Bowser/QupZilla/Falkon/LG Browser/Otter/qutebrowser/Dooble
-            /(flock|rockmelt|midori|epiphany|silk|skyfire|ovibrowser|bolt|iron|vivaldi|iridium|phantomjs|bowser|qupzilla|falkon|rekonq|puffin|brave|whale(?!.+naver)|qqbrowserlite|duckduckgo|klar|helio|(?=comodo_)?dragon|otter|dooble|(?:lg |qute)browser)\/([-\w\.]+)/i,
-                                                                                // Rekonq/Puffin/Brave/Whale/QQBrowserLite/QQ//Vivaldi/DuckDuckGo/Klar/Helio/Dragon
-            /(heytap|ovi|115|surf)browser\/([\d\.]+)/i,                         // HeyTap/Ovi/115/Surf
+            // Blink/Webkit/KHTML based                                         // Flock/RockMelt/Midori/Epiphany/Silk/Skyfire/Bolt/Iron/Iridium/PhantomJS/Bowser/QupZilla/Falkon/LG Browser/Otter/qutebrowser/Dooble/Palemoon
+            /(atlas|flock|rockmelt|midori|epiphany|silk|skyfire|ovibrowser|bolt|iron|vivaldi|iridium|phantomjs|bowser|qupzilla|falkon|rekonq|puffin|brave|whale(?!.+naver)|qqbrowserlite|duckduckgo|klar|helio|(?=comodo_)?dragon|otter|dooble|(?:lg |qute)browser|palemoon)\/([-\w\.]+)/i,
+                                                                                // Atlas/Rekonq/Puffin/Brave/Whale/QQBrowserLite/QQ//Vivaldi/DuckDuckGo/Klar/Helio/Dragon
+            /(heytap|ovi|115|surf|qwant)browser\/([\d\.]+)/i,                   // HeyTap/Ovi/115/Surf
+            /(qwant)(?:ios|mobile)\/([\d\.]+)/i,                                // Qwant
             /(ecosia|weibo)(?:__| \w+@)([\d\.]+)/i                              // Ecosia/Weibo
             ], [NAME, VERSION], [
             /quark(?:pc)?\/([-\w\.]+)/i                                         // Quark
@@ -433,7 +432,7 @@
             /(tesla)(?: qtcarbrowser|\/(20\d\d\.[-\w\.]+))/i,                   // Tesla
             /m?(qqbrowser|2345(?=browser|chrome|explorer))\w*[\/ ]?v?([\w\.]+)/i   // QQ/2345
             ], [NAME, VERSION], [
-            /(lbbrowser|rekonq)/i                                               // LieBao Browser/Rekonq
+            /(lbbrowser|rekonq|steam(?= (clie|tenf|gameo)))/i                   // LieBao Browser/Rekonq/Steam
             ], [NAME], [
             /ome\/([\w\.]+) \w* ?(iron) saf/i,                                  // Iron
             /ome\/([\w\.]+).+qihu (360)[es]e/i                                  // 360
@@ -449,6 +448,7 @@
             /\b(line)\/([\w\.]+)\/iab/i,                                        // Line App for Android
             /(alipay)client\/([\w\.]+)/i,                                       // Alipay
             /(twitter)(?:and| f.+e\/([\w\.]+))/i,                               // Twitter
+            /(bing)(?:web|sapphire)\/([\w\.]+)/i,                               // Bing
             /(instagram|snapchat|klarna)[\/ ]([-\w\.]+)/i                       // Instagram/Snapchat/Klarna
             ], [NAME, VERSION, [TYPE, INAPP]], [
             /\bgsa\/([\w\.]+) .*safari\//i                                      // Google Search Appliance on iOS
@@ -506,10 +506,10 @@
             /(swiftfox)/i,                                                      // Swiftfox
             /(icedragon|iceweasel|camino|chimera|fennec|maemo browser|minimo|conkeror)[\/ ]?([\w\.\+]+)/i,
                                                                                 // IceDragon/Iceweasel/Camino/Chimera/Fennec/Maemo/Minimo/Conkeror
-            /(seamonkey|k-meleon|icecat|iceape|firebird|phoenix|palemoon|basilisk|waterfox)\/([-\w\.]+)$/i,
+            /(seamonkey|k-meleon|icecat|iceape|firebird|phoenix|basilisk|waterfox)\/([-\w\.]+)$/i,
                                                                                 // Firefox/SeaMonkey/K-Meleon/IceCat/IceApe/Firebird/Phoenix
             /(firefox)\/([\w\.]+)/i,                                            // Other Firefox-based
-            /(mozilla)\/([\w\.]+) .+rv\:.+gecko\/\d+/i,                         // Mozilla
+            /(mozilla)\/([\w\.]+(?= .+rv\:.+gecko\/\d+)|[0-4][\w\.]+(?!.+compatible))/i, // Mozilla
 
             // Other
             /(amaya|dillo|doris|icab|ladybird|lynx|mosaic|netsurf|obigo|polaris|w3m|(?:go|ice|up)[\. ]?browser)[-\/ ]?v?([\w\.]+)/i,
@@ -547,6 +547,8 @@
             /((ppc|powerpc)(64)?)( mac|;|\))/i,                                 // PowerPC
             /(?:osf1|[freopnt]{3,4}bsd) (alpha)/i                               // Alpha
             ], [[ARCHITECTURE, /ower/, EMPTY, lowerize]], [
+            /mc680.0/i
+            ], [[ARCHITECTURE, '68k']], [
             /winnt.+\[axp/i
             ], [[ARCHITECTURE, 'alpha']]
         ],
@@ -566,11 +568,10 @@
             ], [MODEL, [VENDOR, SAMSUNG], [TYPE, MOBILE]], [
 
             // Apple
-            /(?:\/|\()(ip(?:hone|od)[\w, ]*)(?:\/|;)/i                          // iPod/iPhone
+            /(?:\/|\()(ip(?:hone|od)[\w, ]*)[\/\);]/i                           // iPod/iPhone
             ], [MODEL, [VENDOR, APPLE], [TYPE, MOBILE]], [
-            /\((ipad);[-\w\),; ]+apple/i,                                       // iPad
-            /applecoremedia\/[\w\.]+ \((ipad)/i,
-            /\b(ipad)\d\d?,\d\d?[;\]].+ios/i
+            /\b(?:ios|apple\w+)\/.+[\(\/](ipad)/i,                              // iPad
+            /\b(ipad)[\d,]*[;\] ].+(mac |i(pad)?)os/i
             ], [MODEL, [VENDOR, APPLE], [TYPE, TABLET]], [
             /(macintosh);/i
             ], [MODEL, [VENDOR, APPLE]], [
@@ -588,21 +589,21 @@
             // Huawei
             /\b((?:ag[rs][2356]?k?|bah[234]?|bg[2o]|bt[kv]|cmr|cpn|db[ry]2?|jdn2|got|kob2?k?|mon|pce|scm|sht?|[tw]gr|vrd)-[ad]?[lw][0125][09]b?|605hw|bg2-u03|(?:gem|fdr|m2|ple|t1)-[7a]0[1-4][lu]|t1-a2[13][lw]|mediapad[\w\. ]*(?= bui|\)))\b(?!.+d\/s)/i
             ], [MODEL, [VENDOR, HUAWEI], [TYPE, TABLET]], [
-            /(?:huawei)([-\w ]+)[;\)]/i,
-            /\b(nexus 6p|\w{2,4}e?-[atu]?[ln][\dx][012359c][adn]?)\b(?!.+d\/s)/i
+            /(?:huawei) ?([-\w ]+)[;\)]/i,
+            /\b(nexus 6p|\w{2,4}e?-[atu]?[ln][\dx][\dc][adnt]?)\b(?!.+d\/s)/i
             ], [MODEL, [VENDOR, HUAWEI], [TYPE, MOBILE]], [
 
             // Xiaomi
             /oid[^\)]+; (2[\dbc]{4}(182|283|rp\w{2})[cgl]|m2105k81a?c)(?: bui|\))/i,
-            /\b((?:red)?mi[-_ ]?pad[\w- ]*)(?: bui|\))/i                                // Mi Pad tablets
+            /\b(?:xiao)?((?:red)?mi[-_ ]?pad[\w- ]*)(?: bui|\))/i               // Mi Pad tablets
             ],[[MODEL, /_/g, ' '], [VENDOR, XIAOMI], [TYPE, TABLET]], [
 
-            /\b(poco[\w ]+|m2\d{3}j\d\d[a-z]{2})(?: bui|\))/i,                  // Xiaomi POCO
             /\b; (\w+) build\/hm\1/i,                                           // Xiaomi Hongmi 'numeric' models
             /\b(hm[-_ ]?note?[_ ]?(?:\d\w)?) bui/i,                             // Xiaomi Hongmi
-            /\b(redmi[\-_ ]?(?:note|k)?[\w_ ]+)(?: bui|\))/i,                   // Xiaomi Redmi
-            /oid[^\)]+; (m?[12][0-389][01]\w{3,6}[c-y])( bui|; wv|\))/i,        // Xiaomi Redmi 'numeric' models
-            /\b(mi[-_ ]?(?:a\d|one|one[_ ]plus|note lte|max|cc)?[_ ]?(?:\d?\w?)[_ ]?(?:plus|se|lite|pro)?)(?: bui|\))/i, // Xiaomi Mi
+                                                                                // Xiaomi Redmi / POCO / Black Shark / Qin
+            /oid[^\)]+; (redmi[\-_ ]?(?:note|k)?[\w_ ]+|m?[12]\d[01]\d\w{3,6}|poco[\w ]+|(shark )?\w{3}-[ah]0|qin ?[1-3](s\+|ultra| pro)?)( bui|; wv|\))/i,
+                                                                                // Xiaomi Mi
+            /\b(mi[-_ ]?(?:a\d|one|one[_ ]plus|note|max|cc)?[_ ]?(?:\d{0,2}\w?)[_ ]?(?:plus|se|lite|pro)?( 5g|lte)?)(?: bui|\))/i,
             / ([\w ]+) miui\/v?\d/i
             ], [[MODEL, /_/g, ' '], [VENDOR, XIAOMI], [TYPE, MOBILE]], [
 
@@ -658,7 +659,7 @@
             /(nokia) (t[12][01])/i
             ], [VENDOR, MODEL, [TYPE, TABLET]], [
             /(?:maemo|nokia).*(n900|lumia \d+|rm-\d+)/i,
-            /nokia[-_ ]?(([-\w\. ]*))/i
+            /nokia[-_ ]?(([-\w\. ]*?))( bui|\)|;|\/)/i
             ], [[MODEL, /_/g, ' '], [TYPE, MOBILE], [VENDOR, 'Nokia']], [
 
             // Google
@@ -689,7 +690,7 @@
             /(playbook);[-\w\),; ]+(rim)/i                                      // BlackBerry PlayBook
             ], [MODEL, VENDOR, [TYPE, TABLET]], [
             /\b((?:bb[a-f]|st[hv])100-\d)/i,
-            /\(bb10; (\w+)/i                                                    // BlackBerry 10
+            /(?:blackberry|\(bb10;) (\w+)/i
             ], [MODEL, [VENDOR, BLACKBERRY], [TYPE, MOBILE]], [
 
             // Asus
@@ -769,10 +770,12 @@
 
             /(blackberry|benq|palm(?=\-)|sonyericsson|acer|asus(?! zenw)|dell|jolla|meizu|motorola|polytron|tecno|micromax|advan)[-_ ]?([-\w]*)/i,
                                                                                 // BlackBerry/BenQ/Palm/Sony-Ericsson/Acer/Asus/Dell/Meizu/Motorola/Polytron/Tecno/Micromax/Advan
-            /; (blu|hmd|imo|infinix|lava|oneplus|tcl)[_ ]([\w\+ ]+?)(?: bui|\)|; r)/i,  // BLU/HMD/IMO/Infinix/Lava/OnePlus/TCL
+                                                                                // BLU/HMD/IMO/Infinix/Lava/OnePlus/TCL/Wiko
+            /; (blu|hmd|imo|infinix|lava|oneplus|tcl|wiko)[_ ]([\w\+ ]+?)(?: bui|\)|; r)/i,
             /(hp) ([\w ]+\w)/i,                                                 // HP iPAQ
             /(microsoft); (lumia[\w ]+)/i,                                      // Microsoft Lumia
             /(oppo) ?([\w ]+) bui/i,                                            // OPPO
+            /(hisense) ([ehv][\w ]+)\)/i,                                       // Hisense
             /droid[^;]+; (philips)[_ ]([sv-x][\d]{3,4}[xz]?)/i                  // Philips
             ], [VENDOR, MODEL, [TYPE, MOBILE]], [
 
@@ -849,10 +852,10 @@
             ], [MODEL, [VENDOR, MICROSOFT], [TYPE, CONSOLE]], [
             /(ouya)/i,                                                          // Ouya
             /(nintendo) (\w+)/i,                                                // Nintendo
-            /(retroid) (pocket ([^\)]+))/i                                      // Retroid Pocket
-            ], [VENDOR, MODEL, [TYPE, CONSOLE]], [
-            /droid.+; (shield)( bui|\))/i                                       // Nvidia Portable
-            ], [MODEL, [VENDOR, NVIDIA], [TYPE, CONSOLE]], [
+            /(retroid) (pocket ([^\)]+))/i,                                     // Retroid Pocket
+            /(valve).+(steam deck)/i,
+            /droid.+; ((shield|rgcube|gr0006))( bui|\))/i                       // Nvidia Portable/Anbernic/Logitech
+            ], [[VENDOR, strMapper, { 'Nvidia': 'Shield', 'Anbernic': 'RGCUBE', 'Logitech': 'GR0006' }], MODEL, [TYPE, CONSOLE]], [
 
             ///////////////////
             // WEARABLES
@@ -861,7 +864,7 @@
             /\b(sm-[lr]\d\d[0156][fnuw]?s?|gear live)\b/i                       // Samsung Galaxy Watch
             ], [MODEL, [VENDOR, SAMSUNG], [TYPE, WEARABLE]], [
             /((pebble))app/i,                                                   // Pebble
-            /(asus|google|lg|oppo) ((pixel |zen)?watch[\w ]*)( bui|\))/i        // Asus ZenWatch / LG Watch / Pixel Watch
+            /(asus|google|lg|oppo|xiaomi) ((pixel |zen)?watch[\w ]*)( bui|\))/i // Asus ZenWatch / LG Watch / Pixel Watch / Xiaomi Watch
             ], [VENDOR, MODEL, [TYPE, WEARABLE]], [
             /(ow(?:19|20)?we?[1-3]{1,3})/i                                      // Oppo Watch
             ], [MODEL, [VENDOR, OPPO], [TYPE, WEARABLE]], [
@@ -912,7 +915,7 @@
             ], [MODEL, [TYPE, SMARTTV]], [
             /\b((4k|android|smart|opera)[- ]?tv|tv; rv:|large screen[\w ]+safari)\b/i
             ], [[TYPE, SMARTTV]], [
-            /droid .+?; ([^;]+?)(?: bui|; wv\)|\) applew).+?(mobile|vr|\d) safari/i
+            /droid .+?; ([^;]+?)(?: bui|; wv\)|\) applew|; hmsc).+?(mobile|vr|\d) safari/i
             ], [MODEL, [TYPE, strMapper, { 'mobile' : 'Mobile', 'xr' : 'VR', '*' : TABLET }]], [
             /\b((tablet|tab)[;\/]|focus\/\d(?!.+mobile))/i                      // Unidentifiable Tablet
             ], [[TYPE, TABLET]], [
@@ -965,7 +968,8 @@
 
             // iOS/macOS
             /[adehimnop]{4,7}\b(?:.*os ([\w]+) like mac|; opera)/i,             // iOS
-            /(?:ios;fbsv\/|iphone.+ios[\/ ])([\d\.]+)/i,
+            /(?:ios;fbsv|ios(?=.+ip(?:ad|hone)|.+apple ?tv)|ip(?:ad|hone)(?: |.+i(?:pad)?)os|apple ?tv.+ios)[\/ ]([\w\.]+)/i,
+            /\btvos ?([\w\.]+)/i,
             /cfnetwork\/.+darwin/i
             ], [[VERSION, /_/g, '.'], [NAME, 'iOS']], [
             /(mac os x) ?([\w\. ]*)/i,
@@ -1050,27 +1054,27 @@
     var defaultProps = (function () {
             var props = { init : {}, isIgnore : {}, isIgnoreRgx : {}, toString : {}};
             setProps.call(props.init, [
-                [UA_BROWSER, [NAME, VERSION, MAJOR, TYPE]],
-                [UA_CPU, [ARCHITECTURE]],
-                [UA_DEVICE, [TYPE, MODEL, VENDOR]],
-                [UA_ENGINE, [NAME, VERSION]],
-                [UA_OS, [NAME, VERSION]]
+                [BROWSER, [NAME, VERSION, MAJOR, TYPE]],
+                [CPU, [ARCHITECTURE]],
+                [DEVICE, [TYPE, MODEL, VENDOR]],
+                [ENGINE, [NAME, VERSION]],
+                [OS, [NAME, VERSION]]
             ]);
             setProps.call(props.isIgnore, [
-                [UA_BROWSER, [VERSION, MAJOR]],
-                [UA_ENGINE, [VERSION]],
-                [UA_OS, [VERSION]]
+                [BROWSER, [VERSION, MAJOR]],
+                [ENGINE, [VERSION]],
+                [OS, [VERSION]]
             ]);
             setProps.call(props.isIgnoreRgx, [
-                [UA_BROWSER, / ?browser$/i],
-                [UA_OS, / ?os$/i]
+                [BROWSER, / ?browser$/i],
+                [OS, / ?os$/i]
             ]);
             setProps.call(props.toString, [
-                [UA_BROWSER, [NAME, VERSION]],
-                [UA_CPU, [ARCHITECTURE]],
-                [UA_DEVICE, [VENDOR, MODEL]],
-                [UA_ENGINE, [NAME, VERSION]],
-                [UA_OS, [NAME, VERSION]]
+                [BROWSER, [NAME, VERSION]],
+                [CPU, [ARCHITECTURE]],
+                [DEVICE, [VENDOR, MODEL]],
+                [ENGINE, [NAME, VERSION]],
+                [OS, [NAME, VERSION]]
             ]);
             return props;
     })();
@@ -1114,14 +1118,14 @@
             return item.detectFeature().get();
         };
 
-        if (itemType != UA_RESULT) {
+        if (itemType != RESULT) {
             IData.prototype.is = function (strToCheck) {
                 var is = false;
                 for (var i in this) {
                     if (this.hasOwnProperty(i) && !has(is_ignoreProps, i) && lowerize(is_ignoreRgx ? strip(is_ignoreRgx, this[i]) : this[i]) == lowerize(is_ignoreRgx ? strip(is_ignoreRgx, strToCheck) : strToCheck)) {
                         is = true;
-                        if (strToCheck != UNDEF_TYPE) break;
-                    } else if (strToCheck == UNDEF_TYPE && is) {
+                        if (strToCheck != TYPEOF.UNDEFINED) break;
+                    } else if (strToCheck == TYPEOF.UNDEFINED && is) {
                         is = !is;
                         break;
                     }
@@ -1131,33 +1135,33 @@
             IData.prototype.toString = function () {
                 var str = EMPTY;
                 for (var i in toString_props) {
-                    if (typeof(this[toString_props[i]]) !== UNDEF_TYPE) {
+                    if (typeof(this[toString_props[i]]) !== TYPEOF.UNDEFINED) {
                         str += (str ? ' ' : EMPTY) + this[toString_props[i]];
                     }
                 }
-                return str || UNDEF_TYPE;
+                return str || TYPEOF.UNDEFINED;
             };
         }
 
-        if (!NAVIGATOR_UADATA) {
-            IData.prototype.then = function (cb) { 
-                var that = this;
-                var IDataResolve = function () {
-                    for (var prop in that) {
-                        if (that.hasOwnProperty(prop)) {
-                            this[prop] = that[prop];
-                        }
+        IData.prototype.then = function (cb) { 
+            var that = this;
+            var IDataResolve = function () {
+                for (var prop in that) {
+                    if (that.hasOwnProperty(prop)) {
+                        this[prop] = that[prop];
                     }
-                };
-                IDataResolve.prototype = {
-                    is : IData.prototype.is,
-                    toString : IData.prototype.toString
-                };
-                var resolveData = new IDataResolve();
-                cb(resolveData);
-                return resolveData;
+                }
             };
-        }
+            IDataResolve.prototype = {
+                is : IData.prototype.is,
+                toString : IData.prototype.toString,
+                withClientHints : IData.prototype.withClientHints,
+                withFeatureCheck : IData.prototype.withFeatureCheck
+            };
+            var resolveData = new IDataResolve();
+            cb(resolveData);
+            return resolveData;
+        };
 
         return new IData();
     };
@@ -1171,196 +1175,24 @@
         setProps.call(this, CH_ALL_VALUES);
         if (isHttpUACH) {
             setProps.call(this, [
-                [BRANDS, itemListToArray(uach[CH_HEADER])],
-                [FULLVERLIST, itemListToArray(uach[CH_HEADER_FULL_VER_LIST])],
-                [MOBILE, /\?1/.test(uach[CH_HEADER_MOBILE])],
-                [MODEL, stripQuotes(uach[CH_HEADER_MODEL])],
-                [PLATFORM, stripQuotes(uach[CH_HEADER_PLATFORM])],
-                [PLATFORMVER, stripQuotes(uach[CH_HEADER_PLATFORM_VER])],
-                [ARCHITECTURE, stripQuotes(uach[CH_HEADER_ARCH])],
-                [FORMFACTORS, itemListToArray(uach[CH_HEADER_FORM_FACTORS])],
-                [BITNESS, stripQuotes(uach[CH_HEADER_BITNESS])]
+                [BRANDS, itemListToArray(uach[CH])],
+                [FULLVERLIST, itemListToArray(uach[CH_FULL_VER_LIST])],
+                [MOBILE, /\?1/.test(uach[CH_MOBILE])],
+                [MODEL, stripQuotes(uach[CH_MODEL])],
+                [PLATFORM, stripQuotes(uach[CH_PLATFORM])],
+                [PLATFORMVER, stripQuotes(uach[CH_PLATFORM_VER])],
+                [ARCHITECTURE, stripQuotes(uach[CH_ARCH])],
+                [FORMFACTORS, itemListToArray(uach[CH_FORM_FACTORS])],
+                [BITNESS, stripQuotes(uach[CH_BITNESS])]
             ]);
         } else {
             for (var prop in uach) {
-                if(this.hasOwnProperty(prop) && typeof uach[prop] !== UNDEF_TYPE) this[prop] = uach[prop];
+                if(this.hasOwnProperty(prop) && typeof uach[prop] !== TYPEOF.UNDEFINED) this[prop] = uach[prop];
             }
         }
     }
 
     function UAItem (itemType, ua, rgxMap, uaCH) {
-
-        this.get = function (prop) {
-            if (!prop) return this.data;
-            return this.data.hasOwnProperty(prop) ? this.data[prop] : undefined;
-        };
-
-        this.set = function (prop, val) {
-            this.data[prop] = val;
-            return this;
-        };
-
-        this.setCH = function (ch) {
-            this.uaCH = ch;
-            return this;
-        };
-
-        this.detectFeature = function () {
-            if (NAVIGATOR && NAVIGATOR.userAgent == this.ua) {
-                switch (this.itemType) {
-                    case UA_BROWSER:
-                        // Brave-specific detection
-                        if (NAVIGATOR.brave && typeof NAVIGATOR.brave.isBrave == FUNC_TYPE) {
-                            this.set(NAME, 'Brave');
-                        }
-                        break;
-                    case UA_DEVICE:
-                        // Chrome-specific detection: check for 'mobile' value of navigator.userAgentData
-                        if (!this.get(TYPE) && NAVIGATOR_UADATA && NAVIGATOR_UADATA[MOBILE]) {
-                            this.set(TYPE, MOBILE);
-                        }
-                        // iPadOS-specific detection: identified as Mac, but has some iOS-only properties
-                        if (this.get(MODEL) == 'Macintosh' && NAVIGATOR && typeof NAVIGATOR.standalone !== UNDEF_TYPE && NAVIGATOR.maxTouchPoints && NAVIGATOR.maxTouchPoints > 2) {
-                            this.set(MODEL, 'iPad')
-                                .set(TYPE, TABLET);
-                        }
-                        break;
-                    case UA_OS:
-                        // Chrome-specific detection: check for 'platform' value of navigator.userAgentData
-                        if (!this.get(NAME) && NAVIGATOR_UADATA && NAVIGATOR_UADATA[PLATFORM]) {
-                            this.set(NAME, NAVIGATOR_UADATA[PLATFORM]);
-                        }
-                        break;
-                    case UA_RESULT:
-                        var data = this.data;
-                        var detect = function (itemType) {
-                            return data[itemType]
-                                    .getItem()
-                                    .detectFeature()
-                                    .get();
-                        };
-                        this.set(UA_BROWSER, detect(UA_BROWSER))
-                            .set(UA_CPU, detect(UA_CPU))
-                            .set(UA_DEVICE, detect(UA_DEVICE))
-                            .set(UA_ENGINE, detect(UA_ENGINE))
-                            .set(UA_OS, detect(UA_OS));
-                }
-            }
-            return this;
-        };
-
-        this.parseUA = function () {
-            if (this.itemType != UA_RESULT) {
-                rgxMapper.call(this.data, this.ua, this.rgxMap);
-            }
-            if (this.itemType == UA_BROWSER) {
-                this.set(MAJOR, majorize(this.get(VERSION)));
-            }
-            return this;
-        };
-
-        this.parseCH = function () {
-            var uaCH = this.uaCH,
-                rgxMap = this.rgxMap;
-    
-            switch (this.itemType) {
-                case UA_BROWSER:
-                case UA_ENGINE:
-                    var brands = uaCH[FULLVERLIST] || uaCH[BRANDS], prevName;
-                    if (brands) {
-                        for (var i=0; i<brands.length; i++) {
-                            var brandName = brands[i].brand || brands[i],
-                                brandVersion = brands[i].version;
-                            if (this.itemType == UA_BROWSER && 
-                                !/not.a.brand/i.test(brandName) && 
-                                (!prevName || 
-                                    (/Chrom/.test(prevName) && brandName != CHROMIUM) || 
-                                    (prevName == EDGE && /WebView2/.test(brandName))
-                                )) {
-                                    brandName = strMapper(brandName, browserHintsMap);
-                                    prevName = this.get(NAME);
-                                    if (!(prevName && !/Chrom/.test(prevName) && /Chrom/.test(brandName))) {
-                                        this.set(NAME, brandName)
-                                            .set(VERSION, brandVersion)
-                                            .set(MAJOR, majorize(brandVersion));
-                                    }
-                                    prevName = brandName;
-                            }
-                            if (this.itemType == UA_ENGINE && brandName == CHROMIUM) {
-                                this.set(VERSION, brandVersion);
-                            }
-                        }
-                    }
-                    break;
-                case UA_CPU:
-                    var archName = uaCH[ARCHITECTURE];
-                    if (archName) {
-                        if (archName && uaCH[BITNESS] == '64') archName += '64';
-                        rgxMapper.call(this.data, archName + ';', rgxMap);
-                    }
-                    break;
-                case UA_DEVICE:
-                    if (uaCH[MOBILE]) {
-                        this.set(TYPE, MOBILE);
-                    }
-                    if (uaCH[MODEL]) {
-                        this.set(MODEL, uaCH[MODEL]);
-                        if (!this.get(TYPE) || !this.get(VENDOR)) {
-                            var reParse = {};
-                            rgxMapper.call(reParse, 'droid 9; ' + uaCH[MODEL] + ')', rgxMap);
-                            if (!this.get(TYPE) && !!reParse.type) {
-                                this.set(TYPE, reParse.type);
-                            }
-                            if (!this.get(VENDOR) && !!reParse.vendor) {
-                                this.set(VENDOR, reParse.vendor);
-                            }
-                        }
-                    }
-                    if (uaCH[FORMFACTORS]) {
-                        var ff;
-                        if (typeof uaCH[FORMFACTORS] !== 'string') {
-                            var idx = 0;
-                            while (!ff && idx < uaCH[FORMFACTORS].length) {
-                                ff = strMapper(uaCH[FORMFACTORS][idx++], formFactorsMap);
-                            }
-                        } else {
-                            ff = strMapper(uaCH[FORMFACTORS], formFactorsMap);
-                        }
-                        this.set(TYPE, ff);
-                    }
-                    break;
-                case UA_OS:
-                    var osName = uaCH[PLATFORM];
-                    if(osName) {
-                        var osVersion = uaCH[PLATFORMVER];
-                        if (osName == WINDOWS) osVersion = (parseInt(majorize(osVersion), 10) >= 13 ? '11' : '10');
-                        this.set(NAME, osName)
-                            .set(VERSION, osVersion);
-                    }
-                    // Xbox-Specific Detection
-                    if (this.get(NAME) == WINDOWS && uaCH[MODEL] == 'Xbox') {
-                        this.set(NAME, 'Xbox')
-                            .set(VERSION, undefined);
-                    }           
-                    break;
-                case UA_RESULT:
-                    var data = this.data;
-                    var parse = function (itemType) {
-                        return data[itemType]
-                                .getItem()
-                                .setCH(uaCH)
-                                .parseCH()
-                                .get();
-                    };
-                    this.set(UA_BROWSER, parse(UA_BROWSER))
-                        .set(UA_CPU, parse(UA_CPU))
-                        .set(UA_DEVICE, parse(UA_DEVICE))
-                        .set(UA_ENGINE, parse(UA_ENGINE))
-                        .set(UA_OS, parse(UA_OS));
-            }
-            return this;
-        };
-
         setProps.call(this, [
             ['itemType', itemType],
             ['ua', ua],
@@ -1368,15 +1200,196 @@
             ['rgxMap', rgxMap],
             ['data', createIData(this, itemType)]
         ]);
-
         return this;
     }
 
+    UAItem.prototype.get = function (prop) {
+        if (!prop) return this.data;
+        return this.data.hasOwnProperty(prop) ? this.data[prop] : undefined;
+    };
+
+    UAItem.prototype.set = function (prop, val) {
+        this.data[prop] = val;
+        return this;
+    };
+
+    UAItem.prototype.setCH = function (ch) {
+        this.uaCH = ch;
+        return this;
+    };
+
+    UAItem.prototype.detectFeature = function () {
+        if (NAVIGATOR && NAVIGATOR.userAgent == this.ua) {
+            switch (this.itemType) {
+                case BROWSER:
+                    // Brave-specific detection
+                    if (NAVIGATOR.brave && typeof NAVIGATOR.brave.isBrave == TYPEOF.FUNCTION) {
+                        this.set(NAME, 'Brave');
+                    }
+                    break;
+                case DEVICE:
+                    // Chrome-specific detection: check for 'mobile' value of navigator.userAgentData
+                    if (!this.get(TYPE) && NAVIGATOR_UADATA && NAVIGATOR_UADATA[MOBILE]) {
+                        this.set(TYPE, MOBILE);
+                    }
+                    // iPadOS-specific detection: identified as Mac, but has some iOS-only properties
+                    if (this.get(MODEL) == 'Macintosh' && NAVIGATOR && typeof NAVIGATOR.standalone !== TYPEOF.UNDEFINED && NAVIGATOR.maxTouchPoints && NAVIGATOR.maxTouchPoints > 2) {
+                        this.set(MODEL, 'iPad')
+                            .set(TYPE, TABLET);
+                    }
+                    break;
+                case OS:
+                    // Chrome-specific detection: check for 'platform' value of navigator.userAgentData
+                    if (!this.get(NAME) && NAVIGATOR_UADATA && NAVIGATOR_UADATA[PLATFORM]) {
+                        this.set(NAME, NAVIGATOR_UADATA[PLATFORM]);
+                    }
+                    break;
+                case RESULT:
+                    var data = this.data;
+                    var detect = function (itemType) {
+                        return data[itemType]
+                                .getItem()
+                                .detectFeature()
+                                .get();
+                    };
+                    this.set(BROWSER, detect(BROWSER))
+                        .set(CPU, detect(CPU))
+                        .set(DEVICE, detect(DEVICE))
+                        .set(ENGINE, detect(ENGINE))
+                        .set(OS, detect(OS));
+            }
+        }
+        return this;
+    };
+
+    UAItem.prototype.parseUA = function () {
+        if (this.itemType != RESULT) {
+            rgxMapper.call(this.data, this.ua, this.rgxMap);
+        }
+        switch (this.itemType) {
+            case BROWSER:
+                this.set(MAJOR, majorize(this.get(VERSION)));
+                break;
+            case OS:
+                if (this.get(NAME) == 'iOS' && this.get(VERSION) == '18.6') {
+                    // Based on the assumption that iOS version is tightly coupled with Safari version
+                    var realVersion = /\) Version\/([\d\.]+)/.exec(this.ua); // Get Safari version
+                    if (realVersion && parseInt(realVersion[1].substring(0,2), 10) >= 26) {
+                        this.set(VERSION, realVersion[1]);  // Set as iOS version
+                    }
+                }
+                break;
+        }
+        return this;
+    };
+
+    UAItem.prototype.parseCH = function () {
+        var uaCH = this.uaCH,
+            rgxMap = this.rgxMap;
+
+        switch (this.itemType) {
+            case BROWSER:
+            case ENGINE:
+                var brands = uaCH[FULLVERLIST] || uaCH[BRANDS], prevName;
+                if (brands) {
+                    for (var i=0; i<brands.length; i++) {
+                        var brandName = brands[i].brand || brands[i],
+                            brandVersion = brands[i].version;
+                        if (this.itemType == BROWSER && 
+                            !/not.a.brand/i.test(brandName) && 
+                            (!prevName || 
+                                (/Chrom/.test(prevName) && brandName != CHROMIUM) || 
+                                (prevName == EDGE && /WebView2/.test(brandName))
+                            )) {
+                                brandName = strMapper(brandName, browserHintsMap);
+                                prevName = this.get(NAME);
+                                if (!(prevName && !/Chrom/.test(prevName) && /Chrom/.test(brandName))) {
+                                    this.set(NAME, brandName)
+                                        .set(VERSION, brandVersion)
+                                        .set(MAJOR, majorize(brandVersion));
+                                }
+                                prevName = brandName;
+                        }
+                        if (this.itemType == ENGINE && brandName == CHROMIUM) {
+                            this.set(VERSION, brandVersion);
+                        }
+                    }
+                }
+                break;
+            case CPU:
+                var archName = uaCH[ARCHITECTURE];
+                if (archName) {
+                    if (archName && uaCH[BITNESS] == '64') archName += '64';
+                    rgxMapper.call(this.data, archName + ';', rgxMap);
+                }
+                break;
+            case DEVICE:
+                if (uaCH[MOBILE]) {
+                    this.set(TYPE, MOBILE);
+                }
+                if (uaCH[MODEL]) {
+                    this.set(MODEL, uaCH[MODEL]);
+                    if (!this.get(TYPE) || !this.get(VENDOR)) {
+                        var reParse = {};
+                        rgxMapper.call(reParse, 'droid 9; ' + uaCH[MODEL] + ')', rgxMap);
+                        if (!this.get(TYPE) && !!reParse.type) {
+                            this.set(TYPE, reParse.type);
+                        }
+                        if (!this.get(VENDOR) && !!reParse.vendor) {
+                            this.set(VENDOR, reParse.vendor);
+                        }
+                    }
+                }
+                if (uaCH[FORMFACTORS]) {
+                    var ff;
+                    if (typeof uaCH[FORMFACTORS] !== 'string') {
+                        var idx = 0;
+                        while (!ff && idx < uaCH[FORMFACTORS].length) {
+                            ff = strMapper(uaCH[FORMFACTORS][idx++], formFactorsMap);
+                        }
+                    } else {
+                        ff = strMapper(uaCH[FORMFACTORS], formFactorsMap);
+                    }
+                    this.set(TYPE, ff);
+                }
+                break;
+            case OS:
+                var osName = uaCH[PLATFORM];
+                if(osName) {
+                    var osVersion = uaCH[PLATFORMVER];
+                    if (osName == WINDOWS) osVersion = (parseInt(majorize(osVersion), 10) >= 13 ? '11' : '10');
+                    this.set(NAME, osName)
+                        .set(VERSION, osVersion);
+                }
+                // Xbox-Specific Detection
+                if (this.get(NAME) == WINDOWS && uaCH[MODEL] == 'Xbox') {
+                    this.set(NAME, 'Xbox')
+                        .set(VERSION, undefined);
+                }           
+                break;
+            case RESULT:
+                var data = this.data;
+                var parse = function (itemType) {
+                    return data[itemType]
+                            .getItem()
+                            .setCH(uaCH)
+                            .parseCH()
+                            .get();
+                };
+                this.set(BROWSER, parse(BROWSER))
+                    .set(CPU, parse(CPU))
+                    .set(DEVICE, parse(DEVICE))
+                    .set(ENGINE, parse(ENGINE))
+                    .set(OS, parse(OS));
+        }
+        return this;
+    };
+
     function UAParser (ua, extensions, headers) {
 
-        if (typeof ua === OBJ_TYPE) {
+        if (typeof ua === TYPEOF.OBJECT) {
             if (isExtensions(ua, true)) {
-                if (typeof extensions === OBJ_TYPE) {
+                if (typeof extensions === TYPEOF.OBJECT) {
                     headers = extensions;               // case UAParser(extensions, headers)           
                 }
                 extensions = ua;                        // case UAParser(extensions)
@@ -1385,13 +1398,13 @@
                 extensions = undefined;
             }
             ua = undefined;
-        } else if (typeof ua === STR_TYPE && !isExtensions(extensions, true)) {
+        } else if (typeof ua === TYPEOF.STRING && !isExtensions(extensions, true)) {
             headers = extensions;                       // case UAParser(ua, headers)
             extensions = undefined;
         }
 
         if (headers) {
-            if (typeof headers.append === FUNC_TYPE) {
+            if (typeof headers.append === TYPEOF.FUNCTION) {
                 // Convert Headers object into a plain object
                 var kv = {};
                 headers.forEach(function (v, k) { kv[String(k).toLowerCase()] = v; });
@@ -1412,7 +1425,7 @@
             return new UAParser(ua, extensions, headers).getResult();
         }
 
-        var userAgent = typeof ua === STR_TYPE ? ua :                                       // Passed user-agent string
+        var userAgent = typeof ua === TYPEOF.STRING ? ua :                                       // Passed user-agent string
                                 (headers && headers[USER_AGENT] ? headers[USER_AGENT] :     // User-Agent from passed headers
                                 ((NAVIGATOR && NAVIGATOR.userAgent) ? NAVIGATOR.userAgent : // navigator.userAgent
                                     EMPTY)),                                                // empty string
@@ -1423,15 +1436,15 @@
                         defaultRegexes,
 
             createItemFunc = function (itemType) {
-                if (itemType == UA_RESULT) {
+                if (itemType == RESULT) {
                     return function () {
                         return new UAItem(itemType, userAgent, regexMap, httpUACH)
                                     .set('ua', userAgent)
-                                    .set(UA_BROWSER, this.getBrowser())
-                                    .set(UA_CPU, this.getCPU())
-                                    .set(UA_DEVICE, this.getDevice())
-                                    .set(UA_ENGINE, this.getEngine())
-                                    .set(UA_OS, this.getOS())
+                                    .set(BROWSER, this.getBrowser())
+                                    .set(CPU, this.getCPU())
+                                    .set(DEVICE, this.getDevice())
+                                    .set(ENGINE, this.getEngine())
+                                    .set(OS, this.getOS())
                                     .get();
                     };
                 } else {
@@ -1445,16 +1458,15 @@
             
         // public methods
         setProps.call(this, [
-            ['getBrowser', createItemFunc(UA_BROWSER)],
-            ['getCPU', createItemFunc(UA_CPU)],
-            ['getDevice', createItemFunc(UA_DEVICE)],
-            ['getEngine', createItemFunc(UA_ENGINE)],
-            ['getOS', createItemFunc(UA_OS)],
-            ['getResult', createItemFunc(UA_RESULT)],
+            ['getBrowser', createItemFunc(BROWSER)],
+            ['getCPU', createItemFunc(CPU)],
+            ['getDevice', createItemFunc(DEVICE)],
+            ['getEngine', createItemFunc(ENGINE)],
+            ['getOS', createItemFunc(OS)],
+            ['getResult', createItemFunc(RESULT)],
             ['getUA', function () { return userAgent; }],
             ['setUA', function (ua) {
-                if (isString(ua))
-                    userAgent = ua.length > UA_MAX_LENGTH ? trim(ua, UA_MAX_LENGTH) : ua;
+                if (isString(ua)) userAgent = trim(ua, UA_MAX_LENGTH);
                 return this;
             }]
         ])
@@ -1474,15 +1486,15 @@
     //////////
 
     // check js environment
-    if (typeof exports !== UNDEF_TYPE) {
+    if (typeof exports !== TYPEOF.UNDEFINED) {
         // nodejs env
-        if (typeof module !== UNDEF_TYPE && module.exports) {
+        if (typeof module !== TYPEOF.UNDEFINED && module.exports) {
             exports = module.exports = UAParser;
         }
         exports.UAParser = UAParser;
     } else {
         // requirejs env (optional)
-        if (typeof define === FUNC_TYPE && define.amd) {
+        if (typeof define === TYPEOF.FUNCTION && define.amd) {
             define(function () {
                 return UAParser;
             });

src/main/ua-parser.mjs

@@ -3,7 +3,7 @@
 // Source: /src/main/ua-parser.js
 
 /////////////////////////////////////////////////////////////////////////////////
-/* UAParser.js v2.0.5
+/* UAParser.js v2.0.7
    Copyright © 2012-2025 Faisal Salman <f@faisalman.com>
    AGPLv3 License *//*
    Detect Browser, Engine, OS, CPU, and Device type/model from User-Agent data.
@@ -21,26 +21,26 @@
     // Constants
     /////////////
 
-    var LIBVERSION  = '2.0.5',
+    var LIBVERSION  = '2.0.7',
         UA_MAX_LENGTH = 500,
         USER_AGENT  = 'user-agent',
         EMPTY       = '',
         UNKNOWN     = '?',
-
-        // typeof
-        FUNC_TYPE   = 'function',
-        UNDEF_TYPE  = 'undefined',
-        OBJ_TYPE    = 'object',
-        STR_TYPE    = 'string',
+        TYPEOF = {
+            FUNCTION    : 'function',
+            OBJECT      : 'object',
+            STRING      : 'string',
+            UNDEFINED   : 'undefined'
+        },
 
         // properties
-        UA_BROWSER  = 'browser',
-        UA_CPU      = 'cpu',
-        UA_DEVICE   = 'device',
-        UA_ENGINE   = 'engine',
-        UA_OS       = 'os',
-        UA_RESULT   = 'result',
-        
+        BROWSER     = 'browser',
+        CPU         = 'cpu',
+        DEVICE      = 'device',
+        ENGINE      = 'engine',
+        OS          = 'os',
+        RESULT      = 'result',
+
         NAME        = 'name',
         TYPE        = 'type',
         VENDOR      = 'vendor',
@@ -68,16 +68,16 @@
         PLATFORM    = 'platform',
         PLATFORMVER = 'platformVersion',
         BITNESS     = 'bitness',
-        CH_HEADER   = 'sec-ch-ua',
-        CH_HEADER_FULL_VER_LIST = CH_HEADER + '-full-version-list',
-        CH_HEADER_ARCH      = CH_HEADER + '-arch',
-        CH_HEADER_BITNESS   = CH_HEADER + '-' + BITNESS,
-        CH_HEADER_FORM_FACTORS = CH_HEADER + '-form-factors',
-        CH_HEADER_MOBILE    = CH_HEADER + '-' + MOBILE,
-        CH_HEADER_MODEL     = CH_HEADER + '-' + MODEL,
-        CH_HEADER_PLATFORM  = CH_HEADER + '-' + PLATFORM,
-        CH_HEADER_PLATFORM_VER = CH_HEADER_PLATFORM + '-version',
-        CH_ALL_VALUES       = [BRANDS, FULLVERLIST, MOBILE, MODEL, PLATFORM, PLATFORMVER, ARCHITECTURE, FORMFACTORS, BITNESS],
+        CH          = 'sec-ch-ua',
+        CH_FULL_VER_LIST= CH + '-full-version-list',
+        CH_ARCH         = CH + '-arch',
+        CH_BITNESS      = CH + '-' + BITNESS,
+        CH_FORM_FACTORS = CH + '-form-factors',
+        CH_MOBILE       = CH + '-' + MOBILE,
+        CH_MODEL        = CH + '-' + MODEL,
+        CH_PLATFORM     = CH + '-' + PLATFORM,
+        CH_PLATFORM_VER = CH_PLATFORM + '-version',
+        CH_ALL_VALUES   = [BRANDS, FULLVERLIST, MOBILE, MODEL, PLATFORM, PLATFORMVER, ARCHITECTURE, FORMFACTORS, BITNESS],
 
         // device vendors
         AMAZON      = 'Amazon',
@@ -116,7 +116,7 @@
         // os
         WINDOWS     = 'Windows';
    
-    var isWindow            = typeof window !== UNDEF_TYPE,
+    var isWindow            = typeof window !== TYPEOF.UNDEFINED,
         NAVIGATOR           = (isWindow && window.navigator) ? 
                                 window.navigator : 
                                 undefined,
@@ -152,7 +152,7 @@
             return enums;
         },
         has = function (str1, str2) {
-            if (typeof str1 === OBJ_TYPE && str1.length > 0) {
+            if (typeof str1 === TYPEOF.OBJECT && str1.length > 0) {
                 for (var i in str1) {
                     if (lowerize(str2) == lowerize(str1[i])) return true;
                 }
@@ -166,7 +166,7 @@
             }
         },
         isString = function (val) {
-            return typeof val === STR_TYPE;
+            return typeof val === TYPEOF.STRING;
         },
         itemListToArray = function (header) {
             if (!header) return undefined;
@@ -193,7 +193,7 @@
                 if (!arr.hasOwnProperty(i)) continue;
 
                 var propName = arr[i];
-                if (typeof propName == OBJ_TYPE && propName.length == 2) {
+                if (typeof propName == TYPEOF.OBJECT && propName.length == 2) {
                     this[propName[0]] = propName[1];
                 } else {
                     this[propName] = undefined;
@@ -208,10 +208,8 @@
             return strip(/\\?\"/g, str); 
         },
         trim = function (str, len) {
-            if (isString(str)) {
-                str = strip(/^\s\s*/, str);
-                return typeof len === UNDEF_TYPE ? str : str.substring(0, UA_MAX_LENGTH);
-            }
+            str = strip(/^\s\s*/, String(str));
+            return typeof len === TYPEOF.UNDEFINED ? str : str.substring(0, len);
     };
 
     ///////////////
@@ -242,9 +240,9 @@
                             match = matches[++k];
                             q = props[p];
                             // check if given property is actually array
-                            if (typeof q === OBJ_TYPE && q.length > 0) {
+                            if (typeof q === TYPEOF.OBJECT && q.length > 0) {
                                 if (q.length === 2) {
-                                    if (typeof q[1] == FUNC_TYPE) {
+                                    if (typeof q[1] == TYPEOF.FUNCTION) {
                                         // assign modified match
                                         this[q[0]] = q[1].call(this, match);
                                     } else {
@@ -253,7 +251,7 @@
                                     }
                                 } else if (q.length >= 3) {
                                     // Check whether q[1] FUNCTION or REGEX
-                                    if (typeof q[1] === FUNC_TYPE && !(q[1].exec && q[1].test)) {
+                                    if (typeof q[1] === TYPEOF.FUNCTION && !(q[1].exec && q[1].test)) {
                                         if (q.length > 3) {
                                             this[q[0]] = match ? q[1].apply(this, q.slice(2)) : undefined;
                                         } else {
@@ -285,7 +283,7 @@
 
             for (var i in map) {
                 // check if current value is array
-                if (typeof map[i] === OBJ_TYPE && map[i].length > 0) {
+                if (typeof map[i] === TYPEOF.OBJECT && map[i].length > 0) {
                     for (var j = 0; j < map[i].length; j++) {
                         if (has(map[i][j], str)) {
                             return (i === UNKNOWN) ? undefined : i;
@@ -379,10 +377,11 @@
             /(avant|iemobile|slim(?:browser|boat|jet))[\/ ]?([\d\.]*)/i,        // Avant/IEMobile/SlimBrowser/SlimBoat/Slimjet
             /(?:ms|\()(ie) ([\w\.]+)/i,                                         // Internet Explorer
 
-            // Blink/Webkit/KHTML based                                         // Flock/RockMelt/Midori/Epiphany/Silk/Skyfire/Bolt/Iron/Iridium/PhantomJS/Bowser/QupZilla/Falkon/LG Browser/Otter/qutebrowser/Dooble
-            /(flock|rockmelt|midori|epiphany|silk|skyfire|ovibrowser|bolt|iron|vivaldi|iridium|phantomjs|bowser|qupzilla|falkon|rekonq|puffin|brave|whale(?!.+naver)|qqbrowserlite|duckduckgo|klar|helio|(?=comodo_)?dragon|otter|dooble|(?:lg |qute)browser)\/([-\w\.]+)/i,
-                                                                                // Rekonq/Puffin/Brave/Whale/QQBrowserLite/QQ//Vivaldi/DuckDuckGo/Klar/Helio/Dragon
-            /(heytap|ovi|115|surf)browser\/([\d\.]+)/i,                         // HeyTap/Ovi/115/Surf
+            // Blink/Webkit/KHTML based                                         // Flock/RockMelt/Midori/Epiphany/Silk/Skyfire/Bolt/Iron/Iridium/PhantomJS/Bowser/QupZilla/Falkon/LG Browser/Otter/qutebrowser/Dooble/Palemoon
+            /(atlas|flock|rockmelt|midori|epiphany|silk|skyfire|ovibrowser|bolt|iron|vivaldi|iridium|phantomjs|bowser|qupzilla|falkon|rekonq|puffin|brave|whale(?!.+naver)|qqbrowserlite|duckduckgo|klar|helio|(?=comodo_)?dragon|otter|dooble|(?:lg |qute)browser|palemoon)\/([-\w\.]+)/i,
+                                                                                // Atlas/Rekonq/Puffin/Brave/Whale/QQBrowserLite/QQ//Vivaldi/DuckDuckGo/Klar/Helio/Dragon
+            /(heytap|ovi|115|surf|qwant)browser\/([\d\.]+)/i,                   // HeyTap/Ovi/115/Surf
+            /(qwant)(?:ios|mobile)\/([\d\.]+)/i,                                // Qwant
             /(ecosia|weibo)(?:__| \w+@)([\d\.]+)/i                              // Ecosia/Weibo
             ], [NAME, VERSION], [
             /quark(?:pc)?\/([-\w\.]+)/i                                         // Quark
@@ -435,7 +434,7 @@
             /(tesla)(?: qtcarbrowser|\/(20\d\d\.[-\w\.]+))/i,                   // Tesla
             /m?(qqbrowser|2345(?=browser|chrome|explorer))\w*[\/ ]?v?([\w\.]+)/i   // QQ/2345
             ], [NAME, VERSION], [
-            /(lbbrowser|rekonq)/i                                               // LieBao Browser/Rekonq
+            /(lbbrowser|rekonq|steam(?= (clie|tenf|gameo)))/i                   // LieBao Browser/Rekonq/Steam
             ], [NAME], [
             /ome\/([\w\.]+) \w* ?(iron) saf/i,                                  // Iron
             /ome\/([\w\.]+).+qihu (360)[es]e/i                                  // 360
@@ -451,6 +450,7 @@
             /\b(line)\/([\w\.]+)\/iab/i,                                        // Line App for Android
             /(alipay)client\/([\w\.]+)/i,                                       // Alipay
             /(twitter)(?:and| f.+e\/([\w\.]+))/i,                               // Twitter
+            /(bing)(?:web|sapphire)\/([\w\.]+)/i,                               // Bing
             /(instagram|snapchat|klarna)[\/ ]([-\w\.]+)/i                       // Instagram/Snapchat/Klarna
             ], [NAME, VERSION, [TYPE, INAPP]], [
             /\bgsa\/([\w\.]+) .*safari\//i                                      // Google Search Appliance on iOS
@@ -508,10 +508,10 @@
             /(swiftfox)/i,                                                      // Swiftfox
             /(icedragon|iceweasel|camino|chimera|fennec|maemo browser|minimo|conkeror)[\/ ]?([\w\.\+]+)/i,
                                                                                 // IceDragon/Iceweasel/Camino/Chimera/Fennec/Maemo/Minimo/Conkeror
-            /(seamonkey|k-meleon|icecat|iceape|firebird|phoenix|palemoon|basilisk|waterfox)\/([-\w\.]+)$/i,
+            /(seamonkey|k-meleon|icecat|iceape|firebird|phoenix|basilisk|waterfox)\/([-\w\.]+)$/i,
                                                                                 // Firefox/SeaMonkey/K-Meleon/IceCat/IceApe/Firebird/Phoenix
             /(firefox)\/([\w\.]+)/i,                                            // Other Firefox-based
-            /(mozilla)\/([\w\.]+) .+rv\:.+gecko\/\d+/i,                         // Mozilla
+            /(mozilla)\/([\w\.]+(?= .+rv\:.+gecko\/\d+)|[0-4][\w\.]+(?!.+compatible))/i, // Mozilla
 
             // Other
             /(amaya|dillo|doris|icab|ladybird|lynx|mosaic|netsurf|obigo|polaris|w3m|(?:go|ice|up)[\. ]?browser)[-\/ ]?v?([\w\.]+)/i,
@@ -549,6 +549,8 @@
             /((ppc|powerpc)(64)?)( mac|;|\))/i,                                 // PowerPC
             /(?:osf1|[freopnt]{3,4}bsd) (alpha)/i                               // Alpha
             ], [[ARCHITECTURE, /ower/, EMPTY, lowerize]], [
+            /mc680.0/i
+            ], [[ARCHITECTURE, '68k']], [
             /winnt.+\[axp/i
             ], [[ARCHITECTURE, 'alpha']]
         ],
@@ -568,11 +570,10 @@
             ], [MODEL, [VENDOR, SAMSUNG], [TYPE, MOBILE]], [
 
             // Apple
-            /(?:\/|\()(ip(?:hone|od)[\w, ]*)(?:\/|;)/i                          // iPod/iPhone
+            /(?:\/|\()(ip(?:hone|od)[\w, ]*)[\/\);]/i                           // iPod/iPhone
             ], [MODEL, [VENDOR, APPLE], [TYPE, MOBILE]], [
-            /\((ipad);[-\w\),; ]+apple/i,                                       // iPad
-            /applecoremedia\/[\w\.]+ \((ipad)/i,
-            /\b(ipad)\d\d?,\d\d?[;\]].+ios/i
+            /\b(?:ios|apple\w+)\/.+[\(\/](ipad)/i,                              // iPad
+            /\b(ipad)[\d,]*[;\] ].+(mac |i(pad)?)os/i
             ], [MODEL, [VENDOR, APPLE], [TYPE, TABLET]], [
             /(macintosh);/i
             ], [MODEL, [VENDOR, APPLE]], [
@@ -590,21 +591,21 @@
             // Huawei
             /\b((?:ag[rs][2356]?k?|bah[234]?|bg[2o]|bt[kv]|cmr|cpn|db[ry]2?|jdn2|got|kob2?k?|mon|pce|scm|sht?|[tw]gr|vrd)-[ad]?[lw][0125][09]b?|605hw|bg2-u03|(?:gem|fdr|m2|ple|t1)-[7a]0[1-4][lu]|t1-a2[13][lw]|mediapad[\w\. ]*(?= bui|\)))\b(?!.+d\/s)/i
             ], [MODEL, [VENDOR, HUAWEI], [TYPE, TABLET]], [
-            /(?:huawei)([-\w ]+)[;\)]/i,
-            /\b(nexus 6p|\w{2,4}e?-[atu]?[ln][\dx][012359c][adn]?)\b(?!.+d\/s)/i
+            /(?:huawei) ?([-\w ]+)[;\)]/i,
+            /\b(nexus 6p|\w{2,4}e?-[atu]?[ln][\dx][\dc][adnt]?)\b(?!.+d\/s)/i
             ], [MODEL, [VENDOR, HUAWEI], [TYPE, MOBILE]], [
 
             // Xiaomi
             /oid[^\)]+; (2[\dbc]{4}(182|283|rp\w{2})[cgl]|m2105k81a?c)(?: bui|\))/i,
-            /\b((?:red)?mi[-_ ]?pad[\w- ]*)(?: bui|\))/i                                // Mi Pad tablets
+            /\b(?:xiao)?((?:red)?mi[-_ ]?pad[\w- ]*)(?: bui|\))/i               // Mi Pad tablets
             ],[[MODEL, /_/g, ' '], [VENDOR, XIAOMI], [TYPE, TABLET]], [
 
-            /\b(poco[\w ]+|m2\d{3}j\d\d[a-z]{2})(?: bui|\))/i,                  // Xiaomi POCO
             /\b; (\w+) build\/hm\1/i,                                           // Xiaomi Hongmi 'numeric' models
             /\b(hm[-_ ]?note?[_ ]?(?:\d\w)?) bui/i,                             // Xiaomi Hongmi
-            /\b(redmi[\-_ ]?(?:note|k)?[\w_ ]+)(?: bui|\))/i,                   // Xiaomi Redmi
-            /oid[^\)]+; (m?[12][0-389][01]\w{3,6}[c-y])( bui|; wv|\))/i,        // Xiaomi Redmi 'numeric' models
-            /\b(mi[-_ ]?(?:a\d|one|one[_ ]plus|note lte|max|cc)?[_ ]?(?:\d?\w?)[_ ]?(?:plus|se|lite|pro)?)(?: bui|\))/i, // Xiaomi Mi
+                                                                                // Xiaomi Redmi / POCO / Black Shark / Qin
+            /oid[^\)]+; (redmi[\-_ ]?(?:note|k)?[\w_ ]+|m?[12]\d[01]\d\w{3,6}|poco[\w ]+|(shark )?\w{3}-[ah]0|qin ?[1-3](s\+|ultra| pro)?)( bui|; wv|\))/i,
+                                                                                // Xiaomi Mi
+            /\b(mi[-_ ]?(?:a\d|one|one[_ ]plus|note|max|cc)?[_ ]?(?:\d{0,2}\w?)[_ ]?(?:plus|se|lite|pro)?( 5g|lte)?)(?: bui|\))/i,
             / ([\w ]+) miui\/v?\d/i
             ], [[MODEL, /_/g, ' '], [VENDOR, XIAOMI], [TYPE, MOBILE]], [
 
@@ -660,7 +661,7 @@
             /(nokia) (t[12][01])/i
             ], [VENDOR, MODEL, [TYPE, TABLET]], [
             /(?:maemo|nokia).*(n900|lumia \d+|rm-\d+)/i,
-            /nokia[-_ ]?(([-\w\. ]*))/i
+            /nokia[-_ ]?(([-\w\. ]*?))( bui|\)|;|\/)/i
             ], [[MODEL, /_/g, ' '], [TYPE, MOBILE], [VENDOR, 'Nokia']], [
 
             // Google
@@ -691,7 +692,7 @@
             /(playbook);[-\w\),; ]+(rim)/i                                      // BlackBerry PlayBook
             ], [MODEL, VENDOR, [TYPE, TABLET]], [
             /\b((?:bb[a-f]|st[hv])100-\d)/i,
-            /\(bb10; (\w+)/i                                                    // BlackBerry 10
+            /(?:blackberry|\(bb10;) (\w+)/i
             ], [MODEL, [VENDOR, BLACKBERRY], [TYPE, MOBILE]], [
 
             // Asus
@@ -771,10 +772,12 @@
 
             /(blackberry|benq|palm(?=\-)|sonyericsson|acer|asus(?! zenw)|dell|jolla|meizu|motorola|polytron|tecno|micromax|advan)[-_ ]?([-\w]*)/i,
                                                                                 // BlackBerry/BenQ/Palm/Sony-Ericsson/Acer/Asus/Dell/Meizu/Motorola/Polytron/Tecno/Micromax/Advan
-            /; (blu|hmd|imo|infinix|lava|oneplus|tcl)[_ ]([\w\+ ]+?)(?: bui|\)|; r)/i,  // BLU/HMD/IMO/Infinix/Lava/OnePlus/TCL
+                                                                                // BLU/HMD/IMO/Infinix/Lava/OnePlus/TCL/Wiko
+            /; (blu|hmd|imo|infinix|lava|oneplus|tcl|wiko)[_ ]([\w\+ ]+?)(?: bui|\)|; r)/i,
             /(hp) ([\w ]+\w)/i,                                                 // HP iPAQ
             /(microsoft); (lumia[\w ]+)/i,                                      // Microsoft Lumia
             /(oppo) ?([\w ]+) bui/i,                                            // OPPO
+            /(hisense) ([ehv][\w ]+)\)/i,                                       // Hisense
             /droid[^;]+; (philips)[_ ]([sv-x][\d]{3,4}[xz]?)/i                  // Philips
             ], [VENDOR, MODEL, [TYPE, MOBILE]], [
 
@@ -851,10 +854,10 @@
             ], [MODEL, [VENDOR, MICROSOFT], [TYPE, CONSOLE]], [
             /(ouya)/i,                                                          // Ouya
             /(nintendo) (\w+)/i,                                                // Nintendo
-            /(retroid) (pocket ([^\)]+))/i                                      // Retroid Pocket
-            ], [VENDOR, MODEL, [TYPE, CONSOLE]], [
-            /droid.+; (shield)( bui|\))/i                                       // Nvidia Portable
-            ], [MODEL, [VENDOR, NVIDIA], [TYPE, CONSOLE]], [
+            /(retroid) (pocket ([^\)]+))/i,                                     // Retroid Pocket
+            /(valve).+(steam deck)/i,
+            /droid.+; ((shield|rgcube|gr0006))( bui|\))/i                       // Nvidia Portable/Anbernic/Logitech
+            ], [[VENDOR, strMapper, { 'Nvidia': 'Shield', 'Anbernic': 'RGCUBE', 'Logitech': 'GR0006' }], MODEL, [TYPE, CONSOLE]], [
 
             ///////////////////
             // WEARABLES
@@ -863,7 +866,7 @@
             /\b(sm-[lr]\d\d[0156][fnuw]?s?|gear live)\b/i                       // Samsung Galaxy Watch
             ], [MODEL, [VENDOR, SAMSUNG], [TYPE, WEARABLE]], [
             /((pebble))app/i,                                                   // Pebble
-            /(asus|google|lg|oppo) ((pixel |zen)?watch[\w ]*)( bui|\))/i        // Asus ZenWatch / LG Watch / Pixel Watch
+            /(asus|google|lg|oppo|xiaomi) ((pixel |zen)?watch[\w ]*)( bui|\))/i // Asus ZenWatch / LG Watch / Pixel Watch / Xiaomi Watch
             ], [VENDOR, MODEL, [TYPE, WEARABLE]], [
             /(ow(?:19|20)?we?[1-3]{1,3})/i                                      // Oppo Watch
             ], [MODEL, [VENDOR, OPPO], [TYPE, WEARABLE]], [
@@ -914,7 +917,7 @@
             ], [MODEL, [TYPE, SMARTTV]], [
             /\b((4k|android|smart|opera)[- ]?tv|tv; rv:|large screen[\w ]+safari)\b/i
             ], [[TYPE, SMARTTV]], [
-            /droid .+?; ([^;]+?)(?: bui|; wv\)|\) applew).+?(mobile|vr|\d) safari/i
+            /droid .+?; ([^;]+?)(?: bui|; wv\)|\) applew|; hmsc).+?(mobile|vr|\d) safari/i
             ], [MODEL, [TYPE, strMapper, { 'mobile' : 'Mobile', 'xr' : 'VR', '*' : TABLET }]], [
             /\b((tablet|tab)[;\/]|focus\/\d(?!.+mobile))/i                      // Unidentifiable Tablet
             ], [[TYPE, TABLET]], [
@@ -967,7 +970,8 @@
 
             // iOS/macOS
             /[adehimnop]{4,7}\b(?:.*os ([\w]+) like mac|; opera)/i,             // iOS
-            /(?:ios;fbsv\/|iphone.+ios[\/ ])([\d\.]+)/i,
+            /(?:ios;fbsv|ios(?=.+ip(?:ad|hone)|.+apple ?tv)|ip(?:ad|hone)(?: |.+i(?:pad)?)os|apple ?tv.+ios)[\/ ]([\w\.]+)/i,
+            /\btvos ?([\w\.]+)/i,
             /cfnetwork\/.+darwin/i
             ], [[VERSION, /_/g, '.'], [NAME, 'iOS']], [
             /(mac os x) ?([\w\. ]*)/i,
@@ -1052,27 +1056,27 @@
     var defaultProps = (function () {
             var props = { init : {}, isIgnore : {}, isIgnoreRgx : {}, toString : {}};
             setProps.call(props.init, [
-                [UA_BROWSER, [NAME, VERSION, MAJOR, TYPE]],
-                [UA_CPU, [ARCHITECTURE]],
-                [UA_DEVICE, [TYPE, MODEL, VENDOR]],
-                [UA_ENGINE, [NAME, VERSION]],
-                [UA_OS, [NAME, VERSION]]
+                [BROWSER, [NAME, VERSION, MAJOR, TYPE]],
+                [CPU, [ARCHITECTURE]],
+                [DEVICE, [TYPE, MODEL, VENDOR]],
+                [ENGINE, [NAME, VERSION]],
+                [OS, [NAME, VERSION]]
             ]);
             setProps.call(props.isIgnore, [
-                [UA_BROWSER, [VERSION, MAJOR]],
-                [UA_ENGINE, [VERSION]],
-                [UA_OS, [VERSION]]
+                [BROWSER, [VERSION, MAJOR]],
+                [ENGINE, [VERSION]],
+                [OS, [VERSION]]
             ]);
             setProps.call(props.isIgnoreRgx, [
-                [UA_BROWSER, / ?browser$/i],
-                [UA_OS, / ?os$/i]
+                [BROWSER, / ?browser$/i],
+                [OS, / ?os$/i]
             ]);
             setProps.call(props.toString, [
-                [UA_BROWSER, [NAME, VERSION]],
-                [UA_CPU, [ARCHITECTURE]],
-                [UA_DEVICE, [VENDOR, MODEL]],
-                [UA_ENGINE, [NAME, VERSION]],
-                [UA_OS, [NAME, VERSION]]
+                [BROWSER, [NAME, VERSION]],
+                [CPU, [ARCHITECTURE]],
+                [DEVICE, [VENDOR, MODEL]],
+                [ENGINE, [NAME, VERSION]],
+                [OS, [NAME, VERSION]]
             ]);
             return props;
     })();
@@ -1116,14 +1120,14 @@
             return item.detectFeature().get();
         };
 
-        if (itemType != UA_RESULT) {
+        if (itemType != RESULT) {
             IData.prototype.is = function (strToCheck) {
                 var is = false;
                 for (var i in this) {
                     if (this.hasOwnProperty(i) && !has(is_ignoreProps, i) && lowerize(is_ignoreRgx ? strip(is_ignoreRgx, this[i]) : this[i]) == lowerize(is_ignoreRgx ? strip(is_ignoreRgx, strToCheck) : strToCheck)) {
                         is = true;
-                        if (strToCheck != UNDEF_TYPE) break;
-                    } else if (strToCheck == UNDEF_TYPE && is) {
+                        if (strToCheck != TYPEOF.UNDEFINED) break;
+                    } else if (strToCheck == TYPEOF.UNDEFINED && is) {
                         is = !is;
                         break;
                     }
@@ -1133,33 +1137,33 @@
             IData.prototype.toString = function () {
                 var str = EMPTY;
                 for (var i in toString_props) {
-                    if (typeof(this[toString_props[i]]) !== UNDEF_TYPE) {
+                    if (typeof(this[toString_props[i]]) !== TYPEOF.UNDEFINED) {
                         str += (str ? ' ' : EMPTY) + this[toString_props[i]];
                     }
                 }
-                return str || UNDEF_TYPE;
+                return str || TYPEOF.UNDEFINED;
             };
         }
 
-        if (!NAVIGATOR_UADATA) {
-            IData.prototype.then = function (cb) { 
-                var that = this;
-                var IDataResolve = function () {
-                    for (var prop in that) {
-                        if (that.hasOwnProperty(prop)) {
-                            this[prop] = that[prop];
-                        }
+        IData.prototype.then = function (cb) { 
+            var that = this;
+            var IDataResolve = function () {
+                for (var prop in that) {
+                    if (that.hasOwnProperty(prop)) {
+                        this[prop] = that[prop];
                     }
-                };
-                IDataResolve.prototype = {
-                    is : IData.prototype.is,
-                    toString : IData.prototype.toString
-                };
-                var resolveData = new IDataResolve();
-                cb(resolveData);
-                return resolveData;
+                }
             };
-        }
+            IDataResolve.prototype = {
+                is : IData.prototype.is,
+                toString : IData.prototype.toString,
+                withClientHints : IData.prototype.withClientHints,
+                withFeatureCheck : IData.prototype.withFeatureCheck
+            };
+            var resolveData = new IDataResolve();
+            cb(resolveData);
+            return resolveData;
+        };
 
         return new IData();
     };
@@ -1173,196 +1177,24 @@
         setProps.call(this, CH_ALL_VALUES);
         if (isHttpUACH) {
             setProps.call(this, [
-                [BRANDS, itemListToArray(uach[CH_HEADER])],
-                [FULLVERLIST, itemListToArray(uach[CH_HEADER_FULL_VER_LIST])],
-                [MOBILE, /\?1/.test(uach[CH_HEADER_MOBILE])],
-                [MODEL, stripQuotes(uach[CH_HEADER_MODEL])],
-                [PLATFORM, stripQuotes(uach[CH_HEADER_PLATFORM])],
-                [PLATFORMVER, stripQuotes(uach[CH_HEADER_PLATFORM_VER])],
-                [ARCHITECTURE, stripQuotes(uach[CH_HEADER_ARCH])],
-                [FORMFACTORS, itemListToArray(uach[CH_HEADER_FORM_FACTORS])],
-                [BITNESS, stripQuotes(uach[CH_HEADER_BITNESS])]
+                [BRANDS, itemListToArray(uach[CH])],
+                [FULLVERLIST, itemListToArray(uach[CH_FULL_VER_LIST])],
+                [MOBILE, /\?1/.test(uach[CH_MOBILE])],
+                [MODEL, stripQuotes(uach[CH_MODEL])],
+                [PLATFORM, stripQuotes(uach[CH_PLATFORM])],
+                [PLATFORMVER, stripQuotes(uach[CH_PLATFORM_VER])],
+                [ARCHITECTURE, stripQuotes(uach[CH_ARCH])],
+                [FORMFACTORS, itemListToArray(uach[CH_FORM_FACTORS])],
+                [BITNESS, stripQuotes(uach[CH_BITNESS])]
             ]);
         } else {
             for (var prop in uach) {
-                if(this.hasOwnProperty(prop) && typeof uach[prop] !== UNDEF_TYPE) this[prop] = uach[prop];
+                if(this.hasOwnProperty(prop) && typeof uach[prop] !== TYPEOF.UNDEFINED) this[prop] = uach[prop];
             }
         }
     }
 
     function UAItem (itemType, ua, rgxMap, uaCH) {
-
-        this.get = function (prop) {
-            if (!prop) return this.data;
-            return this.data.hasOwnProperty(prop) ? this.data[prop] : undefined;
-        };
-
-        this.set = function (prop, val) {
-            this.data[prop] = val;
-            return this;
-        };
-
-        this.setCH = function (ch) {
-            this.uaCH = ch;
-            return this;
-        };
-
-        this.detectFeature = function () {
-            if (NAVIGATOR && NAVIGATOR.userAgent == this.ua) {
-                switch (this.itemType) {
-                    case UA_BROWSER:
-                        // Brave-specific detection
-                        if (NAVIGATOR.brave && typeof NAVIGATOR.brave.isBrave == FUNC_TYPE) {
-                            this.set(NAME, 'Brave');
-                        }
-                        break;
-                    case UA_DEVICE:
-                        // Chrome-specific detection: check for 'mobile' value of navigator.userAgentData
-                        if (!this.get(TYPE) && NAVIGATOR_UADATA && NAVIGATOR_UADATA[MOBILE]) {
-                            this.set(TYPE, MOBILE);
-                        }
-                        // iPadOS-specific detection: identified as Mac, but has some iOS-only properties
-                        if (this.get(MODEL) == 'Macintosh' && NAVIGATOR && typeof NAVIGATOR.standalone !== UNDEF_TYPE && NAVIGATOR.maxTouchPoints && NAVIGATOR.maxTouchPoints > 2) {
-                            this.set(MODEL, 'iPad')
-                                .set(TYPE, TABLET);
-                        }
-                        break;
-                    case UA_OS:
-                        // Chrome-specific detection: check for 'platform' value of navigator.userAgentData
-                        if (!this.get(NAME) && NAVIGATOR_UADATA && NAVIGATOR_UADATA[PLATFORM]) {
-                            this.set(NAME, NAVIGATOR_UADATA[PLATFORM]);
-                        }
-                        break;
-                    case UA_RESULT:
-                        var data = this.data;
-                        var detect = function (itemType) {
-                            return data[itemType]
-                                    .getItem()
-                                    .detectFeature()
-                                    .get();
-                        };
-                        this.set(UA_BROWSER, detect(UA_BROWSER))
-                            .set(UA_CPU, detect(UA_CPU))
-                            .set(UA_DEVICE, detect(UA_DEVICE))
-                            .set(UA_ENGINE, detect(UA_ENGINE))
-                            .set(UA_OS, detect(UA_OS));
-                }
-            }
-            return this;
-        };
-
-        this.parseUA = function () {
-            if (this.itemType != UA_RESULT) {
-                rgxMapper.call(this.data, this.ua, this.rgxMap);
-            }
-            if (this.itemType == UA_BROWSER) {
-                this.set(MAJOR, majorize(this.get(VERSION)));
-            }
-            return this;
-        };
-
-        this.parseCH = function () {
-            var uaCH = this.uaCH,
-                rgxMap = this.rgxMap;
-    
-            switch (this.itemType) {
-                case UA_BROWSER:
-                case UA_ENGINE:
-                    var brands = uaCH[FULLVERLIST] || uaCH[BRANDS], prevName;
-                    if (brands) {
-                        for (var i=0; i<brands.length; i++) {
-                            var brandName = brands[i].brand || brands[i],
-                                brandVersion = brands[i].version;
-                            if (this.itemType == UA_BROWSER && 
-                                !/not.a.brand/i.test(brandName) && 
-                                (!prevName || 
-                                    (/Chrom/.test(prevName) && brandName != CHROMIUM) || 
-                                    (prevName == EDGE && /WebView2/.test(brandName))
-                                )) {
-                                    brandName = strMapper(brandName, browserHintsMap);
-                                    prevName = this.get(NAME);
-                                    if (!(prevName && !/Chrom/.test(prevName) && /Chrom/.test(brandName))) {
-                                        this.set(NAME, brandName)
-                                            .set(VERSION, brandVersion)
-                                            .set(MAJOR, majorize(brandVersion));
-                                    }
-                                    prevName = brandName;
-                            }
-                            if (this.itemType == UA_ENGINE && brandName == CHROMIUM) {
-                                this.set(VERSION, brandVersion);
-                            }
-                        }
-                    }
-                    break;
-                case UA_CPU:
-                    var archName = uaCH[ARCHITECTURE];
-                    if (archName) {
-                        if (archName && uaCH[BITNESS] == '64') archName += '64';
-                        rgxMapper.call(this.data, archName + ';', rgxMap);
-                    }
-                    break;
-                case UA_DEVICE:
-                    if (uaCH[MOBILE]) {
-                        this.set(TYPE, MOBILE);
-                    }
-                    if (uaCH[MODEL]) {
-                        this.set(MODEL, uaCH[MODEL]);
-                        if (!this.get(TYPE) || !this.get(VENDOR)) {
-                            var reParse = {};
-                            rgxMapper.call(reParse, 'droid 9; ' + uaCH[MODEL] + ')', rgxMap);
-                            if (!this.get(TYPE) && !!reParse.type) {
-                                this.set(TYPE, reParse.type);
-                            }
-                            if (!this.get(VENDOR) && !!reParse.vendor) {
-                                this.set(VENDOR, reParse.vendor);
-                            }
-                        }
-                    }
-                    if (uaCH[FORMFACTORS]) {
-                        var ff;
-                        if (typeof uaCH[FORMFACTORS] !== 'string') {
-                            var idx = 0;
-                            while (!ff && idx < uaCH[FORMFACTORS].length) {
-                                ff = strMapper(uaCH[FORMFACTORS][idx++], formFactorsMap);
-                            }
-                        } else {
-                            ff = strMapper(uaCH[FORMFACTORS], formFactorsMap);
-                        }
-                        this.set(TYPE, ff);
-                    }
-                    break;
-                case UA_OS:
-                    var osName = uaCH[PLATFORM];
-                    if(osName) {
-                        var osVersion = uaCH[PLATFORMVER];
-                        if (osName == WINDOWS) osVersion = (parseInt(majorize(osVersion), 10) >= 13 ? '11' : '10');
-                        this.set(NAME, osName)
-                            .set(VERSION, osVersion);
-                    }
-                    // Xbox-Specific Detection
-                    if (this.get(NAME) == WINDOWS && uaCH[MODEL] == 'Xbox') {
-                        this.set(NAME, 'Xbox')
-                            .set(VERSION, undefined);
-                    }           
-                    break;
-                case UA_RESULT:
-                    var data = this.data;
-                    var parse = function (itemType) {
-                        return data[itemType]
-                                .getItem()
-                                .setCH(uaCH)
-                                .parseCH()
-                                .get();
-                    };
-                    this.set(UA_BROWSER, parse(UA_BROWSER))
-                        .set(UA_CPU, parse(UA_CPU))
-                        .set(UA_DEVICE, parse(UA_DEVICE))
-                        .set(UA_ENGINE, parse(UA_ENGINE))
-                        .set(UA_OS, parse(UA_OS));
-            }
-            return this;
-        };
-
         setProps.call(this, [
             ['itemType', itemType],
             ['ua', ua],
@@ -1370,15 +1202,196 @@
             ['rgxMap', rgxMap],
             ['data', createIData(this, itemType)]
         ]);
-
         return this;
     }
 
+    UAItem.prototype.get = function (prop) {
+        if (!prop) return this.data;
+        return this.data.hasOwnProperty(prop) ? this.data[prop] : undefined;
+    };
+
+    UAItem.prototype.set = function (prop, val) {
+        this.data[prop] = val;
+        return this;
+    };
+
+    UAItem.prototype.setCH = function (ch) {
+        this.uaCH = ch;
+        return this;
+    };
+
+    UAItem.prototype.detectFeature = function () {
+        if (NAVIGATOR && NAVIGATOR.userAgent == this.ua) {
+            switch (this.itemType) {
+                case BROWSER:
+                    // Brave-specific detection
+                    if (NAVIGATOR.brave && typeof NAVIGATOR.brave.isBrave == TYPEOF.FUNCTION) {
+                        this.set(NAME, 'Brave');
+                    }
+                    break;
+                case DEVICE:
+                    // Chrome-specific detection: check for 'mobile' value of navigator.userAgentData
+                    if (!this.get(TYPE) && NAVIGATOR_UADATA && NAVIGATOR_UADATA[MOBILE]) {
+                        this.set(TYPE, MOBILE);
+                    }
+                    // iPadOS-specific detection: identified as Mac, but has some iOS-only properties
+                    if (this.get(MODEL) == 'Macintosh' && NAVIGATOR && typeof NAVIGATOR.standalone !== TYPEOF.UNDEFINED && NAVIGATOR.maxTouchPoints && NAVIGATOR.maxTouchPoints > 2) {
+                        this.set(MODEL, 'iPad')
+                            .set(TYPE, TABLET);
+                    }
+                    break;
+                case OS:
+                    // Chrome-specific detection: check for 'platform' value of navigator.userAgentData
+                    if (!this.get(NAME) && NAVIGATOR_UADATA && NAVIGATOR_UADATA[PLATFORM]) {
+                        this.set(NAME, NAVIGATOR_UADATA[PLATFORM]);
+                    }
+                    break;
+                case RESULT:
+                    var data = this.data;
+                    var detect = function (itemType) {
+                        return data[itemType]
+                                .getItem()
+                                .detectFeature()
+                                .get();
+                    };
+                    this.set(BROWSER, detect(BROWSER))
+                        .set(CPU, detect(CPU))
+                        .set(DEVICE, detect(DEVICE))
+                        .set(ENGINE, detect(ENGINE))
+                        .set(OS, detect(OS));
+            }
+        }
+        return this;
+    };
+
+    UAItem.prototype.parseUA = function () {
+        if (this.itemType != RESULT) {
+            rgxMapper.call(this.data, this.ua, this.rgxMap);
+        }
+        switch (this.itemType) {
+            case BROWSER:
+                this.set(MAJOR, majorize(this.get(VERSION)));
+                break;
+            case OS:
+                if (this.get(NAME) == 'iOS' && this.get(VERSION) == '18.6') {
+                    // Based on the assumption that iOS version is tightly coupled with Safari version
+                    var realVersion = /\) Version\/([\d\.]+)/.exec(this.ua); // Get Safari version
+                    if (realVersion && parseInt(realVersion[1].substring(0,2), 10) >= 26) {
+                        this.set(VERSION, realVersion[1]);  // Set as iOS version
+                    }
+                }
+                break;
+        }
+        return this;
+    };
+
+    UAItem.prototype.parseCH = function () {
+        var uaCH = this.uaCH,
+            rgxMap = this.rgxMap;
+
+        switch (this.itemType) {
+            case BROWSER:
+            case ENGINE:
+                var brands = uaCH[FULLVERLIST] || uaCH[BRANDS], prevName;
+                if (brands) {
+                    for (var i=0; i<brands.length; i++) {
+                        var brandName = brands[i].brand || brands[i],
+                            brandVersion = brands[i].version;
+                        if (this.itemType == BROWSER && 
+                            !/not.a.brand/i.test(brandName) && 
+                            (!prevName || 
+                                (/Chrom/.test(prevName) && brandName != CHROMIUM) || 
+                                (prevName == EDGE && /WebView2/.test(brandName))
+                            )) {
+                                brandName = strMapper(brandName, browserHintsMap);
+                                prevName = this.get(NAME);
+                                if (!(prevName && !/Chrom/.test(prevName) && /Chrom/.test(brandName))) {
+                                    this.set(NAME, brandName)
+                                        .set(VERSION, brandVersion)
+                                        .set(MAJOR, majorize(brandVersion));
+                                }
+                                prevName = brandName;
+                        }
+                        if (this.itemType == ENGINE && brandName == CHROMIUM) {
+                            this.set(VERSION, brandVersion);
+                        }
+                    }
+                }
+                break;
+            case CPU:
+                var archName = uaCH[ARCHITECTURE];
+                if (archName) {
+                    if (archName && uaCH[BITNESS] == '64') archName += '64';
+                    rgxMapper.call(this.data, archName + ';', rgxMap);
+                }
+                break;
+            case DEVICE:
+                if (uaCH[MOBILE]) {
+                    this.set(TYPE, MOBILE);
+                }
+                if (uaCH[MODEL]) {
+                    this.set(MODEL, uaCH[MODEL]);
+                    if (!this.get(TYPE) || !this.get(VENDOR)) {
+                        var reParse = {};
+                        rgxMapper.call(reParse, 'droid 9; ' + uaCH[MODEL] + ')', rgxMap);
+                        if (!this.get(TYPE) && !!reParse.type) {
+                            this.set(TYPE, reParse.type);
+                        }
+                        if (!this.get(VENDOR) && !!reParse.vendor) {
+                            this.set(VENDOR, reParse.vendor);
+                        }
+                    }
+                }
+                if (uaCH[FORMFACTORS]) {
+                    var ff;
+                    if (typeof uaCH[FORMFACTORS] !== 'string') {
+                        var idx = 0;
+                        while (!ff && idx < uaCH[FORMFACTORS].length) {
+                            ff = strMapper(uaCH[FORMFACTORS][idx++], formFactorsMap);
+                        }
+                    } else {
+                        ff = strMapper(uaCH[FORMFACTORS], formFactorsMap);
+                    }
+                    this.set(TYPE, ff);
+                }
+                break;
+            case OS:
+                var osName = uaCH[PLATFORM];
+                if(osName) {
+                    var osVersion = uaCH[PLATFORMVER];
+                    if (osName == WINDOWS) osVersion = (parseInt(majorize(osVersion), 10) >= 13 ? '11' : '10');
+                    this.set(NAME, osName)
+                        .set(VERSION, osVersion);
+                }
+                // Xbox-Specific Detection
+                if (this.get(NAME) == WINDOWS && uaCH[MODEL] == 'Xbox') {
+                    this.set(NAME, 'Xbox')
+                        .set(VERSION, undefined);
+                }           
+                break;
+            case RESULT:
+                var data = this.data;
+                var parse = function (itemType) {
+                    return data[itemType]
+                            .getItem()
+                            .setCH(uaCH)
+                            .parseCH()
+                            .get();
+                };
+                this.set(BROWSER, parse(BROWSER))
+                    .set(CPU, parse(CPU))
+                    .set(DEVICE, parse(DEVICE))
+                    .set(ENGINE, parse(ENGINE))
+                    .set(OS, parse(OS));
+        }
+        return this;
+    };
+
     function UAParser (ua, extensions, headers) {
 
-        if (typeof ua === OBJ_TYPE) {
+        if (typeof ua === TYPEOF.OBJECT) {
             if (isExtensions(ua, true)) {
-                if (typeof extensions === OBJ_TYPE) {
+                if (typeof extensions === TYPEOF.OBJECT) {
                     headers = extensions;               // case UAParser(extensions, headers)           
                 }
                 extensions = ua;                        // case UAParser(extensions)
@@ -1387,13 +1400,13 @@
                 extensions = undefined;
             }
             ua = undefined;
-        } else if (typeof ua === STR_TYPE && !isExtensions(extensions, true)) {
+        } else if (typeof ua === TYPEOF.STRING && !isExtensions(extensions, true)) {
             headers = extensions;                       // case UAParser(ua, headers)
             extensions = undefined;
         }
 
         if (headers) {
-            if (typeof headers.append === FUNC_TYPE) {
+            if (typeof headers.append === TYPEOF.FUNCTION) {
                 // Convert Headers object into a plain object
                 var kv = {};
                 headers.forEach(function (v, k) { kv[String(k).toLowerCase()] = v; });
@@ -1414,7 +1427,7 @@
             return new UAParser(ua, extensions, headers).getResult();
         }
 
-        var userAgent = typeof ua === STR_TYPE ? ua :                                       // Passed user-agent string
+        var userAgent = typeof ua === TYPEOF.STRING ? ua :                                       // Passed user-agent string
                                 (headers && headers[USER_AGENT] ? headers[USER_AGENT] :     // User-Agent from passed headers
                                 ((NAVIGATOR && NAVIGATOR.userAgent) ? NAVIGATOR.userAgent : // navigator.userAgent
                                     EMPTY)),                                                // empty string
@@ -1425,15 +1438,15 @@
                         defaultRegexes,
 
             createItemFunc = function (itemType) {
-                if (itemType == UA_RESULT) {
+                if (itemType == RESULT) {
                     return function () {
                         return new UAItem(itemType, userAgent, regexMap, httpUACH)
                                     .set('ua', userAgent)
-                                    .set(UA_BROWSER, this.getBrowser())
-                                    .set(UA_CPU, this.getCPU())
-                                    .set(UA_DEVICE, this.getDevice())
-                                    .set(UA_ENGINE, this.getEngine())
-                                    .set(UA_OS, this.getOS())
+                                    .set(BROWSER, this.getBrowser())
+                                    .set(CPU, this.getCPU())
+                                    .set(DEVICE, this.getDevice())
+                                    .set(ENGINE, this.getEngine())
+                                    .set(OS, this.getOS())
                                     .get();
                     };
                 } else {
@@ -1447,16 +1460,15 @@
             
         // public methods
         setProps.call(this, [
-            ['getBrowser', createItemFunc(UA_BROWSER)],
-            ['getCPU', createItemFunc(UA_CPU)],
-            ['getDevice', createItemFunc(UA_DEVICE)],
-            ['getEngine', createItemFunc(UA_ENGINE)],
-            ['getOS', createItemFunc(UA_OS)],
-            ['getResult', createItemFunc(UA_RESULT)],
+            ['getBrowser', createItemFunc(BROWSER)],
+            ['getCPU', createItemFunc(CPU)],
+            ['getDevice', createItemFunc(DEVICE)],
+            ['getEngine', createItemFunc(ENGINE)],
+            ['getOS', createItemFunc(OS)],
+            ['getResult', createItemFunc(RESULT)],
             ['getUA', function () { return userAgent; }],
             ['setUA', function (ua) {
-                if (isString(ua))
-                    userAgent = ua.length > UA_MAX_LENGTH ? trim(ua, UA_MAX_LENGTH) : ua;
+                if (isString(ua)) userAgent = trim(ua, UA_MAX_LENGTH);
                 return this;
             }]
         ])

test/data/ua/browser/browser-all.json

@@ -171,6 +171,16 @@
             "major"   : "0"
         }
     },
+    {
+        "desc"    : "Atlas",
+        "ua"      : "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/141.0.0.0 Safari/537.36 Atlas/1.0",
+        "expect"  :
+        {
+            "name"    : "Atlas",
+            "version" : "1.0",
+            "major"   : "1"
+        }
+    },
     {
         "desc"    : "Avant",
         "ua"      : "Mozilla/4.0 (compatible; MSIE 8.0; Windows NT 5.1; Trident/4.0; GTB5; Avant Browser; .NET CLR 1.1.4322; .NET CLR 2.0.50727)",
@@ -271,6 +281,26 @@
             "major"   : "11"
         }
     },
+    {
+        "desc"    : "Bing",
+        "ua"      : "Mozilla/5.0 (iPhone; CPU iPhone OS 18_5 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/18.5 Mobile/15E148 Safari/605.1.15 BingSapphire/31.8.430522001",
+        "expect"  :
+        {
+            "name"    : "Bing",
+            "version" : "31.8.430522001",
+            "major"   : "31"
+        }
+    },
+    {
+        "desc"    : "Bing",
+        "ua"      : "Mozilla/5.0 (Linux; Android 9; MIX 2 Build/PKQ1.190118.001; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/100.0.4893.0 Mobile Safari/537.36 BingWeb/6.9.12",
+        "expect"  :
+        {
+            "name"    : "Bing",
+            "version" : "6.9.12",
+            "major"   : "6"
+        }
+    },
     {
         "desc"    : "Blazer",
         "ua"      : "Mozilla/4.0 (compatible; MSIE 6.0; Windows 98; PalmSource/hspr-H102; Blazer/4.0) 16;320x320",
@@ -611,6 +641,16 @@
             "major"   : "55"
         }
     },
+    {
+        "desc"    : "PaleMoon",
+        "ua"      : "(Windows NT 6.2; WOW64) KHTML/4.11 Gecko/20130308 Firefox/23.0 (PaleMoon/20.3)",
+        "expect"  :
+        {
+            "name"    : "PaleMoon",
+            "version" : "20.3",
+            "major"   : "20"
+        }
+    },
     {
         "desc"    : "PaleMoon",
         "ua"      : "Mozilla/5.0 (X11; Linux x86_64; rv:52.9) Gecko/20100101 Goanna/3.4 Firefox/52.9 PaleMoon/27.6.1",
@@ -1338,6 +1378,16 @@
             "major"   : "5"
         }
     },
+    {
+        "desc"    : "Mozilla",
+        "ua"      : "Mozilla/2.02 [fr] (WinNT; I)",
+        "expect"  :
+        {
+            "name"    : "Mozilla",
+            "version" : "2.02",
+            "major"   : "2"
+        }
+    },
     {
         "desc"    : "MSIE",
         "ua"      : "Mozilla/4.0 (compatible; MSIE 5.0b1; Mac_PowerPC)",
@@ -1688,6 +1738,36 @@
             "major"   : "2"
         }
     },
+    {
+        "desc"    : "Qwant",
+        "ua"      : "Mozilla/5.0 (iPhone; CPU iPhone OS 16_1_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) QwantMobile/6.7.6 Mobile/15E148 Safari/605.1.15",
+        "expect"  :
+        {
+            "name"    : "Qwant",
+            "version" : "6.7.6",
+            "major"   : "6"
+        }
+    },
+    {
+        "desc"    : "Qwant",
+        "ua"      : "QwantMobile/2.0 (Android 8.0.0; Mobile; rv:59.0) Gecko/59.0 Firefox/59.0 QwantBrowser/59.0",
+        "expect"  :
+        {
+            "name"    : "Qwant",
+            "version" : "59.0",
+            "major"   : "59"
+        }
+    },
+    {
+        "desc"    : "Qwant",
+        "ua"      : "QwantMobile/2.0 (iPad; CPU OS 15_8_3 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) QwantiOS/2.7.0b1 Mobile/15E148 Safari/605.1.15",
+        "expect"  :
+        {
+            "name"    : "Qwant",
+            "version" : "2.0",
+            "major"   : "2"
+        }
+    },
     {
         "desc"    : "Rekonq 2",
         "ua"      : "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.21 (KHTML, like Gecko) rekonq/2.2.1 Safari/537.21",
@@ -1879,6 +1959,36 @@
             "major"   : "20"
         }
     },
+    {
+        "desc"    : "Steam Client",
+        "ua"      : "Mozilla/5.0 (X11; Linux x86_64; Valve Steam Client/default/1705108172) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/85.0.4183.121 Safari/537.36",
+        "expect"  :
+        {
+            "name"    : "Steam",
+            "version" : "undefined",
+            "major"   : "undefined"
+        }
+    },
+    {
+        "desc"    : "Steam Big Picture",
+        "ua"      : "Mozilla/5.0 (Linux; U; X11; en-US; Valve Steam Tenfoot/1660688177; ) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/84.0.4147.105 Safari/537.36",
+        "expect"  :
+        {
+            "name"    : "Steam",
+            "version" : "undefined",
+            "major"   : "undefined"
+        }
+    },
+    {
+        "desc"    : "Steam Overlay",
+        "ua"      : "Mozilla/5.0 (Windows NT 10.0; Win64; x64; Valve Steam GameOverlay/default/1741737356) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/126.0.6478.183 Safari/537.36",
+        "expect"  :
+        {
+            "name"    : "Steam",
+            "version" : "undefined",
+            "major"   : "undefined"
+        }
+    },
     {
         "desc"    : "Swiftfox",
         "ua"      : "Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.8.1) Gecko/20061024 Firefox/2.0 (Swiftfox)",

test/data/ua/cpu/cpu-all.json

@@ -289,7 +289,15 @@
     },
     {
         "desc"    : "68k",
-        "ua"      : "'Mozilla/1.1 (Macintosh; U; 68K)'",
+        "ua"      : "Mozilla/1.1 (Macintosh; U; 68K)",
+        "expect"  : 
+        {
+            "architecture"  : "68k"
+        }
+    },
+    {
+        "desc"    : "MC680x0",
+        "ua"      : "AmigaVoyager/3.2 (AmigaOS/MC680x0)",
         "expect"  : 
         {
             "architecture"  : "68k"

test/data/ua/device/anbernic.json

@@ -0,0 +1,11 @@
+[
+    {
+        "desc": "Anbernic",
+        "ua": "Mozilla/5.0 (Linux; Android 13; RGCUBE) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Mobile Safari/537.36",
+        "expect": {
+            "vendor": "Anbernic",
+            "model": "RGCUBE",
+            "type": "console"
+        }
+    }
+]

test/data/ua/device/apple.json

@@ -44,6 +44,105 @@
             "type": "tablet"
         }
     },
+    {
+        "desc": "iPad using Chrome",
+        "ua": "Mozilla/5.0 (iPad13,10; CPU OS 16_6_2 like Mac OS X) AppleWebKit/602.3 (KHTML, like Gecko) CriOS/97.0.0.5927.72 Mobile/11S296 Safari/602.3",
+        "expect": {
+            "vendor": "Apple",
+            "model": "iPad",
+            "type": "tablet"
+        }
+    },
+    {
+        "desc": "iPad using DuckDuckGo",
+        "ua": "Mozilla/5.0 (iPad; iPad13,6 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) DuckDuckGo/130.0.0.0 Mobile/15E148 Safari/604.1",
+        "expect": {
+            "vendor": "Apple",
+            "model": "iPad",
+            "type": "tablet"
+        }
+    },
+    {
+        "desc": "iPad using Discord",
+        "ua": "Discord/52.0 (iPad; iOS 14.4; Scale/2.00)",
+        "expect": {
+            "vendor": "Apple",
+            "model": "iPad",
+            "type": "tablet"
+        }
+    },
+    {
+        "desc": "iPad using Firefox",
+        "ua": "Mozilla/5.0 (iPad; iPad14,2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Firefox/120.0 Mobile/15E148 Safari/604.1",
+        "expect": {
+            "vendor": "Apple",
+            "model": "iPad",
+            "type": "tablet"
+        }
+    },
+    {
+        "desc": "iPad using iTunes",
+        "ua": "itunesstored/1.0 iOS/15.6.1 model/iPad13,8 hwp/t8103 build/19G82 (5; dt:238)",
+        "expect": {
+            "vendor": "Apple",
+            "model": "iPad",
+            "type": "tablet"
+        }
+    },
+    {
+        "desc": "iPad using MS OneNote",
+        "ua": "Microsoft Office OneNote/16.81/240108 (iOS/16.5.1; Tablet; AppStore; Apple/iPad8,3)",
+        "expect": {
+            "vendor": "Apple",
+            "model": "iPad",
+            "type": "tablet"
+        }
+    },
+    {
+        "desc": "iPad using MS Word",
+        "ua": "Microsoft Office Word/2.44.1211 (iOS/13.7; Tablet; es-MX; AppStore; Apple/iPad11,3)",
+        "expect": {
+            "vendor": "Apple",
+            "model": "iPad",
+            "type": "tablet"
+        }
+    },
+    {
+        "desc": "iPad using Quora",
+        "ua": "Quora 8.4.30 rv:3230 env:prod (iPad11,3; iPadOS 17.7; en_GB) AppleWebKit",
+        "expect": {
+            "vendor": "Apple",
+            "model": "iPad",
+            "type": "tablet"
+        }
+    },
+    {
+        "desc": "iPad using TuneIn Radio",
+        "ua": "TuneIn Radio/27.1.0; iPad6,3; iPadOS/16.6",
+        "expect": {
+            "vendor": "Apple",
+            "model": "iPad",
+            "type": "tablet"
+        }
+    },
+    {
+        "desc": "iPad using TuneIn Radio Pro",
+        "ua": "TuneIn Radio Pro/21.4.1; iPad8,9; iOS/15.0",
+        "expect": {
+            "vendor": "Apple",
+            "model": "iPad",
+            "type": "tablet"
+        }
+    },
+    {
+        "desc": "iPad using YouTube",
+        "ua": "com.google.ios.youtube/20.31.6 (iPad13,5; U; CPU iPadOS 18_6 like Mac OS X; en_US)",
+        "expect": {
+            "vendor": "Apple",
+            "model": "iPad",
+            "type": "tablet"
+        }
+    },
     {
         "desc": "iPod",
         "ua": "Mozilla/5.0 (iPod touch; CPU iPhone OS 7_0_4 like Mac OS X) AppleWebKit/537.51.1 (KHTML, like Gecko) Version/7.0 Mobile/11B554a Safari/9537.53",
@@ -62,6 +161,15 @@
             "type": "mobile"
         }
     },
+    {
+        "desc": "iPhone using Spotify",
+        "ua": "Spotify/8.7.70 iOS/16.0 (iPhone15,3)",
+        "expect": {
+            "vendor": "Apple",
+            "model": "iPhone15,3",
+            "type": "mobile"
+        }
+    },
     {
         "desc": "iPhone SE",
         "ua": "Mozilla/5.0 (iPhone; CPU iPhone OS 13_3_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148 [FBAN/FBIOS;FBDV/iPhone8,4;FBMD/iPhone;FBSN/iOS;FBSV/13.3.1;FBSS/2;FBID/phone;FBLC/en_US;FBOP/5;FBCR/]",

test/data/ua/device/blackberry.json

@@ -1,7 +1,25 @@
 [
+    {
+        "desc": "BlackBerry 9650",
+        "ua": "Mozilla/5.0 (BlackBerry; U; BlackBerry 9650; en-US) AppleWebKit/534.8+ (KHTML, like Gecko) Version/6.0.0.524 Mobile Safari/534.8+",
+        "expect": {
+            "vendor": "BlackBerry",
+            "model": "9650",
+            "type": "mobile"
+        }
+    },
+    {
+        "desc": "BlackBerry 9780",
+        "ua": "Mozilla/5.0 (BlackBerry; U; BlackBerry 9780; en) AppleWebKit/534.8+ (KHTML, like Gecko) Version/6.0.0.546 Mobile Safari/534.8+",
+        "expect": {
+            "vendor": "BlackBerry",
+            "model": "9780",
+            "type": "mobile"
+        }
+    },
     {
         "desc": "BlackBerry Priv",
-        "ua": "User-Agent: Mozilla/5.0 (Linux; Android 5.1.1; STV100-1 Build/LMY47V; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/46.0.2490.76 Mobile Safari/537.36",
+        "ua": "Mozilla/5.0 (Linux; Android 5.1.1; STV100-1 Build/LMY47V; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/46.0.2490.76 Mobile Safari/537.36",
         "expect": {
             "vendor": "BlackBerry",
             "model": "STV100-1",
@@ -28,7 +46,7 @@
     },
     {
         "desc": "BlackBerry Key2 LE",
-        "ua": "User-Agent: Mozilla/5.0 (Linux; Android 8.1.0; BBE100-1 Build/OPM1.171019.026) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/69.0.3497 Mobile Safari/537.36",
+        "ua": "Mozilla/5.0 (Linux; Android 8.1.0; BBE100-1 Build/OPM1.171019.026) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/69.0.3497 Mobile Safari/537.36",
         "expect": {
             "vendor": "BlackBerry",
             "model": "BBE100-1",

test/data/ua/device/hisense.json

@@ -0,0 +1,20 @@
+[
+    {
+        "desc": "Hisense E50 Lite",
+        "ua": "Mozilla/5.0 (Linux; Android 11; Hisense E50 Lite) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/106.0.5249.126 Mobile Safari/537.36",
+        "expect": {
+            "vendor": "Hisense",
+            "model": "E50 Lite",
+            "type": "mobile"
+        }
+    },
+    {
+        "desc": "Hisense V40s",
+        "ua": "Mozilla/5.0 (Linux; Android 11; Hisense V40s) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/105.0.5195.125 Mobile Safari/537.36",
+        "expect": {
+            "vendor": "Hisense",
+            "model": "V40s",
+            "type": "mobile"
+        }
+    }
+]

test/data/ua/device/huawei.json

@@ -701,6 +701,15 @@
             "type": "mobile"
         }
     },
+    {
+        "desc": "Huawei P10 Lite",
+        "ua": "Mozilla/5.0 (Linux; Android 8.0.0; WAS-L03T) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/107.0.5199.205 Mobile Safari/537.36",
+        "expect": {
+            "vendor": "Huawei",
+            "model": "WAS-L03T",
+            "type": "mobile"
+        }
+    },
     {
         "desc": "Huawei P20 Lite",
         "ua": "Mozilla/5.0 (Linux; Android 8.0.0; ANE-LX1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/75.0.3770.143 Mobile Safari/537.36",
@@ -728,6 +737,15 @@
             "type": "mobile"
         }
     },
+    {
+        "desc": "Huawei P30",
+        "ua": "Mozilla/5.0 (Linux; Android 10; ELE-L04) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/91.0.4472.109 Mobile Safari/537.36",
+        "expect": {
+            "vendor": "Huawei",
+            "model": "ELE-L04",
+            "type": "mobile"
+        }
+    },
     {
         "desc": "Huawei P30",
         "ua": "Mozilla/5.0 (Linux; Android 9; ELE-L29) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/73.0.3683.90 Mobile Safari/537.36",
@@ -782,6 +800,15 @@
             "type": "mobile"
         }
     },
+    {
+        "desc": "Huawei Nova",
+        "ua": "Mozilla/5.0 (Linux; Android 7.0; HUAWEI CAN-L13) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/106.0.5113.212 Mobile Safari/537.36",
+        "expect": {
+            "vendor": "Huawei",
+            "model": "CAN-L13",
+            "type": "mobile"
+        }
+    },
     {
         "desc": "Huawei Nova 5T",
         "ua": "Mozilla/5.0 (Linux; Android 10; YAL-L21) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/80.0.3987.132 Mobile Safari/537.36",
@@ -899,6 +926,15 @@
             "type": "mobile"
         }
     },
+    {
+        "desc": "Huawei Y7p",
+        "ua": "Mozilla/5.0 (Linux; Android 10; ART-L28; HMSCore 6.8.0.311) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/92.0.4476.0 HuaweiBrowser/12.1.2.312 Mobile Safari/537.36",
+        "expect": {
+            "vendor": "Huawei",
+            "model": "ART-L28",
+            "type": "mobile"
+        }
+    },
     {
         "desc": "Huawei Y7p",
         "ua": "Mozilla/5.0 (Linux; Android 9; ART-L29) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.92 Mobile Safari/537.36",

test/data/ua/device/logitech.json

@@ -0,0 +1,11 @@
+[
+    {
+        "desc": "Logitech",
+        "ua": "Dalvik/2.1.0 (Linux; U; Android 11; GR0006 Build/SQ02K.00.0018)",
+        "expect": {
+            "vendor": "Logitech",
+            "model": "GR0006",
+            "type": "console"
+        }
+    }
+]

test/data/ua/device/nokia.json

@@ -1,4 +1,13 @@
 [
+    {
+        "desc": "Nokia 1",
+        "ua": "Mozilla/5.0 (Linux; Android 10; Nokia 1 Build/QP1A.190711.020) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/107.0.5304.15 Mobile Safari/537.36",
+        "expect": {
+            "vendor": "Nokia",
+            "model": "1",
+            "type": "mobile"
+        }
+    },
     {
         "desc": "Nokia3xx",
         "ua": "Nokia303/14.87 CLDC-1.1",

test/data/ua/device/valve.json

@@ -0,0 +1,11 @@
+[
+    {
+        "desc": "Valve",
+        "ua": "Mozilla/5.0 (X11; Linux x86_64; Valve Steam Client/Steam Deck [Steam Deck Beta]/default/0) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/126.0.6478.183 Safari/537.36",
+        "expect": {
+            "vendor": "Valve",
+            "model": "Steam Deck",
+            "type": "console"
+        }
+    }
+]

test/data/ua/device/wiko.json

@@ -0,0 +1,29 @@
+[
+    {
+        "desc": "Wiko Life 3",
+        "ua": "Mozilla/5.0 (Linux; Android 11; Wiko U316AT) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/107.0.5199.205 Mobile Safari/537.36",
+        "expect": {
+            "vendor": "Wiko",
+            "model": "U316AT",
+            "type": "mobile"
+        }
+    },
+    {
+        "desc": "Wiko Ride 3",
+        "ua": "Mozilla/5.0 (Linux; Android 11; Wiko U614AS) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/88.0.4324.181 Mobile Safari/537.36",
+        "expect": {
+            "vendor": "Wiko",
+            "model": "U614AS",
+            "type": "mobile"
+        }
+    },
+    {
+        "desc": "Wiko T10",
+        "ua": "Mozilla/5.0 (Linux; Android 11; WIKO T10 Build/RP1A.200720.011) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/107.0.5304.62 Mobile Safari/537.36",
+        "expect": {
+            "vendor": "WIKO",
+            "model": "T10",
+            "type": "mobile"
+        }
+    }
+]

test/data/ua/device/xiaomi.json

@@ -71,6 +71,51 @@
             "type": "mobile"
         }
     },
+    {
+        "desc": "XiaoMi Black Shark 3",
+        "ua": "Mozilla/5.0 (Linux; U; Android 11; zh-CN; SHARK KLE-A0 Build/KLEN2211210CN00MR6) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/100.0.4896.58 UCBrowser/17.3.8.1369 Mobile Safari/537.36",
+        "expect": {
+            "vendor": "Xiaomi",
+            "model": "SHARK KLE-A0",
+            "type": "mobile"
+        }
+    },
+    {
+        "desc": "XiaoMi Black Shark 4",
+        "ua": "Mozilla/5.0 (Linux; U; Android 11; en-US; SHARK PRS-H0 Build/PROS2203060OS00MP5) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/78.0.3904.108 UCBrowser/13.4.0.1306 Mobile Safari/537.36",
+        "expect": {
+            "vendor": "Xiaomi",
+            "model": "SHARK PRS-H0",
+            "type": "mobile"
+        }
+    },
+    {
+        "desc": "XiaoMi Black Shark 4 Pro",
+        "ua": "Mozilla/5.0 (Linux; U; Android 11; es-us; SHARK KSR-H0 Build/KASE2208050OS00MP4) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/100.0.4896.127 Mobile Safari/537.36 XiaoMi/MiuiBrowser/13.22.1-gn",
+        "expect": {
+            "vendor": "Xiaomi",
+            "model": "SHARK KSR-H0",
+            "type": "mobile"
+        }
+    },
+    {
+        "desc": "XiaoMi Black Shark 5",
+        "ua": "Mozilla/5.0 (Linux; arm_64; Android 12; SHARK PAR-H0) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/112.0.0.0 YaBrowser/23.5.0.256.00 SA/3 Mobile Safari/537.36",
+        "expect": {
+            "vendor": "Xiaomi",
+            "model": "SHARK PAR-H0",
+            "type": "mobile"
+        }
+    },
+    {
+        "desc": "XiaoMi Civi 5 Pro",
+        "ua": "Mozilla/5.0 (Linux; U; Android 15; zh-CN; 25067PYE3C Build/AQ3A.250129.001) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/100.0.4896.58 UCBrowser/18.0.4.1430 Mobile Safari/537.36",
+        "expect": {
+            "vendor": "Xiaomi",
+            "model": "25067PYE3C",
+            "type": "mobile"
+        }
+    },
     {
         "desc": "Xiaomi Hongmi Note 1W",
         "ua": "Mozilla/5.0 (Linux; U; Android 4.2.2; zh-CN; HM NOTE 1W Build/JDQ39) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 UCBrowser/9.7.9.439 U3/0.8.0 Mobile Safari/533.1",
@@ -116,6 +161,15 @@
             "type": "mobile"
         }
     },
+    {
+        "desc": "Xiaomi Mi 11 Lite 5G",
+        "ua": "Mozilla/5.0 (Linux; U; Android 12; zh-CN; Mi 11 Lite 5G Build/SKQ1.211006.001) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/100.0.4896.136 Mobile Safari/537.36 XiaoMi/MiuiBrowser/13.17.0-gn",
+        "expect": {
+            "vendor": "Xiaomi",
+            "model": "Mi 11 Lite 5G",
+            "type": "mobile"
+        }
+    },
     {
         "desc": "Xiaomi Mi 5s Plus",
         "ua": "Mozilla/5.0 (Linux; U; Android 6.0.1; zh-cn; MI 5s Plus Build/MXB48T) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/53.0.2785.146 Mobile Safari/537.36 XiaoMi/MiuiBrowser/8.7.1",
@@ -188,6 +242,15 @@
             "type": "mobile"
         }
     },
+    {
+        "desc": "Xiaomi Mi 10T",
+        "ua": "Mozilla/5.0 (Linux; U; Android 12; fr-CA; Mi 10T Build/SKQ1.211006.001) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/100.0.4896.79 Mobile Safari/537.36 XiaoMi/MiuiBrowser/13.16.1-gn",
+        "expect": {
+            "vendor": "Xiaomi",
+            "model": "Mi 10T",
+            "type": "mobile"
+        }
+    },
     {
         "desc": "Xiaomi Mi A2",
         "ua": "Mozilla/5.0 (Linux; Android 9; Mi A2) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/76.0.3809.132 Mobile Safari/537.36",
@@ -314,6 +377,15 @@
             "type": "tablet"
         }
     },
+    {
+        "desc": "Xiaomi Pad 5",
+        "ua": "Mozilla/5.0 (Linux; U; Android 12; ca-ES; Xiaomi Pad 5 Build/SKQ1.220303.001) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/89.0.4389.86 Mobile Safari/537.36 XiaoMi/MiuiBrowser/13.6.0-gn",
+        "expect": {
+            "vendor": "Xiaomi",
+            "model": "mi Pad 5",
+            "type": "tablet"
+        }
+    },
     {
         "desc": "Xiaomi Pad 6S Pro 12.4",
         "ua": "Mozilla/5.0 (Linux; Android 14; 24018RPACC) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/110.0.0.0 Safari/537.36",
@@ -386,6 +458,42 @@
             "type": "mobile"
         }
     },
+    {
+        "desc": "Xiaomi Qin 1s+",
+        "ua": "Mozilla/5.0 (Linux; U; Android 4.4.4; Qin 1s+ Build/KTU84P; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/33.0.0.0 Mobile Safari/537.36 OPR/46.0.2254.145391",
+        "expect": {
+            "vendor": "Xiaomi",
+            "model": "Qin 1s+",
+            "type": "mobile"
+        }
+    },
+    {
+        "desc": "Xiaomi Qin 2",
+        "ua": "Mozilla/5.0 (Linux; Android 9; Qin 2) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/80.0.3987.162 Mobile Safari/537.36",
+        "expect": {
+            "vendor": "Xiaomi",
+            "model": "Qin 2",
+            "type": "mobile"
+        }
+    },
+    {
+        "desc": "Xiaomi Qin 2 Pro",
+        "ua": "Mozilla/5.0 (Linux; Android 9.0; QIN2 Pro) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/86.0.4215.0 Mobile Safari/537.36 EdgA/86.0.597.0",
+        "expect": {
+            "vendor": "Xiaomi",
+            "model": "QIN2 Pro",
+            "type": "mobile"
+        }
+    },
+    {
+        "desc": "Xiaomi Qin 3 Ultra",
+        "ua": "Mozilla/5.0 (Linux; Android 12; QIN3ULTRA Build/SP1A.210812.016; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/128.0.6613.120 Mobile Safari/537.36",
+        "expect": {
+            "vendor": "Xiaomi",
+            "model": "QIN3ULTRA",
+            "type": "mobile"
+        }
+    },
     {
         "desc": "Xiaomi Redmi 4A",
         "ua": "Mozilla/5.0 (Linux; Android 6.0; Redmi 4A Build/MMB29M; xx-xx) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/56.0.2924.87 Mobile Safari/537.36",
@@ -404,6 +512,15 @@
             "type": "mobile"
         }
     },
+    {
+        "desc": "Xiaomi Redmi 15",
+        "ua": "Mozilla/5.0 (Linux; Android 15; 25062RN2DA Build/AQ3A.250226.002; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/142.0.7444.212 Mobile Safari/537.36 [FB_IAB/FB4A;FBAV/541.0.0.49.79;IABMV/1;]",
+        "expect": {
+            "vendor": "Xiaomi",
+            "model": "25062RN2DA",
+            "type": "mobile"
+        }
+    },
     {
         "desc": "Xiaomi Redmi K30 5G",
         "ua": "Mozilla/5.0 (Linux; Android 10; Redmi K30 5G) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/78.0.3904.96 Mobile Safari/537.36",
@@ -458,6 +575,15 @@
             "type": "mobile"
         }
     },
+    {
+        "desc": "XiaoMi Redmi Note 10 Lite",
+        "ua": "Mozilla/5.0 (Linux; U; Android 12; es-VE; Mi Note 10 Lite Build/SKQ1.210908.001) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/100.0.4896.88 Mobile Safari/537.36 XiaoMi/MiuiBrowser/13.16.1-gn",
+        "expect": {
+            "vendor": "Xiaomi",
+            "model": "Mi Note 10 Lite",
+            "type": "mobile"
+        }
+    },
     {
         "desc": "XiaoMi Redmi Note 10 Pro",
         "ua": "Mozilla/5.0 (Linux; Android 13; M2101K6P) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/107.0.0.0 Mobile Safari/537.36",
@@ -565,5 +691,14 @@
             "model": "MIBOX3",
             "type": "smarttv"
         }
+    },
+    {
+        "desc": "Xiaomi Watch 2 Pro",
+        "ua": "Dalvik/2.1.0 (Linux; U; Android 13; Xiaomi Watch 2 Pro Build/TWR7.231031.001.XM064S)",
+        "expect": {
+            "vendor": "Xiaomi",
+            "model": "Watch 2 Pro",
+            "type": "wearable"
+        }
     }
 ]

test/data/ua/extension/crawler.json

@@ -965,7 +965,7 @@
         "ua"      : "Mozilla/5.0 (compatible; Qwantbot-news/2.0;  +https://help.qwant.com/bot/)",
         "expect"  :
         {
-            "name"    : "Qwantbot",
+            "name"    : "Qwantbot-news",
             "version" : "2.0",
             "type"    : "crawler"
         }
@@ -1100,6 +1100,26 @@
             "type"    : "crawler"
         }
     },
+    {
+        "desc"    : "SurdotlyBot",
+        "ua"      : "Mozilla/5.0 (compatible; SurdotlyBot/1.0; +http://sur.ly/bot.html)",
+        "expect"  :
+        {
+            "name"    : "SurdotlyBot",
+            "version" : "1.0",
+            "type"    : "crawler"
+        }
+    },
+    {
+        "desc"    : "Swiftbot",
+        "ua"      : "Swiftbot/1.0 (swiftype.com)",
+        "expect"  :
+        {
+            "name"    : "Swiftbot",
+            "version" : "1.0",
+            "type"    : "crawler"
+        }
+    },
     {
         "desc"    : "Teoma",
         "ua"      : "Mozilla/2.0 (compatible; Ask Jeeves/Teoma; +http://sp.ask.com/docs/about/tech_crawling.html)",

test/data/ua/extension/fetcher.json

@@ -51,7 +51,7 @@
     },
     {
         "desc"    : "Blueno",
-        "ua"      : "acebookexternalhit/1.1 (compatible; Blueno/1.0; +http://naver.me/scrap)",
+        "ua"      : "facebookexternalhit/1.1 (compatible; Blueno/1.0; +http://naver.me/scrap)",
         "expect"  :
         {
             "name"    : "Blueno",
@@ -119,6 +119,16 @@
             "type"    : "fetcher"
         }
     },
+    {
+        "desc"    : "Discordbot",
+        "ua"      : "Mozilla/5.0 (compatible; Discordbot/2.0; +https://discordapp.com)",
+        "expect"  :
+        {
+            "name"    : "Discordbot",
+            "version" : "2.0",
+            "type"    : "fetcher"
+        }
+    },
     {
         "desc"    : "DuckAssistBot",
         "ua"      : "DuckAssistBot/1.2; (+http://duckduckgo.com/duckassistbot.html)",
@@ -239,6 +249,16 @@
             "type"    : "fetcher"
         }
     },
+    {
+        "desc"    : "KeybaseBot",
+        "ua"      : "Mozilla/5.0 (compatible; KeybaseBot; +https://keybase.io)",
+        "expect"  :
+        {
+            "name"    : "KeybaseBot",
+            "version" : "undefined",
+            "type"    : "fetcher"
+        }
+    },
     {
         "desc"    : "Meta-ExternalFetcher",
         "ua"      : "meta-externalfetcher/1.1 (+https://developers.facebook.com/docs/sharing/webmasters/crawler)",
@@ -269,6 +289,16 @@
             "type"    : "fetcher"
         }
     },
+    {
+        "desc"    : "NovaAct",
+        "ua"      : "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/115.0.0.0 Safari/537.36 Agent-NovaAct/0.9",
+        "expect"  :
+        {
+            "name"    : "NovaAct",
+            "version" : "0.9",
+            "type"    : "fetcher"
+        }
+    },
     {
         "desc"    : "Perplexity-User",
         "ua"      : "Mozilla/5.0 AppleWebKit/537.36 (KHTML, like Gecko; compatible; Perplexity-User/1.0; +https://perplexity.ai/perplexity-user)",
@@ -309,6 +339,36 @@
             "type"    : "fetcher"
         }
     },
+    {
+        "desc"    : "Slack-ImgProxy",
+        "ua"      : "Slack-ImgProxy 0.19 (+https://api.slack.com/robots)",
+        "expect"  :
+        {
+            "name"    : "Slack-ImgProxy",
+            "version" : "0.19",
+            "type"    : "fetcher"
+        }
+    },
+    {
+        "desc"    : "Slackbot",
+        "ua"      : "Slackbot 1.0 (+https://api.slack.com/robots)",
+        "expect"  :
+        {
+            "name"    : "Slackbot",
+            "version" : "1.0",
+            "type"    : "fetcher"
+        }
+    },
+    {
+        "desc"    : "Slackbot-LinkExpanding",
+        "ua"      : "Slackbot-LinkExpanding 1.0 (+https://api.slack.com/robots)",
+        "expect"  :
+        {
+            "name"    : "Slackbot-LinkExpanding",
+            "version" : "1.0",
+            "type"    : "fetcher"
+        }
+    },
     {
         "desc"    : "Snap URL Preview",
         "ua"      : "Snap URL Preview Service; bot; snapchat; https://developers.snap.com/robots  ",
@@ -339,6 +399,16 @@
             "type"    : "fetcher"
         }
     },
+    {
+        "desc"    : "Twitterbot",
+        "ua"      : "Twitterbot/1.0",
+        "expect"  :
+        {
+            "name"    : "Twitterbot",
+            "version" : "1.0",
+            "type"    : "fetcher"
+        }
+    },
     {
         "desc"    : "UptimeRobot",
         "ua"      : "Mozilla/5.0 (compatible; UptimeRobot/2.0; http://www.uptimerobot.com/)",

test/data/ua/extension/library.json

@@ -39,6 +39,36 @@
             "type"    : "library"
         }
     },
+    {
+        "desc"    : "Bun",
+        "ua"      : "Bun/1.0.6",
+        "expect"  :
+        {
+            "name"    : "Bun",
+            "version" : "1.0.6",
+            "type"    : "library"
+        }
+    },
+    {
+        "desc"    : "Dart",
+        "ua"      : "Dart/3.5 (dart:io)",
+        "expect"  :
+        {
+            "name"    : "Dart",
+            "version" : "3.5",
+            "type"    : "library"
+        }
+    },
+    {
+        "desc"    : "Deno",
+        "ua"      : "Deno/2.1.7",
+        "expect"  :
+        {
+            "name"    : "Deno",
+            "version" : "2.1.7",
+            "type"    : "library"
+        }
+    },
     {
         "desc"    : "go-http-client",
         "ua"      : "go-http-client/1.1",
@@ -59,6 +89,16 @@
             "type"    : "library"
         }
     },
+    {
+        "desc"    : "hackney",
+        "ua"      : "hackney/1.20.1",
+        "expect"  :
+        {
+            "name"    : "hackney",
+            "version" : "1.20.1",
+            "type"    : "library"
+        }
+    },
     {
         "desc"    : "GuzzleHttp",
         "ua"      : "GuzzleHttp/6.5.5 curl/7.70.0 PHP/7.4.22",
@@ -129,6 +169,26 @@
             "type"    : "library"
         }
     },
+    {
+        "desc"    : "Node.js",
+        "ua"      : "Node.js/22",
+        "expect"  :
+        {
+            "name"    : "Node.js",
+            "version" : "22",
+            "type"    : "library"
+        }
+    },
+    {
+        "desc"    : "node-fetch",
+        "ua"      : "node-fetch/1.0 (+https://github.com/bitinn/node-fetch)",
+        "expect"  :
+        {
+            "name"    : "node-fetch",
+            "version" : "1.0",
+            "type"    : "library"
+        }
+    },
     {
         "desc"    : "Nutch",
         "ua"      : "AliyunSecBot/Nutch-1.21-SNAPSHOT",
@@ -149,16 +209,6 @@
             "type"    : "library"
         }
     },
-    {
-        "desc"    : "node-fetch",
-        "ua"      : "node-fetch/1.0 (+https://github.com/bitinn/node-fetch)",
-        "expect"  :
-        {
-            "name"    : "node-fetch",
-            "version" : "1.0",
-            "type"    : "library"
-        }
-    },
     {
         "desc"    : "PHP-SOAP",
         "ua"      : "PHP-SOAP/7.4.33",
@@ -219,6 +269,16 @@
             "type"    : "library"
         }
     },
+    {
+        "desc"    : "rest-client",
+        "ua"      : "rest-client/2.1.0 (linux-gnu x86_64) ruby/2.7.2p137",
+        "expect"  :
+        {
+            "name"    : "rest-client",
+            "version" : "2.1.0",
+            "type"    : "library"
+        }
+    },
     {
         "desc"    : "Scrapy",
         "ua"      : "Scrapy/1.5.0 (+https://scrapy.org)",
@@ -238,5 +298,15 @@
             "version" : "5.0.2",
             "type"    : "library"
         }
+    },
+    {
+        "desc"    : "undici",
+        "ua"      : "undici",
+        "expect"  :
+        {
+            "name"    : "undici",
+            "version" : "undefined",
+            "type"    : "library"
+        }
     }
 ]

test/data/ua/os/ios.json

@@ -1,4 +1,22 @@
 [
+    {
+        "desc"    : "iOS 18.6",
+        "ua"      : "Mozilla/5.0 (iPhone; CPU iPhone OS 18_6 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/18.6 Mobile/15E148 Safari/604.1",
+        "expect"  :
+        {
+            "name"    : "iOS",
+            "version" : "18.6"
+        }
+    },
+    {
+        "desc"    : "iOS 26",
+        "ua"      : "Mozilla/5.0 (iPhone; CPU iPhone OS 18_6 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/26.0 Mobile/15E148 Safari/604.1",
+        "expect"  :
+        {
+            "name"    : "iOS",
+            "version" : "26.0"
+        }
+    },
     {
         "desc"    : "iOS in App",
         "ua"      : "AppName/version CFNetwork/version Darwin/version",
@@ -17,6 +35,15 @@
             "version" : "5.1.1"
         }
     },
+    {
+        "desc"    : "iOS with DuckDuckGo",
+        "ua"      : "Mozilla/5.0 (iPhone; CPU iPhone OS 18_7 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/26.0 Mobile/15E148 Safari/604.1 Ddg/26.0",
+        "expect"  :
+        {
+            "name"    : "iOS",
+            "version" : "18.7"
+        }
+    },
     {
         "desc"    : "iOS with Opera Mini",
         "ua"      : "Opera/9.80 (iPhone; Opera Mini/7.1.32694/27.1407; U; en) Presto/2.8.119 Version/11.10",
@@ -35,6 +62,33 @@
             "version" : "13.6.1"
         }
     },
+    {
+        "desc": "iOS with Instagram",
+        "ua": "Instagram 5.0.2 (iPhone5,1; iPhone OS 7_0_4; en_US; en) AppleWebKit/420+",
+        "expect":
+        {
+            "name"    : "iOS",
+            "version" : "7.0.4"
+        }
+    },
+    {
+        "desc": "iOS with MS Word App",
+        "ua": "Microsoft Office Word/2.44.1211 (iOS/13.7; Tablet; es-MX; AppStore; Apple/iPad11,3)",
+        "expect":
+        {
+            "name"    : "iOS",
+            "version" : "13.7"
+        }
+    },
+    {
+        "desc": "iOS with Quora App",
+        "ua": "Quora 8.4.30 rv:3230 env:prod (iPad11,3; iPadOS 17.7; en_GB) AppleWebKit",
+        "expect":
+        {
+            "name"    : "iOS",
+            "version" : "17.7"
+        }
+    },
     {
         "desc": "iOS with Slack App",
         "ua": "com.tinyspeck.chatlyio/23.04.10 (iPhone; iOS 16.4.1; Scale/3.00)",
@@ -44,6 +98,33 @@
             "version" : "16.4.1"
         }
     },
+    {
+        "desc": "iOS with Snapchat",
+        "ua": "Snapchat/12.12.1.40 (iPhone15,2; iOS 16.2; gzip)",
+        "expect":
+        {
+            "name"    : "iOS",
+            "version" : "16.2"
+        }
+    },
+    {
+        "desc": "iOS with Spotify App",
+        "ua": "Spotify/8.7.70 iOS/16.0 (iPhone15,3)",
+        "expect":
+        {
+            "name"    : "iOS",
+            "version" : "16.0"
+        }
+    },
+    {
+        "desc": "iOS with TuneIn Radio App",
+        "ua": "TuneIn Radio/27.1.0; iPad6,3; iPadOS/16.6",
+        "expect":
+        {
+            "name"    : "iOS",
+            "version" : "16.6"
+        }
+    },
     {
         "desc"    : "iOS BE App",
         "ua"      : "APP-BE Test/1.0 (iPad; Apple; CPU iPhone OS 7_0_2 like Mac OS X)",
@@ -61,5 +142,41 @@
             "name"    : "iOS",
             "version" : "11.2.5"
         }
+    },
+    {
+        "desc": "iOS",
+        "ua": "iPlayTV/3.3.9 (Apple TV; iOS 16.1; Scale/1.00)",
+        "expect"  :
+        {
+            "name"    : "iOS",
+            "version" : "16.1"
+        }
+    },
+    {
+        "desc": "iOS",
+        "ua": "itunesstored/1.0 iOS/8.4.4 AppleTV/7.8 model/AppleTV3,2 build/12H937 (3; dt:12)",
+        "expect"  :
+        {
+            "name"    : "iOS",
+            "version" : "8.4.4"
+        }
+    },
+    {
+        "desc": "tvOS",
+        "ua": "iMPlayer/1.6.1 (tvOS 26.0.1)",
+        "expect"  :
+        {
+            "name"    : "iOS",
+            "version" : "26.0.1"
+        }
+    },
+    {
+        "desc": "tvOS",
+        "ua": "otg/1.5.1 (AppleTv Apple TV 4; tvOS16.2; appletv.client) libcurl/7.58.0 OpenSSL/1.0.2o zlib/1.2.11 clib/1.8.56",
+        "expect"  :
+        {
+            "name"    : "iOS",
+            "version" : "16.2"
+        }
     }
 ]

test/e2e/browser.spec.mjs

@@ -152,3 +152,45 @@ test.describe('request.headers can be passed in form of a Headers object', () =>
         expect(uap.ua).toBe('myBrowser/1.0');
     });
 });
+
+test.describe('Chaining withFeatureCheck() & withClientHints() in client-side development', () => {
+
+    test('Chain', async ({ page, browserName }) => {   
+        await page.addInitScript((browserName) => {
+            Object.defineProperty(navigator, 'userAgent', {
+                value: 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/16.0 Safari/605.1.15'
+            });
+            Object.defineProperty(navigator, 'standalone', {
+                value: true
+            });
+            Object.defineProperty(navigator, 'maxTouchPoints', {
+                value: 3
+            });
+            if (browserName == 'chromium') {
+                Object.defineProperty(navigator, 'userAgentData', {
+                    value: {
+                        brands: [],
+                        platform: '',
+                        mobile: false,
+                        getHighEntropyValues: () => {
+                            return Promise.resolve({
+                                formFactors: 'VR'
+                            });
+                        }
+                    }
+                });
+            }
+        }, browserName);
+        await page.goto(localHtml);
+        // @ts-ignore
+        const fc2ch = await page.evaluate(async () => await UAParser().withFeatureCheck().then(res => res.withClientHints()));
+        const ch2fc = await page.evaluate(async () => await UAParser().withClientHints().then(res => res.withFeatureCheck()));
+        if (browserName == 'chromium') {
+            expect(fc2ch).toHaveProperty('device.type', 'xr');      // overwrite by client hints
+            expect(ch2fc).toHaveProperty('device.type', 'tablet');  // overwrite by feature check
+        } else {
+            expect(fc2ch).toHaveProperty('device.type', 'tablet');  // no client hints found
+            expect(ch2fc).toHaveProperty('device.type', 'tablet');
+        }
+    });
+});

test/unit/cli/cli.spec.js

@@ -0,0 +1,37 @@
+const assert = require('node:assert');
+const { exec } = require('node:child_process');
+const fs = require('node:fs');
+const { UAParser } = require('../../../src/main/ua-parser');
+const uap = new UAParser();
+
+const input = [
+    'Opera/9.25 (Windows NT 6.0; U; ru)',
+    'Mozilla/4.0 (compatible; MSIE 5.5; Windows NT)'
+];
+const output = input.map(x => uap.setUA(x).getResult());
+
+describe('npx ua-parser-js <string>', () => {
+    it ('print result to stdout', () => {
+        exec('npx ua-parser-js "TEST"', (err, stdout, stderr) => {
+            assert.deepEqual(JSON.parse(stdout), JSON.parse(JSON.stringify([uap.setUA("TEST").getResult()])));
+        });
+    })
+});
+
+describe('npx ua-parser-js --input-file=<filepath>', () => {
+    it ('load file and print result to stdout', () => {
+        exec('npx ua-parser-js --input-file="../test/unit/cli/input.txt"', (err, stdout, stderr) => {
+            assert.deepEqual(JSON.parse(stdout), JSON.parse(JSON.stringify(output)));
+        });
+    });
+});
+
+describe('npx ua-parser-js --input-file=<filepath> --output-file=<filepath>', () => {
+    it ('load file and save result to file', () => {
+        exec('npx ua-parser-js --input-file="../test/unit/cli/input.txt" --output-file="../test/unit/cli/output.json"', (err, stdout, stderr) => {
+            fs.readFile('test/unit/cli/output.json', (err, data) => {
+                assert.deepEqual(JSON.parse(data), JSON.parse(JSON.stringify(output)));
+            });
+        });
+    });
+});

test/unit/cli/input.txt

@@ -0,0 +1,2 @@
+Opera/9.25 (Windows NT 6.0; U; ru)
+Mozilla/4.0 (compatible; MSIE 5.5; Windows NT)

test/unit/cli/output.json

@@ -0,0 +1,32 @@
+[
+{
+    "ua": "Opera/9.25 (Windows NT 6.0; U; ru)",
+    "browser": {
+        "name": "Opera",
+        "version": "9.25",
+        "major": "9"
+    },
+    "cpu": {},
+    "device": {},
+    "engine": {},
+    "os": {
+        "name": "Windows",
+        "version": "Vista"
+    }
+},
+{
+    "ua": "Mozilla/4.0 (compatible; MSIE 5.5; Windows NT)",
+    "browser": {
+        "name": "IE",
+        "version": "5.5",
+        "major": "5"
+    },
+    "cpu": {},
+    "device": {},
+    "engine": {},
+    "os": {
+        "name": "Windows",
+        "version": "NT"
+    }
+}
+]

test/unit/helpers.js

@@ -1,85 +0,0 @@
-const assert = require('assert');
-const { UAParser } = require('../../src/main/ua-parser');
-const { getDeviceVendor, isAppleSilicon, isAIBot, isBot, isChromeFamily } = require('../../src/helpers/ua-parser-helpers');
-const { Bots, Emails } = require('../../src/extensions/ua-parser-extensions');
-const { DeviceVendor } = require('../../src/enums/ua-parser-enums');
-
-describe('getDeviceVendor', () => {
-    it('Can guess the device vendor from a model name', () => {
-        
-        const modelSM = 'SM-A605G';
-        const modelRedmi = 'Redmi Note 8';
-        const modelNexus = 'Nexus 6P';
-        const modelAquos = 'AQUOS-TVX19B';
-
-        assert.equal(getDeviceVendor(modelSM), DeviceVendor.SAMSUNG);
-        assert.equal(getDeviceVendor(modelRedmi), DeviceVendor.XIAOMI);
-        assert.equal(getDeviceVendor(modelNexus), DeviceVendor.HUAWEI);
-        assert.equal(getDeviceVendor(modelAquos), DeviceVendor.SHARP);
-    });
-});
-
-describe('isAppleSilicon', () => {
-    it('Can detect Apple Silicon device', () => {
-        
-        // non-real ua
-        const macARM = 'Mozilla/5.0 (Macintosh; ARM; Mac OS X 10.15; rv:97.0) Gecko/20100101 Firefox/97.0';
-        const macIntel = 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:97.0) Gecko/20100101 Firefox/97.0';
-
-        assert.equal(isAppleSilicon(UAParser(macIntel)), false);
-        assert.equal(isAppleSilicon(macIntel), false);
-        assert.equal(isAppleSilicon(UAParser(macARM)), true);
-        assert.equal(isAppleSilicon(macARM), true);
-    });
-});
-
-describe('isAIBot', () => {
-    it('Can detect AI Bots', () => {
-        
-        const claudeBot = 'Mozilla/5.0 AppleWebKit/537.36 (KHTML, like Gecko; compatible; ClaudeBot/1.0; +claudebot@anthropic.com)';
-        const firefox = 'Mozilla/5.0 (X11; Linux x86_64; rv:109.0) Gecko/20100101 Firefox/111.0';
-        const searchGPT = 'Mozilla/5.0 AppleWebKit/537.36 (KHTML, like Gecko); compatible; OAI-SearchBot/1.0; +https://openai.com/searchbot';
-        const semrushAI = 'Mozilla/5.0 (compatible; SemrushBot-OCOB/1; +https://www.semrush.com/bot/)';
-
-        assert.equal(isAIBot(UAParser(claudeBot, Bots)), true);
-        assert.equal(isAIBot(claudeBot), true);
-        assert.equal(isAIBot(firefox), false);
-        assert.equal(isAIBot(searchGPT), true);
-        assert.equal(isAIBot(semrushAI), true);
-    });
-});
-
-describe('isBot', () => {
-    it('Can detect Bots', () => {
-        
-        // non-real ua
-        const ahrefsBot = 'Mozilla/5.0 (compatible; AhrefsBot/7.0; +http://ahrefs.com/robot/)';
-        const firefox = 'Mozilla/5.0 (X11; Linux x86_64; rv:109.0) Gecko/20100101 Firefox/111.0';
-        const scrapy = 'Scrapy/1.5.0 (+https://scrapy.org)';
-        const thunderbird = 'Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.13.0';
-
-        const botParser = new UAParser(firefox, { Bots, Emails });
-        assert.equal(isBot(botParser.getResult()), false);
-        assert.equal(isBot(botParser.setUA(ahrefsBot).getResult()), true);
-        assert.equal(isBot(botParser.setUA(scrapy).getResult()), true);
-        assert.equal(isBot(botParser.setUA(thunderbird).getResult()), false);
-
-        assert.equal(isBot(ahrefsBot), true);
-        assert.equal(isBot(firefox), false);
-        assert.equal(isBot(scrapy), true);
-        assert.equal(isBot(thunderbird), false);
-    });
-});
-
-describe('isChromeFamily', () => {
-    it('Can detect Chromium-based browser', () => {
-        
-        const edge = 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/119.0.0.0 Safari/537.36 Edg/119.0.2151.58';
-        const firefox = 'Mozilla/5.0 (X11; Linux x86_64; rv:109.0) Gecko/20100101 Firefox/111.0';
-
-        assert.equal(isChromeFamily(UAParser(edge)), true);
-        assert.equal(isChromeFamily(UAParser(firefox)), false);
-        assert.equal(isChromeFamily(edge), true);
-        assert.equal(isChromeFamily(firefox), false);
-    });
-});

test/unit/main.js

@@ -10,7 +10,6 @@ var cpus        = require('../data/ua/cpu/cpu-all.json');
 var devices     = readJsonFiles('test/data/ua/device');
 var engines     = require('../data/ua/engine/engine-all.json');
 var os          = readJsonFiles('test/data/ua/os');
-var { Headers } = require('undici');
 
 function readJsonFiles(dir) {
     var list = [];
@@ -163,6 +162,14 @@ describe('Extending Regex', function () {
     assert.deepEqual(myParser3.setUA(myUA2).getDevice(), {vendor: "MyTab", model: "14 Pro Max", type: "tablet"});
 });
 
+describe('User-agent with trailing space', function () {
+    it ('trailing space will be trimmed', function () {
+        const uastring = '     Opera/9.21 (Windows NT 5.1; U; ru)     ';
+        const { ua } = UAParser(uastring);
+        assert.equal(ua, 'Opera/9.21 (Windows NT 5.1; U; ru)     ');
+    });
+});
+
 describe('User-agent length', function () {
     var UA_MAX_LENGTH = 500;
 
@@ -375,12 +382,15 @@ describe('Read user-agent data from req.headers', function () {
         assert.strictEqual(engine.name, "EdgeHTML");
     });
 
-    it('Fetch API\'s Header can be passed directly into headers', () => {
-        const reqHeaders = new Headers();
-        reqHeaders.append('User-Agent', 'Midori/0.2.2 (X11; Linux i686; U; en-us) WebKit/531.2+');
-        const { browser } = UAParser(reqHeaders);
-        assert.strictEqual(browser.is('Midori'), true);
-    });
+    // Headers supported in node 18+ - https://developer.mozilla.org/en-US/docs/Web/API/Headers
+    if (typeof Headers !== 'undefined') {
+        it('Fetch API\'s Header can be passed directly into headers', () => {
+            const reqHeaders = new Headers();
+            reqHeaders.append('User-Agent', 'Midori/0.2.2 (X11; Linux i686; U; en-us) WebKit/531.2+');
+            const { browser } = UAParser(reqHeaders);
+            assert.strictEqual(browser.is('Midori'), true);
+        });
+    }
 
     it('Headers field name should be case insensitive', function () {    
         const hEaDeRs = {

test/unit/submodules/bot-detection.spec.js

@@ -0,0 +1,42 @@
+const assert = require('assert');
+const { UAParser } = require('../../../src/main/ua-parser');
+const { isAICrawler, isBot } = require('../../../src/bot-detection/bot-detection');
+const { Bots, Emails } = require('../../../src/extensions/ua-parser-extensions');
+
+describe('isAICrawler()', () => {
+    it('Can detect AI Crawlers', () => {
+        
+        // AI Crawlers
+        const claudeBot = 'Mozilla/5.0 AppleWebKit/537.36 (KHTML, like Gecko; compatible; ClaudeBot/1.0; +claudebot@anthropic.com)';
+        const searchGPT = 'Mozilla/5.0 AppleWebKit/537.36 (KHTML, like Gecko); compatible; OAI-SearchBot/1.0; +https://openai.com/searchbot';
+        const semrushAI = 'Mozilla/5.0 (compatible; SemrushBot-OCOB/1; +https://www.semrush.com/bot/)';
+
+        assert.equal(isAICrawler(claudeBot), true);
+        assert.equal(isAICrawler(searchGPT), true);
+        assert.equal(isAICrawler(semrushAI), true);
+
+        // Non-AI Crawlers
+        const firefox = 'Mozilla/5.0 (X11; Linux x86_64; rv:109.0) Gecko/20100101 Firefox/111.0';
+
+        assert.equal(isAICrawler(firefox), false);
+    });
+});
+
+describe('isBot()', () => {
+    it('Can detect general Bots', () => {
+        
+        // Bots
+        const ahrefsBot = 'Mozilla/5.0 (compatible; AhrefsBot/7.0; +http://ahrefs.com/robot/)';
+        const scrapy = 'Scrapy/1.5.0 (+https://scrapy.org)';
+
+        assert.equal(isBot(ahrefsBot), true);
+        assert.equal(isBot(scrapy), true);
+
+        // Non-bots
+        const firefox = 'Mozilla/5.0 (X11; Linux x86_64; rv:109.0) Gecko/20100101 Firefox/111.0';
+        const thunderbird = 'Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.13.0';
+
+        assert.equal(isBot(firefox), false);
+        assert.equal(isBot(thunderbird), false);
+    });
+});

test/unit/submodules/browser-detection.spec.js

@@ -0,0 +1,16 @@
+const assert = require('assert');
+const { UAParser } = require('../../../src/main/ua-parser');
+const { isChromeFamily } = require('../../../src/browser-detection/browser-detection');
+
+describe('isChromeFamily()', () => {
+    it('Can detect Chromium-based browser', () => {
+        
+        const edge = 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/119.0.0.0 Safari/537.36 Edg/119.0.2151.58';
+        const firefox = 'Mozilla/5.0 (X11; Linux x86_64; rv:109.0) Gecko/20100101 Firefox/111.0';
+
+        assert.equal(isChromeFamily(UAParser(edge)), true);
+        assert.equal(isChromeFamily(edge), true);
+        assert.equal(isChromeFamily(UAParser(firefox)), false);
+        assert.equal(isChromeFamily(firefox), false);
+    });
+});

test/unit/submodules/device-detection.spec.js

@@ -0,0 +1,32 @@
+const assert = require('assert');
+const { UAParser } = require('../../../src/main/ua-parser');
+const { getDeviceVendor, isAppleSilicon } = require('../../../src/device-detection/device-detection');
+const { DeviceVendor } = require('../../../src/enums/ua-parser-enums');
+
+describe('getDeviceVendor()', () => {
+    it('Can guess the device vendor from a model name', () => {
+        
+        const sm = 'SM-A605G';
+        const redmi = 'Redmi Note 8';
+        const nexus = 'Nexus 6P';
+        const aquos = 'AQUOS-TVX19B';
+
+        assert.equal(getDeviceVendor(sm), DeviceVendor.SAMSUNG);
+        assert.equal(getDeviceVendor(redmi), DeviceVendor.XIAOMI);
+        assert.equal(getDeviceVendor(nexus), DeviceVendor.HUAWEI);
+        assert.equal(getDeviceVendor(aquos), DeviceVendor.SHARP);
+    });
+});
+
+describe('isAppleSilicon()', () => {
+    it('Can detect Apple Silicon device', () => {
+        
+        const macARM = 'Mozilla/5.0 (Macintosh; ARM; Mac OS X 10.15; rv:97.0) Gecko/20100101 Firefox/97.0';
+        const macIntel = 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:97.0) Gecko/20100101 Firefox/97.0';
+
+        assert.equal(isAppleSilicon(UAParser(macIntel)), false);
+        assert.equal(isAppleSilicon(macIntel), false);
+        assert.equal(isAppleSilicon(UAParser(macARM)), true);
+        assert.equal(isAppleSilicon(macARM), true);
+    });
+});

test/unit/submodules/extensions.spec.js

@@ -3,9 +3,9 @@ const assert = require('assert');
 const parseJS = require('@babel/parser').parse;
 const traverse = require('@babel/traverse').default;
 const safe = require('safe-regex');
-const { UAParser } = require('../../src/main/ua-parser');
-const { Bots, CLIs, Crawlers, Emails, Fetchers, InApps, Libraries, Vehicles } = require('../../src/extensions/ua-parser-extensions');
-const { BrowserType, OSName, Extension } = require('../../src/enums/ua-parser-enums');
+const { UAParser } = require('../../../src/main/ua-parser');
+const { Bots, CLIs, Crawlers, Emails, Fetchers, InApps, Libraries, Vehicles } = require('../../../src/extensions/ua-parser-extensions');
+const { BrowserType, OSName, Extension } = require('../../../src/enums/ua-parser-enums');
 const { CLI, Crawler, Email, Fetcher, Library } = Extension.BrowserName;
 
 describe('Extensions', () => {
@@ -19,7 +19,7 @@ describe('Extensions', () => {
         ['Vehicles', 'vehicle', Vehicles]
     ]
     .forEach(([desc, path, ext]) => {
-        const tests = require(`../data/ua/extension/${path}.json`);
+        const tests = require(`../../data/ua/extension/${path}.json`);
         describe(desc, () => {
             tests.forEach((test) => {
                 it(`Can detect ${test.desc}: "${test.ua}"`, () => {

test/unit/submodules/helpers.spec.js

@@ -0,0 +1,13 @@
+const assert = require('assert');
+const { isFrozenUA } = require('../../../src/helpers/ua-parser-helpers');
+
+describe('isFrozenUA()', () => {
+    it('matches supplied user-agent string with known frozen user-agent pattern', () => {
+    
+        const regularMobileUA = "Mozilla/5.0 (Linux; Android 9; SM-A205U) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/93.0.1234.56 Mobile Safari/537.36";
+        const frozenMobileUA = "Mozilla/5.0 (Linux; Android 10; K) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/93.0.0.0 Mobile Safari/537.36";
+
+        assert.equal(isFrozenUA(regularMobileUA), false);
+        assert.equal(isFrozenUA(frozenMobileUA), true);
+    });
+});

test/unit/ua-ch.js

@@ -413,4 +413,20 @@ describe('Identify vendor & type of device from given model name', () => {
             assert.strictEqual(device.type, test.expect.type);
         });
     });
+});
+
+describe('Chaining withClientHints() & withFeatureCheck() in server-side development', () => {
+    const headers = {
+        'user-agent' : 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/16.0 Safari/605.1.15',
+        'sec-ch-ua-form-factors' : '"VR"'
+    };
+    const device = new UAParser(headers).getDevice();
+    it('Chain order: withFeatureCheck().withClientHints()', () => {  
+        const fc2ch = device.withFeatureCheck().withClientHints();
+        assert.strictEqual(fc2ch.type, "xr");
+    });
+    it('Chain order: withClientHints().withFeatureCheck()', () => {
+        const ch2fc = device.withClientHints().withFeatureCheck();
+        assert.strictEqual(ch2fc.type, "xr");
+    });
 });