Make it biz - 2.0.0-beta.2

Fixed Xbox Detection for Chrome-Based Edge

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,43 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Library version**
+Which version of the library that you use, eg: v0.7.35 or v2.0.0-alpha.3
+
+For the issue related with detection result, you can use the demo section in https://uaparser.js.org to confirm
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Desktop (please complete the following information):**
+ - OS: [e.g. iOS]
+ - Browser [e.g. chrome, safari]
+ - Version [e.g. 22]
+
+**Smartphone (please complete the following information):**
+ - Device: [e.g. iPhone6]
+ - OS: [e.g. iOS8.1]
+ - Browser [e.g. stock browser, safari]
+ - Version [e.g. 22]
+
+**Additional context**
+Add any other context about the problem here.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.

.github/PULL_REQUEST_TEMPLATE/pull_request_template.md

@@ -0,0 +1 @@
+- [ ] I have read and accept the [Contributor License Agreement (CLA)](https://gist.github.com/faisalman/2ed16621ebb544157eba85a7f7381417) Document and I hereby sign the CLA

.github/workflows/analysis-codeql.yml

@@ -0,0 +1,78 @@
+# For most projects, this workflow file will not need changing; you simply need
+# to commit it to your repository.
+#
+# You may wish to alter this file to override the set of languages analyzed,
+# or to provide custom queries or build logic.
+#
+# ******** NOTE ********
+# We have attempted to detect the languages in your repository. Please check
+# the `language` matrix defined below to confirm you have the correct set of
+# supported CodeQL languages.
+#
+name: CodeQL Analysis
+
+on:
+  push:
+    branches: [ "master"]
+  pull_request:
+    # The branches below must be a subset of the branches above
+    branches: [ "master" ]
+  schedule:
+    - cron: '15 6 * * 0'
+
+permissions: read-all
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ubuntu-latest
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+
+    strategy:
+      fail-fast: false
+      matrix:
+        language: [ 'javascript' ]
+        # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
+        # Use only 'java' to analyze code written in Java, Kotlin or both
+        # Use only 'javascript' to analyze code written in JavaScript, TypeScript or both
+        # Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v3
+
+    # Initializes the CodeQL tools for scanning.
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v2
+      with:
+        languages: ${{ matrix.language }}
+        # If you wish to specify custom queries, you can do so here or in a config file.
+        # By default, queries listed here will override any specified in a config file.
+        # Prefix the list here with "+" to use these queries and those in the config file.
+
+        # Details on CodeQL's query packs refer to : https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
+        # queries: security-extended,security-and-quality
+
+
+    # Autobuild attempts to build any compiled languages  (C/C++, C#, Go, or Java).
+    # If this step fails, then you should remove it and run the build manually (see below)
+    # - name: Autobuild
+    #  uses: github/codeql-action/autobuild@v2
+
+    # ℹ️ Command-line programs to run using the OS shell.
+    # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
+
+    #   If the Autobuild fails above, remove it and uncomment the following three lines.
+    #   modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance.
+
+    # - run: |
+    #     echo "Run, Build Application using script"
+    #     ./location_of_script_within_repo/buildscript.sh
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v2
+      with:
+        category: "/language:${{matrix.language}}"

.github/workflows/analysis-dependency.yml

@@ -0,0 +1,20 @@
+# Dependency Review Action
+#
+# This Action will scan dependency manifest files that change as part of a Pull Request, surfacing known-vulnerable versions of the packages declared or updated in the PR. Once installed, if the workflow run is marked as required, PRs introducing known-vulnerable packages will be blocked from merging.
+#
+# Source repository: https://github.com/actions/dependency-review-action
+# Public documentation: https://docs.github.com/en/code-security/supply-chain-security/understanding-your-software-supply-chain/about-dependency-review#dependency-review-enforcement
+name: Dependency Analysis
+on: [pull_request]
+
+permissions:
+  contents: read
+
+jobs:
+  dependency-review:
+    runs-on: ubuntu-latest
+    steps:
+      - name: 'Checkout Repository'
+        uses: actions/checkout@v3
+      - name: 'Dependency Review'
+        uses: actions/dependency-review-action@v2

.github/workflows/analysis-scorecard.yml

@@ -0,0 +1,72 @@
+# This workflow uses actions that are not certified by GitHub. They are provided
+# by a third-party and are governed by separate terms of service, privacy
+# policy, and support documentation.
+
+name: OpenSSF's Scorecard Analysis
+on:
+  # For Branch-Protection check. Only the default branch is supported. See
+  # https://github.com/ossf/scorecard/blob/main/docs/checks.md#branch-protection
+  branch_protection_rule:
+  # To guarantee Maintained check is occasionally updated. See
+  # https://github.com/ossf/scorecard/blob/main/docs/checks.md#maintained
+  schedule:
+    - cron: '45 2 * * 4'
+  push:
+    branches: [ "master" ]
+
+# Declare default permissions as read only.
+permissions: read-all
+
+jobs:
+  analysis:
+    name: Scorecard analysis
+    runs-on: ubuntu-latest
+    permissions:
+      # Needed to upload the results to code-scanning dashboard.
+      security-events: write
+      # Needed to publish results and get a badge (see publish_results below).
+      id-token: write
+      # Uncomment the permissions below if installing in a private repository.
+      # contents: read
+      # actions: read
+
+    steps:
+      - name: "Checkout code"
+        uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # v3.1.0
+        with:
+          persist-credentials: false
+
+      - name: "Run analysis"
+        uses: ossf/scorecard-action@e38b1902ae4f44df626f11ba0734b14fb91f8f86 # v2.1.2
+        with:
+          results_file: results.sarif
+          results_format: sarif
+          # (Optional) "write" PAT token. Uncomment the `repo_token` line below if:
+          # - you want to enable the Branch-Protection check on a *public* repository, or
+          # - you are installing Scorecard on a *private* repository
+          # To create the PAT, follow the steps in https://github.com/ossf/scorecard-action#authentication-with-pat.
+          repo_token: ${{ secrets.SCORECARD_TOKEN }}
+
+          # Public repositories:
+          #   - Publish results to OpenSSF REST API for easy access by consumers
+          #   - Allows the repository to include the Scorecard badge.
+          #   - See https://github.com/ossf/scorecard-action#publishing-results.
+          # For private repositories:
+          #   - `publish_results` will always be set to `false`, regardless
+          #     of the value entered here.
+          publish_results: true
+
+      # Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF
+      # format to the repository Actions tab.
+      - name: "Upload artifact"
+        uses: actions/upload-artifact@3cea5372237819ed00197afe530f5a7ea3e805c8 # v3.1.0
+        with:
+          name: SARIF file
+          path: results.sarif
+          retention-days: 5
+
+      # Upload the results to GitHub's code scanning dashboard.
+      - name: "Upload to code-scanning"
+        uses: github/codeql-action/upload-sarif@17573ee1cc1b9d061760f3a006fc4aac4f944fd5 # v2.2.4
+        with:
+          sarif_file: results.sarif

.github/workflows/publish-github-packages.yml

@@ -0,0 +1,22 @@
+name: Publish to GitHub Package
+
+on:
+  release:
+    types: [published]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-node@v3
+        with:
+          node-version: '18.x'
+          registry-url: https://npm.pkg.github.com/
+      - run: npm ci
+      - run: npm publish
+        env:
+          NODE_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/publish-npm-packages.yml

@@ -0,0 +1,23 @@
+name: Publish to NPM
+
+on:
+ release:
+   types: [published]
+
+jobs:
+ build:
+   runs-on: ubuntu-latest
+   permissions:
+     contents: read
+     id-token: write
+   steps:
+     - uses: actions/checkout@v3
+     - uses: actions/setup-node@v3
+       with:
+         node-version: '18.x'
+         registry-url: 'https://registry.npmjs.org'
+     - run: npm install -g npm
+     - run: npm ci
+     - run: npm publish --provenance --access public
+       env:
+         NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}

.github/workflows/test-ci.yml

@@ -1,4 +1,4 @@
-name: ua-parser-js-run-test
+name: UAParser.js CI-Test
 
 on: [push, pull_request]
 
@@ -12,9 +12,12 @@ jobs:
       matrix:
         arch: [amd64, ppc64le]
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
+      - uses: actions/checkout@v3
+      - uses: actions/setup-node@v3
+        with: 
+          node-version: 'lts/*'
       - name: Run the test
         run: |
-          npm install
-          npm run test-ci
+          npm ci
+          npx playwright install
+          npm test

.gitignore

@@ -1,5 +1,7 @@
 node_modules/
 npm-debug.log
+playwright-report/
+test-results/
 
 ### vim ###
 .*.s[a-w][a-z]

.jshintrc

@@ -1,3 +0,0 @@
-{
-    "esversion": 3
-}

.npmrc

@@ -1 +0,0 @@
-package-lock=false

.travis.yml

@@ -1,18 +0,0 @@
-arch:
- - amd64
- - ppc64le
-language: node_js
-node_js:
-    - stable
-    - lts/*
-
-notifications:
-  email: false
-
-cache:
-    directories:
-        - node_modules
-
-sudo: false
-
-script: npm run test-ci

CHANGELOG.md

@@ -2,22 +2,52 @@
 
 # Version 2.0
 - What's breaking:
+  - Dual-licensed under AGPLv3 or PRO License
   - 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()`
+  - Some new methods in result object: 
+    - Support for client hints: `withClientHints()`
+    - Support for feature detection: `withFeatureCheck()`
     - 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'`
+  - Support for ES module `import { UAParser } from 'ua-parser-js'`
+  - Provided Enums submodule `'ua-parser-js/enums'`
+  - Provided Extensions submodule `'ua-parser-js/extensions'`
+  - Provided Helpers submodule `'ua-parser-js/helpers'`
+
+## Version 2.0.0-beta.2
+
+- Increase UA_MAX_LENGTH to 500
+- Add TypeScript declaration file in `ua-parser-js/extensions` submodule
+- Improve TypeScript module resolution
+- Add new methods in `ua-parser-js/helpers` submodule: `isAppleSilicon()` & `isChromiumBased()`
+- Fix misidentified WebView token as device model
+- Add new browser: Alipay, Klarna, Opera GX, Smart Lenovo Browser, Vivo Browser
+- Rename browser: Avant, Baidu, Samsung Internet, Sogou Explorer, Sogou Mobile, WeChat
+- Improve client-hints detection: Edge, Xbox
+
+## Version 2.0.0-beta.1
+
+- Update Client Hints Form-Factor
+- Provide in-package type definitions
+- Add new device: Ulefone
+- Improve device detection: Realme, Xiaomi Redmi
+
+## Version 2.0.0-alpha.3
+
+- Add `withFeatureCheck()` method
+- Add `isFrozenUA()` method in `ua-parser-js/helpers` submodule
+- Add `MediaPlayers` & `Modules` in `ua-parser-js/extensions` submodule
+- Fix issue with ESM import
 
 ## 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
+
+- 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
 
 
@@ -25,6 +55,21 @@
 
 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.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

CODE_OF_CONDUCT.md

@@ -0,0 +1,29 @@
+# UAParser.js Code of Conduct
+
+## Introduction
+
+Welcome to the UAParser.js community! We're here to collaborate on developing an awesome project. Here are some general guidelines to make our community a great place:
+
+### 1. Be Kind, Honest, and Respectful
+
+Always treat others with kindness and respect. We value different opinions and encourage positive communication.
+
+### 2. Keep Conversations Civil and On-Topic
+
+Please keep discussions related to the project. If you want to talk about something else, find the right place for it.
+
+### 3. Mutual Assistance, Appreciation, and Acknowledgement
+
+Feel free to ask for help, show gratitude for contributions, and make sure to give credit where it's due.
+
+### 4. Resolving Disagreements
+
+In the event of a disagreement, we encourage open and respectful dialogue. It's important to remember that it's okay to have differing opinions, and if a common ground can't be reached, we suggest using the 'agree to disagree' approach.
+
+## Reporting Issues
+
+If you see any behavior that goes against this code of conduct, report it to [f@faisalman.com](mailto:f@faisalman.com).
+
+## Conclusion
+
+Together, we can make this project awesome!

CONTRIBUTING.md

@@ -0,0 +1,7 @@
+# UAParser.js: How to Contribute
+
+* Fork and clone this repository
+* Make some changes as required
+* Write unit test to showcase its functionality under `/test`
+* Run the test suites to make sure it's not breaking anything `$ npm run build+test`
+* Submit a pull request under `develop` branch & check the CLA in the submission form

LICENSE.md

@@ -0,0 +1,71 @@
+# UAPARSER.JS PRO BUSINESS LICENSE
+
+Version 1, October 2023
+
+Copyright (C) 2023 Faisal Salman <f+ua-parser-js@faisalman.com>
+
+---
+
+## Definitions
+
+"We" are the team behind UAParser.js.
+
+"You" are the individual/organization/company who is responsible for purchasing this license.
+
+"The Code" is UAParser.js.
+
+"Project" is what you built with The Code.
+
+---
+
+## License
+
+We retains all title, intellectual property, and ownership rights to The Code.
+
+The Code is licensed, not sold, to You for use solely subject to the terms and conditions detailed here.
+
+We grant You (and only You) a limited, non-exclusive, non-transferable, non-sublicensable, royalty-free right to use, copy, and modify The Code.
+
+This license is only valid for You as 1 (one) individual/organization/company and can not be transferred to other individual/organization/company.
+
+---
+
+## Rights
+
+You may use and modify The Code only in 1 (one) Project, if you use it in more than 1 (one) Project you have to purchase for another license.
+
+If You transfer a Project to a client, the use of The Code must be limited to the original functionality that You created for them. The Code must not be extracted, reproduced, or used in any other way. You must inform your client of this condition.
+
+You have the right to get lifetime updates and a 1 (one) year support, starting from the time you make the purchase.
+
+---
+
+## Restriction
+
+You may not redistribute The Code, as-is or modified, except as a part of a Project that you made.
+
+You may not deliver a Project that contains The Code as an open-source Project that might be used for commercial purpose to the general public, except with our written consent.
+
+You may not use The Code for unlawful, inappropriate, illegal, or offensive purposes.
+
+---
+
+## Limitations
+
+The Code is provided 'as is' without warranty of any kind, expressed, or implied. 
+
+We shall not be liable for any damages, including but not limited to, direct, indirect, special, incidental, or consequential damages or losses that occur by the use of The Code.
+
+We reserve the rights to discontinue the lifetime updates for The Code at any time, with or without notice.
+
+We offer support only for question within the scope of The Code functionality or related at our sole discretion.
+
+---
+
+## Terminations
+
+This license works indefinitely but can be revoked at any time if there is a violation to any of the terms.
+
+---
+
+END OF TERMS AND CONDITIONS

PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,22 @@
+# Prerequisites
+
+- [ ] I have read and follow the contributing guidelines
+- [ ] I have read and accept the [Contributor License Agreement (CLA)](https://gist.github.com/faisalman/2ed16621ebb544157eba85a7f7381417) Document and I hereby sign the CLA
+
+# Type of Change
+
+Bug fix, feature, docs update, ...
+
+# Description
+
+Please include a summary of the change (current behavior vs new behavior), which issue is fixed (you can also link to an open issue here), and why this change is necessary.
+
+# Test
+
+Please describe the tests that you ran to verify your changes.
+
+# Impact
+
+Does this PR introduce a breaking change? What changes might users need to make due to this PR?
+
+# Other Info

README.md

@@ -0,0 +1,23 @@
+<p align="center">
+    <a href="https://uaparser.js.org"><img src="https://raw.githubusercontent.com/faisalman/ua-parser-js/gh-pages/images/uap-header.png"></a>
+</p>
+
+# UAParser.js
+
+Thank you for purchasing UAParser.js PRO Business License, if you haven't please order here: https://store.faisalman.com
+
+# Download
+
+```sh
+npm install @ua-parser-js/pro-business
+```
+
+# Documentation
+
+https://docs.uaparser.js.org/v2 
+
+# License
+
+UAParser.js PRO Business
+
+Copyright (c) 2012-2023 Faisal Salman <<f@faisalman.com>>

SECURITY.md

@@ -0,0 +1,7 @@
+# Security Policy
+
+## Reporting a Vulnerability
+
+To report a security issue, please email `f@faisalman.com` with a description of the issue, reproducible steps to get the issue, affected versions, and, if known, mitigations for the issue.
+
+If the issue is confirmed as a vulnerability, we will open a new security advisory draft in our GitHub's Security Advisory page [https://github.com/faisalman/ua-parser-js/security/advisories](https://github.com/faisalman/ua-parser-js/security/advisories) and acknowledge your contributions as part of it. This project follows a 90 days disclosure timeline.

bower.json

@@ -1,17 +0,0 @@
-{
-  "name": "ua-parser-js",
-  "version": "2.0.0-alpha.2",
-  "authors": [
-    "Faisal Salman <f@faisalman.com>"
-  ],
-  "private": false,
-  "main": "src/ua-parser.js",
-  "ignore": [
-    "build",
-    "node_modules",
-    "bower_components",
-    "test",
-    "tests"
-  ],
-  "dependencies": {}
-}

images/51degrees.svg

@@ -1,19 +0,0 @@
-<?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>

license.md

@@ -1,21 +0,0 @@
-MIT License
-
-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
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.

package.js

@@ -1,6 +1,6 @@
 Package.describe({
   name: 'faisalman:ua-parser-js',
-  version: '2.0.0-alpha.2',
+  version: '2.0.0-beta.2',
   summary: 'Lightweight JavaScript-based user-agent string parser',
   git: 'https://github.com/faisalman/ua-parser-js.git',
   documentation: 'readme.md'

package.json

@@ -1,11 +1,12 @@
 {
-  "title": "UAParser.js",
-  "name": "ua-parser-js",
-  "version": "2.0.0-alpha.2",
+  "title": "UAParser.js PRO Business",
+  "name": "@ua-parser-js/pro-business",
+  "version": "2.0.0-beta.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",
+  "description": "Detect Browser, Engine, OS, CPU, and Device type/model from User-Agent & Client Hints data. Supports browser & node.js environment",
   "keywords": [
     "user-agent",
+    "client-hints",
     "parser",
     "browser",
     "engine",
@@ -13,7 +14,11 @@
     "device",
     "cpu",
     "jquery-plugin",
-    "ecosystem:jquery"
+    "ecosystem:jquery",
+    "ua-parser-js",
+    "browser-detection",
+    "device-detection",
+    "os-detection"
   ],
   "homepage": "https://github.com/faisalman/ua-parser-js",
   "contributors": [
@@ -34,8 +39,11 @@
     "Carl C Von Lewin <carlchristianlewin@gmail.com>",
     "CESAR RAMOS <c@imagenproactiva.com>",
     "Chad Killingsworth <ckillingsworth@jackhenry.com>",
+    "chenhui9279 <chenhui9279@autohome.com.cn>",
+    "chenyuan-new <53860479+chenyuan-new@users.noreply.github.com>",
     "Christopher De Cairos <chris.decairos@gmail.com>",
     "Cyrille David <cyrille@qonto.eu>",
+    "Dante <duanjl.china@gmail.com>",
     "Dario Vladovic <d.vladimyr@gmail.com>",
     "David Annez <david.annez@gmail.com>",
     "Davit Barbakadze <jayarjo@gmail.com>",
@@ -58,10 +66,12 @@
     "Faisal Salman <f@faisalman.com>",
     "Frédéric Camblor <fcamblor@gmail.com>",
     "Frederik Ring <frederik.ring@gmail.com>",
+    "Garrit Franke <garrit@slashdev.space>",
     "Gerald Host <me@jacobford.co.uk>",
     "Germán M. Bravo <german.mb@gmail.com>",
     "Grigory Dmitrenko <grigory@snsk.ru>",
     "gulpin <gulping.gulpin@gmail.com>",
+    "Hans Ott <hansott@hotmail.be>",
     "Hendrik Helwich <h.helwich@iplabs.de>",
     "Hermann Ebert <ebbmo@HE.local>",
     "hr6r <hedian@gmail.com>",
@@ -69,6 +79,7 @@
     "Ildar Kamalov <i.kamalov@adguard.com>",
     "insanehong <insane.hong@navercorp.com>",
     "jackpoll <jackpoll123456@gmail.com>",
+    "Jacky Choo <jackychoo@adly-macbook.local>",
     "Jake Mc <startswithaj@users.noreply.github.com>",
     "JBYoshi <12983479+JBYoshi@users.noreply.github.com>",
     "Joey Parrish <joeyparrish@google.com>",
@@ -78,11 +89,14 @@
     "Josh Goldberg <joshuakgoldberg@outlook.com>",
     "Junki-Ishida <junki_ishida@dwango.co.jp>",
     "Kendall Buchanan <kendall@kendagriff.com>",
+    "KnifeLemon <role___play@naver.com>",
+    "kNoAPP <alldoneb@gmail.com>",
     "Lee Treveil <leetreveil@gmail.com>",
     "leonardo <leofiore@libero.it>",
     "Levente Balogh <balogh.levente.hu@gmail.com>",
     "Liam Quinn <lquinn@blackberry.com>",
     "Lithin <lithin@webklipper.com>",
+    "liujunlve <liujunlve@henhaoji.com>",
     "ll-syber <670159357@qq.com>",
     "Loris Guignard <loris.guignard@gmail.com>",
     "Lukas Drgon <lukas.drgon@gmail.com>",
@@ -97,6 +111,8 @@
     "Max Nordlund <max.nordlund@gmail.com>",
     "Michael Hess <mhess@connectify.me>",
     "MimyyK <michele.marais@hakisa.com>",
+    "Mok <mok@moekm.com>",
+    "nabetama <mao.nabeta@gmail.com>",
     "naoh <naoh.cs03g@nctu.edu.tw>",
     "Nicholas Ionata <nionata@ufl.edu>",
     "Nikhil Motiani <nikhil.motiani@outlook.com>",
@@ -105,7 +121,9 @@
     "niris <nirisix@gmail.com>",
     "Nobuo Okada <nookada@yahoo-corp.jp>",
     "o.drapeza <o.drapeza@tinkoff.ru>",
+    "Oscar Becerra <oscarbecerra@google.com>",
     "otakuSiD <otakusid@gmail.com>",
+    "Paris Morgan <paris@8thwall.com>",
     "patrick-nurt <github@pereira.dk>",
     "Pavel Studeny <studeny@avast.com>",
     "Peter Dave Hello <PeterDaveHello@users.noreply.github.com>",
@@ -115,19 +133,24 @@
     "Queen Vinyl Darkscratch <vinyldarkscratch@gmail.com>",
     "Raine Makelainen <raine.makelainen@jolla.com>",
     "Raman Savaryn <homeneartheocean@gmail.com>",
+    "Riley Shaw <rileyjshaw@users.noreply.github.com>",
     "Robert Tod <robert@qubit.com>",
     "roman.savarin <roman.savarin@skywindgroup.com>",
     "Ron Korland <ron@testim.io>",
     "Ross Noble <rosshnoble@gmail.com>",
     "ruicong <466403866@qq.com>",
+    "Runar Heggset <rukki093@gmail.com>",
+    "Ryohei Shima <shima01dev@gmail.com>",
     "Sandro Sonntag <sandro.sonntag@adorsys.de>",
     "sgautrea <shanegautreau@gmail.com>",
+    "shaharmor <shahar@peer5.com>",
     "Shane Gautreau <sgautrea@opentext.com>",
     "Shane Thacker <shane@steadymade.com>",
     "Shreedhar <shreedhar@uber.com>",
     "Simon Eisenmann <simon@longsleep.org>",
     "Simon Lang <me@simonlang.org>",
     "Stiekel <histkc@gmail.com>",
+    "sunny-mwx <30586210+sunny-mwx@users.noreply.github.com>",
     "sUP <dani3l@gmail.com>",
     "Sylvain Gizard <sylvain.gizard@gmail.com>",
     "szchenghuang <szchenghuang@gmail.com>",
@@ -135,26 +158,38 @@
     "Tony Tomarchio <tony@tomarchio.cc>",
     "Ulrich Schmidt <u.schmidt@velian.de>",
     "Vadim Kurachevsky <vadim@hmvs.org>",
+    "Varun Sharma <varunsh@stepsecurity.io>",
+    "XhmikosR <xhmikosr@gmail.com>",
     "Yılmaz <yilmazdemir36@gmail.com>",
     "yuanyang <work_yuanyang@163.com>",
     "Yun Young-jin <yupmin@yupmin-office-macmini.local>",
-    "Zach Bjornson <zbbjornson@gmail.com>"
+    "Zach Bjornson <zbbjornson@gmail.com>",
+    "Ziding Zhang <zidingz@gmail.com>"
   ],
   "type": "commonjs",
-  "main": "src/ua-parser.js",
-  "module": "src/ua-parser.mjs",
+  "types": "src/main/ua-parser.d.ts",
+  "main": "src/main/ua-parser.js",
+  "module": "src/main/ua-parser.mjs",
+  "browser": "dist/ua-parser.pack.js",
   "exports": {
     ".": {
-      "require": "./src/ua-parser.js",
-      "import": "./src/ua-parser.mjs"
+      "require": "./src/main/ua-parser.js",
+      "import": "./src/main/ua-parser.mjs",
+      "types": "./src/main/ua-parser.d.ts"
     },
     "./enums": {
-      "require": "./src/enum/ua-parser-enum.js",
-      "import": "./src/enum/ua-parser-enum.mjs"
+      "require": "./src/enums/ua-parser-enums.js",
+      "import": "./src/enums/ua-parser-enums.mjs"
     },
     "./extensions": {
-      "require": "./src/extension/ua-parser-extension.js",
-      "import": "./src/extension/ua-parser-extension.mjs"
+      "require": "./src/extensions/ua-parser-extensions.js",
+      "import": "./src/extensions/ua-parser-extensions.mjs",
+      "types": "./src/extensions/ua-parser-extensions.d.ts"
+    },
+    "./helpers": {
+      "require": "./src/helpers/ua-parser-helpers.js",
+      "import": "./src/helpers/ua-parser-helpers.mjs",
+      "types": "./src/helpers/ua-parser-helpers.d.ts"
     }
   },
   "files": [
@@ -162,49 +197,46 @@
     "src"
   ],
   "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 && 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"
-  },
-  "verup": {
-    "files": [
-      "bower.json",
-      "package.js",
-      "src/ua-parser.js"
-    ],
-    "regs": [
-      "^((?:\\$|(\\s*\\*\\s*@)|(\\s*(?:var|,)?\\s+))(?:LIBVERSION|version)[\\s\\:='\"]+)([0-9]+(?:\\.[0-9]+){2,2})",
-      "^(\\/?\\s?\\*.*v)([0-9]+(?:\\.[0-9]+){2,2})"
-    ]
+    "build": "./script/build-dist.sh && ./script/build-module.js",
+    "build+test": "npm run build && npm run test",
+    "fuzz": "jazzer ./test/jazzer-fuzz-test.js --sync",
+    "test": "./script/test-all.sh",
+    "test:dts-lint": "tsd --typings src/main/ua-parser.d.ts --files test/dts-test.ts",
+    "test:eslint": "eslint src && eslint script",
+    "test:jshint": "jshint src/main",
+    "test:lockfile-lint": "npx lockfile-lint -p package-lock.json",
+    "test:mocha": "mocha -R list test/mocha*js",
+    "test:playwright": "playwright test"
   },
   "devDependencies": {
     "@babel/parser": "7.15.8",
-    "@babel/traverse": "7.15.4",
-    "jshint": "~2.12.0",
+    "@babel/traverse": "7.23.2",
+    "@jazzer.js/core": "^1.4.0",
+    "@playwright/test": "~1.32.2",
+    "jshint": "~2.13.6",
     "mocha": "~8.2.0",
-    "requirejs": "^2.3.2",
+    "requirejs": "2.3.2",
     "safe-regex": "^2.1.1",
-    "uglify-js": "~3.12.0",
-    "verup": "^1.3.x"
+    "tsd": "^0.29.0",
+    "uglify-js": "~3.12.0"
   },
   "repository": {
     "type": "git",
     "url": "https://github.com/faisalman/ua-parser-js.git"
   },
-  "license": "MIT",
+  "license": "UAParser.js-PRO-Business",
   "engines": {
     "node": "*"
   },
   "directories": {
     "dist": "dist",
+    "script": "script",
     "src": "src",
     "test": "test"
   },
   "bugs": "https://github.com/faisalman/ua-parser-js/issues",
-  "demo": "https://faisalman.github.io/ua-parser-js",
-  "download": "https://raw.github.com/faisalman/ua-parser-js/master/dist/ua-parser.min.js",
+  "demo": "https://uaparser.js.org",
+  "download": "https://raw.github.com/faisalman/ua-parser-js/master/dist/ua-parser.pack.js",
   "funding": [
     {
       "type": "opencollective",

readme.md

@@ -1,603 +0,0 @@
-<p align="center">
-    <img src="https://raw.githubusercontent.com/faisalman/ua-parser-js/gh-pages/images/logo.png" width="256" height="256"> 
-</p>
-
-<p align="center">
-<a href="https://travis-ci.org/faisalman/ua-parser-js"><img src="https://travis-ci.org/faisalman/ua-parser-js.svg?branch=master"></a>
-<a href="https://www.npmjs.com/package/ua-parser-js"><img src="https://img.shields.io/npm/v/ua-parser-js.svg"></a>
-<a href="https://www.npmjs.com/package/ua-parser-js"><img src="https://img.shields.io/npm/dw/ua-parser-js.svg"></a>
-<a href="https://www.jsdelivr.com/package/npm/ua-parser-js"><img src="https://data.jsdelivr.com/v1/package/npm/ua-parser-js/badge"></a>
-<a href="https://cdnjs.com/libraries/UAParser.js"><img src="https://img.shields.io/cdnjs/v/UAParser.js.svg"></a>
-</p>
-
-# UAParser.js
-
-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://faisalman.github.io/ua-parser-js
-* Source    : https://github.com/faisalman/ua-parser-js
-
-***
-
-### From Our Sponsors:
-<table>
-<thead>
-</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>
-</tr>
-</tbody>
-</table>
-
----
-
-# Version 2.0
-What's new & breaking, please read [CHANGELOG](changelog.md) before upgrading.
-
-# Documentation
-### UAParser([user-agent:string][,extensions:object][,headers:object(since@2.0)])
-
-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.
-Like so:
-* `new UAParser([user-agent:string][,extensions:object][,headers:object(since@2.0)])`
-```js
-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"     : {}
-} */
-```
-
-When you call UAParser without the `new` keyword, it will automatically call `getResult()` function and return the parsed results.
-* `UAParser([user-agent:string][,extensions:object][,headers:object(since@2.0)])`
-    * returns result object `{ ua: '', browser: {}, cpu: {}, device: {}, engine: {}, os: {} }`
-
-## Methods
-
-#### Methods table
-The methods are self explanatory, here's a small overview on all the available methods:
-*  `getResult()` - returns all function object calls, user-agent string, browser info, cpu, device, engine, os:
-`{ ua: '', browser: {}, cpu: {}, device: {}, engine: {}, os: {} }`.
-
- *  `getBrowser()`      - returns the browser name and version.
- *  `getDevice()`       - returns the device model, type, vendor.
- *  `getEngine()`       - returns the current browser engine name and version.
- *  `getOS()`           - returns the running operating system name and version.
- *  `getCPU()`          - returns CPU architectural design name.
- *  `getUA()`           - returns the user-agent string.
- *  `setUA(user-agent)` - set a custom user-agent to be parsed.
-
----
-
-* `getResult()`
-    * returns `{ ua: '', browser: {}, cpu: {}, device: {}, engine: {}, os: {} }`
-
-* `getBrowser()`
-    * returns `{ name: '', version: '' }`
-
-```sh
-# Possible 'browser.name':
-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, [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
-```
-
-* `getDevice()`
-    * returns `{ model: '', type: '', vendor: '' }`
-
-```sh
-# Possible 'device.type':
-console, mobile, tablet, smarttv, wearable, embedded
-
-##########
-# NOTE: 'desktop' is not a possible device type. 
-# UAParser only reports info directly available from the UA string, which is not the case for 'desktop' device type.
-# If you wish to detect desktop devices, you must handle the needed logic yourself.
-# You can read more about it in this issue: https://github.com/faisalman/ua-parser-js/issues/182
-##########
-
-# Possible 'device.vendor':
-Acer, Alcatel, Amazon, Apple, Archos, ASUS, AT&T, BenQ, BlackBerry, Dell,
-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
-```
-
-* `getEngine()`
-    * returns `{ name: '', version: '' }`
-
-```sh
-# Possible 'engine.name'
-Amaya, Blink, EdgeHTML, Flow, Gecko, Goanna, iCab, KHTML, LibWeb, Links, Lynx, 
-NetFront, NetSurf, Presto, Tasman, Trident, w3m, WebKit
-
-# 'engine.version' determined dynamically
-```
-
-* `getOS()`
-    * returns `{ name: '', version: '' }`
-
-```sh
-# Possible 'os.name'
-AIX, Amiga OS, Android[-x86], Arch, Bada, BeOS, BlackBerry, CentOS, Chromium OS,
-Contiki, Fedora, Firefox OS, FreeBSD, Debian, Deepin, DragonFly, elementary OS, 
-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, ...
-
-# 'os.version' determined dynamically
-```
-
-* `getCPU()`
-    * returns `{ architecture: '' }`
-
-```sh
-# Possible 'cpu.architecture'
-68k, amd64, arm[64/hf], avr, ia[32/64], irix[64], mips[64], pa-risc, ppc, sparc[64]
-```
-
-* `getUA()`
-    * returns UA string of current instance
-
-* `setUA(uastring)`
-    * 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
-
-```html
-<!doctype html>
-<html>
-<head>
-<script src="ua-parser.min.js"></script>
-<script>
-
-    var uap = new UAParser();
-    console.log(uap.getResult());
-    /*
-        /// This will print an object structured like this:
-        {
-            ua: "",
-            browser: {
-                name: "",
-                version: "",
-                major: ""
-            },
-            engine: {
-                name: "",
-                version: ""
-            },
-            os: {
-                name: "",
-                version: ""
-            },
-            device: {
-                model: "",
-                type: "",
-                vendor: ""
-            },
-            cpu: {
-                architecture: ""
-            }
-        }
-    */
-    // Default result depends on current window.navigator.userAgent value
-
-    // 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";
-    uap.setUA(uastring1);
-    var result = uap.getResult();
-    // You can also use UAParser constructor directly without having to create an instance:
-    // 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}
-    console.log(result.os);             // {name: "Ubuntu", version: "11.10"}
-    console.log(result.os.version);     // "11.10"
-    console.log(result.engine.name);    // "WebKit"
-    console.log(result.cpu.architecture);   // "amd64"
-
-    // Do some other tests
-    var uastring2 = "Mozilla/5.0 (compatible; Konqueror/4.1; OpenBSD) KHTML/4.1.4 (like Gecko)";
-    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(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>
-<body>
-</body>
-</html>
-```
-
-## Using node.js
-
-Note: Device information is not available in the NodeJS environment.
-
-```sh
-$ npm install ua-parser-js
-```
-
-```js
-var http = require('http');
-var uap = require('ua-parser-js');
-
-http.createServer(function (req, res) {
-    // get user-agent header
-    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, '  '));
-})
-.listen(1337, '127.0.0.1');
-
-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
-$ npm install --save @types/ua-parser-js
-# Download TS type definition from DefinitelyTyped repository:
-# https://github.com/DefinitelyTyped/DefinitelyTyped/tree/master/types/ua-parser-js
-```
-
-## Using jQuery/Zepto ($.ua)
-
-Although written in vanilla js, this library will automatically detect if jQuery/Zepto is present and create `$.ua` object (with values based on its User-Agent) along with `window.UAParser` constructor. To get/set user-agent you can use: `$.ua.get()` / `$.ua.set(uastring)`.
-
-```js
-// Say we are in a browser with default user-agent: 'Mozilla/5.0 (Linux; U; Android 2.3.4; en-us; Sprint APA7373KT Build/GRJ22) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0':
-
-// Get the details
-console.log($.ua.device);           // {vendor: "HTC", model: "Evo Shift 4G", type: "mobile"}
-console.log($.ua.os);               // {name: "Android", version: "2.3.4"}
-console.log($.ua.os.name);          // "Android"
-console.log($.ua.get());            // "Mozilla/5.0 (Linux; U; Android 2.3.4; en-us; Sprint APA7373KT Build/GRJ22) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0"
-
-// Now lets try to reset to another custom user-agent
-$.ua.set('Mozilla/5.0 (Linux; U; Android 3.0.1; en-us; Xoom Build/HWI69) AppleWebKit/534.13 (KHTML, like Gecko) Version/4.0 Safari/534.13');
-
-// Test again
-console.log($.ua.browser.name);     // "Safari"
-console.log($.ua.engine.name);      // "Webkit"
-console.log($.ua.device);           // {vendor: "Motorola", model: "Xoom", type: "tablet"}
-console.log(parseInt($.ua.browser.version.split('.')[0], 10));  // 4
-
-// Add class to <body> tag
-// <body class="ua-browser-safari ua-devicetype-tablet">
-$('body').addClass('ua-browser-' + $.ua.browser.name + ' ua-devicetype-' + $.ua.device.type);
-```
-
-# Development
-
-## Backers & Sponsors
-
-<a href="https://opencollective.com/ua-parser-js"><img src="https://opencollective.com/ua-parser-js/organizations.svg?avatarHeight=64"></a>
-<a href="https://opencollective.com/ua-parser-js"><img src="https://opencollective.com/ua-parser-js/individuals.svg?avatarHeight=64"></a>
-
-<a href="https://www.paypal.me/faisalman/"><img src="https://cdn.rawgit.com/twolfson/paypal-github-button/1.0.0/dist/button.svg" height="40"></a>
-
-## Contributors
-
-<a href="https://github.com/faisalman/ua-parser-js/graphs/contributors">
-  <img src="https://contrib.rocks/image?repo=faisalman/ua-parser-js" />
-</a>
-
-Made with [contributors-img](https://contrib.rocks).
-
-## How To Contribute
-
-* Fork and clone this repository
-* Make some changes as required
-* Write unit test to showcase its functionality
-* Run the test suites to make sure it's not breaking anything `$ npm test`
-* Submit a pull request under `develop` branch
-
-# License
-
-MIT License
-
-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
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.

script/build-dist.sh

@@ -0,0 +1,13 @@
+#!/usr/bin/env bash
+
+SRC_PATH="src/main/ua-parser.js"
+MIN_PATH="dist/ua-parser.min.js"
+PACK_PATH="dist/ua-parser.pack.js"
+
+# minified
+echo "Generate ${MIN_PATH}"
+uglifyjs $SRC_PATH -o $MIN_PATH --comments "/^ UA/"
+
+# packed
+echo "Generate ${PACK_PATH}"
+uglifyjs $SRC_PATH -o $PACK_PATH --comments "/^ UA/" --compress --mangle

script/build-module.js

@@ -0,0 +1,58 @@
+#!/usr/bin/env node
+/* jshint esversion: 6 */ 
+const fs = require('fs');
+
+const generateMJS = (module) => {
+    let { src, dest, title, replacements } = module;
+    let text = fs.readFileSync(src, 'utf-8');
+
+    replacements.push(
+        [/const (.+?)\s*=\s*require\((.+)\)/ig, 'import $1 from $2'],
+        [/module\.exports =/ig, 'export']
+    );
+    replacements.forEach(rep => {
+        text = text.replace(rep[0], rep[1]);
+    });
+
+    console.log(`Generate ${dest}`);
+
+    fs.writeFileSync(dest,
+`// Generated ESM version of ${title}
+// DO NOT EDIT THIS FILE!
+// Source: /${src}
+
+${text}`, 'utf-8');
+
+};
+
+const modules = [
+    {
+        src : 'src/main/ua-parser.js',
+        dest : 'src/main/ua-parser.mjs',
+        title : 'ua-parser-js',
+        replacements : [
+            [/\(func[\s\S]+strict\';/ig, ''],
+            [/esversion\: 3/ig, 'esversion: 6'],
+            [/\/[\/\s]+export[\s\S]+/ig,'export {UAParser};']
+        ]
+    },{
+        src : 'src/enums/ua-parser-enums.js',
+        dest :'src/enums/ua-parser-enums.mjs',
+        title : 'ua-parser-js/enums',
+        replacements : []
+    },
+    {
+        src : 'src/extensions/ua-parser-extensions.js',
+        dest : 'src/extensions/ua-parser-extensions.mjs',
+        title : 'ua-parser-js/extensions',
+        replacements : []
+    },
+    {
+        src : 'src/helpers/ua-parser-helpers.js',
+        dest : 'src/helpers/ua-parser-helpers.mjs',
+        title : 'ua-parser-js/helpers',
+        replacements : []
+    }
+];
+
+modules.forEach(module => generateMJS(module));

script/test-all.sh

@@ -0,0 +1,32 @@
+#!/usr/bin/env bash
+
+echo '
+- run build
+'
+npm run build || exit 1
+
+echo '
+- lint js code
+'
+npm run test:jshint || exit 1 
+#npm run test:eslint || exit 1 
+
+echo '
+- test using mocha
+'
+npm run test:mocha || exit 1 
+
+echo '
+- test using playwright
+'
+npm run test:playwright || exit 1 
+
+echo '
+- lint lockfile
+'
+npm run test:lockfile-lint || exit 1 
+
+echo '
+- lint d.ts files
+'
+npm run test:dts-lint || exit 1

security.md

@@ -1,5 +0,0 @@
-# Security Policy
-
-## Reporting a Vulnerability
-
-Please report security issues to `f@faisalman.com`

src/enum/ua-parser-enum.js

@@ -1,101 +0,0 @@
-///////////////////////////////////////////////
-/*  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
-}

src/enum/ua-parser-enum.mjs

@@ -1,105 +0,0 @@
-// 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
-}

src/enums/ua-parser-enums.js

@@ -0,0 +1,350 @@
+///////////////////////////////////////////////
+/*  Enums for UAParser.js v2.0.0-beta.2
+    https://github.com/faisalman/ua-parser-js
+    Author: Faisal Salman <f@faisalman.com>
+    UAParser.js PRO Business License */
+//////////////////////////////////////////////
+
+/*jshint esversion: 6 */ 
+
+const Browser = Object.freeze({
+    _2345_EXPLORER: '2345Explorer',
+    _360: '360 Browser',
+    ALIPAY: 'Alipay',
+    AMAYA: 'Amaya',
+    ANDROID: 'Android Browser',
+    ARORA: 'Arora',
+    AVANT: 'Avant',
+    AVAST: 'Avast Secure Browser',
+    AVG: 'AVG Secure Browser',
+    BAIDU: 'Baidu Browser',
+    BASILISK: 'Basilisk',
+    BLAZER: 'Blazer',
+    BOLT: 'Bolt',
+    BOWSER: 'Bowser',
+    BRAVE: 'Brave',
+    CAMINO: 'Camino',
+    CHIMERA: 'Chimera',
+    CHROME: 'Chrome',
+    CHROME_HEADLESS: 'Chrome Headless',
+    CHROME_MOBILE: 'Mobile Chrome',
+    CHROME_WEBVIEW: 'Chrome WebView',
+    CHROMIUM: 'Chromium',
+    COBALT: 'Cobalt',
+    COC_COC: 'Coc Coc',
+    COMODO_DRAGON: 'Comodo Dragon',
+    CONKEROR: 'Conkeror',
+    DILLO: 'Dillo',
+    DOLPHIN: 'Dolphin',
+    DORIS: 'Doris',
+    DUCKDUCKGO: 'DuckDuckGo',
+    EDGE: 'Edge',
+    EPIPHANY: 'Epiphany',
+    FACEBOOK: 'Facebook',
+    FALKON: 'Falkon',
+    FIREBIRD: 'Firebird',
+    FIREFOX: 'Firefox',
+    FIREFOX_FOCUS: 'Firefox Focus',
+    FIREFOX_MOBILE: 'Mobile Firefox',
+    FIREFOX_REALITY: 'Firefox Reality',
+    FENNEC: 'Fennec',
+    FLOCK: 'Flock',
+    FLOW: 'Flow',
+    GO: 'Go Browser',
+    GOOGLE_SEARCH: 'GSA',
+    HEYTAP: 'HeyTap',
+    HUAWEI: 'Huawei Browser',
+    ICAB: 'iCab',
+    ICE: 'ICE Browser',
+    ICEAPE: 'IceApe',
+    ICECAT: 'IceCat',
+    ICEDRAGON: 'IceDragon',
+    ICEWEASEL: 'IceWeasel',
+    IE: 'IE',
+    INSTAGRAM: 'Instagram',
+    IRIDIUM: 'Iridium',
+    IRON: 'Iron',
+    JASMINE: 'Jasmine',
+    KONQUEROR: 'Konqueror',
+    KAKAO: 'KakaoTalk',
+    KHTML: 'KHTML',
+    K_MELEON: 'K-Meleon',
+    KLAR: 'Klar',
+    KLARNA: 'Klarna',
+    KINDLE: 'Kindle',
+    LENOVO: 'Smart Lenovo Browser',
+    LIEBAO: 'LBBROWSER',
+    LINE: 'Line',
+    LINKEDIN: 'LinkedIn',
+    LINKS: 'Links',
+    LUNASCAPE: 'Lunascape',
+    LYNX: 'Lynx',
+    MAEMO: 'Maemo Browser',
+    MAXTHON: 'Maxthon',
+    MIDORI: 'Midori',
+    MINIMO: 'Minimo',
+    MIUI: 'MIUI Browser',
+    MOZILLA: 'Mozilla',
+    MOSAIC: 'Mosaic',
+    NAVER: 'Naver',
+    NETFRONT: 'NetFront',
+    NETSCAPE: 'Netscape',
+    NETSURF: 'Netsurf',
+    NOKIA: 'Nokia Browser',
+    OBIGO: 'Obigo',
+    OCULUS: 'Oculus Browser',
+    OMNIWEB: 'OmniWeb',
+    OPERA: 'Opera',
+    OPERA_COAST: 'Opera Coast',
+    OPERA_MINI: 'Opera Mini',
+    OPERA_MOBI: 'Opera Mobi',
+    OPERA_TABLET: 'Opera Tablet',
+    OPERA_TOUCH: 'Opera Touch',
+    OVI: 'OviBrowser',
+    PALEMOON: 'PaleMoon',
+    PHANTOMJS: 'PhantomJS',
+    PHOENIX: 'Phoenix',
+    POLARIS: 'Polaris',
+    PUFFIN: 'Puffin',
+    QQ: 'QQBrowser',
+    QQ_LITE: 'QQBrowserLite',
+    QUARK: 'Quark',
+    QUPZILLA: 'QupZilla',
+    REKONQ: 'rekonq',
+    ROCKMELT: 'Rockmelt',
+    SAFARI: 'Safari',
+    SAFARI_MOBILE: 'Mobile Safari',
+    SAILFISH: 'Sailfish Browser',
+    SAMSUNG: 'Samsung Internet',
+    SEAMONKEY: 'SeaMonkey',
+    SILK: 'Silk',
+    SKYFIRE: 'Skyfire',
+    SLEIPNIR: 'Sleipnir',
+    SLIMBROWSER: 'SlimBrowser',
+    SNAPCHAT: 'Snapchat',
+    SOGOU_EXPLORER: 'Sogou Explorer',
+    SOGOU_MOBILE: 'Sogou Mobile',
+    SWIFTFOX: 'Swiftfox',
+    TESLA: 'Tesla',
+    TIKTOK: 'TikTok',
+    TIZEN: 'Tizen Browser',
+    UC: 'UCBrowser',
+    UP: 'UP.Browser',
+    VIERA: 'Viera',
+    VIVALDI: 'Vivaldi',
+    VIVO: 'Vivo Browser',
+    W3M: 'w3m',
+    WATERFOX: 'Waterfox',
+    WEBKIT: 'WebKit',
+    WECHAT: 'WeChat',
+    WEIBO: 'Weibo',
+    WHALE: 'Whale',
+    YANDEX: 'Yandex'
+
+    // TODO : test!
+});
+
+const CPU = Object.freeze({
+    ARM : 'arm',
+    ARM_64: 'arm64',
+    ARM_HF: 'armhf',
+    AVR: 'avr',
+    AVR_32: 'avr32',
+    IA64: 'ia64',
+    IRIX: 'irix',
+    IRIX_64: 'irix64',
+    MIPS: 'mips',
+    MIPS_64: 'mips64',
+    M68K: '68k',
+    PA_RISC: 'pa-risc',
+    PPC: 'ppc',
+    SPARC: 'sparc',
+    SPARC_64: 'sparc64',
+    X86: 'ia32',
+    X86_64: 'amd64'
+});
+
+const Device = Object.freeze({
+    CONSOLE: 'console',
+    DESKTOP: 'desktop',
+    EMBEDDED: 'embedded',
+    MOBILE: 'mobile',
+    SMARTTV: 'smarttv',
+    TABLET: 'tablet',
+    WEARABLE: 'wearable'
+});
+
+const Vendor = Object.freeze({
+    ACER: 'Acer',
+    ALCATEL: 'Alcatel',
+    APPLE: 'Apple',
+    AMAZON: 'Amazon',
+    ARCHOS: 'Archos',
+    ASUS: 'ASUS',
+    ATT: 'AT&T',
+    BENQ: 'BenQ',
+    BLACKBERRY: 'BlackBerry',
+    DELL: 'Dell',
+    ESSENTIAL: 'Essential',
+    FACEBOOK: 'Facebook',
+    FAIRPHONE: 'Fairphone',
+    GEEKSPHONE: 'GeeksPhone',
+    GENERIC: 'Generic',
+    GOOGLE: 'Google',
+    HP: 'HP',
+    HTC: 'HTC',
+    HUAWEI: 'Huawei',
+    INFINIX: 'Infinix',
+    JOLLA: 'Jolla',
+    KOBO: 'Kobo',
+    LENOVO: 'Lenovo',
+    LG: 'LG',
+    MEIZU: 'Meizu',
+    MICROSOFT: 'Microsoft',
+    MOTOROLA: 'Motorola',
+    NEXIAN: 'Nexian',
+    NINTENDO: 'Nintendo',
+    NOKIA: 'Nokia',
+    NVIDIA: 'Nvidia',
+    ONEPLUS: 'OnePlus',
+    OPPO: 'OPPO',
+    OUYA: 'Ouya',
+    PALM: 'Palm',
+    PANASONIC: 'Panasonic',
+    PEBBLE: 'Pebble',
+    POLYTRON: 'Polytron',
+    REALME: 'Realme',
+    RIM: 'RIM',
+    ROKU: 'Roku',
+    SAMSUNG: 'Samsung',
+    SHARP: 'Sharp',
+    SIEMENS: 'Siemens',
+    SONY: 'Sony',
+    SPRINT: 'Sprint',
+    TECHNISAT: 'TechniSAT',
+    TECNO: 'Tecno',
+    TESLA: 'Tesla',
+    ULEFONE: 'Ulefone',
+    VIVO: 'Vivo',
+    VODAFONE: 'Vodafone',
+    XBOX: 'Xbox',
+    XIAOMI: 'Xiaomi',
+    ZEBRA: 'Zebra',
+    ZTE: 'ZTE',
+
+    // TODO : test!
+});
+
+const Engine = Object.freeze({
+    AMAYA: 'Amaya',
+    BLINK: 'Blink',
+    EDGEHTML: 'EdgeHTML',
+    FLOW: 'Flow',
+    GECKO: 'Gecko',
+    GOANNA: 'Goanna',
+    ICAB: 'iCab',
+    KHTML: 'KHTML',
+    LIBWEB: 'LibWeb',
+    LINKS: 'Links',
+    LYNX: 'Lynx',
+    NETFRONT: 'NetFront',
+    NETSURF: 'NetSurf',
+    PRESTO: 'Presto',
+    TASMAN: 'Tasman',
+    TRIDENT: 'Trident',
+    W3M: 'w3m',
+    WEBKIT: 'WebKit'
+});
+
+const OS = Object.freeze({
+    AIX: 'AIX',
+    AMIGA_OS: 'Amiga OS',
+    ANDROID: 'Android',
+    ANDROID_X86: 'Android-x86',
+    ARCH: 'Arch',
+    BADA: 'Bada',
+    BEOS: 'BeOS',
+    BLACKBERRY: 'BlackBerry',
+    CENTOS: 'CentOS',
+    CHROME_OS: 'Chrome OS',
+    CHROMECAST: 'Chromecast',
+    CONTIKI: 'Contiki',
+    DEBIAN: 'Debian',
+    DEEPIN: 'Deepin',
+    DRAGONFLY: 'DragonFly',
+    ELEMENTARY_OS: 'elementary OS',
+    FEDORA: 'Fedora',
+    FIREFOX_OS: 'Firefox OS',
+    FREEBSD: 'FreeBSD',
+    FUCHSIA: 'Fuchsia',
+    GENTOO: 'Gentoo',
+    GHOSTBSD: 'GhostBSD',
+    GNU: 'GNU',
+    HAIKU: 'Haiku',
+    HARMONYOS: 'HarmonyOS',
+    HP_UX: 'HP-UX',
+    HURD: 'Hurd',
+    IOS: 'iOS',
+    JOLI: 'Joli',
+    KAIOS: 'KaiOS',
+    LINPUS: 'Linpus',
+    LINSPIRE: 'Linspire',
+    LINUX: 'Linux',
+    MACOS: 'macOS',
+    MAEMO: 'Maemo',
+    MAGEIA: 'Mageia',
+    MANDRIVA: 'Mandriva',
+    MANJARO: 'Manjaro',
+    MEEGO: 'MeeGo',
+    MINIX: 'Minix',
+    MINT: 'Mint',
+    MORPH_OS: 'Morph OS',
+    NETBSD: 'NetBSD',
+    NETRANGE: 'NetRange',
+    NETTV: 'NetTV',
+    NINTENDO: 'Nintendo',
+    OPENBSD: 'OpenBSD',
+    OPENVMS: 'OpenVMS',
+    OS2: 'OS/2',
+    PALM: 'Palm',
+    PC_BSD: 'PC-BSD',
+    PCLINUXOS: 'PCLinuxOS',
+    PLAN9: 'Plan9',
+    PLAYSTATION: 'PlayStation',
+    QNX: 'QNX',
+    RASPBIAN: 'Raspbian',
+    REDHAT: 'RedHat',
+    RIM_TABLET_OS: 'RIM Tablet OS',
+    RISC_OS: 'RISC OS',
+    SABAYON: 'Sabayon',
+    SAILFISH: 'Sailfish',
+    SERENITYOS: 'SerenityOS',
+    SERIES40: 'Series40',
+    SLACKWARE: 'Slackware',
+    SOLARIS: 'Solaris',
+    SUSE: 'SUSE',
+    SYMBIAN: 'Symbian',
+    TIZEN: 'Tizen',
+    UBUNTU: 'Ubuntu',
+    UNIX: 'Unix',
+    VECTORLINUX: 'VectorLinux',
+    VIERA: 'Viera',
+    WATCHOS: 'watchOS',
+    WEBOS: 'WebOS',
+    WINDOWS: 'Windows',
+    WINDOWS_MOBILE: 'Windows Mobile',
+    WINDOWS_PHONE: 'Windows Phone',
+    XBOX: 'Xbox',
+    ZENWALK: 'Zenwalk'
+
+    // TODO : test!
+});
+
+module.exports = { 
+    Browser, 
+    CPU, 
+    Device, 
+    Vendor,
+    Engine,
+    OS
+};

src/enums/ua-parser-enums.mjs

@@ -0,0 +1,354 @@
+// Generated ESM version of ua-parser-js/enums
+// DO NOT EDIT THIS FILE!
+// Source: /src/enums/ua-parser-enums.js
+
+///////////////////////////////////////////////
+/*  Enums for UAParser.js v2.0.0-beta.2
+    https://github.com/faisalman/ua-parser-js
+    Author: Faisal Salman <f@faisalman.com>
+    UAParser.js PRO Business License */
+//////////////////////////////////////////////
+
+/*jshint esversion: 6 */ 
+
+const Browser = Object.freeze({
+    _2345_EXPLORER: '2345Explorer',
+    _360: '360 Browser',
+    ALIPAY: 'Alipay',
+    AMAYA: 'Amaya',
+    ANDROID: 'Android Browser',
+    ARORA: 'Arora',
+    AVANT: 'Avant',
+    AVAST: 'Avast Secure Browser',
+    AVG: 'AVG Secure Browser',
+    BAIDU: 'Baidu Browser',
+    BASILISK: 'Basilisk',
+    BLAZER: 'Blazer',
+    BOLT: 'Bolt',
+    BOWSER: 'Bowser',
+    BRAVE: 'Brave',
+    CAMINO: 'Camino',
+    CHIMERA: 'Chimera',
+    CHROME: 'Chrome',
+    CHROME_HEADLESS: 'Chrome Headless',
+    CHROME_MOBILE: 'Mobile Chrome',
+    CHROME_WEBVIEW: 'Chrome WebView',
+    CHROMIUM: 'Chromium',
+    COBALT: 'Cobalt',
+    COC_COC: 'Coc Coc',
+    COMODO_DRAGON: 'Comodo Dragon',
+    CONKEROR: 'Conkeror',
+    DILLO: 'Dillo',
+    DOLPHIN: 'Dolphin',
+    DORIS: 'Doris',
+    DUCKDUCKGO: 'DuckDuckGo',
+    EDGE: 'Edge',
+    EPIPHANY: 'Epiphany',
+    FACEBOOK: 'Facebook',
+    FALKON: 'Falkon',
+    FIREBIRD: 'Firebird',
+    FIREFOX: 'Firefox',
+    FIREFOX_FOCUS: 'Firefox Focus',
+    FIREFOX_MOBILE: 'Mobile Firefox',
+    FIREFOX_REALITY: 'Firefox Reality',
+    FENNEC: 'Fennec',
+    FLOCK: 'Flock',
+    FLOW: 'Flow',
+    GO: 'Go Browser',
+    GOOGLE_SEARCH: 'GSA',
+    HEYTAP: 'HeyTap',
+    HUAWEI: 'Huawei Browser',
+    ICAB: 'iCab',
+    ICE: 'ICE Browser',
+    ICEAPE: 'IceApe',
+    ICECAT: 'IceCat',
+    ICEDRAGON: 'IceDragon',
+    ICEWEASEL: 'IceWeasel',
+    IE: 'IE',
+    INSTAGRAM: 'Instagram',
+    IRIDIUM: 'Iridium',
+    IRON: 'Iron',
+    JASMINE: 'Jasmine',
+    KONQUEROR: 'Konqueror',
+    KAKAO: 'KakaoTalk',
+    KHTML: 'KHTML',
+    K_MELEON: 'K-Meleon',
+    KLAR: 'Klar',
+    KLARNA: 'Klarna',
+    KINDLE: 'Kindle',
+    LENOVO: 'Smart Lenovo Browser',
+    LIEBAO: 'LBBROWSER',
+    LINE: 'Line',
+    LINKEDIN: 'LinkedIn',
+    LINKS: 'Links',
+    LUNASCAPE: 'Lunascape',
+    LYNX: 'Lynx',
+    MAEMO: 'Maemo Browser',
+    MAXTHON: 'Maxthon',
+    MIDORI: 'Midori',
+    MINIMO: 'Minimo',
+    MIUI: 'MIUI Browser',
+    MOZILLA: 'Mozilla',
+    MOSAIC: 'Mosaic',
+    NAVER: 'Naver',
+    NETFRONT: 'NetFront',
+    NETSCAPE: 'Netscape',
+    NETSURF: 'Netsurf',
+    NOKIA: 'Nokia Browser',
+    OBIGO: 'Obigo',
+    OCULUS: 'Oculus Browser',
+    OMNIWEB: 'OmniWeb',
+    OPERA: 'Opera',
+    OPERA_COAST: 'Opera Coast',
+    OPERA_MINI: 'Opera Mini',
+    OPERA_MOBI: 'Opera Mobi',
+    OPERA_TABLET: 'Opera Tablet',
+    OPERA_TOUCH: 'Opera Touch',
+    OVI: 'OviBrowser',
+    PALEMOON: 'PaleMoon',
+    PHANTOMJS: 'PhantomJS',
+    PHOENIX: 'Phoenix',
+    POLARIS: 'Polaris',
+    PUFFIN: 'Puffin',
+    QQ: 'QQBrowser',
+    QQ_LITE: 'QQBrowserLite',
+    QUARK: 'Quark',
+    QUPZILLA: 'QupZilla',
+    REKONQ: 'rekonq',
+    ROCKMELT: 'Rockmelt',
+    SAFARI: 'Safari',
+    SAFARI_MOBILE: 'Mobile Safari',
+    SAILFISH: 'Sailfish Browser',
+    SAMSUNG: 'Samsung Internet',
+    SEAMONKEY: 'SeaMonkey',
+    SILK: 'Silk',
+    SKYFIRE: 'Skyfire',
+    SLEIPNIR: 'Sleipnir',
+    SLIMBROWSER: 'SlimBrowser',
+    SNAPCHAT: 'Snapchat',
+    SOGOU_EXPLORER: 'Sogou Explorer',
+    SOGOU_MOBILE: 'Sogou Mobile',
+    SWIFTFOX: 'Swiftfox',
+    TESLA: 'Tesla',
+    TIKTOK: 'TikTok',
+    TIZEN: 'Tizen Browser',
+    UC: 'UCBrowser',
+    UP: 'UP.Browser',
+    VIERA: 'Viera',
+    VIVALDI: 'Vivaldi',
+    VIVO: 'Vivo Browser',
+    W3M: 'w3m',
+    WATERFOX: 'Waterfox',
+    WEBKIT: 'WebKit',
+    WECHAT: 'WeChat',
+    WEIBO: 'Weibo',
+    WHALE: 'Whale',
+    YANDEX: 'Yandex'
+
+    // TODO : test!
+});
+
+const CPU = Object.freeze({
+    ARM : 'arm',
+    ARM_64: 'arm64',
+    ARM_HF: 'armhf',
+    AVR: 'avr',
+    AVR_32: 'avr32',
+    IA64: 'ia64',
+    IRIX: 'irix',
+    IRIX_64: 'irix64',
+    MIPS: 'mips',
+    MIPS_64: 'mips64',
+    M68K: '68k',
+    PA_RISC: 'pa-risc',
+    PPC: 'ppc',
+    SPARC: 'sparc',
+    SPARC_64: 'sparc64',
+    X86: 'ia32',
+    X86_64: 'amd64'
+});
+
+const Device = Object.freeze({
+    CONSOLE: 'console',
+    DESKTOP: 'desktop',
+    EMBEDDED: 'embedded',
+    MOBILE: 'mobile',
+    SMARTTV: 'smarttv',
+    TABLET: 'tablet',
+    WEARABLE: 'wearable'
+});
+
+const Vendor = Object.freeze({
+    ACER: 'Acer',
+    ALCATEL: 'Alcatel',
+    APPLE: 'Apple',
+    AMAZON: 'Amazon',
+    ARCHOS: 'Archos',
+    ASUS: 'ASUS',
+    ATT: 'AT&T',
+    BENQ: 'BenQ',
+    BLACKBERRY: 'BlackBerry',
+    DELL: 'Dell',
+    ESSENTIAL: 'Essential',
+    FACEBOOK: 'Facebook',
+    FAIRPHONE: 'Fairphone',
+    GEEKSPHONE: 'GeeksPhone',
+    GENERIC: 'Generic',
+    GOOGLE: 'Google',
+    HP: 'HP',
+    HTC: 'HTC',
+    HUAWEI: 'Huawei',
+    INFINIX: 'Infinix',
+    JOLLA: 'Jolla',
+    KOBO: 'Kobo',
+    LENOVO: 'Lenovo',
+    LG: 'LG',
+    MEIZU: 'Meizu',
+    MICROSOFT: 'Microsoft',
+    MOTOROLA: 'Motorola',
+    NEXIAN: 'Nexian',
+    NINTENDO: 'Nintendo',
+    NOKIA: 'Nokia',
+    NVIDIA: 'Nvidia',
+    ONEPLUS: 'OnePlus',
+    OPPO: 'OPPO',
+    OUYA: 'Ouya',
+    PALM: 'Palm',
+    PANASONIC: 'Panasonic',
+    PEBBLE: 'Pebble',
+    POLYTRON: 'Polytron',
+    REALME: 'Realme',
+    RIM: 'RIM',
+    ROKU: 'Roku',
+    SAMSUNG: 'Samsung',
+    SHARP: 'Sharp',
+    SIEMENS: 'Siemens',
+    SONY: 'Sony',
+    SPRINT: 'Sprint',
+    TECHNISAT: 'TechniSAT',
+    TECNO: 'Tecno',
+    TESLA: 'Tesla',
+    ULEFONE: 'Ulefone',
+    VIVO: 'Vivo',
+    VODAFONE: 'Vodafone',
+    XBOX: 'Xbox',
+    XIAOMI: 'Xiaomi',
+    ZEBRA: 'Zebra',
+    ZTE: 'ZTE',
+
+    // TODO : test!
+});
+
+const Engine = Object.freeze({
+    AMAYA: 'Amaya',
+    BLINK: 'Blink',
+    EDGEHTML: 'EdgeHTML',
+    FLOW: 'Flow',
+    GECKO: 'Gecko',
+    GOANNA: 'Goanna',
+    ICAB: 'iCab',
+    KHTML: 'KHTML',
+    LIBWEB: 'LibWeb',
+    LINKS: 'Links',
+    LYNX: 'Lynx',
+    NETFRONT: 'NetFront',
+    NETSURF: 'NetSurf',
+    PRESTO: 'Presto',
+    TASMAN: 'Tasman',
+    TRIDENT: 'Trident',
+    W3M: 'w3m',
+    WEBKIT: 'WebKit'
+});
+
+const OS = Object.freeze({
+    AIX: 'AIX',
+    AMIGA_OS: 'Amiga OS',
+    ANDROID: 'Android',
+    ANDROID_X86: 'Android-x86',
+    ARCH: 'Arch',
+    BADA: 'Bada',
+    BEOS: 'BeOS',
+    BLACKBERRY: 'BlackBerry',
+    CENTOS: 'CentOS',
+    CHROME_OS: 'Chrome OS',
+    CHROMECAST: 'Chromecast',
+    CONTIKI: 'Contiki',
+    DEBIAN: 'Debian',
+    DEEPIN: 'Deepin',
+    DRAGONFLY: 'DragonFly',
+    ELEMENTARY_OS: 'elementary OS',
+    FEDORA: 'Fedora',
+    FIREFOX_OS: 'Firefox OS',
+    FREEBSD: 'FreeBSD',
+    FUCHSIA: 'Fuchsia',
+    GENTOO: 'Gentoo',
+    GHOSTBSD: 'GhostBSD',
+    GNU: 'GNU',
+    HAIKU: 'Haiku',
+    HARMONYOS: 'HarmonyOS',
+    HP_UX: 'HP-UX',
+    HURD: 'Hurd',
+    IOS: 'iOS',
+    JOLI: 'Joli',
+    KAIOS: 'KaiOS',
+    LINPUS: 'Linpus',
+    LINSPIRE: 'Linspire',
+    LINUX: 'Linux',
+    MACOS: 'macOS',
+    MAEMO: 'Maemo',
+    MAGEIA: 'Mageia',
+    MANDRIVA: 'Mandriva',
+    MANJARO: 'Manjaro',
+    MEEGO: 'MeeGo',
+    MINIX: 'Minix',
+    MINT: 'Mint',
+    MORPH_OS: 'Morph OS',
+    NETBSD: 'NetBSD',
+    NETRANGE: 'NetRange',
+    NETTV: 'NetTV',
+    NINTENDO: 'Nintendo',
+    OPENBSD: 'OpenBSD',
+    OPENVMS: 'OpenVMS',
+    OS2: 'OS/2',
+    PALM: 'Palm',
+    PC_BSD: 'PC-BSD',
+    PCLINUXOS: 'PCLinuxOS',
+    PLAN9: 'Plan9',
+    PLAYSTATION: 'PlayStation',
+    QNX: 'QNX',
+    RASPBIAN: 'Raspbian',
+    REDHAT: 'RedHat',
+    RIM_TABLET_OS: 'RIM Tablet OS',
+    RISC_OS: 'RISC OS',
+    SABAYON: 'Sabayon',
+    SAILFISH: 'Sailfish',
+    SERENITYOS: 'SerenityOS',
+    SERIES40: 'Series40',
+    SLACKWARE: 'Slackware',
+    SOLARIS: 'Solaris',
+    SUSE: 'SUSE',
+    SYMBIAN: 'Symbian',
+    TIZEN: 'Tizen',
+    UBUNTU: 'Ubuntu',
+    UNIX: 'Unix',
+    VECTORLINUX: 'VectorLinux',
+    VIERA: 'Viera',
+    WATCHOS: 'watchOS',
+    WEBOS: 'WebOS',
+    WINDOWS: 'Windows',
+    WINDOWS_MOBILE: 'Windows Mobile',
+    WINDOWS_PHONE: 'Windows Phone',
+    XBOX: 'Xbox',
+    ZENWALK: 'Zenwalk'
+
+    // TODO : test!
+});
+
+export { 
+    Browser, 
+    CPU, 
+    Device, 
+    Vendor,
+    Engine,
+    OS
+};

src/extension/ua-parser-extension.js

@@ -1,120 +0,0 @@
-///////////////////////////////////////////////
-/*  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
-}

src/extension/ua-parser-extension.mjs

@@ -1,124 +0,0 @@
-// 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
-}

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

@@ -0,0 +1,13 @@
+// Type definitions for Helpers submodule of UAParser.js v2.0.0-beta.2
+// Project: https://github.com/faisalman/ua-parser-js
+// Definitions by: Faisal Salman <https://github.com/faisalman>
+
+import type { UAParserExt } from "../main/ua-parser";
+
+export const Apps: UAParserExt;
+export const Bots: UAParserExt;
+export const CLIs: UAParserExt;
+export const ExtraDevices: UAParserExt;
+export const Emails: UAParserExt;
+export const MediaPlayers: UAParserExt;
+export const Modules: UAParserExt;

src/extensions/ua-parser-extensions.js

@@ -0,0 +1,248 @@
+///////////////////////////////////////////////
+/*  Extensions for UAParser.js v2.0.0-beta.2
+    https://github.com/faisalman/ua-parser-js
+    Author: Faisal Salman <f@faisalman.com>
+    UAParser.js PRO Business License */
+//////////////////////////////////////////////
+
+/*jshint esversion: 6 */ 
+
+const MODEL     = 'model';
+const NAME      = 'name';
+const TYPE      = 'type';
+const VENDOR    = 'vendor';
+const VERSION   = 'version';
+const MOBILE    = 'mobile';
+const TABLET    = 'tablet';
+
+const Apps = Object.freeze({
+    browser : [
+        [/chatlyio\/([\d\.]+)/i], [VERSION, 'Slack', [TYPE, 'app']]
+    ]
+});
+
+const Bots = Object.freeze({
+    browser : [
+        // Googlebot / BingBot / MSNBot / FacebookBot
+        [/((?:google|bing|msn|facebook)bot(?:[\-imagevdo]{0,6})|bingpreview)\/([\w\.]+)/i], [NAME, VERSION, [TYPE, 'bot']],
+
+        // GPTBot - https://platform.openai.com/docs/gptbot
+        [/(gptbot)\/([\w\.]+)/i], [NAME, VERSION, [TYPE, 'bot']],
+
+        // Slackbot - https://api.slack.com/robots
+        [/(slack(?:bot)?(?:-imgproxy|-linkexpanding)?) ([\w\.]+)/i], [NAME, VERSION, [TYPE, 'bot']]
+    ]
+});
+
+const CLIs = Object.freeze({
+    browser : [
+                                                                            // wget / curl / lynx
+        [/(wget|curl|lynx)\/([\w\.]+)/i], [NAME, VERSION, [TYPE, 'cli']]
+    ]
+});
+
+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 MediaPlayers = Object.freeze({
+    browser : [[
+
+        /(apple(?:coremedia|))\/([\w\._]+)/i,                               // Generic Apple CoreMedia
+        /(coremedia) v([\w\._]+)/i
+        ], [NAME, VERSION], [
+
+        /(aqualung|lyssna|bsplayer)\/([\w\.-]+)/i                           // Aqualung/Lyssna/BSPlayer
+        ], [NAME, VERSION], [
+
+        /(ares|ossproxy)\s([\w\.-]+)/i                                      // Ares/OSSProxy
+        ], [NAME, VERSION], [
+
+        /(audacious|audimusicstream|amarok|bass|core|dalvik|gnomemplayer|music on console|nsplayer|psp-internetradioplayer|videos)\/([\w\.-]+)/i,
+                                                                            // Audacious/AudiMusicStream/Amarok/BASS/OpenCORE/Dalvik/GnomeMplayer/MoC
+                                                                            // NSPlayer/PSP-InternetRadioPlayer/Videos
+        /(clementine|music player daemon)\s([\w\.-]+)/i,                    // Clementine/MPD
+        /(lg player|nexplayer)\s([\d\.]+)/i,
+        /player\/(nexplayer|lg player)\s([\w\.-]+)/i                        // NexPlayer/LG Player
+        ], [NAME, VERSION], [
+        /(nexplayer)\s([\w\.-]+)/i                                          // Nexplayer
+        ], [NAME, VERSION], [
+
+        /(flrp)\/([\w\.-]+)/i                                               // Flip Player
+        ], [[NAME, 'Flip Player'], VERSION], [
+
+        /(fstream|nativehost|queryseekspider|ia-archiver|facebookexternalhit)/i
+                                                                            // FStream/NativeHost/QuerySeekSpider/IA Archiver/facebookexternalhit
+        ], [NAME], [
+
+        /(gstreamer) souphttpsrc.+libsoup\/([\w\.-]+)/i
+                                                                            // Gstreamer
+        ], [NAME, VERSION], [
+
+        /(htc streaming player)\s[\w_]+\s\/\s([\d\.]+)/i,                   // HTC Streaming Player
+        /(java|python-urllib|python-requests|wget|libcurl)\/([\w\.-_]+)/i,
+                                                                            // Java/urllib/requests/wget/cURL
+        /(lavf)([\d\.]+)/i                                                  // Lavf (FFMPEG)
+        ], [NAME, VERSION], [
+
+        /(htc_one_s)\/([\d\.]+)/i,                                          // HTC One S
+        ], [[NAME, /_/g, ' '], VERSION], [
+
+        /(mplayer)(?:\s|\/)(?:(?:sherpya-){0,1}svn)(?:-|\s)(r\d+(?:-\d+[\w\.-]+))/i,
+                                                                            // MPlayer SVN
+        ], [NAME, VERSION], [
+
+        /(mplayer)(?:\s|\/)([\w\.-]+)/i,                                    // MPlayer
+        /(mplayer) unknown-([\w\.\-]+)/i                                    // MPlayer UNKNOWN
+        ], [NAME, VERSION], [
+
+        /(mplayer)/i,                                                       // MPlayer (no other info)
+        /(yourmuze)/i,                                                      // YourMuze
+        /(media player classic|nero showtime)/i                             // Media Player Classic/Nero ShowTime
+        ], [NAME], [
+
+        /(nero (?:home|scout))\/([\w\.-]+)/i                                // Nero Home/Nero Scout
+        ], [NAME, VERSION], [
+
+        /(nokia\d+)\/([\w\.-]+)/i                                           // Nokia
+        ], [NAME, VERSION], [
+
+        /\s(songbird)\/([\w\.-]+)/i                                         // Songbird/Philips-Songbird
+        ], [NAME, VERSION], [
+
+        /(winamp)3 version ([\w\.-]+)/i,                                    // Winamp
+        /(winamp)\s([\w\.-]+)/i,
+        /(winamp)mpeg\/([\w\.-]+)/i
+        ], [NAME, VERSION], [
+
+        /(ocms-bot|tapinradio|tunein radio|unknown|winamp|inlight radio)/i  // OCMS-bot/tap in radio/tunein/unknown/winamp (no other info)
+                                                                            // inlight radio
+        ], [NAME], [
+
+        /(quicktime|rma|radioapp|radioclientapplication|soundtap|totem|stagefright|streamium)\/([\w\.-]+)/i
+                                                                            // QuickTime/RealMedia/RadioApp/RadioClientApplication/
+                                                                            // SoundTap/Totem/Stagefright/Streamium
+        ], [NAME, VERSION], [
+
+        /(smp)([\d\.]+)/i                                                   // SMP
+        ], [NAME, VERSION], [
+
+        /(vlc) media player - version ([\w\.]+)/i,                          // VLC Videolan
+        /(vlc)\/([\w\.-]+)/i,
+        /(xbmc|gvfs|xine|xmms|irapp)\/([\w\.-]+)/i,                         // XBMC/gvfs/Xine/XMMS/irapp
+        /(foobar2000)\/([\d\.]+)/i,                                         // Foobar2000
+        /(itunes)\/([\d\.]+)/i                                              // iTunes
+        ], [NAME, VERSION], [
+
+        /(wmplayer)\/([\w\.-]+)/i,                                          // Windows Media Player
+        /(windows-media-player)\/([\w\.-]+)/i
+        ], [[NAME, /-/g, ' '], VERSION], [
+
+        /windows\/([\w\.-]+) upnp\/[\d\.]+ dlnadoc\/[\d\.]+ (home media server)/i,
+                                                                            // Windows Media Server
+        ], [VERSION, [NAME, 'Windows']], [
+
+        /(com\.riseupradioalarm)\/([\d\.]*)/i                               // RiseUP Radio Alarm
+        ], [NAME, VERSION], [
+
+        /(rad.io)\s([\d\.]+)/i,                                             // Rad.io
+        /(radio.(?:de|at|fr))\s([\d\.]+)/i
+        ], [[NAME, 'rad.io'], VERSION]
+    ]
+});
+
+const Modules = Object.freeze({
+    browser : [
+                                                                            // Axios/jsdom/Scrapy
+        [/\b(axios|jsdom|scrapy)\/([\w\.]+)/i], [NAME, VERSION, [TYPE, 'module']]
+    ]
+});
+
+module.exports = { 
+    Apps,
+    Bots,
+    CLIs,
+    ExtraDevices,
+    Emails,
+    MediaPlayers,
+    Modules
+};

src/extensions/ua-parser-extensions.mjs

@@ -0,0 +1,252 @@
+// Generated ESM version of ua-parser-js/extensions
+// DO NOT EDIT THIS FILE!
+// Source: /src/extensions/ua-parser-extensions.js
+
+///////////////////////////////////////////////
+/*  Extensions for UAParser.js v2.0.0-beta.2
+    https://github.com/faisalman/ua-parser-js
+    Author: Faisal Salman <f@faisalman.com>
+    UAParser.js PRO Business License */
+//////////////////////////////////////////////
+
+/*jshint esversion: 6 */ 
+
+const MODEL     = 'model';
+const NAME      = 'name';
+const TYPE      = 'type';
+const VENDOR    = 'vendor';
+const VERSION   = 'version';
+const MOBILE    = 'mobile';
+const TABLET    = 'tablet';
+
+const Apps = Object.freeze({
+    browser : [
+        [/chatlyio\/([\d\.]+)/i], [VERSION, 'Slack', [TYPE, 'app']]
+    ]
+});
+
+const Bots = Object.freeze({
+    browser : [
+        // Googlebot / BingBot / MSNBot / FacebookBot
+        [/((?:google|bing|msn|facebook)bot(?:[\-imagevdo]{0,6})|bingpreview)\/([\w\.]+)/i], [NAME, VERSION, [TYPE, 'bot']],
+
+        // GPTBot - https://platform.openai.com/docs/gptbot
+        [/(gptbot)\/([\w\.]+)/i], [NAME, VERSION, [TYPE, 'bot']],
+
+        // Slackbot - https://api.slack.com/robots
+        [/(slack(?:bot)?(?:-imgproxy|-linkexpanding)?) ([\w\.]+)/i], [NAME, VERSION, [TYPE, 'bot']]
+    ]
+});
+
+const CLIs = Object.freeze({
+    browser : [
+                                                                            // wget / curl / lynx
+        [/(wget|curl|lynx)\/([\w\.]+)/i], [NAME, VERSION, [TYPE, 'cli']]
+    ]
+});
+
+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 MediaPlayers = Object.freeze({
+    browser : [[
+
+        /(apple(?:coremedia|))\/([\w\._]+)/i,                               // Generic Apple CoreMedia
+        /(coremedia) v([\w\._]+)/i
+        ], [NAME, VERSION], [
+
+        /(aqualung|lyssna|bsplayer)\/([\w\.-]+)/i                           // Aqualung/Lyssna/BSPlayer
+        ], [NAME, VERSION], [
+
+        /(ares|ossproxy)\s([\w\.-]+)/i                                      // Ares/OSSProxy
+        ], [NAME, VERSION], [
+
+        /(audacious|audimusicstream|amarok|bass|core|dalvik|gnomemplayer|music on console|nsplayer|psp-internetradioplayer|videos)\/([\w\.-]+)/i,
+                                                                            // Audacious/AudiMusicStream/Amarok/BASS/OpenCORE/Dalvik/GnomeMplayer/MoC
+                                                                            // NSPlayer/PSP-InternetRadioPlayer/Videos
+        /(clementine|music player daemon)\s([\w\.-]+)/i,                    // Clementine/MPD
+        /(lg player|nexplayer)\s([\d\.]+)/i,
+        /player\/(nexplayer|lg player)\s([\w\.-]+)/i                        // NexPlayer/LG Player
+        ], [NAME, VERSION], [
+        /(nexplayer)\s([\w\.-]+)/i                                          // Nexplayer
+        ], [NAME, VERSION], [
+
+        /(flrp)\/([\w\.-]+)/i                                               // Flip Player
+        ], [[NAME, 'Flip Player'], VERSION], [
+
+        /(fstream|nativehost|queryseekspider|ia-archiver|facebookexternalhit)/i
+                                                                            // FStream/NativeHost/QuerySeekSpider/IA Archiver/facebookexternalhit
+        ], [NAME], [
+
+        /(gstreamer) souphttpsrc.+libsoup\/([\w\.-]+)/i
+                                                                            // Gstreamer
+        ], [NAME, VERSION], [
+
+        /(htc streaming player)\s[\w_]+\s\/\s([\d\.]+)/i,                   // HTC Streaming Player
+        /(java|python-urllib|python-requests|wget|libcurl)\/([\w\.-_]+)/i,
+                                                                            // Java/urllib/requests/wget/cURL
+        /(lavf)([\d\.]+)/i                                                  // Lavf (FFMPEG)
+        ], [NAME, VERSION], [
+
+        /(htc_one_s)\/([\d\.]+)/i,                                          // HTC One S
+        ], [[NAME, /_/g, ' '], VERSION], [
+
+        /(mplayer)(?:\s|\/)(?:(?:sherpya-){0,1}svn)(?:-|\s)(r\d+(?:-\d+[\w\.-]+))/i,
+                                                                            // MPlayer SVN
+        ], [NAME, VERSION], [
+
+        /(mplayer)(?:\s|\/)([\w\.-]+)/i,                                    // MPlayer
+        /(mplayer) unknown-([\w\.\-]+)/i                                    // MPlayer UNKNOWN
+        ], [NAME, VERSION], [
+
+        /(mplayer)/i,                                                       // MPlayer (no other info)
+        /(yourmuze)/i,                                                      // YourMuze
+        /(media player classic|nero showtime)/i                             // Media Player Classic/Nero ShowTime
+        ], [NAME], [
+
+        /(nero (?:home|scout))\/([\w\.-]+)/i                                // Nero Home/Nero Scout
+        ], [NAME, VERSION], [
+
+        /(nokia\d+)\/([\w\.-]+)/i                                           // Nokia
+        ], [NAME, VERSION], [
+
+        /\s(songbird)\/([\w\.-]+)/i                                         // Songbird/Philips-Songbird
+        ], [NAME, VERSION], [
+
+        /(winamp)3 version ([\w\.-]+)/i,                                    // Winamp
+        /(winamp)\s([\w\.-]+)/i,
+        /(winamp)mpeg\/([\w\.-]+)/i
+        ], [NAME, VERSION], [
+
+        /(ocms-bot|tapinradio|tunein radio|unknown|winamp|inlight radio)/i  // OCMS-bot/tap in radio/tunein/unknown/winamp (no other info)
+                                                                            // inlight radio
+        ], [NAME], [
+
+        /(quicktime|rma|radioapp|radioclientapplication|soundtap|totem|stagefright|streamium)\/([\w\.-]+)/i
+                                                                            // QuickTime/RealMedia/RadioApp/RadioClientApplication/
+                                                                            // SoundTap/Totem/Stagefright/Streamium
+        ], [NAME, VERSION], [
+
+        /(smp)([\d\.]+)/i                                                   // SMP
+        ], [NAME, VERSION], [
+
+        /(vlc) media player - version ([\w\.]+)/i,                          // VLC Videolan
+        /(vlc)\/([\w\.-]+)/i,
+        /(xbmc|gvfs|xine|xmms|irapp)\/([\w\.-]+)/i,                         // XBMC/gvfs/Xine/XMMS/irapp
+        /(foobar2000)\/([\d\.]+)/i,                                         // Foobar2000
+        /(itunes)\/([\d\.]+)/i                                              // iTunes
+        ], [NAME, VERSION], [
+
+        /(wmplayer)\/([\w\.-]+)/i,                                          // Windows Media Player
+        /(windows-media-player)\/([\w\.-]+)/i
+        ], [[NAME, /-/g, ' '], VERSION], [
+
+        /windows\/([\w\.-]+) upnp\/[\d\.]+ dlnadoc\/[\d\.]+ (home media server)/i,
+                                                                            // Windows Media Server
+        ], [VERSION, [NAME, 'Windows']], [
+
+        /(com\.riseupradioalarm)\/([\d\.]*)/i                               // RiseUP Radio Alarm
+        ], [NAME, VERSION], [
+
+        /(rad.io)\s([\d\.]+)/i,                                             // Rad.io
+        /(radio.(?:de|at|fr))\s([\d\.]+)/i
+        ], [[NAME, 'rad.io'], VERSION]
+    ]
+});
+
+const Modules = Object.freeze({
+    browser : [
+                                                                            // Axios/jsdom/Scrapy
+        [/\b(axios|jsdom|scrapy)\/([\w\.]+)/i], [NAME, VERSION, [TYPE, 'module']]
+    ]
+});
+
+export { 
+    Apps,
+    Bots,
+    CLIs,
+    ExtraDevices,
+    Emails,
+    MediaPlayers,
+    Modules
+};

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

@@ -0,0 +1,15 @@
+// Type definitions for Helpers submodule of UAParser.js v2.0.0-beta.2
+// Project: https://github.com/faisalman/ua-parser-js
+// Definitions by: Faisal Salman <https://github.com/faisalman>
+
+import { IResult } from "../main/ua-parser";
+
+declare function isAppleSilicon(res: IResult): boolean;
+declare function isChromiumBased(res: IResult): boolean;
+declare function isFrozenUA(ua: string): boolean;
+
+export {
+    isAppleSilicon,
+    isChromiumBased,
+    isFrozenUA
+}

src/helpers/ua-parser-helpers.js

@@ -0,0 +1,22 @@
+///////////////////////////////////////////////
+/*  Helpers for UAParser.js v2.0.0-beta.2
+    https://github.com/faisalman/ua-parser-js
+    Author: Faisal Salman <f@faisalman.com>
+    AGPLv3 License */
+//////////////////////////////////////////////
+
+/*jshint esversion: 6 */ 
+
+const { CPU, OS, Engine } = require('../enums/ua-parser-enums');
+
+const isAppleSilicon = (res) => res.os.is(OS.MACOS) && res.cpu.is(CPU.ARM);
+
+const isChromiumBased = (res) => res.engine.is(Engine.BLINK);
+
+const isFrozenUA = (ua) => /^Mozilla\/5\.0 \((Windows NT 10\.0; Win64; x64|Macintosh; Intel Mac OS X 10_15_7|X11; Linux x86_64|X11; CrOS x86_64 14541\.0\.0|Fuchsia|Linux; Android 10; K)\) AppleWebKit\/537\.36 \(KHTML, like Gecko\) Chrome\/\d+\.0\.0\.0 (Mobile )?Safari\/537\.36/.test(ua);
+
+module.exports = { 
+    isAppleSilicon,
+    isChromiumBased,
+    isFrozenUA
+}

src/helpers/ua-parser-helpers.mjs

@@ -0,0 +1,26 @@
+// Generated ESM version of ua-parser-js/helpers
+// DO NOT EDIT THIS FILE!
+// Source: /src/helpers/ua-parser-helpers.js
+
+///////////////////////////////////////////////
+/*  Helpers for UAParser.js v2.0.0-beta.2
+    https://github.com/faisalman/ua-parser-js
+    Author: Faisal Salman <f@faisalman.com>
+    AGPLv3 License */
+//////////////////////////////////////////////
+
+/*jshint esversion: 6 */ 
+
+import { CPU, OS, Engine } from '../enums/ua-parser-enums';
+
+const isAppleSilicon = (res) => res.os.is(OS.MACOS) && res.cpu.is(CPU.ARM);
+
+const isChromiumBased = (res) => res.engine.is(Engine.BLINK);
+
+const isFrozenUA = (ua) => /^Mozilla\/5\.0 \((Windows NT 10\.0; Win64; x64|Macintosh; Intel Mac OS X 10_15_7|X11; Linux x86_64|X11; CrOS x86_64 14541\.0\.0|Fuchsia|Linux; Android 10; K)\) AppleWebKit\/537\.36 \(KHTML, like Gecko\) Chrome\/\d+\.0\.0\.0 (Mobile )?Safari\/537\.36/.test(ua);
+
+export { 
+    isAppleSilicon,
+    isChromiumBased,
+    isFrozenUA
+}

src/main/ua-parser.d.ts

@@ -0,0 +1,106 @@
+// Type definitions for UAParser.js v2.0.0-beta.2
+// Project: https://github.com/faisalman/ua-parser-js
+// Definitions by: Faisal Salman <https://github.com/faisalman>
+
+declare namespace UAParser {
+    
+    interface IData<T> {
+        is(val: string): boolean;
+        toString(): string;
+        withClientHints(): PromiseLike<T> | T;
+        withFeatureCheck(): T;
+    }
+
+    interface IBrowser extends IData<IBrowser> {
+        name?: string;
+        version?: string;
+        major?: string;
+    }
+
+    interface ICPU extends IData<ICPU> {
+        architecture?: 'ia32' | 'ia64' | 'amd64' | 'arm' | 'arm64' | 'armhf' | 'avr' | 'irix' | 'irix64' | 'mips' | 'mips64' | '68k' | 'ppc' | 'sparc' | 'sparc64';
+    }
+
+    interface IDevice extends IData<IDevice> {
+        type?: 'mobile' | 'tablet' | 'console' | 'smarttv' | 'wearable';
+        vendor?: string;
+        model?: string;
+    }
+
+    interface IEngine extends IData<IEngine> {
+        name?: 'Amaya' | 'Blink' | 'EdgeHTML' | 'Flow' | 'Gecko' | 'Goanna' | 'iCab' | 'KHTML' | 'LibWeb' | 'Links' | 'Lynx' | 'NetFront' | 'NetSurf' | 'Presto' | 'Tasman' | 'Trident' | 'w3m' | 'WebKit';
+        version?: string;
+    }
+
+    interface IOS extends IData<IOS> {
+        name?: string;
+        version?: string;
+    }
+
+    interface IResult extends IData<IResult> {
+        ua: string;
+        browser: IBrowser;
+        cpu: ICPU; 
+        device: IDevice;
+        engine: IEngine; 
+        os: IOS;
+    }
+
+    type RegexMap = ((RegExp | string | (string | RegExp | Function)[])[])[];
+    type UAParserProps = 'browser' | 'cpu' | 'device' | 'engine' | 'os';
+    type UAParserExt = Partial<Record<UAParserProps, RegexMap>>;
+
+    export function UAParser(uastring?: string, extensions?: UAParserExt, headers?: Record<string, string>): IResult;
+    export function UAParser(uastring?: string, headers?: Record<string, string>): IResult;
+    export function UAParser(extensions?: UAParserExt, headers?: Record<string, string>): IResult;
+    export function UAParser(headers?: Record<string, string>): IResult;
+
+    export class UAParser {
+        
+        static readonly BROWSER: {
+            NAME: 'name'; 
+            VERSION: 'version'; 
+            MAJOR: 'major';
+        };
+        static readonly CPU: { 
+            ARCHITECTURE: 'architecture'; 
+        };
+        static readonly DEVICE: { 
+            TYPE: 'type';
+            VENDOR: 'vendor'; 
+            MODEL: 'model';
+            CONSOLE: 'console';
+            MOBILE: 'mobile';
+            SMARTTV: 'smarttv';
+            TABLET: 'tablet';
+            WEARABLE: 'wearable';
+            EMBEDDED: 'embedded';
+        };
+        static readonly ENGINE: { 
+            NAME: 'name'; 
+            VERSION: 'version'; 
+        };
+        static readonly OS: { 
+            NAME: 'name';
+            VERSION: 'version'; 
+        };
+        static readonly VERSION: string;
+
+        constructor(uastring?: string, extensions?: UAParserExt, headers?: Record<string, string>);
+        constructor(uastring?: string, headers?: Record<string, string>);
+        constructor(extensions?: UAParserExt, headers?: Record<string, string>);
+        constructor(headers?: Record<string, string>);
+    
+        getUA(): string;
+        getBrowser(): IBrowser;
+        getCPU(): ICPU;
+        getDevice(): IDevice;
+        getEngine(): IEngine;
+        getOS(): IOS;
+        getResult(): IResult;
+        setUA(uastring: string): UAParser;
+    }
+}
+
+export as namespace UAParser;
+export = UAParser;

src/main/ua-parser.js

@@ -1,23 +1,25 @@
 /////////////////////////////////////////////////////////////////////////////////
-/* UAParser.js v2.0.0-alpha.2
+/* UAParser.js v2.0.0-beta.2
    Copyright © 2012-2023 Faisal Salman <f@faisalman.com>
-   MIT License *//*
+   UAParser.js PRO Business License *//*
    Detect Browser, Engine, OS, CPU, and Device type/model from User-Agent data.
    Supports browser & node.js environment. 
    Demo   : https://faisalman.github.io/ua-parser-js
    Source : https://github.com/faisalman/ua-parser-js */
 /////////////////////////////////////////////////////////////////////////////////
 
+/* jshint esversion: 3 */ 
+/* globals window */
+
 (function (window, undefined) {
 
     'use strict';
-
+    
     //////////////
     // Constants
     /////////////
 
-
-    var LIBVERSION  = '2.0.0-alpha.2',
+    var LIBVERSION  = '2.0.0-beta.2',
         EMPTY       = '',
         UNKNOWN     = '?',
         FUNC_TYPE   = 'function',
@@ -38,8 +40,9 @@
         WEARABLE    = 'wearable',
         EMBEDDED    = 'embedded',
         USER_AGENT  = 'user-agent',
-        UA_MAX_LENGTH = 350,
+        UA_MAX_LENGTH = 500,
         BRANDS      = 'brands',
+        FORMFACTOR  = 'formFactor',
         FULLVERLIST = 'fullVersionList',
         PLATFORM    = 'platform',
         PLATFORMVER = 'platformVersion',
@@ -47,12 +50,13 @@
         CH_HEADER   = 'sec-ch-ua',
         CH_HEADER_FULL_VER_LIST = CH_HEADER + '-full-version-list',
         CH_HEADER_ARCH      = CH_HEADER + '-arch',
-        CH_HEADER_BITNESS   = CH_HEADER + '-bitness',
-        CH_HEADER_MOBILE    = CH_HEADER + '-mobile',
-        CH_HEADER_MODEL     = CH_HEADER + '-model',
-        CH_HEADER_PLATFORM  = CH_HEADER + '-platform',
+        CH_HEADER_BITNESS   = CH_HEADER + '-' + BITNESS,
+        CH_HEADER_FORM_FACTOR = CH_HEADER + '-form-factor',
+        CH_HEADER_MOBILE    = CH_HEADER + '-' + MOBILE,
+        CH_HEADER_MODEL     = CH_HEADER + '-' + MODEL,
+        CH_HEADER_PLATFORM  = CH_HEADER + '-' + PLATFORM,
         CH_HEADER_PLATFORM_VER = CH_HEADER_PLATFORM + '-version',
-        CH_ALL_VALUES       = ['brands', 'fullVersionList', MOBILE, MODEL, 'platform', 'platformVersion', ARCHITECTURE, 'bitness'],
+        CH_ALL_VALUES       = [BRANDS, FULLVERLIST, MOBILE, MODEL, PLATFORM, PLATFORMVER, ARCHITECTURE, FORMFACTOR, BITNESS],
         UA_BROWSER  = 'browser',
         UA_CPU      = 'cpu',
         UA_DEVICE   = 'device',
@@ -65,6 +69,7 @@
         BLACKBERRY  = 'BlackBerry',
         GOOGLE      = 'Google',
         HUAWEI      = 'Huawei',
+        LENOVO      = 'Lenovo',
         LG          = 'LG',
         MICROSOFT   = 'Microsoft',
         MOTOROLA    = 'Motorola',
@@ -80,9 +85,11 @@
         FIREFOX     = 'Firefox',
         OPERA       = 'Opera',
         FACEBOOK    = 'Facebook',
+        SOGOU       = 'Sogou',
         WINDOWS     = 'Windows';
    
-    var NAVIGATOR           = (typeof window !== UNDEF_TYPE && window.navigator) ? 
+    var isWindow            = typeof window !== UNDEF_TYPE,
+        NAVIGATOR           = (isWindow && window.navigator) ? 
                                 window.navigator : 
                                 undefined,
         NAVIGATOR_UADATA    = (NAVIGATOR && NAVIGATOR.userAgentData) ? 
@@ -93,18 +100,7 @@
     // Helper
     //////////
 
-    var assignFromEntries = function (arr) {
-            for (var i in arr) {
-                var propName = arr[i];
-                if (typeof propName == OBJ_TYPE && propName.length == 2) {
-                    this[propName[0]] = propName[1];
-                } else {
-                    this[propName] = undefined;
-                }
-            }
-            return this;
-        },
-        extend = function (regexes, extensions) {
+    var extend = function (regexes, extensions) {
             var mergedRegexes = {};
             for (var i in regexes) {
                 mergedRegexes[i] = extensions[i] && extensions[i].length % 2 === 0 ? extensions[i].concat(regexes[i]) : regexes[i];
@@ -125,39 +121,57 @@
                 }
                 return false;
             }
-            return typeof str1 === STR_TYPE ? lowerize(str2).indexOf(lowerize(str1)) !== -1 : false;
+            return isString(str1) ? lowerize(str2).indexOf(lowerize(str1)) !== -1 : false;
         },
         isExtensions = function (obj) {
             for (var prop in obj) {
                 return /^(browser|cpu|device|engine|os)$/.test(prop);
             }
         },
+        isString = function (val) {
+            return typeof val === STR_TYPE;
+        },
         itemListToArray = function (header) {
             if (!header) return undefined;
             var arr = [];
-            var tokens = strip(/\\?\"/g, header).split(', ');
+            var tokens = strip(/\\?\"/g, header).split(',');
             for (var i = 0; i < tokens.length; i++) {
-                var token = tokens[i].split(';v=');
-                arr[i] = { brand : token[0], version : token[1] };
+                if (tokens[i].indexOf(';') > -1) {
+                    var token = trim(tokens[i]).split(';v=');
+                    arr[i] = { brand : token[0], version : token[1] };
+                } else {
+                    arr[i] = trim(tokens[i]);
+                }
             }
             return arr;
         },
         lowerize = function (str) {
-            return typeof(str) === STR_TYPE ? str.toLowerCase() : str;
+            return isString(str) ? str.toLowerCase() : str;
         },
         majorize = function (version) {
-            return typeof(version) === STR_TYPE ? strip(/[^\d\.]/g, version).split('.')[0] : undefined;
+            return isString(version) ? strip(/[^\d\.]/g, version).split('.')[0] : undefined;
+        },
+        setProps = function (arr) {
+            for (var i in arr) {
+                var propName = arr[i];
+                if (typeof propName == OBJ_TYPE && propName.length == 2) {
+                    this[propName[0]] = propName[1];
+                } else {
+                    this[propName] = undefined;
+                }
+            }
+            return this;
         },
         strip = function (pattern, str) {
-            return str.replace(pattern, EMPTY);
+            return isString(str) ? str.replace(pattern, EMPTY) : str;
         },
-        stripQuotes = function (val) {
-            return typeof val === STR_TYPE ? strip(/\"/g, val) : val; 
+        stripQuotes = function (str) {
+            return strip(/\\?\"/g, str); 
         },
         trim = function (str, len) {
-            if (typeof(str) === STR_TYPE) {
+            if (isString(str)) {
                 str = strip(/^\s\s*/, str);
-                return typeof(len) === UNDEF_TYPE ? str : str.substring(0, UA_MAX_LENGTH);
+                return typeof len === UNDEF_TYPE ? str : str.substring(0, UA_MAX_LENGTH);
             }
     };
 
@@ -234,25 +248,14 @@
                     return (i === UNKNOWN) ? undefined : i;
                 }
             }
-            return str;
+            return map.hasOwnProperty('*') ? map['*'] : str;
     };
 
     ///////////////
     // String map
     //////////////
 
-    // Safari < 3.0
-    var oldSafariMap = {
-            '1.0'   : '/8',
-            '1.2'   : '/1',
-            '1.3'   : '/3',
-            '2.0'   : '/412',
-            '2.0.2' : '/416',
-            '2.0.3' : '/417',
-            '2.0.4' : '/419',
-            '?'     : '/'
-        },
-        windowsVersionMap = {
+    var windowsVersionMap = {
             'ME'        : '4.90',
             'NT 3.11'   : 'NT3.51',
             'NT 4.0'    : 'NT4.0',
@@ -264,6 +267,16 @@
             '8.1'       : 'NT 6.3',
             '10'        : ['NT 6.4', 'NT 10.0'],
             'RT'        : 'ARM'
+        },
+        
+        formFactorMap = {
+            'embedded'  : 'Automotive',
+            'mobile'    : 'Mobile',
+            'tablet'    : ['Tablet', 'EInk'],
+            'smarttv'   : 'TV',
+            'wearable'  : ['VR', 'XR', 'Watch'],
+            '?'         : ['Desktop', 'Unknown'],
+            '*'         : undefined
     };
 
     //////////////
@@ -287,15 +300,18 @@
             ], [NAME, VERSION], [
             /opios[\/ ]+([\w\.]+)/i                                             // Opera mini on iphone >= 8.0
             ], [VERSION, [NAME, OPERA+' Mini']], [
+            /\bop(?:rg)?x\/([\w\.]+)/i                                          // Opera GX
+            ], [VERSION, [NAME, OPERA+' GX']], [
             /\bopr\/([\w\.]+)/i                                                 // Opera Webkit
             ], [VERSION, [NAME, OPERA]], [
 
             // Mixed
+            /\bb[ai]*d(?:uhd|[ub]*[aekoprswx]{5,6})[\/ ]?([\w\.]+)/i            // Baidu
+            ], [VERSION, [NAME, 'Baidu']], [
             /(kindle)\/([\w\.]+)/i,                                             // Kindle
             /(lunascape|maxthon|netfront|jasmine|blazer)[\/ ]?([\w\.]*)/i,      // Lunascape/Maxthon/Netfront/Jasmine/Blazer
             // Trident based
-            /(avant |iemobile|slim)(?:browser)?[\/ ]?([\w\.]*)/i,               // Avant/IEMobile/SlimBrowser
-            /(ba?idubrowser)[\/ ]?([\w\.]+)/i,                                  // Baidu Browser
+            /(avant|iemobile|slim)\s?(?:browser)?[\/ ]?([\w\.]*)/i,             // Avant/IEMobile/SlimBrowser
             /(?:ms|\()(ie) ([\w\.]+)/i,                                         // Internet Explorer
 
             // Webkit/KHTML based                                               // Flock/RockMelt/Midori/Epiphany/Silk/Skyfire/Bolt/Iron/Iridium/PhantomJS/Bowser/QupZilla/Falkon
@@ -307,8 +323,7 @@
             /(?:\buc? ?browser|(?:juc.+)ucweb)[\/ ]?([\w\.]+)/i                 // UCBrowser
             ], [VERSION, [NAME, 'UCBrowser']], [
             /microm.+\bqbcore\/([\w\.]+)/i,                                     // WeChat Desktop for Windows Built-in Browser
-            /\bqbcore\/([\w\.]+).+microm/i
-            ], [VERSION, [NAME, 'WeChat(Win) Desktop']], [
+            /\bqbcore\/([\w\.]+).+microm/i,
             /micromessenger\/([\w\.]+)/i                                        // WeChat
             ], [VERSION, [NAME, 'WeChat']], [
             /konqueror\/([\w\.]+)/i                                             // Konqueror
@@ -317,6 +332,8 @@
             ], [VERSION, [NAME, 'IE']], [
             /ya(?:search)?browser\/([\w\.]+)/i                                  // Yandex
             ], [VERSION, [NAME, 'Yandex']], [
+            /slbrowser\/([\w\.]+)/i                                             // Smart Lenovo Browser
+            ], [VERSION, [NAME, 'Smart ' + LENOVO + SUFFIX_BROWSER]], [
             /(avast|avg)\/([\w\.]+)/i                                           // Avast/AVG Secure Browser
             ], [[NAME, /(.+)/, '$1 Secure' + SUFFIX_BROWSER], VERSION], [
             /\bfocus\/([\w\.]+)/i                                               // Firefox Focus
@@ -335,15 +352,20 @@
             ], [VERSION, [NAME, PREFIX_MOBILE + FIREFOX]], [
             /\bqihu|(qi?ho?o?|360)browser/i                                     // 360
             ], [[NAME, '360' + SUFFIX_BROWSER]], [
-            /(oculus|samsung|sailfish|huawei)browser\/([\w\.]+)/i
-            ], [[NAME, /(.+)/, '$1' + SUFFIX_BROWSER], VERSION], [               // Oculus/Samsung/Sailfish/Huawei Browser
+            /(oculus|sailfish|huawei|vivo)browser\/([\w\.]+)/i
+            ], [[NAME, /(.+)/, '$1' + SUFFIX_BROWSER], VERSION], [              // Oculus/Sailfish/HuaweiBrowser/VivoBrowser
+            /samsungbrowser\/([\w\.]+)/i                                        // Samsung Internet
+            ], [VERSION, [NAME, SAMSUNG + ' Internet']], [
             /(comodo_dragon)\/([\w\.]+)/i                                       // Comodo Dragon
             ], [[NAME, /_/g, ' '], VERSION], [
+            /metasr[\/ ]?([\d\.]+)/i                                            // Sogou Explorer
+            ], [VERSION, [NAME, SOGOU + ' Explorer']], [
+            /(sogou)mo\w+\/([\d\.]+)/i                                          // Sogou Mobile
+            ], [[NAME, SOGOU + ' Mobile'], VERSION], [
             /(electron)\/([\w\.]+) safari/i,                                    // Electron-based App
             /(tesla)(?: qtcarbrowser|\/(20\d\d\.[-\w\.]+))/i,                   // Tesla
-            /m?(qqbrowser|baiduboxapp|2345Explorer)[\/ ]?([\w\.]+)/i            // QQBrowser/Baidu App/2345 Browser
+            /m?(qqbrowser|2345Explorer)[\/ ]?([\w\.]+)/i                        // QQBrowser/2345 Browser
             ], [NAME, VERSION], [
-            /(metasr)[\/ ]?([\w\.]+)/i,                                         // SouGouBrowser
             /(lbbrowser)/i,                                                     // LieBao Browser
             /\[(linkedin)app\]/i                                                // LinkedIn App for iOS & Android
             ], [NAME], [
@@ -351,11 +373,13 @@
             // WebView
             /((?:fban\/fbios|fb_iab\/fb4a)(?!.+fbav)|;fbav\/([\w\.]+);)/i       // Facebook App for iOS & Android
             ], [[NAME, FACEBOOK], VERSION], [
+            /(Klarna)\/([\w\.]+)/i,                                             // Klarna Shopping Browser for iOS & Android
             /(kakao(?:talk|story))[\/ ]([\w\.]+)/i,                             // Kakao App
             /(naver)\(.*?(\d+\.[\w\.]+).*\)/i,                                  // Naver InApp
             /safari (line)\/([\w\.]+)/i,                                        // Line App for iOS
             /\b(line)\/([\w\.]+)\/iab/i,                                        // Line App for Android
-            /(chromium|instagram)[\/ ]([-\w\.]+)/i                              // Chromium/Instagram
+            /(alipay)client\/([\w\.]+)/i,                                       // Alipay
+            /(chromium|instagram|snapchat)[\/ ]([-\w\.]+)/i                     // Chromium/Instagram/Snapchat
             ], [NAME, VERSION], [
             /\bgsa\/([\w\.]+) .*safari\//i                                      // Google Search Appliance on iOS
             ], [VERSION, [NAME, 'GSA']], [
@@ -384,7 +408,7 @@
             /version\/([\w\.\,]+) .*(safari)/i                                  // Safari
             ], [VERSION, NAME], [
             /webkit.+?(mobile ?safari|safari)(\/[\w\.]+)/i                      // Safari < 3.0
-            ], [NAME, [VERSION, strMapper, oldSafariMap]], [
+            ], [NAME, [VERSION, '1']], [
 
             /(webkit|khtml)\/([\w\.]+)/i
             ], [NAME, VERSION], [
@@ -425,7 +449,7 @@
             /((?:i[346]|x)86)[;\)]/i                                            // IA32 (x86)
             ], [[ARCHITECTURE, 'ia32']], [
 
-            /\b(aarch64|arm(v?8e?l?|_?64))\b/i                                 // ARM64
+            /\b(aarch64|arm(v?8e?l?|_?64))\b/i                                  // ARM64
             ], [[ARCHITECTURE, 'arm64']], [
 
             /\b(arm(?:v[67])?ht?n?[fl]p?)\b/i                                   // ARMHF
@@ -482,12 +506,14 @@
             ], [MODEL, [VENDOR, HUAWEI], [TYPE, MOBILE]], [
 
             // Xiaomi
-            /\b(poco[\w ]+)(?: bui|\))/i,                                       // Xiaomi POCO
+            /\b(poco[\w ]+|m2\d{3}j\d\d[a-z]{2})(?: bui|\))/i,                  // Xiaomi POCO
             /\b; (\w+) build\/hm\1/i,                                           // Xiaomi Hongmi 'numeric' models
             /\b(hm[-_ ]?note?[_ ]?(?:\d\w)?) bui/i,                             // Xiaomi Hongmi
             /\b(redmi[\-_ ]?(?:note|k)?[\w_ ]+)(?: bui|\))/i,                   // Xiaomi Redmi
+            /oid[^\)]+; (m?[12][0-389][01]\w{3,6}[c-y])( bui|; wv|\))/i,        // Xiaomi Redmi 'numeric' models
             /\b(mi[-_ ]?(?:a\d|one|one[_ ]plus|note lte|max|cc)?[_ ]?(?:\d?\w?)[_ ]?(?:plus|se|lite)?)(?: bui|\))/i // Xiaomi Mi
             ], [[MODEL, /_/g, ' '], [VENDOR, XIAOMI], [TYPE, MOBILE]], [
+            /oid[^\)]+; (2\d{4}(283|rpbf)[cgl])( bui|\))/i,                     // Redmi Pad
             /\b(mi[-_ ]?(?:pad)(?:[\w_ ]+))(?: bui|\))/i                        // Mi Pad tablets
             ],[[MODEL, /_/g, ' '], [VENDOR, XIAOMI], [TYPE, TABLET]], [
 
@@ -502,7 +528,7 @@
             ], [MODEL, [VENDOR, 'Vivo'], [TYPE, MOBILE]], [
 
             // Realme
-            /\b(rmx[12]\d{3})(?: bui|;|\))/i
+            /\b(rmx[1-3]\d{3})(?: bui|;|\))/i
             ], [MODEL, [VENDOR, 'Realme'], [TYPE, MOBILE]], [
 
             // Motorola
@@ -524,7 +550,7 @@
             // Lenovo
             /(ideatab[-\w ]+)/i,
             /lenovo ?(s[56]000[-\w]+|tab(?:[\w ]+)|yt[-\d\w]{6}|tb[-\d\w]{6})/i
-            ], [MODEL, [VENDOR, 'Lenovo'], [TYPE, TABLET]], [
+            ], [MODEL, [VENDOR, LENOVO], [TYPE, TABLET]], [
 
             // Nokia
             /(?:maemo|nokia).*(n900|lumia \d+)/i,
@@ -588,9 +614,13 @@
             /droid.+; (m[1-5] note) bui/i,
             /\bmz-([-\w]{2,})/i
             ], [MODEL, [VENDOR, 'Meizu'], [TYPE, MOBILE]], [
+                
+            // Ulefone
+            /; ((?:power )?armor(?:[\w ]{0,8}))(?: bui|\))/i
+            ], [MODEL, [VENDOR, 'Ulefone'], [TYPE, MOBILE]], [
 
             // MIXED
-            /(blackberry|benq|palm(?=\-)|sonyericsson|acer|asus|dell|meizu|motorola|polytron)[-_ ]?([-\w]*)/i,
+            /(blackberry|benq|palm(?=\-)|sonyericsson|acer|asus|dell|meizu|motorola|polytron|infinix|tecno)[-_ ]?([-\w]*)/i,
                                                                                 // BlackBerry/BenQ/Palm/Sony-Ericsson/Acer/Asus/Dell/Meizu/Motorola/Polytron
             /(hp) ([\w ]+\w)/i,                                                 // HP iPAQ
             /(asus)-?(\w+)/i,                                                   // Asus
@@ -635,7 +665,7 @@
             ], [VENDOR, [MODEL, APPLE+' TV'], [TYPE, SMARTTV]], [
             /crkey/i                                                            // Google Chromecast
             ], [[MODEL, CHROME+'cast'], [VENDOR, GOOGLE], [TYPE, SMARTTV]], [
-            /droid.+aft(\w)( bui|\))/i                                          // Fire TV
+            /droid.+aft(\w+)( bui|\))/i                                         // Fire TV
             ], [MODEL, [VENDOR, AMAZON], [TYPE, SMARTTV]], [
             /\(dtv[\);].+(aquos)/i,
             /(aquos-tv[\w ]+)\)/i                                               // Sharp
@@ -694,7 +724,7 @@
             // MIXED (GENERIC)
             ///////////////////
 
-            /droid .+?; ([^;]+?)(?: bui|\) applew).+? mobile safari/i           // Android Phones from Unidentified Vendors
+            /droid .+?; ([^;]+?)(?: bui|; wv\)|\) applew).+? mobile safari/i    // Android Phones from Unidentified Vendors
             ], [MODEL, [TYPE, MOBILE]], [
             /droid .+?; ([^;]+?)(?: bui|\) applew).+?(?! mobile) safari/i       // Android Tablets from Unidentified Vendors
             ], [MODEL, [TYPE, TABLET]], [
@@ -731,16 +761,16 @@
             // Windows
             /microsoft (windows) (vista|xp)/i                                   // Windows (iTunes)
             ], [NAME, VERSION], [
-            /(windows) nt 6\.2; (arm)/i,                                        // Windows RT
-            /(windows (?:phone(?: os)?|mobile))[\/ ]?([\d\.\w ]*)/i,            // Windows Phone
-            /(windows)[\/ ]?([ntce\d\. ]+\w)(?!.+xbox)/i
+            /(windows (?:phone(?: os)?|mobile))[\/ ]?([\d\.\w ]*)/i             // Windows Phone
             ], [NAME, [VERSION, strMapper, windowsVersionMap]], [
-            /(win(?=3|9|n)|win 9x )([nt\d\.]+)/i
-            ], [[NAME, WINDOWS], [VERSION, strMapper, windowsVersionMap]], [
+            /windows nt 6\.2; (arm)/i,                                        // Windows RT
+            /windows[\/ ]?([ntce\d\. ]+\w)(?!.+xbox)/i,
+            /(?:win(?=3|9|n)|win 9x )([nt\d\.]+)/i
+            ], [[VERSION, strMapper, windowsVersionMap], [NAME, WINDOWS]], [
 
             // iOS/macOS
             /ip[honead]{2,4}\b(?:.*os ([\w]+) like mac|; opera)/i,              // iOS
-            /ios;fbsv\/([\d\.]+)/i,
+            /(?:ios;fbsv\/|iphone.+ios[\/ ])([\d\.]+)/i,
             /cfnetwork\/.+darwin/i
             ], [[VERSION, /_/g, '.'], [NAME, 'iOS']], [
             /(mac os x) ?([\w\. ]*)/i,
@@ -809,23 +839,23 @@
 
     var defaultProps = (function () {
             var props = { init : {}, isIgnore : {}, isIgnoreRgx : {}, toString : {}};
-            assignFromEntries.call(props.init, [
+            setProps.call(props.init, [
                 [UA_BROWSER, [NAME, VERSION, MAJOR]],
                 [UA_CPU, [ARCHITECTURE]],
                 [UA_DEVICE, [TYPE, MODEL, VENDOR]],
                 [UA_ENGINE, [NAME, VERSION]],
                 [UA_OS, [NAME, VERSION]]
             ]);
-            assignFromEntries.call(props.isIgnore, [
+            setProps.call(props.isIgnore, [
                 [UA_BROWSER, [VERSION, MAJOR]],
                 [UA_ENGINE, [VERSION]],
                 [UA_OS, [VERSION]]
             ]);
-            assignFromEntries.call(props.isIgnoreRgx, [
+            setProps.call(props.isIgnoreRgx, [
                 [UA_BROWSER, / ?browser$/i],
                 [UA_OS, / ?os$/i]
             ]);
-            assignFromEntries.call(props.toString, [
+            setProps.call(props.toString, [
                 [UA_BROWSER, [NAME, VERSION]],
                 [UA_CPU, [ARCHITECTURE]],
                 [UA_DEVICE, [VENDOR, MODEL]],
@@ -835,34 +865,47 @@
             return props;
     })();
 
-    var createUAParserData = function (itemType, ua, rgxMap, uaCH) {
+    var createIData = function (item, itemType) {
 
         var init_props = defaultProps.init[itemType],
             is_ignoreProps = defaultProps.isIgnore[itemType] || 0,
             is_ignoreRgx = defaultProps.isIgnoreRgx[itemType] || 0,
             toString_props = defaultProps.toString[itemType] || 0;
 
-        function UAParserData () {
-            assignFromEntries.call(this, init_props);
+        function IData () {
+            setProps.call(this, init_props);
         }
-        UAParserData.prototype.withClientHints = function () {
-            
+
+        IData.prototype.getItem = function () {
+            return item;
+        };
+
+        IData.prototype.withClientHints = function () {
+
             // nodejs / non-client-hints browsers
             if (!NAVIGATOR_UADATA) {
-                return new UAParserItem(itemType, ua, rgxMap, uaCH).parseCH().get();
+                return item
+                        .parseCH()
+                        .get();
             }
 
             // browsers based on chromium 85+
             return NAVIGATOR_UADATA
                     .getHighEntropyValues(CH_ALL_VALUES)
                     .then(function (res) {
-                        var JS_UACH = new UAParserDataCH(res, false);
-                        return new UAParserItem(itemType, ua, rgxMap, JS_UACH).parseCH().get();
+                        return item
+                                .setCH(new UACHData(res, false))
+                                .parseCH()
+                                .get();
             });
         };
 
+        IData.prototype.withFeatureCheck = function () {
+            return item.detectFeature().get();
+        };
+
         if (itemType != UA_RESULT) {
-            UAParserData.prototype.is = function (strToCheck) {
+            IData.prototype.is = function (strToCheck) {
                 var is = false;
                 for (var i in this) {
                     if (this.hasOwnProperty(i) && !has(is_ignoreProps, i) && lowerize(is_ignoreRgx ? strip(is_ignoreRgx, this[i]) : this[i]) == lowerize(is_ignoreRgx ? strip(is_ignoreRgx, strToCheck) : strToCheck)) {
@@ -875,7 +918,7 @@
                 }
                 return is;
             };
-            UAParserData.prototype.toString = function () {
+            IData.prototype.toString = function () {
                 var str = EMPTY;
                 for (var i in toString_props) {
                     if (typeof(this[toString_props[i]]) !== UNDEF_TYPE) {
@@ -887,45 +930,45 @@
         }
 
         if (!NAVIGATOR_UADATA) {
-            UAParserData.prototype.then = function (cb) { 
+            IData.prototype.then = function (cb) { 
                 var that = this;
-                var UAParserDataResolve = function () {
+                var IDataResolve = function () {
                     for (var prop in that) {
                         if (that.hasOwnProperty(prop)) {
                             this[prop] = that[prop];
                         }
                     }
                 };
-                UAParserDataResolve.prototype = {
-                    is : UAParserData.prototype.is,
-                    toString : UAParserData.prototype.toString
+                IDataResolve.prototype = {
+                    is : IData.prototype.is,
+                    toString : IData.prototype.toString
                 };
-                var resolveData = new UAParserDataResolve();
+                var resolveData = new IDataResolve();
                 cb(resolveData);
                 return resolveData;
             };
         }
 
-        return new UAParserData();
+        return new IData();
     };
 
     /////////////////
     // Constructor
     ////////////////
 
-    function UAParserDataCH (uach, isHTTP_UACH) {
+    function UACHData (uach, isHttpUACH) {
         uach = uach || {};
-        assignFromEntries.call(this, CH_ALL_VALUES);
-        if (isHTTP_UACH) {
-            assignFromEntries.call(this, [
+        setProps.call(this, CH_ALL_VALUES);
+        if (isHttpUACH) {
+            setProps.call(this, [
                 [BRANDS, itemListToArray(uach[CH_HEADER])],
                 [FULLVERLIST, itemListToArray(uach[CH_HEADER_FULL_VER_LIST])],
-                [BRANDS, itemListToArray(uach[CH_HEADER])],
                 [MOBILE, /\?1/.test(uach[CH_HEADER_MOBILE])],
                 [MODEL, stripQuotes(uach[CH_HEADER_MODEL])],
                 [PLATFORM, stripQuotes(uach[CH_HEADER_PLATFORM])],
                 [PLATFORMVER, stripQuotes(uach[CH_HEADER_PLATFORM_VER])],
                 [ARCHITECTURE, stripQuotes(uach[CH_HEADER_ARCH])],
+                [FORMFACTOR, itemListToArray(uach[CH_HEADER_FORM_FACTOR])],
                 [BITNESS, stripQuotes(uach[CH_HEADER_BITNESS])]
             ]);
         } else {
@@ -933,127 +976,173 @@
                 if(this.hasOwnProperty(prop) && typeof uach[prop] !== UNDEF_TYPE) this[prop] = uach[prop];
             }
         }
-        return this;
     }
 
-    function UAParserItem (itemType, ua, rgxMap, uaCH) {
-        assignFromEntries.call(this, [
+    function UAItem (itemType, ua, rgxMap, uaCH) {
+
+        this.get = function (prop) {
+            if (!prop) return this.data;
+            return this.data.hasOwnProperty(prop) ? this.data[prop] : undefined;
+        };
+
+        this.set = function (prop, val) {
+            this.data[prop] = val;
+            return this;
+        };
+
+        this.setCH = function (ch) {
+            this.uaCH = ch;
+            return this;
+        };
+
+        this.detectFeature = function () {
+            if (NAVIGATOR && NAVIGATOR.userAgent == this.ua) {
+                switch (this.itemType) {
+                    case UA_BROWSER:
+                        // Brave-specific detection
+                        if (NAVIGATOR.brave && typeof NAVIGATOR.brave.isBrave == FUNC_TYPE) {
+                            this.set(NAME, 'Brave');
+                        }
+                        break;
+                    case UA_DEVICE:
+                        // Chrome-specific detection: check for 'mobile' value of navigator.userAgentData
+                        if (!this.get(TYPE) && NAVIGATOR_UADATA && NAVIGATOR_UADATA[MOBILE]) {
+                            this.set(TYPE, MOBILE);
+                        }
+                        // iPadOS-specific detection: identified as Mac, but has some iOS-only properties
+                        if (this.get(MODEL) == 'Macintosh' && NAVIGATOR && typeof NAVIGATOR.standalone !== UNDEF_TYPE && NAVIGATOR.maxTouchPoints && NAVIGATOR.maxTouchPoints > 2) {
+                            this.set(MODEL, 'iPad')
+                                .set(TYPE, TABLET);
+                        }
+                        break;
+                    case UA_OS:
+                        // Chrome-specific detection: check for 'platform' value of navigator.userAgentData
+                        if (!this.get(NAME) && NAVIGATOR_UADATA && NAVIGATOR_UADATA[PLATFORM]) {
+                            this.set(NAME, NAVIGATOR_UADATA[PLATFORM]);
+                        }
+                        break;
+                    case UA_RESULT:
+                        var data = this.data;
+                        var detect = function (itemType) {
+                            return data[itemType]
+                                    .getItem()
+                                    .detectFeature()
+                                    .get();
+                        };
+                        this.set(UA_BROWSER, detect(UA_BROWSER))
+                            .set(UA_CPU, detect(UA_CPU))
+                            .set(UA_DEVICE, detect(UA_DEVICE))
+                            .set(UA_ENGINE, detect(UA_ENGINE))
+                            .set(UA_OS, detect(UA_OS));
+                }
+            }
+            return this;
+        };
+
+        this.parseUA = function () {
+            if (this.itemType != UA_RESULT) {
+                rgxMapper.call(this.data, this.ua, this.rgxMap);
+            }
+            if (this.itemType == UA_BROWSER) {
+                this.set(MAJOR, majorize(this.get(VERSION)));
+            }
+            return this;
+        };
+
+        this.parseCH = function () {
+            var uaCH = this.uaCH,
+                rgxMap = this.rgxMap;
+    
+            switch (this.itemType) {
+                case UA_BROWSER:
+                    var brands = uaCH[FULLVERLIST] || uaCH[BRANDS], prevName;
+                    if (brands) {
+                        for (var i in brands) {
+                            var brandName = strip(/(Google|Microsoft) /, brands[i].brand || brands[i]),
+                                brandVersion = brands[i].version;
+                            if (!/not.a.brand/i.test(brandName) && (!prevName || (/chrom/i.test(prevName) && !/chromi/i.test(brandName)))) {
+                                this.set(NAME, brandName)
+                                    .set(VERSION, brandVersion)
+                                    .set(MAJOR, majorize(brandVersion));
+                                prevName = brandName;
+                            }
+                        }
+                    }
+                    break;
+                case UA_CPU:
+                    var archName = uaCH[ARCHITECTURE];
+                    if (archName) {
+                        if (archName && uaCH[BITNESS] == '64') archName += '64';
+                        rgxMapper.call(this.data, archName + ';', rgxMap);
+                    }
+                    break;
+                case UA_DEVICE:
+                    if (uaCH[MOBILE]) {
+                        this.set(TYPE, MOBILE);
+                    }
+                    if (uaCH[MODEL]) {
+                        this.set(MODEL, uaCH[MODEL]);
+                    }
+                    // Xbox-Specific Detection
+                    if (uaCH[MODEL] == 'Xbox') {
+                        this.set(TYPE, CONSOLE)
+                            .set(VENDOR, MICROSOFT);
+                    }
+                    if (uaCH[FORMFACTOR]) {
+                        var ff;
+                        if (typeof uaCH[FORMFACTOR] !== 'string') {
+                            var idx = 0;
+                            while (!ff && idx < uaCH[FORMFACTOR].length) {
+                                ff = strMapper(uaCH[FORMFACTOR][idx++], formFactorMap);
+                            }
+                        } else {
+                            ff = strMapper(uaCH[FORMFACTOR], formFactorMap);
+                        }
+                        this.set(TYPE, ff);
+                    }
+                    break;
+                case UA_OS:
+                    var osName = uaCH[PLATFORM];
+                    if(osName) {
+                        var osVersion = uaCH[PLATFORMVER];
+                        if (osName == WINDOWS) osVersion = (parseInt(majorize(osVersion), 10) >= 13 ? '11' : '10');
+                        this.set(NAME, osName)
+                            .set(VERSION, osVersion);
+                    }
+                    // Xbox-Specific Detection
+                    if (this.get(NAME) == WINDOWS && uaCH[MODEL] == 'Xbox') {
+                        this.set(NAME, 'Xbox')
+                            .set(VERSION, undefined);
+                    }           
+                    break;
+                case UA_RESULT:
+                    var data = this.data;
+                    var parse = function (itemType) {
+                        return data[itemType]
+                                .getItem()
+                                .setCH(uaCH)
+                                .parseCH()
+                                .get();
+                    };
+                    this.set(UA_BROWSER, parse(UA_BROWSER))
+                        .set(UA_CPU, parse(UA_CPU))
+                        .set(UA_DEVICE, parse(UA_DEVICE))
+                        .set(UA_ENGINE, parse(UA_ENGINE))
+                        .set(UA_OS, parse(UA_OS));
+            }
+            return this;
+        };
+
+        setProps.call(this, [
             ['itemType', itemType],
             ['ua', ua],
             ['uaCH', uaCH],
             ['rgxMap', rgxMap],
-            ['data', createUAParserData(itemType, ua, rgxMap, uaCH)]
+            ['data', createIData(this, itemType)]
         ]);
-        this.parse();
-        var isSelfNav = NAVIGATOR && NAVIGATOR.userAgent == ua;
-        switch(this.itemType) {
-            case UA_BROWSER:
-                // Brave-specific detection
-                if (isSelfNav && NAVIGATOR.brave && typeof NAVIGATOR.brave.isBrave == FUNC_TYPE) {
-                    this.set(NAME, 'Brave');
-                }
-                this.set(MAJOR, majorize(this.get(VERSION)));
-                break;
-            case UA_DEVICE:
-                if (isSelfNav && !this.get(TYPE) && NAVIGATOR_UADATA && NAVIGATOR_UADATA[MOBILE]) {
-                    this.set(TYPE, MOBILE);
-                }
-                // iPadOS-specific detection: identified as Mac, but has some iOS-only properties
-                if (isSelfNav && this.get(MODEL) == 'Macintosh' && NAVIGATOR && typeof NAVIGATOR.standalone !== UNDEF_TYPE && NAVIGATOR.maxTouchPoints && NAVIGATOR.maxTouchPoints > 2) {
-                    this.set(MODEL, 'iPad')
-                        .set(TYPE, TABLET);
-                }
-                break;
-            case UA_OS:
-                if (isSelfNav && !this.get(NAME) && NAVIGATOR_UADATA && NAVIGATOR_UADATA[PLATFORM]) {
-                    this.set(NAME, NAVIGATOR_UADATA[PLATFORM]);
-                }
-                break;
-            case UA_RESULT:
-                var createUAParserItem = function (itemType) {
-                    return new UAParserItem(itemType, ua, rgxMap[itemType], uaCH).get();
-                };
-                this.set('ua', ua)
-                    .set(UA_BROWSER, createUAParserItem(UA_BROWSER))
-                    .set(UA_CPU, createUAParserItem(UA_CPU))
-                    .set(UA_DEVICE, createUAParserItem(UA_DEVICE))
-                    .set(UA_ENGINE, createUAParserItem(UA_ENGINE))
-                    .set(UA_OS, createUAParserItem(UA_OS))
-                    .get();
-        }
+
         return this;
     }
-    UAParserItem.prototype.get = function (prop) {
-        if (!prop) return this.data;
-        return this.data.hasOwnProperty(prop) ? this.data[prop] : undefined;
-    };
-    UAParserItem.prototype.parse = function () {
-        if (this.itemType != UA_RESULT) {
-            rgxMapper.call(this.data, this.ua, this.rgxMap);
-        }
-        return this;
-    };
-    UAParserItem.prototype.parseCH = function () {
-        var ua = this.ua,
-            uaCH = this.uaCH,
-            rgxMap = this.rgxMap;
-
-        switch (this.itemType) {
-            case UA_BROWSER:
-                var brands = uaCH[FULLVERLIST] || uaCH[BRANDS];
-                if (brands) {
-                    for (var i in brands) {
-                        var brandName = brands[i].brand,
-                            brandVersion = brands[i].version;
-                        if (!/not.a.brand/i.test(brandName) && (i < 1 || /chromi/i.test(this.get(NAME)))) {
-                            this.set(NAME, strip(GOOGLE+' ', brandName))
-                                .set(VERSION, brandVersion)
-                                .set(MAJOR, majorize(brandVersion));
-                        }
-                    }
-                }
-                break;
-            case UA_CPU:
-                var archName = uaCH[ARCHITECTURE];
-                if (archName) {
-                    if (archName && uaCH[BITNESS] == '64') archName += '64';
-                    rgxMapper.call(this.data, archName + ';', rgxMap);
-                }
-                break;
-            case UA_DEVICE:
-                if (uaCH[MOBILE]) {
-                    this.set(TYPE, MOBILE);
-                }
-                if (uaCH[MODEL]) {
-                    this.set(MODEL, uaCH[MODEL]);
-                }
-                break;
-            case UA_OS:
-                var osName = uaCH[PLATFORM];
-                if(osName) {
-                    var osVersion = uaCH[PLATFORMVER];
-                    if (osName == WINDOWS) osVersion = (parseInt(majorize(osVersion), 10) >= 13 ? '11' : '10');
-                    this.set(NAME, osName)
-                        .set(VERSION, osVersion);
-                }
-                break;
-            case UA_RESULT:
-                var createUAParserItemWithCH = function (itemType) {
-                    return new UAParserItem(itemType, ua, rgxMap[itemType], uaCH).parseCH().get();
-                };
-                this.set('ua', ua)
-                    .set(UA_BROWSER, createUAParserItemWithCH(UA_BROWSER))
-                    .set(UA_CPU, createUAParserItemWithCH(UA_CPU))
-                    .set(UA_DEVICE, createUAParserItemWithCH(UA_DEVICE))
-                    .set(UA_ENGINE, createUAParserItemWithCH(UA_ENGINE))
-                    .set(UA_OS, createUAParserItemWithCH(UA_OS));
-        }
-        return this;
-    };
-    UAParserItem.prototype.set = function (prop, val) {
-        this.data[prop] = val;
-        return this;
-    };
 
     function UAParser (ua, extensions, headers) {
 
@@ -1077,39 +1166,54 @@
             return new UAParser(ua, extensions, headers).getResult();
         }
 
-        var userAgent = ua || 
-                        ((NAVIGATOR && NAVIGATOR.userAgent) ? 
-                            NAVIGATOR.userAgent : 
-                            (headers && headers[USER_AGENT] ? 
-                                headers[USER_AGENT] : 
-                                EMPTY)),
-            
-            HTTP_UACH = new UAParserDataCH(headers, true),
+        var userAgent = typeof ua === STR_TYPE ? ua :                                       // Passed user-agent string
+                            ((NAVIGATOR && NAVIGATOR.userAgent) ? NAVIGATOR.userAgent :     // navigator.userAgent
+                                (headers && headers[USER_AGENT] ? headers[USER_AGENT] :     // User-Agent from passed headers
+                                    EMPTY)),                                                // empty string
 
+            httpUACH = new UACHData(headers, true),
             regexMap = extensions ? 
                         extend(defaultRegexes, extensions) : 
                         defaultRegexes,
 
-            createUAParserItemFunc = function (itemType) {
-                return function () {
-                    return new UAParserItem(itemType, userAgent, itemType == UA_RESULT ? regexMap : regexMap[itemType], HTTP_UACH).get();
-                };
+            createItemFunc = function (itemType) {
+                if (itemType == UA_RESULT) {
+                    return function () {
+                        return new UAItem(itemType, userAgent, regexMap, httpUACH)
+                                    .set('ua', userAgent)
+                                    .set(UA_BROWSER, this.getBrowser())
+                                    .set(UA_CPU, this.getCPU())
+                                    .set(UA_DEVICE, this.getDevice())
+                                    .set(UA_ENGINE, this.getEngine())
+                                    .set(UA_OS, this.getOS())
+                                    .get();
+                    };
+                } else {
+                    return function () {
+                        return new UAItem(itemType, userAgent, regexMap[itemType], httpUACH)
+                                    .parseUA()
+                                    .get();
+                    };
+                }
             };
-
+            
         // public methods
-        assignFromEntries.call(this, [
-            ['getBrowser', createUAParserItemFunc(UA_BROWSER)],
-            ['getCPU', createUAParserItemFunc(UA_CPU)],
-            ['getDevice', createUAParserItemFunc(UA_DEVICE)],
-            ['getEngine', createUAParserItemFunc(UA_ENGINE)],
-            ['getOS', createUAParserItemFunc(UA_OS)],
-            ['getResult', createUAParserItemFunc(UA_RESULT)],
+        setProps.call(this, [
+            ['getBrowser', createItemFunc(UA_BROWSER)],
+            ['getCPU', createItemFunc(UA_CPU)],
+            ['getDevice', createItemFunc(UA_DEVICE)],
+            ['getEngine', createItemFunc(UA_ENGINE)],
+            ['getOS', createItemFunc(UA_OS)],
+            ['getResult', createItemFunc(UA_RESULT)],
             ['getUA', function () { return userAgent; }],
             ['setUA', function (ua) {
-                userAgent = (typeof ua === STR_TYPE && ua.length > UA_MAX_LENGTH) ? trim(ua, UA_MAX_LENGTH) : ua;
+                if (isString(ua))
+                    userAgent = ua.length > UA_MAX_LENGTH ? trim(ua, UA_MAX_LENGTH) : ua;
                 return this;
             }]
-        ]).setUA(userAgent);
+        ])
+        .setUA(userAgent);
+
         return this;
     }
 
@@ -1124,7 +1228,7 @@
     //////////
 
     // check js environment
-    if (typeof(exports) !== UNDEF_TYPE) {
+    if (typeof exports !== UNDEF_TYPE) {
         // nodejs env
         if (typeof module !== UNDEF_TYPE && module.exports) {
             exports = module.exports = UAParser;
@@ -1132,11 +1236,11 @@
         exports.UAParser = UAParser;
     } else {
         // requirejs env (optional)
-        if (typeof(define) === FUNC_TYPE && define.amd) {
+        if (typeof define === FUNC_TYPE && define.amd) {
             define(function () {
                 return UAParser;
             });
-        } else if (typeof window !== UNDEF_TYPE) {
+        } else if (isWindow) {
             // browser env
             window.UAParser = UAParser;
         }
@@ -1147,7 +1251,7 @@
     //   In AMD env the global scope should be kept clean, but jQuery is an exception.
     //   jQuery always exports to global scope, unless jQuery.noConflict(true) is used,
     //   and we should catch that.
-    var $ = typeof window !== UNDEF_TYPE && (window.jQuery || window.Zepto);
+    var $ = isWindow && (window.jQuery || window.Zepto);
     if ($ && !$.ua) {
         var parser = new UAParser();
         $.ua = parser.getResult();

src/main/ua-parser.mjs

@@ -1,27 +1,27 @@
-// Generated ESM version of UAParser.js
+// Generated ESM version of ua-parser-js
 // DO NOT EDIT THIS FILE!
-// Source: /src/ua-parser.js
-
-const window = undefined;
+// Source: /src/main/ua-parser.js
 
 /////////////////////////////////////////////////////////////////////////////////
-/* UAParser.js v2.0.0-alpha.2
+/* UAParser.js v2.0.0-beta.2
    Copyright © 2012-2023 Faisal Salman <f@faisalman.com>
-   MIT License *//*
+   UAParser.js PRO Business License *//*
    Detect Browser, Engine, OS, CPU, and Device type/model from User-Agent data.
    Supports browser & node.js environment. 
    Demo   : https://faisalman.github.io/ua-parser-js
    Source : https://github.com/faisalman/ua-parser-js */
 /////////////////////////////////////////////////////////////////////////////////
 
+/* jshint esversion: 6 */ 
+/* globals window */
 
 
+    
     //////////////
     // Constants
     /////////////
 
-
-    var LIBVERSION  = '2.0.0-alpha.2',
+    var LIBVERSION  = '2.0.0-beta.2',
         EMPTY       = '',
         UNKNOWN     = '?',
         FUNC_TYPE   = 'function',
@@ -42,8 +42,9 @@ const window = undefined;
         WEARABLE    = 'wearable',
         EMBEDDED    = 'embedded',
         USER_AGENT  = 'user-agent',
-        UA_MAX_LENGTH = 350,
+        UA_MAX_LENGTH = 500,
         BRANDS      = 'brands',
+        FORMFACTOR  = 'formFactor',
         FULLVERLIST = 'fullVersionList',
         PLATFORM    = 'platform',
         PLATFORMVER = 'platformVersion',
@@ -51,12 +52,13 @@ const window = undefined;
         CH_HEADER   = 'sec-ch-ua',
         CH_HEADER_FULL_VER_LIST = CH_HEADER + '-full-version-list',
         CH_HEADER_ARCH      = CH_HEADER + '-arch',
-        CH_HEADER_BITNESS   = CH_HEADER + '-bitness',
-        CH_HEADER_MOBILE    = CH_HEADER + '-mobile',
-        CH_HEADER_MODEL     = CH_HEADER + '-model',
-        CH_HEADER_PLATFORM  = CH_HEADER + '-platform',
+        CH_HEADER_BITNESS   = CH_HEADER + '-' + BITNESS,
+        CH_HEADER_FORM_FACTOR = CH_HEADER + '-form-factor',
+        CH_HEADER_MOBILE    = CH_HEADER + '-' + MOBILE,
+        CH_HEADER_MODEL     = CH_HEADER + '-' + MODEL,
+        CH_HEADER_PLATFORM  = CH_HEADER + '-' + PLATFORM,
         CH_HEADER_PLATFORM_VER = CH_HEADER_PLATFORM + '-version',
-        CH_ALL_VALUES       = ['brands', 'fullVersionList', MOBILE, MODEL, 'platform', 'platformVersion', ARCHITECTURE, 'bitness'],
+        CH_ALL_VALUES       = [BRANDS, FULLVERLIST, MOBILE, MODEL, PLATFORM, PLATFORMVER, ARCHITECTURE, FORMFACTOR, BITNESS],
         UA_BROWSER  = 'browser',
         UA_CPU      = 'cpu',
         UA_DEVICE   = 'device',
@@ -69,6 +71,7 @@ const window = undefined;
         BLACKBERRY  = 'BlackBerry',
         GOOGLE      = 'Google',
         HUAWEI      = 'Huawei',
+        LENOVO      = 'Lenovo',
         LG          = 'LG',
         MICROSOFT   = 'Microsoft',
         MOTOROLA    = 'Motorola',
@@ -84,9 +87,11 @@ const window = undefined;
         FIREFOX     = 'Firefox',
         OPERA       = 'Opera',
         FACEBOOK    = 'Facebook',
+        SOGOU       = 'Sogou',
         WINDOWS     = 'Windows';
    
-    var NAVIGATOR           = (typeof window !== UNDEF_TYPE && window.navigator) ? 
+    var isWindow            = typeof window !== UNDEF_TYPE,
+        NAVIGATOR           = (isWindow && window.navigator) ? 
                                 window.navigator : 
                                 undefined,
         NAVIGATOR_UADATA    = (NAVIGATOR && NAVIGATOR.userAgentData) ? 
@@ -97,18 +102,7 @@ const window = undefined;
     // Helper
     //////////
 
-    var assignFromEntries = function (arr) {
-            for (var i in arr) {
-                var propName = arr[i];
-                if (typeof propName == OBJ_TYPE && propName.length == 2) {
-                    this[propName[0]] = propName[1];
-                } else {
-                    this[propName] = undefined;
-                }
-            }
-            return this;
-        },
-        extend = function (regexes, extensions) {
+    var extend = function (regexes, extensions) {
             var mergedRegexes = {};
             for (var i in regexes) {
                 mergedRegexes[i] = extensions[i] && extensions[i].length % 2 === 0 ? extensions[i].concat(regexes[i]) : regexes[i];
@@ -129,39 +123,57 @@ const window = undefined;
                 }
                 return false;
             }
-            return typeof str1 === STR_TYPE ? lowerize(str2).indexOf(lowerize(str1)) !== -1 : false;
+            return isString(str1) ? lowerize(str2).indexOf(lowerize(str1)) !== -1 : false;
         },
         isExtensions = function (obj) {
             for (var prop in obj) {
                 return /^(browser|cpu|device|engine|os)$/.test(prop);
             }
         },
+        isString = function (val) {
+            return typeof val === STR_TYPE;
+        },
         itemListToArray = function (header) {
             if (!header) return undefined;
             var arr = [];
-            var tokens = strip(/\\?\"/g, header).split(', ');
+            var tokens = strip(/\\?\"/g, header).split(',');
             for (var i = 0; i < tokens.length; i++) {
-                var token = tokens[i].split(';v=');
-                arr[i] = { brand : token[0], version : token[1] };
+                if (tokens[i].indexOf(';') > -1) {
+                    var token = trim(tokens[i]).split(';v=');
+                    arr[i] = { brand : token[0], version : token[1] };
+                } else {
+                    arr[i] = trim(tokens[i]);
+                }
             }
             return arr;
         },
         lowerize = function (str) {
-            return typeof(str) === STR_TYPE ? str.toLowerCase() : str;
+            return isString(str) ? str.toLowerCase() : str;
         },
         majorize = function (version) {
-            return typeof(version) === STR_TYPE ? strip(/[^\d\.]/g, version).split('.')[0] : undefined;
+            return isString(version) ? strip(/[^\d\.]/g, version).split('.')[0] : undefined;
+        },
+        setProps = function (arr) {
+            for (var i in arr) {
+                var propName = arr[i];
+                if (typeof propName == OBJ_TYPE && propName.length == 2) {
+                    this[propName[0]] = propName[1];
+                } else {
+                    this[propName] = undefined;
+                }
+            }
+            return this;
         },
         strip = function (pattern, str) {
-            return str.replace(pattern, EMPTY);
+            return isString(str) ? str.replace(pattern, EMPTY) : str;
         },
-        stripQuotes = function (val) {
-            return typeof val === STR_TYPE ? strip(/\"/g, val) : val; 
+        stripQuotes = function (str) {
+            return strip(/\\?\"/g, str); 
         },
         trim = function (str, len) {
-            if (typeof(str) === STR_TYPE) {
+            if (isString(str)) {
                 str = strip(/^\s\s*/, str);
-                return typeof(len) === UNDEF_TYPE ? str : str.substring(0, UA_MAX_LENGTH);
+                return typeof len === UNDEF_TYPE ? str : str.substring(0, UA_MAX_LENGTH);
             }
     };
 
@@ -238,25 +250,14 @@ const window = undefined;
                     return (i === UNKNOWN) ? undefined : i;
                 }
             }
-            return str;
+            return map.hasOwnProperty('*') ? map['*'] : str;
     };
 
     ///////////////
     // String map
     //////////////
 
-    // Safari < 3.0
-    var oldSafariMap = {
-            '1.0'   : '/8',
-            '1.2'   : '/1',
-            '1.3'   : '/3',
-            '2.0'   : '/412',
-            '2.0.2' : '/416',
-            '2.0.3' : '/417',
-            '2.0.4' : '/419',
-            '?'     : '/'
-        },
-        windowsVersionMap = {
+    var windowsVersionMap = {
             'ME'        : '4.90',
             'NT 3.11'   : 'NT3.51',
             'NT 4.0'    : 'NT4.0',
@@ -268,6 +269,16 @@ const window = undefined;
             '8.1'       : 'NT 6.3',
             '10'        : ['NT 6.4', 'NT 10.0'],
             'RT'        : 'ARM'
+        },
+        
+        formFactorMap = {
+            'embedded'  : 'Automotive',
+            'mobile'    : 'Mobile',
+            'tablet'    : ['Tablet', 'EInk'],
+            'smarttv'   : 'TV',
+            'wearable'  : ['VR', 'XR', 'Watch'],
+            '?'         : ['Desktop', 'Unknown'],
+            '*'         : undefined
     };
 
     //////////////
@@ -291,15 +302,18 @@ const window = undefined;
             ], [NAME, VERSION], [
             /opios[\/ ]+([\w\.]+)/i                                             // Opera mini on iphone >= 8.0
             ], [VERSION, [NAME, OPERA+' Mini']], [
+            /\bop(?:rg)?x\/([\w\.]+)/i                                          // Opera GX
+            ], [VERSION, [NAME, OPERA+' GX']], [
             /\bopr\/([\w\.]+)/i                                                 // Opera Webkit
             ], [VERSION, [NAME, OPERA]], [
 
             // Mixed
+            /\bb[ai]*d(?:uhd|[ub]*[aekoprswx]{5,6})[\/ ]?([\w\.]+)/i            // Baidu
+            ], [VERSION, [NAME, 'Baidu']], [
             /(kindle)\/([\w\.]+)/i,                                             // Kindle
             /(lunascape|maxthon|netfront|jasmine|blazer)[\/ ]?([\w\.]*)/i,      // Lunascape/Maxthon/Netfront/Jasmine/Blazer
             // Trident based
-            /(avant |iemobile|slim)(?:browser)?[\/ ]?([\w\.]*)/i,               // Avant/IEMobile/SlimBrowser
-            /(ba?idubrowser)[\/ ]?([\w\.]+)/i,                                  // Baidu Browser
+            /(avant|iemobile|slim)\s?(?:browser)?[\/ ]?([\w\.]*)/i,             // Avant/IEMobile/SlimBrowser
             /(?:ms|\()(ie) ([\w\.]+)/i,                                         // Internet Explorer
 
             // Webkit/KHTML based                                               // Flock/RockMelt/Midori/Epiphany/Silk/Skyfire/Bolt/Iron/Iridium/PhantomJS/Bowser/QupZilla/Falkon
@@ -311,8 +325,7 @@ const window = undefined;
             /(?:\buc? ?browser|(?:juc.+)ucweb)[\/ ]?([\w\.]+)/i                 // UCBrowser
             ], [VERSION, [NAME, 'UCBrowser']], [
             /microm.+\bqbcore\/([\w\.]+)/i,                                     // WeChat Desktop for Windows Built-in Browser
-            /\bqbcore\/([\w\.]+).+microm/i
-            ], [VERSION, [NAME, 'WeChat(Win) Desktop']], [
+            /\bqbcore\/([\w\.]+).+microm/i,
             /micromessenger\/([\w\.]+)/i                                        // WeChat
             ], [VERSION, [NAME, 'WeChat']], [
             /konqueror\/([\w\.]+)/i                                             // Konqueror
@@ -321,6 +334,8 @@ const window = undefined;
             ], [VERSION, [NAME, 'IE']], [
             /ya(?:search)?browser\/([\w\.]+)/i                                  // Yandex
             ], [VERSION, [NAME, 'Yandex']], [
+            /slbrowser\/([\w\.]+)/i                                             // Smart Lenovo Browser
+            ], [VERSION, [NAME, 'Smart ' + LENOVO + SUFFIX_BROWSER]], [
             /(avast|avg)\/([\w\.]+)/i                                           // Avast/AVG Secure Browser
             ], [[NAME, /(.+)/, '$1 Secure' + SUFFIX_BROWSER], VERSION], [
             /\bfocus\/([\w\.]+)/i                                               // Firefox Focus
@@ -339,15 +354,20 @@ const window = undefined;
             ], [VERSION, [NAME, PREFIX_MOBILE + FIREFOX]], [
             /\bqihu|(qi?ho?o?|360)browser/i                                     // 360
             ], [[NAME, '360' + SUFFIX_BROWSER]], [
-            /(oculus|samsung|sailfish|huawei)browser\/([\w\.]+)/i
-            ], [[NAME, /(.+)/, '$1' + SUFFIX_BROWSER], VERSION], [               // Oculus/Samsung/Sailfish/Huawei Browser
+            /(oculus|sailfish|huawei|vivo)browser\/([\w\.]+)/i
+            ], [[NAME, /(.+)/, '$1' + SUFFIX_BROWSER], VERSION], [              // Oculus/Sailfish/HuaweiBrowser/VivoBrowser
+            /samsungbrowser\/([\w\.]+)/i                                        // Samsung Internet
+            ], [VERSION, [NAME, SAMSUNG + ' Internet']], [
             /(comodo_dragon)\/([\w\.]+)/i                                       // Comodo Dragon
             ], [[NAME, /_/g, ' '], VERSION], [
+            /metasr[\/ ]?([\d\.]+)/i                                            // Sogou Explorer
+            ], [VERSION, [NAME, SOGOU + ' Explorer']], [
+            /(sogou)mo\w+\/([\d\.]+)/i                                          // Sogou Mobile
+            ], [[NAME, SOGOU + ' Mobile'], VERSION], [
             /(electron)\/([\w\.]+) safari/i,                                    // Electron-based App
             /(tesla)(?: qtcarbrowser|\/(20\d\d\.[-\w\.]+))/i,                   // Tesla
-            /m?(qqbrowser|baiduboxapp|2345Explorer)[\/ ]?([\w\.]+)/i            // QQBrowser/Baidu App/2345 Browser
+            /m?(qqbrowser|2345Explorer)[\/ ]?([\w\.]+)/i                        // QQBrowser/2345 Browser
             ], [NAME, VERSION], [
-            /(metasr)[\/ ]?([\w\.]+)/i,                                         // SouGouBrowser
             /(lbbrowser)/i,                                                     // LieBao Browser
             /\[(linkedin)app\]/i                                                // LinkedIn App for iOS & Android
             ], [NAME], [
@@ -355,11 +375,13 @@ const window = undefined;
             // WebView
             /((?:fban\/fbios|fb_iab\/fb4a)(?!.+fbav)|;fbav\/([\w\.]+);)/i       // Facebook App for iOS & Android
             ], [[NAME, FACEBOOK], VERSION], [
+            /(Klarna)\/([\w\.]+)/i,                                             // Klarna Shopping Browser for iOS & Android
             /(kakao(?:talk|story))[\/ ]([\w\.]+)/i,                             // Kakao App
             /(naver)\(.*?(\d+\.[\w\.]+).*\)/i,                                  // Naver InApp
             /safari (line)\/([\w\.]+)/i,                                        // Line App for iOS
             /\b(line)\/([\w\.]+)\/iab/i,                                        // Line App for Android
-            /(chromium|instagram)[\/ ]([-\w\.]+)/i                              // Chromium/Instagram
+            /(alipay)client\/([\w\.]+)/i,                                       // Alipay
+            /(chromium|instagram|snapchat)[\/ ]([-\w\.]+)/i                     // Chromium/Instagram/Snapchat
             ], [NAME, VERSION], [
             /\bgsa\/([\w\.]+) .*safari\//i                                      // Google Search Appliance on iOS
             ], [VERSION, [NAME, 'GSA']], [
@@ -388,7 +410,7 @@ const window = undefined;
             /version\/([\w\.\,]+) .*(safari)/i                                  // Safari
             ], [VERSION, NAME], [
             /webkit.+?(mobile ?safari|safari)(\/[\w\.]+)/i                      // Safari < 3.0
-            ], [NAME, [VERSION, strMapper, oldSafariMap]], [
+            ], [NAME, [VERSION, '1']], [
 
             /(webkit|khtml)\/([\w\.]+)/i
             ], [NAME, VERSION], [
@@ -429,7 +451,7 @@ const window = undefined;
             /((?:i[346]|x)86)[;\)]/i                                            // IA32 (x86)
             ], [[ARCHITECTURE, 'ia32']], [
 
-            /\b(aarch64|arm(v?8e?l?|_?64))\b/i                                 // ARM64
+            /\b(aarch64|arm(v?8e?l?|_?64))\b/i                                  // ARM64
             ], [[ARCHITECTURE, 'arm64']], [
 
             /\b(arm(?:v[67])?ht?n?[fl]p?)\b/i                                   // ARMHF
@@ -486,12 +508,14 @@ const window = undefined;
             ], [MODEL, [VENDOR, HUAWEI], [TYPE, MOBILE]], [
 
             // Xiaomi
-            /\b(poco[\w ]+)(?: bui|\))/i,                                       // Xiaomi POCO
+            /\b(poco[\w ]+|m2\d{3}j\d\d[a-z]{2})(?: bui|\))/i,                  // Xiaomi POCO
             /\b; (\w+) build\/hm\1/i,                                           // Xiaomi Hongmi 'numeric' models
             /\b(hm[-_ ]?note?[_ ]?(?:\d\w)?) bui/i,                             // Xiaomi Hongmi
             /\b(redmi[\-_ ]?(?:note|k)?[\w_ ]+)(?: bui|\))/i,                   // Xiaomi Redmi
+            /oid[^\)]+; (m?[12][0-389][01]\w{3,6}[c-y])( bui|; wv|\))/i,        // Xiaomi Redmi 'numeric' models
             /\b(mi[-_ ]?(?:a\d|one|one[_ ]plus|note lte|max|cc)?[_ ]?(?:\d?\w?)[_ ]?(?:plus|se|lite)?)(?: bui|\))/i // Xiaomi Mi
             ], [[MODEL, /_/g, ' '], [VENDOR, XIAOMI], [TYPE, MOBILE]], [
+            /oid[^\)]+; (2\d{4}(283|rpbf)[cgl])( bui|\))/i,                     // Redmi Pad
             /\b(mi[-_ ]?(?:pad)(?:[\w_ ]+))(?: bui|\))/i                        // Mi Pad tablets
             ],[[MODEL, /_/g, ' '], [VENDOR, XIAOMI], [TYPE, TABLET]], [
 
@@ -506,7 +530,7 @@ const window = undefined;
             ], [MODEL, [VENDOR, 'Vivo'], [TYPE, MOBILE]], [
 
             // Realme
-            /\b(rmx[12]\d{3})(?: bui|;|\))/i
+            /\b(rmx[1-3]\d{3})(?: bui|;|\))/i
             ], [MODEL, [VENDOR, 'Realme'], [TYPE, MOBILE]], [
 
             // Motorola
@@ -528,7 +552,7 @@ const window = undefined;
             // Lenovo
             /(ideatab[-\w ]+)/i,
             /lenovo ?(s[56]000[-\w]+|tab(?:[\w ]+)|yt[-\d\w]{6}|tb[-\d\w]{6})/i
-            ], [MODEL, [VENDOR, 'Lenovo'], [TYPE, TABLET]], [
+            ], [MODEL, [VENDOR, LENOVO], [TYPE, TABLET]], [
 
             // Nokia
             /(?:maemo|nokia).*(n900|lumia \d+)/i,
@@ -592,9 +616,13 @@ const window = undefined;
             /droid.+; (m[1-5] note) bui/i,
             /\bmz-([-\w]{2,})/i
             ], [MODEL, [VENDOR, 'Meizu'], [TYPE, MOBILE]], [
+                
+            // Ulefone
+            /; ((?:power )?armor(?:[\w ]{0,8}))(?: bui|\))/i
+            ], [MODEL, [VENDOR, 'Ulefone'], [TYPE, MOBILE]], [
 
             // MIXED
-            /(blackberry|benq|palm(?=\-)|sonyericsson|acer|asus|dell|meizu|motorola|polytron)[-_ ]?([-\w]*)/i,
+            /(blackberry|benq|palm(?=\-)|sonyericsson|acer|asus|dell|meizu|motorola|polytron|infinix|tecno)[-_ ]?([-\w]*)/i,
                                                                                 // BlackBerry/BenQ/Palm/Sony-Ericsson/Acer/Asus/Dell/Meizu/Motorola/Polytron
             /(hp) ([\w ]+\w)/i,                                                 // HP iPAQ
             /(asus)-?(\w+)/i,                                                   // Asus
@@ -639,7 +667,7 @@ const window = undefined;
             ], [VENDOR, [MODEL, APPLE+' TV'], [TYPE, SMARTTV]], [
             /crkey/i                                                            // Google Chromecast
             ], [[MODEL, CHROME+'cast'], [VENDOR, GOOGLE], [TYPE, SMARTTV]], [
-            /droid.+aft(\w)( bui|\))/i                                          // Fire TV
+            /droid.+aft(\w+)( bui|\))/i                                         // Fire TV
             ], [MODEL, [VENDOR, AMAZON], [TYPE, SMARTTV]], [
             /\(dtv[\);].+(aquos)/i,
             /(aquos-tv[\w ]+)\)/i                                               // Sharp
@@ -698,7 +726,7 @@ const window = undefined;
             // MIXED (GENERIC)
             ///////////////////
 
-            /droid .+?; ([^;]+?)(?: bui|\) applew).+? mobile safari/i           // Android Phones from Unidentified Vendors
+            /droid .+?; ([^;]+?)(?: bui|; wv\)|\) applew).+? mobile safari/i    // Android Phones from Unidentified Vendors
             ], [MODEL, [TYPE, MOBILE]], [
             /droid .+?; ([^;]+?)(?: bui|\) applew).+?(?! mobile) safari/i       // Android Tablets from Unidentified Vendors
             ], [MODEL, [TYPE, TABLET]], [
@@ -735,16 +763,16 @@ const window = undefined;
             // Windows
             /microsoft (windows) (vista|xp)/i                                   // Windows (iTunes)
             ], [NAME, VERSION], [
-            /(windows) nt 6\.2; (arm)/i,                                        // Windows RT
-            /(windows (?:phone(?: os)?|mobile))[\/ ]?([\d\.\w ]*)/i,            // Windows Phone
-            /(windows)[\/ ]?([ntce\d\. ]+\w)(?!.+xbox)/i
+            /(windows (?:phone(?: os)?|mobile))[\/ ]?([\d\.\w ]*)/i             // Windows Phone
             ], [NAME, [VERSION, strMapper, windowsVersionMap]], [
-            /(win(?=3|9|n)|win 9x )([nt\d\.]+)/i
-            ], [[NAME, WINDOWS], [VERSION, strMapper, windowsVersionMap]], [
+            /windows nt 6\.2; (arm)/i,                                        // Windows RT
+            /windows[\/ ]?([ntce\d\. ]+\w)(?!.+xbox)/i,
+            /(?:win(?=3|9|n)|win 9x )([nt\d\.]+)/i
+            ], [[VERSION, strMapper, windowsVersionMap], [NAME, WINDOWS]], [
 
             // iOS/macOS
             /ip[honead]{2,4}\b(?:.*os ([\w]+) like mac|; opera)/i,              // iOS
-            /ios;fbsv\/([\d\.]+)/i,
+            /(?:ios;fbsv\/|iphone.+ios[\/ ])([\d\.]+)/i,
             /cfnetwork\/.+darwin/i
             ], [[VERSION, /_/g, '.'], [NAME, 'iOS']], [
             /(mac os x) ?([\w\. ]*)/i,
@@ -813,23 +841,23 @@ const window = undefined;
 
     var defaultProps = (function () {
             var props = { init : {}, isIgnore : {}, isIgnoreRgx : {}, toString : {}};
-            assignFromEntries.call(props.init, [
+            setProps.call(props.init, [
                 [UA_BROWSER, [NAME, VERSION, MAJOR]],
                 [UA_CPU, [ARCHITECTURE]],
                 [UA_DEVICE, [TYPE, MODEL, VENDOR]],
                 [UA_ENGINE, [NAME, VERSION]],
                 [UA_OS, [NAME, VERSION]]
             ]);
-            assignFromEntries.call(props.isIgnore, [
+            setProps.call(props.isIgnore, [
                 [UA_BROWSER, [VERSION, MAJOR]],
                 [UA_ENGINE, [VERSION]],
                 [UA_OS, [VERSION]]
             ]);
-            assignFromEntries.call(props.isIgnoreRgx, [
+            setProps.call(props.isIgnoreRgx, [
                 [UA_BROWSER, / ?browser$/i],
                 [UA_OS, / ?os$/i]
             ]);
-            assignFromEntries.call(props.toString, [
+            setProps.call(props.toString, [
                 [UA_BROWSER, [NAME, VERSION]],
                 [UA_CPU, [ARCHITECTURE]],
                 [UA_DEVICE, [VENDOR, MODEL]],
@@ -839,34 +867,47 @@ const window = undefined;
             return props;
     })();
 
-    var createUAParserData = function (itemType, ua, rgxMap, uaCH) {
+    var createIData = function (item, itemType) {
 
         var init_props = defaultProps.init[itemType],
             is_ignoreProps = defaultProps.isIgnore[itemType] || 0,
             is_ignoreRgx = defaultProps.isIgnoreRgx[itemType] || 0,
             toString_props = defaultProps.toString[itemType] || 0;
 
-        function UAParserData () {
-            assignFromEntries.call(this, init_props);
+        function IData () {
+            setProps.call(this, init_props);
         }
-        UAParserData.prototype.withClientHints = function () {
-            
+
+        IData.prototype.getItem = function () {
+            return item;
+        };
+
+        IData.prototype.withClientHints = function () {
+
             // nodejs / non-client-hints browsers
             if (!NAVIGATOR_UADATA) {
-                return new UAParserItem(itemType, ua, rgxMap, uaCH).parseCH().get();
+                return item
+                        .parseCH()
+                        .get();
             }
 
             // browsers based on chromium 85+
             return NAVIGATOR_UADATA
                     .getHighEntropyValues(CH_ALL_VALUES)
                     .then(function (res) {
-                        var JS_UACH = new UAParserDataCH(res, false);
-                        return new UAParserItem(itemType, ua, rgxMap, JS_UACH).parseCH().get();
+                        return item
+                                .setCH(new UACHData(res, false))
+                                .parseCH()
+                                .get();
             });
         };
 
+        IData.prototype.withFeatureCheck = function () {
+            return item.detectFeature().get();
+        };
+
         if (itemType != UA_RESULT) {
-            UAParserData.prototype.is = function (strToCheck) {
+            IData.prototype.is = function (strToCheck) {
                 var is = false;
                 for (var i in this) {
                     if (this.hasOwnProperty(i) && !has(is_ignoreProps, i) && lowerize(is_ignoreRgx ? strip(is_ignoreRgx, this[i]) : this[i]) == lowerize(is_ignoreRgx ? strip(is_ignoreRgx, strToCheck) : strToCheck)) {
@@ -879,7 +920,7 @@ const window = undefined;
                 }
                 return is;
             };
-            UAParserData.prototype.toString = function () {
+            IData.prototype.toString = function () {
                 var str = EMPTY;
                 for (var i in toString_props) {
                     if (typeof(this[toString_props[i]]) !== UNDEF_TYPE) {
@@ -891,45 +932,45 @@ const window = undefined;
         }
 
         if (!NAVIGATOR_UADATA) {
-            UAParserData.prototype.then = function (cb) { 
+            IData.prototype.then = function (cb) { 
                 var that = this;
-                var UAParserDataResolve = function () {
+                var IDataResolve = function () {
                     for (var prop in that) {
                         if (that.hasOwnProperty(prop)) {
                             this[prop] = that[prop];
                         }
                     }
                 };
-                UAParserDataResolve.prototype = {
-                    is : UAParserData.prototype.is,
-                    toString : UAParserData.prototype.toString
+                IDataResolve.prototype = {
+                    is : IData.prototype.is,
+                    toString : IData.prototype.toString
                 };
-                var resolveData = new UAParserDataResolve();
+                var resolveData = new IDataResolve();
                 cb(resolveData);
                 return resolveData;
             };
         }
 
-        return new UAParserData();
+        return new IData();
     };
 
     /////////////////
     // Constructor
     ////////////////
 
-    function UAParserDataCH (uach, isHTTP_UACH) {
+    function UACHData (uach, isHttpUACH) {
         uach = uach || {};
-        assignFromEntries.call(this, CH_ALL_VALUES);
-        if (isHTTP_UACH) {
-            assignFromEntries.call(this, [
+        setProps.call(this, CH_ALL_VALUES);
+        if (isHttpUACH) {
+            setProps.call(this, [
                 [BRANDS, itemListToArray(uach[CH_HEADER])],
                 [FULLVERLIST, itemListToArray(uach[CH_HEADER_FULL_VER_LIST])],
-                [BRANDS, itemListToArray(uach[CH_HEADER])],
                 [MOBILE, /\?1/.test(uach[CH_HEADER_MOBILE])],
                 [MODEL, stripQuotes(uach[CH_HEADER_MODEL])],
                 [PLATFORM, stripQuotes(uach[CH_HEADER_PLATFORM])],
                 [PLATFORMVER, stripQuotes(uach[CH_HEADER_PLATFORM_VER])],
                 [ARCHITECTURE, stripQuotes(uach[CH_HEADER_ARCH])],
+                [FORMFACTOR, itemListToArray(uach[CH_HEADER_FORM_FACTOR])],
                 [BITNESS, stripQuotes(uach[CH_HEADER_BITNESS])]
             ]);
         } else {
@@ -937,127 +978,173 @@ const window = undefined;
                 if(this.hasOwnProperty(prop) && typeof uach[prop] !== UNDEF_TYPE) this[prop] = uach[prop];
             }
         }
-        return this;
     }
 
-    function UAParserItem (itemType, ua, rgxMap, uaCH) {
-        assignFromEntries.call(this, [
+    function UAItem (itemType, ua, rgxMap, uaCH) {
+
+        this.get = function (prop) {
+            if (!prop) return this.data;
+            return this.data.hasOwnProperty(prop) ? this.data[prop] : undefined;
+        };
+
+        this.set = function (prop, val) {
+            this.data[prop] = val;
+            return this;
+        };
+
+        this.setCH = function (ch) {
+            this.uaCH = ch;
+            return this;
+        };
+
+        this.detectFeature = function () {
+            if (NAVIGATOR && NAVIGATOR.userAgent == this.ua) {
+                switch (this.itemType) {
+                    case UA_BROWSER:
+                        // Brave-specific detection
+                        if (NAVIGATOR.brave && typeof NAVIGATOR.brave.isBrave == FUNC_TYPE) {
+                            this.set(NAME, 'Brave');
+                        }
+                        break;
+                    case UA_DEVICE:
+                        // Chrome-specific detection: check for 'mobile' value of navigator.userAgentData
+                        if (!this.get(TYPE) && NAVIGATOR_UADATA && NAVIGATOR_UADATA[MOBILE]) {
+                            this.set(TYPE, MOBILE);
+                        }
+                        // iPadOS-specific detection: identified as Mac, but has some iOS-only properties
+                        if (this.get(MODEL) == 'Macintosh' && NAVIGATOR && typeof NAVIGATOR.standalone !== UNDEF_TYPE && NAVIGATOR.maxTouchPoints && NAVIGATOR.maxTouchPoints > 2) {
+                            this.set(MODEL, 'iPad')
+                                .set(TYPE, TABLET);
+                        }
+                        break;
+                    case UA_OS:
+                        // Chrome-specific detection: check for 'platform' value of navigator.userAgentData
+                        if (!this.get(NAME) && NAVIGATOR_UADATA && NAVIGATOR_UADATA[PLATFORM]) {
+                            this.set(NAME, NAVIGATOR_UADATA[PLATFORM]);
+                        }
+                        break;
+                    case UA_RESULT:
+                        var data = this.data;
+                        var detect = function (itemType) {
+                            return data[itemType]
+                                    .getItem()
+                                    .detectFeature()
+                                    .get();
+                        };
+                        this.set(UA_BROWSER, detect(UA_BROWSER))
+                            .set(UA_CPU, detect(UA_CPU))
+                            .set(UA_DEVICE, detect(UA_DEVICE))
+                            .set(UA_ENGINE, detect(UA_ENGINE))
+                            .set(UA_OS, detect(UA_OS));
+                }
+            }
+            return this;
+        };
+
+        this.parseUA = function () {
+            if (this.itemType != UA_RESULT) {
+                rgxMapper.call(this.data, this.ua, this.rgxMap);
+            }
+            if (this.itemType == UA_BROWSER) {
+                this.set(MAJOR, majorize(this.get(VERSION)));
+            }
+            return this;
+        };
+
+        this.parseCH = function () {
+            var uaCH = this.uaCH,
+                rgxMap = this.rgxMap;
+    
+            switch (this.itemType) {
+                case UA_BROWSER:
+                    var brands = uaCH[FULLVERLIST] || uaCH[BRANDS], prevName;
+                    if (brands) {
+                        for (var i in brands) {
+                            var brandName = strip(/(Google|Microsoft) /, brands[i].brand || brands[i]),
+                                brandVersion = brands[i].version;
+                            if (!/not.a.brand/i.test(brandName) && (!prevName || (/chrom/i.test(prevName) && !/chromi/i.test(brandName)))) {
+                                this.set(NAME, brandName)
+                                    .set(VERSION, brandVersion)
+                                    .set(MAJOR, majorize(brandVersion));
+                                prevName = brandName;
+                            }
+                        }
+                    }
+                    break;
+                case UA_CPU:
+                    var archName = uaCH[ARCHITECTURE];
+                    if (archName) {
+                        if (archName && uaCH[BITNESS] == '64') archName += '64';
+                        rgxMapper.call(this.data, archName + ';', rgxMap);
+                    }
+                    break;
+                case UA_DEVICE:
+                    if (uaCH[MOBILE]) {
+                        this.set(TYPE, MOBILE);
+                    }
+                    if (uaCH[MODEL]) {
+                        this.set(MODEL, uaCH[MODEL]);
+                    }
+                    // Xbox-Specific Detection
+                    if (uaCH[MODEL] == 'Xbox') {
+                        this.set(TYPE, CONSOLE)
+                            .set(VENDOR, MICROSOFT);
+                    }
+                    if (uaCH[FORMFACTOR]) {
+                        var ff;
+                        if (typeof uaCH[FORMFACTOR] !== 'string') {
+                            var idx = 0;
+                            while (!ff && idx < uaCH[FORMFACTOR].length) {
+                                ff = strMapper(uaCH[FORMFACTOR][idx++], formFactorMap);
+                            }
+                        } else {
+                            ff = strMapper(uaCH[FORMFACTOR], formFactorMap);
+                        }
+                        this.set(TYPE, ff);
+                    }
+                    break;
+                case UA_OS:
+                    var osName = uaCH[PLATFORM];
+                    if(osName) {
+                        var osVersion = uaCH[PLATFORMVER];
+                        if (osName == WINDOWS) osVersion = (parseInt(majorize(osVersion), 10) >= 13 ? '11' : '10');
+                        this.set(NAME, osName)
+                            .set(VERSION, osVersion);
+                    }
+                    // Xbox-Specific Detection
+                    if (this.get(NAME) == WINDOWS && uaCH[MODEL] == 'Xbox') {
+                        this.set(NAME, 'Xbox')
+                            .set(VERSION, undefined);
+                    }           
+                    break;
+                case UA_RESULT:
+                    var data = this.data;
+                    var parse = function (itemType) {
+                        return data[itemType]
+                                .getItem()
+                                .setCH(uaCH)
+                                .parseCH()
+                                .get();
+                    };
+                    this.set(UA_BROWSER, parse(UA_BROWSER))
+                        .set(UA_CPU, parse(UA_CPU))
+                        .set(UA_DEVICE, parse(UA_DEVICE))
+                        .set(UA_ENGINE, parse(UA_ENGINE))
+                        .set(UA_OS, parse(UA_OS));
+            }
+            return this;
+        };
+
+        setProps.call(this, [
             ['itemType', itemType],
             ['ua', ua],
             ['uaCH', uaCH],
             ['rgxMap', rgxMap],
-            ['data', createUAParserData(itemType, ua, rgxMap, uaCH)]
+            ['data', createIData(this, itemType)]
         ]);
-        this.parse();
-        var isSelfNav = NAVIGATOR && NAVIGATOR.userAgent == ua;
-        switch(this.itemType) {
-            case UA_BROWSER:
-                // Brave-specific detection
-                if (isSelfNav && NAVIGATOR.brave && typeof NAVIGATOR.brave.isBrave == FUNC_TYPE) {
-                    this.set(NAME, 'Brave');
-                }
-                this.set(MAJOR, majorize(this.get(VERSION)));
-                break;
-            case UA_DEVICE:
-                if (isSelfNav && !this.get(TYPE) && NAVIGATOR_UADATA && NAVIGATOR_UADATA[MOBILE]) {
-                    this.set(TYPE, MOBILE);
-                }
-                // iPadOS-specific detection: identified as Mac, but has some iOS-only properties
-                if (isSelfNav && this.get(MODEL) == 'Macintosh' && NAVIGATOR && typeof NAVIGATOR.standalone !== UNDEF_TYPE && NAVIGATOR.maxTouchPoints && NAVIGATOR.maxTouchPoints > 2) {
-                    this.set(MODEL, 'iPad')
-                        .set(TYPE, TABLET);
-                }
-                break;
-            case UA_OS:
-                if (isSelfNav && !this.get(NAME) && NAVIGATOR_UADATA && NAVIGATOR_UADATA[PLATFORM]) {
-                    this.set(NAME, NAVIGATOR_UADATA[PLATFORM]);
-                }
-                break;
-            case UA_RESULT:
-                var createUAParserItem = function (itemType) {
-                    return new UAParserItem(itemType, ua, rgxMap[itemType], uaCH).get();
-                };
-                this.set('ua', ua)
-                    .set(UA_BROWSER, createUAParserItem(UA_BROWSER))
-                    .set(UA_CPU, createUAParserItem(UA_CPU))
-                    .set(UA_DEVICE, createUAParserItem(UA_DEVICE))
-                    .set(UA_ENGINE, createUAParserItem(UA_ENGINE))
-                    .set(UA_OS, createUAParserItem(UA_OS))
-                    .get();
-        }
+
         return this;
     }
-    UAParserItem.prototype.get = function (prop) {
-        if (!prop) return this.data;
-        return this.data.hasOwnProperty(prop) ? this.data[prop] : undefined;
-    };
-    UAParserItem.prototype.parse = function () {
-        if (this.itemType != UA_RESULT) {
-            rgxMapper.call(this.data, this.ua, this.rgxMap);
-        }
-        return this;
-    };
-    UAParserItem.prototype.parseCH = function () {
-        var ua = this.ua,
-            uaCH = this.uaCH,
-            rgxMap = this.rgxMap;
-
-        switch (this.itemType) {
-            case UA_BROWSER:
-                var brands = uaCH[FULLVERLIST] || uaCH[BRANDS];
-                if (brands) {
-                    for (var i in brands) {
-                        var brandName = brands[i].brand,
-                            brandVersion = brands[i].version;
-                        if (!/not.a.brand/i.test(brandName) && (i < 1 || /chromi/i.test(this.get(NAME)))) {
-                            this.set(NAME, strip(GOOGLE+' ', brandName))
-                                .set(VERSION, brandVersion)
-                                .set(MAJOR, majorize(brandVersion));
-                        }
-                    }
-                }
-                break;
-            case UA_CPU:
-                var archName = uaCH[ARCHITECTURE];
-                if (archName) {
-                    if (archName && uaCH[BITNESS] == '64') archName += '64';
-                    rgxMapper.call(this.data, archName + ';', rgxMap);
-                }
-                break;
-            case UA_DEVICE:
-                if (uaCH[MOBILE]) {
-                    this.set(TYPE, MOBILE);
-                }
-                if (uaCH[MODEL]) {
-                    this.set(MODEL, uaCH[MODEL]);
-                }
-                break;
-            case UA_OS:
-                var osName = uaCH[PLATFORM];
-                if(osName) {
-                    var osVersion = uaCH[PLATFORMVER];
-                    if (osName == WINDOWS) osVersion = (parseInt(majorize(osVersion), 10) >= 13 ? '11' : '10');
-                    this.set(NAME, osName)
-                        .set(VERSION, osVersion);
-                }
-                break;
-            case UA_RESULT:
-                var createUAParserItemWithCH = function (itemType) {
-                    return new UAParserItem(itemType, ua, rgxMap[itemType], uaCH).parseCH().get();
-                };
-                this.set('ua', ua)
-                    .set(UA_BROWSER, createUAParserItemWithCH(UA_BROWSER))
-                    .set(UA_CPU, createUAParserItemWithCH(UA_CPU))
-                    .set(UA_DEVICE, createUAParserItemWithCH(UA_DEVICE))
-                    .set(UA_ENGINE, createUAParserItemWithCH(UA_ENGINE))
-                    .set(UA_OS, createUAParserItemWithCH(UA_OS));
-        }
-        return this;
-    };
-    UAParserItem.prototype.set = function (prop, val) {
-        this.data[prop] = val;
-        return this;
-    };
 
     function UAParser (ua, extensions, headers) {
 
@@ -1081,39 +1168,54 @@ const window = undefined;
             return new UAParser(ua, extensions, headers).getResult();
         }
 
-        var userAgent = ua || 
-                        ((NAVIGATOR && NAVIGATOR.userAgent) ? 
-                            NAVIGATOR.userAgent : 
-                            (headers && headers[USER_AGENT] ? 
-                                headers[USER_AGENT] : 
-                                EMPTY)),
-            
-            HTTP_UACH = new UAParserDataCH(headers, true),
+        var userAgent = typeof ua === STR_TYPE ? ua :                                       // Passed user-agent string
+                            ((NAVIGATOR && NAVIGATOR.userAgent) ? NAVIGATOR.userAgent :     // navigator.userAgent
+                                (headers && headers[USER_AGENT] ? headers[USER_AGENT] :     // User-Agent from passed headers
+                                    EMPTY)),                                                // empty string
 
+            httpUACH = new UACHData(headers, true),
             regexMap = extensions ? 
                         extend(defaultRegexes, extensions) : 
                         defaultRegexes,
 
-            createUAParserItemFunc = function (itemType) {
-                return function () {
-                    return new UAParserItem(itemType, userAgent, itemType == UA_RESULT ? regexMap : regexMap[itemType], HTTP_UACH).get();
-                };
+            createItemFunc = function (itemType) {
+                if (itemType == UA_RESULT) {
+                    return function () {
+                        return new UAItem(itemType, userAgent, regexMap, httpUACH)
+                                    .set('ua', userAgent)
+                                    .set(UA_BROWSER, this.getBrowser())
+                                    .set(UA_CPU, this.getCPU())
+                                    .set(UA_DEVICE, this.getDevice())
+                                    .set(UA_ENGINE, this.getEngine())
+                                    .set(UA_OS, this.getOS())
+                                    .get();
+                    };
+                } else {
+                    return function () {
+                        return new UAItem(itemType, userAgent, regexMap[itemType], httpUACH)
+                                    .parseUA()
+                                    .get();
+                    };
+                }
             };
-
+            
         // public methods
-        assignFromEntries.call(this, [
-            ['getBrowser', createUAParserItemFunc(UA_BROWSER)],
-            ['getCPU', createUAParserItemFunc(UA_CPU)],
-            ['getDevice', createUAParserItemFunc(UA_DEVICE)],
-            ['getEngine', createUAParserItemFunc(UA_ENGINE)],
-            ['getOS', createUAParserItemFunc(UA_OS)],
-            ['getResult', createUAParserItemFunc(UA_RESULT)],
+        setProps.call(this, [
+            ['getBrowser', createItemFunc(UA_BROWSER)],
+            ['getCPU', createItemFunc(UA_CPU)],
+            ['getDevice', createItemFunc(UA_DEVICE)],
+            ['getEngine', createItemFunc(UA_ENGINE)],
+            ['getOS', createItemFunc(UA_OS)],
+            ['getResult', createItemFunc(UA_RESULT)],
             ['getUA', function () { return userAgent; }],
             ['setUA', function (ua) {
-                userAgent = (typeof ua === STR_TYPE && ua.length > UA_MAX_LENGTH) ? trim(ua, UA_MAX_LENGTH) : ua;
+                if (isString(ua))
+                    userAgent = ua.length > UA_MAX_LENGTH ? trim(ua, UA_MAX_LENGTH) : ua;
                 return this;
             }]
-        ]).setUA(userAgent);
+        ])
+        .setUA(userAgent);
+
         return this;
     }
 

test/dts-test.ts

@@ -0,0 +1,48 @@
+import { expectType } from 'tsd';
+import { UAParser, IResult, IBrowser, ICPU, IEngine, IDevice, IOS } from "../src/main/ua-parser";
+import { isAppleSilicon, isChromiumBased } from "../src/helpers/ua-parser-helpers";
+
+const uastring = 'Mozilla/5.0 (X11; MyCustomOS; Linux i686; rv:19.0) Gecko/20100101 Firefox/19.0';
+const extensions = {
+    os : [
+        [/(mycustomos)/], [UAParser.OS.NAME, [UAParser.OS.VERSION, '10']]
+    ]
+};
+const headers = {
+    'sec-ch-ua-mobile' : '?1'
+};
+
+expectType<IResult>(UAParser());
+expectType<IResult>(UAParser(uastring));
+expectType<IResult>(UAParser(uastring, extensions));
+expectType<IResult>(UAParser(uastring, headers));
+expectType<IResult>(UAParser(extensions, headers));
+expectType<IResult>(UAParser(extensions));
+expectType<IResult>(UAParser(headers));
+expectType<UAParser>(new UAParser());
+
+const parser = new UAParser(uastring);
+const browser = parser.getBrowser();
+
+expectType<IBrowser>(browser);
+expectType<string | undefined>(browser.name);
+expectType<string | undefined>(browser.version);
+expectType<string | undefined>(browser.major);
+expectType<boolean>(browser.is(''));
+expectType<string>(browser.toString());
+expectType<IBrowser | PromiseLike<IBrowser>>(browser.withClientHints());
+expectType<IBrowser>((<IBrowser>browser.withClientHints()).withFeatureCheck());
+expectType<boolean>((<IBrowser>browser.withClientHints()).withFeatureCheck().is(''));
+
+expectType<ICPU>(parser.getCPU());
+expectType<IDevice>(parser.getDevice());
+expectType<IEngine>(parser.getEngine());
+expectType<IOS>(parser.getOS());
+expectType<IResult>(parser.getResult());
+expectType<string>(parser.getUA());
+expectType<UAParser>(parser.setUA(uastring));
+
+const result = parser.getResult();
+
+expectType<boolean>(isAppleSilicon(result));
+expectType<boolean>(isChromiumBased(result));

test/jazzer-fuzz-test.js

@@ -0,0 +1,20 @@
+const { FuzzedDataProvider } = require('@jazzer.js/core');
+const UAParser = require('ua-parser-js');
+const UA_MAX_LENGTH = 350;
+
+module.exports.fuzz = function (buffer) {
+    const data = new FuzzedDataProvider(buffer);
+    const userAgent = data.consumeString(UA_MAX_LENGTH, 'utf-8', true);
+    const start = process.hrtime();
+    
+    UAParser(userAgent);
+
+    const elapsed = process.hrtime(start);
+    const milisec = (elapsed[0]*1e3+elapsed[1]*1e-6).toFixed(3);
+    if (milisec > 1000) {
+        throw new Error(
+            `Potential ReDoS\n` +
+            `Time taken: ${milisec} ms.\n` +
+            `User agent: ${userAgent}`);
+    }
+};

test/mocha-test-es6.mjs

@@ -1,5 +1,5 @@
-import { UAParser } from 'ua-parser-js';
-import { CPUArch, DeviceType, EngineName } from 'ua-parser-js/enums';
+import { UAParser } from '../src/main/ua-parser.mjs';
+import { CPU, Device, Engine } from '../src/enums/ua-parser-enums.mjs';
 import * as assert from 'assert';
 
 describe('Returns', () => {
@@ -20,8 +20,8 @@ describe('Returns', () => {
 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);
+        assert.strictEqual(cpu.is(CPU.ARM), true);
+        assert.strictEqual(device.is(Device.MOBILE), true);
+        assert.strictEqual(engine.is(Engine.GECKO), true);
     });
 });

test/mocha-test-extension.js

@@ -0,0 +1,79 @@
+const fs = require('fs');
+const assert = require('assert');
+const parseJS = require('@babel/parser').parse;
+const traverse = require('@babel/traverse').default;
+const safe = require('safe-regex');
+const UAParser = require('../src/main/ua-parser');
+const { Bots, CLIs, Emails, Modules } = require('../src/extensions/ua-parser-extensions');
+
+describe('Bots', () => {
+    it('Can detect bots', () => {
+        const googleBot = 'Googlebot-Video/1.0';
+        const gptBot = 'Mozilla/5.0 AppleWebKit/537.36 (KHTML, like Gecko; compatible; GPTBot/1.0; +https://openai.com/gptbot)';
+        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 axios = 'axios/1.3.5';
+        const jsdom = 'Mozilla/5.0 (darwin) AppleWebKit/537.36 (KHTML, like Gecko) jsdom/20.0.3';
+        const scrapy = 'Scrapy/1.5.0 (+https://scrapy.org)';
+
+        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(gptBot).getBrowser(), {name: "GPTBot", 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 & CLIs
+        const botsAndCLIs = { browser : [...Bots.browser, ...CLIs.browser]};
+        const botsAndCLIsParser = new UAParser(botsAndCLIs);
+        assert.deepEqual(botsAndCLIsParser.setUA(wget).getBrowser(), {name: "Wget", version: "1.21.1", major: "1", type:"cli"});
+        assert.deepEqual(botsAndCLIsParser.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"});
+
+        const moduleParser = new UAParser(Modules);
+        assert.deepEqual(moduleParser.setUA(axios).getBrowser(), {name: "axios", version: "1.3.5", major: "1", type: "module"});
+        assert.deepEqual(moduleParser.setUA(jsdom).getBrowser(), {name: "jsdom", version: "20.0.3", major: "20", type: "module"});
+        assert.deepEqual(moduleParser.setUA(scrapy).getBrowser(), {name: "Scrapy", version: "1.5.0", major: "1", type: "module"});
+    });
+});
+
+// TODO : move test spec to JSON file
+
+describe('Testing regexes', () => {
+
+    let regexes;
+
+    before('Read main js file', () => {
+        let code = fs.readFileSync('src/extensions/ua-parser-extensions.js', 'utf8').toString();
+        let ast = parseJS(code, { sourceType: 'script' });
+        regexes = [];
+        traverse(ast, {
+            RegExpLiteral: (path) => {
+                regexes.push(path.node.pattern);
+            }
+        });
+        if (regexes.length === 0) {
+            throw new Error('Regexes cannot be empty!');
+        }
+    });
+
+    describe('Begin testing', () => {
+        it('all regexes in extension file', () => {
+            regexes.forEach(regex => {
+                describe('Test against `safe-regex` : ' + regex, () => {
+                    it('should be safe from potentially vulnerable regex', () => {
+                        assert.strictEqual(safe(regex), true);
+                    });
+                });
+            });
+        });
+    });
+});

test/mocha-test-helpers.js

@@ -0,0 +1,26 @@
+const assert = require('assert');
+const UAParser = require('../src/main/ua-parser');
+const { isAppleSilicon, isChromiumBased } = require('../src/helpers/ua-parser-helpers');
+
+describe('isAppleSilicon', () => {
+    it('Can detect Apple Silicon device', () => {
+        
+        // non-real ua
+        const macARM = 'Mozilla/5.0 (Macintosh; ARM; Mac OS X 10.15; rv:97.0) Gecko/20100101 Firefox/97.0';
+        const macIntel = 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:97.0) Gecko/20100101 Firefox/97.0';
+
+        assert.equal(isAppleSilicon(UAParser(macIntel)), false);
+        assert.equal(isAppleSilicon(UAParser(macARM)), true);
+    });
+});
+
+describe('isChromiumBased', () => {
+    it('Can detect Chromium-based browser', () => {
+        
+        const edge = 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/119.0.0.0 Safari/537.36 Edg/119.0.2151.58';
+        const firefox = 'Mozilla/5.0 (X11; Linux x86_64; rv:109.0) Gecko/20100101 Firefox/111.0';
+
+        assert.equal(isChromiumBased(UAParser(edge)), true);
+        assert.equal(isChromiumBased(UAParser(firefox)), false);
+    });
+});

test/playwright-test-main.spec.mjs

@@ -0,0 +1,78 @@
+import { test, expect } from '@playwright/test';
+import path from 'path';
+import url from 'url';
+
+const localHtml = `file://${path.resolve(path.dirname(url.fileURLToPath(import.meta.url)), '../')}/dist/ua-parser.html`;
+
+test.describe('test input', () => {
+    test.beforeEach(async ({ page }) => {
+        await page.goto(localHtml);
+    });
+
+    test('accept empty string', async ({ page }) => {
+        // @ts-ignore
+        const uap = await page.evaluate(async () => await UAParser(''));
+        expect(uap).toHaveProperty('ua', '');
+    });
+});
+
+test('read client hints data', async ({ page }) => {
+    await page.addInitScript(() => {
+        Object.defineProperty(navigator, 'userAgentData', {
+            value: {
+                brands: [],
+                platform: '',
+                mobile: false,
+                getHighEntropyValues: () => {
+                    return Promise.resolve({
+                        brands: [
+                            {
+                                brand: 'Chromium',
+                                version: '110'
+                            },
+                            {
+                                brand: 'Not(A:Brand',
+                                version: '110'
+                            },
+                            {
+                                brand: 'New Browser',
+                                version: '110'
+                            }
+                        ],
+                        platform: 'New OS',
+                        formFactor: 'New Form Factor'
+                    });
+                }
+            }
+        });
+    });
+
+    await page.goto(localHtml);
+
+    // @ts-ignore
+    const uap = await page.evaluate(async () => await UAParser().withClientHints());
+
+    expect(uap).toHaveProperty('browser.name', 'New Browser');
+    expect(uap).toHaveProperty('os.name', 'New OS');
+    expect(uap).toHaveProperty('device.type', undefined);
+});
+
+test('detect Brave', async ({ page }) => {
+    await page.addInitScript(() => {
+        Object.defineProperty(navigator, 'brave', {
+            value: {
+                isBrave: () => true
+            }
+        });
+    });
+
+    await page.goto(localHtml);
+
+    // @ts-ignore
+    let uap = await page.evaluate(() => UAParser());
+    expect(uap).toHaveProperty('browser.name', 'Chrome Headless');
+
+    // @ts-ignore
+    uap = await page.evaluate(() => UAParser().withFeatureCheck());
+    expect(uap).toHaveProperty('browser.name', 'Brave');
+});

test/specs/browser-all.json

@@ -9,6 +9,26 @@
             "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",
@@ -64,7 +84,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 Browser",
+            "name"    : "Samsung Internet",
             "version" : "3.0",
             "major"   : "3"
         }
@@ -94,7 +114,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"
         }
@@ -124,11 +144,71 @@
         "ua"      : "Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; SV1; baidubrowser 1.x)",
         "expect"  :
         {
-            "name"    : "baidubrowser",
+            "name"    : "Baidu",
             "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"    : "Bolt",
         "ua"      : "Mozilla/5.0 (X11; 78; CentOS; US-en) AppleWebKit/527+ (KHTML, like Gecko) Bolt/0.862 Version/3.0 Safari/523.15",
@@ -199,6 +279,46 @@
             "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",
@@ -389,6 +509,26 @@
             "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",
@@ -668,6 +808,26 @@
             "major"   : "5"
         }
     },
+    {
+        "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",
@@ -978,6 +1138,26 @@
             "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",
@@ -1084,20 +1264,60 @@
         "expect"  :
         {
             "name"    : "Safari",
-            "version" : "2.0.4",
-            "major"   : "2"
+            "version" : "1",
+            "major"   : "1"
         }
     },
     {
-        "desc"    : "Samsung Browser",
+        "desc"    : "Samsung Internet for Android",
         "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 Browser",
+            "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",
+            "version" : "4.0",
+            "major"   : "4"
+        }
+    },
+    {
+        "desc"    : "Samsung Internet in Redmi 8A",
+        "ua"      : "Mozilla/5.0 (Linux; Android 10; Redmi 8A) AppleWebKit/537.36 (KHTML, like Gecko) SamsungBrowser/23.0 Chrome/115.0.0.0 Mobile Safari/537.36",
+        "expect"  :
+        {
+            "name"    : "Samsung Internet",
+            "version" : "23.0",
+            "major"   : "23"
+        }
+    },
     {
         "desc"    : "SeaMonkey",
         "ua"      : "Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9.1b4pre) Gecko/20090405 SeaMonkey/2.0b1pre",
@@ -1298,6 +1518,26 @@
             "major"   : "1"
         }
     },
+    {
+        "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",
+        "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"    : "Viera",
         "ua"      : "HbbTV/1.2.1 (;Panasonic;VIERA 2015;3.014;a001-003 4000-0000;)",
@@ -1328,6 +1568,56 @@
             "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",
@@ -1338,6 +1628,16 @@
             "major"   : "6"
         }
     },
+    {
+        "desc"    : "Puffin",
+        "ua"      : "Mozilla/5.0 (Linux; Android 7.1.1; ZTE BLADE A0620 Build/NMF26F; ru-ru) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/79.0.3945.136 Mobile Safari/537.36 Puffin/9.2.0.50586AP",
+        "expect"  :
+        {
+            "name"    : "Puffin",
+            "version" : "9.2.0.50586AP",
+            "major"   : "9"
+        }
+    },
     {
         "desc"    : "Microsoft Edge 0.1",
         "ua"      : "Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/39.0.2171.71 Safari/537.36 Edge/12.0",
@@ -1428,6 +1728,16 @@
             "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"    : "Mobile 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",
@@ -1458,32 +1768,12 @@
             "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(Win) Desktop",
+            "name"    : "WeChat",
             "version" : "3.43.901.400",
             "major"   : "3"
         }
@@ -1493,7 +1783,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(Win) Desktop",
+            "name"    : "WeChat",
             "version" : "4.0.1301.400",
             "major"   : "4"
         }
@@ -1523,7 +1813,19 @@
         "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"    : "MetaSr"
+            "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"
         }
     },
     {
@@ -1534,16 +1836,6 @@
             "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",
@@ -1769,5 +2061,15 @@
             "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"
+        }
     }
 ]

test/specs/cpu-all.json

@@ -23,6 +23,46 @@
             "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)",
@@ -127,6 +167,14 @@
             "architecture"  : "arm64"
         }
     },
+    {
+        "desc"    : "Google Search App",
+        "ua"      : "Mozilla/5.0 (Linux; Android 6.0; M5s Build/MRA58K; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/44.0.2403.147 Mobile Safari/537.36 GSA/12.40.17.23.arm64",
+        "expect"  :
+        {
+            "architecture"  : "arm64"
+        }
+    },
     {
         "desc"    : "Pocket PC",
         "ua"      : "Opera/9.7 (Windows Mobile; PPC; Opera Mobi/35166; U; en) Presto/2.2.1",

test/specs/device-all.json

@@ -1,4 +1,14 @@
-[{
+[
+    {
+        "desc": "K",
+        "ua": "Mozilla/5.0 (Linux; Android 10; K) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/111.0.0.0 Mobile Safari/537.36",
+        "expect": {
+            "vendor": "undefined",
+            "model": "K",
+            "type": "mobile"
+        }
+    },
+    {
         "desc": "ASUS Nexus 7",
         "ua": "Mozilla/5.0 (Linux; Android 4.4.2; Nexus 7 Build/KOT49H) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/32.0.1700.99 Safari/537.36",
         "expect": {
@@ -142,6 +152,15 @@
             "type": "mobile"
         }
     },
+    {
+        "desc": "ASUS Zenfone 2 Laser",
+        "ua": "Mozilla/5.0 (Linux; Android 6.0.1; ASUS_Z00ED) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/106.0.0.0 Mobile Safari/537.36",
+        "expect": {
+            "vendor": "ASUS",
+            "model": "Z00ED",
+            "type": "mobile"
+        }
+    },
     {
         "desc": "Acer Iconia A1-810",
         "ua": "Mozilla/5.0 (Linux; Android 4.2.2; A1-810 Build/JDQ39) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/65.0.3325.109 Safari/537.36",
@@ -187,6 +206,15 @@
             "type": "mobile"
         }
     },
+    {
+        "desc": "Blackview 4900Pro",
+        "ua": "Mozilla/5.0 (Linux; Android 12; BV4900Pro) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/111.0.0.0 Mobile Safari/537.36",
+        "expect": {
+            "vendor": "undefined",
+            "model": "BV4900Pro",
+            "type": "mobile"
+        }
+    },
     {
         "desc": "Desktop (IE11 with Tablet string)",
         "ua": "Mozilla/5.0 (Windows NT 6.3; WOW64; Trident/7.0; .NET4.0E; .NET4.0C; .NET CLR 3.5.30729; .NET CLR 2.0.50727; .NET CLR 3.0.30729; Tablet PC 2.0; GWX:MANAGED; rv:11.0) like Gecko",
@@ -413,31 +441,31 @@
         }
     },
     {
-      "desc": "Huawei Mate 20 X",
-      "ua": "Mozilla/5.0 (Linux; Android 9; EVR-L29 Build/HUAWEIEVR-L29; xx-xx) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/70.0.3538.110 Mobile Safari/537.36",
-      "expect": {
-          "vendor": "Huawei",
-          "model": "EVR-L29",
-          "type": "mobile"
-      }
+        "desc": "Huawei Mate 20 X",
+        "ua": "Mozilla/5.0 (Linux; Android 9; EVR-L29 Build/HUAWEIEVR-L29; xx-xx) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/70.0.3538.110 Mobile Safari/537.36",
+        "expect": {
+            "vendor": "Huawei",
+            "model": "EVR-L29",
+            "type": "mobile"
+        }
     },
     {
-      "desc": "Huawei Mate 20 Pro",
-      "ua": "Mozilla/5.0 (Linux; Android 9; LYA-L09) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/78.0.3904.90 Mobile Safari/537.36",
-      "expect": {
-          "vendor": "Huawei",
-          "model": "LYA-L09",
-          "type": "mobile"
-      }
+        "desc": "Huawei Mate 20 Pro",
+        "ua": "Mozilla/5.0 (Linux; Android 9; LYA-L09) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/78.0.3904.90 Mobile Safari/537.36",
+        "expect": {
+            "vendor": "Huawei",
+            "model": "LYA-L09",
+            "type": "mobile"
+        }
     },
     {
-      "desc": "Huawei Mate 20 Pro",
-      "ua": "Mozilla/5.0 (Linux; Android 9; LYA-AL00) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/78.0.3904.90 Mobile Safari/537.36",
-      "expect": {
-          "vendor": "Huawei",
-          "model": "LYA-AL00",
-          "type": "mobile"
-      }
+        "desc": "Huawei Mate 20 Pro",
+        "ua": "Mozilla/5.0 (Linux; Android 9; LYA-AL00) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/78.0.3904.90 Mobile Safari/537.36",
+        "expect": {
+            "vendor": "Huawei",
+            "model": "LYA-AL00",
+            "type": "mobile"
+        }
     },
     {
         "desc": "Huawei Mate 20 Pro",
@@ -447,8 +475,8 @@
             "model": "LYA-AL10",
             "type": "mobile"
         }
-      },
-      {
+    },
+    {
         "desc": "Huawei Mate 20 Pro",
         "ua": "Mozilla/5.0 (Linux; Android 9; LYA-L0C) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/78.0.3904.90 Mobile Safari/537.36",
         "expect": {
@@ -456,8 +484,8 @@
             "model": "LYA-L0C",
             "type": "mobile"
         }
-      },
-      {
+    },
+    {
         "desc": "Huawei Mate 20 Pro",
         "ua": "Mozilla/5.0 (Linux; Android 9; LYA-L29) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/78.0.3904.90 Mobile Safari/537.36",
         "expect": {
@@ -465,8 +493,8 @@
             "model": "LYA-L29",
             "type": "mobile"
         }
-      },
-      {
+    },
+    {
         "desc": "Huawei Mate 20 Pro",
         "ua": "Mozilla/5.0 (Linux; Android 9; LYA-TL00) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/78.0.3904.90 Mobile Safari/537.36",
         "expect": {
@@ -475,6 +503,15 @@
             "type": "mobile"
         }
     },
+    {
+        "desc": "Huawei Mate 50 Pro",
+        "ua": "Mozilla/5.0 (Linux; Android 12; DCO-LX9) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/107.0.0.0 Mobile Safari/537.36",
+        "expect": {
+            "vendor": "Huawei",
+            "model": "DCO-LX9",
+            "type": "mobile"
+        }
+    },
     {
         "desc": "Huawei P20 Lite",
         "ua": "Mozilla/5.0 (Linux; Android 8.0.0; ANE-LX1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/75.0.3770.143 Mobile Safari/537.36",
@@ -485,13 +522,13 @@
         }
     },
     {
-      "desc": "Huawei P20",
-      "ua": "Mozilla/5.0 (Linux; Android 8.1.0; EML-L29) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/74.0.3729.157 Mobile Safari/537.36",
-      "expect": {
-          "vendor": "Huawei",
-          "model": "EML-L29",
-          "type": "mobile"
-      }
+        "desc": "Huawei P20",
+        "ua": "Mozilla/5.0 (Linux; Android 8.1.0; EML-L29) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/74.0.3729.157 Mobile Safari/537.36",
+        "expect": {
+            "vendor": "Huawei",
+            "model": "EML-L29",
+            "type": "mobile"
+        }
     },
     {
         "desc": "Huawei P20 Pro",
@@ -564,8 +601,8 @@
             "model": "YAL-L21",
             "type": "mobile"
         }
-      },
-      {
+    },
+    {
         "desc": "Huawei Nova 5T",
         "ua": "Mozilla/5.0 (Linux; Android 10; YAL-L61) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/80.0.3987.132 Mobile Safari/537.36",
         "expect": {
@@ -573,8 +610,8 @@
             "model": "YAL-L61",
             "type": "mobile"
         }
-      },
-      {
+    },
+    {
         "desc": "Huawei Nova 5T",
         "ua": "Mozilla/5.0 (Linux; Android 10; YAL-L71) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/80.0.3987.132 Mobile Safari/537.36",
         "expect": {
@@ -582,8 +619,8 @@
             "model": "YAL-L71",
             "type": "mobile"
         }
-      },
-      {
+    },
+    {
         "desc": "Huawei Nova 5T",
         "ua": "Mozilla/5.0 (Linux; Android 10; YAL-L61D) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/80.0.3987.132 Mobile Safari/537.36",
         "expect": {
@@ -591,8 +628,8 @@
             "model": "YAL-L61D",
             "type": "mobile"
         }
-      },
-      {
+    },
+    {
         "desc": "Huawei Nova 5T",
         "ua": "Mozilla/5.0 (Linux; Android 10; YALE-L61A) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/80.0.3987.132 Mobile Safari/537.36",
         "expect": {
@@ -600,8 +637,8 @@
             "model": "YALE-L61A",
             "type": "mobile"
         }
-      },
-      {
+    },
+    {
         "desc": "Huawei Nova 5T",
         "ua": "Mozilla/5.0 (Linux; Android 10; YALE-L61D) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/80.0.3987.132 Mobile Safari/537.36",
         "expect": {
@@ -609,8 +646,8 @@
             "model": "YALE-L61D",
             "type": "mobile"
         }
-      },
-      {
+    },
+    {
         "desc": "Huawei Nova 5T",
         "ua": "Mozilla/5.0 (Linux; Android 10; YALE-L71A) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/80.0.3987.132 Mobile Safari/537.36",
         "expect": {
@@ -745,6 +782,51 @@
             "type": "mobile"
         }
     },
+    {
+        "desc": "Infinix Hot 7 Pro",
+        "ua": "Mozilla/5.0 (Linux; Android 9; Infinix X625C) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/111.0.0.0 Mobile Safari/537.36",
+        "expect": {
+            "vendor": "Infinix",
+            "model": "X625C",
+            "type": "mobile"
+        }
+    },
+    {
+        "desc": "Infinix Hot 10T",
+        "ua": "Mozilla/5.0 (Linux; Android 11; Infinix X689C) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/111.0.0.0 Mobile Safari/537.36",
+        "expect": {
+            "vendor": "Infinix",
+            "model": "X689C",
+            "type": "mobile"
+        }
+    },
+    {
+        "desc": "Infinix Hot 11s",
+        "ua": "Mozilla/5.0 (Linux; Android 11; Infinix X6812 Build/RP1A.200720.011; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/111.0.5563.116 Mobile Safari/537.36",
+        "expect": {
+            "vendor": "Infinix",
+            "model": "X6812",
+            "type": "mobile"
+        }
+    },
+    {
+        "desc": "Infinix Smart 5",
+        "ua": "Mozilla/5.0 (Linux; Android 10; Infinix X657C) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/105.0.0.0 Mobile Safari/537.36",
+        "expect": {
+            "vendor": "Infinix",
+            "model": "X657C",
+            "type": "mobile"
+        }
+    },
+    {
+        "desc": "Infinix Zero 5G",
+        "ua": "Mozilla/5.0 (Linux; Android 12; Infinix X6815B) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/111.0.0.0 Mobile Safari/537.36",
+        "expect": {
+            "vendor": "Infinix",
+            "model": "X6815B",
+            "type": "mobile"
+        }
+    },
     {
         "desc": "Apple Desktop",
         "ua": "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_6) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/14.0.3 Safari/605.1.15",
@@ -898,6 +980,15 @@
             "type": "tablet"
         }
     },
+    {
+        "desc": "Lenovo IdeaTab S6000",
+        "ua": "Mozilla/5.0 (Linux; Android 4.2.2; IdeaTab S6000-H) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/70.0.3538.102 YaBrowser/18.11.1.1011.01 Safari/537.36",
+        "expect": {
+            "vendor": "Lenovo",
+            "model": "IdeaTab S6000-H",
+            "type": "tablet"
+        }
+    },
     {
         "desc": "LG V40 ThinQ",
         "ua": "Mozilla/5.0 (Linux; Android 9; LM-V405) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/74.0.3729.136 Mobile Safari/537.36",
@@ -925,6 +1016,24 @@
             "type": "mobile"
         }
     },
+    {
+        "desc": "LG K40",
+        "ua": "Mozilla/5.0 (Linux; Android 10; LM-X420) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/111.0.5563.57 Mobile Safari/537.36",
+        "expect": {
+            "vendor": "LG",
+            "model": "LM-X420",
+            "type": "mobile"
+        }
+    },
+    {
+        "desc": "LG Stylo 4",
+        "ua": "Mozilla/5.0 (Linux; Android 10; LM-Q710(FGN)) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/111.0.5563.57 Mobile Safari/537.36",
+        "expect": {
+            "vendor": "undefined",
+            "model": "LM-Q710(FGN)",
+            "type": "mobile"
+        }
+    },
     {
         "desc": "LG Stylo 5",
         "ua": "Mozilla/5.0 (Linux; Android 9; LM-Q720) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/78.0.3904.96 Mobile Safari/537.36",
@@ -943,6 +1052,15 @@
             "type": "mobile"
         }
     },
+    {
+        "desc": "LG K20",
+        "ua": "Mozilla/5.0 (Android 13; Mobile; LG-M255; rv:111.0) Gecko/111.0 Firefox/111.0",
+        "expect": {
+            "vendor": "LG",
+            "model": "M255",
+            "type": "mobile"
+        }
+    },
     {
         "desc": "LG K500",
         "ua": "Mozilla/5.0 (Linux; Android 6.0.1; LG-K500 Build/MMB29M) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/63.0.3239.111 Mobile Safari/537.36",
@@ -1061,23 +1179,30 @@
         }
     },
     {
-        "desc"      : "Meizu M3S",
-        "ua"        : "Mozilla/5.0 (X11; Linux; Android 5.1; MZ-M3s Build/LMY47I) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrom/45.0.2454.94 Mobile Safari/537.36",
-        "expect"    :
-        {
-            "vendor"  : "Meizu",
-            "model"   : "M3s",
-            "type"    : "mobile"
+        "desc": "Motorola Moto Z3 Play",
+        "ua": "Mozilla/5.0 (Linux; Android 9; Moto Z3 Play) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/111.0.0.0 Mobile Safari/537.36",
+        "expect": {
+            "vendor": "Motorola",
+            "model": "Moto Z3 Play",
+            "type": "mobile"
         }
     },
     {
-        "desc"      : "Microsoft Lumia 950",
-        "ua"        : "Mozilla/5.0 (Windows Phone 10.0; Android 4.2.1; Microsoft; Lumia 950) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/46.0.2486.0 Mobile Safari/537.36 Edge/13.10586",
-        "expect"    :
-        {
-            "vendor"  : "Microsoft",
-            "model"   : "Lumia 950",
-            "type"    : "mobile"
+        "desc": "Meizu M3S",
+        "ua": "Mozilla/5.0 (X11; Linux; Android 5.1; MZ-M3s Build/LMY47I) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrom/45.0.2454.94 Mobile Safari/537.36",
+        "expect": {
+            "vendor": "Meizu",
+            "model": "M3s",
+            "type": "mobile"
+        }
+    },
+    {
+        "desc": "Microsoft Lumia 950",
+        "ua": "Mozilla/5.0 (Windows Phone 10.0; Android 4.2.1; Microsoft; Lumia 950) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/46.0.2486.0 Mobile Safari/537.36 Edge/13.10586",
+        "expect": {
+            "vendor": "Microsoft",
+            "model": "Lumia 950",
+            "type": "mobile"
         }
     },
     {
@@ -1215,6 +1340,15 @@
             "type": "mobile"
         }
     },
+    {
+        "desc": "Nokia 7",
+        "ua": "Mozilla/5.0 (Linux; Android 11; Nokia 7.2) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/105.0.0.0 Mobile Safari/537.36",
+        "expect": {
+            "vendor": "Nokia",
+            "model": "7.2",
+            "type": "mobile"
+        }
+    },
     {
         "desc": "Nokia N9",
         "ua": "Mozilla/5.0 (MeeGo; NokiaN9) AppleWebKit/534.13 (KHTML, like Gecko) NokiaBrowser/8.5.0 Mobile Safari/534.13",
@@ -1314,6 +1448,15 @@
             "type": "mobile"
         }
     },
+    {
+        "desc": "OnePlus 7T Pro",
+        "ua": "Mozilla/5.0 (Linux; Android 10; HD1913) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/111.0.5563.57 Mobile Safari/537.36 EdgA/110.0.1587.66",
+        "expect": {
+            "vendor": "undefined",
+            "model": "HD1913",
+            "type": "mobile"
+        }
+    },
     {
         "desc": "OnePlus 8T",
         "ua": "Mozilla/5.0 (Linux; Android 11; KB2005) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/85.0.4183.127 Mobile Safari/537.36",
@@ -1332,6 +1475,15 @@
             "type": "mobile"
         }
     },
+    {
+        "desc": "OnePlus 10RT",
+        "ua": "Mozilla/5.0 (Linux; Android 13; CPH2413) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/111.0.0.0 Mobile Safari/537.36",
+        "expect": {
+            "vendor": "OPPO",
+            "model": "CPH2413",
+            "type": "mobile"
+        }
+    },
     {
         "desc": "OnePlus Nord N100",
         "ua": "Mozilla/5.0 (Linux; Android 10; BE2015 Build/QKQ1.200719.002; xx-xx) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/83.0.4103.106 Mobile Safari/537.36",
@@ -1458,6 +1610,15 @@
             "type": "mobile"
         }
     },
+    {
+        "desc": "OPPO F5",
+        "ua": "ozilla/5.0 (Linux; Android 7.1.1; CPH1723) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/106.0.0.0 Mobile Safari/537.36",
+        "expect": {
+            "vendor": "OPPO",
+            "model": "CPH1723",
+            "type": "mobile"
+        }
+    },
     {
         "desc": "Realme C1",
         "ua": "Mozilla/5.0 (Linux; Android 8.1; RMX1811 Build/OPM1.171019.026) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/66.0.3359.126 Mobile Safari/537.36",
@@ -1494,6 +1655,42 @@
             "type": "mobile"
         }
     },
+    {
+        "desc": "Realme 3 Pro",
+        "ua": "Mozilla/5.0 (Linux; Android 11; RMX1851) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/111.0.0.0 Mobile Safari/537.36",
+        "expect": {
+            "vendor": "Realme",
+            "model": "RMX1851",
+            "type": "mobile"
+        }
+    },
+    {
+        "desc": "Realme 8",
+        "ua": "Mozilla/5.0 (Linux; Android 12; RMX3085) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/105.0.0.0 Mobile Safari/537.36",
+        "expect": {
+            "vendor": "Realme",
+            "model": "RMX3085",
+            "type": "mobile"
+        }
+    },
+    {
+        "desc": "Realme 9 Pro",
+        "ua": "Mozilla/5.0 (Linux; Android 13; RMX3471) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/111.0.0.0 Mobile Safari/537.36",
+        "expect": {
+            "vendor": "Realme",
+            "model": "RMX3471",
+            "type": "mobile"
+        }
+    },
+    {
+        "desc": "Realme GT Master",
+        "ua": "Mozilla/5.0 (Linux; Android 13; RMX3363) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/105.0.0.0 Mobile Safari/537.36",
+        "expect": {
+            "vendor": "Realme",
+            "model": "RMX3363",
+            "type": "mobile"
+        }
+    },
     {
         "desc": "Panasonic T31",
         "ua": "Mozilla/5.0 (Linux; Android 4.2.2; Panasonic T31 Build/JDQ39) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/33.0.1750.170 Mobile Safari/537.36 ",
@@ -1683,6 +1880,24 @@
             "type": "mobile"
         }
     },
+    {
+        "desc": "Samsung Galaxy A50s",
+        "ua": "Mozilla/5.0 (Linux; Android 11; SM-A507FN) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/111.0.0.0 Mobile Safari/537.36",
+        "expect": {
+            "vendor": "Samsung",
+            "model": "SM-A507FN",
+            "type": "mobile"
+        }
+    },
+    {
+        "desc": "Samsung Galaxy A52s",
+        "ua": "Mozilla/5.0 (Linux; Android 13; SM-A528B) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/111.0.0.0 Mobile Safari/537.36",
+        "expect": {
+            "vendor": "Samsung",
+            "model": "SM-A528B",
+            "type": "mobile"
+        }
+    },
     {
         "desc": "Samsung Galaxy A80",
         "ua": "Mozilla/5.0 (Linux; Android 9; SM-A805F) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/74.0.3729.112 Mobile Safari/537.36",
@@ -1736,7 +1951,7 @@
             "model": "SCG01",
             "type": "mobile"
         }
-      },
+    },
     {
         "desc": "Samsung Galaxy Note 10+",
         "ua": "Mozilla/5.0 (Linux; Android 9; SM-N976V) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/76.0.3809.89 Mobile Safari/537.36",
@@ -1755,6 +1970,15 @@
             "type": "mobile"
         }
     },
+    {
+        "desc": "Samsung C8",
+        "ua": "Mozilla/5.0 (Linux; Android 7.1.1; SM-C7108) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/109.0.0.0 Mobile Safari/537.36",
+        "expect": {
+            "vendor": "Samsung",
+            "model": "SM-C7108",
+            "type": "mobile"
+        }
+    },
     {
         "desc": "Samsung Galaxy Note 8",
         "ua": "Mozilla/5.0 (Linux; Android 4.2.2; GT-N5100 Build/JDQ39) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/35.0.1916.141 Safari/537.36",
@@ -1840,9 +2064,9 @@
         "desc": "Samsung Note 10.1",
         "ua": "Mozilla/5.0 (Linux; Android 5.1.1; SM-P605) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/83.0.4103.106 Safari/537.36",
         "expect": {
-          "vendor": "Samsung",
-          "model": "SM-P605",
-          "type": "tablet"
+            "vendor": "Samsung",
+            "model": "SM-P605",
+            "type": "tablet"
         }
     },
     {
@@ -1953,6 +2177,15 @@
             "type": "mobile"
         }
     },
+    {
+        "desc": "Sony G8141 (Xperia XZ1)",
+        "ua": "Mozilla/5.0 (Linux; Android 9; SO-01K) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/111.0.0.0 Mobile Safari/537.36",
+        "expect": {
+            "vendor": "Sony",
+            "model": "SO-01K",
+            "type": "mobile"
+        }
+    },
     {
         "desc": "Sony G8141 (Xperia XZ Premium)",
         "ua": "Mozilla/5.0 (Linux; Android 8.0.0; G8141) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/70.0.3538.80 Mobile Safari/537.36",
@@ -2116,45 +2349,185 @@
         }
     },
     {
-        "desc"    : "Tesla",
-        "ua"      : "Mozilla/5.0 (X11; GNU/Linux) AppleWebKit/601.1 (KHTML, like Gecko) Tesla QtCarBrowser Safari/601.1",
-        "expect"  :
-        {
+        "desc": "Tecno KC8",
+        "ua": "Mozilla/5.0 (Linux; Android 10; TECNO KC8) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/111.0.0.0 Mobile Safari/537.36",
+        "expect": {
+            "vendor": "TECNO",
+            "model": "KC8",
+            "type": "mobile"
+        }
+    },
+    {
+        "desc": "Tecno Spark 8C",
+        "ua": "Mozilla/5.0 (Linux; Android 11; TECNO KG5n) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/111.0.0.0 Mobile Safari/537.36",
+        "expect": {
+            "vendor": "TECNO",
+            "model": "KG5n",
+            "type": "mobile"
+        }
+    },
+    {
+        "desc": "Tesla",
+        "ua": "Mozilla/5.0 (X11; GNU/Linux) AppleWebKit/601.1 (KHTML, like Gecko) Tesla QtCarBrowser Safari/601.1",
+        "expect": {
             "vendor": "Tesla",
             "model": "undefined",
             "type": "embedded"
         }
     },
     {
-        "desc"    : "Tesla",
-        "ua"      : "Mozilla/5.0 (X11; GNU/Linux) AppleWebKit/537.36 (KHTML, like Gecko) Chromium/79.0.3945.130 Chrome/79.0.3945.130 Safari/537.36 Tesla/2020.16.2.1-e99c70fff409",
-        "expect"  :
-        {
+        "desc": "Tesla",
+        "ua": "Mozilla/5.0 (X11; GNU/Linux) AppleWebKit/537.36 (KHTML, like Gecko) Chromium/79.0.3945.130 Chrome/79.0.3945.130 Safari/537.36 Tesla/2020.16.2.1-e99c70fff409",
+        "expect": {
             "vendor": "Tesla",
             "model": "undefined",
             "type": "embedded"
         }
     },
     {
-        "desc"    : "TechniSAT Digit ISIO S SAT receiver",
-        "ua"      : "Opera/9.80 (Linux sh4; U; HbbTV/1.1.1 (;;;;;); CE-HTML; TechniSat Digit ISIO S; de) Presto/2.9.167 Version/11.50",
-        "expect"  :
-        {
+        "desc": "TechniSAT Digit ISIO S SAT receiver",
+        "ua": "Opera/9.80 (Linux sh4; U; HbbTV/1.1.1 (;;;;;); CE-HTML; TechniSat Digit ISIO S; de) Presto/2.9.167 Version/11.50",
+        "expect": {
             "vendor": "TechniSat",
             "model": "Digit ISIO S",
             "type": "smarttv"
         }
     },
     {
-        "desc"    : "TechniSAT MultyVision SmartTV",
-        "ua"      : "Opera/9.80 (Linux i686; U; HbbTV/1.1.1 (;;;;;); CE-HTML; TechniSat MultyVision ISIO; de) Presto/2.9.167 Version/11.50",
-        "expect"  :
-        {
+        "desc": "TechniSAT MultyVision SmartTV",
+        "ua": "Opera/9.80 (Linux i686; U; HbbTV/1.1.1 (;;;;;); CE-HTML; TechniSat MultyVision ISIO; de) Presto/2.9.167 Version/11.50",
+        "expect": {
             "vendor": "TechniSat",
             "model": "MultyVision ISIO",
             "type": "smarttv"
         }
     },
+    {
+        "desc": "Ulefone Armor",
+        "ua": "Mozilla/5.0 (Linux; Android 6.0; Armor Build/MRA58K) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/60.0.3112.107 Mobile Safari/537.36",
+        "expect": {
+            "vendor": "Ulefone",
+            "model": "Armor",
+            "type": "mobile"
+        }
+    },
+    {
+        "desc": "Ulefone Armor",
+        "ua": "Mozilla/5.0 (Linux; arm_64; Android 6.0; Armor) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/81.0.4044.138 YaBrowser/20.4.2.101.00 SA/1 Mobile Safari/537.36",
+        "expect": {
+            "vendor": "Ulefone",
+            "model": "Armor",
+            "type": "mobile"
+        }
+    },
+    {
+        "desc": "Ulefone Armor 8 Pro",
+        "ua": "Mozilla/5.0 (Linux; Android 11; Armor 8 Pro) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/110.0.5481.192 Mobile Safari/537.36 OPR/74.1.3922.71199",
+        "expect": {
+            "vendor": "Ulefone",
+            "model": "Armor 8 Pro",
+            "type": "mobile"
+        }
+    },
+    {
+        "desc": "Ulefone Armor 12 5G",
+        "ua": "Mozilla/5.0 (Linux; Android 11; Armor 12 5G Build/RP1A.200720.011; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/115.0.5790.166 Mobile Safari/537.36",
+        "expect": {
+            "vendor": "Ulefone",
+            "model": "Armor 12 5G",
+            "type": "mobile"
+        }
+    },
+    {
+        "desc": "Ulefone Armor 20WT",
+        "ua": "Mozilla/5.0 (Linux; Android 12; Armor 20WT) AppleWebKit/537.36 (KHTML, like Gecko) SamsungBrowser/22.0 Chrome/111.0.5563.116 Mobile Safari/537.36",
+        "expect": {
+            "vendor": "Ulefone",
+            "model": "Armor 20WT",
+            "type": "mobile"
+        }
+    },
+    {
+        "desc": "Ulefone Armor Pad",
+        "ua": "Mozilla/5.0 (Linux; Android 12; Armor Pad Build/SP1A.210812.016; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/116.0.0.0 Mobile Safari/537.36 [FB_IAB/FB4A;FBAV/431.0.0.30.108;]",
+        "expect": {
+            "vendor": "Ulefone",
+            "model": "Armor Pad",
+            "type": "mobile"
+        }
+    },
+    {
+        "desc": "Ulefone Armor X5 Pro",
+        "ua": "Mozilla/5.0 (Linux; Android 10; Armor X5 Pro Build/QP1A.190711.020; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/116.0.0.0 Mobile Safari/537.36 [FB_IAB/FB4A;FBAV/430.0.0.23.113;]",
+        "expect": {
+            "vendor": "Ulefone",
+            "model": "Armor X5 Pro",
+            "type": "mobile"
+        }
+    },
+    {
+        "desc": "Ulefone Power Armor 14 Pro",
+        "ua": "Mozilla/5.0 (Linux; Android 12; Power Armor14 Pro Build/SP1A.210812.016; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/115.0.5790.138 Mobile Safari/537.36",
+        "expect": {
+            "vendor": "Ulefone",
+            "model": "Power Armor14 Pro",
+            "type": "mobile"
+        }
+    },
+    {
+        "desc": "Ulefone Power Armor 18T",
+        "ua": "Mozilla/5.0 (Linux; Android 12; Power Armor 18T) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/111.0.0.0 Mobile Safari/537.36",
+        "expect": {
+            "vendor": "Ulefone",
+            "model": "Power Armor 18T",
+            "type": "mobile"
+        }
+    },
+    {
+        "desc": "Ulefone Power Armor 19T",
+        "ua": "Mozilla/5.0 (Linux; Android 12; Power Armor 19T) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/110.0.5481.192 Mobile Safari/537.36 OPR/74.3.3922.71982",
+        "expect": {
+            "vendor": "Ulefone",
+            "model": "Power Armor 19T",
+            "type": "mobile"
+        }
+    },
+    {
+        "desc": "Xiaomi 2201117TG",
+        "ua": "Mozilla/5.0 (Linux; Android 11; 2201117TG) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/97.0.4692.98 Mobile Safari/537.36",
+        "expect": {
+            "vendor": "Xiaomi",
+            "model": "2201117TG",
+            "type": "mobile"
+        }
+    },
+    {
+        "desc": "Xiaomi M2004J19C",
+        "ua": "Mozilla/5.0 (Linux; Android 11; M2004J19C Build/RP1A.200720.011; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/113.0.5672.77 Mobile Safari/537.36",
+        "expect": {
+            "vendor": "Xiaomi",
+            "model": "M2004J19C",
+            "type": "mobile"
+        }
+    },
+    {
+        "desc": "Xiaomi M2006C3MNG",
+        "ua": "Mozilla/5.0 (Linux; Android 11; M2006C3MNG) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/94.0.4606.85 Mobile Safari/537.36",
+        "expect": {
+            "vendor": "Xiaomi",
+            "model": "M2006C3MNG",
+            "type": "mobile"
+        }
+    },
+    {
+        "desc": "Xiaomi 21061119DG",
+        "ua": "Mozilla/5.0 (Linux; arm_64; Android 11; 21061119DG) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/110.0.0.0 YaBrowser/23.3.7.24.00 SA/3 Mobile Safari/537.36",
+        "expect": {
+            "vendor": "Xiaomi",
+            "model": "21061119DG",
+            "type": "mobile"
+        }
+    },
     {
         "desc": "Xiaomi 2013023",
         "ua": "Mozilla/5.0 (Linux; U; Android 4.2.2; en-US; 2013023 Build/HM2013023) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 UCBrowser/10.0.1.512 U3/0.8.0 Mobile Safari/533.1",
@@ -2317,6 +2690,60 @@
             "type": "mobile"
         }
     },
+    {
+        "desc": "Xiaomi POCO X3 Pro",
+        "ua": "Mozilla/5.0 (Linux; Android 11; M2102J20SI) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/107.0.0.0 Mobile Safari/537.36",
+        "expect": {
+            "vendor": "Xiaomi",
+            "model": "M2102J20SI",
+            "type": "mobile"
+        }
+    },
+    {
+        "desc": "Xiaomi POCO X3 Pro",
+        "ua": "Mozilla/5.0 (Linux; Android 12; M2102J20SG) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/107.0.0.0 Mobile Safari/537.36",
+        "expect": {
+            "vendor": "Xiaomi",
+            "model": "M2102J20SG",
+            "type": "mobile"
+        }
+    },
+    {
+        "desc": "Xiaomi POCO X3 NFC",
+        "ua": "Mozilla/5.0 (Linux; Android 12; M2007J20CG) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/111.0.0.0 Mobile Safari/537.36",
+        "expect": {
+            "vendor": "Xiaomi",
+            "model": "M2007J20CG",
+            "type": "mobile"
+        }
+    },
+    {
+        "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": {
+            "vendor": "Xiaomi",
+            "model": "POCO M2 Pro",
+            "type": "mobile"
+        }
+    },
+    {
+        "desc": "Xiaomi POCO M3",
+        "ua": "Mozilla/5.0 (Linux; Android 10; M2010J19CI) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/111.0.0.0 Mobile Safari/537.36",
+        "expect": {
+            "vendor": "Xiaomi",
+            "model": "M2010J19CI",
+            "type": "mobile"
+        }
+    },
+    {
+        "desc": "Xiaomi POCOPHONE F1",
+        "ua": "Mozilla/5.0 (Linux; Android 10; POCOPHONE F1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/111.0.0.0 Mobile Safari/537.36",
+        "expect": {
+            "vendor": "Xiaomi",
+            "model": "POCOPHONE F1",
+            "type": "mobile"
+        }
+    },
     {
         "desc": "Xiaomi Redmi 4A",
         "ua": "Mozilla/5.0 (Linux; Android 6.0; Redmi 4A Build/MMB29M; xx-xx) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/56.0.2924.87 Mobile Safari/537.36",
@@ -2326,6 +2753,15 @@
             "type": "mobile"
         }
     },
+    {
+        "desc": "Xiaomi Redmi 10C",
+        "ua": "Mozilla/5.0 (Linux; Android 12; 220333QAG) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/105.0.0.0 Mobile Safari/537.36",
+        "expect": {
+            "vendor": "Xiaomi",
+            "model": "220333QAG",
+            "type": "mobile"
+        }
+    },
     {
         "desc": "Xiaomi Redmi K30 5G",
         "ua": "Mozilla/5.0 (Linux; Android 10; Redmi K30 5G) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/78.0.3904.96 Mobile Safari/537.36",
@@ -2362,6 +2798,69 @@
             "type": "mobile"
         }
     },
+    {
+        "desc": "XiaoMi Redmi Note 9S",
+        "ua": "Mozilla/5.0 (Linux; Android 10; Redmi Note 9S) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/111.0.0.0 Mobile Safari/537.36",
+        "expect": {
+            "vendor": "Xiaomi",
+            "model": "Redmi Note 9S",
+            "type": "mobile"
+        }
+    },
+    {
+        "desc": "XiaoMi Redmi Note 10 5G",
+        "ua": "Mozilla/5.0 (Linux; Android 12; M2103K19C) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/99.0.4844.88 Mobile Safari/537.36",
+        "expect": {
+            "vendor": "Xiaomi",
+            "model": "M2103K19C",
+            "type": "mobile"
+        }
+    },
+    {
+        "desc": "XiaoMi Redmi Note 10 Pro",
+        "ua": "Mozilla/5.0 (Linux; Android 13; M2101K6P) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/107.0.0.0 Mobile Safari/537.36",
+        "expect": {
+            "vendor": "Xiaomi",
+            "model": "M2101K6P",
+            "type": "mobile"
+        }
+    },
+    {
+        "desc": "XiaoMi Redmi Note 10 Pro",
+        "ua": "Mozilla/5.0 (Linux; Android 12; M2101K6G) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/105.0.0.0 Mobile Safari/537.36",
+        "expect": {
+            "vendor": "Xiaomi",
+            "model": "M2101K6G",
+            "type": "mobile"
+        }
+    },
+    {
+        "desc": "XiaoMi Redmi Note 8",
+        "ua": "Mozilla/5.0 (Linux; Android 10; Redmi Note 8) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/111.0.0.0 Mobile Safari/537.36",
+        "expect": {
+            "vendor": "Xiaomi",
+            "model": "Redmi Note 8",
+            "type": "mobile"
+        }
+    },
+    {
+        "desc": "XiaoMi Redmi Note 12 Turbo",
+        "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": {
+            "vendor": "Xiaomi",
+            "model": "23049RAD8C",
+            "type": "mobile"
+        }
+    },
+    {
+        "desc": "ZTE Blade A6",
+        "ua": "Mozilla/5.0 (Linux; Android 7.1.1; ZTE BLADE A0620 Build/NMF26F; ru-ru) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/79.0.3945.136 Mobile Safari/537.36 Puffin/9.2.0.50586AP",
+        "expect": {
+            "vendor": "ZTE",
+            "model": "BLADE A0620",
+            "type": "mobile"
+        }
+    },
     {
         "desc": "PlayStation 4",
         "ua": "Mozilla/5.0 (PlayStation 4 3.00) AppleWebKit/537.73 (KHTML, like Gecko)",
@@ -2461,6 +2960,15 @@
             "type": "mobile"
         }
     },
+    {
+        "desc": "Samsung Galaxy J7 Prime",
+        "ua": "Mozilla/5.0 (Linux; Android 8.1.0; SM-G610F) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/107.0.0.0 Mobile Safari/537.36",
+        "expect": {
+            "vendor": "Samsung",
+            "model": "SM-G610F",
+            "type": "mobile"
+        }
+    },
     {
         "desc": "Samsung Galaxy S6",
         "ua": "Mozilla/5.0 (Linux; Android 4.4.2; SM-G920I Build/KOT49H) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/36.0.1985.135 Safari/537.36",
@@ -2659,6 +3167,15 @@
             "type": "mobile"
         }
     },
+    {
+        "desc": "Google Pixel 7",
+        "ua": "Mozilla/5.0 (Linux; Android 13; Pixel 7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/111.0.0.0 Mobile Safari/537.36",
+        "expect": {
+            "vendor": "Google",
+            "model": "Pixel 7",
+            "type": "mobile"
+        }
+    },
     {
         "desc": "Generic Android Device",
         "ua": "Mozilla/5.0 (Linux; U; Android 6.0.1; i980 Build/MRA58K)",
@@ -2772,6 +3289,15 @@
             "type": "smarttv"
         }
     },
+    {
+        "desc": "Amazon Fire TV",
+        "ua": "Mozilla/5.0 (Linux; Android 9; AFTKA Build/PS7633.3445N; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/108.0.5359.160 Mobile Safari/537.36",
+        "expect": {
+            "vendor": "Amazon",
+            "model": "KA",
+            "type": "smarttv"
+        }
+    },
     {
         "desc": "Android TV",
         "ua": "Mozilla/5.0 (Linux; Android 10; 2020/2021 UHD Android TV Build/QTG3.201102.001; wv) AppleWebKit/537.36 (KHTML, like Gecko) version/4.0 Chrome/83.0.4103.101 Mobile Safari/537.36",
@@ -2880,6 +3406,15 @@
             "type": "console"
         }
     },
+    {
+        "desc": "Vivo S1 Pro",
+        "ua": "Mozilla/5.0 (Linux; Android 11; vivo 1920) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/110.0.0.0 Mobile Safari/537.36",
+        "expect": {
+            "vendor": "Vivo",
+            "model": "1920",
+            "type": "mobile"
+        }
+    },
     {
         "desc": "Vivo Y52s",
         "ua": "Mozilla/5.0 (Linux; Android 10; V2057A Build/QP1A.190711.020; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/76.0.3809.89 Mobile Safari/537.36 T7/12.10 SP-engine/2.28.0 baiduboxapp/12.10.0.10 (Baidu; P1 10) NABar/1.0",
@@ -2907,6 +3442,15 @@
             "type": "mobile"
         }
     },
+    {
+        "desc": "Vivo Y93",
+        "ua": "Mozilla/5.0 (Linux; Android 8.1.0; vivo 1814) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/112.0.0.0 Mobile Safari/537.36",
+        "expect": {
+            "vendor": "Vivo",
+            "model": "1814",
+            "type": "mobile"
+        }
+    },
     {
         "desc": "Vivo Y97",
         "ua": "Mozilla/5.0 (Linux; Android 8.1.0; V1813T Build/O11019; wv) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/62.0.3202.84 Mobile Safari/537.36 VivoBrowser/9.0.14.0",
@@ -2925,6 +3469,15 @@
             "type": "mobile"
         }
     },
+    {
+        "desc": "Vivo 1906 (Y11)",
+        "ua": "Mozilla/5.0 (Linux; Android 11; vivo 1906) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/111.0.0.0 Mobile Safari/537.36",
+        "expect": {
+            "vendor": "Vivo",
+            "model": "1906",
+            "type": "mobile"
+        }
+    },
     {
         "desc": "Unknown Mobile using Firefox",
         "ua": "Mozilla/5.0 (Android 4.4; Mobile; rv:41.0) Gecko/41.0 Firefox/41.0",
@@ -3006,4 +3559,4 @@
             "type": "mobile"
         }
     }
-]
+]

test/specs/os-all.json

@@ -80,6 +80,24 @@
             "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)",
@@ -773,6 +791,15 @@
             "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]",

test/test-extension.js

@@ -1,36 +0,0 @@
-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