Bump version 2.0.0-alpha.2

Fix #640 - Self-return thenable causing infinite-loop when awaited
Only set browser as Chromium if no other brand was found
2025-11-15 14:42:16 +03:00 · 2023-04-02 18:00:48 +07:00 · 2023-04-02 05:55:33 +07:00 · 2023-03-29 23:42:30 +07:00 · 2023-03-29 22:53:07 +07:00 · 2023-03-29 10:44:37 +07:00
25 changed files with 3397 additions and 2319 deletions
--- a/.github/FUNDING.yml
+++ b/.github/FUNDING.yml
@@ -1,6 +1,6 @@
 # These are supported funding model platforms

-github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
+github: faisalman
 patreon: # Replace with a single Patreon username
 open_collective: ua-parser-js
 ko_fi: # Replace with a single Ko-fi username
--- a/bower.json
+++ b/bower.json
@@ -1,6 +1,6 @@
 {
  "name": "ua-parser-js",
-  "version": "0.7.39",
+  "version": "2.0.0-alpha.2",
  "authors": [
    "Faisal Salman <f@faisalman.com>"
  ],
--- a/changelog.md
+++ b/changelog.md
@@ -1,37 +1,30 @@
 # UAParser.js Changelog

+# Version 2.0
+- What's breaking:
+  - Browser detection on mobile device: `"Chrome" => "Mobile Chrome"`, `"Firefox" => "Mobile Firefox"`
+  - OS detection: `"Mac OS" => "macOS"`, `"Chromium OS" => "Chrome OS"`
+- What's new:
+  - Add some new methods in result object: 
+    - Add support for client hints: `withClientHints()`
+    - Utility for easy comparison: `is()`
+    - Utility to print full-name: `toString()`
+  - Add support for ES module `import { UAParser } from 'ua-parser-js'`
+  - Provide Enums `'ua-parser-js/enums'`
+  - Provide Extensions `'ua-parser-js/extensions'`
+
+## Version 2.0.0-alpha.2
+- Fix browser result always returning Chromium when using `withClientHints()`
+- Fix infinite-loop when await-ing `withClientHints()` in non-client-hints browser
+
+## Version 2.0.0-alpha.1
+- Initial work on new major version
+
+
 # Version 0.7 / 1.0

 Version 1.0.x is basically the equivalent of version 0.7.x. See [#536](https://github.com/faisalman/ua-parser-js/issues/536) for the reason behind this confusion.

-## Version 0.7.39 / 1.0.39
- Add new feature: executable command using `npx ua-parser-js "[INSERT-UA-HERE]"`
- Add new browser: Helio, Pico Browser, Wolvic
- Add new device vendor: itel, Nothing, TCL
- Improve browser detection: ICEBrowser, Klar, QQBrowser, Quark, Rekonq, Sleipnir
- Improve device detection: Xiaomi Pro, Amazon Echo Show, Samsung Galaxy Watch
- Removed from browser: Viera
-
-## Version 0.7.38 / 1.0.38
- Fix error on getOS() when userAgentData.platform is undefined
- Add new browser: Opera GX, Twitter
- Improve browser detection: DuckDuckGo
- Improve device detection: OPPO Pad, Oculus Quest
-
-## Version 0.7.37 / 1.0.37
- Fix misidentified WebView token as device model
- Increase UA_MAX_LENGTH to 500
- Add new browser: Alipay, Klarna, Smart Lenovo Browser, Vivo Browser
- Add new device: Ulefone
- Improve device detection: Realme, Xiaomi Redmi
- Rename browser: Avant, Baidu, Samsung Internet, Sogou Explorer, Sogou Mobile, WeChat
-
-## Version 0.7.36 / 1.0.36
- Add new browser: Snapchat
- Add new devices: Infinix, Tecno
- Improve device detection: Amazon Fire TV, Xiaomi POCO 
- Improve OS detection: iOS
-
 ## Version 0.7.35 / 1.0.35
 - Fix result from user-supplied user-agent being altered
 - Add new browser: Heytap, TikTok
--- a/dist/ua-parser.min.js
+++ b/dist/ua-parser.min.js
--- a/dist/ua-parser.pack.js
+++ b/dist/ua-parser.pack.js
--- a/images/51degrees.svg
+++ b/images/51degrees.svg
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 23.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 161.93 86.82" style="enable-background:new 0 0 161.93 86.82;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#232628;}
+	.st1{fill:#E62E3A;}
+	.st2{fill:none;}
+</style>
+<g>
+	<path class="st0" d="M116.93,0.68H103.5V17.5h13.43c15.24,0,25.53,10.53,25.53,25.53v0.24c0,15-10.28,25.29-25.53,25.29H103.5
+		v16.82h13.43c26.62,0,45-18.51,45-42.34v-0.24C161.93,18.95,143.54,0.68,116.93,0.68"/>
+	<path class="st1" d="M8.11,0.68h52.02v16.33H24.07l-0.97,14.64c3.39-0.85,6.41-1.45,11.13-1.45c16.7,0,29.64,7.99,29.64,27.22
+		c0,18.03-12.7,29.4-32.18,29.4c-13.55,0-23.47-4.84-31.7-12.7l11.25-13.43c6.41,5.81,12.7,9.19,20.2,9.19
+		c8.71,0,14.15-4.23,14.15-11.86c0-7.38-5.93-11.61-15-11.61c-5.32,0-10.16,1.45-14.16,3.15L5.69,42.42L8.11,0.68z"/>
+	<polygon class="st1" points="86.14,0 98.84,0 98.84,85.29 80.45,85.29 80.45,18.87 65.69,22.5 61.82,7.26 	"/>
+</g>
+<rect x="144.06" y="110.12" class="st2" width="566.93" height="113.39"/>
+</svg>
--- a/license.md
+++ b/license.md
@@ -1,6 +1,6 @@
 MIT License

-Copyright (c) 2012-2024 Faisal Salman <<f@faisalman.com>>
+Copyright (c) 2012-2023 Faisal Salman <<f@faisalman.com>>

 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
--- a/package.js
+++ b/package.js
@@ -1,6 +1,6 @@
 Package.describe({
  name: 'faisalman:ua-parser-js',
-  version: '0.7.39',
+  version: '2.0.0-alpha.2',
  summary: 'Lightweight JavaScript-based user-agent string parser',
  git: 'https://github.com/faisalman/ua-parser-js.git',
  documentation: 'readme.md'
--- a/package.json
+++ b/package.json
@@ -1,27 +1,21 @@
 {
  "title": "UAParser.js",
  "name": "ua-parser-js",
-  "version": "0.7.39",
+  "version": "2.0.0-alpha.2",
  "author": "Faisal Salman <f@faisalman.com> (http://faisalman.com)",
  "description": "Detect Browser, Engine, OS, CPU, and Device type/model from User-Agent data. Supports browser & node.js environment",
  "keywords": [
-    "ua-parser-js",
    "user-agent",
+    "parser",
    "browser",
    "engine",
    "os",
    "device",
-    "mobile",
    "cpu",
-    "platform",
-    "detect",
-    "javascript",
-    "jquery",
-    "typescript",
-    "node-js",
-    "client-hints"
+    "jquery-plugin",
+    "ecosystem:jquery"
  ],
-  "homepage": "https://uaparser.dev",
+  "homepage": "https://github.com/faisalman/ua-parser-js",
  "contributors": [
    "Aamir Poonawalla <aamir@urx.com>",
    "Admas <mollases@users.noreply.github.com>",
@@ -146,16 +140,31 @@
    "Yun Young-jin <yupmin@yupmin-office-macmini.local>",
    "Zach Bjornson <zbbjornson@gmail.com>"
  ],
+  "type": "commonjs",
  "main": "src/ua-parser.js",
+  "module": "src/ua-parser.mjs",
+  "exports": {
+    ".": {
+      "require": "./src/ua-parser.js",
+      "import": "./src/ua-parser.mjs"
+    },
+    "./enums": {
+      "require": "./src/enum/ua-parser-enum.js",
+      "import": "./src/enum/ua-parser-enum.mjs"
+    },
+    "./extensions": {
+      "require": "./src/extension/ua-parser-extension.js",
+      "import": "./src/extension/ua-parser-extension.mjs"
+    }
+  },
  "files": [
    "dist",
    "src"
  ],
-  "bin": "./script/cli.js",
  "scripts": {
-    "build": "uglifyjs src/ua-parser.js -o dist/ua-parser.min.js --comments '/^ UA/' && uglifyjs src/ua-parser.js -o dist/ua-parser.pack.js --comments '/^ UA/' --compress --mangle",
-    "test": "jshint src/ua-parser.js && mocha -R nyan test/test.js",
-    "test-ci": "jshint src/ua-parser.js && mocha -R spec test/test.js",
+    "build": "uglifyjs src/ua-parser.js -o dist/ua-parser.min.js --comments '/^ UA/' && uglifyjs src/ua-parser.js -o dist/ua-parser.pack.js --comments '/^ UA/' --compress --mangle && node -e \"const fs=require('fs');fs.writeFileSync('src/ua-parser.mjs','// Generated ESM version of UAParser.js\\n// DO NOT EDIT THIS FILE!\\n// Source: /src/ua-parser.js\\n\\nconst window = undefined;\\n\\n'+fs.readFileSync('src/ua-parser.js','utf-8').replace(/\\(func[\\s\\S]+strict\\';/ig,'').replace(/\\/[\\/\\s]+export[\\s\\S]+/ig,'export {UAParser};'),'utf-8');fs.writeFileSync('src/enum/ua-parser-enum.mjs','// Generated ESM version of UAParser.js enums\\n// DO NOT EDIT THIS FILE!\\n// Source: /src/enum/ua-parser-enum.js\\n\\n'+fs.readFileSync('src/enum/ua-parser-enum.js','utf-8').replace(/module\\.exports =/ig,'export'),'utf-8');fs.writeFileSync('src/extension/ua-parser-extension.mjs','// Generated ESM version of UAParser.js extensions\\n// DO NOT EDIT THIS FILE!\\n// Source: /src/extension/ua-parser-extension.js\\n\\n'+fs.readFileSync('src/extension/ua-parser-extension.js','utf-8').replace(/const UA.+\\)/ig,'import UAParser from \\'ua-parser-js\\'').replace(/module\\.exports =/ig,'export'),'utf-8')\"",
+    "test": "jshint src/ua-parser.js && mocha -R nyan test",
+    "test-ci": "jshint src/ua-parser.js && mocha -R spec test",
    "verup": "node ./node_modules/verup",
    "version": "node ./node_modules/verup 0"
  },
@@ -194,7 +203,7 @@
    "test": "test"
  },
  "bugs": "https://github.com/faisalman/ua-parser-js/issues",
-  "demo": "https://uaparser.dev",
+  "demo": "https://faisalman.github.io/ua-parser-js",
  "download": "https://raw.github.com/faisalman/ua-parser-js/master/dist/ua-parser.min.js",
  "funding": [
    {
@@ -206,8 +215,8 @@
      "url": "https://paypal.me/faisalman"
    },
    {
-        "type": "github",
-        "url": "https://github.com/sponsors/faisalman"
+      "type": "github",
+      "url": "https://github.com/sponsors/faisalman"
    }
  ]
 }
--- a/readme.md
+++ b/readme.md
@@ -12,14 +12,11 @@

 # UAParser.js

-JavaScript library to detect Browser, Engine, OS, CPU, and Device type/model from User-Agent data with relatively small footprint (~17KB minified, ~6KB gzipped) that can be used either in browser (client-side) or node.js (server-side).
+JavaScript library to detect Browser, Engine, OS, CPU, and Device type/model from User-Agent & Client-Hints data that can be used either in browser (client-side) or node.js (server-side).

 * Author    : Faisal Salman <<f@faisalman.com>>
-* Demo      : https://uaparser.dev
+* Demo      : https://faisalman.github.io/ua-parser-js
 * Source    : https://github.com/faisalman/ua-parser-js
-* Documentation : 
-  * v1 : https://github.com/faisalman/ua-parser-js/tree/1.0.39#documentation
-  * v2 : https://docs.uaparser.dev

 ***

@@ -29,6 +26,14 @@ JavaScript library to detect Browser, Engine, OS, CPU, and Device type/model fro
 </thead>
 <tbody>
 <tr>
+<td align="center" width="200px" rowspan="2"><a href="https://www.npmjs.com/package/@51degrees/ua-parser-js"><img src="images/51degrees.svg" alt="51degrees" width="75%" height="75%" ></a></td>
+<td align="left" width="400px"><a href="https://www.npmjs.com/package/@51degrees/ua-parser-js">↗ @51degrees/ua-parser-js</a></td> 
+</tr>
+<tr>
+<td><br/><p>UAParser.js has been upgraded to detect comprehensive device data based on the User-Agent and User-Agent Client Hints.</p><p>This package supports all device types including Apple and Android devices and can be used either in a browser (client-side) or Node.js environment (server-side).</p><p>Visit <a href="https://www.npmjs.com/package/@51degrees/ua-parser-js">↗ 51Degrees <u>UAParser</u></a> to get started.</p>
+</td>
+</tr>
+<tr>
 <td colspan="2">
 <a href="https://opencollective.com/ua-parser-js">↗ Become a sponsor</a>
 </td>
@@ -36,42 +41,38 @@ JavaScript library to detect Browser, Engine, OS, CPU, and Device type/model fro
 </tbody>
 </table>

-<a href="https://uaparser.dev"><img src="https://raw.githubusercontent.com/faisalman/ua-parser-js/gh-pages/images/uap-header.png"></a>
-
 ---

+# Version 2.0
+What's new & breaking, please read [CHANGELOG](changelog.md) before upgrading.
+
 # Documentation
-### UAParser([user-agent][,extensions])
-typeof `user-agent` "string".
+### UAParser([user-agent:string][,extensions:object][,headers:object(since@2.0)])

-typeof `extensions` "array".
-
-In The Browser environment you dont need to pass the user-agent string to the function, you can just call the funtion and it should automatically get the string from the `window.navigator.userAgent`, but that is not the case in nodejs. The user-agent string must be passed in nodejs for the function to work.
-Usually you can find the user agent in:
-`request.headers["user-agent"]`.
+In the browser environment you dont need to pass the user-agent string to the function, you can just call the funtion and it should automatically get the string from the `window.navigator.userAgent`, but that is not the case in nodejs. The user-agent string must be passed in' nodejs for the function to work. Usually you can find the user agent in: `request.headers["user-agent"]`.


 ## Constructor
-When you call `UAParser` with the `new` keyword `UAParser` will return a new instance with an empty result object, you have to call one of the available methods to get the information from the user-agent string.
+When you call `UAParser` with the `new` keyword, `UAParser` will return a new instance with an empty result object, you have to call one of the available methods to get the information from the user-agent string.
 Like so:
-* `new UAParser([uastring][,extensions])`
+* `new UAParser([user-agent:string][,extensions:object][,headers:object(since@2.0)])`
 ```js
-let parser = new UAParser("user-agent"); // you need to pass the user-agent for nodejs
+let parser = new UAParser("your user-agent here"); // you need to pass the user-agent for nodejs
 console.log(parser); // {}
 let parserResults = parser.getResult();
 console.log(parserResults);
 /** {
-  "ua": "",
-  "browser": {},
-  "engine": {},
-  "os": {},
-  "device": {},
-  "cpu": {}
+  "ua"      : "",
+  "browser" : {},
+  "engine"  : {},
+  "os"      : {},
+  "device"  : {},
+  "cpu"     : {}
 } */
 ```

 When you call UAParser without the `new` keyword, it will automatically call `getResult()` function and return the parsed results.
-* `UAParser([uastring][,extensions])`
+* `UAParser([user-agent:string][,extensions:object][,headers:object(since@2.0)])`
    * returns result object `{ ua: '', browser: {}, cpu: {}, device: {}, engine: {}, os: {} }`

 ## Methods
@@ -89,7 +90,6 @@ The methods are self explanatory, here's a small overview on all the available m
 *  `getUA()`           - returns the user-agent string.
 *  `setUA(user-agent)` - set a custom user-agent to be parsed.

-
 ---

 * `getResult()`
@@ -100,23 +100,21 @@ The methods are self explanatory, here's a small overview on all the available m

 ```sh
 # Possible 'browser.name':
-2345Explorer, 360 Browser, Alipay, Amaya, Android Browser, Arora, Avant, Avast, 
-AVG, Baidu, Basilisk, Blazer, Bolt, Brave, Bowser, Camino, Chimera,
-Chrome Headless, Chrome WebView, Chrome, Chromium, Cobalt, Comodo Dragon, Dillo,
+2345Explorer, 360 Browser, Amaya, Android Browser, Arora, Avant, Avast, AVG,
+BIDUBrowser, Baidu, Basilisk, Blazer, Bolt, Brave, Bowser, Camino, Chimera,
+[Mobile] Chrome [Headless/WebView], Chromium, Cobalt, Comodo Dragon, Dillo,
 Dolphin, Doris, DuckDuckGo, Edge, Electron, Epiphany, Facebook, Falkon, Fennec, 
-Firebird, Firefox [Focus/Reality], Flock, Flow, GSA, GoBrowser, Helio, Heytap, 
-Huawei Browser, iCab, ICE Browser, IE, IEMobile, IceApe, IceCat, IceDragon, 
-Iceweasel, Instagram, Iridium, Iron, Jasmine, Kakao[Story/Talk], K-Meleon, 
-Kindle, Klar, Klarna, Konqueror, LBBROWSER, Line, LinkedIn, Links, Lunascape, 
-Lynx, MIUI Browser, Maemo, Maxthon, Midori, Minimo, Mobile Safari, Mosaic, 
-Mozilla, NetFront, NetSurf, Netfront, Netscape, NokiaBrowser, Obigo, 
-Oculus Browser, OmniWeb, Opera Coast, Opera [GX/Mini/Mobi/Tablet], PaleMoon, 
-PhantomJS, Phoenix, Pico Browser, Polaris, Puffin, QQ, QQBrowser, QQBrowserLite, 
-Quark, QupZilla, RockMelt, Safari, Sailfish Browser, Samsung Internet, SeaMonkey, 
-Silk, Skyfire, Sleipnir, Slim, SlimBrowser, Smart Lenovo Browser, Snapchat, 
-Sogou [Explorer/Mobile], Swiftfox, Tesla, TikTok, Tizen Browser, Twitter, 
-UCBrowser, UP.Browser, Vivaldi, Vivo Browser, w3m, Waterfox, WeChat, Weibo, 
-Whale Browser, Wolvic, Yandex, ...
+Firebird, [Mobile] Firefox [Focus/Reality], Flock, Flow, GSA, GoBrowser, HeyTap,
+Huawei Browser, ICE Browser, IE, IEMobile, IceApe, IceCat, IceDragon, Iceweasel, 
+Instagram, Iridium, Iron, Jasmine, Kakao[Story/Talk], K-Meleon, Kindle, Klar, 
+Konqueror, LBBROWSER, Line, LinkedIn, Links, Lunascape, Lynx, MIUI Browser, 
+Maemo Browser, Maemo, Maxthon, MetaSr Midori, Minimo, Mosaic, Mozilla, NetFront, 
+NetSurf, Netfront, Netscape, NokiaBrowser, Obigo, Oculus Browser, OmniWeb, 
+Opera Coast, Opera [Mini/Mobi/Tablet], PaleMoon, PhantomJS, Phoenix, Polaris, 
+Puffin, QQ, QQBrowser, QQBrowserLite, Quark, QupZilla, RockMelt, [Mobile] Safari, 
+Sailfish Browser, Samsung Browser, SeaMonkey, Silk, Skyfire, Sleipnir, Slim, 
+SlimBrowser, Swiftfox, Tesla, TikTok, Tizen Browser, UCBrowser, UP.Browser, Viera, 
+Vivaldi, Waterfox, WeChat, Weibo, Yandex, baidu, iCab, w3m, Whale Browser, ...

 # 'browser.version' determined dynamically
 ```
@@ -137,11 +135,10 @@ console, mobile, tablet, smarttv, wearable, embedded

 # Possible 'device.vendor':
 Acer, Alcatel, Amazon, Apple, Archos, ASUS, AT&T, BenQ, BlackBerry, Dell,
-Essential, Facebook, Fairphone, GeeksPhone, Google, HP, HTC, Huawei, Infinix, 
-itel, Jolla, Kobo, Lenovo, LG, Meizu, Microsoft, Motorola, Nexian, Nintendo, 
-Nokia, Nothing, Nvidia, OnePlus, OPPO, Ouya, Palm, Panasonic, Pebble, Polytron, 
-Realme, RIM, Roku, Samsung, Sharp, Siemens, Sony[Ericsson], Sprint, TCL, Tecno, 
-Tesla, Ulefone, Vivo, Vodafone, Xbox, Xiaomi, Zebra, ZTE, ...
+Essential, Facebook, Fairphone, GeeksPhone, Google, HP, HTC, Huawei, Jolla, Kobo,
+Lenovo, LG, Meizu, Microsoft, Motorola, Nexian, Nintendo, Nokia, Nvidia, OnePlus, 
+OPPO, Ouya, Palm, Panasonic, Pebble, Polytron, Realme, RIM, Roku, Samsung, Sharp, 
+Siemens, Sony[Ericsson], Sprint, Tesla, Vivo, Vodafone, Xbox, Xiaomi, Zebra, ZTE, ...

 # 'device.model' determined dynamically
 ```
@@ -168,9 +165,9 @@ Fuchsia, Gentoo, GhostBSD, GNU, Haiku, HarmonyOS, HP-UX, Hurd, iOS, Joli, KaiOS,
 Linpus, Linspire,Linux, Mac OS, Maemo, Mageia, Mandriva, Manjaro, MeeGo, Minix, 
 Mint, Morph OS, NetBSD, NetRange, NetTV, Nintendo, OpenBSD, OpenVMS, OS/2, Palm, 
 PC-BSD, PCLinuxOS, Plan9, PlayStation, QNX, Raspbian, RedHat, RIM Tablet OS, 
-RISC OS, Sabayon, Sailfish, SerenityOS, Series40, Slackware, Solaris, SUSE, 
-Symbian, Tizen, Ubuntu, Unix, VectorLinux, Viera, watchOS, WebOS, 
-Windows [Phone/Mobile], Zenwalk, ...
+RISC OS, Sabayon, Sailfish, SerenityOS, Series40, Slackware, Solaris, SUSE, Symbian, 
+Tizen, Ubuntu, Unix, VectorLinux, Viera, watchOS, WebOS, Windows [Phone/Mobile], 
+Zenwalk, ...

 # 'os.version' determined dynamically
 ```
@@ -180,8 +177,7 @@ Windows [Phone/Mobile], Zenwalk, ...

 ```sh
 # Possible 'cpu.architecture'
-68k, amd64, arm[64/hf], avr, ia[32/64], irix[64], mips[64], pa-risc, ppc, 
-sparc[64]
+68k, amd64, arm[64/hf], avr, ia[32/64], irix[64], mips[64], pa-risc, ppc, sparc[64]
 ```

 * `getUA()`
@@ -191,6 +187,214 @@ sparc[64]
    * set UA string to be parsed
    * returns current instance

+#### * `is():boolean` utility `since@2.0`
+
+```js
+// Is just a shorthand comparison to check whether the value of specified item equals one of its properties (in a case-insensitive way)
+// so that instead of write it using `==` operator like this:
+
+let ua = UAParser();
+let device = ua.device;
+let os = ua.os;
+
+if (device.type == "mobile" && os.name != "iOS") {}
+if (device.type == "smarttv" || device.vendor == "Samsung") {}
+
+// we can also write the comparison above into as follow:
+
+if (device.is("mobile") && !os.is("iOS")) {}
+if (device.is("SmartTV") || device.is("SaMsUnG")) {}
+
+/*
+    For device, properties will be checked in this particular order: type, model, vendor
+*/
+
+// Another examples:
+
+let uap = new UAParser('Mozilla/5.0 (Mobile; Windows Phone 8.1; Android 4.0; ARM; Trident/7.0; Touch; rv:11.0; IEMobile/11.0; NOKIA; Lumia 635) like iPhone OS 7_0_3 Mac OS X AppleWebKit/537 (KHTML, like Gecko) Mobile Safari/537');
+
+uap.getBrowser().name;              // "IEMobile"
+uap.getBrowser().is("IEMobile");    // true
+uap.getCPU().is("ARM");             // true
+
+uap.getOS().name;                   // "Windows Phone"
+uap.getOS().is("Windows Phone");    // true
+
+uap.getDevice();                    // { vendor: "Nokia", model: "Lumia 635", type: "mobile" }
+uap.getResult().device;             // { vendor: "Nokia", model: "Lumia 635", type: "mobile" }
+
+let device = uap.getDevice();
+device.is("mobile");                // true
+device.is("Lumia 635");             // true
+device.is("Nokia");                 // true
+device.is("iPhone");                // false
+uap.getResult().device.is("Nokia"); // true
+uap.getResult().device.model;       // "Lumia 635"
+
+uap.setUA("Mozilla/5.0 (Macintosh; Intel Mac OS X 10_6_8) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/28.0.1500.95 Safari/537.36");
+
+let browser = uap.getBrowser();
+browser.is("IEMobile");             // false 
+browser.is("Chrome");               // true
+
+uap.getResult().browser.is("Edge"); // false
+uap.getResult().os.name             // "Mac OS"
+uap.getResult().os.is("Mac OS");    // true
+uap.getResult().os.version;         // "10.6.8"
+
+let engine = uap.getEngine();
+engine.is("Blink");                 // true
+```
+
+#### * `toString():string` utility `since@2.0`
+
+```js
+// Retrieve full-name values as a string
+
+/*
+    Values will be concatenated following this pattern:
+    * browser : name + version
+    * cpu : architecture 
+    * device : vendor + model
+    * engine : name + version
+    * os : name + version
+*/
+
+// Usage examples
+
+let uap = new UAParser('Mozilla/5.0 (Mobile; Windows Phone 8.1; Android 4.0; ARM; Trident/7.0; Touch; rv:11.0; IEMobile/11.0; NOKIA; Lumia 635) like iPhone OS 7_0_3 Mac OS X AppleWebKit/537 (KHTML, like Gecko) Mobile Safari/537');
+
+uap.getDevice();                    // { 
+                                    //    vendor: "Nokia", 
+                                    //    model: "Lumia 635", 
+                                    //    type: "mobile"
+                                    // }
+uap.getDevice().toString();         // "Nokia Lumia 635"
+
+uap.getResult().os.name;            // "Windows Phone"
+uap.getResult().os.version;         // "8.1"
+uap.getResult().os.toString();      // "Windows Phone 8.1"
+
+uap.setUA("Mozilla/5.0 (Macintosh; Intel Mac OS X 10_6_8) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/28.0.1500.95 Safari/537.36");
+uap.getBrowser().name;              // "Chrome"
+uap.getBrowser().version;           // "28.0.1500.95"
+uap.getBrowser().major;             // "28"
+uap.getBrowser().toString();        // "Chrome 28.0.1500.95"
+
+let engine = uap.getEngine();
+engine.name;                        // "Blink"
+engine.version;                     // "28.0.1500.95"
+engine.toString();                  // "Blink 28.0.1500.95"
+```
+
+#### * `withClientHints():Promise<object>|Thenable<object>|object` `since@2.0`
+
+Recently, Chrome limits the information exposed through user-agent and introduces a new experimental set of data called "client-hints". In browser-environment, obtaining the client-hints data via JavaScript must be done in an asynchronous way. In `UAParser` you can chain the result object from `get*` method with `withClientHints()` to also read the client-hints data from the browser and return the updated data as a `Promise`.
+
+```js
+// client-side example
+(async function () {  
+    let ua = new UAParser();
+
+    // get browser data from user-agent only :
+    let browser = ua.getBrowser();
+    console.log('Using User-Agent: ', browser);
+
+    // get browser data from client-hints (with user-agent as fallback) :
+    browser = await ua.getBrowser().withClientHints();
+    console.log('Using Client-Hints: ', browser);
+
+    // alternatively :
+    ua.getBrowser().withClientHints().then(function (browser) {
+        console.log('Using Client-Hints: ', browser);
+    });
+})();
+```
+
+Along with `User-Agent` HTTP header, Chrome also sends this client-hints data by default under `Sec-CH-UA-*` HTTP headers in each request. In server-side development, you can capture this extra information by passing the `req.headers` to `UAParser()` (see examples below). When using `withClientHints()` in nodejs environment and browser without client-hints support (basically anything that's not Chromium-based), it will returns a new object with updated data.
+
+```js
+// server-side example
+
+// Suppose we got a request having these HTTP headers: 
+const request = {
+    headers : {
+        'user-agent' : 'Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/110.0.0.0 Safari/537.36',
+
+        'sec-ch-ua-mobile' : '?1',
+        'sec-ch-ua-model' : 'Galaxy S3 Marketing',
+        'sec-ch-ua-platform' : 'Android'
+    }
+};
+
+const result1 = UAParser(request.headers);                      // parse only "user-agent" header
+const result2 = UAParser(request.headers).withClientHints();    // update with "sec-ch-ua" headers
+
+console.log(result1.os.name);       // "Linux"
+console.log(result1.device.type);   // undefined
+console.log(result1.device.model);  // undefined
+
+console.log(result2.os.name);       // "Android"
+console.log(result2.device.type);   // "mobile"
+console.log(result2.device.model);  // "Galaxy S3 Marketing"
+
+new UAParser(request.headers)
+        .getBrowser()
+        .withClientHints()
+        .then((browser) => {
+    console.log(browser.toString());    // Chrome 110.0.0.0 
+});
+```
+
+## Extending Regex
+
+If you want to detect something that's not currently provided by UAParser.js (eg: `bots`, specific apps, etc), you can pass a list of regexes to extend internal UAParser.js regexes with your own.
+
+* `UAParser([uastring,] extensions [,headers:object(since@2.0)])`
+
+```js
+// Example:
+const myOwnListOfBrowsers = [
+    [/(mybrowser)\/([\w\.]+)/i], [UAParser.BROWSER.NAME, UAParser.BROWSER.VERSION, ['type', 'bot']]
+];
+
+const myUA = 'Mozilla/5.0 MyBrowser/1.3';
+
+let myParser = new UAParser({ browser: myOwnListOfBrowsers });
+
+console.log(myParser.setUA(myUA).getBrowser());  // {name: "MyBrowser", version: "1.3", major: "1", type : "bot"}
+console.log(myParser.getBrowser().is('bot'));    // true
+
+// Another example:
+const myOwnListOfDevices = [
+    [/(mytab) ([\w ]+)/i], [UAParser.DEVICE.VENDOR, UAParser.DEVICE.MODEL, [UAParser.DEVICE.TYPE, UAParser.DEVICE.TABLET]],
+    [/(myphone)/i], [UAParser.DEVICE.VENDOR, [UAParser.DEVICE.TYPE, UAParser.DEVICE.MOBILE]]
+];
+
+const myUA2 = 'Mozilla/5.0 MyTab 14 Pro Max';
+
+let myParser2 = new UAParser({
+    browser: myOwnListOfBrowsers,
+    device: myOwnListOfDevices
+});
+
+console.log(myParser2.setUA(myUA2).getDevice());  // {vendor: "MyTab", model: "14 Pro Max", type: "tablet"}
+```
+
+Some basic extensions (although not very complete at the moment) can also be found under `ua-parser-js/extensions` submodule.
+
+```js
+import { UAParser } from 'ua-parser-js';
+import { Emails } from 'ua-parser-js/extensions';
+
+const browser = new UAParser(Emails)
+                        .setUA('Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.13.0')
+                        .getBrowser();
+
+console.log(browser.name); // Thunderbird
+```
+
+
 # Usage

 ## Using HTML
@@ -202,8 +406,8 @@ sparc[64]
 <script src="ua-parser.min.js"></script>
 <script>

-    var parser = new UAParser();
-    console.log(parser.getResult());
+    var uap = new UAParser();
+    console.log(uap.getResult());
    /*
        /// This will print an object structured like this:
        {
@@ -211,7 +415,7 @@ sparc[64]
            browser: {
                name: "",
                version: "",
-                major: "" //@deprecated
+                major: ""
            },
            engine: {
                name: "",
@@ -235,10 +439,10 @@ sparc[64]

    // Now let's try a custom user-agent string as an example
    var uastring1 = "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/535.2 (KHTML, like Gecko) Ubuntu/11.10 Chromium/15.0.874.106 Chrome/15.0.874.106 Safari/535.2";
-    parser.setUA(uastring1);
-    var result = parser.getResult();
+    uap.setUA(uastring1);
+    var result = uap.getResult();
    // You can also use UAParser constructor directly without having to create an instance:
-    // var result = UAParser(uastring1);
+    // var ua = UAParser(uastring1);

    console.log(result.browser);        // {name: "Chromium", version: "15.0.874.106"}
    console.log(result.device);         // {model: undefined, type: undefined, vendor: undefined}
@@ -249,14 +453,14 @@ sparc[64]

    // Do some other tests
    var uastring2 = "Mozilla/5.0 (compatible; Konqueror/4.1; OpenBSD) KHTML/4.1.4 (like Gecko)";
-    console.log(parser.setUA(uastring2).getBrowser().name); // "Konqueror"
-    console.log(parser.getOS());                            // {name: "OpenBSD", version: undefined}
-    console.log(parser.getEngine());                        // {name: "KHTML", version: "4.1.4"}
+    console.log(uap.setUA(uastring2).getBrowser().name); // "Konqueror"
+    console.log(uap.getOS());                            // {name: "OpenBSD", version: undefined}
+    console.log(uap.getEngine());                        // {name: "KHTML", version: "4.1.4"}

    var uastring3 = 'Mozilla/5.0 (PlayBook; U; RIM Tablet OS 1.0.0; en-US) AppleWebKit/534.11 (KHTML, like Gecko) Version/7.1.0.7 Safari/534.11';
-    console.log(parser.setUA(uastring3).getDevice().model); // "PlayBook"
-    console.log(parser.getOS())                             // {name: "RIM Tablet OS", version: "1.0.0"}
-    console.log(parser.getBrowser().name);                  // "Safari"
+    console.log(uap.setUA(uastring3).getDevice().model); // "PlayBook"
+    console.log(uap.getOS())                             // {name: "RIM Tablet OS", version: "1.0.0"}
+    console.log(uap.getBrowser().name);                  // "Safari"

 </script>
 </head>
@@ -275,11 +479,24 @@ $ npm install ua-parser-js

 ```js
 var http = require('http');
-var parser = require('ua-parser-js');
+var uap = require('ua-parser-js');

 http.createServer(function (req, res) {
    // get user-agent header
-    var ua = parser(req.headers['user-agent']);
+    var ua = uap(req.headers['user-agent']);
+
+    /* // BEGIN since@2.0 - you can also pass client-hints data to UAParser
+
+    // note: only works in secure context (https:// or localhost or file://)
+
+    var getHighEntropyValues = 'Sec-CH-UA-Full-Version-List, Sec-CH-UA-Mobile, Sec-CH-UA-Model, Sec-CH-UA-Platform, Sec-CH-UA-Platform-Version, Sec-CH-UA-Arch, Sec-CH-UA-Bitness';
+    res.setHeader('Accept-CH', getHighEntropyValues);
+    res.setHeader('Critical-CH', getHighEntropyValues);
+    
+    var ua = uap(req.headers).withClientHints();
+
+    // END since@2.0 */
+
    // write the result as response
    res.end(JSON.stringify(ua, null, '  '));
 })
@@ -288,6 +505,19 @@ http.createServer(function (req, res) {
 console.log('Server running at http://127.0.0.1:1337/');
 ```

+## Using ES Modules
+
+```js
+import { UAParser } from 'ua-parser-js';
+
+const { browser, cpu, device } = UAParser('Mozilla/5.0 (X11; U; Linux armv7l; en-GB; rv:1.9.2a1pre) Gecko/20090928 Firefox/3.5 Maemo Browser 1.4.1.22 RX-51 N900');
+
+console.log(browser.name);          // Maemo Browser
+console.log(cpu.is('arm'));         // true
+console.log(device.is('mobile'));   // true
+console.log(device.model);          // N900
+```
+
 ## Using TypeScript

 ```sh
@@ -323,28 +553,6 @@ console.log(parseInt($.ua.browser.version.split('.')[0], 10));  // 4
 $('body').addClass('ua-browser-' + $.ua.browser.name + ' ua-devicetype-' + $.ua.device.type);
 ```

-## Using npx
-
-UAParser.js can be executed as a command that returns the parsed data in JSON format:
-
-```sh
-$ npx ua-parser-js "[INSERT-UA-HERE]"
-```
-
-## Using Extension
-
-* `UAParser([uastring,] extensions)`
-
-```js
-// Example:
-var myOwnListOfBrowsers = [
-    [/(mybrowser)\/([\w\.]+)/i], [UAParser.BROWSER.NAME, UAParser.BROWSER.VERSION]
-];
-var myParser = new UAParser({ browser: myOwnListOfBrowsers });
-var myUA = 'Mozilla/5.0 MyBrowser/1.3';
-console.log(myParser.setUA(myUA).getBrowser());  // {name: "MyBrowser", version: "1.3"}
-```
-
 # Development

 ## Backers & Sponsors
@@ -374,7 +582,7 @@ Made with [contributors-img](https://contrib.rocks).

 MIT License

-Copyright (c) 2012-2024 Faisal Salman <<f@faisalman.com>>
+Copyright (c) 2012-2023 Faisal Salman <<f@faisalman.com>>

 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
--- a/script/cli.js
+++ b/script/cli.js
@@ -1,4 +0,0 @@
-#!/usr/bin/env node
-
-const UAParser = require('ua-parser-js');
-console.log(JSON.stringify(process.argv.slice(2).map(ua => UAParser(ua)), null, 4));
--- a/src/enum/ua-parser-enum.js
+++ b/src/enum/ua-parser-enum.js
@@ -0,0 +1,101 @@
+///////////////////////////////////////////////
+/*  Enums for UAParser.js v2.0.0-alpha.2
+    https://github.com/faisalman/ua-parser-js
+    Author: Faisal Salman <f@faisalman.com>
+    MIT License */
+//////////////////////////////////////////////
+
+const BrowserName = Object.freeze({
+    CHROME          : 'Chrome',
+    EDGE            : 'Edge',
+    SAFARI          : 'Safari',
+    FIREFOX         : 'Firefox',
+    OPERA           : 'Opera',
+    MOBILE_CHROME   : 'Mobile Chrome',
+    MOBILE_SAFARI   : 'Mobile Safari',
+    MOBILE_FIREFOX  : 'Mobile Firefox',
+    ANDROID_BROWSER : 'Android Browser'
+
+    // TODO : test!
+});
+
+const CPUArch = Object.freeze({
+    IA32    : 'ia32',
+    AMD64   : 'amd64',
+    IA64    : 'ia64',
+    ARM     : 'arm',
+    ARM64   : 'arm64',
+    ARMHF   : 'armhf',
+    _68K    : '68k',
+    AVR     : 'avr',
+    IRIX    : 'irix',
+    IRIX64  : 'irix64',
+    MIPS    : 'mips',
+    MIPS64  : 'mips64',
+    PPC     : 'ppc',
+    SPARC   : 'sparc',
+    SPARC64 : 'sparc64'
+});
+
+const DeviceType = Object.freeze({
+    MOBILE  : 'mobile',
+    TABLET  : 'tablet',
+    SMARTTV : 'smarttv',
+    CONSOLE : 'console',
+    WEARABLE: 'wearable',
+    EMBEDDED: 'embedded'
+});
+
+const DeviceVendor = Object.freeze({
+    APPLE   : 'Apple',
+    SAMSUNG : 'Samsung',
+    HUAWEI  : 'Huawei',
+    XIAOMI  : 'Xiaomi',
+    OPPO    : 'OPPO',
+    VIVO    : 'Vivo',
+    REALME  : 'Realme',
+    LENOVO  : 'Lenovo',
+    LG      : 'LG'
+
+    // TODO : test!
+});
+
+const EngineName = Object.freeze({
+    AMAYA   : 'Amaya',
+    BLINK   : 'Blink',
+    EDGEHTML: 'EdgeHTML',
+    FLOW    : 'Flow',
+    GECKO   : 'Gecko',
+    GOANNA  : 'Goanna',
+    ICAB    : 'iCab',
+    LIBWEB  : 'LibWeb',
+    KHTML   : 'KHTML',
+    LINKS   : 'Links',
+    LYNX    : 'Lynx',
+    NETFRONT: 'NetFront',
+    NETSURF : 'NetSurf',
+    PRESTO  : 'Presto',
+    TASMAN  : 'Tasman',
+    TRIDENT : 'Trident',
+    W3M     : 'w3m',
+    WEBKIT  : 'WebKit'
+});
+
+const OSName = Object.freeze({
+    WINDOWS : 'Windows',
+    LINUX   : 'Linux',
+    MACOS   : 'macOS',
+    IOS     : 'iOS',
+    ANDROID : 'Android'
+
+    // TODO : test!
+});
+
+module.exports = { 
+    BrowserName, 
+    CPUArch, 
+    DeviceType, 
+    DeviceVendor,
+    EngineName,
+    OSName
+}
--- a/src/enum/ua-parser-enum.mjs
+++ b/src/enum/ua-parser-enum.mjs
@@ -0,0 +1,105 @@
+// Generated ESM version of UAParser.js enums
+// DO NOT EDIT THIS FILE!
+// Source: /src/enum/ua-parser-enum.js
+
+///////////////////////////////////////////////
+/*  Enums for UAParser.js v2.0.0-alpha.2
+    https://github.com/faisalman/ua-parser-js
+    Author: Faisal Salman <f@faisalman.com>
+    MIT License */
+//////////////////////////////////////////////
+
+const BrowserName = Object.freeze({
+    CHROME          : 'Chrome',
+    EDGE            : 'Edge',
+    SAFARI          : 'Safari',
+    FIREFOX         : 'Firefox',
+    OPERA           : 'Opera',
+    MOBILE_CHROME   : 'Mobile Chrome',
+    MOBILE_SAFARI   : 'Mobile Safari',
+    MOBILE_FIREFOX  : 'Mobile Firefox',
+    ANDROID_BROWSER : 'Android Browser'
+
+    // TODO : test!
+});
+
+const CPUArch = Object.freeze({
+    IA32    : 'ia32',
+    AMD64   : 'amd64',
+    IA64    : 'ia64',
+    ARM     : 'arm',
+    ARM64   : 'arm64',
+    ARMHF   : 'armhf',
+    _68K    : '68k',
+    AVR     : 'avr',
+    IRIX    : 'irix',
+    IRIX64  : 'irix64',
+    MIPS    : 'mips',
+    MIPS64  : 'mips64',
+    PPC     : 'ppc',
+    SPARC   : 'sparc',
+    SPARC64 : 'sparc64'
+});
+
+const DeviceType = Object.freeze({
+    MOBILE  : 'mobile',
+    TABLET  : 'tablet',
+    SMARTTV : 'smarttv',
+    CONSOLE : 'console',
+    WEARABLE: 'wearable',
+    EMBEDDED: 'embedded'
+});
+
+const DeviceVendor = Object.freeze({
+    APPLE   : 'Apple',
+    SAMSUNG : 'Samsung',
+    HUAWEI  : 'Huawei',
+    XIAOMI  : 'Xiaomi',
+    OPPO    : 'OPPO',
+    VIVO    : 'Vivo',
+    REALME  : 'Realme',
+    LENOVO  : 'Lenovo',
+    LG      : 'LG'
+
+    // TODO : test!
+});
+
+const EngineName = Object.freeze({
+    AMAYA   : 'Amaya',
+    BLINK   : 'Blink',
+    EDGEHTML: 'EdgeHTML',
+    FLOW    : 'Flow',
+    GECKO   : 'Gecko',
+    GOANNA  : 'Goanna',
+    ICAB    : 'iCab',
+    LIBWEB  : 'LibWeb',
+    KHTML   : 'KHTML',
+    LINKS   : 'Links',
+    LYNX    : 'Lynx',
+    NETFRONT: 'NetFront',
+    NETSURF : 'NetSurf',
+    PRESTO  : 'Presto',
+    TASMAN  : 'Tasman',
+    TRIDENT : 'Trident',
+    W3M     : 'w3m',
+    WEBKIT  : 'WebKit'
+});
+
+const OSName = Object.freeze({
+    WINDOWS : 'Windows',
+    LINUX   : 'Linux',
+    MACOS   : 'macOS',
+    IOS     : 'iOS',
+    ANDROID : 'Android'
+
+    // TODO : test!
+});
+
+export { 
+    BrowserName, 
+    CPUArch, 
+    DeviceType, 
+    DeviceVendor,
+    EngineName,
+    OSName
+}
--- a/src/extension/ua-parser-extension.js
+++ b/src/extension/ua-parser-extension.js
@@ -0,0 +1,120 @@
+///////////////////////////////////////////////
+/*  Extensions for UAParser.js v2.0.0-alpha.2
+    https://github.com/faisalman/ua-parser-js
+    Author: Faisal Salman <f@faisalman.com>
+    MIT License */
+//////////////////////////////////////////////
+
+const MODEL     = 'model';
+const NAME      = 'name';
+const TYPE      = 'type';
+const VENDOR    = 'vendor';
+const VERSION   = 'version';
+const MOBILE    = 'mobile';
+const TABLET    = 'tablet';
+
+const Bots = Object.freeze({
+    browser : [
+                                                                                // Googlebot / BingBot / MSNBot / FacebookBot
+        [/((?:google|bing|msn|facebook)bot(?:\-[imagevdo]{5})?|bingpreview)\/([\w\.]+)/i], [NAME, VERSION, [TYPE, 'bot']]
+    ]
+});
+
+const ExtraDevices = Object.freeze({
+    device : [
+        [    
+            /(nook)[\w ]+build\/(\w+)/i,                                        // Nook
+            /(dell) (strea[kpr\d ]*[\dko])/i,                                   // Dell Streak
+            /(le[- ]+pan)[- ]+(\w{1,9}) bui/i,                                  // Le Pan Tablets
+            /(trinity)[- ]*(t\d{3}) bui/i,                                      // Trinity Tablets
+            /(gigaset)[- ]+(q\w{1,9}) bui/i,                                    // Gigaset Tablets
+            /(vodafone) ([\w ]+)(?:\)| bui)/i                                   // Vodafone
+            ], [VENDOR, MODEL, [TYPE, TABLET]], [
+
+            /(u304aa)/i                                                         // AT&T
+            ], [MODEL, [VENDOR, 'AT&T'], [TYPE, MOBILE]], [
+
+            /\bsie-(\w*)/i                                                      // Siemens
+            ], [MODEL, [VENDOR, 'Siemens'], [TYPE, MOBILE]], [
+
+            /\b(rct\w+) b/i                                                     // RCA Tablets
+            ], [MODEL, [VENDOR, 'RCA'], [TYPE, TABLET]], [
+
+            /\b(venue[\d ]{2,7}) b/i                                            // Dell Venue Tablets
+            ], [MODEL, [VENDOR, 'Dell'], [TYPE, TABLET]], [
+
+            /\b(q(?:mv|ta)\w+) b/i                                              // Verizon Tablet
+            ], [MODEL, [VENDOR, 'Verizon'], [TYPE, TABLET]], [
+
+            /\b(?:barnes[& ]+noble |bn[rt])([\w\+ ]*) b/i                       // Barnes & Noble Tablet
+            ], [MODEL, [VENDOR, 'Barnes & Noble'], [TYPE, TABLET]], [
+
+            /\b(tm\d{3}\w+) b/i
+            ], [MODEL, [VENDOR, 'NuVision'], [TYPE, TABLET]], [
+
+            /\b(k88) b/i                                                        // ZTE K Series Tablet
+            ], [MODEL, [VENDOR, 'ZTE'], [TYPE, TABLET]], [
+
+            /\b(nx\d{3}j) b/i                                                   // ZTE Nubia
+            ], [MODEL, [VENDOR, 'ZTE'], [TYPE, MOBILE]], [
+
+            /\b(gen\d{3}) b.+49h/i                                              // Swiss GEN Mobile
+            ], [MODEL, [VENDOR, 'Swiss'], [TYPE, MOBILE]], [
+
+            /\b(zur\d{3}) b/i                                                   // Swiss ZUR Tablet
+            ], [MODEL, [VENDOR, 'Swiss'], [TYPE, TABLET]], [
+
+            /\b((zeki)?tb.*\b) b/i                                              // Zeki Tablets
+            ], [MODEL, [VENDOR, 'Zeki'], [TYPE, TABLET]], [
+
+            /\b([yr]\d{2}) b/i,
+            /\b(?:dragon[- ]+touch |dt)(\w{5}) b/i                              // Dragon Touch Tablet
+            ], [MODEL, [VENDOR, 'Dragon Touch'], [TYPE, TABLET]], [
+
+            /\b(ns-?\w{0,9}) b/i                                                // Insignia Tablets
+            ], [MODEL, [VENDOR, 'Insignia'], [TYPE, TABLET]], [
+
+            /\b((nxa|next)-?\w{0,9}) b/i                                        // NextBook Tablets
+            ], [MODEL, [VENDOR, 'NextBook'], [TYPE, TABLET]], [
+
+            /\b(xtreme\_)?(v(1[045]|2[015]|[3469]0|7[05])) b/i                  // Voice Xtreme Phones
+            ], [[VENDOR, 'Voice'], MODEL, [TYPE, MOBILE]], [
+
+            /\b(lvtel\-)?(v1[12]) b/i                                           // LvTel Phones
+            ], [[VENDOR, 'LvTel'], MODEL, [TYPE, MOBILE]], [
+
+            /\b(ph-1) /i                                                        // Essential PH-1
+            ], [MODEL, [VENDOR, 'Essential'], [TYPE, MOBILE]], [
+
+            /\b(v(100md|700na|7011|917g).*\b) b/i                               // Envizen Tablets
+            ], [MODEL, [VENDOR, 'Envizen'], [TYPE, TABLET]], [
+
+            /\b(trio[-\w\. ]+) b/i                                              // MachSpeed Tablets
+            ], [MODEL, [VENDOR, 'MachSpeed'], [TYPE, TABLET]], [
+
+            /\btu_(1491) b/i                                                    // Rotor Tablets
+            ], [MODEL, [VENDOR, 'Rotor'], [TYPE, TABLET]
+        ]
+    ]
+});
+
+const Emails = Object.freeze({
+    browser : [
+                                                                                // Microsoft Outlook / Thunderbird
+        [/(microsoft outlook|thunderbird)[\s\/]([\w\.]+)/i], [NAME, VERSION, [TYPE, 'email']]
+    ]
+});
+
+const Tools = Object.freeze({
+    browser : [
+                                                                                // wget / curl / lynx
+        [/(wget|curl|lynx)\/([\w\.]+)/i], [NAME, VERSION, [TYPE, 'tool']]
+    ]
+});
+
+module.exports = { 
+    Bots,
+    ExtraDevices,
+    Emails,
+    Tools
+}
--- a/src/extension/ua-parser-extension.mjs
+++ b/src/extension/ua-parser-extension.mjs
@@ -0,0 +1,124 @@
+// Generated ESM version of UAParser.js extensions
+// DO NOT EDIT THIS FILE!
+// Source: /src/extension/ua-parser-extension.js
+
+///////////////////////////////////////////////
+/*  Extensions for UAParser.js v2.0.0-alpha.2
+    https://github.com/faisalman/ua-parser-js
+    Author: Faisal Salman <f@faisalman.com>
+    MIT License */
+//////////////////////////////////////////////
+
+const MODEL     = 'model';
+const NAME      = 'name';
+const TYPE      = 'type';
+const VENDOR    = 'vendor';
+const VERSION   = 'version';
+const MOBILE    = 'mobile';
+const TABLET    = 'tablet';
+
+const Bots = Object.freeze({
+    browser : [
+                                                                                // Googlebot / BingBot / MSNBot / FacebookBot
+        [/((?:google|bing|msn|facebook)bot(?:\-[imagevdo]{5})?|bingpreview)\/([\w\.]+)/i], [NAME, VERSION, [TYPE, 'bot']]
+    ]
+});
+
+const ExtraDevices = Object.freeze({
+    device : [
+        [    
+            /(nook)[\w ]+build\/(\w+)/i,                                        // Nook
+            /(dell) (strea[kpr\d ]*[\dko])/i,                                   // Dell Streak
+            /(le[- ]+pan)[- ]+(\w{1,9}) bui/i,                                  // Le Pan Tablets
+            /(trinity)[- ]*(t\d{3}) bui/i,                                      // Trinity Tablets
+            /(gigaset)[- ]+(q\w{1,9}) bui/i,                                    // Gigaset Tablets
+            /(vodafone) ([\w ]+)(?:\)| bui)/i                                   // Vodafone
+            ], [VENDOR, MODEL, [TYPE, TABLET]], [
+
+            /(u304aa)/i                                                         // AT&T
+            ], [MODEL, [VENDOR, 'AT&T'], [TYPE, MOBILE]], [
+
+            /\bsie-(\w*)/i                                                      // Siemens
+            ], [MODEL, [VENDOR, 'Siemens'], [TYPE, MOBILE]], [
+
+            /\b(rct\w+) b/i                                                     // RCA Tablets
+            ], [MODEL, [VENDOR, 'RCA'], [TYPE, TABLET]], [
+
+            /\b(venue[\d ]{2,7}) b/i                                            // Dell Venue Tablets
+            ], [MODEL, [VENDOR, 'Dell'], [TYPE, TABLET]], [
+
+            /\b(q(?:mv|ta)\w+) b/i                                              // Verizon Tablet
+            ], [MODEL, [VENDOR, 'Verizon'], [TYPE, TABLET]], [
+
+            /\b(?:barnes[& ]+noble |bn[rt])([\w\+ ]*) b/i                       // Barnes & Noble Tablet
+            ], [MODEL, [VENDOR, 'Barnes & Noble'], [TYPE, TABLET]], [
+
+            /\b(tm\d{3}\w+) b/i
+            ], [MODEL, [VENDOR, 'NuVision'], [TYPE, TABLET]], [
+
+            /\b(k88) b/i                                                        // ZTE K Series Tablet
+            ], [MODEL, [VENDOR, 'ZTE'], [TYPE, TABLET]], [
+
+            /\b(nx\d{3}j) b/i                                                   // ZTE Nubia
+            ], [MODEL, [VENDOR, 'ZTE'], [TYPE, MOBILE]], [
+
+            /\b(gen\d{3}) b.+49h/i                                              // Swiss GEN Mobile
+            ], [MODEL, [VENDOR, 'Swiss'], [TYPE, MOBILE]], [
+
+            /\b(zur\d{3}) b/i                                                   // Swiss ZUR Tablet
+            ], [MODEL, [VENDOR, 'Swiss'], [TYPE, TABLET]], [
+
+            /\b((zeki)?tb.*\b) b/i                                              // Zeki Tablets
+            ], [MODEL, [VENDOR, 'Zeki'], [TYPE, TABLET]], [
+
+            /\b([yr]\d{2}) b/i,
+            /\b(?:dragon[- ]+touch |dt)(\w{5}) b/i                              // Dragon Touch Tablet
+            ], [MODEL, [VENDOR, 'Dragon Touch'], [TYPE, TABLET]], [
+
+            /\b(ns-?\w{0,9}) b/i                                                // Insignia Tablets
+            ], [MODEL, [VENDOR, 'Insignia'], [TYPE, TABLET]], [
+
+            /\b((nxa|next)-?\w{0,9}) b/i                                        // NextBook Tablets
+            ], [MODEL, [VENDOR, 'NextBook'], [TYPE, TABLET]], [
+
+            /\b(xtreme\_)?(v(1[045]|2[015]|[3469]0|7[05])) b/i                  // Voice Xtreme Phones
+            ], [[VENDOR, 'Voice'], MODEL, [TYPE, MOBILE]], [
+
+            /\b(lvtel\-)?(v1[12]) b/i                                           // LvTel Phones
+            ], [[VENDOR, 'LvTel'], MODEL, [TYPE, MOBILE]], [
+
+            /\b(ph-1) /i                                                        // Essential PH-1
+            ], [MODEL, [VENDOR, 'Essential'], [TYPE, MOBILE]], [
+
+            /\b(v(100md|700na|7011|917g).*\b) b/i                               // Envizen Tablets
+            ], [MODEL, [VENDOR, 'Envizen'], [TYPE, TABLET]], [
+
+            /\b(trio[-\w\. ]+) b/i                                              // MachSpeed Tablets
+            ], [MODEL, [VENDOR, 'MachSpeed'], [TYPE, TABLET]], [
+
+            /\btu_(1491) b/i                                                    // Rotor Tablets
+            ], [MODEL, [VENDOR, 'Rotor'], [TYPE, TABLET]
+        ]
+    ]
+});
+
+const Emails = Object.freeze({
+    browser : [
+                                                                                // Microsoft Outlook / Thunderbird
+        [/(microsoft outlook|thunderbird)[\s\/]([\w\.]+)/i], [NAME, VERSION, [TYPE, 'email']]
+    ]
+});
+
+const Tools = Object.freeze({
+    browser : [
+                                                                                // wget / curl / lynx
+        [/(wget|curl|lynx)\/([\w\.]+)/i], [NAME, VERSION, [TYPE, 'tool']]
+    ]
+});
+
+export { 
+    Bots,
+    ExtraDevices,
+    Emails,
+    Tools
+}
--- a/src/ua-parser.js
+++ b/src/ua-parser.js
--- a/src/ua-parser.mjs
+++ b/src/ua-parser.mjs
--- a/test/browser-test.json
+++ b/test/browser-test.json
@@ -9,26 +9,6 @@
            "major"   : "undefined"
        }
    },
-    {
-        "desc"    : "Alipay",
-        "ua"      : "Mozilla/5.0 (Linux; U; Android 10; zh-CN; V2034A Build/QP1A.190711.020) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/69.0.3497.100 UWS/3.22.2.33 Mobile Safari/537.36 UCBS/3.22.2.33_211025173018 NebulaSDK/1.8.100112 Nebula AlipayDefined(nt:WIFI,ws:360|0|2.0) AliApp(AP/10.2.51.7100) AlipayClient/10.2.51.7100 Language/zh-Hans useStatusBar/true isConcaveScreen/true Region/CNAriver/1.0.0",
-        "expect"  :
-        {
-            "name"    : "Alipay",
-            "version" : "10.2.51.7100",
-            "major"   : "10"
-        }
-    },
-    {
-        "desc"    : "Alipay",
-        "ua"      : "Mozilla/5.0 (Linux; Android 10; VOG-AL00 Build/HUAWEIVOG-AL00; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/105.0.5195.148 MYWeb/0.2.103.0_20230131112530 UWS/3.22.2.9999 UCBS/3.22.2.9999_220000000000 Mobile Safari/537.36 NebulaSDK/1.8.100112 Nebula AlipayDefined(nt:WIFI,ws:360|0|3.0) AliApp(AP/10.3.50.9999) AlipayClient/10.3.50.9999 Language/en isConcaveScreen/true Region/CN ProductType/devAriver/1.0.0",
-        "expect"  :
-        {
-            "name"    : "Alipay",
-            "version" : "10.3.50.9999",
-            "major"   : "10"
-        }
-    },
    {
        "desc"    : "Android Browser on Galaxy Nexus",
        "ua"      : "Mozilla/5.0 (Linux; U; Android 4.0.2; en-us; Galaxy Nexus Build/ICL53F) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Mobile Safari/534.30",
@@ -84,7 +64,7 @@
        "ua"      : "Mozilla/5.0 (Linux; Android 5.0.2; SAMSUNG SM-G925F Build/LRX22G) AppleWebKit/537.36 (KHTML, like Gecko) SamsungBrowser/3.0 Chrome/38.0.2125.102 Mobile Safari/537.36",
        "expect"  :
        {
-            "name"    : "Samsung Internet",
+            "name"    : "Samsung Browser",
            "version" : "3.0",
            "major"   : "3"
        }
@@ -114,7 +94,7 @@
        "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)",
        "expect"  :
        {
-            "name"    : "Avant",
+            "name"    : "Avant ",
            "version" : "undefined",
            "major"   : "undefined"
        }
@@ -144,81 +124,11 @@
        "ua"      : "Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; SV1; baidubrowser 1.x)",
        "expect"  :
        {
-            "name"    : "Baidu",
+            "name"    : "baidubrowser",
            "version" : "1.x",
            "major"   : "1"
        }
    },
-    {
-        "desc"    : "Baidu",
-        "ua"      : "Mozilla/5.0 (Linux; Android 9; Redmi Note 5 Build/PKQ1.180904.001; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/110.0.5481.153 Mobile Safari/537.36 bdbrowser/6.4.0.4",
-        "expect"  :
-        {
-            "name"    : "Baidu",
-            "version" : "6.4.0.4",
-            "major"   : "6"
-        }
-    },
-    {
-        "desc"    : "Baidu",
-        "ua"      : "Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.31 (KHTML, like Gecko) Chrome/26.4.9999.1900 Safari/537.31 BDSpark/26.4",
-        "expect"  :
-        {
-            "name"    : "Baidu",
-            "version" : "26.4",
-            "major"   : "26"
-        }
-    },
-    {
-        "desc"    : "Baidu",
-        "ua"      : "Mozilla/5.0 (iPad; CPU OS 9_1 like Mac OS X) AppleWebKit/534.46 (KHTML, like Gecko) BaiduHD/5.4.0.0 Mobile/10A406 Safari/8536.25",
-        "expect"  :
-        {
-            "name"    : "Baidu",
-            "version" : "5.4.0.0",
-            "major"   : "5"
-        }
-    },
-    {
-        "desc"    : "BaiDu Browser",
-        "ua"      : "Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/47.0.2526.106 BIDUBrowser/8.7 Safari/537.36",
-        "expect"  :
-        {
-            "name"    : "Baidu",
-            "version" : "8.7",
-            "major"   : "8"
-        }
-    },
-    {
-        "desc"    : "baidu app on iOS",
-        "ua"      : "Mozilla/5.0 (iPhone; CPU iPhone OS 12_1_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/16C101 main%2F1.0 baiduboxapp/11.12.0.18 (Baidu; P2 12.1.2)",
-        "expect"  :
-        {
-            "name"    : "Baidu",
-            "version" : "11.12.0.18",
-            "major"   : "11"
-        }
-    },
-    {
-        "desc"    : "baidu app on Android",
-        "ua"      : "Mozilla/5.0 (Linux; Android 8.1.0; BKK-AL10 Build/HONORBKK-AL10; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/63.0.3239.83 Mobile Safari/537.36 T7/11.11 baiduboxapp/11.11.0.0 (Baidu; P1 8.1.0)",
-        "expect"  :
-        {
-            "name"    : "Baidu",
-            "version" : "11.11.0.0",
-            "major"   : "11"
-        }
-    },
-    {
-        "desc"    : "Blazer",
-        "ua"      : "Mozilla/4.0 (compatible; MSIE 6.0; Windows 98; PalmSource/hspr-H102; Blazer/4.0) 16;320x320",
-        "expect"  :
-        {
-            "name"    : "Blazer",
-            "version" : "4.0",
-            "major"   : "4"
-        }
-    },
    {
        "desc"    : "Bolt",
        "ua"      : "Mozilla/5.0 (X11; 78; CentOS; US-en) AppleWebKit/527+ (KHTML, like Gecko) Bolt/0.862 Version/3.0 Safari/523.15",
@@ -289,46 +199,6 @@
            "major"   : "100"
        }
    },
-    {
-        "desc"    : "Chrome 112.0 on Win10",
-        "ua"      : "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/112.0.0.0 Safari/537.36",
-        "expect"  :
-        {
-            "name"    : "Chrome",
-            "version" : "112.0.0.0",
-            "major"   : "112"
-        }
-    },
-    {
-        "desc"    : "Chrome 112.0 on macOS",
-        "ua"      : "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/112.0.0.0 Safari/537.36",
-        "expect"  :
-        {
-            "name"    : "Chrome",
-            "version" : "112.0.0.0",
-            "major"   : "112"
-        }
-    },
-    {
-        "desc"    : "Chrome 111.0 on Linux",
-        "ua"      : "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/111.0.0.0 Safari/537.36",
-        "expect"  :
-        {
-            "name"    : "Chrome",
-            "version" : "111.0.0.0",
-            "major"   : "111"
-        }
-    },
-    {
-        "desc"    : "Chrome 111.0 on ChromeOS",
-        "ua"      : "Mozilla/5.0 (X11; CrOS x86_64 14541.0.0) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/111.0.0.0 Safari/537.36",
-        "expect"  :
-        {
-            "name"    : "Chrome",
-            "version" : "111.0.0.0",
-            "major"   : "111"
-        }
-    },
    {
            "desc"    : "Chrome Headless",
            "ua"      : "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) HeadlessChrome Safari/537.36",
@@ -364,7 +234,7 @@
        "ua"      : "Mozilla/5.0 (iPhone; U; CPU iPhone OS 5_1_1 like Mac OS X; en) AppleWebKit/534.46.0 (KHTML, like Gecko) CriOS/19.0.1084.60 Mobile/9B206 Safari/7534.48.3",
        "expect"  :
        {
-            "name"    : "Chrome",
+            "name"    : "Mobile Chrome",
            "version" : "19.0.1084.60",
            "major"   : "19"
        }
@@ -384,7 +254,7 @@
        "ua"      : "Mozilla/5.0 (Linux; U; Android-4.0.3; en-us; Galaxy Nexus Build/IML74K) AppleWebKit/535.7 (KHTML, like Gecko) CrMo/16.0.912.75 Mobile Safari/535.7",
        "expect"  :
        {
-            "name"    : "Chrome",
+            "name"    : "Mobile Chrome",
            "version" : "16.0.912.75",
            "major"   : "16"
        }
@@ -399,26 +269,6 @@
            "major"   : "78"
        }
    },
-    {
-        "desc"    : "Comodo Dragon",
-        "ua"      : "Mozilla/5.0 (Windows NT 6.2) AppleWebKit/535.7 (KHTML, like Gecko) Comodo_Dragon/16.1.1.0 Chrome/16.0.912.63 Safari/535.7",
-        "expect"  :
-        {
-            "name"    : "Comodo Dragon",
-            "version" : "16.1.1.0",
-            "major"   : "16"
-        }
-    },
-    {
-        "desc"    : "Conkeror",
-        "ua"      : "Mozilla/5.0 (X11; Linux x86_64; rv:6.0.1) Gecko/20110831 conkeror/0.9.3",
-        "expect"  :
-        {
-            "name"    : "conkeror",
-            "version" : "0.9.3",
-            "major"   : "0"
-        }
-    },
    {
        "desc"    : "Dillo",
        "ua"      : "Dillo/2.2",
@@ -449,16 +299,6 @@
            "major"   : "1"
        }
    },
-    {
-        "desc"    : "DuckDuckGo",
-        "ua"      : "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/17.4.1 Safari/605.1.1517.4.1 Ddg/17.4.1",
-        "expect"  :
-        {
-            "name"    : "DuckDuckGo",
-            "version" : "17.4.1",
-            "major"   : "17"
-        }
-    },
    {
        "desc"    : "DuckDuckGo",
        "ua"      : "Mozilla/5.0 (Linux; Android 8.1.0) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/92.0.4515.131 Mobile DuckDuckGo/5 Safari/537.36",
@@ -489,16 +329,6 @@
            "major"   : "5"
        }
    },
-    {
-        "desc"    : "Go Browser",
-        "ua"      : "NokiaE66/GoBrowser/2.0.297",
-        "expect"  :
-        {
-            "name"    : "GoBrowser",
-            "version" : "2.0.297",
-            "major"   : "2"
-        }
-    },
    {
        "desc"    : "Waterfox",
        "ua"      : "Mozilla/5.0 (X11; Linux x86_64; rv:55.0) Gecko/20100101 Firefox/55.2.2 Waterfox/55.2.2",
@@ -559,26 +389,6 @@
            "major"   : "undefined"
        }
    },
-    {
-        "desc"    : "Klarna in-App Browser for iOS",
-        "ua"      : "Mozilla/5.0 (iPhone; CPU iPhone OS 16_6_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148 Klarna/23.36.223",
-        "expect"  :
-        {
-            "name"    : "Klarna",
-            "version" : "23.36.223",
-            "major"   : "23"
-        }
-    },
-    {
-        "desc"    : "Klarna in-App Browser for Android",
-        "ua"      : "Mozilla/5.0 (Linux; Android 12; moto g(60)s Build/S3RLS32.114-25-13; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/116.0.0.0 Mobile Safari/537.36 Klarna/23.36.215",
-        "expect"  :
-        {
-            "name"    : "Klarna",
-            "version" : "23.36.215",
-            "major"   : "23"
-        }
-    },
    {
        "desc"    : "Instagram in-App Browser for iOS",
        "ua"      : "Mozilla/5.0 (iPhone; CPU iPhone OS 14_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148 Instagram 142.0.0.22.109 (iPhone12,5; iOS 14_1; en_US; en-US; scale=3.00; 1242x2688; 214888322) NW/1",
@@ -698,16 +508,6 @@
            "major"   : "1"
        }
    },
-    {
-        "desc"    : "Helio",
-        "ua"      : "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/89.0.4389.72 Safari/537.36 Helio/0.98.20",
-        "expect"  :
-        {
-            "name"    : "Helio",
-            "version" : "0.98.20",
-            "major"   : "0"
-        }
-    },
    {
        "desc"    : "HeyTap",
        "ua"      : "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/90.0.4430.61 Safari/537.36 HeyTapBrowser/40.8.10.1",
@@ -768,16 +568,6 @@
            "major"   : "2"
        }
    },
-    {
-        "desc"    : "ICEBrowser",
-        "ua"      : "Mozilla/5.0 (Java 1.6.0_01; Windows XP 5.1 x86; en) ICEbrowser/v6_1_2",
-        "expect"  :
-        {
-            "name"    : "ICEbrowser",
-            "version" : "6.1.2",
-            "major"   : "6"
-        }
-    },
    {
        "desc"    : "IceCat",
        "ua"      : "Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9.0.3) Gecko/2008092921 IceCat/3.0.3-g1",
@@ -838,26 +628,6 @@
            "major"   : "11"
        }
    },
-    {
-        "desc"    : "Iron",
-        "ua"      : "Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.4 (KHTML, like Gecko) Chrome/22.0.1250.0 Iron/22.0.2150.0 Safari/537.4",
-        "expect"  :
-        {
-            "name"    : "Iron",
-            "version" : "22.0.2150.0",
-            "major"   : "22"
-        }
-    },
-    {
-        "desc"    : "Jasmine",
-        "ua"      : "SAMSUNG-S8000/S8000XXIF3 SHP/VPP/R5 Jasmine/1.0 Nextreaming SMM-MMS/1.2.0 profile/MIDP-2.1 configuration/CLDC-1.1",
-        "expect"  :
-        {
-            "name"    : "Jasmine",
-            "version" : "1.0",
-            "major"   : "1"
-        }
-    },
    {
        "desc"    : "K-Meleon",
        "ua"      : "Mozilla/5.0 (Windows; U; Win98; en-US; rv:1.5) Gecko/20031016 K-Meleon/0.8.2",
@@ -878,16 +648,6 @@
            "major"   : "2"
        }
    },
-    {
-        "desc"    : "Klar < 4.1",
-        "ua"      : "Mozilla/5.0 (Linux; Android 7.0) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Klar/1.0 Chrome/58.0.3029.83 Mobile Safari/537.36",
-        "expect"  :
-        {
-            "name"    : "Klar",
-            "version" : "1.0",
-            "major"   : "1"
-        }
-    },
    {
        "desc"    : "Konqueror",
        "ua"      : "Mozilla/5.0 (compatible; Konqueror/3.5; Linux; X11; x86_64) KHTML/3.5.6 (like Gecko) (Kubuntu)",
@@ -908,56 +668,6 @@
            "major"   : "5"
        }
    },
-    {
-        "desc"    : "PicoBrowser",
-        "ua"      : "Mozilla/5.0 (X11; Linux x86_64; Pico Neo3 Link OS5.8.4.0 like Quest) AppleWebKit/537.36 (KHTML, like Gecko) PicoBrowser/3.3.22 Chrome/105.0.5195.68 VR Safari/537.36",
-        "expect"  :
-        {
-            "name"    : "Pico Browser",
-            "version" : "3.3.22",
-            "major"   : "3"
-        }
-    },
-    {
-        "desc"    : "PicoBrowser",
-        "ua"      : "Mozilla/5.0 (X11; Linux x86_64; PICO 4 OS5.4.0 like Quest) AppleWebKit/537.36 (KHTML, like Gecko) PicoBrowser/3.3.22 Chrome/105.0.5195.68 VR Safari/537.36 OculusBrowser/7.0",
-        "expect"  :
-        {
-            "name"    : "Pico Browser",
-            "version" : "3.3.22",
-            "major"   : "3"
-        }
-    },
-    {
-        "desc"    : "Rekonq",
-        "ua"      : "Mozilla/5.0 (X11; U; Linux x86_64; cs-CZ) AppleWebKit/533.3 (KHTML, like Gecko) rekonq Safari/533.3",
-        "expect"  :
-        {
-            "name"    : "rekonq",
-            "version" : "undefined",
-            "major"   : "undefined"
-        }
-    },
-    {
-        "desc"    : "Smart Lenovo Browser",
-        "ua"      : "Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/92.0.4515.131 Safari/537.36 SLBrowser/8.0.0.10171 SLBChan/8",
-        "expect"  :
-        {
-            "name"    : "Smart Lenovo Browser",
-            "version" : "8.0.0.10171",
-            "major"   : "8"
-        }
-    },
-    {
-        "desc"    : "Smart Lenovo Browser",
-        "ua"      : "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/109.0.0.0 Safari/537.36 SLBrowser/9.0.0.9011 SLBChan/10",
-        "expect"  :
-        {
-            "name"    : "Smart Lenovo Browser",
-            "version" : "9.0.0.9011",
-            "major"   : "9"
-        }
-    },
    {
        "desc"    : "LINE on Android",
        "ua"      : "Mozilla/5.0 (Linux; Android 5.0; ASUS_Z00AD Build/LRX21V; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/51.0.2704.81 Mobile Safari/537.36 Line/6.5.1/IAB",
@@ -1058,6 +768,16 @@
            "major"   : "4"
        }
    },
+    {
+        "desc"    : "Mobile Safari",
+        "ua"      : "Mozilla/5.0 (iPhone; CPU iPhone OS 16_3 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko)  Mobile/15E148 Safari/604.1",
+        "expect"  :
+        {
+            "name"    : "Mobile Safari",
+            "version" : "undefined",
+            "major"   : "undefined"
+        }
+    },
    {
        "desc"    : "Mosaic",
        "ua"      : "NCSA_Mosaic/2.6 (X11; SunOS 4.1.3 sun4m)",
@@ -1128,26 +848,6 @@
            "major"   : "6"
        }
    },
-    {
-        "desc"    : "NetSurf in Plan9",
-        "ua"      : "Mozilla/5.0 (Plan9) NetSurf/3.12",
-        "expect"  :
-        {
-            "name"    : "NetSurf",
-            "version" : "3.12",
-            "major"   : "3"
-        }
-    },
-    {
-        "desc"    : "NetSurf in Linux",
-        "ua"      : "NetSurf/3.10 (Linux; Arch Linux)",
-        "expect"  :
-        {
-            "name"    : "NetSurf",
-            "version" : "3.10",
-            "major"   : "3"
-        }
-    },
    {
        "desc"    : "Nokia Browser",
        "ua"      : "Mozilla/5.0 (Symbian/3; Series60/5.2 NokiaN8-00/025.007; Profile/MIDP-2.1 Configuration/CLDC-1.1 ) AppleWebKit/533.4 (KHTML, like Gecko) NokiaBrowser/7.3.1.37 Mobile Safari/533.4 3gpp-gba",
@@ -1278,26 +978,6 @@
            "major"   : "12"
        }
    },
-    {
-        "desc"    : "Opera GX on Android",
-        "ua"      : "Mozilla/5.0 (Linux; Android 10; Redmi Note 8 Pro Build/QP1A.190711.020) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/115.0.5790.168 Mobile Safari/537.36 OPX/2",
-        "expect"  :
-        {
-            "name"    : "Opera GX",
-            "version" : "2",
-            "major"   : "2"
-        }
-    },
-    {
-        "desc"    : "Opera GX on Windows",
-        "ua"      : "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/73.0.3683.103 Safari/537.36 OPR/60.0.3255.50747 OPRGX/60.0.3255.50747",
-        "expect"  :
-        {
-            "name"    : "Opera GX",
-            "version" : "60.0.3255.50747",
-            "major"   : "60"
-        }
-    },
    {
        "desc"    : "Opera Tablet",
        "ua"      : "Opera/9.80 (Windows NT 6.1; Opera Tablet/15165; U; en) Presto/2.8.149 Version/11.1",
@@ -1328,16 +1008,6 @@
            "major"   : "1"
        }
    },
-    {
-        "desc"    : "OviBrowser",
-        "ua"      : "Mozilla/5.0 (Series40; NokiaX3-02/le6.32; Profile/MIDP-2.1 Configuration/CLDC-1.1) Gecko/20100401 S40OviBrowser/1.0.0.11.8",
-        "expect"  :
-        {
-            "name"    : "OviBrowser",
-            "version" : "1.0.0.11.8",
-            "major"   : "1"
-        }
-    },
    {
        "desc"    : "PhantomJS",
        "ua"      : "Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/534.34 (KHTML, like Gecko) PhantomJS/1.9.2 Safari/534.34",
@@ -1369,7 +1039,7 @@
        }
    },
    {
-        "desc"    : "QQBrowser",
+        "desc"    : "QQ",
        "ua"      : "Mozilla/5.0 (Linux; U; Android 4.4.4; zh-cn; OPPO R7s Build/KTU84P) AppleWebKit/537.36 (KHTML, like Gecko)Version/4.0 Chrome/37.0.0.0 MQQBrowser/7.1 Mobile Safari/537.36",
        "expect"  :
        {
@@ -1378,36 +1048,6 @@
            "major"   : "7"
        }
    },
-    {
-        "desc"    : "QQBrowser",
-        "ua"      : "Mozilla/5.0 (Linux; U; Android 9; zh-cn; vivo X21 Build/PKQ1.180819.001) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/66.0.3359.126 MQQBrowser/9.9 Mobile Safari/537.36",
-        "expect"  :
-        {
-            "name"    : "QQBrowser",
-            "version" : "9.9",
-            "major"   : "9"
-        }
-    },
-    {
-        "desc"    : "Quark",
-        "ua"      : "Mozilla/5.0 (Linux; U; Android 12; zh-Hans-CN; JLH-AN00 Build/HONORJLH-AN00) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/78.0.3904.108 Quark/5.8.2.221 Mobile Safari/537.36",
-        "expect"  :
-        {
-            "name"    : "Quark",
-            "version" : "5.8.2.221",
-            "major"   : "5"
-        }
-    },
-    {
-        "desc"    : "Quark",
-        "ua"      : "mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/112.0.0.0 safari/537.36 quarkpc/1.5.5.75",
-        "expect"  :
-        {
-            "name"    : "Quark",
-            "version" : "1.5.5.75",
-            "major"   : "1"
-        }
-    },
    {
        "desc"    : "QupZilla",
        "ua"      : "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/538.1 (KHTML, like Gecko) QupZilla/1.8.9 Safari/538.1",
@@ -1418,16 +1058,6 @@
            "major"   : "1"
        }
    },
-    {
-        "desc"    : "Rekonq 2",
-        "ua"      : "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.21 (KHTML, like Gecko) rekonq/2.2.1 Safari/537.21",
-        "expect"  :
-        {
-            "name"    : "rekonq",
-            "version" : "2.2.1",
-            "major"   : "2"
-        }
-    },
    {
        "desc"    : "RockMelt",
        "ua"      : "Mozilla/5.0 (Windows; U; Windows NT 6.1; en-US) AppleWebKit/534.7 (KHTML, like Gecko) RockMelt/0.8.36.78 Chrome/7.0.517.44 Safari/534.7",
@@ -1459,41 +1089,11 @@
        }
    },
    {
-        "desc"    : "Samsung Internet for Android",
+        "desc"    : "Samsung Browser",
        "ua"      : "Mozilla/5.0 (Linux; Android 6.0.1; SAMSUNG-SM-G925A Build/MMB29K) AppleWebKit/537.36 (KHTML, like Gecko) SamsungBrowser/4.0 Chrome/44.0.2403.133 Mobile Safari/537.36",
        "expect"  :
        {
-            "name"    : "Samsung Internet",
-            "version" : "4.0",
-            "major"   : "4"
-        }
-    },
-    {
-        "desc"    : "Samsung Internet for Tizen Mobile",
-        "ua"      : "Mozilla/5.0 (Linux; Tizen 2.3; SAMSUNG SM-Z130H) AppleWebKit/537.3 (KHTML, like Gecko) SamsungBrowser/1.0 Mobile Safari/537.3",
-        "expect"  :
-        {
-            "name"    : "Samsung Internet",
-            "version" : "1.0",
-            "major"   : "1"
-        }
-    },
-    {
-        "desc"    : "Samsung Internet for Smart-TV",
-        "ua"      : "Mozilla/5.0 (SMART-TV; Linux; Tizen 2.3) AppleWebkit/538.1 (KHTML, like Gecko) SamsungBrowser/1.0 TV Safari/538.1",
-        "expect"  :
-        {
-            "name"    : "Samsung Internet",
-            "version" : "1.0",
-            "major"   : "1"
-        }
-    },
-    {
-        "desc"    : "Samsung Internet for Gear VR",
-        "ua"      : "Mozilla/5.0 (Linux; Android 5.0.2; SAMSUNG SM-G925K Build/LRX22G) AppleWebKit/537.36 (KHTML, like Gecko) SamsungBrowser/4.0 Chrome/44.0.2403.133 Mobile VR Safari/537.36",
-        "expect"  :
-        {
-            "name"    : "Samsung Internet",
+            "name"    : "Samsung Browser",
            "version" : "4.0",
            "major"   : "4"
        }
@@ -1537,37 +1137,6 @@
            "version" : "2.0",
            "major"   : "2"
        }
-    },    
-    {
-        "desc"    : "Sleipnir",
-        "ua"      : "Mozilla/5.0 (Linux; Android 10; SOV37 Build/52.1.C.0.220; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/123.0.6312.120 Mobile Safari/537.36 Sleipnir/3.7.5",
-        "expect"  :
-        {
-            "name"    : "Sleipnir",
-            "version" : "3.7.5",
-            "major"   : "3"
-        }
-    },
-
-    {
-        "desc"    : "Sleipnir",
-        "ua"      : "Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; SV1; Sleipnir 2.8.4)",
-        "expect"  :
-        {
-            "name"    : "Sleipnir",
-            "version" : "2.8.4",
-            "major"   : "2"
-        }
-    },
-    {
-        "desc"    : "Sleipnir",
-        "ua"      : "Mozilla/4.0 (compatible; MSIE 7.0; Windows NT 5.1; Trident/4.0; .NET CLR 1.1.4322; .NET CLR 2.0.50727; InfoPath.1; .NET CLR 3.0.04506.648; .NET CLR 3.5.21022) Sleipnir/2.8.4",
-        "expect"  :
-        {
-            "name"    : "Sleipnir",
-            "version" : "2.8.4",
-            "major"   : "2"
-        }
    },
    {
        "desc"    : "SlimBrowser",
@@ -1680,7 +1249,7 @@
        }
    },
    {
-        "desc"    : "UP.Browser",
+        "desc"    : "UPBrowser",
        "ua"      : "BenQ-CF61/1.00/WAP2.0/MIDP2.0/CLDC1.0 UP.Browser/6.3.0.4.c.1.102 (GUI) MMP/2.0",
        "expect"  :
        {
@@ -1730,43 +1299,13 @@
        }
    },
    {
-        "desc"    : "Vivaldi on Mac",
-        "ua"      : "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_13_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/73.0.3683.88 Safari/537.36 Vivaldi/2.4.1488.36",
+        "desc"    : "Viera",
+        "ua"      : "HbbTV/1.2.1 (;Panasonic;VIERA 2015;3.014;a001-003 4000-0000;)",
        "expect"  :
        {
-            "name"    : "Vivaldi",
-            "version" : "2.4.1488.36",
-            "major"   : "2"
-        }
-    },
-    {
-        "desc"    : "Vivo Browser",
-        "ua"      : "Mozilla/5.0 (Linux; Android 13; 23049RAD8C; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/87.0.4280.141 Mobile Safari/537.36 VivoBrowser/16.7.1.1",
-        "expect"  :
-        {
-            "name"    : "Vivo Browser",
-            "version" : "16.7.1.1",
-            "major"   : "16"
-        }
-    },
-    {
-        "desc"    : "w3m",
-        "ua"      : "w3m/0.5.1",
-        "expect"  :
-        {
-            "name"    : "w3m",
-            "version" : "0.5.1",
-            "major"   : "0"
-        }
-    },
-    {
-        "desc"    : "Wolvic",
-        "ua"      : "Mozilla/5.0 (Android 12; Mobile VR; rv:121.0) Gecko/121.0 Firefox/121.0 Wolvic/1.6.1",
-        "expect"  :
-        {
-            "name"    : "Wolvic",
-            "version" : "1.6.1",
-            "major"   : "1"
+            "name"    : "VIERA",
+            "version" : "undefined",
+            "major"   : "undefined"
        }
    },
    {
@@ -1789,56 +1328,6 @@
            "major"   : "22"
        }
    },
-    {
-        "desc"    : "Yandex",
-        "ua"      : "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/110.0.0.0 YaBrowser/23.3.0.2246 Yowser/2.5 Safari/537.36",
-        "expect"  :
-        {
-            "name"    : "Yandex",
-            "version" : "23.3.0.2246",
-            "major"   : "23"
-        }
-    },
-    {
-        "desc"    : "Yandex on Android",
-        "ua"      : "Mozilla/5.0 (Linux; arm_64; Android 13; SM-G965F) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/113.0.5672.76 YaBrowser/21.3.4.59 Mobile Safari/537.36",
-        "expect"  :
-        {
-            "name"    : "Yandex",
-            "version" : "21.3.4.59",
-            "major"   : "21"
-        }
-    },
-    {
-        "desc"    : "Yandex on iPhone",
-        "ua"      : "Mozilla/5.0 (iPhone; CPU iPhone OS 16_4_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/16.4 YaBrowser/23.3.3.330 Mobile/15E148 Safari/604.1",
-        "expect"  :
-        {
-            "name"    : "Yandex",
-            "version" : "23.3.3.330",
-            "major"   : "23"
-        }
-    },
-    {
-        "desc"    : "Yandex on iPad",
-        "ua"      : "Mozilla/5.0 (iPad; CPU OS 16_4_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/16.4 YaBrowser/23.3.3.330 Mobile/15E148 Safari/605.1",
-        "expect"  :
-        {
-            "name"    : "Yandex",
-            "version" : "23.3.3.330",
-            "major"   : "23"
-        }
-    },
-    {
-        "desc"    : "Yandex on iPod",
-        "ua"      : "Mozilla/5.0 (iPod touch; CPU iPhone 16_4_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/16.4 YaBrowser/23.3.3.330 Mobile/15E148 Safari/605.1",
-        "expect"  :
-        {
-            "name"    : "Yandex",
-            "version" : "23.3.3.330",
-            "major"   : "23"
-        }
-    },
    {
        "desc"    : "Puffin",
        "ua"      : "Mozilla/5.0 (Linux; Android 6.0.1; Lenovo P2a42 Build/MMB29M; en-us) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/42.0.2311.135 Mobile Safari/537.36 Puffin/6.0.8.15804AP",
@@ -1934,27 +1423,17 @@
        "ua"      : "Mozilla/5.0 (iPhone; CPU iPhone OS 9_1 like Mac OS X) AppleWebKit/601.1.46 (KHTML, like Gecko) FxiOS/1.1 Mobile/13B143 Safari/601.1.46",
        "expect"  :
        {
-            "name"    : "Firefox",
+            "name"    : "Mobile Firefox",
            "version" : "1.1",
            "major"   : "1"
        }
    },
-    {
-        "desc"    : "Firefox on iOS",
-        "ua"      : "Mozilla/5.0 (iPhone; CPU iPhone OS 16_4_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) FxiOS/112.0 Mobile/15E148 Safari/605.1.15",
-        "expect"  :
-        {
-            "name"    : "Firefox",
-            "version" : "112.0",
-            "major"   : "112"
-        }
-    },
    {
        "desc"    : "Firefox iOS using iPad",
        "ua"      : "Mozilla/5.0 (iPad; CPU iPhone OS 8_3 like Mac OS X) AppleWebKit/600.1.4 (KHTML, like Gecko) FxiOS/1.0 Mobile/12F69 Safari/600.1.4",
        "expect"  :
        {
-            "name"    : "Firefox",
+            "name"    : "Mobile Firefox",
            "version" : "1.0",
            "major"   : "1"
        }
@@ -1964,7 +1443,7 @@
        "ua"      : "Mozilla/5.0 (iPhone; CPU iPhone OS 10_0_2 like Mac OS X) AppleWebKit/602.1.50 (KHTML, like Gecko) Mobile/14A456 QQ/6.5.3.410 V1_IPH_SQ_6.5.3_1_APP_A Pixel/1080 Core/UIWebView NetType/WIFI Mem/26",
        "expect"  :
        {
-            "name"    : "QQBrowser",
+            "name"    : "QQ",
            "version" : "6.5.3.410",
            "major"   : "6"
        }
@@ -1974,17 +1453,37 @@
        "ua"      : "Mozilla/5.0 (Linux; Android 6.0; PRO 6 Build/MRA58K) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/37.0.0.0 Mobile MQQBrowser/6.8 TBS/036824 Safari/537.36 V1_AND_SQ_6.5.8_422_YYB_D PA QQ/6.5.8.2910 NetType/WIFI WebP/0.3.0 Pixel/1080",
        "expect"  :
        {
-            "name"    : "QQBrowser",
+            "name"    : "QQ",
            "version" : "6.5.8.2910",
            "major"   : "6"
        }
    },
+    {
+        "desc"    : "baidu app on iOS",
+        "ua"      : "Mozilla/5.0 (iPhone; CPU iPhone OS 12_1_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/16C101 main%2F1.0 baiduboxapp/11.12.0.18 (Baidu; P2 12.1.2)",
+        "expect"  :
+        {
+            "name"    : "baiduboxapp",
+            "version" : "11.12.0.18",
+            "major"   : "11"
+        }
+    },
+    {
+        "desc"    : "baidu app on Android",
+        "ua"      : "Mozilla/5.0 (Linux; Android 8.1.0; BKK-AL10 Build/HONORBKK-AL10; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/63.0.3239.83 Mobile Safari/537.36 T7/11.11 baiduboxapp/11.11.0.0 (Baidu; P1 8.1.0)",
+        "expect"  :
+        {
+            "name"    : "baiduboxapp",
+            "version" : "11.11.0.0",
+            "major"   : "11"
+        }
+    },
    {
        "desc"    : "WeChat Desktop for Windows Built-in Browser",
        "ua"      : "Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/39.0.2171.95 Safari/537.36 MicroMessenger/6.5.2.501 NetType/WIFI WindowsWechat QBCore/3.43.901.400 QQBrowser/9.0.2524.400",
        "expect"  :
        {
-            "name"    : "WeChat",
+            "name"    : "WeChat(Win) Desktop",
            "version" : "3.43.901.400",
            "major"   : "3"
        }
@@ -1994,7 +1493,7 @@
        "ua"      : "mozilla/5.0 (windows nt 10.0; wow64) applewebkit/537.36 (khtml, like gecko) chrome/53.0.2785.116 safari/537.36 qbcore/4.0.1301.400 qqbrowser/9.0.2524.400 mozilla/5.0 (windows nt 6.1; wow64) applewebkit/537.36 (khtml, like gecko) chrome/81.0.4044.138 safari/537.36 nettype/wifi micromessenger/7.0.20.1781(0x6700143b) windowswechat",
        "expect"  :
        {
-            "name"    : "WeChat",
+            "name"    : "WeChat(Win) Desktop",
            "version" : "4.0.1301.400",
            "major"   : "4"
        }
@@ -2024,19 +1523,7 @@
        "ua"      : "Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/49.0.2623.221 Safari/537.36 SE 2.X MetaSr 1.0",
        "expect"  :
        {
-            "name"    : "Sogou Explorer",
-            "version" : "1.0",
-            "major"   : "1"
-        }
-    },
-    {
-        "desc"    : "Sogou Mobile Browser",
-        "ua"      : "Mozilla/5.0 (iPhone; CPU iPhone OS 10_3_2 like Mac OS X) AppleWebKit/603.2.4 (KHTML, like Gecko) Version/4.0 Mobile Safari/534.30 SogouMSE,SogouMobileBrowser/3.7.4",
-        "expect"  :
-        {
-            "name"    : "Sogou Mobile",
-            "version" : "3.7.4",
-            "major"   : "3"
+            "name"    : "MetaSr"
        }
    },
    {
@@ -2047,6 +1534,16 @@
            "name"    : "LBBROWSER"
        }
    },
+    {
+        "desc"    : "BaiDu Browser",
+        "ua"      : "Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/47.0.2526.106 BIDUBrowser/8.7 Safari/537.36",
+        "expect"  :
+        {
+            "name"    : "BIDUBrowser",
+            "version" : "8.7",
+            "major"   : "8"
+        }
+    },
    {
        "desc"    : "2345 Browser",
        "ua"      : "Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.90 Safari/537.36 2345Explorer/9.2.1.17116",
@@ -2115,46 +1612,6 @@
            "name"    : "LinkedIn"
        }
    },
-    {
-        "desc"    : "Links in Linux",
-        "ua"      : "Links (2.xpre7; Linux 2.4.18 i586; x)",
-        "expect"  :
-        {
-            "name"    : "Links",
-            "version" : "2.xpre7",
-            "major"   : "2"
-        }
-    },
-    {
-        "desc"    : "Links in Mac",
-        "ua"      : "Links (2.1pre33; Darwin 8.11.0 Power Macintosh; 169x55)",
-        "expect"  :
-        {
-            "name"    : "Links",
-            "version" : "2.1pre33",
-            "major"   : "2"
-        }
-    },
-    {
-        "desc"    : "Links in NetBSD",
-        "ua"      : "Links (2.29; NetBSD 10.0 i386; GNU C 10.5; x)",
-        "expect"  :
-        {
-            "name"    : "Links",
-            "version" : "2.29",
-            "major"   : "2"
-        }
-    },
-    {
-        "desc"    : "Links in FreeBSD",
-        "ua"      : "Links (2.1pre15; FreeBSD 5.3-RELEASE i386; 196x84)",
-        "expect"  :
-        {
-            "name"    : "Links",
-            "version" : "2.1pre15",
-            "major"   : "2"
-        }
-    },
    {
        "desc"    : "Safari including comma in minor version number",
        "ua"      : "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_6) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/15.6,2 Safari/605.1.15",
@@ -2288,7 +1745,7 @@
        "ua"      : "Mozilla/5.0 (Linux; Android 7.1.2; Nexus 5X Build/N2G47W) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/58.0.3029.83 Mobile Safari/537.36",
        "expect"  :
        {
-            "name"    : "Chrome",
+            "name"    : "Mobile Chrome",
            "version" : "58.0.3029.83",
            "major"   : "58"
        }
@@ -2298,7 +1755,7 @@
        "ua"      : "Mozilla/5.0 (Linux; Android 7.1.2; Nexus 5X Build/N2G47W) AppleWebKit/537.36 (KHTML, like Gecko) FxiOS/7.5b3349 Mobile/14F89 Safari/603.2.4",
        "expect"  :
        {
-            "name"    : "Firefox",
+            "name"    : "Mobile Firefox",
            "version" : "7.5b3349",
            "major"   : "7"
        }
@@ -2308,39 +1765,9 @@
        "ua"      : "Mozilla/5.0 (Android 5.0; Mobile; rv:41.0) Gecko/41.0 Firefox/41.0",
        "expect"  :
        {
-            "name"    : "Firefox",
+            "name"    : "Mobile Firefox",
            "version" : "41.0",
            "major"   : "41"
        }
-    },
-    {
-        "desc"    : "Snapchat",
-        "ua"      : "Mozilla/5.0 (iPhone; CPU iPhone OS 16_0_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/16.0 Mobile/15E148 Snapchat/12.33.0.36 (like Safari/8614.1.25.0.31, panda)",
-        "expect"  :
-        {
-            "name"    : "Snapchat",
-            "version" : "12.33.0.36",
-            "major"   : "12"
-        }
-    },
-    {
-        "desc"    : "Twitter",
-        "ua"      : "Mozilla/5.0 (Linux; Android 13; CPH2531 Build/SP1A.210812.016; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/123.0.6312.120 Mobile Safari/537.36 TwitterAndroid",
-        "expect"  :
-        {
-            "name"    : "Twitter",
-            "version" : "undefined",
-            "major"   : "undefined"
-        }
-    },
-    {
-        "desc"    : "Twitter",
-        "ua"      : "Mozilla/5.0 (iPad; CPU OS 15_7 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/19H12 Twitter for iPhone/10.34",
-        "expect"  :
-        {
-            "name"    : "Twitter",
-            "version" : "10.34",
-            "major"   : "10"
-        }
    }
-]
+]
--- a/test/cpu-test.json
+++ b/test/cpu-test.json
@@ -23,46 +23,6 @@
            "architecture"  : "amd64"
        }
    },
-    {
-        "desc"    : "Vivaldi on Windows",
-        "ua"      : "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/113.0.0.0 Safari/537.36 Vivaldi/6.0.2979.18",
-        "expect"  :
-        {
-            "architecture"  : "amd64"
-        }
-    },
-    {
-        "desc"    : "Vivaldi on Windows",
-        "ua"      : "Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/113.0.0.0 Safari/537.36 Vivaldi/6.0.2979.18",
-        "expect"  :
-        {
-            "architecture"  : "amd64"
-        }
-    },
-    {
-        "desc"    : "Vivaldi on Linux",
-        "ua"      : "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/113.0.0.0 Safari/537.36 Vivaldi/6.0.2979.18",
-        "expect"  :
-        {
-            "architecture"  : "amd64"
-        }
-    },
-    {
-        "desc"    : "Vivaldi on Linux",
-        "ua"      : "Mozilla/5.0 (X11; Linux i686) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/113.0.0.0 Safari/537.36 Vivaldi/6.0.2979.18",
-        "expect"  :
-        {
-            "architecture"  : "ia32"
-        }
-    },
-    {
-        "desc": "Xiaomi POCO M2 Pro",
-        "ua": "Mozilla/5.0 (Linux; arm_64; Android 11; POCO M2 Pro) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/106.0.0.0 YaBrowser/22.11.7.42.00 SA/3 Mobile Safari/537.36",
-        "expect"  :
-        {
-            "architecture"  : "arm64"
-        }
-    },
    {
        "desc"    : "win64",
        "ua"      : "Mozilla/4.0 (compatible; MSIE 7.0; Windows NT 6.2; Win64; x64; Trident/6.0; .NET4.0E; .NET4.0C)",
@@ -246,5 +206,13 @@
        {
            "architecture"  : "irix64"
        }
+    },
+    {
+        "desc"    : "68k",
+        "ua"      : "'Mozilla/1.1 (Macintosh; U; 68K)'",
+        "expect"  : 
+        {
+            "architecture"  : "68k"
+        }
    }
 ]
--- a/test/device-test.json
+++ b/test/device-test.json
--- a/test/os-test.json
+++ b/test/os-test.json
@@ -80,24 +80,6 @@
            "version" : "10"
        }
    },
-    {
-        "desc"    : "WeChat Desktop for Windows Built-in Browser",
-        "ua"      : "Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/39.0.2171.95 Safari/537.36 MicroMessenger/6.5.2.501 NetType/WIFI WindowsWechat QBCore/3.43.901.400 QQBrowser/9.0.2524.400",
-        "expect"  :
-        {
-            "name"    : "Windows",
-            "version" : "7"
-        }
-    },
-    {
-        "desc"    : "WeChat Desktop for Windows Built-in Browser major version in 4",
-        "ua"      : "mozilla/5.0 (windows nt 6.1; wow64) applewebkit/537.36 (khtml, like gecko) chrome/81.0.4044.138 safari/537.36 nettype/wifi micromessenger/7.0.20.1781(0x6700143b) windowswechat",
-        "expect"  :
-        {
-            "name"    : "Windows",
-            "version" : "7"
-        }
-    },
    {
        "desc"    : "Windows RT",
        "ua"      : "Mozilla/5.0 (compatible; MSIE 10.0; Windows NT 6.2; ARM; Trident/6.0)",
@@ -688,7 +670,7 @@
        "ua"      : "Mozilla/5.0 (X11; CrOS x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/99.0.0.0 Safari/537.36",
        "expect"  :
        {
-            "name"    : "Chromium OS",
+            "name"    : "Chrome OS",
            "version" : "undefined"
        }
    },
@@ -697,7 +679,7 @@
        "ua"      : "Mozilla/5.0 (X11; CrOS x86_64 10575.58.0) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/67.0.3396.99 Safari/537.36",
        "expect"  :
        {
-            "name"    : "Chromium OS",
+            "name"    : "Chrome OS",
            "version" : "10575.58.0"
        }
    },
@@ -791,15 +773,6 @@
            "version" : "13.6.1"
        }
    },
-    {
-        "desc": "iOS with Slack App",
-        "ua": "com.tinyspeck.chatlyio/23.04.10 (iPhone; iOS 16.4.1; Scale/3.00)",
-        "expect":
-        {
-            "name"    : "iOS",
-            "version" : "16.4.1"
-        }
-    },
    {
        "desc"    : "watchOS",
        "ua"      : "server-bag [Watch OS,8.4,19S546,Watch3,4]",
@@ -832,7 +805,7 @@
        "ua"      : "Mozilla/4.0 (compatible; MSIE 5.0b1; Mac_PowerPC)",
        "expect"  :
        {
-            "name"    : "Mac OS",
+            "name"    : "macOS",
            "version" : "undefined"
        }
    },
@@ -841,7 +814,7 @@
        "ua"      : "Mozilla/5.0 (Macintosh; Intel Mac OS X x.y; rv:10.0) Gecko/20100101 Firefox/10.0",
        "expect"  :
        {
-            "name"    : "Mac OS",
+            "name"    : "macOS",
            "version" : "x.y"
        }
    },
@@ -850,7 +823,7 @@
        "ua"      : "Mozilla/5.0 (Macintosh; PPC Mac OS X x.y; rv:10.0) Gecko/20100101 Firefox/10.0",
        "expect"  :
        {
-            "name"    : "Mac OS",
+            "name"    : "macOS",
            "version" : "x.y"
        }
    },
@@ -859,7 +832,7 @@
        "ua"      : "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_6_8) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/28.0.1500.95 Safari/537.36",
        "expect"  :
        {
-            "name"    : "Mac OS",
+            "name"    : "macOS",
            "version" : "10.6.8"
        }
    },
--- a/test/test-es6.mjs
+++ b/test/test-es6.mjs
@@ -0,0 +1,27 @@
+import { UAParser } from 'ua-parser-js';
+import { CPUArch, DeviceType, EngineName } from 'ua-parser-js/enums';
+import * as assert from 'assert';
+
+describe('Returns', () => {
+    it('getResult() should returns object', () => {
+        assert.deepEqual(new UAParser('').getResult(), 
+            {
+                ua : '',
+                //ua_ch : { architecture: undefined, bitness: undefined, brands: undefined, fullVersionList: undefined, mobile: false, model: undefined, platform: undefined, platformVersion: undefined },
+                browser: { name: undefined, version: undefined, major: undefined },
+                cpu: { architecture: undefined },
+                device: { vendor: undefined, model: undefined, type: undefined },
+                engine: { name: undefined, version: undefined},
+                os: { name: undefined, version: undefined }
+        });
+    });
+});
+
+describe('Enums', () => {    
+    it('Can use enum', () => {
+        const { cpu, device, engine } = UAParser('Mozilla/5.0 (X11; U; Linux armv7l; en-GB; rv:1.9.2a1pre) Gecko/20090928 Firefox/3.5 Maemo Browser 1.4.1.22 RX-51 N900');
+        assert.strictEqual(cpu.is(CPUArch.ARM), true);
+        assert.strictEqual(device.is(DeviceType.MOBILE), true);
+        assert.strictEqual(engine.is(EngineName.GECKO), true);
+    });
+});
--- a/test/test-extension.js
+++ b/test/test-extension.js
@@ -0,0 +1,36 @@
+const assert = require('assert');
+const safeRegex = require('safe-regex');
+const UAParser = require('ua-parser-js');
+const { Bots, Emails, Tools } = require('ua-parser-js/extensions');
+
+describe('Bots', () => {
+    it('Can detect bots', () => {
+        const googleBot = 'Googlebot-Video/1.0';
+        const msnBot = 'msnbot-media/1.1 (+http://search.msn.com/msnbot.htm)';
+        const bingPreview = 'Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/534+ (KHTML, like Gecko) BingPreview/1.0b';
+        const opera = 'Opera/8.5 (Macintosh; PPC Mac OS X; U; en)';
+        const wget = 'Wget/1.21.1';
+        const facebookBot = 'Mozilla/5.0 (compatible; FacebookBot/1.0; +https://developers.facebook.com/docs/sharing/webmasters/facebookbot/)';
+        const outlook = 'Mozilla/4.0 (compatible; MSIE 7.0; Windows NT 10.0; WOW64; Trident/7.0; .NET4.0C; .NET4.0E; .NET CLR 2.0.50727; .NET CLR 3.0.30729; .NET CLR 3.5.30729; Microsoft Outlook 16.0.9126; Microsoft Outlook 16.0.9126; ms-office; MSOffice 16)';
+        const thunderbird = 'Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.13.0';
+
+        const botParser = new UAParser(Bots);
+        assert.deepEqual(botParser.setUA(googleBot).getBrowser(), {name: "Googlebot-Video", version: "1.0", major: "1", type: "bot"});
+        assert.deepEqual(botParser.setUA(msnBot).getBrowser(), {name: "msnbot-media", version: "1.1", major: "1", type: "bot"});
+        assert.deepEqual(botParser.setUA(bingPreview).getBrowser(), {name: "BingPreview", version: "1.0b", major: "1", type: "bot"});
+        assert.deepEqual(botParser.setUA(opera).getBrowser(), {name: "Opera", version: "8.5", major: "8"});
+
+        // try merging Bots & Tools
+        const botsAndTools = { browser : [...Bots.browser, ...Tools.browser]};
+        const botolParser = new UAParser(botsAndTools);
+        assert.deepEqual(botolParser.setUA(wget).getBrowser(), {name: "Wget", version: "1.21.1", major: "1", type:"tool"});
+        assert.deepEqual(botolParser.setUA(facebookBot).getBrowser(), {name: "FacebookBot", version: "1.0", major: "1", type:"bot"});
+
+        const emailParser = new UAParser(Emails);
+        assert.deepEqual(emailParser.setUA(outlook).getBrowser(), {name: "Microsoft Outlook", version: "16.0.9126", major: "16", type: "email"});
+        assert.deepEqual(emailParser.setUA(thunderbird).getBrowser(), {name: "Thunderbird", version: "78.13.0", major: "78", type: "email"});
+    });
+});
+
+// TODO : move test spec to JSON file
+// TODO : check for safe-regex
--- a/test/test-extension.json
+++ b/test/test-extension.json
@@ -0,0 +1,342 @@
+[{
+    "desc": "Essential PH-1",
+    "ua": "Mozilla/5.0 (Linux; Android 9; PH-1 Build/PPR1.180905.036) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/69.0.3497.86 Mobile Safari/537.36",
+    "expect": {
+        "vendor": "Essential",
+        "model": "PH-1",
+        "type": "mobile"
+    }
+},
+{
+    "desc": "Gigaset Tablet",
+    "ua": "Mozilla/5.0 (Linux; Android 4.2.2; Gigaset QV830 Build/JDQ39) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Safari/537.36",
+    "expect": {
+        "vendor": "Gigaset",
+        "model": "QV830",
+        "type": "tablet"
+    }
+},
+{
+    "desc": "RCA Voyager III Tablet",
+    "ua": "Mozilla/5.0 (Linux; Android 6.0.1; RCT6973W43 Build/MMB29M) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Safari/537.36",
+    "expect": {
+        "vendor": "RCA",
+        "model": "RCT6973W43",
+        "type": "tablet"
+    }
+},
+{
+    "desc": "RCA Voyager II Tablet",
+    "ua": "Mozilla/5.0 (Linux; Android 5.0; RCT6773W22B Build/LRX21M) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Safari/537.36",
+    "expect": {
+        "vendor": "RCA",
+        "model": "RCT6773W22B",
+        "type": "tablet"
+    }
+},
+{
+    "desc": "Verizon Quanta Tablet",
+    "ua": "Mozilla/5.0 (Linux; Android 4.4.2; QMV7B Build/KOT49H) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Safari/537.36",
+    "expect": {
+        "vendor": "Verizon",
+        "model": "QMV7B",
+        "type": "tablet"
+    }
+},
+{
+    "desc": "Verizon Ellipsis 8 Tablet",
+    "ua": "Mozilla/5.0 (Linux; Android 5.1.1; QTAQZ3 Build/LMY47V) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Safari/537.36",
+    "expect": {
+        "vendor": "Verizon",
+        "model": "QTAQZ3",
+        "type": "tablet"
+    }
+},
+{
+    "desc": "Verizon Ellipsis 8HD Tablet",
+    "ua": "Mozilla/5.0 (Linux; Android 6.0.1; QTASUN1 Build/MMB29M) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/51.0.2704.81 Safari/537.36",
+    "expect": {
+        "vendor": "Verizon",
+        "model": "QTASUN1",
+        "type": "tablet"
+    }
+},
+{
+    "desc": "Dell Venue 8 Tablet",
+    "ua": "Mozilla/5.0 (Linux; Android 4.4.2; Venue 8 3830 Build/KOT49H) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Safari/537.36",
+    "expect": {
+        "vendor": "Dell",
+        "model": "Venue 8 3830",
+        "type": "tablet"
+    }
+},
+{
+    "desc": "Dell Venue 7 Tablet",
+    "ua": "Mozilla/5.0 (Linux; Android 4.4.2; Venue 7 3730 Build/KOT49H) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Safari/537.36",
+    "expect": {
+        "vendor": "Dell",
+        "model": "Venue 7 3730",
+        "type": "tablet"
+    }
+},
+{
+    "desc": "Barnes & Noble Nook HD+ Tablet",
+    "ua": "Mozilla/5.0 (Linux; U; Android 4.1.2; en-us; Barnes & Noble Nook HD+ Build/JZO54K; CyanogenMod-10) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Mobile Safari/534.30",
+    "expect": {
+        "vendor": "Barnes & Noble",
+        "model": "Nook HD+",
+        "type": "tablet"
+    }
+},
+{
+    "desc": "Barnes & Noble V400 Tablet",
+    "ua": "Mozilla/5.0 (Linux; Android 4.0.4; BNTV400 Build/IMM76L) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/42.0.2311.111 Safari/537.36",
+    "expect": {
+        "vendor": "Barnes & Noble",
+        "model": "V400",
+        "type": "tablet"
+    }
+},
+{
+    "desc": "NuVision TM101A540N Tablet",
+    "ua": "Mozilla/5.0 (Linux; Android 5.1; TM101A540N Build/LMY47I; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/50.0.2661.86 Safari/537.36",
+    "expect": {
+        "vendor": "NuVision",
+        "model": "TM101A540N",
+        "type": "tablet"
+    }
+},
+{
+    "desc": "ZTE-Z431",
+    "ua": "ZTE-Z431/1.4.0 NetFront/4.2 QTV5.1 Profile/MIDP-2.1 Configuration/CLDC-1.1",
+    "expect": {
+        "vendor": "ZTE",
+        "model": "Z431",
+        "type": "mobile"
+    }
+},
+{
+    "desc": "ZTE",
+    "ua": "Mozilla/5.0 (Linux; U; Android 4.1.2; en-us; ZTE-Z740G Build/JZO54K) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Mobile Safari/534.30",
+    "expect": {
+        "vendor": "ZTE",
+        "model": "Z740G",
+        "type": "mobile"
+    }
+},
+{
+    "desc": "ZTE K Series Tablet",
+    "ua": "Mozilla/5.0 (Linux; Android 6.0.1; K88 Build/MMB29M) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Safari/537.36",
+    "expect": {
+        "vendor": "ZTE",
+        "model": "K88",
+        "type": "tablet"
+    }
+},
+{
+    "desc": "ZTE Nubia Red Magic 3",
+    "ua": "Mozilla/5.0 (Linux; Android 9; NX629J Build/PKQ1.190321.001; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/66.0.3359.126 MQQBrowser/6.2 TBS/45016 Mobile Safari/537.36 MMWEBID/4064 MicroMessenger/7.0.10.1580(0x27000A34) Process/tools NetType/WIFI Language/zh_CN ABI/arm64",
+    "expect": {
+        "vendor": "ZTE",
+        "model": "NX629J",
+        "type": "mobile"
+    }
+},
+{
+    "desc": "ZTE Blade A5",
+    "ua": "Mozilla/5.0 (Linux; Android 9; ZTE Blade A5 2019) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/79.0.3945.116 Mobile Safari/537.36",
+    "expect": {
+        "vendor": "ZTE",
+        "model": "Blade A5 2019",
+        "type": "mobile"
+    }
+},
+{
+    "desc": "ZTE BLADE V0730",
+    "ua": "Mozilla/5.0 (Linux; Android 6.0; ZTE BLADE V0730) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/79.0.3945.116 Mobile Safari/537.36",
+    "expect": {
+        "vendor": "ZTE",
+        "model": "BLADE V0730",
+        "type": "mobile"
+    }
+},
+{
+    "desc": "ZTE B2017G",
+    "ua": "Mozilla/5.0 (Linux; Android 7.1.1; ZTE B2017G) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/79.0.3945.93 Mobile Safari/537.36",
+    "expect": {
+        "vendor": "ZTE",
+        "model": "B2017G",
+        "type": "mobile"
+    }
+},
+{
+    "desc": "Swizz GEN610",
+    "ua": "Mozilla/5.0 (Linux; Android 4.4.2; GEN610 Build/KOT49H) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/47.0.2526.83 Mobile Safari/537.36",
+    "expect": {
+        "vendor": "Swiss",
+        "model": "GEN610",
+        "type": "mobile"
+    }
+},
+{
+    "desc": "Swizz ZUR700",
+    "ua": "Mozilla/5.0 (Linux; Android 4.4.2; ZUR700 Build/KVT49L) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/41.0.2272.96 Safari/537.36",
+    "expect": {
+        "vendor": "Swiss",
+        "model": "ZUR700",
+        "type": "tablet"
+    }
+},
+{
+    "desc": "Zeki TB782b Tablet",
+    "ua": "Mozilla/5.0 (Linux; U; Android 4.0.4; en-US; TB782B Build/IMM76D) AppleWebKit/534.31 (KHTML, like Gecko) UCBrowser/9.0.2.299 U3/0.8.0 Mobile Safari/534.31",
+    "expect": {
+        "vendor": "Zeki",
+        "model": "TB782B",
+        "type": "tablet"
+    }
+},
+{
+    "desc": "Dragon Touch Tablet",
+    "ua": "Mozilla/5.0 (Linux; Android 4.0.4; DT9138B Build/IMM76D) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/29.0.1547.72 Mobile Safari/537.36",
+    "expect": {
+        "vendor": "Dragon Touch",
+        "model": "9138B",
+        "type": "tablet"
+    }
+},
+{
+    "desc": "Insignia Tablet",
+    "ua": "Mozilla/5.0 (Linux; U; Android 6.0.1; NS-P08A7100 Build/MMB29M; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/56.0.2924.87 Safari/537.36",
+    "expect": {
+        "vendor": "Insignia",
+        "model": "NS-P08A7100",
+        "type": "tablet"
+    }
+},
+{
+    "desc": "Voice Xtreme V75",
+    "ua": "Mozilla/5.0 (Linux; U; Android 4.2.1; en-us; V75 Build/JOP40D) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Mobile Safari/534.30",
+    "expect": {
+        "vendor": "Voice",
+        "model": "V75",
+        "type": "mobile"
+    }
+},
+{
+    "desc": "LvTel V11",
+    "ua": "Mozilla/5.0 (Linux; Android 5.1.1; V11 Build/LMY47V) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/39.0.0.0 Safari/537.36",
+    "expect": {
+        "vendor": "LvTel",
+        "model": "V11",
+        "type": "mobile"
+    }
+},
+{
+    "desc": "Envizen Tablet V100MD",
+    "ua": "Mozilla/5.0 (Linux; U; Android 4.1.1; en-us; V100MD Build/V100MD.20130816) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Safari/534.30",
+    "expect": {
+        "vendor": "Envizen",
+        "model": "V100MD",
+        "type": "tablet"
+    }
+},
+{
+    "desc": "Rotor Tablet",
+    "ua": "mozilla/5.0 (linux; android 5.0.1; tu_1491 build/lrx22c) applewebkit/537.36 (khtml, like gecko) chrome/43.0.2357.93 safari/537.36",
+    "expect": {
+        "vendor": "Rotor",
+        "model": "1491",
+        "type": "tablet"
+    }
+},
+{
+    "desc": "MachSpeed Tablets",
+    "ua": "Mozilla/5.0 (Linux; Android 4.4.2; Trio 7.85 vQ Build/Trio_7.85_vQ) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/30.0.0.0 Safari/537.36",
+    "expect": {
+        "vendor": "MachSpeed",
+        "model": "Trio 7.85 vQ",
+        "type": "tablet"
+    }
+},
+{
+    "desc": "Trinity Tablets",
+    "ua": "Mozilla/5.0 (Linux; Android 5.0.1; Trinity T101 Build/LRX22C) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/47.0.2526.83 Safari/537.36",
+    "expect": {
+        "vendor": "Trinity",
+        "model": "T101",
+        "type": "tablet"
+    }
+},
+{
+    "desc": "NextBook Next7",
+    "ua": "Mozilla/5.0 (Linux; U; Android 4.0.4; en-us; Next7P12 Build/IMM76I) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Safari/534.30",
+    "expect": {
+        "vendor": "NextBook",
+        "model": "Next7P12",
+        "type": "tablet"
+    }
+},
+{
+    "desc": "NextBook Tablets",
+    "ua": "Mozilla/5.0 (Linux; Android 5.0; NXA8QC116 Build/LRX21V) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Safari/537.36",
+    "expect": {
+        "vendor": "NextBook",
+        "model": "NXA8QC116",
+        "type": "tablet"
+    }
+},
+{
+    "desc": "Le Pan Tablets",
+    "ua": "Mozilla/5.0 (Linux; Android 4.2.2; Le Pan TC802A Build/JDQ39) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Safari/537.36",
+    "expect": {
+        "vendor": "Le Pan",
+        "model": "TC802A",
+        "type": "tablet"
+    }
+},
+{
+    "desc": "Le Pan Tablets",
+    "ua": "Mozilla/5.0 (Linux; Android 4.2.2; Le Pan TC802A Build/JDQ39) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Safari/537.36",
+    "expect": {
+        "vendor": "Le Pan",
+        "model": "TC802A",
+        "type": "tablet"
+    }
+},
+{
+    "desc": "AT&T Radiant Core U304AA",
+    "ua": "Dalvik/2.1.0 (Linux; U; Android 9; U304AA Build/P00610)",
+    "expect": {
+        "vendor": "AT&T",
+        "model": "U304AA",
+        "type": "mobile"
+    }
+},
+{
+    "desc": "Vodafone Smart Tab 4G",
+    "ua": "Mozilla/5.0 (Linux; Android 4.4.4; Vodafone Smart Tab 4G) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/81.0.4044.138 Safari/537.36",
+    "expect": {
+        "vendor": "Vodafone",
+        "model": "Smart Tab 4G",
+        "type": "tablet"
+    }
+},
+{
+    "desc": "Vodafone Smart ultra 6",
+    "ua": "Mozilla/5.0 (Linux; Android 5.0.2; Vodafone Smart ultra 6 Build/LRX22G) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/44.0.2403.133 Mobile Safari/537.36",
+    "expect": {
+        "vendor": "Vodafone",
+        "model": "Smart ultra 6",
+        "type": "tablet"
+    }
+},
+{
+    "desc": "4ife 4K Smart TV Box",
+    "ua": "Mozilla/5.0 (Linux; Android 4.4.2; 4ife 4K Smart TV Box Build/KOT49H) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/30.0.0.0 Safari/537.36 Vinebre",
+    "expect": {
+        "vendor": "undefined",
+        "model": "undefined",
+        "type": "smarttv"
+    }
+}]
--- a/test/test.js
+++ b/test/test.js
Author	SHA1	Message	Date
Faisal Salman	5d2acd8fe7	Bump version 2.0.0-alpha.2	2023-04-02 18:00:48 +07:00
Faisal Salman	359cbecd32	Fix #640 - Self-return thenable causing infinite-loop when awaited	2023-04-02 05:55:33 +07:00
Faisal Salman	1e80cf3533	Only set browser as Chromium if no other brand was found	2023-03-29 23:42:30 +07:00
Faisal Salman	b09878934f	Prevent altering the result when supplied user-agent is different from current user-agent	2023-03-29 22:53:07 +07:00
Faisal Salman	30de983043	Alpha release of v2.0	2023-03-29 10:44:37 +07:00
Faisal Salman	894512c72f	Move some low-usage devices to extension as ExtraDevices	2023-03-29 10:14:20 +07:00
Faisal Salman	4af26c7a5e	Add new browser: TikTok User-agent example: - https://user-agents.net/s/o2A0qRAZIN - https://explore.whatismybrowser.com/useragents/parse/241240920-android-webview-android-jny-l22-blink	2023-03-29 05:58:44 +07:00
Faisal Salman	a6c85d0148	Add new engine: LibWeb + Add new OS: SerenityOS	2023-03-29 04:52:26 +07:00
Faisal Salman	7a4fe6f454	Fix #227 #237 #488 : Provide extensions - initial work	2023-03-28 10:41:59 +07:00
Faisal Salman	af65fd6960	Fix #300 : Provide enums - initial work	2023-03-28 08:36:48 +07:00
Faisal Salman	ba28d33d51	Move generated .mjs file to /src	2023-03-27 22:37:42 +07:00
Faisal Salman	82567c28ab	Fix #639 : Only check for Brave properties if given userAgent match the current userAgent	2023-03-26 12:46:04 +07:00
Faisal Salman	e70d09a1f8	Fix #489 : ARM arch detection & create test that simulates HTTP headers sent from an Apple silicon	2023-03-25 07:21:17 +07:00
Faisal Salman	3af8e1e272	Upon creating new item, only pass regex map thats relevant with its itemType	2023-03-23 21:43:19 +07:00
Faisal Salman	172f57ffea	Fix #636 - Add new browser: HeyTap \| Fix #248 - Add 'Mobile' prefix for mobile version of Chrome, Firefox, Safari	2023-03-22 11:51:28 +07:00
Faisal Salman	33f02099d1	Fix #678 - Improve Yandex detection	2023-03-22 11:18:52 +07:00
Faisal Salman	33df5dc698	Fix #637 - Detect Safari on iPhone as Safari Mobile	2023-03-22 11:02:26 +07:00
Faisal Salman	49d6422ebd	Mistype in iPad detection	2023-03-22 10:53:15 +07:00
Faisal Salman	a1d816ae21	Fix #519 #521 #616 - Improve iPhone & iOS detection	2023-03-20 23:37:19 +07:00
Faisal Salman	0097b211db	Merge branch 'shaharmor-mobile-browsers' into develop	2023-03-20 11:08:31 +07:00
Faisal Salman	6b3fc3e0f1	Small refactor	2023-03-20 11:05:42 +07:00
Faisal Salman	08436ce4f5	Merge branch 'mobile-browsers' of https://github.com/shaharmor/ua-parser-js	2023-03-19 11:05:25 +07:00
Faisal Salman	df1a1c7bb4	Fix #624 - Detect Amazon Echo	2023-03-18 18:50:42 +07:00
Faisal Salman	31f94f3a51	Fix #441 #591 - Generate ESM version of main CJS file at build time	2023-03-18 17:41:42 +07:00
Faisal Salman	6821276669	Fix #218 #491 #517 #518 - introduce breaking changes: "Mac OS" => "macOS", "Chromium OS" => "Chrome OS"	2023-03-18 16:39:01 +07:00
Faisal Salman	41f8d76968	Remove `is()` & `toString()` prototype from `getResult()` data	2023-03-18 10:38:38 +07:00
Faisal Salman	c78346d3b4	Returns `withClientHints()` as `Thenable` in nodejs / non-client-hints browsers	2023-03-15 23:37:41 +07:00
Faisal Salman	f8dde65d54	Only use user-agent data by default. Must explicitly call `withClientHints()` to also use client-hints data	2023-03-14 23:22:26 +07:00
Faisal Salman	60d3a2fbbc	Create test for client hints in browser context	2023-03-12 16:31:58 +07:00
Faisal Salman	aff5a209f8	Add new method: withClientHints() #408 #566 #588	2023-03-11 20:32:35 +07:00
Faisal Salman	5672a2e15c	Expose UA-CH data in getResult()	2023-03-10 22:15:12 +07:00
Faisal Salman	3c3c03ceeb	Add new feature: read Client Hints data from HTTP Headers #408 #566 #588	2023-03-08 22:42:59 +07:00
Faisal Salman	d99ff741f4	Add new feature: ability to pass req.headers object directly into UAParser	2023-02-28 17:58:46 +07:00
Faisal Salman	9ee128ae2b	Fix failing CI test, update funding & license year	2023-02-28 12:26:21 +07:00
Faisal Salman	c6b4c867d5	Sponsorship content revision	2023-02-28 01:13:56 +07:00
Faisal Salman	f1449a8202	Refactor	2023-02-27 23:14:43 +07:00
Faisal Salman	18730452f2	Add new device: Apple Watch, new os: watchOS	2023-02-25 11:41:19 +07:00
Faisal Salman	5ea9f0ec16	Fix #387 #554 - Detect iPadOS 13 https://stackoverflow.com/questions/9038625/detect-if-device-is-ios	2023-02-24 14:31:21 +07:00
Faisal Salman	03b0a5afa6	Fix #498 - Detect Brave Browser by checking navigator.brave https://github.com/brave/brave-browser/issues/10165#issuecomment-641128278	2023-02-24 13:13:03 +07:00
Faisal Salman	d03c74d6b7	Insert sponsorship content from 51degrees	2023-02-21 22:57:17 +07:00
Faisal Salman	f18516c9c8	Make sure all properties are "undefined" for is("undefined") to be true	2023-02-19 16:43:59 +07:00
Faisal Salman	746ac28f94	Readme: update is() & toString() methods explanation	2023-02-19 16:33:46 +07:00
Faisal Salman	96fb3a5ed5	Merge branch 'is-utility'	2023-02-19 09:30:07 +07:00
Faisal Salman	6c34c3d4fa	Add new utility methods: is() & toString()	2023-02-18 20:46:28 +07:00
shaharmor	7fbb93c99a	Detect "Chrome Mobile" & "Firefox Mobile"	2017-07-02 16:14:23 +03:00