Update 2.0.0-beta.3-pro-business

Merge with 2.0.0-beta.2-pro-personal

.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]

.jshintrc

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

.npmrc

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

.travis.yml

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

CHANGELOG.md

@@ -0,0 +1,148 @@
+# 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.3
+
+- Breaking:
+  - AR/VR devices moved to new device type: `xr`
+  - New property in `browser`: `type`
+  - In `ua-parser-js/extensions` submodule, `bots` divided into `crawler` / `fetcher` 
+- New features:
+  - Parse directly from command line using `npx ua-parser-js`
+  - Extensions can be passed as a list to `UAParser()`
+- Add new browser: Pico Browser, Twitter, Wolvic
+- Improve browser detection: DuckDuckGo, ICEBrowser, Klar, QQ, Sleipnir
+- Improve device detection: Oculus Quest & Oppo Pad
+- Update latest client hints spec: `formFactor` -> `formFactors`
+
+## 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,71 @@
+# UAPARSER.JS PRO BUSINESS LICENSE
+
+Version 2, July 2024
+
+Copyright (C) 2023-2024 Faisal Salman <f+ua-parser-js@faisalman.com>
+
+---
+
+## Definitions
+
+"We" are the team behind UAParser.js.
+
+"You" are the individual, organization, or company who is responsible for purchasing this license.
+
+"The Code" is UAParser.js.
+
+"Project" is what you built with The Code.
+
+---
+
+## License
+
+We retain all title, intellectual property, and ownership rights to The Code.
+
+The Code is licensed, not sold, to You for use solely subject to the terms and conditions detailed here.
+
+We grant You (and only You) a limited, non-exclusive, non-transferable, non-sublicensable, royalty-free right to use, copy, and modify The Code.
+
+This license is only valid for You as one (1) individual, organization, or company and cannot be transferred to another individual, organization, or company.
+
+---
+
+## Rights
+
+You may use and modify The Code only in one (1) Project. If you use it in more than one (1) Project, you must purchase another license.
+
+If You transfer a Project to a client, the use of The Code must be limited to the original functionality that You created for them. The Code must not be extracted, reproduced, or used in any other way. You must inform your client of this condition.
+
+You have the right to receive lifetime updates and one (1) year of support, starting from the time you make the purchase.
+
+---
+
+## Restrictions
+
+You may not redistribute The Code, as-is or modified, except as a part of a Project that you made.
+
+You may not deliver a Project that contains The Code as an open-source Project that might be used for commercial purposes by 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 right to discontinue the lifetime updates for The Code at any time, with or without notice.
+
+We offer support only for questions within the scope of The Code's functionality or related issues at our sole discretion.
+
+---
+
+## Termination
+
+This license is effective indefinitely but can be revoked at any time if there is a violation of 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.dev"><img src="https://raw.githubusercontent.com/faisalman/ua-parser-js/gh-pages/images/uap-header.png"></a>
+</p>
+
+# UAParser.js
+
+Thank you for purchasing UAParser.js PRO Business License, if you haven't please order here: https://store.faisalman.com
+
+# Download
+
+```sh
+npm install @ua-parser-js/pro-business
+```
+
+# Documentation
+
+https://docs.uaparser.dev 
+
+# License
+
+UAParser.js PRO Business
+
+Copyright (c) 2012-2024 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.8.1",
-  "authors": [
-    "Faisal Salman <f@faisalman.com>"
-  ],
-  "private": false,
-  "main": "src/ua-parser.js",
-  "ignore": [
-    "build",
-    "node_modules",
-    "bower_components",
-    "test",
-    "tests"
-  ],
-  "dependencies": {}
-}

changelog.md

@@ -1,3 +0,0 @@
-# UAParser.js Changelog
-
-## Version 0.8.0

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

readme.md

@@ -1,308 +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      : https://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, Electron, Epiphany, Facebook, Falkon, Fennec, Firebird,
-Firefox [Reality], Flock, Flow, GSA, GoBrowser, ICE Browser, IE, IEMobile, IceApe, 
-IceCat, IceDragon, Iceweasel, Instagram, Iridium, Iron, Jasmine, K-Meleon,
-Kindle, Klar, Konqueror, LBBROWSER, Line, Links, Lunascape, Lynx, MIUI Browser,
-Maemo Browser, Maemo, Maxthon, MetaSr Midori, Minimo, Mobile Safari, Mosaic,
-Mozilla, NetFront, NetSurf, Netfront, Netscape, NokiaBrowser, Obigo, Oculus Browser,
-OmniWeb, Opera Coast, Opera [Mini/Mobi/Tablet], PaleMoon, PhantomJS, Phoenix, 
-Polaris, Puffin, QQ, QQBrowser, QQBrowserLite, Quark, QupZilla, RockMelt, Safari, 
-Sailfish Browser, Samsung Browser, SeaMonkey, Silk, Skyfire, Sleipnir, Slim, 
-SlimBrowser, Swiftfox, Tesla, Tizen Browser, UCBrowser, UP.Browser, 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, AT&T, BenQ, BlackBerry, Dell,
-Essential, Fairphone, GeeksPhone, Google, HP, HTC, Huawei, Jolla, Lenovo, LG, 
-Meizu, Microsoft, Motorola, Nexian, Nintendo, Nokia, Nvidia, OnePlus, OPPO, Ouya,
-Palm, Panasonic, Pebble, Polytron, Realme, RIM, Roku, Samsung, Sharp, Siemens,
-Sony[Ericsson], Sprint, Tesla, Vivo, Vodafone, Xbox, Xiaomi, Zebra, ZTE, ...
-
-# 'device.model' determined dynamically
-```
-
-* `getEngine()`
-    * returns `{ name: '', version: '' }`
-
-```sh
-# Possible 'engine.name'
-Amaya, Blink, EdgeHTML, Flow, Gecko, Goanna, iCab, KHTML, Links, Lynx, NetFront,
-NetSurf, Presto, Tasman, Trident, w3m, WebKit
-
-# 'engine.version' determined dynamically
-```
-
-* `getOS()`
-    * returns `{ name: '', version: '' }`
-
-```sh
-# Possible 'os.name'
-AIX, Amiga OS, Android[-x86], Arch, Bada, BeOS, BlackBerry, CentOS, Chromium OS,
-Contiki, Fedora, Firefox OS, FreeBSD, Debian, Deepin, DragonFly, elementary OS, 
-Fuchsia, Gentoo, GhostBSD, GNU, Haiku, HP-UX, Hurd, iOS, Joli, KaiOS, Linpus, Linspire,
-Linux, Mac OS, Maemo, Mageia, Mandriva, Manjaro, MeeGo, Minix, Mint, Morph OS, NetBSD,
-Nintendo, OpenBSD, OpenVMS, OS/2, Palm, PC-BSD, PCLinuxOS, Plan9, PlayStation, QNX, 
-Raspbian, RedHat, RIM Tablet OS, RISC OS, Sabayon, 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/hf], 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/cli.js

@@ -0,0 +1,4 @@
+#!/usr/bin/env node
+
+const UAParser = require('ua-parser-js');
+console.log(JSON.stringify(process.argv.slice(2).map(ua => UAParser(ua)), null, 4));

script/test-all.sh

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

security.md

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

src/enums/ua-parser-enums.js

@@ -0,0 +1,363 @@
+///////////////////////////////////////////////
+/*  Enums for UAParser.js v2.0.0-beta.3
+    https://github.com/faisalman/ua-parser-js
+    Author: Faisal Salman <f@faisalman.com>
+    UAParser.js PRO Business License */
+//////////////////////////////////////////////
+
+/*jshint esversion: 6 */ 
+
+const Browser = Object.freeze({
+    _2345_EXPLORER: '2345Explorer',
+    _360: '360 Browser',
+    ALIPAY: 'Alipay',
+    AMAYA: 'Amaya',
+    ANDROID: 'Android Browser',
+    ARORA: 'Arora',
+    AVANT: 'Avant',
+    AVAST: 'Avast Secure Browser',
+    AVG: 'AVG Secure Browser',
+    BAIDU: 'Baidu Browser',
+    BASILISK: 'Basilisk',
+    BLAZER: 'Blazer',
+    BOLT: 'Bolt',
+    BOWSER: 'Bowser',
+    BRAVE: 'Brave',
+    CAMINO: 'Camino',
+    CHIMERA: 'Chimera',
+    CHROME: 'Chrome',
+    CHROME_HEADLESS: 'Chrome Headless',
+    CHROME_MOBILE: 'Mobile Chrome',
+    CHROME_WEBVIEW: 'Chrome WebView',
+    CHROMIUM: 'Chromium',
+    COBALT: 'Cobalt',
+    COC_COC: 'Coc Coc',
+    COMODO_DRAGON: 'Comodo Dragon',
+    CONKEROR: 'Conkeror',
+    DILLO: 'Dillo',
+    DOLPHIN: 'Dolphin',
+    DORIS: 'Doris',
+    DUCKDUCKGO: 'DuckDuckGo',
+    EDGE: 'Edge',
+    EPIPHANY: 'Epiphany',
+    FACEBOOK: 'Facebook',
+    FALKON: 'Falkon',
+    FIREBIRD: 'Firebird',
+    FIREFOX: 'Firefox',
+    FIREFOX_FOCUS: 'Firefox Focus',
+    FIREFOX_MOBILE: 'Mobile Firefox',
+    FIREFOX_REALITY: 'Firefox Reality',
+    FENNEC: 'Fennec',
+    FLOCK: 'Flock',
+    FLOW: 'Flow',
+    GO: 'GoBrowser',
+    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',
+    PICOBROWSER: 'Pico Browser',
+    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',
+    TWITTER: 'Twitter',
+    UC: 'UCBrowser',
+    UP: 'UP.Browser',
+    VIVALDI: 'Vivaldi',
+    VIVO: 'Vivo Browser',
+    W3M: 'w3m',
+    WATERFOX: 'Waterfox',
+    WEBKIT: 'WebKit',
+    WECHAT: 'WeChat',
+    WEIBO: 'Weibo',
+    WHALE: 'Whale',
+    WOLVIC: 'Wolvic',
+    YANDEX: 'Yandex'
+
+    // TODO : test!
+});
+
+const BrowserType = Object.freeze({
+    CRAWLER: 'crawler',
+    CLI: 'cli',
+    EMAIL: 'email',
+    FETCHER: 'fetcher',
+    INAPP: 'inapp',
+    MODULE: 'module'
+});
+
+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',
+    XR: 'xr'
+});
+
+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,
+    BrowserType, 
+    CPU, 
+    Device, 
+    Vendor,
+    Engine,
+    OS
+};

src/enums/ua-parser-enums.mjs

@@ -0,0 +1,367 @@
+// 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.3
+    https://github.com/faisalman/ua-parser-js
+    Author: Faisal Salman <f@faisalman.com>
+    UAParser.js PRO Business License */
+//////////////////////////////////////////////
+
+/*jshint esversion: 6 */ 
+
+const Browser = Object.freeze({
+    _2345_EXPLORER: '2345Explorer',
+    _360: '360 Browser',
+    ALIPAY: 'Alipay',
+    AMAYA: 'Amaya',
+    ANDROID: 'Android Browser',
+    ARORA: 'Arora',
+    AVANT: 'Avant',
+    AVAST: 'Avast Secure Browser',
+    AVG: 'AVG Secure Browser',
+    BAIDU: 'Baidu Browser',
+    BASILISK: 'Basilisk',
+    BLAZER: 'Blazer',
+    BOLT: 'Bolt',
+    BOWSER: 'Bowser',
+    BRAVE: 'Brave',
+    CAMINO: 'Camino',
+    CHIMERA: 'Chimera',
+    CHROME: 'Chrome',
+    CHROME_HEADLESS: 'Chrome Headless',
+    CHROME_MOBILE: 'Mobile Chrome',
+    CHROME_WEBVIEW: 'Chrome WebView',
+    CHROMIUM: 'Chromium',
+    COBALT: 'Cobalt',
+    COC_COC: 'Coc Coc',
+    COMODO_DRAGON: 'Comodo Dragon',
+    CONKEROR: 'Conkeror',
+    DILLO: 'Dillo',
+    DOLPHIN: 'Dolphin',
+    DORIS: 'Doris',
+    DUCKDUCKGO: 'DuckDuckGo',
+    EDGE: 'Edge',
+    EPIPHANY: 'Epiphany',
+    FACEBOOK: 'Facebook',
+    FALKON: 'Falkon',
+    FIREBIRD: 'Firebird',
+    FIREFOX: 'Firefox',
+    FIREFOX_FOCUS: 'Firefox Focus',
+    FIREFOX_MOBILE: 'Mobile Firefox',
+    FIREFOX_REALITY: 'Firefox Reality',
+    FENNEC: 'Fennec',
+    FLOCK: 'Flock',
+    FLOW: 'Flow',
+    GO: 'GoBrowser',
+    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',
+    PICOBROWSER: 'Pico Browser',
+    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',
+    TWITTER: 'Twitter',
+    UC: 'UCBrowser',
+    UP: 'UP.Browser',
+    VIVALDI: 'Vivaldi',
+    VIVO: 'Vivo Browser',
+    W3M: 'w3m',
+    WATERFOX: 'Waterfox',
+    WEBKIT: 'WebKit',
+    WECHAT: 'WeChat',
+    WEIBO: 'Weibo',
+    WHALE: 'Whale',
+    WOLVIC: 'Wolvic',
+    YANDEX: 'Yandex'
+
+    // TODO : test!
+});
+
+const BrowserType = Object.freeze({
+    CRAWLER: 'crawler',
+    CLI: 'cli',
+    EMAIL: 'email',
+    FETCHER: 'fetcher',
+    INAPP: 'inapp',
+    MODULE: 'module'
+});
+
+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',
+    XR: 'xr'
+});
+
+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,
+    BrowserType, 
+    CPU, 
+    Device, 
+    Vendor,
+    Engine,
+    OS
+};

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

@@ -0,0 +1,14 @@
+// Type definitions for Helpers submodule of UAParser.js v2.0.0-beta.3
+// 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 CLIs: UAParserExt;
+export const Crawlers: UAParserExt;
+export const ExtraDevices: UAParserExt;
+export const Emails: UAParserExt;
+export const Fetchers: UAParserExt;
+export const InApps: UAParserExt;
+export const MediaPlayers: UAParserExt;
+export const Modules: UAParserExt;

src/extensions/ua-parser-extensions.js

@@ -0,0 +1,344 @@
+///////////////////////////////////////////////
+/*  Extensions for UAParser.js v2.0.0-beta.3
+    https://github.com/faisalman/ua-parser-js
+    Author: Faisal Salman <f@faisalman.com>
+    UAParser.js PRO Business License */
+//////////////////////////////////////////////
+
+/*jshint esversion: 6 */ 
+
+const MODEL     = 'model';
+const NAME      = 'name';
+const TYPE      = 'type';
+const VENDOR    = 'vendor';
+const VERSION   = 'version';
+const MOBILE    = 'mobile';
+const TABLET    = 'tablet';
+const CRAWLER   = 'crawler';
+const CLI       = 'cli';
+const EMAIL     = 'email';
+const FETCHER   = 'fetcher';
+const INAPP     = 'inapp';
+const MODULE    = 'module';
+
+//////////////////////
+// COMMAND LINE APPS
+/////////////////////
+
+const CLIs = Object.freeze({
+    browser : [
+        // wget / curl / lynx
+        [/(wget|curl|lynx)[\/ ]([\w\.]+)/i], [NAME, VERSION, [TYPE, CLI]]
+    ]
+});
+
+////////////////////////
+// CRAWLERS / SPIDERS
+///////////////////////
+
+const Crawlers = Object.freeze({
+    browser : [
+        // Amazonbot - https://developer.amazon.com/amazonbot
+        // Applebot - http://apple.com/go/applebot
+        // Bingbot - http://www.bing.com/bingbot.htm
+        // DuckDuckBot - http://duckduckgo.com/duckduckbot.html
+        // FacebookBot - https://developers.facebook.com/docs/sharing/bot/
+        // GPTBot - https://platform.openai.com/docs/gptbot
+        [/((?:amazon|apple|bing|duckduck|facebook|gpt)bot)\/([\w\.]+)/i], 
+        [NAME, VERSION, [TYPE, CRAWLER]],
+
+        // Baiduspider https://help.baidu.com/question?prod_id=99&class=0&id=3001
+        [/(baiduspider)[-imagevdonsfcpr]{0,6}\/([\w\.]+)/i], 
+        [NAME, VERSION, [TYPE, CRAWLER]],
+
+        // Bytespider
+        // Yahoo! Slurp - http://help.yahoo.com/help/us/ysearch/slurp
+        [/((?:bytespider|(?=yahoo! )slurp))/i], 
+        [NAME, [TYPE, CRAWLER]],
+
+        // ClaudeBot
+        [/(claude(?:bot|-web))\/([\w\.]+)/i], 
+        [NAME, VERSION, [TYPE, CRAWLER]],
+
+        // Googlebot - http://www.google.com/bot.html
+        [
+            /(google(?:bot|other)(?:-image|-video|-news|-extended)?|(?:storebot-)?google(?:-inspectiontool)?)\/?([\w\.]*)/i
+        ], 
+        [NAME, VERSION, [TYPE, CRAWLER]],
+        
+        // Sogou Spider
+        [/(sogou (?:pic|head|web|orion|news) spider)\/([\w\.]+)/i], 
+        [NAME, VERSION, [TYPE, CRAWLER]],
+
+        // Yandex Bots - https://yandex.com/bots
+        [
+            /(yandex(?:(?:mobile)?(?:accessibility|additional|renderresources|screenshot|sprav)?bot|image(?:s|resizer)|video(?:parser)?|blogs|adnet|favicons|fordomain|market|media|metrika|news|ontodb(?:api)?|pagechecker|partner|rca|tracker|turbo|vertis|webmaster|antivirus))\/([\w\.]+)/i
+        ], 
+        [NAME, VERSION, [TYPE, CRAWLER]]
+    ]
+});
+
+//////////////////
+// EXTRA DEVICES
+/////////////////
+
+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]]
+    ]
+});
+
+///////////////
+// EMAIL APPS
+//////////////
+
+const Emails = Object.freeze({
+    browser : [
+        // Microsoft Outlook / Thunderbird
+        [/(microsoft outlook|thunderbird)[\s\/]([\w\.]+)/i], [NAME, VERSION, [TYPE, EMAIL]]
+    ]
+});
+
+///////////////////////
+// ON-DEMAND SCRAPERS
+//////////////////////
+
+const Fetchers = Object.freeze({
+    browser : [
+        // BingPreview / Mastodon / Pinterestbot / Redditbot / Telegrambot / Twitterbot
+        [/(bingpreview|mastodon|(?:discord|linkedin|pinterest|reddit|telegram|twitter)bot)\/([\w\.]+)/i], 
+        [NAME, VERSION, [TYPE, FETCHER]],
+
+        // Google Bots / Snapchat
+        [/(feedfetcher-google|google-read-aloud|(?=bot; )snapchat)/i], 
+        [NAME, [TYPE, FETCHER]],
+
+
+        // Slackbot - https://api.slack.com/robots
+        [/(slack(?:bot)?(?:-imgproxy|-linkexpanding)?) ([\w\.]+)/i], 
+        [NAME, VERSION, [TYPE, FETCHER]],
+
+        // WhatsApp
+        [/(whatsapp)\/([\w\.]+)[\/ ][ianw]/i], 
+        [NAME, VERSION, [TYPE, FETCHER]],
+
+        // Yandex Bots - https://yandex.com/bots
+        [
+            /(yandex(?:calendar|direct(?:dyn)?|searchshop)|yadirectfetcher)\/([\w\.]+)/i,
+            /(yandex(?:sitelinks|userproxy))/i
+        ], 
+        [NAME, VERSION, [TYPE, FETCHER]]
+    ]
+});
+
+////////////////////
+// IN-APP BROWSERS
+///////////////////
+
+const InApps = Object.freeze({
+    browser : [
+        [/chatlyio\/([\d\.]+)/i], [VERSION, 'Slack', [TYPE, INAPP]]
+    ]
+});
+
+//////////////////////
+// MEDIA PLAYER APPS
+/////////////////////
+
+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]
+    ]
+});
+
+////////////////////////
+// MODULES / LIBRARIES
+///////////////////////
+
+const Modules = Object.freeze({
+    browser : [
+        // Axios/jsdom/Scrapy
+        [/\b(axios|jsdom|scrapy)\/([\w\.]+)/i], [NAME, VERSION, [TYPE, MODULE]]
+    ]
+});
+
+module.exports = { 
+    CLIs,
+    Crawlers,
+    ExtraDevices,
+    Emails,
+    Fetchers,
+    InApps,
+    MediaPlayers,
+    Modules
+};

src/extensions/ua-parser-extensions.mjs

@@ -0,0 +1,348 @@
+// 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.3
+    https://github.com/faisalman/ua-parser-js
+    Author: Faisal Salman <f@faisalman.com>
+    UAParser.js PRO Business License */
+//////////////////////////////////////////////
+
+/*jshint esversion: 6 */ 
+
+const MODEL     = 'model';
+const NAME      = 'name';
+const TYPE      = 'type';
+const VENDOR    = 'vendor';
+const VERSION   = 'version';
+const MOBILE    = 'mobile';
+const TABLET    = 'tablet';
+const CRAWLER   = 'crawler';
+const CLI       = 'cli';
+const EMAIL     = 'email';
+const FETCHER   = 'fetcher';
+const INAPP     = 'inapp';
+const MODULE    = 'module';
+
+//////////////////////
+// COMMAND LINE APPS
+/////////////////////
+
+const CLIs = Object.freeze({
+    browser : [
+        // wget / curl / lynx
+        [/(wget|curl|lynx)[\/ ]([\w\.]+)/i], [NAME, VERSION, [TYPE, CLI]]
+    ]
+});
+
+////////////////////////
+// CRAWLERS / SPIDERS
+///////////////////////
+
+const Crawlers = Object.freeze({
+    browser : [
+        // Amazonbot - https://developer.amazon.com/amazonbot
+        // Applebot - http://apple.com/go/applebot
+        // Bingbot - http://www.bing.com/bingbot.htm
+        // DuckDuckBot - http://duckduckgo.com/duckduckbot.html
+        // FacebookBot - https://developers.facebook.com/docs/sharing/bot/
+        // GPTBot - https://platform.openai.com/docs/gptbot
+        [/((?:amazon|apple|bing|duckduck|facebook|gpt)bot)\/([\w\.]+)/i], 
+        [NAME, VERSION, [TYPE, CRAWLER]],
+
+        // Baiduspider https://help.baidu.com/question?prod_id=99&class=0&id=3001
+        [/(baiduspider)[-imagevdonsfcpr]{0,6}\/([\w\.]+)/i], 
+        [NAME, VERSION, [TYPE, CRAWLER]],
+
+        // Bytespider
+        // Yahoo! Slurp - http://help.yahoo.com/help/us/ysearch/slurp
+        [/((?:bytespider|(?=yahoo! )slurp))/i], 
+        [NAME, [TYPE, CRAWLER]],
+
+        // ClaudeBot
+        [/(claude(?:bot|-web))\/([\w\.]+)/i], 
+        [NAME, VERSION, [TYPE, CRAWLER]],
+
+        // Googlebot - http://www.google.com/bot.html
+        [
+            /(google(?:bot|other)(?:-image|-video|-news|-extended)?|(?:storebot-)?google(?:-inspectiontool)?)\/?([\w\.]*)/i
+        ], 
+        [NAME, VERSION, [TYPE, CRAWLER]],
+        
+        // Sogou Spider
+        [/(sogou (?:pic|head|web|orion|news) spider)\/([\w\.]+)/i], 
+        [NAME, VERSION, [TYPE, CRAWLER]],
+
+        // Yandex Bots - https://yandex.com/bots
+        [
+            /(yandex(?:(?:mobile)?(?:accessibility|additional|renderresources|screenshot|sprav)?bot|image(?:s|resizer)|video(?:parser)?|blogs|adnet|favicons|fordomain|market|media|metrika|news|ontodb(?:api)?|pagechecker|partner|rca|tracker|turbo|vertis|webmaster|antivirus))\/([\w\.]+)/i
+        ], 
+        [NAME, VERSION, [TYPE, CRAWLER]]
+    ]
+});
+
+//////////////////
+// EXTRA DEVICES
+/////////////////
+
+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]]
+    ]
+});
+
+///////////////
+// EMAIL APPS
+//////////////
+
+const Emails = Object.freeze({
+    browser : [
+        // Microsoft Outlook / Thunderbird
+        [/(microsoft outlook|thunderbird)[\s\/]([\w\.]+)/i], [NAME, VERSION, [TYPE, EMAIL]]
+    ]
+});
+
+///////////////////////
+// ON-DEMAND SCRAPERS
+//////////////////////
+
+const Fetchers = Object.freeze({
+    browser : [
+        // BingPreview / Mastodon / Pinterestbot / Redditbot / Telegrambot / Twitterbot
+        [/(bingpreview|mastodon|(?:discord|linkedin|pinterest|reddit|telegram|twitter)bot)\/([\w\.]+)/i], 
+        [NAME, VERSION, [TYPE, FETCHER]],
+
+        // Google Bots / Snapchat
+        [/(feedfetcher-google|google-read-aloud|(?=bot; )snapchat)/i], 
+        [NAME, [TYPE, FETCHER]],
+
+
+        // Slackbot - https://api.slack.com/robots
+        [/(slack(?:bot)?(?:-imgproxy|-linkexpanding)?) ([\w\.]+)/i], 
+        [NAME, VERSION, [TYPE, FETCHER]],
+
+        // WhatsApp
+        [/(whatsapp)\/([\w\.]+)[\/ ][ianw]/i], 
+        [NAME, VERSION, [TYPE, FETCHER]],
+
+        // Yandex Bots - https://yandex.com/bots
+        [
+            /(yandex(?:calendar|direct(?:dyn)?|searchshop)|yadirectfetcher)\/([\w\.]+)/i,
+            /(yandex(?:sitelinks|userproxy))/i
+        ], 
+        [NAME, VERSION, [TYPE, FETCHER]]
+    ]
+});
+
+////////////////////
+// IN-APP BROWSERS
+///////////////////
+
+const InApps = Object.freeze({
+    browser : [
+        [/chatlyio\/([\d\.]+)/i], [VERSION, 'Slack', [TYPE, INAPP]]
+    ]
+});
+
+//////////////////////
+// MEDIA PLAYER APPS
+/////////////////////
+
+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]
+    ]
+});
+
+////////////////////////
+// MODULES / LIBRARIES
+///////////////////////
+
+const Modules = Object.freeze({
+    browser : [
+        // Axios/jsdom/Scrapy
+        [/\b(axios|jsdom|scrapy)\/([\w\.]+)/i], [NAME, VERSION, [TYPE, MODULE]]
+    ]
+});
+
+export { 
+    CLIs,
+    Crawlers,
+    ExtraDevices,
+    Emails,
+    Fetchers,
+    InApps,
+    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.3
+// 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.3
+    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.3
+    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,109 @@
+// Type definitions for UAParser.js v2.0.0-beta.3
+// 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;
+        type?: 'crawler' | 'cli' | 'email' | 'fetcher' | 'inapp' | 'module';
+    }
+
+    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' | 'xr' | 'embedded';
+        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>> | 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';
+            TYPE: 'type';
+        };
+        static readonly CPU: { 
+            ARCHITECTURE: 'architecture'; 
+        };
+        static readonly DEVICE: { 
+            TYPE: 'type';
+            VENDOR: 'vendor'; 
+            MODEL: 'model';
+            CONSOLE: 'console';
+            MOBILE: 'mobile';
+            SMARTTV: 'smarttv';
+            TABLET: 'tablet';
+            WEARABLE: 'wearable';
+            XR: 'xr';
+            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,874 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////////
-/* UAParser.js v0.7.28
-   Copyright © 2012-2021 Faisal Salman <f@faisalman.com>
-   MIT License *//*
-   Detect Browser, Engine, OS, CPU, and Device type/model from User-Agent data.
-   Supports browser & node.js environment. 
-   Demo   : https://faisalman.github.io/ua-parser-js
-   Source : https://github.com/faisalman/ua-parser-js */
-/////////////////////////////////////////////////////////////////////////////////
-
-(function (window, undefined) {
-
-    'use strict';
-
-    //////////////
-    // Constants
-    /////////////
-
-
-    var LIBVERSION  = '0.8.1',
-        EMPTY       = '',
-        UNKNOWN     = '?',
-        FUNC_TYPE   = 'function',
-        UNDEF_TYPE  = 'undefined',
-        OBJ_TYPE    = 'object',
-        STR_TYPE    = 'string',
-        MAJOR       = 'major',
-        MODEL       = 'model',
-        NAME        = 'name',
-        TYPE        = 'type',
-        VENDOR      = 'vendor',
-        VERSION     = 'version',
-        ARCHITECTURE= 'architecture',
-        CONSOLE     = 'console',
-        MOBILE      = 'mobile',
-        TABLET      = 'tablet',
-        SMARTTV     = 'smarttv',
-        WEARABLE    = 'wearable',
-        EMBEDDED    = 'embedded',
-        UA_MAX_LENGTH = 255;
-
-    var AMAZON  = 'Amazon',
-        APPLE   = 'Apple',
-        ASUS    = 'ASUS',
-        BLACKBERRY = 'BlackBerry',
-        BROWSER = 'Browser',
-        CHROME  = 'Chrome',
-        EDGE    = 'Edge',
-        FIREFOX = 'Firefox',
-        GOOGLE  = 'Google',
-        HUAWEI  = 'Huawei',
-        LG      = 'LG',
-        MICROSOFT = 'Microsoft',
-        MOTOROLA  = 'Motorola',
-        OPERA   = 'Opera',
-        SAMSUNG = 'Samsung',
-        SONY    = 'Sony',
-        XIAOMI  = 'Xiaomi',
-        ZEBRA   = 'Zebra',
-        FACEBOOK   = 'Facebook';
-
-    ///////////
-    // Helper
-    //////////
-
-    var 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;
-        },
-        enumerize = function (arr) {
-            var enums = {};
-            for (var i in arr) {
-                enums[arr[i].toUpperCase()] = arr[i];
-            }
-            return enums;
-        },
-        has = function (str1, str2) {
-            return typeof str1 === STR_TYPE ? lowerize(str2).indexOf(lowerize(str1)) !== -1 : false;
-        },
-        lowerize = function (str) {
-            return str.toLowerCase();
-        },
-        majorize = function (version) {
-            return typeof(version) === STR_TYPE ? version.replace(/[^\d\.]/g, EMPTY).split('.')[0] : undefined;
-        },
-        trim = function (str, len) {
-            if (typeof(str) === STR_TYPE) {
-                str = str.replace(/^\s\s*/, EMPTY).replace(/\s\s*$/, EMPTY);
-                return typeof(len) === UNDEF_TYPE ? str : str.substring(0, UA_MAX_LENGTH);
-            }
-    };
-
-    ///////////////
-    // Map helper
-    //////////////
-
-    var rgxMapper = 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;
-            }
-        },
-
-        strMapper = function (str, map) {
-
-            for (var i in map) {
-                // check if current value is array
-                if (typeof map[i] === OBJ_TYPE && map[i].length > 0) {
-                    for (var j = 0; j < map[i].length; j++) {
-                        if (has(map[i][j], str)) {
-                            return (i === UNKNOWN) ? undefined : i;
-                        }
-                    }
-                } else if (has(map[i], str)) {
-                    return (i === UNKNOWN) ? undefined : i;
-                }
-            }
-            return str;
-    };
-
-    ///////////////
-    // String map
-    //////////////
-
-    // Safari < 3.0
-    var oldSafariMap = {
-            '1.0'   : '/8',
-            '1.2'   : '/1',
-            '1.3'   : '/3',
-            '2.0'   : '/412',
-            '2.0.2' : '/416',
-            '2.0.3' : '/417',
-            '2.0.4' : '/419',
-            '?'     : '/'
-        },
-        windowsVersionMap = {
-            '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 : [[
-
-            /\b(?:crmo|crios)\/([\w\.]+)/i                                      // Chrome for Android/iOS
-            ], [VERSION, [NAME, 'Chrome']], [
-            /edg(?:e|ios|a)?\/([\w\.]+)/i                                       // Microsoft Edge
-            ], [VERSION, [NAME, 'Edge']], [
-
-            // Presto based
-            /(opera mini)\/([-\w\.]+)/i,                                        // Opera Mini
-            /(opera [mobiletab]{3,6})\b.+version\/([-\w\.]+)/i,                 // Opera Mobi/Tablet
-            /(opera)(?:.+version\/|[\/ ]+)([\w\.]+)/i                           // Opera
-            ], [NAME, VERSION], [
-            /opios[\/ ]+([\w\.]+)/i                                             // Opera mini on iphone >= 8.0
-            ], [VERSION, [NAME, OPERA+' Mini']], [
-            /\bopr\/([\w\.]+)/i                                                 // Opera Webkit
-            ], [VERSION, [NAME, OPERA]], [
-
-            // Mixed
-            /(kindle)\/([\w\.]+)/i,                                             // Kindle
-            /(lunascape|maxthon|netfront|jasmine|blazer)[\/ ]?([\w\.]*)/i,      // Lunascape/Maxthon/Netfront/Jasmine/Blazer
-            // Trident based
-            /(avant |iemobile|slim)(?:browser)?[\/ ]?([\w\.]*)/i,               // Avant/IEMobile/SlimBrowser
-            /(ba?idubrowser)[\/ ]?([\w\.]+)/i,                                  // Baidu Browser
-            /(?:ms|\()(ie) ([\w\.]+)/i,                                         // Internet Explorer
-
-            // Webkit/KHTML based                                               // Flock/RockMelt/Midori/Epiphany/Silk/Skyfire/Bolt/Iron/Iridium/PhantomJS/Bowser/QupZilla/Falkon
-            /(flock|rockmelt|midori|epiphany|silk|skyfire|ovibrowser|bolt|iron|vivaldi|iridium|phantomjs|bowser|quark|qupzilla|falkon|rekonq|puffin|brave|whale|qqbrowserlite|qq)\/([-\w\.]+)/i,
-                                                                                // Rekonq/Puffin/Brave/Whale/QQBrowserLite/QQ, aka ShouQ
-            /(weibo)__([\d\.]+)/i                                               // Weibo
-            ], [NAME, VERSION], [
-            /(?:\buc? ?browser|(?:juc.+)ucweb)[\/ ]?([\w\.]+)/i                 // UCBrowser
-            ], [VERSION, [NAME, 'UC'+BROWSER]], [
-            /\bqbcore\/([\w\.]+)/i                                              // WeChat Desktop for Windows Built-in Browser
-            ], [VERSION, [NAME, 'WeChat(Win) Desktop']], [
-            /micromessenger\/([\w\.]+)/i                                        // WeChat
-            ], [VERSION, [NAME, 'WeChat']], [
-            /konqueror\/([\w\.]+)/i                                             // Konqueror
-            ], [VERSION, [NAME, 'Konqueror']], [
-            /trident.+rv[: ]([\w\.]{1,9})\b.+like gecko/i                       // IE11
-            ], [VERSION, [NAME, 'IE']], [
-            /yabrowser\/([\w\.]+)/i                                             // Yandex
-            ], [VERSION, [NAME, 'Yandex']], [
-            /(avast|avg)\/([\w\.]+)/i                                           // Avast/AVG Secure Browser
-            ], [[NAME, /(.+)/, '$1 Secure '+BROWSER], VERSION], [
-            /\bfocus\/([\w\.]+)/i                                               // Firefox Focus
-            ], [VERSION, [NAME, FIREFOX+' Focus']], [
-            /\bopt\/([\w\.]+)/i                                                 // Opera Touch
-            ], [VERSION, [NAME, OPERA+' Touch']], [
-            /coc_coc\w+\/([\w\.]+)/i                                            // Coc Coc Browser
-            ], [VERSION, [NAME, 'Coc Coc']], [
-            /dolfin\/([\w\.]+)/i                                                // Dolphin
-            ], [VERSION, [NAME, 'Dolphin']], [
-            /coast\/([\w\.]+)/i                                                 // Opera Coast
-            ], [VERSION, [NAME, OPERA+' Coast']], [
-            /miuibrowser\/([\w\.]+)/i                                           // MIUI Browser
-            ], [VERSION, [NAME, 'MIUI '+BROWSER]], [
-            /fxios\/([-\w\.]+)/i                                                // Firefox for iOS
-            ], [VERSION, [NAME, FIREFOX]], [
-            /\bqihu|(qi?ho?o?|360)browser/i                                     // 360
-            ], [[NAME, '360 '+BROWSER]], [
-            /(oculus|samsung|sailfish)browser\/([\w\.]+)/i
-            ], [[NAME, /(.+)/, '$1 '+BROWSER], VERSION], [                      // Oculus/Samsung/Sailfish Browser
-            /(comodo_dragon)\/([\w\.]+)/i                                       // Comodo Dragon
-            ], [[NAME, /_/g, ' '], VERSION], [
-            /(electron)\/([\w\.]+) safari/i,                                    // Electron-based App
-            /(tesla)(?: qtcarbrowser|\/(20\d\d\.[-\w\.]+))/i,                   // Tesla
-            /m?(qqbrowser|baiduboxapp|2345Explorer)[\/ ]?([\w\.]+)/i            // QQBrowser/Baidu App/2345 Browser
-            ], [NAME, VERSION], [
-            /(metasr)[\/ ]?([\w\.]+)/i,                                         // SouGouBrowser
-            /(lbbrowser)/i                                                      // LieBao Browser
-            ], [NAME], [
-
-            // WebView
-            /((?:fban\/fbios|fb_iab\/fb4a)(?!.+fbav)|;fbav\/([\w\.]+);)/i       // Facebook App for iOS & Android
-            ], [[NAME, FACEBOOK], VERSION], [
-            /safari (line)\/([\w\.]+)/i,                                        // Line App for iOS
-            /\b(line)\/([\w\.]+)\/iab/i,                                        // Line App for Android
-            /(chromium|instagram)[\/ ]([-\w\.]+)/i                              // Chromium/Instagram
-            ], [NAME, VERSION], [
-            /\bgsa\/([\w\.]+) .*safari\//i                                      // Google Search Appliance on iOS
-            ], [VERSION, [NAME, 'GSA']], [
-
-            /headlesschrome(?:\/([\w\.]+)| )/i                                  // Chrome Headless
-            ], [VERSION, [NAME, CHROME+' Headless']], [
-
-            / wv\).+(chrome)\/([\w\.]+)/i                                       // Chrome WebView
-            ], [[NAME, CHROME+' WebView'], VERSION], [
-
-            /droid.+ version\/([\w\.]+)\b.+(?:mobile safari|safari)/i           // Android Browser
-            ], [VERSION, [NAME, 'Android '+BROWSER]], [
-
-            /(chrome|omniweb|arora|[tizenoka]{5} ?browser)\/v?([\w\.]+)/i       // Chrome/OmniWeb/Arora/Tizen/Nokia
-            ], [NAME, VERSION], [
-
-            /version\/([\w\.]+) .*mobile\/\w+ (safari)/i                        // Mobile Safari
-            ], [VERSION, [NAME, 'Mobile Safari']], [
-            /version\/([\w\.]+) .*(mobile ?safari|safari)/i                     // Safari & Safari Mobile
-            ], [VERSION, NAME], [
-            /webkit.+?(mobile ?safari|safari)(\/[\w\.]+)/i                      // Safari < 3.0
-            ], [NAME, [VERSION, strMapper, oldSafariMap]], [
-
-            /(webkit|khtml)\/([\w\.]+)/i
-            ], [NAME, VERSION], [
-
-            // Gecko based
-            /(navigator|netscape\d?)\/([-\w\.]+)/i                              // Netscape
-            ], [[NAME, 'Netscape'], VERSION], [
-            /mobile vr; rv:([\w\.]+)\).+firefox/i                               // Firefox Reality
-            ], [VERSION, [NAME, FIREFOX+' Reality']], [
-            /ekiohf.+(flow)\/([\w\.]+)/i,                                       // Flow
-            /(swiftfox)/i,                                                      // Swiftfox
-            /(icedragon|iceweasel|camino|chimera|fennec|maemo browser|minimo|conkeror|klar)[\/ ]?([\w\.\+]+)/i,
-                                                                                // IceDragon/Iceweasel/Camino/Chimera/Fennec/Maemo/Minimo/Conkeror/Klar
-            /(seamonkey|k-meleon|icecat|iceape|firebird|phoenix|palemoon|basilisk|waterfox)\/([-\w\.]+)$/i,
-                                                                                // Firefox/SeaMonkey/K-Meleon/IceCat/IceApe/Firebird/Phoenix
-            /(firefox)\/([\w\.]+)/i,                                            // Other Firefox-based
-            /(mozilla)\/([\w\.]+) .+rv\:.+gecko\/\d+/i,                         // Mozilla
-
-            // Other
-            /(polaris|lynx|dillo|icab|doris|amaya|w3m|netsurf|sleipnir|obigo|mosaic|(?:go|ice|up)[\. ]?browser)[-\/ ]?v?([\w\.]+)/i,
-                                                                                // Polaris/Lynx/Dillo/iCab/Doris/Amaya/w3m/NetSurf/Sleipnir/Obigo/Mosaic/Go/ICE/UP.Browser
-            /(links) \(([\w\.]+)/i                                              // Links
-            ], [NAME, VERSION]
-        ],
-
-        cpu : [[
-
-            /(?:(amd|x(?:(?:86|64)[-_])?|wow|win)64)[;\)]/i                     // AMD64 (x64)
-            ], [[ARCHITECTURE, 'amd64']], [
-
-            /(ia32(?=;))/i                                                      // IA32 (quicktime)
-            ], [[ARCHITECTURE, lowerize]], [
-
-            /((?:i[346]|x)86)[;\)]/i                                            // IA32 (x86)
-            ], [[ARCHITECTURE, 'ia32']], [
-
-            /\b(aarch64|arm(v?8e?l?|_?64))\b/i                                 // ARM64
-            ], [[ARCHITECTURE, 'arm64']], [
-
-            /\b(arm(?:v[67])?ht?n?[fl]p?)\b/i                                   // ARMHF
-            ], [[ARCHITECTURE, 'armhf']], [
-
-            // PocketPC mistakenly identified as PowerPC
-            /windows (ce|mobile); ppc;/i
-            ], [[ARCHITECTURE, 'arm']], [
-
-            /((?:ppc|powerpc)(?:64)?)(?: mac|;|\))/i                            // PowerPC
-            ], [[ARCHITECTURE, /ower/, EMPTY, lowerize]], [
-
-            /(sun4\w)[;\)]/i                                                    // SPARC
-            ], [[ARCHITECTURE, 'sparc']], [
-
-            /((?:avr32|ia64(?=;))|68k(?=\))|\barm(?=v(?:[1-7]|[5-7]1)l?|;|eabi)|(?=atmel )avr|(?:irix|mips|sparc)(?:64)?\b|pa-risc)/i
-                                                                                // IA64, 68K, ARM/64, AVR/32, IRIX/64, MIPS/64, SPARC/64, PA-RISC
-            ], [[ARCHITECTURE, lowerize]]
-        ],
-
-        device : [[
-
-            //////////////////////////
-            // MOBILES & TABLETS
-            // Ordered by popularity
-            /////////////////////////
-
-            // Samsung
-            /\b(sch-i[89]0\d|shw-m380s|sm-[pt]\w{2,4}|gt-[pn]\d{2,4}|sgh-t8[56]9|nexus 10)/i
-            ], [MODEL, [VENDOR, SAMSUNG], [TYPE, TABLET]], [
-            /\b((?:s[cgp]h|gt|sm)-\w+|galaxy nexus)/i,
-            /samsung[- ]([-\w]+)/i,
-            /sec-(sgh\w+)/i
-            ], [MODEL, [VENDOR, SAMSUNG], [TYPE, MOBILE]], [
-
-            // Apple
-            /\((ip(?:hone|od)[\w ]*);/i                                         // iPod/iPhone
-            ], [MODEL, [VENDOR, APPLE], [TYPE, MOBILE]], [
-            /\((ipad);[-\w\),; ]+apple/i,                                       // iPad
-            /applecoremedia\/[\w\.]+ \((ipad)/i,
-            /\b(ipad)\d\d?,\d\d?[;\]].+ios/i
-            ], [MODEL, [VENDOR, APPLE], [TYPE, TABLET]], [
-
-            // Huawei
-            /\b((?:ag[rs][23]?|bah2?|sht?|btv)-a?[lw]\d{2})\b(?!.+d\/s)/i
-            ], [MODEL, [VENDOR, HUAWEI], [TYPE, TABLET]], [
-            /(?:huawei|honor)([-\w ]+)[;\)]/i,
-            /\b(nexus 6p|\w{2,4}-[atu]?[ln][01259x][012359][an]?)\b(?!.+d\/s)/i
-            ], [MODEL, [VENDOR, HUAWEI], [TYPE, MOBILE]], [
-
-            // Xiaomi
-            /\b(poco[\w ]+)(?: bui|\))/i,                                       // Xiaomi POCO
-            /\b; (\w+) build\/hm\1/i,                                           // Xiaomi Hongmi 'numeric' models
-            /\b(hm[-_ ]?note?[_ ]?(?:\d\w)?) bui/i,                             // Xiaomi Hongmi
-            /\b(redmi[\-_ ]?(?:note|k)?[\w_ ]+)(?: bui|\))/i,                   // Xiaomi Redmi
-            /\b(mi[-_ ]?(?:a\d|one|one[_ ]plus|note lte|max)?[_ ]?(?:\d?\w?)[_ ]?(?:plus|se|lite)?)(?: bui|\))/i // Xiaomi Mi
-            ], [[MODEL, /_/g, ' '], [VENDOR, XIAOMI], [TYPE, MOBILE]], [
-            /\b(mi[-_ ]?(?:pad)(?:[\w_ ]+))(?: bui|\))/i                        // Mi Pad tablets
-            ],[[MODEL, /_/g, ' '], [VENDOR, XIAOMI], [TYPE, TABLET]], [
-
-            // OPPO
-            /; (\w+) bui.+ oppo/i,
-            /\b(cph[12]\d{3}|p(?:af|c[al]|d\w|e[ar])[mt]\d0|x9007)\b/i
-            ], [MODEL, [VENDOR, 'OPPO'], [TYPE, MOBILE]], [
-
-            // Vivo
-            /vivo (\w+)(?: bui|\))/i,
-            /\b(v[12]\d{3}\w?[at])(?: bui|;)/i
-            ], [MODEL, [VENDOR, 'Vivo'], [TYPE, MOBILE]], [
-
-            // Realme
-            /\b(rmx[12]\d{3})(?: bui|;|\))/i
-            ], [MODEL, [VENDOR, 'Realme'], [TYPE, MOBILE]], [
-
-            // Motorola
-            /\b(milestone|droid(?:[2-4x]| (?:bionic|x2|pro|razr))?:?( 4g)?)\b[\w ]+build\//i,
-            /\bmot(?:orola)?[- ](\w*)/i,
-            /((?:moto[\w\(\) ]+|xt\d{3,4}|nexus 6)(?= bui|\)))/i
-            ], [MODEL, [VENDOR, MOTOROLA], [TYPE, MOBILE]], [
-            /\b(mz60\d|xoom[2 ]{0,2}) build\//i
-            ], [MODEL, [VENDOR, MOTOROLA], [TYPE, TABLET]], [
-
-            // LG
-            /((?=lg)?[vl]k\-?\d{3}) bui| 3\.[-\w; ]{10}lg?-([06cv9]{3,4})/i
-            ], [MODEL, [VENDOR, LG], [TYPE, TABLET]], [
-            /(lm(?:-?f100[nv]?|-[\w\.]+)(?= bui|\))|nexus [45])/i,
-            /\blg[-e;\/ ]+((?!browser|netcast|android tv)\w+)/i,
-            /\blg-?([\d\w]+) bui/i
-            ], [MODEL, [VENDOR, LG], [TYPE, MOBILE]], [
-
-            // Lenovo
-            /(ideatab[-\w ]+)/i,
-            /lenovo ?(s[56]000[-\w]+|tab(?:[\w ]+)|yt[-\d\w]{6}|tb[-\d\w]{6})/i
-            ], [MODEL, [VENDOR, 'Lenovo'], [TYPE, TABLET]], [
-
-            // Nokia
-            /(?:maemo|nokia).*(n900|lumia \d+)/i,
-            /nokia[-_ ]?([-\w\.]*)/i
-            ], [[MODEL, /_/g, ' '], [VENDOR, 'Nokia'], [TYPE, MOBILE]], [
-
-            // Google
-            /(pixel c)\b/i                                                      // Google Pixel C
-            ], [MODEL, [VENDOR, GOOGLE], [TYPE, TABLET]], [
-            /droid.+; (pixel[\daxl ]{0,6})(?: bui|\))/i                         // Google Pixel
-            ], [MODEL, [VENDOR, GOOGLE], [TYPE, MOBILE]], [
-
-            // Sony
-            /droid.+ ([c-g]\d{4}|so[-gl]\w+|xq-a\w[4-7][12])(?= bui|\).+chrome\/(?![1-6]{0,1}\d\.))/i
-            ], [MODEL, [VENDOR, SONY], [TYPE, MOBILE]], [
-            /sony tablet [ps]/i,
-            /\b(?:sony)?sgp\w+(?: bui|\))/i
-            ], [[MODEL, 'Xperia Tablet'], [VENDOR, SONY], [TYPE, TABLET]], [
-
-            // OnePlus
-            / (kb2005|in20[12]5|be20[12][59])\b/i,
-            /(?:one)?(?:plus)? (a\d0\d\d)(?: b|\))/i
-            ], [MODEL, [VENDOR, 'OnePlus'], [TYPE, MOBILE]], [
-
-            // Amazon
-            /(alexa)webm/i,
-            /(kf[a-z]{2}wi)( bui|\))/i,                                         // Kindle Fire without Silk
-            /(kf[a-z]+)( bui|\)).+silk\//i                                      // Kindle Fire HD
-            ], [MODEL, [VENDOR, AMAZON], [TYPE, TABLET]], [
-            /((?:sd|kf)[0349hijorstuw]+)( bui|\)).+silk\//i                     // Fire Phone
-            ], [[MODEL, /(.+)/g, 'Fire Phone $1'], [VENDOR, AMAZON], [TYPE, MOBILE]], [
-
-            // BlackBerry
-            /(playbook);[-\w\),; ]+(rim)/i                                      // BlackBerry PlayBook
-            ], [MODEL, VENDOR, [TYPE, TABLET]], [
-            /\b((?:bb[a-f]|st[hv])100-\d)/i,
-            /\(bb10; (\w+)/i                                                    // BlackBerry 10
-            ], [MODEL, [VENDOR, BLACKBERRY], [TYPE, MOBILE]], [
-
-            // Asus
-            /(?:\b|asus_)(transfo[prime ]{4,10} \w+|eeepc|slider \w+|nexus 7|padfone|p00[cj])/i
-            ], [MODEL, [VENDOR, ASUS], [TYPE, TABLET]], [
-            / (z[bes]6[027][012][km][ls]|zenfone \d\w?)\b/i
-            ], [MODEL, [VENDOR, ASUS], [TYPE, MOBILE]], [
-
-            // HTC
-            /(nexus 9)/i                                                        // HTC Nexus 9
-            ], [MODEL, [VENDOR, 'HTC'], [TYPE, TABLET]], [
-            /(htc)[-;_ ]{1,2}([\w ]+(?=\)| bui)|\w+)/i,                         // HTC
-
-            // ZTE
-            /(zte)[- ]([\w ]+?)(?: bui|\/|\))/i,
-            /(alcatel|geeksphone|nexian|panasonic|sony)[-_ ]?([-\w]*)/i         // Alcatel/GeeksPhone/Nexian/Panasonic/Sony
-            ], [VENDOR, [MODEL, /_/g, ' '], [TYPE, MOBILE]], [
-
-            // Acer
-            /droid.+; ([ab][1-7]-?[0178a]\d\d?)/i
-            ], [MODEL, [VENDOR, 'Acer'], [TYPE, TABLET]], [
-
-            // Meizu
-            /droid.+; (m[1-5] note) bui/i,
-            /\bmz-([-\w]{2,})/i
-            ], [MODEL, [VENDOR, 'Meizu'], [TYPE, MOBILE]], [
-
-            // Sharp
-            /\b(sh-?[altvz]?\d\d[a-ekm]?)/i
-            ], [MODEL, [VENDOR, 'Sharp'], [TYPE, MOBILE]], [
-
-            // MIXED
-            /(blackberry|benq|palm(?=\-)|sonyericsson|acer|asus|dell|meizu|motorola|polytron)[-_ ]?([-\w]*)/i,
-                                                                                // BlackBerry/BenQ/Palm/Sony-Ericsson/Acer/Asus/Dell/Meizu/Motorola/Polytron
-            /(hp) ([\w ]+\w)/i,                                                 // HP iPAQ
-            /(asus)-?(\w+)/i,                                                   // Asus
-            /(microsoft); (lumia[\w ]+)/i,                                      // Microsoft Lumia
-            /(lenovo)[-_ ]?([-\w]+)/i,                                          // Lenovo
-            /(jolla)/i,                                                         // Jolla
-            /(oppo) ?([\w ]+) bui/i                                             // OPPO
-            ], [VENDOR, MODEL, [TYPE, MOBILE]], [
-
-            /(archos) (gamepad2?)/i,                                            // Archos
-            /(hp).+(touchpad(?!.+tablet)|tablet)/i,                             // HP TouchPad
-            /(kindle)\/([\w\.]+)/i,                                             // Kindle
-            /(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]], [
-
-            /(surface duo)/i                                                    // Surface Duo
-            ], [MODEL, [VENDOR, MICROSOFT], [TYPE, TABLET]], [
-            /droid [\d\.]+; (fp\du?)(?: b|\))/i                                 // Fairphone
-            ], [MODEL, [VENDOR, 'Fairphone'], [TYPE, MOBILE]], [
-            /(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
-            ], [[VENDOR, 'Dragon Touch'], MODEL, [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]], [
-            /(shield[\w ]+) b/i                                                 // Nvidia Shield Tablets
-            ], [MODEL, [VENDOR, 'Nvidia'], [TYPE, TABLET]], [
-            /(sprint) (\w+)/i                                                   // Sprint Phones
-            ], [VENDOR, MODEL, [TYPE, MOBILE]], [
-            /(kin\.[onetw]{3})/i                                                // Microsoft Kin
-            ], [[MODEL, /\./g, ' '], [VENDOR, MICROSOFT], [TYPE, MOBILE]], [
-            /droid.+; (cc6666?|et5[16]|mc[239][23]x?|vc8[03]x?)\)/i             // Zebra
-            ], [MODEL, [VENDOR, ZEBRA], [TYPE, TABLET]], [
-            /droid.+; (ec30|ps20|tc[2-8]\d[kx])\)/i
-            ], [MODEL, [VENDOR, ZEBRA], [TYPE, MOBILE]], [
-
-            ///////////////////
-            // CONSOLES
-            ///////////////////
-
-            /(ouya)/i,                                                          // Ouya
-            /(nintendo) ([wids3utch]+)/i                                        // Nintendo
-            ], [VENDOR, MODEL, [TYPE, CONSOLE]], [
-            /droid.+; (shield) bui/i                                            // Nvidia
-            ], [MODEL, [VENDOR, 'Nvidia'], [TYPE, CONSOLE]], [
-            /(playstation [345portablevi]+)/i                                   // Playstation
-            ], [MODEL, [VENDOR, SONY], [TYPE, CONSOLE]], [
-            /\b(xbox(?: one)?(?!; xbox))[\); ]/i                                // Microsoft Xbox
-            ], [MODEL, [VENDOR, MICROSOFT], [TYPE, CONSOLE]], [
-
-            ///////////////////
-            // SMARTTVS
-            ///////////////////
-
-            /smart-tv.+(samsung)/i                                              // Samsung
-            ], [VENDOR, [TYPE, SMARTTV]], [
-            /hbbtv.+maple;(\d+)/i
-            ], [[MODEL, /^/, 'SmartTV'], [VENDOR, SAMSUNG], [TYPE, SMARTTV]], [
-            /(nux; netcast.+smarttv|lg (netcast\.tv-201\d|android tv))/i        // LG SmartTV
-            ], [[VENDOR, LG], [TYPE, SMARTTV]], [
-            /(apple) ?tv/i                                                      // Apple TV
-            ], [VENDOR, [MODEL, APPLE+' TV'], [TYPE, SMARTTV]], [
-            /crkey/i                                                            // Google Chromecast
-            ], [[MODEL, CHROME+'cast'], [VENDOR, GOOGLE], [TYPE, SMARTTV]], [
-            /droid.+aft(\w)( bui|\))/i                                          // Fire TV
-            ], [MODEL, [VENDOR, AMAZON], [TYPE, SMARTTV]], [
-            /\(dtv[\);].+(aquos)/i                                              // Sharp
-            ], [MODEL, [VENDOR, 'Sharp'], [TYPE, SMARTTV]], [
-            /\b(roku)[\dx]*[\)\/]((?:dvp-)?[\d\.]*)/i,                          // Roku
-            /hbbtv\/\d+\.\d+\.\d+ +\([\w ]*; *(\w[^;]*);([^;]*)/i               // HbbTV devices
-            ], [[VENDOR, trim], [MODEL, trim], [TYPE, SMARTTV]], [
-            /\b(android tv|smart[- ]?tv|opera tv|tv; rv:)\b/i                   // SmartTV from Unidentified Vendors
-            ], [[TYPE, SMARTTV]], [
-
-            ///////////////////
-            // WEARABLES
-            ///////////////////
-
-            /((pebble))app/i                                                    // Pebble
-            ], [VENDOR, MODEL, [TYPE, WEARABLE]], [
-            /droid.+; (glass) \d/i                                              // Google Glass
-            ], [MODEL, [VENDOR, GOOGLE], [TYPE, WEARABLE]], [
-            /droid.+; (wt63?0{2,3})\)/i
-            ], [MODEL, [VENDOR, ZEBRA], [TYPE, WEARABLE]], [
-            /(quest( 2)?)/i                                                     // Oculus Quest
-            ], [MODEL, [VENDOR, FACEBOOK], [TYPE, WEARABLE]], [
-
-            ///////////////////
-            // EMBEDDED
-            ///////////////////
-
-            /(tesla)(?: qtcarbrowser|\/[-\w\.]+)/i                              // Tesla
-            ], [VENDOR, [TYPE, EMBEDDED]], [
-
-            ////////////////////
-            // MIXED (GENERIC)
-            ///////////////////
-
-            /droid .+?; ([^;]+?)(?: bui|\) applew).+? mobile safari/i           // Android Phones from Unidentified Vendors
-            ], [MODEL, [TYPE, MOBILE]], [
-            /droid .+?; ([^;]+?)(?: bui|\) applew).+?(?! mobile) safari/i       // Android Tablets from Unidentified Vendors
-            ], [MODEL, [TYPE, TABLET]], [
-            /\b((tablet|tab)[;\/]|focus\/\d(?!.+mobile))/i                      // Unidentifiable Tablet
-            ], [[TYPE, TABLET]], [
-            /(phone|mobile(?:[;\/]| safari)|pda(?=.+windows ce))/i              // Unidentifiable Mobile
-            ], [[TYPE, MOBILE]], [
-            /(android[-\w\. ]{0,9});.+buil/i                                    // Generic Android Device
-            ], [MODEL, [VENDOR, 'Generic']]
-        ],
-
-        engine : [[
-
-            /windows.+ edge\/([\w\.]+)/i                                       // EdgeHTML
-            ], [VERSION, [NAME, EDGE+'HTML']], [
-
-            /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
-            /ekioh(flow)\/([\w\.]+)/i,                                          // Flow
-            /(khtml|tasman|links)[\/ ]\(?([\w\.]+)/i,                           // KHTML/Tasman/Links
-            /(icab)[\/ ]([23]\.[\d\.]+)/i                                       // iCab
-            ], [NAME, VERSION], [
-
-            /rv\:([\w\.]{1,9})\b.+(gecko)/i                                     // Gecko
-            ], [VERSION, NAME]
-        ],
-
-        os : [[
-
-            // Windows
-            /microsoft (windows) (vista|xp)/i                                   // Windows (iTunes)
-            ], [NAME, VERSION], [
-            /(windows) nt 6\.2; (arm)/i,                                        // Windows RT
-            /(windows (?:phone(?: os)?|mobile))[\/ ]?([\d\.\w ]*)/i,            // Windows Phone
-            /(windows)[\/ ]?([ntce\d\. ]+\w)(?!.+xbox)/i
-            ], [NAME, [VERSION, strMapper, windowsVersionMap]], [
-            /(win(?=3|9|n)|win 9x )([nt\d\.]+)/i
-            ], [[NAME, 'Windows'], [VERSION, strMapper, windowsVersionMap]], [
-
-            // iOS/macOS
-            /ip[honead]{2,4}\b(?:.*os ([\w]+) like mac|; opera)/i,              // iOS
-            /cfnetwork\/.+darwin/i
-            ], [[VERSION, /_/g, '.'], [NAME, 'iOS']], [
-            /(mac os x) ?([\w\. ]*)/i,
-            /(macintosh|mac_powerpc\b)(?!.+haiku)/i                             // Mac OS
-            ], [[NAME, 'Mac OS'], [VERSION, /_/g, '.']], [
-
-            // Mobile OSes
-            /droid ([\w\.]+)\b.+(android[- ]x86)/i                              // Android-x86
-            ], [VERSION, NAME], [                                               // Android/WebOS/QNX/Bada/RIM/Maemo/MeeGo/Sailfish OS
-            /(android|webos|qnx|bada|rim tablet os|maemo|meego|sailfish)[-\/ ]?([\w\.]*)/i,
-            /(blackberry)\w*\/([\w\.]*)/i,                                      // Blackberry
-            /(tizen|kaios)[\/ ]([\w\.]+)/i,                                     // Tizen/KaiOS
-            /\((series40);/i                                                    // Series 40
-            ], [NAME, VERSION], [
-            /\(bb(10);/i                                                        // BlackBerry 10
-            ], [VERSION, [NAME, BLACKBERRY]], [
-            /(?:symbian ?os|symbos|s60(?=;)|series60)[-\/ ]?([\w\.]*)/i         // Symbian
-            ], [VERSION, [NAME, 'Symbian']], [
-            /mozilla\/[\d\.]+ \((?:mobile|tablet|tv|mobile; [\w ]+); rv:.+ gecko\/([\w\.]+)/i // Firefox OS
-            ], [VERSION, [NAME, FIREFOX+' OS']], [
-            /web0s;.+rt(tv)/i,
-            /\b(?:hp)?wos(?:browser)?\/([\w\.]+)/i                              // WebOS
-            ], [VERSION, [NAME, 'webOS']], [
-
-            // Google Chromecast
-            /crkey\/([\d\.]+)/i                                                 // Google Chromecast
-            ], [VERSION, [NAME, CHROME+'cast']], [
-            /(cros) [\w]+ ([\w\.]+\w)/i                                         // Chromium OS
-            ], [[NAME, 'Chromium OS'], VERSION],[
-
-            // Console
-            /(nintendo|playstation) ([wids345portablevuch]+)/i,                 // Nintendo/Playstation
-            /(xbox); +xbox ([^\);]+)/i,                                         // Microsoft Xbox (360, One, X, S, Series X, Series S)
-
-            // Other
-            /\b(joli|palm)\b ?(?:os)?\/?([\w\.]*)/i,                            // Joli/Palm
-            /(mint)[\/\(\) ]?(\w*)/i,                                           // Mint
-            /(mageia|vectorlinux)[; ]/i,                                        // Mageia/VectorLinux
-            /([kxln]?ubuntu|debian|suse|opensuse|gentoo|arch(?= linux)|slackware|fedora|mandriva|centos|pclinuxos|red ?hat|zenwalk|linpus|raspbian|plan 9|minix|risc os|contiki|deepin|manjaro|elementary os|sabayon|linspire)(?: gnu\/linux)?(?: enterprise)?(?:[- ]linux)?(?:-gnu)?[-\/ ]?(?!chrom|package)([-\w\.]*)/i,
-                                                                                // Ubuntu/Debian/SUSE/Gentoo/Arch/Slackware/Fedora/Mandriva/CentOS/PCLinuxOS/RedHat/Zenwalk/Linpus/Raspbian/Plan9/Minix/RISCOS/Contiki/Deepin/Manjaro/elementary/Sabayon/Linspire
-            /(hurd|linux) ?([\w\.]*)/i,                                         // Hurd/Linux
-            /(gnu) ?([\w\.]*)/i,                                                // GNU
-            /\b([-frentopcghs]{0,5}bsd|dragonfly)[\/ ]?(?!amd|[ix346]{1,2}86)([\w\.]*)/i, // FreeBSD/NetBSD/OpenBSD/PC-BSD/GhostBSD/DragonFly
-            /(haiku) (\w+)/i                                                    // Haiku
-            ], [NAME, VERSION], [
-            /(sunos) ?([\w\.\d]*)/i                                             // Solaris
-            ], [[NAME, 'Solaris'], VERSION], [
-            /((?:open)?solaris)[-\/ ]?([\w\.]*)/i,                              // Solaris
-            /(aix) ((\d)(?=\.|\)| )[\w\.])*/i,                                  // AIX
-            /\b(beos|os\/2|amigaos|morphos|openvms|fuchsia|hp-ux)/i,            // BeOS/OS2/AmigaOS/MorphOS/OpenVMS/Fuchsia/HP-UX
-            /(unix) ?([\w\.]*)/i                                                // UNIX
-            ], [NAME, VERSION]
-        ]
-    };
-
-    /////////////////
-    // Constructor
-    ////////////////
-
-    var UAParser = function (ua, extensions) {
-
-        if (typeof ua === OBJ_TYPE) {
-            extensions = ua;
-            ua = undefined;
-        }
-
-        if (!(this instanceof UAParser)) {
-            return new UAParser(ua, extensions).getResult();
-        }
-
-        var _ua = ua || ((typeof window !== UNDEF_TYPE && window.navigator && window.navigator.userAgent) ? window.navigator.userAgent : EMPTY);
-        var _rgxmap = extensions ? extend(regexes, extensions) : regexes;
-
-        this.getBrowser = function () {
-            var _browser = {};
-            _browser[NAME] = undefined;
-            _browser[VERSION] = undefined;
-            rgxMapper.call(_browser, _ua, _rgxmap.browser);
-            _browser.major = majorize(_browser.version);
-            return _browser;
-        };
-        this.getCPU = function () {
-            var _cpu = {};
-            _cpu[ARCHITECTURE] = undefined;
-            rgxMapper.call(_cpu, _ua, _rgxmap.cpu);
-            return _cpu;
-        };
-        this.getDevice = function () {
-            var _device = {};
-            _device[VENDOR] = undefined;
-            _device[MODEL] = undefined;
-            _device[TYPE] = undefined;
-            rgxMapper.call(_device, _ua, _rgxmap.device);
-            return _device;
-        };
-        this.getEngine = function () {
-            var _engine = {};
-            _engine[NAME] = undefined;
-            _engine[VERSION] = undefined;
-            rgxMapper.call(_engine, _ua, _rgxmap.engine);
-            return _engine;
-        };
-        this.getOS = function () {
-            var _os = {};
-            _os[NAME] = undefined;
-            _os[VERSION] = undefined;
-            rgxMapper.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 (ua) {
-            _ua = (typeof ua === STR_TYPE && ua.length > UA_MAX_LENGTH) ? trim(ua, UA_MAX_LENGTH) : ua;
-            return this;
-        };
-        this.setUA(_ua);
-        return this;
-    };
-
-    UAParser.VERSION = LIBVERSION;
-    UAParser.BROWSER =  enumerize([NAME, VERSION, MAJOR]);
-    UAParser.CPU = enumerize([ARCHITECTURE]);
-    UAParser.DEVICE = enumerize([MODEL, VENDOR, TYPE, CONSOLE, MOBILE, SMARTTV, TABLET, WEARABLE, EMBEDDED]);
-    UAParser.ENGINE = UAParser.OS = enumerize([NAME, 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) === FUNC_TYPE && define.amd) {
-            define(function () {
-                return UAParser;
-            });
-        } else if (typeof window !== UNDEF_TYPE) {
-            // 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 !== UNDEF_TYPE && (window.jQuery || window.Zepto);
-    if ($ && !$.ua) {
-        var parser = new UAParser();
-        $.ua = parser.getResult();
-        $.ua.get = function () {
-            return parser.getUA();
-        };
-        $.ua.set = function (ua) {
-            parser.setUA(ua);
-            var result = parser.getResult();
-            for (var prop in result) {
-                $.ua[prop] = result[prop];
-            }
-        };
-    }
-
-})(typeof window === 'object' ? window : this);

test/dts-test.ts

@@ -0,0 +1,49 @@
+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<'crawler' | 'cli' | 'email' | 'fetcher' | 'inapp' | 'module' | undefined>(browser.type);
+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('../src/main/ua-parser');
+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,26 @@
+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 : '',
+                browser: { name: undefined, version: undefined, major: undefined, type: 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,93 @@
+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 clis = require('./specs/browser-clis.json');
+const crawlers = require('./specs/browser-crawlers.json');
+const emails = require('./specs/browser-emails.json');
+const fetchers = require('./specs/browser-fetchers.json');
+const modules = require('./specs/browser-modules.json');
+const { CLIs, Crawlers, Emails, Fetchers, Modules } = require('../src/extensions/ua-parser-extensions');
+
+describe('Extensions', () => {
+    [   
+        ['CLIs', clis, CLIs], 
+        ['Crawlers', crawlers, Crawlers], 
+        ['Emails', emails, Emails], 
+        ['Fetchers', fetchers, Fetchers],
+        ['Modules', modules, Modules]
+    ]
+    .forEach((list) => {
+        describe(list[0], () => {
+            list[1].forEach((agent) => {
+                it(`Can detect ${agent.desc}`, () => {
+                    let browser = UAParser(agent.ua, list[2]).browser;
+                    assert.strictEqual(String(browser.name), agent.expect.name);
+                    assert.strictEqual(String(browser.version), agent.expect.version);
+                    assert.strictEqual(String(browser.type), agent.expect.type);
+                });
+            });
+        });
+    });
+
+    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 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"});
+});
+
+describe('Merge', () => {
+    it('Can merge multiple extensions', () => {
+        const wget = 'Wget/1.21.1';
+        const facebookBot = 'Mozilla/5.0 (compatible; FacebookBot/1.0; +https://developers.facebook.com/docs/sharing/webmasters/facebookbot/)';
+
+        // try merging crawlers & CLIs
+        const crawlersAndCLIs = { browser : [...Crawlers.browser, ...CLIs.browser]};
+        const crawlersAndCLIsParser = new UAParser(crawlersAndCLIs);
+        assert.deepEqual(crawlersAndCLIsParser.setUA(wget).getBrowser(), {name: "Wget", version: "1.21.1", major: "1", type:"cli"});
+        assert.deepEqual(crawlersAndCLIsParser.setUA(facebookBot).getBrowser(), {name: "FacebookBot", version: "1.0", major: "1", type:"crawler"});
+
+        // alternative merge options
+        const crawlersAndCLIsParser2 = new UAParser([Crawlers, CLIs]);
+        const crawlersAndCLIsParser3 = new UAParser(facebookBot, [Crawlers, CLIs]);
+        assert.deepEqual(crawlersAndCLIsParser2.setUA(wget).getBrowser(), {name: "Wget", version: "1.21.1", major: "1", type:"cli"});
+        assert.deepEqual(crawlersAndCLIsParser3.getBrowser(), {name: "FacebookBot", version: "1.0", major: "1", type:"crawler"});
+    });
+});
+
+describe('Testing regexes', () => {
+
+    let regexes;
+    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('Checking for potentially vulnerable regex', () => {
+        for (let regex of regexes) {
+            it('Test against `safe-regex` : ' + regex, () => {
+                assert.strictEqual(safe(regex), true);
+            });
+        }
+    });
+});

test/mocha-test-helpers.js

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

test/playwright-test-main.spec.mjs

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

test/specs/browser-clis.json

@@ -0,0 +1,42 @@
+[
+    {
+        "desc"    : "curl",
+        "ua"      : "curl/7.38.0",
+        "expect"  :
+        {
+            "name"    : "curl",
+            "version" : "7.38.0",
+            "type"    : "cli"
+        }
+    },
+    {
+        "desc"    : "lynx",
+        "ua"      : "Lynx 2.8.8dev.3",
+        "expect"  :
+        {
+            "name"    : "Lynx",
+            "version" : "2.8.8dev.3",
+            "type"    : "cli"
+        }
+    },
+    {
+        "desc"    : "lynx",
+        "ua"      : "Lynx/2.6",
+        "expect"  :
+        {
+            "name"    : "Lynx",
+            "version" : "2.6",
+            "type"    : "cli"
+        }
+    },
+    {
+        "desc"    : "wget",
+        "ua"      : "Wget/1.21.1",
+        "expect"  :
+        {
+            "name"    : "Wget",
+            "version" : "1.21.1",
+            "type"    : "cli"
+        }
+    }
+]

test/specs/browser-crawlers.json

@@ -0,0 +1,92 @@
+[
+    {
+        "desc"    : "Applebot",
+        "ua"      : "Mozilla/5.0 (iPhone; CPU iPhone OS 8_1 like Mac OS X) AppleWebKit/600.1.4 (KHTML, like Gecko) Version/8.0 Mobile/12B410 Safari/600.1.4 (Applebot/0.1;+http://www.apple.com/go/applebot)",
+        "expect"  :
+        {
+            "name"    : "Applebot",
+            "version" : "0.1",
+            "type"    : "crawler"
+        }
+    },
+    {
+        "desc"    : "Amazonbot",
+        "ua"      : "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_10_1) AppleWebKit/600.2.5 (KHTML, like Gecko) Version/8.0.2 Safari/600.2.5 (Amazonbot/0.1; +https://developer.amazon.com/support/amazonbot)",
+        "expect"  :
+        {
+            "name"    : "Amazonbot",
+            "version" : "0.1",
+            "type"    : "crawler"
+        }
+    },
+    {
+        "desc"    : "Bytespider",
+        "ua"      : "Mozilla/5.0 (Linux; Android 8.0; Pixel 2 Build/OPD3.170816.012) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.1511.1269 Mobile Safari/537.36; Bytespider",
+        "expect"  :
+        {
+            "name"    : "Bytespider",
+            "version" : "undefined",
+            "type"    : "crawler"
+        }
+    },
+    {
+        "desc"    : "ClaudeBot",
+        "ua"      : "Mozilla/5.0 AppleWebKit/537.36 (KHTML, like Gecko; compatible; ClaudeBot/1.0; +claudebot@anthropic.com)",
+        "expect"  :
+        {
+            "name"    : "ClaudeBot",
+            "version" : "1.0",
+            "type"    : "crawler"
+        }
+    },
+    {
+        "desc"    : "ClaudeWeb",
+        "ua"      : "Claude-Web/1.0 (web crawler; +https://www.anthropic.com/; bots@anthropic.com)",
+        "expect"  :
+        {
+            "name"    : "Claude-Web",
+            "version" : "1.0",
+            "type"    : "crawler"
+        }
+    },
+    {
+        "desc"    : "FacebookBot",
+        "ua"      : "Mozilla/5.0 (compatible; FacebookBot/1.0; +https://developers.facebook.com/docs/sharing/webmasters/facebookbot/",
+        "expect"  :
+        {
+            "name"    : "FacebookBot",
+            "version" : "1.0",
+            "type"    : "crawler"
+        }
+    },
+    {
+        "desc"    : "Googlebot-Video",
+        "ua"      : "Googlebot-Video/1.0",
+        "expect"  :
+        {
+            "name"    : "Googlebot-Video",
+            "version" : "1.0",
+            "type"    : "crawler"
+        }
+    },
+    {
+        "desc"    : "GPTBot",
+        "ua"      : "Mozilla/5.0 AppleWebKit/537.36 (KHTML, like Gecko; compatible; GPTBot/1.0; +https://openai.com/gptbot)",
+        "expect"  :
+        {
+            "name"    : "GPTBot",
+            "version" : "1.0",
+            "type"    : "crawler"
+        }
+    },
+    {
+        "desc"    : "YandexBot",
+        "ua"      : "Mozilla/5.0 (compatible; YandexBot/3.0; +http://yandex.com/bots)",
+        "expect"  :
+        {
+            "name"    : "YandexBot",
+            "version" : "3.0",
+            "type"    : "crawler"
+        }
+    }
+]

test/specs/browser-emails.json

@@ -0,0 +1,12 @@
+[
+    {
+        "desc"    : "Thunderbird",
+        "ua"      : "Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.13.0",
+        "expect"  :
+        {
+            "name"    : "Thunderbird",
+            "version" : "78.13.0",
+            "type"    : "email"
+        }
+    }
+]

test/specs/browser-fetchers.json

@@ -0,0 +1,12 @@
+[
+    {
+        "desc"    : "BingPreview",
+        "ua"      : "Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/534+ (KHTML, like Gecko) BingPreview/1.0b",
+        "expect"  :
+        {
+            "name"    : "BingPreview",
+            "version" : "1.0b",
+            "type"    : "fetcher"
+        }
+    }
+]

test/specs/browser-modules.json

@@ -0,0 +1,12 @@
+[
+    {
+        "desc"    : "Scrapy",
+        "ua"      : "Scrapy/1.5.0 (+https://scrapy.org)",
+        "expect"  :
+        {
+            "name"    : "Scrapy",
+            "version" : "1.5.0",
+            "type"    : "module"
+        }
+    }
+]

test/specs/cpu-all.json

@@ -23,6 +23,46 @@
             "architecture"  : "amd64"
         }
     },
+    {
+        "desc"    : "Vivaldi on Windows",
+        "ua"      : "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/113.0.0.0 Safari/537.36 Vivaldi/6.0.2979.18",
+        "expect"  :
+        {
+            "architecture"  : "amd64"
+        }
+    },
+    {
+        "desc"    : "Vivaldi on Windows",
+        "ua"      : "Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/113.0.0.0 Safari/537.36 Vivaldi/6.0.2979.18",
+        "expect"  :
+        {
+            "architecture"  : "amd64"
+        }
+    },
+    {
+        "desc"    : "Vivaldi on Linux",
+        "ua"      : "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/113.0.0.0 Safari/537.36 Vivaldi/6.0.2979.18",
+        "expect"  :
+        {
+            "architecture"  : "amd64"
+        }
+    },
+    {
+        "desc"    : "Vivaldi on Linux",
+        "ua"      : "Mozilla/5.0 (X11; Linux i686) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/113.0.0.0 Safari/537.36 Vivaldi/6.0.2979.18",
+        "expect"  :
+        {
+            "architecture"  : "ia32"
+        }
+    },
+    {
+        "desc": "Xiaomi POCO M2 Pro",
+        "ua": "Mozilla/5.0 (Linux; arm_64; Android 11; POCO M2 Pro) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/106.0.0.0 YaBrowser/22.11.7.42.00 SA/3 Mobile Safari/537.36",
+        "expect"  :
+        {
+            "architecture"  : "arm64"
+        }
+    },
     {
         "desc"    : "win64",
         "ua"      : "Mozilla/4.0 (compatible; MSIE 7.0; Windows NT 6.2; Win64; x64; Trident/6.0; .NET4.0E; .NET4.0C)",
@@ -127,6 +167,14 @@
             "architecture"  : "arm64"
         }
     },
+    {
+        "desc"    : "Google Search App",
+        "ua"      : "Mozilla/5.0 (Linux; Android 6.0; M5s Build/MRA58K; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/44.0.2403.147 Mobile Safari/537.36 GSA/12.40.17.23.arm64",
+        "expect"  :
+        {
+            "architecture"  : "arm64"
+        }
+    },
     {
         "desc"    : "Pocket PC",
         "ua"      : "Opera/9.7 (Windows Mobile; PPC; Opera Mobi/35166; U; en) Presto/2.2.1",
@@ -206,5 +254,13 @@
         {
             "architecture"  : "irix64"
         }
+    },
+    {
+        "desc"    : "68k",
+        "ua"      : "'Mozilla/1.1 (Macintosh; U; 68K)'",
+        "expect"  : 
+        {
+            "architecture"  : "68k"
+        }
     }
 ]

test/specs/engine-all.json

@@ -53,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",

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

@@ -80,6 +80,24 @@
             "version" : "10"
         }
     },
+    {
+        "desc"    : "WeChat Desktop for Windows Built-in Browser",
+        "ua"      : "Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/39.0.2171.95 Safari/537.36 MicroMessenger/6.5.2.501 NetType/WIFI WindowsWechat QBCore/3.43.901.400 QQBrowser/9.0.2524.400",
+        "expect"  :
+        {
+            "name"    : "Windows",
+            "version" : "7"
+        }
+    },
+    {
+        "desc"    : "WeChat Desktop for Windows Built-in Browser major version in 4",
+        "ua"      : "mozilla/5.0 (windows nt 6.1; wow64) applewebkit/537.36 (khtml, like gecko) chrome/81.0.4044.138 safari/537.36 nettype/wifi micromessenger/7.0.20.1781(0x6700143b) windowswechat",
+        "expect"  :
+        {
+            "name"    : "Windows",
+            "version" : "7"
+        }
+    },
     {
         "desc"    : "Windows RT",
         "ua"      : "Mozilla/5.0 (compatible; MSIE 10.0; Windows NT 6.2; ARM; Trident/6.0)",
@@ -197,6 +215,15 @@
             "version" : "2.3"
         }
     },
+    {
+        "desc"    : "Tizen 6.0",
+        "ua"      : "HbbTV/1.5.1 (+DRM;Samsung;SmartTV2021:UAU7000;T-KSU2EDEUC-1506.0;KantSU2e;urn:samsungtv:familyname:21_KANTSU2E_UHD_BASIC:2021;) Tizen/6.0 (+TVPLUS+SmartHubLink) Chrome/76 LaTivu_1.0.1_2021 RVID/17",
+        "expect"  :
+        {
+            "name"    : "Tizen",
+            "version" : "6.0"
+        }
+    },
     {
         "desc"    : "Android",
         "ua"      : "Mozilla/5.0 (Linux; U; Android 2.2.2; en-us; VM670 Build/FRG83G) AppleWebKit/533.1 (KHTML, like Gecko)",
@@ -206,6 +233,15 @@
             "version" : "2.2.2"
         }
     },
+    {
+        "desc"    : "HarmonyOS",
+        "ua"      : "Mozilla/5.0 (Linux; Android 10; HarmonyOS; YAL-AL10; HMSCore 6.3.0.327; GMSCore 21.48.15) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/92.0.4515.105 HuaweiBrowser/12.0.3.310 Mobile Safari/537.36",
+        "expect"  :
+        {
+            "name"    : "HarmonyOS",
+            "version" : "10"
+        }
+    },
     {
         "desc"    : "Sailfish",
         "ua"      : "Mozilla/5.0 (Linux; U; Sailfish 3.0; Mobile; rv:45.0) Gecko/45.0 Firefox/45.0 SailfishBrowser/1.0",
@@ -647,12 +683,21 @@
             "version" : "1.9.2.22-0.1mdv2010.2"
         }
     },
+    {
+        "desc"    : "Chrome OS",
+        "ua"      : "Mozilla/5.0 (X11; CrOS x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/99.0.0.0 Safari/537.36",
+        "expect"  :
+        {
+            "name"    : "Chrome OS",
+            "version" : "undefined"
+        }
+    },
     {
         "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",
+            "name"    : "Chrome OS",
             "version" : "10575.58.0"
         }
     },
@@ -737,12 +782,57 @@
             "version" : "undefined"
         }
     },
+    {
+        "desc": "iOS with FaceBook Mobile App",
+        "ua": "[FBAN/FBIOS;FBAV/283.0.0.44.117;FBBV/238386386;FBDV/iPhone12,1;FBMD/iPhone;FBSN/iOS;FBSV/13.6.1;FBSS/2;FBID/phone;FBLC/en_US;FBOP/5;FBRV/240127608]",
+        "expect":
+        {
+            "name"    : "iOS",
+            "version" : "13.6.1"
+        }
+    },
+    {
+        "desc": "iOS with Slack App",
+        "ua": "com.tinyspeck.chatlyio/23.04.10 (iPhone; iOS 16.4.1; Scale/3.00)",
+        "expect":
+        {
+            "name"    : "iOS",
+            "version" : "16.4.1"
+        }
+    },
+    {
+        "desc"    : "watchOS",
+        "ua"      : "server-bag [Watch OS,8.4,19S546,Watch3,4]",
+        "expect"  :
+        {
+            "name"    : "watchOS",
+            "version" : "8.4"
+        }
+    },
+    {
+        "desc"    : "watchOS",
+        "ua"      : "atc/1.0 watchOS/7.4.1 model/Watch3,3 hwp/t8004 build/18T201 (6; dt:155)",
+        "expect"  :
+        {
+            "name"    : "watchOS",
+            "version" : "7.4.1"
+        }
+    },
+    {
+        "desc"    : "watchOS",
+        "ua"      : "Watch4,3/5.3.8 (16U680)",
+        "expect"  :
+        {
+            "name"    : "watchOS",
+            "version" : "5.3.8"
+        }
+    },
     {
         "desc"    : "Mac OS on PowerPC",
         "ua"      : "Mozilla/4.0 (compatible; MSIE 5.0b1; Mac_PowerPC)",
         "expect"  :
         {
-            "name"    : "Mac OS",
+            "name"    : "macOS",
             "version" : "undefined"
         }
     },
@@ -751,7 +841,7 @@
         "ua"      : "Mozilla/5.0 (Macintosh; Intel Mac OS X x.y; rv:10.0) Gecko/20100101 Firefox/10.0",
         "expect"  :
         {
-            "name"    : "Mac OS",
+            "name"    : "macOS",
             "version" : "x.y"
         }
     },
@@ -760,7 +850,7 @@
         "ua"      : "Mozilla/5.0 (Macintosh; PPC Mac OS X x.y; rv:10.0) Gecko/20100101 Firefox/10.0",
         "expect"  :
         {
-            "name"    : "Mac OS",
+            "name"    : "macOS",
             "version" : "x.y"
         }
     },
@@ -769,7 +859,7 @@
         "ua"      : "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_6_8) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/28.0.1500.95 Safari/537.36",
         "expect"  :
         {
-            "name"    : "Mac OS",
+            "name"    : "macOS",
             "version" : "10.6.8"
         }
     },
@@ -1034,6 +1124,33 @@
             "version" : "undefined"
         }
     },
+    {
+        "desc"    : "Panasonic Viera",
+        "ua"      : "HbbTV/1.2.1 (;Panasonic;VIERA 2015;3.014;a001-003 4000-0000;)",
+        "expect"  :
+        {
+            "name"    : "VIERA",
+            "version" : "undefined"
+        }
+    },
+    {
+        "desc"    : "Netrange Smart TV",
+        "ua"      : "Mozilla/5.0 (Linux; U) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/59.0.3071.115 Safari/537.36 OPR/46.0.2207.0 LOEWE-SL410/5.2.0.0 HbbTV/1.4.1 (; LOEWE; SL410; LOH/5.2.0.0;;) FVC/3.0 (LOEWE; SL410;) CE-HTML/1.0 Config (L:deu,CC:DEU) NETRANGEMMH",
+        "expect"  :
+        {
+            "name"    : "NETRANGE",
+            "version" : "undefined"
+        }
+    },
+    {
+        "desc"    : "NetTV 3.2.1",
+        "ua"      : "Opera/9.80 (Linux mips ; U; HbbTV/1.1.1 (; Philips; ; ; ; ) CE-HTML/1.0 NETTV/3.2.1; en) Presto/2.6.33 Version/10.70",
+        "expect"  :
+        {
+            "name"    : "NETTV",
+            "version" : "3.2.1"
+        }
+    },
     {
         "desc"    : "HP-UX",
         "ua"      : "Mozilla/5.0 (X11; U; HP-UX 9000/785; es-ES; rv:1.0.1) Gecko/20020827 Netscape/7.0",
@@ -1114,5 +1231,14 @@
             "name"    : "Linspire",
             "version" : "1.5.0.4"
         }
+    },
+    {
+        "desc"    : "SerenityOS",
+        "ua"      : "Mozilla/4.0 (SerenityOS; x86) LibWeb+LibJS (Not KHTML, nor Gecko) LibWeb",
+        "expect"  :
+        {
+            "name"    : "SerenityOS",
+            "version" : "undefined"
+        }
     }
 ]