Make it personal - 2.0.0-beta.2

Fixed Xbox Detection for Chrome-Based Edge

.github/FUNDING.yml

@@ -1,6 +1,6 @@
 # These are supported funding model platforms
 
-github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
+github: faisalman
 patreon: # Replace with a single Patreon username
 open_collective: ua-parser-js
 ko_fi: # Replace with a single Ko-fi username

.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/run-test.yml

@@ -1,17 +0,0 @@
-name: ua-parser-js-run-test
-
-on: [push, pull_request]
-
-jobs:
-  run-test:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        arch: [amd64, ppc64le]
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
-      - name: Run the test
-        run: |
-          npm install
-          npm run test-ci

.github/workflows/test-ci.yml

@@ -0,0 +1,23 @@
+name: UAParser.js CI-Test
+
+on: [push, pull_request]
+
+permissions:
+  contents: read
+
+jobs:
+  run-test:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        arch: [amd64, ppc64le]
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-node@v3
+        with: 
+          node-version: 'lts/*'
+      - name: Run the test
+        run: |
+          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]

.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

@@ -0,0 +1,134 @@
+# UAParser.js Changelog
+
+# 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:
+  - 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()`
+  - 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
+
+## Version 2.0.0-alpha.1
+
+- Initial work on new major version
+
+
+# Version 0.7 / 1.0
+
+Version 1.0.x is basically the equivalent of version 0.7.x. See [#536](https://github.com/faisalman/ua-parser-js/issues/536) for the reason behind this confusion.
+
+## Version 0.7.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
+- Add new engine: LibWeb
+- Add new OS: SerenityOS
+- Improve browser detection: Yandex
+- Improve device detection: iPhone, Amazon Echo
+- Improve OS detection: iOS
+
+## Version 0.7.34 / 1.0.34
+- Fix Sharp Mobile detected as Huawei Tablet
+- Fix IE8 bug
+- Add new devices : Kobo e-Reader, Apple Watch, and some new SmartTV devices
+- Add new OS : watchOS
+- Improve browser detection : Kakao, Naver, Brave
+- Improve device detection : Oculus, iPad
+- Improve OS detection : Chrome OS
+- Using navigator.userAgentData as fallback for device.type & os.name
+
+## Version 0.7.33 / 1.0.33
+
+- Add new browser : Cobalt
+- Identify Macintosh as an Apple device
+- Fix ReDoS vulnerability
+
+## Version 0.7.32 / 1.0.32
+
+- Add new browser : DuckDuckGo, Huawei Browser, LinkedIn
+- Add new OS : HarmonyOS
+- Add some Huawei models
+- Add Sharp Aquos TV
+- Improve detection Xiaomi Mi CC9 
+- Fix Sony Xperia 1 III misidentified as Acer tablet
+- Fix Detect Sony BRAVIA as SmartTV 
+- Fix Detect Xiaomi Mi TV as SmartTV 
+- Fix Detect Galaxy Tab S8 as tablet 
+- Fix WeGame mistakenly identified as WeChat
+- Fix included commas in Safari / Mobile Safari version
+- Increase UA_MAX_LENGTH to 350
+
+## Version 0.7.31 / 1.0.2
+
+- Fix OPPO Reno A5 incorrect detection
+- Fix TypeError Bug
+- Use AST to extract regexes and verify them with safe-regex
+
+## Version 0.7.30 / 1.0.1
+
+- Add new browser : Obigo, UP.Browser, Klar
+- Add new device : Oculus, Roku
+- Add new OS: Maemo, HP-UX, Android-x86, Deepin, elementary OS, GhostBSD, Linspire, Manjaro, Sabayon
+- Improve detection for Sony Xperia 1ii, LG Android TV, and some more devices
+- Improve detection for ARM64 CPU
+- Improve detection for Windows Mobile, Netscape, Mac on PowerPC
+- Categorize PDA as mobile
+- Fix Sharp devices misjudged as Huawei
+- Fix trailing comma for ES3 compatibility
+- Some code refactor
+
+# Version 0.8
+
+Version 0.8 was created by accident. This version is now deprecated and no longer maintained, please update to version 0.7 / 1.0.

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,73 @@
+# UAPARSER.JS PRO PERSONAL 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 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 personal, 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 and can not be transferred to other individual or organization.
+
+---
+
+## Rights
+
+You may use and modify The Code to create as many personal, hobby, educational, and other non-profit use as you want for yourself.
+
+You may create any number of copies of The Code for yourself.
+
+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 use and modify The Code in such a way that may be used directly for commercial purpose.
+
+You may not redistribute The Code, as-is or modified, except as a part of a Project that you made for yourself.
+
+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 Personal License, if you haven't please oreder here: https://store.faisalman.com
+
+# Download
+
+```sh
+npm install @ua-parser-js/pro-personal
+```
+
+# Documentation
+
+https://docs.uaparser.js.org/v2 
+
+# License
+
+UAParser.js PRO Personal
+
+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": "0.7.25",
-  "authors": [
-    "Faisal Salman <f@faisalman.com>"
-  ],
-  "private": false,
-  "main": "src/ua-parser.js",
-  "ignore": [
-    "build",
-    "node_modules",
-    "bower_components",
-    "test",
-    "tests"
-  ],
-  "dependencies": {}
-}

license.md

@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2012-2021 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: '0.7.25',
+  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": "0.7.25",
+  "title": "UAParser.js PRO Personal",
+  "name": "@ua-parser-js/pro-personal",
+  "version": "2.0.0-beta.2",
   "author": "Faisal Salman <f@faisalman.com> (http://faisalman.com)",
-  "description": "Lightweight JavaScript-based user-agent string parser",
+  "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,132 +14,229 @@
     "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": [
     "Aamir Poonawalla <aamir@urx.com>",
     "Admas <mollases@users.noreply.github.com>",
     "algenon <m@antonz.ru>",
-    "Alvin Portillo <portilloalvin@gmail.com>",
+    "Alvin Portillo <alvin@8thwall.com>",
+    "Amumu <yoyo837@hotmail.com>",
     "Andrea Vaghi <andrea.vaghi@jobrapido.com>",
     "Anton Zhiyanov <m@antonz.ru>",
     "Arturo Mejia <amejia@blim.com>",
     "Arun Rama Reddy <arunramareddy@gmail.com>",
     "Austin Pray <austin@austinpray.com>",
+    "Bendeguz <symunona@gmail.com>",
     "Benjamin Bertrand <bertrand.design@gmail.com>",
     "Benjamin Urban <benjamin.urban@sueddeutsche.de>",
     "boneyao <admin@boneyao.com>",
     "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>",
     "ddivernois <david-emmanuel.divernois@amadeus.com>",
+    "Deliaz <D3liaz@gmail.com>",
     "Demis Palma <demis.palma@gmail.com>",
     "dhoko <aurelien@protonmail.com>",
     "dianhe <dianhe@webank.com>",
+    "dineshks1 <dineshks1@d.kumar44@outlook.com>",
     "Dmitry Tyschenko <dtyschenko@gmail.com>",
     "Douglas Li <doug@knotch.it>",
     "Dumitru Uzun <contact@duzun.me>",
+    "Dustin <duburns@fanatics.com>",
+    "Elchin Valiyev <elchin.valiyev@autodesk.com>",
+    "Emil Hesslow <hesslow@gmail.com>",
+    "Eric Redon <eric.redon@coox.org>",
     "Eric Schrenker <eric.schrenker@gmail.com>",
     "Erik Hesselink <hesselink@gmail.com>",
     "Fabian Becker <halfdan@xnorfz.de>",
-    "Faisal Salman <fyzlman@gmail.com>",
+    "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>",
+    "Igor Topal <i.topal@smartweb.com.ua>",
+    "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>",
     "John Tantalo <john.tantalo@gmail.com>",
     "John Yanarella <jmy@codecatalyst.com>",
     "Jon Buckley <jon@jbuckley.ca>",
+    "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>",
     "Lukas Eipert <leipert@users.noreply.github.com>",
     "Malash <i@malash.me>",
     "Martynas <martynas@firmfirm.co>",
+    "Masahiko Sato <masasato@yahoo-corp.jp>",
     "Matt Brophy <matt@brophy.org>",
-    "Max Maurer <maxemanuel.maurer@gmail.com>",
+    "Matthew Origer <karatecowboy@gmail.com>",
     "Maximilian Haupt <mail@maximilianhaupt.com>",
+    "Max Maurer <maxemanuel.maurer@gmail.com>",
+    "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>",
     "Nik Rolls <nik@rolls.cc>",
-    "Nikhil Motiani <nikhil.m@247-inc.com>",
+    "nionata <n.ionata129@gmail.com>",
     "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>",
     "philippsimon <github@philippsimon.de>",
     "Pieter Hendrickx <pieter.hendrickx@belfius.be>",
     "Piper Chester <piperchester@gmail.com>",
+    "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>",
-    "shchotse <topal@mail.ua>",
+    "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>",
+    "Tanguy Krotoff <tkrotoff@gmail.com>",
+    "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>",
-    "Insanehong <insae.hong@navercorp.com>"
+    "Zach Bjornson <zbbjornson@gmail.com>",
+    "Ziding Zhang <zidingz@gmail.com>"
   ],
-  "main": "src/ua-parser.js",
-  "scripts": {
-    "build": "uglifyjs src/ua-parser.js -o dist/ua-parser.min.js --comments && uglifyjs src/ua-parser.js -o dist/ua-parser.pack.js --comments --compress --mangle",
-    "test": "jshint src/ua-parser.js && mocha -R nyan test/test.js",
-    "test-ci": "jshint src/ua-parser.js && mocha -R spec test/test.js",
-    "verup": "node ./node_modules/verup",
-    "version": "node ./node_modules/verup 0"
+  "type": "commonjs",
+  "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/main/ua-parser.js",
+      "import": "./src/main/ua-parser.mjs",
+      "types": "./src/main/ua-parser.d.ts"
+    },
+    "./enums": {
+      "require": "./src/enums/ua-parser-enums.js",
+      "import": "./src/enums/ua-parser-enums.mjs"
+    },
+    "./extensions": {
+      "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"
+    }
   },
-  "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})"
-    ]
+  "files": [
+    "dist",
+    "src"
+  ],
+  "scripts": {
+    "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": {
-    "jshint": "~2.12.0",
+    "@babel/parser": "7.15.8",
+    "@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",
-    "uglify-js": "~3.12.0",
-    "verup": "^1.3.x"
+    "requirejs": "2.3.2",
+    "safe-regex": "^2.1.1",
+    "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-Personal",
   "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",
@@ -147,6 +245,10 @@
     {
       "type": "paypal",
       "url": "https://paypal.me/faisalman"
+    },
+    {
+      "type": "github",
+      "url": "https://github.com/sponsors/faisalman"
     }
   ]
 }

readme.md

@@ -1,307 +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 data with relatively small footprint (~17KB minified, ~6KB gzipped) that can be used either in browser (client-side) or node.js (server-side).
-
-* Author    : Faisal Salman <<f@faisalman.com>>
-* Demo      : http://faisalman.github.io/ua-parser-js
-* Source    : https://github.com/faisalman/ua-parser-js
-
-# Documentation
-
-## Constructor
-
-* `new UAParser([uastring][,extensions])`
-    * returns new instance
-
-* `UAParser([uastring][,extensions])`
-    * returns result object `{ ua: '', browser: {}, cpu: {}, device: {}, engine: {}, os: {} }`
-
-## Methods
-
-* `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,
-Chrome Headless, Chrome WebView, Chrome, Chromium, Comodo Dragon, Dillo,
-Dolphin, Doris, Edge, Epiphany, Facebook, Falkon, Fennec, Firebird, Firefox,
-Flock, GSA, GoBrowser, ICE Browser, IE, IEMobile, IceApe, IceCat, IceDragon,
-Iceape, Iceweasel, Instagram, Iridium, Iron, Jasmine, K-Meleon, Kindle,
-Konqueror, LBBROWSER, Line, Links, Lunascape, Lynx, MIUI Browser,
-Maemo Browser, Maemo, Maxthon, MetaSr Midori, Minimo, Mobile Safari, Mosaic,
-Mozilla, NetFront, NetSurf, Netfront, Netscape, NokiaBrowser, Oculus Browser,
-OmniWeb, Opera Coast, Opera Mini, Opera Mobi, Opera Tablet, Opera, PaleMoon,
-PhantomJS, Phoenix, Polaris, Puffin, QQ, QQBrowser, QQBrowserLite, Quark,
-QupZilla, RockMelt, Safari, Sailfish Browser, Samsung Browser, SeaMonkey, Silk,
-Skyfire, Sleipnir, Slim, SlimBrowser, Swiftfox, Tizen Browser, UCBrowser,
-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
-
-# Possible 'device.vendor':
-Acer, Alcatel, Amazon, Apple, Archos, Asus, BenQ, BlackBerry, Dell, Essential,
-GeeksPhone, Google, HP, HTC, Huawei, Jolla, Lenovo, LG, Meizu, Microsoft, Motorola,
-Nexian, Nintendo, Nokia, Nvidia, OnePlus, Ouya, Palm, Panasonic, Pebble, Polytron,
-RIM, Samsung, Sharp, Siemens, Sony[Ericsson], Sprint, Xbox, Xiaomi, ZTE, ...
-
-# 'device.model' determined dynamically
-```
-
-* `getEngine()`
-    * returns `{ name: '', version: '' }`
-
-```sh
-# Possible 'engine.name'
-Amaya, Blink, EdgeHTML, Gecko, Goanna, iCab, KHTML, 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, Arch, Bada, BeOS, BlackBerry, CentOS, Chromium OS,
-Contiki, Fedora, Firefox OS, FreeBSD, Debian, DragonFly, Fuchsia, Gentoo, GNU,
-Haiku, Hurd, iOS, Joli, KaiOS, Linpus, Linux, Mac OS, Mageia, Mandriva, MeeGo,
-Minix, Mint, Morph OS, NetBSD, Nintendo, OpenBSD, OpenVMS, OS/2, Palm, PC-BSD,
-PCLinuxOS, Plan9, PlayStation, QNX, RedHat, RIM Tablet OS, RISC OS, Sailfish,
-Series40, Slackware, Solaris, SUSE, Symbian, Tizen, Ubuntu, Unix, VectorLinux,
-WebOS, Windows [Phone/Mobile], Zenwalk, ...
-
-# 'os.version' determined dynamically
-```
-
-* `getCPU()`
-    * returns `{ architecture: '' }`
-
-```sh
-# Possible 'cpu.architecture'
-68k, amd64, arm[64], avr, ia[32/64], irix[64], mips[64], pa-risc, ppc, sparc[64]
-```
-
-* `getResult()`
-    * returns `{ ua: '', browser: {}, cpu: {}, device: {}, engine: {}, os: {} }`
-
-* `getUA()`
-    * returns UA string of current instance
-
-* `setUA(uastring)`
-    * set UA string to be parsed
-    * returns current instance
-
-# Usage
-
-## Using HTML
-
-```html
-<!doctype html>
-<html>
-<head>
-<script src="ua-parser.min.js"></script>
-<script>
-
-    var parser = new UAParser();
-    console.log(parser.getResult());
-    /*
-        /// This will print an object structured like this:
-        {
-            ua: "",
-            browser: {
-                name: "",
-                version: "",
-                major: "" //@deprecated
-            },
-            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";
-    parser.setUA(uastring1);
-    var result = parser.getResult();
-    // You can also use UAParser constructor directly without having to create an instance:
-    // var result = 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(parser.setUA(uastring2).getBrowser().name); // "Konqueror"
-    console.log(parser.getOS());                            // {name: "OpenBSD", version: undefined}
-    console.log(parser.getEngine());                        // {name: "KHTML", version: "4.1.4"}
-
-    var uastring3 = 'Mozilla/5.0 (PlayBook; U; RIM Tablet OS 1.0.0; en-US) AppleWebKit/534.11 (KHTML, like Gecko) Version/7.1.0.7 Safari/534.11';
-    console.log(parser.setUA(uastring3).getDevice().model); // "PlayBook"
-    console.log(parser.getOS())                             // {name: "RIM Tablet OS", version: "1.0.0"}
-    console.log(parser.getBrowser().name);                  // "Safari"
-
-</script>
-</head>
-<body>
-</body>
-</html>
-```
-
-## Using node.js
-
-```sh
-$ npm install ua-parser-js
-```
-
-```js
-var http = require('http');
-var parser = require('ua-parser-js');
-
-http.createServer(function (req, res) {
-    // get user-agent header
-    var ua = parser(req.headers['user-agent']);
-    // 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 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);
-```
-
-## Using Extension
-
-* `UAParser([uastring,] extensions)`
-
-```js
-// Example:
-var myOwnListOfBrowsers = [
-    [/(mybrowser)\/([\w\.]+)/i], [UAParser.BROWSER.NAME, UAParser.BROWSER.VERSION]
-];
-var myParser = new UAParser({ browser: myOwnListOfBrowsers });
-var myUA = 'Mozilla/5.0 MyBrowser/1.3';
-console.log(myParser.setUA(myUA).getBrowser());  // {name: "MyBrowser", version: "1.3"}
-```
-
-# Development
-
-## Sponsors
-
-<a href="https://opencollective.com/ua-parser-js"><img src="https://opencollective.com/ua-parser-js/tiers/backers.svg?avatarHeight=64" height="80"/></a> <a href="https://opencollective.com/ua-parser-js"><img src="https://opencollective.com/ua-parser-js/tiers/sponsors.svg?avatarHeight=64" height="80"/></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-2021 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

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 Personal 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 Personal 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/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 Personal 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 Personal 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/ua-parser.js

@@ -1,924 +0,0 @@
-/*!@license
- * UAParser.js v0.7.25
- * Lightweight JavaScript-based User-Agent string parser
- * https://github.com/faisalman/ua-parser-js
- *
- * Copyright © 2012-2021 Faisal Salman <f@faisalman.com>
- * Licensed under MIT License
- */
-
-(function (window, undefined) {
-
-    'use strict';
-
-    //////////////
-    // Constants
-    /////////////
-
-
-    var LIBVERSION  = '0.7.25',
-        EMPTY       = '',
-        UNKNOWN     = '?',
-        FUNC_TYPE   = 'function',
-        UNDEF_TYPE  = 'undefined',
-        OBJ_TYPE    = 'object',
-        STR_TYPE    = 'string',
-        MAJOR       = 'major', // deprecated
-        MODEL       = 'model',
-        NAME        = 'name',
-        TYPE        = 'type',
-        VENDOR      = 'vendor',
-        VERSION     = 'version',
-        ARCHITECTURE= 'architecture',
-        CONSOLE     = 'console',
-        MOBILE      = 'mobile',
-        TABLET      = 'tablet',
-        SMARTTV     = 'smarttv',
-        WEARABLE    = 'wearable',
-        EMBEDDED    = 'embedded';
-
-
-    ///////////
-    // Helper
-    //////////
-
-
-    var util = {
-        extend : function (regexes, extensions) {
-            var mergedRegexes = {};
-            for (var i in regexes) {
-                if (extensions[i] && extensions[i].length % 2 === 0) {
-                    mergedRegexes[i] = extensions[i].concat(regexes[i]);
-                } else {
-                    mergedRegexes[i] = regexes[i];
-                }
-            }
-            return mergedRegexes;
-        },
-        has : function (str1, str2) {
-          if (typeof str1 === "string") {
-            return str2.toLowerCase().indexOf(str1.toLowerCase()) !== -1;
-          } else {
-            return false;
-          }
-        },
-        lowerize : function (str) {
-            return str.toLowerCase();
-        },
-        major : function (version) {
-            return typeof(version) === STR_TYPE ? version.replace(/[^\d\.]/g,'').split(".")[0] : undefined;
-        },
-        trim : function (str) {
-          return str.replace(/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g, '');
-        }
-    };
-
-
-    ///////////////
-    // Map helper
-    //////////////
-
-
-    var mapper = {
-
-        rgx : function (ua, arrays) {
-
-            var i = 0, j, k, p, q, matches, match;
-
-            // loop through all regexes maps
-            while (i < arrays.length && !matches) {
-
-                var regex = arrays[i],       // even sequence (0,2,4,..)
-                    props = arrays[i + 1];   // odd sequence (1,3,5,..)
-                j = k = 0;
-
-                // try matching uastring with regexes
-                while (j < regex.length && !matches) {
-
-                    matches = regex[j++].exec(ua);
-
-                    if (!!matches) {
-                        for (p = 0; p < props.length; p++) {
-                            match = matches[++k];
-                            q = props[p];
-                            // check if given property is actually array
-                            if (typeof q === OBJ_TYPE && q.length > 0) {
-                                if (q.length == 2) {
-                                    if (typeof q[1] == FUNC_TYPE) {
-                                        // assign modified match
-                                        this[q[0]] = q[1].call(this, match);
-                                    } else {
-                                        // assign given value, ignore regex match
-                                        this[q[0]] = q[1];
-                                    }
-                                } else if (q.length == 3) {
-                                    // check whether function or regex
-                                    if (typeof q[1] === FUNC_TYPE && !(q[1].exec && q[1].test)) {
-                                        // call function (usually string mapper)
-                                        this[q[0]] = match ? q[1].call(this, match, q[2]) : undefined;
-                                    } else {
-                                        // sanitize match using given regex
-                                        this[q[0]] = match ? match.replace(q[1], q[2]) : undefined;
-                                    }
-                                } else if (q.length == 4) {
-                                        this[q[0]] = match ? q[3].call(this, match.replace(q[1], q[2])) : undefined;
-                                }
-                            } else {
-                                this[q] = match ? match : undefined;
-                            }
-                        }
-                    }
-                }
-                i += 2;
-            }
-        },
-
-        str : function (str, map) {
-
-            for (var i in map) {
-                // check if array
-                if (typeof map[i] === OBJ_TYPE && map[i].length > 0) {
-                    for (var j = 0; j < map[i].length; j++) {
-                        if (util.has(map[i][j], str)) {
-                            return (i === UNKNOWN) ? undefined : i;
-                        }
-                    }
-                } else if (util.has(map[i], str)) {
-                    return (i === UNKNOWN) ? undefined : i;
-                }
-            }
-            return str;
-        }
-    };
-
-
-    ///////////////
-    // String map
-    //////////////
-
-
-    var maps = {
-
-        browser : {
-            oldsafari : {
-                version : {
-                    '1.0'   : '/8',
-                    '1.2'   : '/1',
-                    '1.3'   : '/3',
-                    '2.0'   : '/412',
-                    '2.0.2' : '/416',
-                    '2.0.3' : '/417',
-                    '2.0.4' : '/419',
-                    '?'     : '/'
-                }
-            }
-        },
-
-        device : {
-            amazon : {
-                model : {
-                    'Fire Phone' : ['SD', 'KF']
-                }
-            },
-            sprint : {
-                model : {
-                    'Evo Shift 4G' : '7373KT'
-                },
-                vendor : {
-                    'HTC'       : 'APA',
-                    'Sprint'    : 'Sprint'
-                }
-            }
-        },
-
-        os : {
-            windows : {
-                version : {
-                    'ME'        : '4.90',
-                    'NT 3.11'   : 'NT3.51',
-                    'NT 4.0'    : 'NT4.0',
-                    '2000'      : 'NT 5.0',
-                    'XP'        : ['NT 5.1', 'NT 5.2'],
-                    'Vista'     : 'NT 6.0',
-                    '7'         : 'NT 6.1',
-                    '8'         : 'NT 6.2',
-                    '8.1'       : 'NT 6.3',
-                    '10'        : ['NT 6.4', 'NT 10.0'],
-                    'RT'        : 'ARM'
-                }
-            }
-        }
-    };
-
-
-    //////////////
-    // Regex map
-    /////////////
-
-
-    var regexes = {
-
-        browser : [[
-
-            // Presto based
-            /(opera\smini)\/([\w\.-]+)/i,                                       // Opera Mini
-            /(opera\s[mobiletab]{3,6}).+version\/([\w\.-]+)/i,                  // Opera Mobi/Tablet
-            /(opera).+version\/([\w\.]+)/i,                                     // Opera > 9.80
-            /(opera)[\/\s]+([\w\.]+)/i                                          // Opera < 9.80
-            ], [NAME, VERSION], [
-
-            /(opios)[\/\s]+([\w\.]+)/i                                          // Opera mini on iphone >= 8.0
-            ], [[NAME, 'Opera Mini'], VERSION], [
-
-            /\s(opr)\/([\w\.]+)/i                                               // Opera Webkit
-            ], [[NAME, 'Opera'], VERSION], [
-
-            // Mixed
-            /(kindle)\/([\w\.]+)/i,                                             // Kindle
-            /(lunascape|maxthon|netfront|jasmine|blazer|instagram)[\/\s]?([\w\.]*)/i,
-                                                                                // Lunascape/Maxthon/Netfront/Jasmine/Blazer/Instagram
-            // Trident based
-            /(avant\s|iemobile|slim)(?:browser)?[\/\s]?([\w\.]*)/i,
-                                                                                // Avant/IEMobile/SlimBrowser
-            /(bidubrowser|baidubrowser)[\/\s]?([\w\.]+)/i,                      // Baidu Browser
-            /(?:ms|\()(ie)\s([\w\.]+)/i,                                        // Internet Explorer
-
-            // Webkit/KHTML based
-            /(rekonq)\/([\w\.]*)/i,                                             // Rekonq
-            /(chromium|flock|rockmelt|midori|epiphany|silk|skyfire|ovibrowser|bolt|iron|vivaldi|iridium|phantomjs|bowser|quark|qupzilla|falkon)\/([\w\.-]+)/i,
-                                                                                // Chromium/Flock/RockMelt/Midori/Epiphany/Silk/Skyfire/Bolt/Iron/Iridium/PhantomJS/Bowser/QupZilla/Falkon
-            /(puffin|brave|whale|qqbrowserlite|qq)\/([\w\.]+)/i                 // Puffin/Brave/Whale/QQBrowserLite/QQ, aka ShouQ
-            ], [NAME, VERSION], [
-
-            /(konqueror)\/([\w\.]+)/i                                           // Konqueror
-            ], [[NAME, 'Konqueror'], VERSION], [
-
-            /(trident).+rv[:\s]([\w\.]{1,9}).+like\sgecko/i                     // IE11
-            ], [[NAME, 'IE'], VERSION], [
-
-            /(edge|edgios|edga|edg)\/((\d+)?[\w\.]+)/i                          // Microsoft Edge
-            ], [[NAME, 'Edge'], VERSION], [
-
-            /(yabrowser)\/([\w\.]+)/i                                           // Yandex
-            ], [[NAME, 'Yandex'], VERSION], [
-
-            /(Avast)\/([\w\.]+)/i                                               // Avast Secure Browser
-            ], [[NAME, 'Avast Secure Browser'], VERSION], [
-
-            /(AVG)\/([\w\.]+)/i                                                 // AVG Secure Browser
-            ], [[NAME, 'AVG Secure Browser'], VERSION], [
-
-            /(focus)\/([\w\.]+)/i                                               // Firefox Focus
-            ], [[NAME, 'Firefox Focus'], VERSION], [
-
-            /(opt)\/([\w\.]+)/i                                                 // Opera Touch
-            ], [[NAME, 'Opera Touch'], VERSION], [
-
-            /((?:[\s\/])uc?\s?browser|(?:juc.+)ucweb)[\/\s]?([\w\.]+)/i         // UCBrowser
-            ], [[NAME, 'UCBrowser'], VERSION], [
-
-            /(comodo_dragon)\/([\w\.]+)/i                                       // Comodo Dragon
-            ], [[NAME, /_/g, ' '], VERSION], [
-
-            /((?:windowswechat)? qbcore)\/([\w\.]+).*(?:windowswechat)?/i       // WeChat Desktop for Windows Built-in Browser
-            ], [[NAME, 'WeChat(Win) Desktop'], VERSION], [
-
-            /(micromessenger)\/([\w\.]+)/i                                      // WeChat
-            ], [[NAME, 'WeChat'], VERSION], [
-
-            /m?(qqbrowser|baiduboxapp|2345Explorer)[\/\s]?([\w\.]+)/i           // QQBrowser/Baidu App/2345 Browser
-            ], [NAME, VERSION], [
-
-            /(MetaSr)[\/\s]?([\w\.]+)/i                                         // SouGouBrowser
-            ], [NAME], [
-
-            /(LBBROWSER)/i                                                      // LieBao Browser
-            ], [NAME], [
-
-            /(weibo)__([\d\.]+)/i                                               // Weibo
-            ], [NAME, VERSION], [
-
-            /xiaomi\/miuibrowser\/([\w\.]+)/i                                   // MIUI Browser
-            ], [VERSION, [NAME, 'MIUI Browser']], [
-
-            /;fbav\/([\w\.]+);/i                                                // Facebook App for iOS & Android with version
-            ], [VERSION, [NAME, 'Facebook']], [
-            
-            /FBAN\/FBIOS|FB_IAB\/FB4A/i                                         // Facebook App for iOS & Android without version
-            ], [[NAME, 'Facebook']], [
-
-            /safari\s(line)\/([\w\.]+)/i,                                       // Line App for iOS
-            /droid.+(line)\/([\w\.]+)\/iab/i                                    // Line App for Android
-            ], [NAME, VERSION], [
-
-            /headlesschrome(?:\/([\w\.]+)|\s)/i                                 // Chrome Headless
-            ], [VERSION, [NAME, 'Chrome Headless']], [
-
-            /\swv\).+(chrome)\/([\w\.]+)/i                                      // Chrome WebView
-            ], [[NAME, /(.+)/, '$1 WebView'], VERSION], [
-
-            /((?:oculus|samsung)browser)\/([\w\.]+)/i
-            ], [[NAME, /(.+(?:g|us))(.+)/, '$1 $2'], VERSION], [                // Oculus / Samsung Browser
-
-            /droid.+version\/([\w\.]+)\s+(?:mobile\s?safari|safari)*/i          // Android Browser
-            ], [VERSION, [NAME, 'Android Browser']], [
-
-            /(coc_coc_browser)\/([\w\.]+)/i                                     // Coc Coc Browser
-            ], [[NAME, 'Coc Coc'], VERSION], [
-
-            /(sailfishbrowser)\/([\w\.]+)/i                                     // Sailfish Browser
-            ], [[NAME, 'Sailfish Browser'], VERSION], [
-
-            /(chrome|omniweb|arora|[tizenoka]{5}\s?browser)\/v?([\w\.]+)/i
-                                                                                // Chrome/OmniWeb/Arora/Tizen/Nokia
-            ], [NAME, VERSION], [
-
-            /(dolfin)\/([\w\.]+)/i                                              // Dolphin
-            ], [[NAME, 'Dolphin'], VERSION], [
-
-            /(qihu|qhbrowser|qihoobrowser|360browser)/i                         // 360
-            ], [[NAME, '360 Browser']], [
-
-            /((?:android.+)crmo|crios)\/([\w\.]+)/i                             // Chrome for Android/iOS
-            ], [[NAME, 'Chrome'], VERSION], [
-
-            /(coast)\/([\w\.]+)/i                                               // Opera Coast
-            ], [[NAME, 'Opera Coast'], VERSION], [
-
-            /fxios\/([\w\.-]+)/i                                                // Firefox for iOS
-            ], [VERSION, [NAME, 'Firefox']], [
-
-            /version\/([\w\.]+)\s.*mobile\/\w+\s(safari)/i                      // Mobile Safari
-            ], [VERSION, [NAME, 'Mobile Safari']], [
-
-            /version\/([\w\.]+)\s.*(mobile\s?safari|safari)/i                   // Safari & Safari Mobile
-            ], [VERSION, NAME], [
-
-            /webkit.+?(gsa)\/([\w\.]+)\s.*(mobile\s?safari|safari)(\/[\w\.]+)/i // Google Search Appliance on iOS
-            ], [[NAME, 'GSA'], VERSION], [
-
-            /webkit.+?(mobile\s?safari|safari)(\/[\w\.]+)/i                     // Safari < 3.0
-            ], [NAME, [VERSION, mapper.str, maps.browser.oldsafari.version]], [
-
-            /(webkit|khtml)\/([\w\.]+)/i
-            ], [NAME, VERSION], [
-
-            // Gecko based
-            /(navigator|netscape)\/([\w\.-]+)/i                                 // Netscape
-            ], [[NAME, 'Netscape'], VERSION], [
-            /(swiftfox)/i,                                                      // Swiftfox
-            /(icedragon|iceweasel|camino|chimera|fennec|maemo\sbrowser|minimo|conkeror)[\/\s]?([\w\.\+]+)/i,
-                                                                                // IceDragon/Iceweasel/Camino/Chimera/Fennec/Maemo/Minimo/Conkeror
-            /(firefox|seamonkey|k-meleon|icecat|iceape|firebird|phoenix|palemoon|basilisk|waterfox)\/([\w\.-]+)$/i,
-
-                                                                                // Firefox/SeaMonkey/K-Meleon/IceCat/IceApe/Firebird/Phoenix
-            /(firefox)\/([\w\.]+)\s[\w\s\-]+\/[\w\.]+$/i,                       // Other Firefox-based
-            /(mozilla)\/([\w\.]+)\s.+rv\:.+gecko\/\d+/i,                        // Mozilla
-
-            // Other
-            /(polaris|lynx|dillo|icab|doris|amaya|w3m|netsurf|sleipnir)[\/\s]?([\w\.]+)/i,
-                                                                                // Polaris/Lynx/Dillo/iCab/Doris/Amaya/w3m/NetSurf/Sleipnir
-            /(links)\s\(([\w\.]+)/i,                                            // Links
-            /(gobrowser)\/?([\w\.]*)/i,                                         // GoBrowser
-            /(ice\s?browser)\/v?([\w\._]+)/i,                                   // ICE Browser
-            /(mosaic)[\/\s]([\w\.]+)/i                                          // Mosaic
-            ], [NAME, VERSION]
-        ],
-
-        cpu : [[
-
-            /(?:(amd|x(?:(?:86|64)[_-])?|wow|win)64)[;\)]/i                     // AMD64
-            ], [[ARCHITECTURE, 'amd64']], [
-
-            /(ia32(?=;))/i                                                      // IA32 (quicktime)
-            ], [[ARCHITECTURE, util.lowerize]], [
-
-            /((?:i[346]|x)86)[;\)]/i                                            // IA32
-            ], [[ARCHITECTURE, 'ia32']], [
-
-            // PocketPC mistakenly identified as PowerPC
-            /windows\s(ce|mobile);\sppc;/i
-            ], [[ARCHITECTURE, 'arm']], [
-
-            /((?:ppc|powerpc)(?:64)?)(?:\smac|;|\))/i                           // PowerPC
-            ], [[ARCHITECTURE, /ower/, '', util.lowerize]], [
-
-            /(sun4\w)[;\)]/i                                                    // SPARC
-            ], [[ARCHITECTURE, 'sparc']], [
-
-            /((?:avr32|ia64(?=;))|68k(?=\))|arm(?:64|(?=v\d+[;l]))|(?=atmel\s)avr|(?:irix|mips|sparc)(?:64)?(?=;)|pa-risc)/i
-                                                                                // IA64, 68K, ARM/64, AVR/32, IRIX/64, MIPS/64, SPARC/64, PA-RISC
-            ], [[ARCHITECTURE, util.lowerize]]
-        ],
-
-        device : [[
-
-            /\((ipad|playbook);[\w\s\),;-]+(rim|apple)/i                        // iPad/PlayBook
-            ], [MODEL, VENDOR, [TYPE, TABLET]], [
-
-            /applecoremedia\/[\w\.]+ \((ipad)/                                  // iPad
-            ], [MODEL, [VENDOR, 'Apple'], [TYPE, TABLET]], [
-
-            /(apple\s{0,1}tv)/i                                                 // Apple TV
-            ], [[MODEL, 'Apple TV'], [VENDOR, 'Apple'], [TYPE, SMARTTV]], [
-
-            /(archos)\s(gamepad2?)/i,                                           // Archos
-            /(hp).+(touchpad)/i,                                                // HP TouchPad
-            /(hp).+(tablet)/i,                                                  // HP Tablet
-            /(kindle)\/([\w\.]+)/i,                                             // Kindle
-            /\s(nook)[\w\s]+build\/(\w+)/i,                                     // Nook
-            /(dell)\s(strea[kpr\s\d]*[\dko])/i                                  // Dell Streak
-            ], [VENDOR, MODEL, [TYPE, TABLET]], [
-
-            /(alexa)webm/i,
-            /(kf[A-z]+)(\sbuild\/|\)).+silk\//i                                 // Kindle Fire HD
-            ], [MODEL, [VENDOR, 'Amazon'], [TYPE, TABLET]], [
-            /(sd|kf)[0349hijorstuw]+(\sbuild\/|\)).+silk\//i                    // Fire Phone
-            ], [[MODEL, mapper.str, maps.device.amazon.model], [VENDOR, 'Amazon'], [TYPE, MOBILE]], [
-            /droid.+aft([\w])(\sbuild\/|\))/i                                   // Fire TV
-            ], [MODEL, [VENDOR, 'Amazon'], [TYPE, SMARTTV]], [
-
-            /\((ip(?:hone|od)[\s\w]*);/i                                        // iPod/iPhone
-            ], [MODEL, [VENDOR, 'Apple'], [TYPE, MOBILE]], [
-
-            /(blackberry)[\s-]?(\w+)/i,                                         // BlackBerry
-            /(blackberry|benq|palm(?=\-)|sonyericsson|acer|asus|dell|meizu|motorola|polytron)[\s_-]?([\w-]*)/i,
-                                                                                // BenQ/Palm/Sony-Ericsson/Acer/Asus/Dell/Meizu/Motorola/Polytron
-            /(hp)\s([\w\s]+\w)/i,                                               // HP iPAQ
-            /(asus)-?(\w+)/i                                                    // Asus
-            ], [VENDOR, MODEL, [TYPE, MOBILE]], [
-            /\(bb10;\s(\w+)/i                                                   // BlackBerry 10
-            ], [MODEL, [VENDOR, 'BlackBerry'], [TYPE, MOBILE]], [
-                                                                                // Asus Tablets
-            /droid.+(transfo[prime\s]{4,10}\s\w+|eeepc|slider\s\w+|nexus 7|padfone|p00c)/i
-            ], [MODEL, [VENDOR, 'Asus'], [TYPE, TABLET]], [
-
-            /sony\stablet\s[ps]\sbuild\//i,                                    // Sony
-            /(?:sony)?sgp\w+(?:\sbuild\/|\))/i
-            ], [[MODEL, 'Xperia Tablet'], [VENDOR, 'Sony'], [TYPE, TABLET]], [
-            /droid.+\s([c-g]\d{4}|so[-l]\w+|xq-a\w[4-7][12])(?=\sbuild\/|\).+chrome\/(?![1-6]{0,1}\d\.))/i
-            ], [MODEL, [VENDOR, 'Sony'], [TYPE, MOBILE]], [
-
-            /\s(ouya)\s/i,                                                      // Ouya
-            /(nintendo)\s([wids3utch]+)/i                                       // Nintendo
-            ], [VENDOR, MODEL, [TYPE, CONSOLE]], [
-
-            /droid.+;\s(shield)\sbuild/i                                        // Nvidia
-            ], [MODEL, [VENDOR, 'Nvidia'], [TYPE, CONSOLE]], [
-
-            /(playstation\s[345portablevi]+)/i                                  // Playstation
-            ], [MODEL, [VENDOR, 'Sony'], [TYPE, CONSOLE]], [
-
-            /(sprint\s(\w+))/i                                                  // Sprint Phones
-            ], [[VENDOR, mapper.str, maps.device.sprint.vendor], [MODEL, mapper.str, maps.device.sprint.model], [TYPE, MOBILE]], [
-
-            /(htc)[;_\s-]{1,2}([\w\s]+(?=\)|\sbuild)|\w+)/i,                    // HTC
-            /(zte)-(\w*)/i,                                                     // ZTE
-            /(alcatel|geeksphone|nexian|panasonic|(?=;\s)sony)[_\s-]?([\w-]*)/i
-                                                                                // Alcatel/GeeksPhone/Nexian/Panasonic/Sony
-            ], [VENDOR, [MODEL, /_/g, ' '], [TYPE, MOBILE]], [
-
-            /(nexus\s9)/i                                                       // HTC Nexus 9
-            ], [MODEL, [VENDOR, 'HTC'], [TYPE, TABLET]], [
-
-            /d\/huawei([\w\s-]+)[;\)]/i,                                        // Huawei
-            /droid.+\s(nexus\s6p|vog-[at]?l\d\d|ane-[at]?l[x\d]\d|eml-a?l\d\da?|lya-[at]?l\d[\dc]|clt-a?l\d\di?)/i,
-            /droid.+\s((?:A(?:GS2?|KA|LP|N[AE]|QM|RE|SK|TH)|B(?:A(?:C|H2)|G2|KL|LA|MH|Z[AKT])|C(?:AZ|DY|LT|OL|[MOR]R)|DUK|E(?:BG|DI|L[ES]|ML|V[AR])|FRD|G(?:LK|RA)|H(?:D[LN]|MA|LK|RY|WI)|INE|J(?:DN2|MM|NY|SN)|K(?:NT|OB|SA)|L(?:IO|LD|ON|[RY]A)|M(?:AR|ED|[HL]A|ON|RX|T7)|N(?:EO|TS|XT)|OXF|P(?:AR|CT|IC|LK|RA)|R(?:IO|VL)|S(?:C[ML]|EA|HT|PN|TF)|T(?:A[HS]|NY)|V(?:[CI]E|KY|OG|RD)|W(?:AS|LZ)|Y(?:635|AL))-[ATU][LN][01259][019])[;\)\s]/i
-
-            ], [MODEL, [VENDOR, 'Huawei'], [TYPE, MOBILE]], [
-
-            /droid.+(bah2?-a?[lw]\d{2})/i                                       // Huawei MediaPad
-            ], [MODEL, [VENDOR, 'Huawei'], [TYPE, TABLET]], [
-
-            /(microsoft);\s(lumia[\s\w]+)/i                                     // Microsoft Lumia
-            ], [VENDOR, MODEL, [TYPE, MOBILE]], [
-
-            /[\s\(;](xbox(?:\sone)?)[\s\);]/i                                   // Microsoft Xbox
-            ], [MODEL, [VENDOR, 'Microsoft'], [TYPE, CONSOLE]], [
-            /(kin\.[onetw]{3})/i                                                // Microsoft Kin
-            ], [[MODEL, /\./g, ' '], [VENDOR, 'Microsoft'], [TYPE, MOBILE]], [
-
-                                                                                // Motorola
-            /\s(milestone|droid(?:[2-4x]|\s(?:bionic|x2|pro|razr))?:?(\s4g)?)[\w\s]+build\//i,
-            /\smot[\s-](\w*)/i,
-            /(moto[\s\w\(\)]+(?=\sbuild|\)))/i,
-            /(XT\d{3,4}) build\//i,
-            /(nexus\s6)/i
-            ], [MODEL, [VENDOR, 'Motorola'], [TYPE, MOBILE]], [
-            /droid.+\s(mz60\d|xoom[\s2]{0,2})\sbuild\//i
-            ], [MODEL, [VENDOR, 'Motorola'], [TYPE, TABLET]], [
-
-            /hbbtv\/\d+\.\d+\.\d+\s+\([\w\s]*;\s*(\w[^;]*);([^;]*)/i            // HbbTV devices
-            ], [[VENDOR, util.trim], [MODEL, util.trim], [TYPE, SMARTTV]], [
-
-            /hbbtv.+maple;(\d+)/i
-            ], [[MODEL, /^/, 'SmartTV'], [VENDOR, 'Samsung'], [TYPE, SMARTTV]], [
-
-            /\(dtv[\);].+(aquos)/i                                              // Sharp
-            ], [MODEL, [VENDOR, 'Sharp'], [TYPE, SMARTTV]], [
-
-            /droid.+((sch-i[89]0\d|shw-m380s|SM-P605|SM-P610|SM-P587|gt-p\d{4}|gt-n\d+|sgh-t8[56]9|nexus 10))/i,
-            /((SM-T\w+))/i
-            ], [[VENDOR, 'Samsung'], MODEL, [TYPE, TABLET]], [                  // Samsung
-            /smart-tv.+(samsung)/i
-            ], [VENDOR, [TYPE, SMARTTV], MODEL], [
-            /((s[cgp]h-\w+|gt-\w+|galaxy\snexus|sm-\w[\w\d]+))/i,
-            /\s(sam)(?:sung)[\s-]([\w-]+)/i,
-            /sec-((sgh\w+))/i
-            ], [[VENDOR, 'Samsung'], MODEL, [TYPE, MOBILE]], [
-
-            /sie-(\w*)/i                                                        // Siemens
-            ], [MODEL, [VENDOR, 'Siemens'], [TYPE, MOBILE]], [
-
-            /(maemo|nokia).*(n900|lumia\s\d+)/i,                                // Nokia
-            /(nokia)[\s_-]?([\w\.-]*)/i
-            ], [[VENDOR, 'Nokia'], MODEL, [TYPE, MOBILE]], [
-
-            /droid[x\d\.\s;]+\s([ab][1-7]\-?[0178a]\d\d?)/i                     // Acer
-            ], [MODEL, [VENDOR, 'Acer'], [TYPE, TABLET]], [
-
-            /droid.+([vl]k\-?\d{3})\s+build/i                                   // LG Tablet
-            ], [MODEL, [VENDOR, 'LG'], [TYPE, TABLET]], [
-            /droid\s3\.[\s\w;-]{10}(lg?)-([06cv9]{3,4})/i                       // LG Tablet
-            ], [[VENDOR, 'LG'], MODEL, [TYPE, TABLET]], [
-            /linux;\snetcast.+smarttv/i,                                        // LG SmartTV
-            /lg\snetcast\.tv-201\d/i
-            ], [[VENDOR, 'LG'], MODEL, [TYPE, SMARTTV]], [
-            /(nexus\s[45])/i,                                                   // LG
-            /lg[e;\s\/-]+(\w*)/i,
-            /droid.+lg(\-?[\d\w]+)\s+build/i
-            ], [MODEL, [VENDOR, 'LG'], [TYPE, MOBILE]], [
-
-            /(lenovo)\s?(s(?:5000|6000)(?:[\w-]+)|tab(?:[\s\w]+)|[\w-]+)/i      // Lenovo tablets
-            ], [VENDOR, MODEL, [TYPE, TABLET]], [
-            /droid.+(ideatab[a-z0-9\-\s]+)/i                                    // Lenovo
-            ], [MODEL, [VENDOR, 'Lenovo'], [TYPE, TABLET]], [
-            /(lenovo)[_\s-]?([\w-]+)/i
-            ], [VENDOR, MODEL, [TYPE, MOBILE]], [
-
-            /linux;.+((jolla));/i                                               // Jolla
-            ], [VENDOR, MODEL, [TYPE, MOBILE]], [
-
-            /((pebble))app\/[\d\.]+\s/i                                         // Pebble
-            ], [VENDOR, MODEL, [TYPE, WEARABLE]], [
-
-            /droid.+;\s(oppo)\s?([\w\s]+)\sbuild/i                              // OPPO
-            ], [VENDOR, MODEL, [TYPE, MOBILE]], [
-
-            /crkey/i                                                            // Google Chromecast
-            ], [[MODEL, 'Chromecast'], [VENDOR, 'Google'], [TYPE, SMARTTV]], [
-
-            /droid.+;\s(glass)\s\d/i                                            // Google Glass
-            ], [MODEL, [VENDOR, 'Google'], [TYPE, WEARABLE]], [
-
-            /droid.+;\s(pixel c)[\s)]/i                                         // Google Pixel C
-            ], [MODEL, [VENDOR, 'Google'], [TYPE, TABLET]], [
-
-            /droid.+;\s(pixel( [2-9]a?)?( xl)?)[\s)]/i                          // Google Pixel
-            ], [MODEL, [VENDOR, 'Google'], [TYPE, MOBILE]], [
-
-            /droid.+;\s(\w+)\s+build\/hm\1/i,                                   // Xiaomi Hongmi 'numeric' models
-            /droid.+(hm[\s\-_]?note?[\s_]?(?:\d\w)?)\sbuild/i,                  // Xiaomi Hongmi
-            /droid.+(redmi[\s\-_]?(?:note|k)?(?:[\s_]?[\w\s]+))(?:\sbuild|\))/i,      
-                                                                                // Xiaomi Redmi
-            /droid.+(mi[\s\-_]?(?:a\d|one|one[\s_]plus|note lte)?[\s_]?(?:\d?\w?)[\s_]?(?:plus)?)\sbuild/i
-                                                                                // Xiaomi Mi
-            ], [[MODEL, /_/g, ' '], [VENDOR, 'Xiaomi'], [TYPE, MOBILE]], [
-            /droid.+(mi[\s\-_]?(?:pad)(?:[\s_]?[\w\s]+))(?:\sbuild|\))/i        // Mi Pad tablets
-            ],[[MODEL, /_/g, ' '], [VENDOR, 'Xiaomi'], [TYPE, TABLET]], [
-            /droid.+;\s(m[1-5]\snote)\sbuild/i                                  // Meizu
-            ], [MODEL, [VENDOR, 'Meizu'], [TYPE, MOBILE]], [
-            /(mz)-([\w-]{2,})/i
-            ], [[VENDOR, 'Meizu'], MODEL, [TYPE, MOBILE]], [
-
-            /droid.+a000(1)\s+build/i,                                          // OnePlus
-            /droid.+oneplus\s(a\d{4})[\s)]/i
-            ], [MODEL, [VENDOR, 'OnePlus'], [TYPE, MOBILE]], [
-
-            /droid.+[;\/]\s*(RCT[\d\w]+)\s+build/i                              // RCA Tablets
-            ], [MODEL, [VENDOR, 'RCA'], [TYPE, TABLET]], [
-
-            /droid.+[;\/\s](Venue[\d\s]{2,7})\s+build/i                         // Dell Venue Tablets
-            ], [MODEL, [VENDOR, 'Dell'], [TYPE, TABLET]], [
-
-            /droid.+[;\/]\s*(Q[T|M][\d\w]+)\s+build/i                           // Verizon Tablet
-            ], [MODEL, [VENDOR, 'Verizon'], [TYPE, TABLET]], [
-
-            /droid.+[;\/]\s+(Barnes[&\s]+Noble\s+|BN[RT])(\S(?:.*\S)?)\s+build/i
-            ], [[VENDOR, 'Barnes & Noble'], MODEL, [TYPE, TABLET]], [
-
-            /droid.+[;\/]\s+(TM\d{3}.*\b)\s+build/i                             // Barnes & Noble Tablet
-            ], [MODEL, [VENDOR, 'NuVision'], [TYPE, TABLET]], [
-
-            /droid.+;\s(k88)\sbuild/i                                           // ZTE K Series Tablet
-            ], [MODEL, [VENDOR, 'ZTE'], [TYPE, TABLET]], [
-
-            /droid.+;\s(nx\d{3}j)\sbuild/i                                      // ZTE Nubia
-            ], [MODEL, [VENDOR, 'ZTE'], [TYPE, MOBILE]], [
-
-            /droid.+[;\/]\s*(gen\d{3})\s+build.*49h/i                           // Swiss GEN Mobile
-            ], [MODEL, [VENDOR, 'Swiss'], [TYPE, MOBILE]], [
-
-            /droid.+[;\/]\s*(zur\d{3})\s+build/i                                // Swiss ZUR Tablet
-            ], [MODEL, [VENDOR, 'Swiss'], [TYPE, TABLET]], [
-
-            /droid.+[;\/]\s*((Zeki)?TB.*\b)\s+build/i                           // Zeki Tablets
-            ], [MODEL, [VENDOR, 'Zeki'], [TYPE, TABLET]], [
-
-            /(android).+[;\/]\s+([YR]\d{2})\s+build/i,
-            /droid.+[;\/]\s+(Dragon[\-\s]+Touch\s+|DT)(\w{5})\sbuild/i          // Dragon Touch Tablet
-            ], [[VENDOR, 'Dragon Touch'], MODEL, [TYPE, TABLET]], [
-
-            /droid.+[;\/]\s*(NS-?\w{0,9})\sbuild/i                              // Insignia Tablets
-            ], [MODEL, [VENDOR, 'Insignia'], [TYPE, TABLET]], [
-
-            /droid.+[;\/]\s*((NXA|Next)-?\w{0,9})\s+build/i                     // NextBook Tablets
-            ], [MODEL, [VENDOR, 'NextBook'], [TYPE, TABLET]], [
-
-            /droid.+[;\/]\s*(Xtreme\_)?(V(1[045]|2[015]|30|40|60|7[05]|90))\s+build/i
-            ], [[VENDOR, 'Voice'], MODEL, [TYPE, MOBILE]], [                    // Voice Xtreme Phones
-
-            /droid.+[;\/]\s*(LVTEL\-)?(V1[12])\s+build/i                        // LvTel Phones
-            ], [[VENDOR, 'LvTel'], MODEL, [TYPE, MOBILE]], [
-
-            /droid.+;\s(PH-1)\s/i
-            ], [MODEL, [VENDOR, 'Essential'], [TYPE, MOBILE]], [                // Essential PH-1
-
-            /droid.+[;\/]\s*(V(100MD|700NA|7011|917G).*\b)\s+build/i            // Envizen Tablets
-            ], [MODEL, [VENDOR, 'Envizen'], [TYPE, TABLET]], [
-
-            /droid.+[;\/]\s*(Le[\s\-]+Pan)[\s\-]+(\w{1,9})\s+build/i            // Le Pan Tablets
-            ], [VENDOR, MODEL, [TYPE, TABLET]], [
-
-            /droid.+[;\/]\s*(Trio[\s\w\-\.]+)\s+build/i                         // MachSpeed Tablets
-            ], [MODEL, [VENDOR, 'MachSpeed'], [TYPE, TABLET]], [
-
-            /droid.+[;\/]\s*(Trinity)[\-\s]*(T\d{3})\s+build/i                  // Trinity Tablets
-            ], [VENDOR, MODEL, [TYPE, TABLET]], [
-
-            /droid.+[;\/]\s*TU_(1491)\s+build/i                                 // Rotor Tablets
-            ], [MODEL, [VENDOR, 'Rotor'], [TYPE, TABLET]], [
-
-            //android.+(KS(.+))\s+build/i                                        // Amazon Kindle Tablets
-            //], [MODEL, [VENDOR, 'Amazon'], [TYPE, TABLET]], [
-
-            /droid.+(Gigaset)[\s\-]+(Q\w{1,9})\s+build/i                        // Gigaset Tablets
-            ], [VENDOR, MODEL, [TYPE, TABLET]], [
-
-            /[\s\/\(](android\stv|smart-?tv)[;\)\s]/i                           // SmartTV from Unidentified Vendors
-            ], [[TYPE, SMARTTV]], [
-                                                                                // Android Phones from Unidentified Vendors
-            /droid .+?; ([^;]+?)(?: build|\) applewebkit).+? mobile safari/i
-            ], [MODEL, [TYPE, MOBILE]], [
-                                                                                // Android Tablets from Unidentified Vendors
-            /droid .+?;\s([^;]+?)(?: build|\) applewebkit).+?(?! mobile) safari/i
-            ], [MODEL, [TYPE, TABLET]], [
-
-            /\s(tablet|tab)[;\/]/i,                                             // Unidentifiable Tablet
-            /\s(mobile)(?:[;\/]|\ssafari)/i                                     // Unidentifiable Mobile
-            ], [[TYPE, util.lowerize], VENDOR, MODEL], [
-
-            /(android[\w\.\s\-]{0,9});.+build/i                                 // Generic Android Device
-            ], [MODEL, [VENDOR, 'Generic']], [
-
-            /(phone)/i
-            ], [[TYPE, MOBILE]]
-        ],
-
-        engine : [[
-
-            /windows.+\sedge\/([\w\.]+)/i                                       // EdgeHTML
-            ], [VERSION, [NAME, 'EdgeHTML']], [
-
-            /webkit\/537\.36.+chrome\/(?!27)([\w\.]+)/i                         // Blink
-            ], [VERSION, [NAME, 'Blink']], [
-
-            /(presto)\/([\w\.]+)/i,                                             // Presto
-            /(webkit|trident|netfront|netsurf|amaya|lynx|w3m|goanna)\/([\w\.]+)/i,
-                                                                                // WebKit/Trident/NetFront/NetSurf/Amaya/Lynx/w3m/Goanna
-            /(khtml|tasman|links)[\/\s]\(?([\w\.]+)/i,                          // KHTML/Tasman/Links
-            /(icab)[\/\s]([23]\.[\d\.]+)/i                                      // iCab
-            ], [NAME, VERSION], [
-
-            /rv\:([\w\.]{1,9}).+(gecko)/i                                       // Gecko
-            ], [VERSION, NAME]
-        ],
-
-        os : [[
-
-            // Xbox, consider this before other Windows-based devices
-            /(xbox);\s+xbox\s([^\);]+)/i,                                       // Microsoft Xbox (360, One, X, S, Series X, Series S)
-
-            // Windows based
-            /microsoft\s(windows)\s(vista|xp)/i                                 // Windows (iTunes)
-            ], [NAME, VERSION], [
-            /(windows)\snt\s6\.2;\s(arm)/i,                                     // Windows RT
-            /(windows\sphone(?:\sos)*)[\s\/]?([\d\.\s\w]*)/i,                   // Windows Phone
-            /(windows\smobile|windows)[\s\/]?([ntce\d\.\s]+\w)/i
-            ], [NAME, [VERSION, mapper.str, maps.os.windows.version]], [
-            /(win(?=3|9|n)|win\s9x\s)([nt\d\.]+)/i
-            ], [[NAME, 'Windows'], [VERSION, mapper.str, maps.os.windows.version]], [
-
-            // Mobile/Embedded OS
-            /\((bb)(10);/i                                                      // BlackBerry 10
-            ], [[NAME, 'BlackBerry'], VERSION], [
-            /(blackberry)\w*\/?([\w\.]*)/i,                                     // Blackberry
-            /(tizen|kaios)[\/\s]([\w\.]+)/i,                                    // Tizen/KaiOS
-            /(android|webos|palm\sos|qnx|bada|rim\stablet\sos|meego|sailfish|contiki)[\/\s-]?([\w\.]*)/i
-                                                                                // Android/WebOS/Palm/QNX/Bada/RIM/MeeGo/Contiki/Sailfish OS
-            ], [NAME, VERSION], [
-            /(symbian\s?os|symbos|s60(?=;))[\/\s-]?([\w\.]*)/i                  // Symbian
-            ], [[NAME, 'Symbian'], VERSION], [
-            /\((series40);/i                                                    // Series 40
-            ], [NAME], [
-            /mozilla.+\(mobile;.+gecko.+firefox/i                               // Firefox OS
-            ], [[NAME, 'Firefox OS'], VERSION], [
-
-            // Google Chromecast
-            /crkey\/([\d\.]+)/i                                                 // Google Chromecast
-            ], [VERSION, [NAME, 'Chromecast']], [
-
-            // Console
-            /(nintendo|playstation)\s([wids345portablevuch]+)/i,                // Nintendo/Playstation
-
-            // GNU/Linux based
-            /(mint)[\/\s\(]?(\w*)/i,                                            // Mint
-            /(mageia|vectorlinux)[;\s]/i,                                       // Mageia/VectorLinux
-            /(joli|[kxln]?ubuntu|debian|suse|opensuse|gentoo|(?=\s)arch|slackware|fedora|mandriva|centos|pclinuxos|redhat|zenwalk|linpus)[\/\s-]?(?!chrom)([\w\.-]*)/i,
-                                                                                // Joli/Ubuntu/Debian/SUSE/Gentoo/Arch/Slackware
-                                                                                // Fedora/Mandriva/CentOS/PCLinuxOS/RedHat/Zenwalk/Linpus
-            /(hurd|linux)\s?([\w\.]*)/i,                                        // Hurd/Linux
-            /(gnu)\s?([\w\.]*)/i                                                // GNU
-            ], [NAME, VERSION], [
-
-            /(cros)\s[\w]+\s([\w\.]+\w)/i                                       // Chromium OS
-            ], [[NAME, 'Chromium OS'], VERSION],[
-
-            // Solaris
-            /(sunos)\s?([\w\.\d]*)/i                                            // Solaris
-            ], [[NAME, 'Solaris'], VERSION], [
-
-            // BSD based
-            /\s([frentopc-]{0,4}bsd|dragonfly)\s?([\w\.]*)/i                    // FreeBSD/NetBSD/OpenBSD/PC-BSD/DragonFly
-            ], [NAME, VERSION],[
-
-            /(haiku)\s(\w+)/i                                                   // Haiku
-            ], [NAME, VERSION],[
-
-            /cfnetwork\/.+darwin/i,
-            /ip[honead]{2,4}(?:.*os\s([\w]+)\slike\smac|;\sopera)/i             // iOS
-            ], [[VERSION, /_/g, '.'], [NAME, 'iOS']], [
-
-            /(mac\sos\sx)\s?([\w\s\.]*)/i,
-            /(macintosh|mac(?=_powerpc)\s)/i                                    // Mac OS
-            ], [[NAME, 'Mac OS'], [VERSION, /_/g, '.']], [
-
-            // Other
-            /((?:open)?solaris)[\/\s-]?([\w\.]*)/i,                             // Solaris
-            /(aix)\s((\d)(?=\.|\)|\s)[\w\.])*/i,                                // AIX
-            /(plan\s9|minix|beos|os\/2|amigaos|morphos|risc\sos|openvms|fuchsia)/i,
-                                                                                // Plan9/Minix/BeOS/OS2/AmigaOS/MorphOS/RISCOS/OpenVMS/Fuchsia
-            /(unix)\s?([\w\.]*)/i                                               // UNIX
-            ], [NAME, VERSION]
-        ]
-    };
-
-
-    /////////////////
-    // Constructor
-    ////////////////
-    var UAParser = function (uastring, extensions) {
-
-        if (typeof uastring === 'object') {
-            extensions = uastring;
-            uastring = undefined;
-        }
-
-        if (!(this instanceof UAParser)) {
-            return new UAParser(uastring, extensions).getResult();
-        }
-
-        var ua = uastring || ((typeof window !== 'undefined' && window.navigator && window.navigator.userAgent) ? window.navigator.userAgent : EMPTY);
-        var rgxmap = extensions ? util.extend(regexes, extensions) : regexes;
-
-        this.getBrowser = function () {
-            var browser = { name: undefined, version: undefined };
-            mapper.rgx.call(browser, ua, rgxmap.browser);
-            browser.major = util.major(browser.version); // deprecated
-            return browser;
-        };
-        this.getCPU = function () {
-            var cpu = { architecture: undefined };
-            mapper.rgx.call(cpu, ua, rgxmap.cpu);
-            return cpu;
-        };
-        this.getDevice = function () {
-            var device = { vendor: undefined, model: undefined, type: undefined };
-            mapper.rgx.call(device, ua, rgxmap.device);
-            return device;
-        };
-        this.getEngine = function () {
-            var engine = { name: undefined, version: undefined };
-            mapper.rgx.call(engine, ua, rgxmap.engine);
-            return engine;
-        };
-        this.getOS = function () {
-            var os = { name: undefined, version: undefined };
-            mapper.rgx.call(os, ua, rgxmap.os);
-            return os;
-        };
-        this.getResult = function () {
-            return {
-                ua      : this.getUA(),
-                browser : this.getBrowser(),
-                engine  : this.getEngine(),
-                os      : this.getOS(),
-                device  : this.getDevice(),
-                cpu     : this.getCPU()
-            };
-        };
-        this.getUA = function () {
-            return ua;
-        };
-        this.setUA = function (uastring) {
-            ua = uastring;
-            return this;
-        };
-        return this;
-    };
-
-    UAParser.VERSION = LIBVERSION;
-    UAParser.BROWSER = {
-        NAME    : NAME,
-        MAJOR   : MAJOR, // deprecated
-        VERSION : VERSION
-    };
-    UAParser.CPU = {
-        ARCHITECTURE : ARCHITECTURE
-    };
-    UAParser.DEVICE = {
-        MODEL   : MODEL,
-        VENDOR  : VENDOR,
-        TYPE    : TYPE,
-        CONSOLE : CONSOLE,
-        MOBILE  : MOBILE,
-        SMARTTV : SMARTTV,
-        TABLET  : TABLET,
-        WEARABLE: WEARABLE,
-        EMBEDDED: EMBEDDED
-    };
-    UAParser.ENGINE = {
-        NAME    : NAME,
-        VERSION : VERSION
-    };
-    UAParser.OS = {
-        NAME    : NAME,
-        VERSION : VERSION
-    };
-
-    ///////////
-    // Export
-    //////////
-
-
-    // check js environment
-    if (typeof(exports) !== UNDEF_TYPE) {
-        // nodejs env
-        if (typeof module !== UNDEF_TYPE && module.exports) {
-            exports = module.exports = UAParser;
-        }
-        exports.UAParser = UAParser;
-    } else {
-        // requirejs env (optional)
-        if (typeof(define) === 'function' && define.amd) {
-            define(function () {
-                return UAParser;
-            });
-        } else if (typeof window !== 'undefined') {
-            // browser env
-            window.UAParser = UAParser;
-        }
-    }
-
-    // jQuery/Zepto specific (optional)
-    // Note:
-    //   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 !== 'undefined' && (window.jQuery || window.Zepto);
-    if ($ && !$.ua) {
-        var parser = new UAParser();
-        $.ua = parser.getResult();
-        $.ua.get = function () {
-            return parser.getUA();
-        };
-        $.ua.set = function (uastring) {
-            parser.setUA(uastring);
-            var result = parser.getResult();
-            for (var prop in result) {
-                $.ua[prop] = result[prop];
-            }
-        };
-    }
-
-})(typeof window === 'object' ? window : this);

test/cpu-test.json

@@ -1,114 +0,0 @@
-[
-    {
-        "desc"    : "i686",
-        "ua"      : "Mozilla/5.0 (X11; Ubuntu; Linux i686; rv:19.0) Gecko/20100101 Firefox/19.0",
-        "expect"  :
-        {
-            "architecture"  : "ia32"
-        }
-    },
-    {
-        "desc"    : "i386",
-        "ua"      : "Mozilla/5.0 (X11; U; FreeBSD i386; en-US; rv:1.7) Gecko/20040628 Epiphany/1.2.6",
-        "expect"  :
-        {
-            "architecture"  : "ia32"
-        }
-    },
-    {
-        "desc"    : "x86-64",
-        "ua"      : "Opera/9.80 (X11; Linux x86_64; U; Linux Mint; en) Presto/2.2.15 Version/10.10",
-        "expect"  :
-        {
-            "architecture"  : "amd64"
-        }
-    },
-    {
-        "desc"    : "win64",
-        "ua"      : "Mozilla/4.0 (compatible; MSIE 7.0; Windows NT 6.2; Win64; x64; Trident/6.0; .NET4.0E; .NET4.0C)",
-        "expect"  :
-        {
-            "architecture"  : "amd64"
-        }
-    },
-    {
-        "desc"    : "WOW64",
-        "ua"      : "Mozilla/5.0 (compatible; MSIE 10.0; Windows NT 6.1; WOW64; Trident/6.0)",
-        "expect"  :
-        {
-            "architecture"  : "amd64"
-        }
-    },
-    {
-        "desc"    : "ARMv6",
-        "ua"      : "Mozilla/5.0 (X11; U; Linux armv61; en-US; rv:1.9.1b2pre) Gecko/20081015 Fennec/1.0a1",
-        "expect"  :
-        {
-            "architecture"  : "arm"
-        }
-    },
-    {
-        "desc"    : "ARMv7",
-        "ua"      : "Mozilla/5.0 (X11; CrOS armv7l 9765.85.0) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/61.0.3163.123 Safari/537.36",
-        "expect"  :
-        {
-            "architecture"  : "arm"
-        }
-    },
-    {
-        "desc"    : "Pocket PC",
-        "ua"      : "Opera/9.7 (Windows Mobile; PPC; Opera Mobi/35166; U; en) Presto/2.2.1",
-        "expect"  :
-        {
-            "architecture"  : "arm"
-        }
-    },
-    {
-        "desc"    : "Mac PowerPC",
-        "ua"      : "Mozilla/4.0 (compatible; MSIE 4.5; Mac_PowerPC)",
-        "expect"  :
-        {
-            "architecture"  : "ppc"
-        }
-    },
-    {
-        "desc"    : "Mac PowerPC",
-        "ua"      : "Mozilla/4.0 (compatible; MSIE 5.17; Mac_PowerPC Mac OS; en)",
-        "expect"  :
-        {
-            "architecture"  : "ppc"
-        }
-    },
-    {
-        "desc"    : "Mac PowerPC",
-        "ua"      : "iCab/2.9.5 (Macintosh; U; PPC; Mac OS X)",
-        "expect"  :
-        {
-            "architecture"  : "ppc"
-        }
-    },
-    {
-        "desc"    : "UltraSPARC",
-        "ua"      : "Mozilla/5.0 (X11; U; SunOS sun4u; en-US; rv:1.9b5) Gecko/2008032620 Firefox/3.0b5",
-        "expect"  :
-        {
-            "architecture"  : "sparc"
-        }
-    },
-    {
-        "desc"    : "QuickTime",
-        "ua"      : "QuickTime/7.5.6 (qtver=7.5.6;cpu=IA32;os=Mac 10.5.8)",
-        "expect"  : 
-        {
-            "architecture"  : "ia32"
-        }
-    },
-    {
-        "desc"    : "XBMC",
-        "ua"      : "XBMC/12.0 Git:20130127-fb595f2 (Windows NT 6.1;WOW64;Win64;x64; http://www.xbmc.org)",
-        "expect"  : 
-        {
-            "architecture"  : "amd64"
-        }
-    }
-]

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

@@ -0,0 +1,27 @@
+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', () => {
+    it('getResult() should returns object', () => {
+        assert.deepEqual(new UAParser('').getResult(), 
+            {
+                ua : '',
+                //ua_ch : { architecture: undefined, bitness: undefined, brands: undefined, fullVersionList: undefined, mobile: false, model: undefined, platform: undefined, platformVersion: undefined },
+                browser: { name: undefined, version: undefined, major: undefined },
+                cpu: { architecture: undefined },
+                device: { vendor: undefined, model: undefined, type: undefined },
+                engine: { name: undefined, version: undefined},
+                os: { name: undefined, version: undefined }
+        });
+    });
+});
+
+describe('Enums', () => {    
+    it('Can use enum', () => {
+        const { cpu, device, engine } = UAParser('Mozilla/5.0 (X11; U; Linux armv7l; en-GB; rv:1.9.2a1pre) Gecko/20090928 Firefox/3.5 Maemo Browser 1.4.1.22 RX-51 N900');
+        assert.strictEqual(cpu.is(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/os-test.json

@@ -1,713 +0,0 @@
-[
-    {
-        "desc"    : "Windows 95",
-        "ua"      : "Mozilla/1.22 (compatible; MSIE 2.0; Windows 95)",
-        "expect"  :
-        {
-            "name"    : "Windows",
-            "version" : "95"
-        }
-    },
-    {
-        "desc"    : "Windows 98",
-        "ua"      : "Mozilla/4.0 (compatible; MSIE 4.01; Windows 98)",
-        "expect"  :
-        {
-            "name"    : "Windows",
-            "version" : "98"
-        }
-    },
-    {
-        "desc"    : "Windows ME",
-        "ua"      : "Mozilla/5.0 (Windows; U; Win 9x 4.90) Gecko/20020502 CS 2000 7.0/7.0",
-        "expect"  :
-        {
-            "name"    : "Windows",
-            "version" : "ME"
-        }
-    },
-    {
-        "desc"    : "Windows 2000",
-        "ua"      : "Mozilla/3.0 (compatible; MSIE 3.0; Windows NT 5.0)",
-        "expect"  :
-        {
-            "name"    : "Windows",
-            "version" : "2000"
-        }
-    },
-    {
-        "desc"    : "Windows XP",
-        "ua"      : "Mozilla/5.0 (Windows; U; MSIE 7.0; Windows NT 5.2)",
-        "expect"  :
-        {
-            "name"    : "Windows",
-            "version" : "XP"
-        }
-    },
-    {
-        "desc"    : "Windows Vista",
-        "ua"      : "Mozilla/5.0 (compatible; MSIE 7.0; Windows NT 6.0; fr-FR)",
-        "expect"  :
-        {
-            "name"    : "Windows",
-            "version" : "Vista"
-        }
-    },
-    {
-        "desc"    : "Windows 7",
-        "ua"      : "Mozilla/5.0 (compatible; MSIE 10.0; Windows NT 6.1; Trident/6.0)",
-        "expect"  :
-        {
-            "name"    : "Windows",
-            "version" : "7"
-        }
-    },
-    {
-        "desc"    : "Windows 8",
-        "ua"      : "Mozilla/4.0 (compatible; MSIE 7.0; Windows NT 6.2; Win64; x64; Trident/6.0; .NET4.0E; .NET4.0C)",
-        "expect"  :
-        {
-            "name"    : "Windows",
-            "version" : "8"
-        }
-    },
-    {
-        "desc"    : "Windows 10",
-        "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",
-        "expect"  :
-        {
-            "name"    : "Windows",
-            "version" : "10"
-        }
-    },
-    {
-        "desc"    : "Windows RT",
-        "ua"      : "Mozilla/5.0 (compatible; MSIE 10.0; Windows NT 6.2; ARM; Trident/6.0)",
-        "expect"  :
-        {
-            "name"    : "Windows",
-            "version" : "RT"
-        }
-    },
-    {
-        "desc"    : "Windows CE",
-        "ua"      : "Mozilla/4.0 (compatible; MSIE 6.0; Windows CE; IEMobile 7.11)",
-        "expect"  :
-        {
-            "name"    : "Windows",
-            "version" : "CE"
-        }
-    },
-    {
-        "desc"    : "Windows Mobile",
-        "ua"      : "Mozilla/5.0 (ZTE-E_N72/N72V1.0.0B02;U;Windows Mobile/6.1;Profile/MIDP-2.0 Configuration/CLDC-1.1;320*240;CTC/2.0) IE/6.0 (compatible; MSIE 4.01; Windows CE; PPC)/UC Browser7.7.1.88",
-        "expect"  :
-        {
-            "name"    : "Windows Mobile",
-            "version" : "6.1"
-        }
-    },
-    {
-        "desc"    : "Windows Phone",
-        "ua"      : "Opera/9.80 (Windows Phone; Opera Mini/7.6.8/35.7518; U; ru) Presto/2.8.119 Version/11.10",
-        "expect"  :
-        {
-            "name"    : "Windows Phone",
-            "version" : "undefined"
-        }
-    },
-    {
-        "desc"    : "Windows Phone OS",
-        "ua"      : "Mozilla/4.0 (compatible; MSIE 7.0; Windows Phone OS 7.0; Trident/3.1; IEMobile/7.0; DELL; Venue Pro)",
-        "expect"  :
-        {
-            "name"    : "Windows Phone OS",
-            "version" : "7.0"
-        }
-    },
-    {
-        "desc"    : "Windows Phone 8",
-        "ua"      : "Mozilla/5.0 (compatible; MSIE 10.0; Windows Phone 8.0; Trident/6.0; IEMobile/10.0; ARM; Touch; HTC; Windows Phone 8X by HTC)",
-        "expect"  :
-        {
-            "name"    : "Windows Phone",
-            "version" : "8.0"
-        }
-    },
-    {
-        "desc"    : "BlackBerry",
-        "ua"      : "BlackBerry9300/5.0.0.912 Profile/MIDP-2.1 Configuration/CLDC-1.1 VendorID/378",
-        "expect"  :
-        {
-            "name"    : "BlackBerry",
-            "version" : "5.0.0.912"
-        }
-    },
-    {
-        "desc"    : "BlackBerry 10",
-        "ua"      : "Mozilla/5.0 (BB10; Touch) AppleWebKit/537.3+ (KHTML, like Gecko) Version/10.0.9.386 Mobile Safari/537.3+",
-        "expect"  :
-        {
-            "name"    : "BlackBerry",
-            "version" : "10"
-        }
-    },
-    {
-        "desc"    : "Tizen",
-        "ua"      : "Mozilla/5.0 (Linux; Tizen 2.3; SAMSUNG SM-Z130H) AppleWebKit/537.3 (KHTML, like Gecko) Version/2.3 Mobile Safari/537.3",
-        "expect"  :
-        {
-            "name"    : "Tizen",
-            "version" : "2.3"
-        }
-    },
-    {
-        "desc"    : "Android",
-        "ua"      : "Mozilla/5.0 (Linux; U; Android 2.2.2; en-us; VM670 Build/FRG83G) AppleWebKit/533.1 (KHTML, like Gecko)",
-        "expect"  :
-        {
-            "name"    : "Android",
-            "version" : "2.2.2"
-        }
-    },
-    {
-        "desc"    : "Sailfish",
-        "ua"      : "Mozilla/5.0 (Linux; U; Sailfish 3.0; Mobile; rv:45.0) Gecko/45.0 Firefox/45.0 SailfishBrowser/1.0",
-        "expect"  :
-        {
-            "name"    : "Sailfish",
-            "version" : "3.0"
-        }
-    },
-    {
-        "desc"    : "WebOS",
-        "ua"      : "",
-        "expect"  :
-        {
-            "name"    : "",
-            "version" : ""
-        }
-    },
-    {
-        "desc"    : "Palm OS",
-        "ua"      : "",
-        "expect"  :
-        {
-            "name"    : "",
-            "version" : ""
-        }
-    },
-    {
-        "desc"    : "QNX",
-        "ua"      : "",
-        "expect"  :
-        {
-            "name"    : "",
-            "version" : ""
-        }
-    },
-    {
-        "desc"    : "Bada",
-        "ua"      : "",
-        "expect"  :
-        {
-            "name"    : "",
-            "version" : ""
-        }
-    },
-    {
-        "desc"    : "RIM Tablet OS",
-        "ua"      : "",
-        "expect"  :
-        {
-            "name"    : "",
-            "version" : ""
-        }
-    },
-    {
-        "desc"    : "MeeGo",
-        "ua"      : "",
-        "expect"  :
-        {
-            "name"    : "",
-            "version" : ""
-        }
-    },
-    {
-        "desc"    : "Symbian",
-        "ua"      : "",
-        "expect"  :
-        {
-            "name"    : "",
-            "version" : ""
-        }
-    },
-    {
-        "desc"    : "Firefox OS",
-        "ua"      : "Mozilla/5.0 (Mobile; rv:14.0) Gecko/14.0 Firefox/14.0",
-        "expect"  :
-        {
-            "name"    : "Firefox OS",
-            "version" : "undefined"
-        }
-    },
-    {
-        "desc"    : "Google Chromecast",
-        "ua"      : "Mozilla/5.0 (X11; Linux aarch64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/76.0.3809.81 Safari/537.36 CrKey/1.42.183786",
-        "expect"  :
-        {
-            "name"    : "Chromecast",
-            "version" : "1.42.183786"
-        }
-    },
-    {
-        "desc"    : "Nintendo Switch",
-        "ua"      : "Mozilla/5.0 (Nintendo Switch; WifiWebAuthApplet) AppleWebKit/606.4 (KHTML, like Gecko) NF/6.0.1.15.4 NintendoBrowser/5.1.0.20393",
-        "expect"  :
-        {
-            "name"    : "Nintendo",
-            "version" : "Switch"
-        }
-    },
-    {
-        "desc"    : "PlayStation",
-        "ua"      : "",
-        "expect"  :
-        {
-            "name"    : "",
-            "version" : ""
-        }
-    },
-    {
-        "desc"    : "PlayStation 4",
-        "ua"      : "Mozilla/5.0 (PlayStation 4 3.00) AppleWebKit/537.73 (KHTML, like Gecko)",
-        "expect"  :
-        {
-            "name"    : "PlayStation",
-            "version" : "4"
-        }
-    },
-    {
-        "desc"    : "Xbox 360",
-        "ua"      : "Mozilla/5.0 (Windows NT 10.0; Win64; x64; Xbox; Xbox 360) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/85.0.4183.121 Safari/537.36",
-        "expect"  :
-        {
-            "name"    : "Xbox",
-            "version" : "360"
-        }
-    },
-    {
-        "desc"    : "Xbox One",
-        "ua"      : "Mozilla/5.0 (Windows NT 10.0; Win64; x64; Xbox; Xbox One; WebView/3.0) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/70.0.3538.102 Safari/537.36 Edge/18.19041",
-        "expect"  :
-        {
-            "name"    : "Xbox",
-            "version" : "One"
-        }
-    },
-    {
-        "desc"    : "Xbox X",
-        "ua"      : "Mozilla/5.0 (Windows NT 10.0; Win64; x64; Xbox; Xbox X) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/48.0.2564.82 Safari/537.36 Edge/20.02",
-        "expect"  :
-        {
-            "name"    : "Xbox",
-            "version" : "X"
-        }
-    },
-    {
-        "desc"    : "Xbox Series X",
-        "ua"      : "Mozilla/5.0 (Windows NT 10.0; Win64; x64; Xbox; Xbox Series X) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/48.0.2564.82 Safari/537.36 Edge/20.02 ",
-        "expect"  :
-        {
-            "name"    : "Xbox",
-            "version" : "Series X"
-        }
-    },
-    {
-        "desc"    : "Mint",
-        "ua"      : "",
-        "expect"  :
-        {
-            "name"    : "",
-            "version" : ""
-        }
-    },
-    {
-        "desc"    : "Joli",
-        "ua"      : "",
-        "expect"  :
-        {
-            "name"    : "",
-            "version" : ""
-        }
-    },
-    {
-        "desc"    : "Ubuntu",
-        "ua"      : "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/535.22+ (KHTML, like Gecko) Chromium/17.0.963.56 Chrome/17.0.963.56 Safari/535.22+ Ubuntu/12.04 (3.4.1-0ubuntu1) Epiphany/3.4.1",
-        "expect"  :
-        {
-            "name"    : "Ubuntu",
-            "version" : "12.04"
-        }
-    },
-    {
-        "desc"    : "Ubuntu",
-        "ua"      : "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Ubuntu Chromium/31.0.1650.63 Chrome/31.0.1650.63 Safari/537.36",
-        "expect"  :
-        {
-            "name"    : "Ubuntu",
-            "version" : "undefined"
-        }
-    },
-    {
-        "desc"    : "Debian",
-        "ua"      : "",
-        "expect"  :
-        {
-            "name"    : "",
-            "version" : ""
-        }
-    },
-    {
-        "desc"    : "OpenSUSE",
-        "ua"      : "",
-        "expect"  :
-        {
-            "name"    : "",
-            "version" : ""
-        }
-    },
-    {
-        "desc"    : "Gentoo",
-        "ua"      : "",
-        "expect"  :
-        {
-            "name"    : "",
-            "version" : ""
-        }
-    },
-    {
-        "desc"    : "Arch",
-        "ua"      : "",
-        "expect"  :
-        {
-            "name"    : "",
-            "version" : ""
-        }
-    },
-    {
-        "desc"    : "Slackware",
-        "ua"      : "",
-        "expect"  :
-        {
-            "name"    : "",
-            "version" : ""
-        }
-    },
-    {
-        "desc"    : "Fedora",
-        "ua"      : "",
-        "expect"  :
-        {
-            "name"    : "",
-            "version" : ""
-        }
-    },
-    {
-        "desc"    : "Mandriva",
-        "ua"      : "",
-        "expect"  :
-        {
-            "name"    : "",
-            "version" : ""
-        }
-    },
-    {
-        "desc"    : "CentOS",
-        "ua"      : "",
-        "expect"  :
-        {
-            "name"    : "",
-            "version" : ""
-        }
-    },
-    {
-        "desc"    : "PCLinuxOS",
-        "ua"      : "",
-        "expect"  :
-        {
-            "name"    : "",
-            "version" : ""
-        }
-    },
-    {
-        "desc"    : "RedHat",
-        "ua"      : "",
-        "expect"  :
-        {
-            "name"    : "",
-            "version" : ""
-        }
-    },
-    {
-        "desc"    : "Zenwalk",
-        "ua"      : "",
-        "expect"  :
-        {
-            "name"    : "",
-            "version" : ""
-        }
-    },
-    {
-        "desc"    : "Hurd",
-        "ua"      : "",
-        "expect"  :
-        {
-            "name"    : "",
-            "version" : ""
-        }
-    },
-    {
-        "desc"    : "Linux",
-        "ua"      : "",
-        "expect"  :
-        {
-            "name"    : "",
-            "version" : ""
-        }
-    },
-    {
-        "desc"    : "GNU",
-        "ua"      : "",
-        "expect"  :
-        {
-            "name"    : "",
-            "version" : ""
-        }
-    },
-    {
-        "desc"    : "Chromium OS",
-        "ua"      : "Mozilla/5.0 (X11; CrOS x86_64 10575.58.0) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/67.0.3396.99 Safari/537.36",
-        "expect"  :
-        {
-            "name"    : "Chromium OS",
-            "version" : "10575.58.0"
-        }
-    },
-    {
-        "desc"    : "Fuchsia",
-        "ua"      : "Mozilla/5.0 (X11; Fuchsia x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/71.0.3557.0 Safari/537.36",
-        "expect"  :
-        {
-            "name"    : "Fuchsia",
-            "version" : "undefined"
-        }
-    },
-    {
-        "desc"    : "Solaris",
-        "ua"      : "",
-        "expect"  :
-        {
-            "name"    : "",
-            "version" : ""
-        }
-    },
-    {
-        "desc"    : "FreeBSD",
-        "ua"      : "",
-        "expect"  :
-        {
-            "name"    : "",
-            "version" : ""
-        }
-    },
-    {
-        "desc"    : "OpenBSD",
-        "ua"      : "",
-        "expect"  :
-        {
-            "name"    : "",
-            "version" : ""
-        }
-    },
-    {
-        "desc"    : "NetBSD",
-        "ua"      : "",
-        "expect"  :
-        {
-            "name"    : "",
-            "version" : ""
-        }
-    },
-    {
-        "desc"    : "DragonFly",
-        "ua"      : "",
-        "expect"  :
-        {
-            "name"    : "",
-            "version" : ""
-        }
-    },
-    {
-        "desc"    : "iOS in App",
-        "ua"      : "AppName/version CFNetwork/version Darwin/version",
-        "expect"  :
-        {
-            "name"    : "iOS",
-            "version" : "undefined"
-        }
-    },
-    {
-        "desc"    : "iOS with Chrome",
-        "ua"      : "Mozilla/5.0 (iPhone; U; CPU iPhone OS 5_1_1 like Mac OS X; en) AppleWebKit/534.46.0 (KHTML, like Gecko) CriOS/19.0.1084.60 Mobile/9B206 Safari/7534.48.3",
-        "expect"  :
-        {
-            "name"    : "iOS",
-            "version" : "5.1.1"
-        }
-    },
-    {
-        "desc"    : "iOS with Opera Mini",
-        "ua"      : "Opera/9.80 (iPhone; Opera Mini/7.1.32694/27.1407; U; en) Presto/2.8.119 Version/11.10",
-        "expect"  :
-        {
-            "name"    : "iOS",
-            "version" : "undefined"
-        }
-    },
-    {
-        "desc"    : "Mac OS",
-        "ua"      : "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_6_8) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/28.0.1500.95 Safari/537.36",
-        "expect"  :
-        {
-            "name"    : "Mac OS",
-            "version" : "10.6.8"
-        }
-    },
-    {
-        "desc"    : "Haiku",
-        "ua"      : "Mozilla/5.0 (Macintosh; Intel Haiku R1 x86) AppleWebKit/602.1.1 (KHTML, like Gecko) WebPositive/1.2 Version/8.0 Safari/602.1.1",
-        "expect"  :
-        {
-            "name"    : "Haiku",
-            "version" : "R1"
-        }
-    },
-    {
-        "desc"    : "KaiOS",
-        "ua"      : "Mozilla/5.0 (Mobile; Nokia_8110_4G; rv:48.0) Gecko/48.0 Firefox/48.0 KAIOS/2.5",
-        "expect"  :
-        {
-            "name"    : "KAIOS",
-            "version" : "2.5"
-        }
-    },
-    {
-        "desc"    : "AIX",
-        "ua"      : "",
-        "expect"  :
-        {
-            "name"    : "",
-            "version" : ""
-        }
-    },
-    {
-        "desc"    : "Plan9",
-        "ua"      : "",
-        "expect"  :
-        {
-            "name"    : "",
-            "version" : ""
-        }
-    },
-    {
-        "desc"    : "Minix",
-        "ua"      : "",
-        "expect"  :
-        {
-            "name"    : "",
-            "version" : ""
-        }
-    },
-    {
-        "desc"    : "BeOS",
-        "ua"      : "",
-        "expect"  :
-        {
-            "name"    : "",
-            "version" : ""
-        }
-    },
-    {
-        "desc"    : "OS/2",
-        "ua"      : "",
-        "expect"  :
-        {
-            "name"    : "",
-            "version" : ""
-        }
-    },
-    {
-        "desc"    : "AmigaOS",
-        "ua"      : "",
-        "expect"  :
-        {
-            "name"    : "",
-            "version" : ""
-        }
-    },
-    {
-        "desc"    : "MorphOS",
-        "ua"      : "",
-        "expect"  :
-        {
-            "name"    : "",
-            "version" : ""
-        }
-    },
-    {
-        "desc"    : "UNIX",
-        "ua"      : "",
-        "expect"  :
-        {
-            "name"    : "",
-            "version" : ""
-        }
-    },
-    {
-        "desc"    : "iTunes Windows Vista",
-        "ua"      : "iTunes/10.7 (Windows; Microsoft Windows Vista Home Premium Edition Service Pack 1 (Build 6001)) AppleWebKit/536.26.9",
-        "expect"  :
-        {
-            "name"    : "Windows",
-            "version" : "Vista"
-        }
-    },
-    {
-        "desc"    : "",
-        "ua"      : "",
-        "expect"  :
-        {
-            "name"    : "",
-            "version" : ""
-        }
-    },
-    {
-        "desc"    : "iOS BE App",
-        "ua"      : "APP-BE Test/1.0 (iPad; Apple; CPU iPhone OS 7_0_2 like Mac OS X)",
-        "expect"  :
-        {
-            "name"    : "iOS",
-            "version" : "7.0.2"
-        }
-    },
-    {
-        "desc"    : "KTB-Nexus 5",
-        "ua"      : "APP-My App/1.0 (Linux; Android 4.2.1; Nexus 5 Build/JOP40D)",
-        "expect"  :
-        {
-            "name"    : "Android",
-            "version" : "4.2.1"
-        }
-    }
-]

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/cpu-all.json

@@ -0,0 +1,266 @@
+[
+    {
+        "desc"    : "i686",
+        "ua"      : "Mozilla/5.0 (X11; Ubuntu; Linux i686; rv:19.0) Gecko/20100101 Firefox/19.0",
+        "expect"  :
+        {
+            "architecture"  : "ia32"
+        }
+    },
+    {
+        "desc"    : "i386",
+        "ua"      : "Mozilla/5.0 (X11; U; FreeBSD i386; en-US; rv:1.7) Gecko/20040628 Epiphany/1.2.6",
+        "expect"  :
+        {
+            "architecture"  : "ia32"
+        }
+    },
+    {
+        "desc"    : "x86-64",
+        "ua"      : "Opera/9.80 (X11; Linux x86_64; U; Linux Mint; en) Presto/2.2.15 Version/10.10",
+        "expect"  :
+        {
+            "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)",
+        "expect"  :
+        {
+            "architecture"  : "amd64"
+        }
+    },
+    {
+        "desc"    : "WOW64",
+        "ua"      : "Mozilla/5.0 (compatible; MSIE 10.0; Windows NT 6.1; WOW64; Trident/6.0)",
+        "expect"  :
+        {
+            "architecture"  : "amd64"
+        }
+    },
+    {
+        "desc"    : "ARM",
+        "ua"      : "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",
+        "expect"  :
+        {
+            "architecture"  : "arm"
+        }
+    },
+    {
+        "desc"    : "ARMv61",
+        "ua"      : "Mozilla/5.0 (X11; U; Linux armv61; en-US; rv:1.9.1b2pre) Gecko/20081015 Fennec/1.0a1",
+        "expect"  :
+        {
+            "architecture"  : "arm"
+        }
+    },
+    {
+        "desc"    : "ARMv7",
+        "ua"      : "Mozilla/5.0 (Linux ARMv7) WebKitGTK+/3.4.9 vimprobable2",
+        "expect"  :
+        {
+            "architecture"  : "arm"
+        }
+    },
+    {
+        "desc"    : "ARMv7l",
+        "ua"      : "Mozilla/5.0 (SMART-TV; X11; Linux armv7l) AppleWebKit/537.42 (KHTML, like Gecko) Chromium/25.0.1349.2 Chrome/25.0.1349.2 Safari/537.42",
+        "expect"  :
+        {
+            "architecture"  : "arm"
+        }
+    },
+    {
+        "desc"    : "ARMv7l",
+        "ua"      : "Mozilla/5.0 (X11; CrOS armv7l 9765.85.0) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/61.0.3163.123 Safari/537.36",
+        "expect"  :
+        {
+            "architecture"  : "arm"
+        }
+    },
+    {
+        "desc"    : "Nokia N900 Linux mobile",
+        "ua"      : "Mozilla/5.0 (Maemo; Linux armv7l; rv:10.0) Gecko/20100101 Firefox/10.0 Fennec/10.0",
+        "expect"  :
+        {
+            "architecture"  : "arm"
+        }
+    },
+    {
+        "desc"    : "ARMEABI",
+        "ua"      : "[FBAN/FB4A;FBAV/237.0.0.44.120;FBBV/170693408;FBDM/{density=1.75,width=720,height=1280};FBLC/en_US;FBRV/172067074;FBCR/ ;FBMF/samsung;FBBD/samsung;FBPN/com.facebook.katana;FBDV/SM-S367VL;FBSV/9;FBBK/1;FBOP/19;FBCA/armeabi-v7a:armeabi;]",
+        "expect"  :
+        {
+            "architecture"  : "arm"
+        }
+    },
+    {
+        "desc"    : "ARMv8",
+        "ua"      : "Mozilla/5.0 (X11; Linux armv8l; rv:45.0) Gecko/20100101 Firefox/45.0",
+        "expect"  :
+        {
+            "architecture"  : "arm64"
+        }
+    },
+    {
+        "desc"    : "AARCH64",
+        "ua"      : "Mozilla/5.0 (X11; CrOS aarch64 13310.93.0) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/85.0.4183.133 Safari/537.36",
+        "expect"  :
+        {
+            "architecture"  : "arm64"
+        }
+    },
+    {
+        "desc"    : "ARM64",
+        "ua"      : "Mozilla/5.0 (Windows NT 10.0; ARM64; RM-1096) AppleWebKit/537.36 (KHTML like Gecko) Chrome/51.0.2704.79 Safari/537.36 Edge/14.14393",
+        "expect"  :
+        {
+            "architecture"  : "arm64"
+        }
+    },
+    {
+        "desc"    : "ARM64",
+        "ua"      : "Mozilla/5.0 (Linux; arm_64; Android 9; HRY-LX1T) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/78.0.3904.97 YaBrowser/19.12.1.121.00 Mobile Safari/537.36",
+        "expect"  :
+        {
+            "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",
+        "expect"  :
+        {
+            "architecture"  : "arm"
+        }
+    },
+    {
+        "desc"    : "Mac PowerPC",
+        "ua"      : "Mozilla/4.0 (compatible; MSIE 4.5; Mac_PowerPC)",
+        "expect"  :
+        {
+            "architecture"  : "ppc"
+        }
+    },
+    {
+        "desc"    : "Mac PowerPC",
+        "ua"      : "Mozilla/4.0 (compatible; MSIE 5.17; Mac_PowerPC Mac OS; en)",
+        "expect"  :
+        {
+            "architecture"  : "ppc"
+        }
+    },
+    {
+        "desc"    : "Mac PowerPC",
+        "ua"      : "iCab/2.9.5 (Macintosh; U; PPC; Mac OS X)",
+        "expect"  :
+        {
+            "architecture"  : "ppc"
+        }
+    },
+    {
+        "desc"    : "Mac OS X on PowerPC using Firefox",
+        "ua"      : "Mozilla/5.0 (Macintosh; PPC Mac OS X x.y; rv:10.0) Gecko/20100101 Firefox/10.0",
+        "expect"  :
+        {
+            "architecture"  : "ppc"
+        }
+    },
+    {
+        "desc"    : "UltraSPARC",
+        "ua"      : "Mozilla/5.0 (X11; U; SunOS sun4u; en-US; rv:1.9b5) Gecko/2008032620 Firefox/3.0b5",
+        "expect"  :
+        {
+            "architecture"  : "sparc"
+        }
+    },
+    {
+        "desc"    : "sparc64",
+        "ua"      : "ELinks (0.4.3; NetBSD 3.0.2PATCH sparc64; 141x19)",
+        "expect"  :
+        {
+            "architecture"  : "sparc64"
+        }
+    },
+    {
+        "desc"    : "QuickTime",
+        "ua"      : "QuickTime/7.5.6 (qtver=7.5.6;cpu=IA32;os=Mac 10.5.8)",
+        "expect"  : 
+        {
+            "architecture"  : "ia32"
+        }
+    },
+    {
+        "desc"    : "XBMC",
+        "ua"      : "XBMC/12.0 Git:20130127-fb595f2 (Windows NT 6.1;WOW64;Win64;x64; http://www.xbmc.org)",
+        "expect"  : 
+        {
+            "architecture"  : "amd64"
+        }
+    },
+    {
+        "desc"    : "IRIX64",
+        "ua"      : "Mozilla/4.8C-SGI [en] (X11; U; IRIX64 6.5 IP27",
+        "expect"  : 
+        {
+            "architecture"  : "irix64"
+        }
+    },
+    {
+        "desc"    : "68k",
+        "ua"      : "'Mozilla/1.1 (Macintosh; U; 68K)'",
+        "expect"  : 
+        {
+            "architecture"  : "68k"
+        }
+    }
+]

test/specs/engine-all.json

@@ -17,6 +17,15 @@
             "version" : "12.0"
         }
     },
+    {
+        "desc"    : "Flow",
+        "ua"      : "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_0) EkiohFlow/5.7.4.30559 Flow/5.7.4 (like Gecko Firefox/53.0 rv:53.0)",
+        "expect"  :
+        {
+            "name"    : "Flow",
+            "version" : "5.7.4.30559"
+        }
+    },
     {
         "desc"    : "Gecko",
         "ua"      : "Mozilla/5.0 (X11; Linux x86_64; rv:2.0b9pre) Gecko/20110111 Firefox/4.0b9pre",
@@ -44,6 +53,15 @@
             "version" : "4.5.4"
         }
     },
+    {
+        "desc"    : "LibWeb",
+        "ua"      : "Mozilla/4.0 (SerenityOS; x86) LibWeb+LibJS (Not KHTML, nor Gecko) LibWeb",
+        "expect"  :
+        {
+            "name"    : "LibWeb",
+            "version" : "undefined"
+        }
+    },
     {
         "desc"    : "NetFront",
         "ua"      : "Mozilla/4.0 (PDA; Windows CE/1.0.1) NetFront/3.0",
@@ -97,5 +115,50 @@
             "name"    : "WebKit",
             "version" : "537.36"
         }
+    },
+    {
+        "desc"    : "WebOS TV 5.x",
+        "ua"      : "Mozilla/5.0 (Web0S; Linux/SmartTV) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/68.0.3440.106 Safari/537.36 WebAppManager",
+        "expect"  :
+        {
+            "name"    : "Blink",
+            "version" : "68.0.3440.106"
+        }
+    },
+    {
+        "desc"    : "WebOS TV 4.x",
+        "ua"      : "Mozilla/5.0 (Web0S; Linux/SmartTV) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/53.0.2785.34 Safari/537.36 WebAppManager",
+        "expect"  :
+        {
+            "name"    : "Blink",
+            "version" : "53.0.2785.34"
+        }
+    },
+    {
+        "desc"    : "WebOS TV 3.x",
+        "ua"      : "Mozilla/5.0 (Web0S; Linux/SmartTV) AppleWebKit/537.36 (KHTML, like Gecko) QtWebEngine/5.2.1 Chrome/38.0.2125.122 Safari/537.36 WebAppManager",
+        "expect"  :
+        {
+            "name"    : "Blink",
+            "version" : "38.0.2125.122"
+        }
+    },
+    {
+        "desc"    : "WebOS TV 2.x",
+        "ua"      : "Mozilla/5.0 (Web0S; Linux/SmartTV) AppleWebKit/538.2 (KHTML, like Gecko) Large Screen WebAppManager Safari/538.2",
+        "expect"  :
+        {
+            "name"    : "WebKit",
+            "version" : "538.2"
+        }
+    },
+    {
+        "desc"    : "WebOS TV 1.x",
+        "ua"      : "Mozilla/5.0 (Web0S; Linux/SmartTV) AppleWebKit/537.41 (KHTML, like Gecko) Large Screen WebAppManager Safari/537.41",
+        "expect"  :
+        {
+            "name"    : "WebKit",
+            "version" : "537.41"
+        }
     }
 ]

test/specs/extension-device.json

@@ -0,0 +1,342 @@
+[{
+    "desc": "Essential PH-1",
+    "ua": "Mozilla/5.0 (Linux; Android 9; PH-1 Build/PPR1.180905.036) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/69.0.3497.86 Mobile Safari/537.36",
+    "expect": {
+        "vendor": "Essential",
+        "model": "PH-1",
+        "type": "mobile"
+    }
+},
+{
+    "desc": "Gigaset Tablet",
+    "ua": "Mozilla/5.0 (Linux; Android 4.2.2; Gigaset QV830 Build/JDQ39) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Safari/537.36",
+    "expect": {
+        "vendor": "Gigaset",
+        "model": "QV830",
+        "type": "tablet"
+    }
+},
+{
+    "desc": "RCA Voyager III Tablet",
+    "ua": "Mozilla/5.0 (Linux; Android 6.0.1; RCT6973W43 Build/MMB29M) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Safari/537.36",
+    "expect": {
+        "vendor": "RCA",
+        "model": "RCT6973W43",
+        "type": "tablet"
+    }
+},
+{
+    "desc": "RCA Voyager II Tablet",
+    "ua": "Mozilla/5.0 (Linux; Android 5.0; RCT6773W22B Build/LRX21M) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Safari/537.36",
+    "expect": {
+        "vendor": "RCA",
+        "model": "RCT6773W22B",
+        "type": "tablet"
+    }
+},
+{
+    "desc": "Verizon Quanta Tablet",
+    "ua": "Mozilla/5.0 (Linux; Android 4.4.2; QMV7B Build/KOT49H) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Safari/537.36",
+    "expect": {
+        "vendor": "Verizon",
+        "model": "QMV7B",
+        "type": "tablet"
+    }
+},
+{
+    "desc": "Verizon Ellipsis 8 Tablet",
+    "ua": "Mozilla/5.0 (Linux; Android 5.1.1; QTAQZ3 Build/LMY47V) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Safari/537.36",
+    "expect": {
+        "vendor": "Verizon",
+        "model": "QTAQZ3",
+        "type": "tablet"
+    }
+},
+{
+    "desc": "Verizon Ellipsis 8HD Tablet",
+    "ua": "Mozilla/5.0 (Linux; Android 6.0.1; QTASUN1 Build/MMB29M) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/51.0.2704.81 Safari/537.36",
+    "expect": {
+        "vendor": "Verizon",
+        "model": "QTASUN1",
+        "type": "tablet"
+    }
+},
+{
+    "desc": "Dell Venue 8 Tablet",
+    "ua": "Mozilla/5.0 (Linux; Android 4.4.2; Venue 8 3830 Build/KOT49H) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Safari/537.36",
+    "expect": {
+        "vendor": "Dell",
+        "model": "Venue 8 3830",
+        "type": "tablet"
+    }
+},
+{
+    "desc": "Dell Venue 7 Tablet",
+    "ua": "Mozilla/5.0 (Linux; Android 4.4.2; Venue 7 3730 Build/KOT49H) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Safari/537.36",
+    "expect": {
+        "vendor": "Dell",
+        "model": "Venue 7 3730",
+        "type": "tablet"
+    }
+},
+{
+    "desc": "Barnes & Noble Nook HD+ Tablet",
+    "ua": "Mozilla/5.0 (Linux; U; Android 4.1.2; en-us; Barnes & Noble Nook HD+ Build/JZO54K; CyanogenMod-10) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Mobile Safari/534.30",
+    "expect": {
+        "vendor": "Barnes & Noble",
+        "model": "Nook HD+",
+        "type": "tablet"
+    }
+},
+{
+    "desc": "Barnes & Noble V400 Tablet",
+    "ua": "Mozilla/5.0 (Linux; Android 4.0.4; BNTV400 Build/IMM76L) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/42.0.2311.111 Safari/537.36",
+    "expect": {
+        "vendor": "Barnes & Noble",
+        "model": "V400",
+        "type": "tablet"
+    }
+},
+{
+    "desc": "NuVision TM101A540N Tablet",
+    "ua": "Mozilla/5.0 (Linux; Android 5.1; TM101A540N Build/LMY47I; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/50.0.2661.86 Safari/537.36",
+    "expect": {
+        "vendor": "NuVision",
+        "model": "TM101A540N",
+        "type": "tablet"
+    }
+},
+{
+    "desc": "ZTE-Z431",
+    "ua": "ZTE-Z431/1.4.0 NetFront/4.2 QTV5.1 Profile/MIDP-2.1 Configuration/CLDC-1.1",
+    "expect": {
+        "vendor": "ZTE",
+        "model": "Z431",
+        "type": "mobile"
+    }
+},
+{
+    "desc": "ZTE",
+    "ua": "Mozilla/5.0 (Linux; U; Android 4.1.2; en-us; ZTE-Z740G Build/JZO54K) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Mobile Safari/534.30",
+    "expect": {
+        "vendor": "ZTE",
+        "model": "Z740G",
+        "type": "mobile"
+    }
+},
+{
+    "desc": "ZTE K Series Tablet",
+    "ua": "Mozilla/5.0 (Linux; Android 6.0.1; K88 Build/MMB29M) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Safari/537.36",
+    "expect": {
+        "vendor": "ZTE",
+        "model": "K88",
+        "type": "tablet"
+    }
+},
+{
+    "desc": "ZTE Nubia Red Magic 3",
+    "ua": "Mozilla/5.0 (Linux; Android 9; NX629J Build/PKQ1.190321.001; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/66.0.3359.126 MQQBrowser/6.2 TBS/45016 Mobile Safari/537.36 MMWEBID/4064 MicroMessenger/7.0.10.1580(0x27000A34) Process/tools NetType/WIFI Language/zh_CN ABI/arm64",
+    "expect": {
+        "vendor": "ZTE",
+        "model": "NX629J",
+        "type": "mobile"
+    }
+},
+{
+    "desc": "ZTE Blade A5",
+    "ua": "Mozilla/5.0 (Linux; Android 9; ZTE Blade A5 2019) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/79.0.3945.116 Mobile Safari/537.36",
+    "expect": {
+        "vendor": "ZTE",
+        "model": "Blade A5 2019",
+        "type": "mobile"
+    }
+},
+{
+    "desc": "ZTE BLADE V0730",
+    "ua": "Mozilla/5.0 (Linux; Android 6.0; ZTE BLADE V0730) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/79.0.3945.116 Mobile Safari/537.36",
+    "expect": {
+        "vendor": "ZTE",
+        "model": "BLADE V0730",
+        "type": "mobile"
+    }
+},
+{
+    "desc": "ZTE B2017G",
+    "ua": "Mozilla/5.0 (Linux; Android 7.1.1; ZTE B2017G) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/79.0.3945.93 Mobile Safari/537.36",
+    "expect": {
+        "vendor": "ZTE",
+        "model": "B2017G",
+        "type": "mobile"
+    }
+},
+{
+    "desc": "Swizz GEN610",
+    "ua": "Mozilla/5.0 (Linux; Android 4.4.2; GEN610 Build/KOT49H) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/47.0.2526.83 Mobile Safari/537.36",
+    "expect": {
+        "vendor": "Swiss",
+        "model": "GEN610",
+        "type": "mobile"
+    }
+},
+{
+    "desc": "Swizz ZUR700",
+    "ua": "Mozilla/5.0 (Linux; Android 4.4.2; ZUR700 Build/KVT49L) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/41.0.2272.96 Safari/537.36",
+    "expect": {
+        "vendor": "Swiss",
+        "model": "ZUR700",
+        "type": "tablet"
+    }
+},
+{
+    "desc": "Zeki TB782b Tablet",
+    "ua": "Mozilla/5.0 (Linux; U; Android 4.0.4; en-US; TB782B Build/IMM76D) AppleWebKit/534.31 (KHTML, like Gecko) UCBrowser/9.0.2.299 U3/0.8.0 Mobile Safari/534.31",
+    "expect": {
+        "vendor": "Zeki",
+        "model": "TB782B",
+        "type": "tablet"
+    }
+},
+{
+    "desc": "Dragon Touch Tablet",
+    "ua": "Mozilla/5.0 (Linux; Android 4.0.4; DT9138B Build/IMM76D) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/29.0.1547.72 Mobile Safari/537.36",
+    "expect": {
+        "vendor": "Dragon Touch",
+        "model": "9138B",
+        "type": "tablet"
+    }
+},
+{
+    "desc": "Insignia Tablet",
+    "ua": "Mozilla/5.0 (Linux; U; Android 6.0.1; NS-P08A7100 Build/MMB29M; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/56.0.2924.87 Safari/537.36",
+    "expect": {
+        "vendor": "Insignia",
+        "model": "NS-P08A7100",
+        "type": "tablet"
+    }
+},
+{
+    "desc": "Voice Xtreme V75",
+    "ua": "Mozilla/5.0 (Linux; U; Android 4.2.1; en-us; V75 Build/JOP40D) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Mobile Safari/534.30",
+    "expect": {
+        "vendor": "Voice",
+        "model": "V75",
+        "type": "mobile"
+    }
+},
+{
+    "desc": "LvTel V11",
+    "ua": "Mozilla/5.0 (Linux; Android 5.1.1; V11 Build/LMY47V) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/39.0.0.0 Safari/537.36",
+    "expect": {
+        "vendor": "LvTel",
+        "model": "V11",
+        "type": "mobile"
+    }
+},
+{
+    "desc": "Envizen Tablet V100MD",
+    "ua": "Mozilla/5.0 (Linux; U; Android 4.1.1; en-us; V100MD Build/V100MD.20130816) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Safari/534.30",
+    "expect": {
+        "vendor": "Envizen",
+        "model": "V100MD",
+        "type": "tablet"
+    }
+},
+{
+    "desc": "Rotor Tablet",
+    "ua": "mozilla/5.0 (linux; android 5.0.1; tu_1491 build/lrx22c) applewebkit/537.36 (khtml, like gecko) chrome/43.0.2357.93 safari/537.36",
+    "expect": {
+        "vendor": "Rotor",
+        "model": "1491",
+        "type": "tablet"
+    }
+},
+{
+    "desc": "MachSpeed Tablets",
+    "ua": "Mozilla/5.0 (Linux; Android 4.4.2; Trio 7.85 vQ Build/Trio_7.85_vQ) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/30.0.0.0 Safari/537.36",
+    "expect": {
+        "vendor": "MachSpeed",
+        "model": "Trio 7.85 vQ",
+        "type": "tablet"
+    }
+},
+{
+    "desc": "Trinity Tablets",
+    "ua": "Mozilla/5.0 (Linux; Android 5.0.1; Trinity T101 Build/LRX22C) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/47.0.2526.83 Safari/537.36",
+    "expect": {
+        "vendor": "Trinity",
+        "model": "T101",
+        "type": "tablet"
+    }
+},
+{
+    "desc": "NextBook Next7",
+    "ua": "Mozilla/5.0 (Linux; U; Android 4.0.4; en-us; Next7P12 Build/IMM76I) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Safari/534.30",
+    "expect": {
+        "vendor": "NextBook",
+        "model": "Next7P12",
+        "type": "tablet"
+    }
+},
+{
+    "desc": "NextBook Tablets",
+    "ua": "Mozilla/5.0 (Linux; Android 5.0; NXA8QC116 Build/LRX21V) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Safari/537.36",
+    "expect": {
+        "vendor": "NextBook",
+        "model": "NXA8QC116",
+        "type": "tablet"
+    }
+},
+{
+    "desc": "Le Pan Tablets",
+    "ua": "Mozilla/5.0 (Linux; Android 4.2.2; Le Pan TC802A Build/JDQ39) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Safari/537.36",
+    "expect": {
+        "vendor": "Le Pan",
+        "model": "TC802A",
+        "type": "tablet"
+    }
+},
+{
+    "desc": "Le Pan Tablets",
+    "ua": "Mozilla/5.0 (Linux; Android 4.2.2; Le Pan TC802A Build/JDQ39) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Safari/537.36",
+    "expect": {
+        "vendor": "Le Pan",
+        "model": "TC802A",
+        "type": "tablet"
+    }
+},
+{
+    "desc": "AT&T Radiant Core U304AA",
+    "ua": "Dalvik/2.1.0 (Linux; U; Android 9; U304AA Build/P00610)",
+    "expect": {
+        "vendor": "AT&T",
+        "model": "U304AA",
+        "type": "mobile"
+    }
+},
+{
+    "desc": "Vodafone Smart Tab 4G",
+    "ua": "Mozilla/5.0 (Linux; Android 4.4.4; Vodafone Smart Tab 4G) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/81.0.4044.138 Safari/537.36",
+    "expect": {
+        "vendor": "Vodafone",
+        "model": "Smart Tab 4G",
+        "type": "tablet"
+    }
+},
+{
+    "desc": "Vodafone Smart ultra 6",
+    "ua": "Mozilla/5.0 (Linux; Android 5.0.2; Vodafone Smart ultra 6 Build/LRX22G) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/44.0.2403.133 Mobile Safari/537.36",
+    "expect": {
+        "vendor": "Vodafone",
+        "model": "Smart ultra 6",
+        "type": "tablet"
+    }
+},
+{
+    "desc": "4ife 4K Smart TV Box",
+    "ua": "Mozilla/5.0 (Linux; Android 4.4.2; 4ife 4K Smart TV Box Build/KOT49H) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/30.0.0.0 Safari/537.36 Vinebre",
+    "expect": {
+        "vendor": "undefined",
+        "model": "undefined",
+        "type": "smarttv"
+    }
+}]

test/test.js

@@ -1,113 +0,0 @@
-var assert      = require('assert');
-var requirejs   = require('requirejs');
-var UAParser    = require('./../src/ua-parser');
-var browsers    = require('./browser-test.json');
-var cpus        = require('./cpu-test.json');
-var devices     = require('./device-test.json');
-var engines     = require('./engine-test.json');
-var os          = require('./os-test.json');
-var parser      = new UAParser();
-var methods     = [
-    {
-        title       : 'getBrowser',
-        label       : 'browser',
-        list        : browsers,
-        properties  : ['name', 'major', 'version']
-    },
-    {
-        title       : 'getCPU',
-        label       : 'cpu',
-        list        : cpus,
-        properties  : ['architecture']
-    },
-    {
-        title       : 'getDevice',
-        label       : 'device',
-        list        : devices,
-        properties  : ['model', 'type', 'vendor']
-    },
-    {
-        title       : 'getEngine',
-        label       : 'engine',
-        list        : engines,
-        properties  : ['name', 'version']
-    },
-    {
-        title       : 'getOS',
-        label       : 'os',
-        list        : os,
-        properties  : ['name', 'version']
-}];
-
-describe('UAParser()', function () {
-    var ua = 'Mozilla/5.0 (Windows NT 6.2) AppleWebKit/536.6 (KHTML, like Gecko) Chrome/20.0.1090.0 Safari/536.6';
-    assert.deepEqual(UAParser(ua), new UAParser().setUA(ua).getResult());
-});
-
-for (var i in methods) {
-    describe(methods[i]['title'], function () {
-        for (var j in methods[i]['list']) {
-            if (!!methods[i]['list'][j].ua) {
-                describe('[' + methods[i]['list'][j].desc + ']', function () {
-                    describe('"' + methods[i]['list'][j].ua + '"', function () {
-                        var expect = methods[i]['list'][j].expect;
-                        var result = parser.setUA(methods[i]['list'][j].ua).getResult()[methods[i]['label']];
-
-                        methods[i]['properties'].forEach(function(m) {
-                            it('should return ' + methods[i]['label'] + ' ' + m + ': ' + expect[m], function () {
-                                assert.equal(result[m], expect[m] != 'undefined' ? expect[m] : undefined);
-                            });
-                        });
-                    });
-                });
-            }
-        }
-    });
-}
-
-describe('Returns', function () {
-    it('getResult() should returns JSON', function(done) {
-        assert.deepEqual(new UAParser('').getResult(), 
-            {
-                ua : '',
-                browser: { name: undefined, version: undefined, major: undefined },
-                cpu: { architecture: undefined },
-                device: { vendor: undefined, model: undefined, type: undefined },
-                engine: { name: undefined, version: undefined},
-                os: { name: undefined, version: undefined }
-        });
-        done();
-    });
-});
-
-describe('Extending Regex', function () {
-    var uaString = 'Mozilla/5.0 MyOwnBrowser/1.3';
-    var myOwnBrowser = [[/(myownbrowser)\/((\d+)?[\w\.]+)/i], [UAParser.BROWSER.NAME, UAParser.BROWSER.VERSION, UAParser.BROWSER.MAJOR]];
-
-    var parser1 = new UAParser(uaString, {browser: myOwnBrowser});
-    assert.equal(parser1.getBrowser().name, 'MyOwnBrowser');
-    assert.equal(parser1.getBrowser().version, '1.3');
-    assert.equal(parser1.getBrowser().major, '1');
-
-    var parser2 = new UAParser({browser: myOwnBrowser});
-    assert.equal(parser2.getBrowser().name, undefined);
-    parser2.setUA(uaString);
-    assert.equal(parser2.getBrowser().name, 'MyOwnBrowser');
-    assert.equal(parser1.getBrowser().version, '1.3');
-});
-
-describe('Using Require.js', function () {
-    it('should loaded automatically', function(done) {
-        requirejs.config({
-            baseUrl : 'dist',
-            paths   : {
-                'ua-parser-js' : 'ua-parser.min'
-            }
-        });
-        requirejs(['ua-parser-js'], function(ua) {
-            var parser = new ua('Dillo/1.0');
-            assert.deepEqual(parser.getBrowser().name, 'Dillo');
-            done();
-        });
-    });
-});