Bump version 0.7.34

Add new device: Apple Watch, new os: watchOS
(cherry picked from commit 18730452f2)
2025-11-15 22:52:16 +03:00 · 2023-03-05 20:46:16 +07:00 · 2023-03-04 22:45:23 +07:00 · 2023-03-04 22:43:28 +07:00 · 2023-03-04 22:42:39 +07:00
50 changed files with 1002 additions and 8889 deletions
--- a/.github/FUNDING.yml
+++ b/.github/FUNDING.yml
@@ -1,6 +1,6 @@
 # These are supported funding model platforms

-github: faisalman
+github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
 patreon: # Replace with a single Patreon username
 open_collective: ua-parser-js
 ko_fi: # Replace with a single Ko-fi username
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -1,38 +0,0 @@
---
-name: Bug report
-about: Create a report to help us improve
-title: ''
-labels: ''
-assignees: ''
-
---
-
-**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.
--- a/.github/ISSUE_TEMPLATE/custom.md
+++ b/.github/ISSUE_TEMPLATE/custom.md
@@ -1,10 +0,0 @@
---
-name: Custom issue template
-about: Describe this issue template's purpose here.
-title: ''
-labels: ''
-assignees: ''
-
---
-
-
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -1,20 +0,0 @@
---
-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.
--- a/.github/workflows/analysis-codeql.yml
+++ b/.github/workflows/analysis-codeql.yml
@@ -1,78 +0,0 @@
-# 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}}"
--- a/.github/workflows/analysis-dependency.yml
+++ b/.github/workflows/analysis-dependency.yml
@@ -1,20 +0,0 @@
-# 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
--- a/.github/workflows/analysis-scorecard.yml
+++ b/.github/workflows/analysis-scorecard.yml
@@ -1,72 +0,0 @@
-# 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
--- a/.github/workflows/publish-github-packages.yml
+++ b/.github/workflows/publish-github-packages.yml
@@ -1,22 +0,0 @@
-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 }}
--- a/.github/workflows/publish-npm-packages.yml
+++ b/.github/workflows/publish-npm-packages.yml
@@ -1,23 +0,0 @@
-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 }}
--- a/.github/workflows/run-test.yml
+++ b/.github/workflows/run-test.yml
@@ -1,4 +1,4 @@
-name: UAParser.js CI-Test
+name: ua-parser-js-run-test

 on: [push, pull_request]

@@ -12,12 +12,9 @@ jobs:
      matrix:
        arch: [amd64, ppc64le]
    steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-node@v3
-        with: 
-          node-version: 'lts/*'
+      - uses: actions/checkout@v2
+      - uses: actions/setup-node@v2
      - name: Run the test
        run: |
-          npm ci
-          npx playwright install
-          npm test
+          npm install
+          npm run test-ci
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,5 @@
 node_modules/
 npm-debug.log
-playwright-report/
-test-results/

 ### vim ###
 .*.s[a-w][a-z]
--- a/.jshintrc
+++ b/.jshintrc
@@ -0,0 +1,3 @@
+{
+    "esversion": 3
+}
--- a/.npmrc
+++ b/.npmrc
@@ -0,0 +1 @@
+package-lock=false
--- a/.travis.yml
+++ b/.travis.yml
@@ -0,0 +1,18 @@
+arch:
+ - amd64
+ - ppc64le
+language: node_js
+node_js:
+    - stable
+    - lts/*
+
+notifications:
+  email: false
+
+cache:
+    directories:
+        - node_modules
+
+sudo: false
+
+script: npm run test-ci
--- a/bower.json
+++ b/bower.json
@@ -1,6 +1,6 @@
 {
  "name": "ua-parser-js",
-  "version": "2.0.0-alpha.3",
+  "version": "0.7.34",
  "authors": [
    "Faisal Salman <f@faisalman.com>"
  ],
--- a/changelog.md
+++ b/changelog.md
@@ -1,47 +1,9 @@
 # UAParser.js Changelog

-# Version 2.0
- What's breaking:
-  - Browser detection on mobile device: `"Chrome" => "Mobile Chrome"`, `"Firefox" => "Mobile Firefox"`
-  - OS detection: `"Mac OS" => "macOS"`, `"Chromium OS" => "Chrome OS"`
- What's new:
-  - Add some new methods in result object: 
-    - Add support for client hints: `withClientHints()`
-    - Add support for feature detection: `withFeatureCheck()`
-    - Utility for easy comparison: `is()`
-    - Utility to print full-name: `toString()`
-  - Add support for ES module `import { UAParser } from 'ua-parser-js'`
-  - Provide Enums `'ua-parser-js/enums'`
-  - Provide Extensions `'ua-parser-js/extensions'`
-  - Provide Helpers `'ua-parser-js/helpers'`
-
-## Version 2.0.0-alpha.3
- Add `withFeatureCheck()` method
- Add `isFrozenUA()` method in `helpers` submodule
- Add `MediaPlayers` & `Modules` in `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.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
--- a/dist/ua-parser.min.js
+++ b/dist/ua-parser.min.js
--- a/dist/ua-parser.pack.js
+++ b/dist/ua-parser.pack.js
--- a/images/51degrees.svg
+++ b/images/51degrees.svg
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 23.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 161.93 86.82" style="enable-background:new 0 0 161.93 86.82;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#232628;}
+	.st1{fill:#E62E3A;}
+	.st2{fill:none;}
+</style>
+<g>
+	<path class="st0" d="M116.93,0.68H103.5V17.5h13.43c15.24,0,25.53,10.53,25.53,25.53v0.24c0,15-10.28,25.29-25.53,25.29H103.5
+		v16.82h13.43c26.62,0,45-18.51,45-42.34v-0.24C161.93,18.95,143.54,0.68,116.93,0.68"/>
+	<path class="st1" d="M8.11,0.68h52.02v16.33H24.07l-0.97,14.64c3.39-0.85,6.41-1.45,11.13-1.45c16.7,0,29.64,7.99,29.64,27.22
+		c0,18.03-12.7,29.4-32.18,29.4c-13.55,0-23.47-4.84-31.7-12.7l11.25-13.43c6.41,5.81,12.7,9.19,20.2,9.19
+		c8.71,0,14.15-4.23,14.15-11.86c0-7.38-5.93-11.61-15-11.61c-5.32,0-10.16,1.45-14.16,3.15L5.69,42.42L8.11,0.68z"/>
+	<polygon class="st1" points="86.14,0 98.84,0 98.84,85.29 80.45,85.29 80.45,18.87 65.69,22.5 61.82,7.26 	"/>
+</g>
+<rect x="144.06" y="110.12" class="st2" width="566.93" height="113.39"/>
+</svg>
--- a/license.md
+++ b/license.md
@@ -1,6 +1,6 @@
 MIT License

-Copyright (c) 2012-2023 Faisal Salman <<f@faisalman.com>>
+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
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.js
+++ b/package.js
@@ -1,6 +1,6 @@
 Package.describe({
  name: 'faisalman:ua-parser-js',
-  version: '2.0.0-alpha.3',
+  version: '0.7.34',
  summary: 'Lightweight JavaScript-based user-agent string parser',
  git: 'https://github.com/faisalman/ua-parser-js.git',
  documentation: 'readme.md'
--- a/package.json
+++ b/package.json
@@ -1,12 +1,11 @@
 {
  "title": "UAParser.js",
  "name": "ua-parser-js",
-  "version": "2.0.0-alpha.3",
+  "version": "0.7.34",
  "author": "Faisal Salman <f@faisalman.com> (http://faisalman.com)",
-  "description": "Detect Browser, Engine, OS, CPU, and Device type/model from User-Agent & Client Hints data. Supports browser & node.js environment",
+  "description": "Detect Browser, Engine, OS, CPU, and Device type/model from User-Agent data. Supports browser & node.js environment",
  "keywords": [
    "user-agent",
-    "client-hints",
    "parser",
    "browser",
    "engine",
@@ -141,51 +140,38 @@
    "Yun Young-jin <yupmin@yupmin-office-macmini.local>",
    "Zach Bjornson <zbbjornson@gmail.com>"
  ],
-  "type": "commonjs",
-  "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"
-    },
-    "./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"
-    },
-    "./helpers": {
-      "require": "./src/helpers/ua-parser-helpers.js",
-      "import": "./src/helpers/ua-parser-helpers.mjs"
-    }
-  },
+  "main": "src/ua-parser.js",
  "files": [
    "dist",
    "src"
  ],
  "scripts": {
-    "build": "./script/build-dist.sh && ./script/build-module.js",
-    "fuzz": "jazzer ./test/jazzer-fuzz-test.js --sync",
-    "test": "./script/test-all.sh",
-    "test:jshint": "jshint src && jshint script",
-    "test:lockfile-lint": "npx lockfile-lint -p package-lock.json",
-    "test:mocha": "mocha -R list test/mocha*js",
-    "test:playwright": "playwright test"
+    "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"
+  },
+  "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})"
+    ]
  },
  "devDependencies": {
    "@babel/parser": "7.15.8",
    "@babel/traverse": "7.15.4",
-    "@jazzer.js/core": "^1.4.0",
-    "@playwright/test": "~1.32.2",
-    "jshint": "~2.13.6",
+    "jshint": "~2.12.0",
    "mocha": "~8.2.0",
-    "requirejs": "2.3.2",
+    "requirejs": "^2.3.2",
    "safe-regex": "^2.1.1",
-    "uglify-js": "~3.12.0"
+    "uglify-js": "~3.12.0",
+    "verup": "^1.3.x"
  },
  "repository": {
    "type": "git",
@@ -197,7 +183,6 @@
  },
  "directories": {
    "dist": "dist",
-    "script": "script",
    "src": "src",
    "test": "test"
  },
@@ -212,10 +197,6 @@
    {
      "type": "paypal",
      "url": "https://paypal.me/faisalman"
-    },
-    {
-      "type": "github",
-      "url": "https://github.com/sponsors/faisalman"
    }
  ]
 }
--- a/readme.md
+++ b/readme.md
@@ -3,26 +3,20 @@
 </p>

 <p align="center">
-<a href="https://www.npmjs.com/package/ua-parser-js"><img src="https://img.shields.io/npm/dw/ua-parser-js?color=red&logo=npm&label=NPM%20DOWNLOADS&style=for-the-badge"></a>
-<a href="https://www.jsdelivr.com/package/npm/ua-parser-js"><img src="https://img.shields.io/jsdelivr/gh/hw/faisalman/ua-parser-js?logo=jsdelivr&style=for-the-badge"></a>
-<a href="https://github.com/faisalman/ua-parser-js"><img src="https://img.shields.io/github/stars/faisalman/ua-parser-js?color=yellow&logo=github&style=for-the-badge"></a>
-<a href="https://bundlephobia.com/package/ua-parser-js@1.0.35"><img src="https://img.shields.io/bundlephobia/minzip/ua-parser-js?logo=hackthebox&logoColor=white&style=for-the-badge"/></a>
-<a href="https://github.com/faisalman/ua-parser-js/graphs/contributors"><img src="https://img.shields.io/github/contributors/faisalman/ua-parser-js?color=purple&logo=githubsponsors&style=for-the-badge"></a>
-<a href="https://www.npmjs.com/package/ua-parser-js"><img src="https://img.shields.io/npm/v/ua-parser-js.svg?logo=npm&color=red&style=for-the-badge"></a>
-<a href="https://cdnjs.com/libraries/UAParser.js"><img src="https://img.shields.io/cdnjs/v/UAParser.js.svg?color=orange&style=for-the-badge"></a>
-<img src="https://img.shields.io/ossf-scorecard/github.com/faisalman/ua-parser-js?label=openssf%20scorecard&style=for-the-badge">
+<a href="https://travis-ci.org/faisalman/ua-parser-js"><img src="https://travis-ci.org/faisalman/ua-parser-js.svg?branch=master"></a>
+<a href="https://www.npmjs.com/package/ua-parser-js"><img src="https://img.shields.io/npm/v/ua-parser-js.svg"></a>
+<a href="https://www.npmjs.com/package/ua-parser-js"><img src="https://img.shields.io/npm/dw/ua-parser-js.svg"></a>
+<a href="https://www.jsdelivr.com/package/npm/ua-parser-js"><img src="https://data.jsdelivr.com/v1/package/npm/ua-parser-js/badge"></a>
+<a href="https://cdnjs.com/libraries/UAParser.js"><img src="https://img.shields.io/cdnjs/v/UAParser.js.svg"></a>
 </p>

 # UAParser.js

-JavaScript library to detect Browser, Engine, OS, CPU, and Device type/model from User-Agent & Client-Hints data that can be used either in browser (client-side) or node.js (server-side).
+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 : 
-  * v1 : https://github.com/faisalman/ua-parser-js/tree/1.0.35#documentation
-  * v2 : https://faisalman.github.io/ua-parser-js-docs/v2

 ***

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

 ---

-# Version 2.0
-What's new & breaking, please read [CHANGELOG](changelog.md) before upgrading.
-
 # Documentation
-### `UAParser([user-agent:string][,extensions:object][,headers:object(since@2.0)]):IData`
+### UAParser([user-agent][,extensions])
+typeof `user-agent` "string".
+
+typeof `extensions` "array".
+
+In The Browser environment you dont need to pass the user-agent string to the function, you can just call the funtion and it should automatically get the string from the `window.navigator.userAgent`, but that is not the case in nodejs. The user-agent string must be passed in nodejs for the function to work.
+Usually you can find the user agent in:
+`request.headers["user-agent"]`.

-In browser environment you don't need to pass the user-agent string to the function, as it should automatically get the string from the `window.navigator.userAgent`. Whereas in nodejs environment, the user-agent string must be passed in order for the function to work (usually you can find the user-agent in: `request.headers["user-agent"]`).

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

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

-When you call `UAParser` without the `new` keyword, it will automatically call `getResult()` function and return the parsed results.
-
-```sh
-returns result object `{ ua: '', browser: {}, cpu: {}, device: {}, engine: {}, os: {} }`
-```
-
-## `UAParser`:
+## Methods

 #### Methods table
 The methods are self explanatory, here's a small overview on all the available methods:
- *  `getResult()` - returns all function object calls, user-agent string, browser info, cpu, device, engine, os:
+*  `getResult()` - returns all function object calls, user-agent string, browser info, cpu, device, engine, os:
 `{ ua: '', browser: {}, cpu: {}, device: {}, engine: {}, os: {} }`.

 *  `getBrowser()`      - returns the browser name and version.
@@ -94,47 +89,42 @@ The methods are self explanatory, here's a small overview on all the available m
 *  `getOS()`           - returns the running operating system name and version.
 *  `getCPU()`          - returns CPU architectural design name.
 *  `getUA()`           - returns the user-agent string.
- *  `setUA(ua)`         - set a custom user-agent to be parsed.
+ *  `setUA(user-agent)` - set a custom user-agent to be parsed.
+

 ---

-#### * `getResult():IData`
+* `getResult()`
+    * returns `{ ua: '', browser: {}, cpu: {}, device: {}, engine: {}, os: {} }`
+
+* `getBrowser()`
+    * returns `{ name: '', version: '' }`

 ```sh
-returns `{ ua: '', browser: {}, cpu: {}, device: {}, engine: {}, os: {} }`
-```
-
-#### * `getBrowser():IData`
-
-```sh
-returns `{ name: '', version: '' }`
-
 # Possible 'browser.name':
 2345Explorer, 360 Browser, Amaya, Android Browser, Arora, Avant, Avast, AVG,
 BIDUBrowser, Baidu, Basilisk, Blazer, Bolt, Brave, Bowser, Camino, Chimera,
-[Mobile] Chrome [Headless/WebView], Chromium, Cobalt, Comodo Dragon, Dillo,
+Chrome Headless, Chrome WebView, Chrome, Chromium, Cobalt, Comodo Dragon, Dillo,
 Dolphin, Doris, DuckDuckGo, Edge, Electron, Epiphany, Facebook, Falkon, Fennec, 
-Firebird, [Mobile] Firefox [Focus/Reality], Flock, Flow, GSA, GoBrowser, HeyTap,
-Huawei Browser, ICE Browser, IE, IEMobile, IceApe, IceCat, IceDragon, Iceweasel, 
-Instagram, Iridium, Iron, Jasmine, Kakao[Story/Talk], K-Meleon, Kindle, Klar, 
-Konqueror, LBBROWSER, Line, LinkedIn, Links, Lunascape, Lynx, MIUI Browser, 
-Maemo Browser, Maemo, Maxthon, MetaSr Midori, Minimo, Mosaic, Mozilla, NetFront, 
+Firebird, Firefox [Focus/Reality], Flock, Flow, GSA, GoBrowser, Huawei Browser, 
+ICE Browser, IE, IEMobile, IceApe, IceCat, IceDragon, Iceweasel, Instagram, 
+Iridium, Iron, Jasmine, Kakao[Story/Talk], K-Meleon, Kindle, Klar, Konqueror, 
+LBBROWSER, Line, LinkedIn, Links, Lunascape, Lynx, MIUI Browser, Maemo Browser, 
+Maemo, Maxthon, MetaSr Midori, Minimo, 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, [Mobile] Safari, 
+Puffin, QQ, QQBrowser, QQBrowserLite, Quark, QupZilla, RockMelt, Safari, 
 Sailfish Browser, Samsung Browser, SeaMonkey, Silk, Skyfire, Sleipnir, Slim, 
-SlimBrowser, Snapchat, Swiftfox, Tesla, TikTok, Tizen Browser, UCBrowser, 
-UP.Browser, Viera, Vivaldi, Waterfox, WeChat, Weibo, Yandex, baidu, iCab, w3m, 
-Whale Browser, ...
+SlimBrowser, Swiftfox, Tesla, Tizen Browser, UCBrowser, UP.Browser, Viera, 
+Vivaldi, Waterfox, WeChat, Weibo, Yandex, baidu, iCab, w3m, Whale Browser...

 # 'browser.version' determined dynamically
 ```

-#### * `getDevice():IData`
+* `getDevice()`
+    * returns `{ model: '', type: '', vendor: '' }`

 ```sh
-returns `{ model: '', type: '', vendor: '' }`
-
 # Possible 'device.type':
 console, mobile, tablet, smarttv, wearable, embedded

@@ -147,32 +137,29 @@ console, mobile, tablet, smarttv, wearable, embedded

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

 # 'device.model' determined dynamically
 ```

-#### * `getEngine():IData`
+* `getEngine()`
+    * returns `{ name: '', version: '' }`

 ```sh
-returns `{ name: '', version: '' }`
-
 # Possible 'engine.name'
-Amaya, Blink, EdgeHTML, Flow, Gecko, Goanna, iCab, KHTML, LibWeb, Links, Lynx, 
-NetFront, NetSurf, Presto, Tasman, Trident, w3m, WebKit
+Amaya, Blink, EdgeHTML, Flow, Gecko, Goanna, iCab, KHTML, Links, Lynx, NetFront,
+NetSurf, Presto, Tasman, Trident, w3m, WebKit

 # 'engine.version' determined dynamically
 ```

-#### * `getOS():IData`
+* `getOS()`
+    * returns `{ name: '', version: '' }`

 ```sh
-returns `{ name: '', version: '' }`
-
 # 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, 
@@ -180,270 +167,26 @@ Fuchsia, Gentoo, GhostBSD, GNU, Haiku, HarmonyOS, HP-UX, Hurd, iOS, Joli, KaiOS,
 Linpus, Linspire,Linux, Mac OS, Maemo, Mageia, Mandriva, Manjaro, MeeGo, Minix, 
 Mint, Morph OS, NetBSD, NetRange, NetTV, Nintendo, OpenBSD, OpenVMS, OS/2, Palm, 
 PC-BSD, PCLinuxOS, Plan9, PlayStation, QNX, Raspbian, RedHat, RIM Tablet OS, 
-RISC OS, Sabayon, Sailfish, SerenityOS, Series40, Slackware, Solaris, SUSE, Symbian, 
-Tizen, Ubuntu, Unix, VectorLinux, Viera, watchOS, WebOS, Windows [Phone/Mobile], 
-Zenwalk, ...
+RISC OS, Sabayon, Sailfish, Series40, Slackware, Solaris, SUSE, Symbian, Tizen, 
+Ubuntu, Unix, VectorLinux, Viera, watchOS, WebOS, Windows [Phone/Mobile], Zenwalk, ...

 # 'os.version' determined dynamically
 ```

-#### * `getCPU():IData`
+* `getCPU()`
+    * returns `{ architecture: '' }`

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

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

+* `setUA(uastring)`
+    * set UA string to be parsed
+    * returns current instance

 # Usage

@@ -456,8 +199,8 @@ console.log(browser.name); // Thunderbird
 <script src="ua-parser.min.js"></script>
 <script>

-    var uap = new UAParser();
-    console.log(uap.getResult());
+    var parser = new UAParser();
+    console.log(parser.getResult());
    /*
        /// This will print an object structured like this:
        {
@@ -465,7 +208,7 @@ console.log(browser.name); // Thunderbird
            browser: {
                name: "",
                version: "",
-                major: ""
+                major: "" //@deprecated
            },
            engine: {
                name: "",
@@ -489,10 +232,10 @@ console.log(browser.name); // Thunderbird

    // Now let's try a custom user-agent string as an example
    var uastring1 = "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/535.2 (KHTML, like Gecko) Ubuntu/11.10 Chromium/15.0.874.106 Chrome/15.0.874.106 Safari/535.2";
-    uap.setUA(uastring1);
-    var result = uap.getResult();
+    parser.setUA(uastring1);
+    var result = parser.getResult();
    // You can also use UAParser constructor directly without having to create an instance:
-    // var ua = UAParser(uastring1);
+    // 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}
@@ -503,14 +246,14 @@ console.log(browser.name); // Thunderbird

    // Do some other tests
    var uastring2 = "Mozilla/5.0 (compatible; Konqueror/4.1; OpenBSD) KHTML/4.1.4 (like Gecko)";
-    console.log(uap.setUA(uastring2).getBrowser().name); // "Konqueror"
-    console.log(uap.getOS());                            // {name: "OpenBSD", version: undefined}
-    console.log(uap.getEngine());                        // {name: "KHTML", version: "4.1.4"}
+    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(uap.setUA(uastring3).getDevice().model); // "PlayBook"
-    console.log(uap.getOS())                             // {name: "RIM Tablet OS", version: "1.0.0"}
-    console.log(uap.getBrowser().name);                  // "Safari"
+    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>
@@ -529,24 +272,11 @@ $ npm install ua-parser-js

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

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

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

 ```sh
@@ -603,6 +320,20 @@ console.log(parseInt($.ua.browser.version.split('.')[0], 10));  // 4
 $('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

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

 MIT License

-Copyright (c) 2012-2023 Faisal Salman <<f@faisalman.com>>
+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
--- a/script/build-dist.sh
+++ b/script/build-dist.sh
@@ -1,13 +0,0 @@
-#!/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
--- a/script/build-module.js
+++ b/script/build-module.js
@@ -1,57 +0,0 @@
-#!/usr/bin/env node
-/* jshint esversion: 6 */ 
-const fs = require('fs');
-const PATH = {
-    main : {
-        src : 'src/main/ua-parser.js',
-        dest : 'src/main/ua-parser.mjs',
-        title : ''
-    },
-    enums : {
-        src : 'src/enums/ua-parser-enums.js',
-        dest :'src/enums/ua-parser-enums.mjs',
-        title : 'enums'
-    },
-    extensions : {
-        src : 'src/extensions/ua-parser-extensions.js',
-        dest : 'src/extensions/ua-parser-extensions.mjs',
-        title : 'extensions'
-    },
-    helpers : {
-        src : 'src/helpers/ua-parser-helpers.js',
-        dest : 'src/helpers/ua-parser-helpers.mjs',
-        title : 'helpers'
-    }
-};
-const generateMJS = (module, replacers) => {
-    const { src, dest, title } = PATH[module];
-    let text = fs.readFileSync(src, 'utf-8');
-    replacers.forEach(replacer => {
-        text = text.replace(replacer[0], replacer[1]);
-    });
-
-    console.log(`Generate ${dest}`);
-
-    fs.writeFileSync(dest,
-`// Generated ESM version of UAParser.js ${title}
-// DO NOT EDIT THIS FILE!
-// Source: /${src}
-
-${text}`, 'utf-8');
-};
-
-// ua-parser.mjs
-generateMJS('main', [
-    [/\(func[\s\S]+strict\';/ig, ''],
-    [/esversion\: 3/ig, 'esversion: 6'],
-    [/\/[\/\s]+export[\s\S]+/ig,'export {UAParser};']
-]);
-
-// ua-parser-enum.mjs
-generateMJS('enums', [[/module\.exports =/ig, 'export']]);
-
-// ua-parser-extension.mjs
-generateMJS('extensions', [[/module\.exports =/ig, 'export']]);
-
-// ua-parser-helpers.mjs
-generateMJS('helpers', [[/module\.exports =/ig, 'export']]);
--- a/script/test-all.sh
+++ b/script/test-all.sh
@@ -1,26 +0,0 @@
-#!/usr/bin/env bash
-
-echo '
- run build
-'
-npm run build || exit 1
-
-echo '
- lint js code
-'
-npm run test:jshint || 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 
--- a/security.md
+++ b/security.md
@@ -2,6 +2,4 @@

 ## 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.
+Please report security issues to `f@faisalman.com`
--- a/src/enums/ua-parser-enums.js
+++ b/src/enums/ua-parser-enums.js
@@ -1,103 +0,0 @@
-///////////////////////////////////////////////
-/*  Enums for UAParser.js v2.0.0-alpha.3
-    https://github.com/faisalman/ua-parser-js
-    Author: Faisal Salman <f@faisalman.com>
-    MIT License */
-//////////////////////////////////////////////
-
-/*jshint esversion: 6 */ 
-
-const BrowserName = Object.freeze({
-    CHROME          : 'Chrome',
-    EDGE            : 'Edge',
-    SAFARI          : 'Safari',
-    FIREFOX         : 'Firefox',
-    OPERA           : 'Opera',
-    MOBILE_CHROME   : 'Mobile Chrome',
-    MOBILE_SAFARI   : 'Mobile Safari',
-    MOBILE_FIREFOX  : 'Mobile Firefox',
-    ANDROID_BROWSER : 'Android Browser'
-
-    // TODO : test!
-});
-
-const CPUArch = Object.freeze({
-    IA32    : 'ia32',
-    AMD64   : 'amd64',
-    IA64    : 'ia64',
-    ARM     : 'arm',
-    ARM64   : 'arm64',
-    ARMHF   : 'armhf',
-    _68K    : '68k',
-    AVR     : 'avr',
-    IRIX    : 'irix',
-    IRIX64  : 'irix64',
-    MIPS    : 'mips',
-    MIPS64  : 'mips64',
-    PPC     : 'ppc',
-    SPARC   : 'sparc',
-    SPARC64 : 'sparc64'
-});
-
-const DeviceType = Object.freeze({
-    MOBILE  : 'mobile',
-    TABLET  : 'tablet',
-    SMARTTV : 'smarttv',
-    CONSOLE : 'console',
-    WEARABLE: 'wearable',
-    EMBEDDED: 'embedded'
-});
-
-const DeviceVendor = Object.freeze({
-    APPLE   : 'Apple',
-    SAMSUNG : 'Samsung',
-    HUAWEI  : 'Huawei',
-    XIAOMI  : 'Xiaomi',
-    OPPO    : 'OPPO',
-    VIVO    : 'Vivo',
-    REALME  : 'Realme',
-    LENOVO  : 'Lenovo',
-    LG      : 'LG'
-
-    // TODO : test!
-});
-
-const EngineName = Object.freeze({
-    AMAYA   : 'Amaya',
-    BLINK   : 'Blink',
-    EDGEHTML: 'EdgeHTML',
-    FLOW    : 'Flow',
-    GECKO   : 'Gecko',
-    GOANNA  : 'Goanna',
-    ICAB    : 'iCab',
-    LIBWEB  : 'LibWeb',
-    KHTML   : 'KHTML',
-    LINKS   : 'Links',
-    LYNX    : 'Lynx',
-    NETFRONT: 'NetFront',
-    NETSURF : 'NetSurf',
-    PRESTO  : 'Presto',
-    TASMAN  : 'Tasman',
-    TRIDENT : 'Trident',
-    W3M     : 'w3m',
-    WEBKIT  : 'WebKit'
-});
-
-const OSName = Object.freeze({
-    WINDOWS : 'Windows',
-    LINUX   : 'Linux',
-    MACOS   : 'macOS',
-    IOS     : 'iOS',
-    ANDROID : 'Android'
-
-    // TODO : test!
-});
-
-module.exports = { 
-    BrowserName, 
-    CPUArch, 
-    DeviceType, 
-    DeviceVendor,
-    EngineName,
-    OSName
-};
--- a/src/enums/ua-parser-enums.mjs
+++ b/src/enums/ua-parser-enums.mjs
@@ -1,107 +0,0 @@
-// Generated ESM version of UAParser.js enums
-// DO NOT EDIT THIS FILE!
-// Source: /src/enums/ua-parser-enums.js
-
-///////////////////////////////////////////////
-/*  Enums for UAParser.js v2.0.0-alpha.3
-    https://github.com/faisalman/ua-parser-js
-    Author: Faisal Salman <f@faisalman.com>
-    MIT License */
-//////////////////////////////////////////////
-
-/*jshint esversion: 6 */ 
-
-const BrowserName = Object.freeze({
-    CHROME          : 'Chrome',
-    EDGE            : 'Edge',
-    SAFARI          : 'Safari',
-    FIREFOX         : 'Firefox',
-    OPERA           : 'Opera',
-    MOBILE_CHROME   : 'Mobile Chrome',
-    MOBILE_SAFARI   : 'Mobile Safari',
-    MOBILE_FIREFOX  : 'Mobile Firefox',
-    ANDROID_BROWSER : 'Android Browser'
-
-    // TODO : test!
-});
-
-const CPUArch = Object.freeze({
-    IA32    : 'ia32',
-    AMD64   : 'amd64',
-    IA64    : 'ia64',
-    ARM     : 'arm',
-    ARM64   : 'arm64',
-    ARMHF   : 'armhf',
-    _68K    : '68k',
-    AVR     : 'avr',
-    IRIX    : 'irix',
-    IRIX64  : 'irix64',
-    MIPS    : 'mips',
-    MIPS64  : 'mips64',
-    PPC     : 'ppc',
-    SPARC   : 'sparc',
-    SPARC64 : 'sparc64'
-});
-
-const DeviceType = Object.freeze({
-    MOBILE  : 'mobile',
-    TABLET  : 'tablet',
-    SMARTTV : 'smarttv',
-    CONSOLE : 'console',
-    WEARABLE: 'wearable',
-    EMBEDDED: 'embedded'
-});
-
-const DeviceVendor = Object.freeze({
-    APPLE   : 'Apple',
-    SAMSUNG : 'Samsung',
-    HUAWEI  : 'Huawei',
-    XIAOMI  : 'Xiaomi',
-    OPPO    : 'OPPO',
-    VIVO    : 'Vivo',
-    REALME  : 'Realme',
-    LENOVO  : 'Lenovo',
-    LG      : 'LG'
-
-    // TODO : test!
-});
-
-const EngineName = Object.freeze({
-    AMAYA   : 'Amaya',
-    BLINK   : 'Blink',
-    EDGEHTML: 'EdgeHTML',
-    FLOW    : 'Flow',
-    GECKO   : 'Gecko',
-    GOANNA  : 'Goanna',
-    ICAB    : 'iCab',
-    LIBWEB  : 'LibWeb',
-    KHTML   : 'KHTML',
-    LINKS   : 'Links',
-    LYNX    : 'Lynx',
-    NETFRONT: 'NetFront',
-    NETSURF : 'NetSurf',
-    PRESTO  : 'Presto',
-    TASMAN  : 'Tasman',
-    TRIDENT : 'Trident',
-    W3M     : 'w3m',
-    WEBKIT  : 'WebKit'
-});
-
-const OSName = Object.freeze({
-    WINDOWS : 'Windows',
-    LINUX   : 'Linux',
-    MACOS   : 'macOS',
-    IOS     : 'iOS',
-    ANDROID : 'Android'
-
-    // TODO : test!
-});
-
-export { 
-    BrowserName, 
-    CPUArch, 
-    DeviceType, 
-    DeviceVendor,
-    EngineName,
-    OSName
-};
--- a/src/extensions/ua-parser-extensions.js
+++ b/src/extensions/ua-parser-extensions.js
@@ -1,248 +0,0 @@
-///////////////////////////////////////////////
-/*  Extensions for UAParser.js v2.0.0-alpha.3
-    https://github.com/faisalman/ua-parser-js
-    Author: Faisal Salman <f@faisalman.com>
-    MIT License */
-//////////////////////////////////////////////
-
-/*jshint esversion: 6 */ 
-
-const MODEL     = 'model';
-const NAME      = 'name';
-const TYPE      = 'type';
-const VENDOR    = 'vendor';
-const VERSION   = 'version';
-const MOBILE    = 'mobile';
-const TABLET    = 'tablet';
-
-const Apps = Object.freeze({
-    browser : [
-        [/chatlyio\/([\d\.]+)/i], [VERSION, 'Slack', [TYPE, 'app']]
-    ]
-});
-
-const Bots = Object.freeze({
-    browser : [
-        // Googlebot / BingBot / MSNBot / FacebookBot
-        [/((?:google|bing|msn|facebook)bot(?:[\-imagevdo]{0,6})|bingpreview)\/([\w\.]+)/i], [NAME, VERSION, [TYPE, 'bot']],
-
-        // GPTBot - https://platform.openai.com/docs/gptbot
-        [/(gptbot)\/([\w\.]+)/i], [NAME, VERSION, [TYPE, 'bot']],
-
-        // Slackbot - https://api.slack.com/robots
-        [/(slack(?:bot)?(?:-imgproxy|-linkexpanding)?) ([\w\.]+)/i], [NAME, VERSION, [TYPE, 'bot']]
-    ]
-});
-
-const CLIs = Object.freeze({
-    browser : [
-                                                                            // wget / curl / lynx
-        [/(wget|curl|lynx)\/([\w\.]+)/i], [NAME, VERSION, [TYPE, 'cli']]
-    ]
-});
-
-const ExtraDevices = Object.freeze({
-    device : [[    
-        /(nook)[\w ]+build\/(\w+)/i,                                        // Nook
-        /(dell) (strea[kpr\d ]*[\dko])/i,                                   // Dell Streak
-        /(le[- ]+pan)[- ]+(\w{1,9}) bui/i,                                  // Le Pan Tablets
-        /(trinity)[- ]*(t\d{3}) bui/i,                                      // Trinity Tablets
-        /(gigaset)[- ]+(q\w{1,9}) bui/i,                                    // Gigaset Tablets
-        /(vodafone) ([\w ]+)(?:\)| bui)/i                                   // Vodafone
-        ], [VENDOR, MODEL, [TYPE, TABLET]], [
-
-        /(u304aa)/i                                                         // AT&T
-        ], [MODEL, [VENDOR, 'AT&T'], [TYPE, MOBILE]], [
-
-        /\bsie-(\w*)/i                                                      // Siemens
-        ], [MODEL, [VENDOR, 'Siemens'], [TYPE, MOBILE]], [
-
-        /\b(rct\w+) b/i                                                     // RCA Tablets
-        ], [MODEL, [VENDOR, 'RCA'], [TYPE, TABLET]], [
-
-        /\b(venue[\d ]{2,7}) b/i                                            // Dell Venue Tablets
-        ], [MODEL, [VENDOR, 'Dell'], [TYPE, TABLET]], [
-
-        /\b(q(?:mv|ta)\w+) b/i                                              // Verizon Tablet
-        ], [MODEL, [VENDOR, 'Verizon'], [TYPE, TABLET]], [
-
-        /\b(?:barnes[& ]+noble |bn[rt])([\w\+ ]*) b/i                       // Barnes & Noble Tablet
-        ], [MODEL, [VENDOR, 'Barnes & Noble'], [TYPE, TABLET]], [
-
-        /\b(tm\d{3}\w+) b/i
-        ], [MODEL, [VENDOR, 'NuVision'], [TYPE, TABLET]], [
-
-        /\b(k88) b/i                                                        // ZTE K Series Tablet
-        ], [MODEL, [VENDOR, 'ZTE'], [TYPE, TABLET]], [
-
-        /\b(nx\d{3}j) b/i                                                   // ZTE Nubia
-        ], [MODEL, [VENDOR, 'ZTE'], [TYPE, MOBILE]], [
-
-        /\b(gen\d{3}) b.+49h/i                                              // Swiss GEN Mobile
-        ], [MODEL, [VENDOR, 'Swiss'], [TYPE, MOBILE]], [
-
-        /\b(zur\d{3}) b/i                                                   // Swiss ZUR Tablet
-        ], [MODEL, [VENDOR, 'Swiss'], [TYPE, TABLET]], [
-
-        /\b((zeki)?tb.*\b) b/i                                              // Zeki Tablets
-        ], [MODEL, [VENDOR, 'Zeki'], [TYPE, TABLET]], [
-
-        /\b([yr]\d{2}) b/i,
-        /\b(?:dragon[- ]+touch |dt)(\w{5}) b/i                              // Dragon Touch Tablet
-        ], [MODEL, [VENDOR, 'Dragon Touch'], [TYPE, TABLET]], [
-
-        /\b(ns-?\w{0,9}) b/i                                                // Insignia Tablets
-        ], [MODEL, [VENDOR, 'Insignia'], [TYPE, TABLET]], [
-
-        /\b((nxa|next)-?\w{0,9}) b/i                                        // NextBook Tablets
-        ], [MODEL, [VENDOR, 'NextBook'], [TYPE, TABLET]], [
-
-        /\b(xtreme\_)?(v(1[045]|2[015]|[3469]0|7[05])) b/i                  // Voice Xtreme Phones
-        ], [[VENDOR, 'Voice'], MODEL, [TYPE, MOBILE]], [
-
-        /\b(lvtel\-)?(v1[12]) b/i                                           // LvTel Phones
-        ], [[VENDOR, 'LvTel'], MODEL, [TYPE, MOBILE]], [
-
-        /\b(ph-1) /i                                                        // Essential PH-1
-        ], [MODEL, [VENDOR, 'Essential'], [TYPE, MOBILE]], [
-
-        /\b(v(100md|700na|7011|917g).*\b) b/i                               // Envizen Tablets
-        ], [MODEL, [VENDOR, 'Envizen'], [TYPE, TABLET]], [
-
-        /\b(trio[-\w\. ]+) b/i                                              // MachSpeed Tablets
-        ], [MODEL, [VENDOR, 'MachSpeed'], [TYPE, TABLET]], [
-
-        /\btu_(1491) b/i                                                    // Rotor Tablets
-        ], [MODEL, [VENDOR, 'Rotor'], [TYPE, TABLET]]
-    ]
-});
-
-const Emails = Object.freeze({
-    browser : [
-                                                                            // Microsoft Outlook / Thunderbird
-        [/(microsoft outlook|thunderbird)[\s\/]([\w\.]+)/i], [NAME, VERSION, [TYPE, 'email']]
-    ]
-});
-
-const MediaPlayers = Object.freeze({
-    browser : [[
-
-        /(apple(?:coremedia|))\/([\w\._]+)/i,                               // Generic Apple CoreMedia
-        /(coremedia) v([\w\._]+)/i
-        ], [NAME, VERSION], [
-
-        /(aqualung|lyssna|bsplayer)\/([\w\.-]+)/i                           // Aqualung/Lyssna/BSPlayer
-        ], [NAME, VERSION], [
-
-        /(ares|ossproxy)\s([\w\.-]+)/i                                      // Ares/OSSProxy
-        ], [NAME, VERSION], [
-
-        /(audacious|audimusicstream|amarok|bass|core|dalvik|gnomemplayer|music on console|nsplayer|psp-internetradioplayer|videos)\/([\w\.-]+)/i,
-                                                                            // Audacious/AudiMusicStream/Amarok/BASS/OpenCORE/Dalvik/GnomeMplayer/MoC
-                                                                            // NSPlayer/PSP-InternetRadioPlayer/Videos
-        /(clementine|music player daemon)\s([\w\.-]+)/i,                    // Clementine/MPD
-        /(lg player|nexplayer)\s([\d\.]+)/i,
-        /player\/(nexplayer|lg player)\s([\w\.-]+)/i                        // NexPlayer/LG Player
-        ], [NAME, VERSION], [
-        /(nexplayer)\s([\w\.-]+)/i                                          // Nexplayer
-        ], [NAME, VERSION], [
-
-        /(flrp)\/([\w\.-]+)/i                                               // Flip Player
-        ], [[NAME, 'Flip Player'], VERSION], [
-
-        /(fstream|nativehost|queryseekspider|ia-archiver|facebookexternalhit)/i
-                                                                            // FStream/NativeHost/QuerySeekSpider/IA Archiver/facebookexternalhit
-        ], [NAME], [
-
-        /(gstreamer) souphttpsrc.+libsoup\/([\w\.-]+)/i
-                                                                            // Gstreamer
-        ], [NAME, VERSION], [
-
-        /(htc streaming player)\s[\w_]+\s\/\s([\d\.]+)/i,                   // HTC Streaming Player
-        /(java|python-urllib|python-requests|wget|libcurl)\/([\w\.-_]+)/i,
-                                                                            // Java/urllib/requests/wget/cURL
-        /(lavf)([\d\.]+)/i                                                  // Lavf (FFMPEG)
-        ], [NAME, VERSION], [
-
-        /(htc_one_s)\/([\d\.]+)/i,                                          // HTC One S
-        ], [[NAME, /_/g, ' '], VERSION], [
-
-        /(mplayer)(?:\s|\/)(?:(?:sherpya-){0,1}svn)(?:-|\s)(r\d+(?:-\d+[\w\.-]+))/i,
-                                                                            // MPlayer SVN
-        ], [NAME, VERSION], [
-
-        /(mplayer)(?:\s|\/)([\w\.-]+)/i,                                    // MPlayer
-        /(mplayer) unknown-([\w\.\-]+)/i                                    // MPlayer UNKNOWN
-        ], [NAME, VERSION], [
-
-        /(mplayer)/i,                                                       // MPlayer (no other info)
-        /(yourmuze)/i,                                                      // YourMuze
-        /(media player classic|nero showtime)/i                             // Media Player Classic/Nero ShowTime
-        ], [NAME], [
-
-        /(nero (?:home|scout))\/([\w\.-]+)/i                                // Nero Home/Nero Scout
-        ], [NAME, VERSION], [
-
-        /(nokia\d+)\/([\w\.-]+)/i                                           // Nokia
-        ], [NAME, VERSION], [
-
-        /\s(songbird)\/([\w\.-]+)/i                                         // Songbird/Philips-Songbird
-        ], [NAME, VERSION], [
-
-        /(winamp)3 version ([\w\.-]+)/i,                                    // Winamp
-        /(winamp)\s([\w\.-]+)/i,
-        /(winamp)mpeg\/([\w\.-]+)/i
-        ], [NAME, VERSION], [
-
-        /(ocms-bot|tapinradio|tunein radio|unknown|winamp|inlight radio)/i  // OCMS-bot/tap in radio/tunein/unknown/winamp (no other info)
-                                                                            // inlight radio
-        ], [NAME], [
-
-        /(quicktime|rma|radioapp|radioclientapplication|soundtap|totem|stagefright|streamium)\/([\w\.-]+)/i
-                                                                            // QuickTime/RealMedia/RadioApp/RadioClientApplication/
-                                                                            // SoundTap/Totem/Stagefright/Streamium
-        ], [NAME, VERSION], [
-
-        /(smp)([\d\.]+)/i                                                   // SMP
-        ], [NAME, VERSION], [
-
-        /(vlc) media player - version ([\w\.]+)/i,                          // VLC Videolan
-        /(vlc)\/([\w\.-]+)/i,
-        /(xbmc|gvfs|xine|xmms|irapp)\/([\w\.-]+)/i,                         // XBMC/gvfs/Xine/XMMS/irapp
-        /(foobar2000)\/([\d\.]+)/i,                                         // Foobar2000
-        /(itunes)\/([\d\.]+)/i                                              // iTunes
-        ], [NAME, VERSION], [
-
-        /(wmplayer)\/([\w\.-]+)/i,                                          // Windows Media Player
-        /(windows-media-player)\/([\w\.-]+)/i
-        ], [[NAME, /-/g, ' '], VERSION], [
-
-        /windows\/([\w\.-]+) upnp\/[\d\.]+ dlnadoc\/[\d\.]+ (home media server)/i,
-                                                                            // Windows Media Server
-        ], [VERSION, [NAME, 'Windows']], [
-
-        /(com\.riseupradioalarm)\/([\d\.]*)/i                               // RiseUP Radio Alarm
-        ], [NAME, VERSION], [
-
-        /(rad.io)\s([\d\.]+)/i,                                             // Rad.io
-        /(radio.(?:de|at|fr))\s([\d\.]+)/i
-        ], [[NAME, 'rad.io'], VERSION]
-    ]
-});
-
-const Modules = Object.freeze({
-    browser : [
-                                                                            // Axios/jsdom/Scrapy
-        [/\b(axios|jsdom|scrapy)\/([\w\.]+)/i], [NAME, VERSION, [TYPE, 'module']]
-    ]
-});
-
-module.exports = { 
-    Apps,
-    Bots,
-    CLIs,
-    ExtraDevices,
-    Emails,
-    MediaPlayers,
-    Modules
-};
--- a/src/extensions/ua-parser-extensions.mjs
+++ b/src/extensions/ua-parser-extensions.mjs
@@ -1,252 +0,0 @@
-// Generated ESM version of UAParser.js extensions
-// DO NOT EDIT THIS FILE!
-// Source: /src/extensions/ua-parser-extensions.js
-
-///////////////////////////////////////////////
-/*  Extensions for UAParser.js v2.0.0-alpha.3
-    https://github.com/faisalman/ua-parser-js
-    Author: Faisal Salman <f@faisalman.com>
-    MIT License */
-//////////////////////////////////////////////
-
-/*jshint esversion: 6 */ 
-
-const MODEL     = 'model';
-const NAME      = 'name';
-const TYPE      = 'type';
-const VENDOR    = 'vendor';
-const VERSION   = 'version';
-const MOBILE    = 'mobile';
-const TABLET    = 'tablet';
-
-const Apps = Object.freeze({
-    browser : [
-        [/chatlyio\/([\d\.]+)/i], [VERSION, 'Slack', [TYPE, 'app']]
-    ]
-});
-
-const Bots = Object.freeze({
-    browser : [
-        // Googlebot / BingBot / MSNBot / FacebookBot
-        [/((?:google|bing|msn|facebook)bot(?:[\-imagevdo]{0,6})|bingpreview)\/([\w\.]+)/i], [NAME, VERSION, [TYPE, 'bot']],
-
-        // GPTBot - https://platform.openai.com/docs/gptbot
-        [/(gptbot)\/([\w\.]+)/i], [NAME, VERSION, [TYPE, 'bot']],
-
-        // Slackbot - https://api.slack.com/robots
-        [/(slack(?:bot)?(?:-imgproxy|-linkexpanding)?) ([\w\.]+)/i], [NAME, VERSION, [TYPE, 'bot']]
-    ]
-});
-
-const CLIs = Object.freeze({
-    browser : [
-                                                                            // wget / curl / lynx
-        [/(wget|curl|lynx)\/([\w\.]+)/i], [NAME, VERSION, [TYPE, 'cli']]
-    ]
-});
-
-const ExtraDevices = Object.freeze({
-    device : [[    
-        /(nook)[\w ]+build\/(\w+)/i,                                        // Nook
-        /(dell) (strea[kpr\d ]*[\dko])/i,                                   // Dell Streak
-        /(le[- ]+pan)[- ]+(\w{1,9}) bui/i,                                  // Le Pan Tablets
-        /(trinity)[- ]*(t\d{3}) bui/i,                                      // Trinity Tablets
-        /(gigaset)[- ]+(q\w{1,9}) bui/i,                                    // Gigaset Tablets
-        /(vodafone) ([\w ]+)(?:\)| bui)/i                                   // Vodafone
-        ], [VENDOR, MODEL, [TYPE, TABLET]], [
-
-        /(u304aa)/i                                                         // AT&T
-        ], [MODEL, [VENDOR, 'AT&T'], [TYPE, MOBILE]], [
-
-        /\bsie-(\w*)/i                                                      // Siemens
-        ], [MODEL, [VENDOR, 'Siemens'], [TYPE, MOBILE]], [
-
-        /\b(rct\w+) b/i                                                     // RCA Tablets
-        ], [MODEL, [VENDOR, 'RCA'], [TYPE, TABLET]], [
-
-        /\b(venue[\d ]{2,7}) b/i                                            // Dell Venue Tablets
-        ], [MODEL, [VENDOR, 'Dell'], [TYPE, TABLET]], [
-
-        /\b(q(?:mv|ta)\w+) b/i                                              // Verizon Tablet
-        ], [MODEL, [VENDOR, 'Verizon'], [TYPE, TABLET]], [
-
-        /\b(?:barnes[& ]+noble |bn[rt])([\w\+ ]*) b/i                       // Barnes & Noble Tablet
-        ], [MODEL, [VENDOR, 'Barnes & Noble'], [TYPE, TABLET]], [
-
-        /\b(tm\d{3}\w+) b/i
-        ], [MODEL, [VENDOR, 'NuVision'], [TYPE, TABLET]], [
-
-        /\b(k88) b/i                                                        // ZTE K Series Tablet
-        ], [MODEL, [VENDOR, 'ZTE'], [TYPE, TABLET]], [
-
-        /\b(nx\d{3}j) b/i                                                   // ZTE Nubia
-        ], [MODEL, [VENDOR, 'ZTE'], [TYPE, MOBILE]], [
-
-        /\b(gen\d{3}) b.+49h/i                                              // Swiss GEN Mobile
-        ], [MODEL, [VENDOR, 'Swiss'], [TYPE, MOBILE]], [
-
-        /\b(zur\d{3}) b/i                                                   // Swiss ZUR Tablet
-        ], [MODEL, [VENDOR, 'Swiss'], [TYPE, TABLET]], [
-
-        /\b((zeki)?tb.*\b) b/i                                              // Zeki Tablets
-        ], [MODEL, [VENDOR, 'Zeki'], [TYPE, TABLET]], [
-
-        /\b([yr]\d{2}) b/i,
-        /\b(?:dragon[- ]+touch |dt)(\w{5}) b/i                              // Dragon Touch Tablet
-        ], [MODEL, [VENDOR, 'Dragon Touch'], [TYPE, TABLET]], [
-
-        /\b(ns-?\w{0,9}) b/i                                                // Insignia Tablets
-        ], [MODEL, [VENDOR, 'Insignia'], [TYPE, TABLET]], [
-
-        /\b((nxa|next)-?\w{0,9}) b/i                                        // NextBook Tablets
-        ], [MODEL, [VENDOR, 'NextBook'], [TYPE, TABLET]], [
-
-        /\b(xtreme\_)?(v(1[045]|2[015]|[3469]0|7[05])) b/i                  // Voice Xtreme Phones
-        ], [[VENDOR, 'Voice'], MODEL, [TYPE, MOBILE]], [
-
-        /\b(lvtel\-)?(v1[12]) b/i                                           // LvTel Phones
-        ], [[VENDOR, 'LvTel'], MODEL, [TYPE, MOBILE]], [
-
-        /\b(ph-1) /i                                                        // Essential PH-1
-        ], [MODEL, [VENDOR, 'Essential'], [TYPE, MOBILE]], [
-
-        /\b(v(100md|700na|7011|917g).*\b) b/i                               // Envizen Tablets
-        ], [MODEL, [VENDOR, 'Envizen'], [TYPE, TABLET]], [
-
-        /\b(trio[-\w\. ]+) b/i                                              // MachSpeed Tablets
-        ], [MODEL, [VENDOR, 'MachSpeed'], [TYPE, TABLET]], [
-
-        /\btu_(1491) b/i                                                    // Rotor Tablets
-        ], [MODEL, [VENDOR, 'Rotor'], [TYPE, TABLET]]
-    ]
-});
-
-const Emails = Object.freeze({
-    browser : [
-                                                                            // Microsoft Outlook / Thunderbird
-        [/(microsoft outlook|thunderbird)[\s\/]([\w\.]+)/i], [NAME, VERSION, [TYPE, 'email']]
-    ]
-});
-
-const MediaPlayers = Object.freeze({
-    browser : [[
-
-        /(apple(?:coremedia|))\/([\w\._]+)/i,                               // Generic Apple CoreMedia
-        /(coremedia) v([\w\._]+)/i
-        ], [NAME, VERSION], [
-
-        /(aqualung|lyssna|bsplayer)\/([\w\.-]+)/i                           // Aqualung/Lyssna/BSPlayer
-        ], [NAME, VERSION], [
-
-        /(ares|ossproxy)\s([\w\.-]+)/i                                      // Ares/OSSProxy
-        ], [NAME, VERSION], [
-
-        /(audacious|audimusicstream|amarok|bass|core|dalvik|gnomemplayer|music on console|nsplayer|psp-internetradioplayer|videos)\/([\w\.-]+)/i,
-                                                                            // Audacious/AudiMusicStream/Amarok/BASS/OpenCORE/Dalvik/GnomeMplayer/MoC
-                                                                            // NSPlayer/PSP-InternetRadioPlayer/Videos
-        /(clementine|music player daemon)\s([\w\.-]+)/i,                    // Clementine/MPD
-        /(lg player|nexplayer)\s([\d\.]+)/i,
-        /player\/(nexplayer|lg player)\s([\w\.-]+)/i                        // NexPlayer/LG Player
-        ], [NAME, VERSION], [
-        /(nexplayer)\s([\w\.-]+)/i                                          // Nexplayer
-        ], [NAME, VERSION], [
-
-        /(flrp)\/([\w\.-]+)/i                                               // Flip Player
-        ], [[NAME, 'Flip Player'], VERSION], [
-
-        /(fstream|nativehost|queryseekspider|ia-archiver|facebookexternalhit)/i
-                                                                            // FStream/NativeHost/QuerySeekSpider/IA Archiver/facebookexternalhit
-        ], [NAME], [
-
-        /(gstreamer) souphttpsrc.+libsoup\/([\w\.-]+)/i
-                                                                            // Gstreamer
-        ], [NAME, VERSION], [
-
-        /(htc streaming player)\s[\w_]+\s\/\s([\d\.]+)/i,                   // HTC Streaming Player
-        /(java|python-urllib|python-requests|wget|libcurl)\/([\w\.-_]+)/i,
-                                                                            // Java/urllib/requests/wget/cURL
-        /(lavf)([\d\.]+)/i                                                  // Lavf (FFMPEG)
-        ], [NAME, VERSION], [
-
-        /(htc_one_s)\/([\d\.]+)/i,                                          // HTC One S
-        ], [[NAME, /_/g, ' '], VERSION], [
-
-        /(mplayer)(?:\s|\/)(?:(?:sherpya-){0,1}svn)(?:-|\s)(r\d+(?:-\d+[\w\.-]+))/i,
-                                                                            // MPlayer SVN
-        ], [NAME, VERSION], [
-
-        /(mplayer)(?:\s|\/)([\w\.-]+)/i,                                    // MPlayer
-        /(mplayer) unknown-([\w\.\-]+)/i                                    // MPlayer UNKNOWN
-        ], [NAME, VERSION], [
-
-        /(mplayer)/i,                                                       // MPlayer (no other info)
-        /(yourmuze)/i,                                                      // YourMuze
-        /(media player classic|nero showtime)/i                             // Media Player Classic/Nero ShowTime
-        ], [NAME], [
-
-        /(nero (?:home|scout))\/([\w\.-]+)/i                                // Nero Home/Nero Scout
-        ], [NAME, VERSION], [
-
-        /(nokia\d+)\/([\w\.-]+)/i                                           // Nokia
-        ], [NAME, VERSION], [
-
-        /\s(songbird)\/([\w\.-]+)/i                                         // Songbird/Philips-Songbird
-        ], [NAME, VERSION], [
-
-        /(winamp)3 version ([\w\.-]+)/i,                                    // Winamp
-        /(winamp)\s([\w\.-]+)/i,
-        /(winamp)mpeg\/([\w\.-]+)/i
-        ], [NAME, VERSION], [
-
-        /(ocms-bot|tapinradio|tunein radio|unknown|winamp|inlight radio)/i  // OCMS-bot/tap in radio/tunein/unknown/winamp (no other info)
-                                                                            // inlight radio
-        ], [NAME], [
-
-        /(quicktime|rma|radioapp|radioclientapplication|soundtap|totem|stagefright|streamium)\/([\w\.-]+)/i
-                                                                            // QuickTime/RealMedia/RadioApp/RadioClientApplication/
-                                                                            // SoundTap/Totem/Stagefright/Streamium
-        ], [NAME, VERSION], [
-
-        /(smp)([\d\.]+)/i                                                   // SMP
-        ], [NAME, VERSION], [
-
-        /(vlc) media player - version ([\w\.]+)/i,                          // VLC Videolan
-        /(vlc)\/([\w\.-]+)/i,
-        /(xbmc|gvfs|xine|xmms|irapp)\/([\w\.-]+)/i,                         // XBMC/gvfs/Xine/XMMS/irapp
-        /(foobar2000)\/([\d\.]+)/i,                                         // Foobar2000
-        /(itunes)\/([\d\.]+)/i                                              // iTunes
-        ], [NAME, VERSION], [
-
-        /(wmplayer)\/([\w\.-]+)/i,                                          // Windows Media Player
-        /(windows-media-player)\/([\w\.-]+)/i
-        ], [[NAME, /-/g, ' '], VERSION], [
-
-        /windows\/([\w\.-]+) upnp\/[\d\.]+ dlnadoc\/[\d\.]+ (home media server)/i,
-                                                                            // Windows Media Server
-        ], [VERSION, [NAME, 'Windows']], [
-
-        /(com\.riseupradioalarm)\/([\d\.]*)/i                               // RiseUP Radio Alarm
-        ], [NAME, VERSION], [
-
-        /(rad.io)\s([\d\.]+)/i,                                             // Rad.io
-        /(radio.(?:de|at|fr))\s([\d\.]+)/i
-        ], [[NAME, 'rad.io'], VERSION]
-    ]
-});
-
-const Modules = Object.freeze({
-    browser : [
-                                                                            // Axios/jsdom/Scrapy
-        [/\b(axios|jsdom|scrapy)\/([\w\.]+)/i], [NAME, VERSION, [TYPE, 'module']]
-    ]
-});
-
-export { 
-    Apps,
-    Bots,
-    CLIs,
-    ExtraDevices,
-    Emails,
-    MediaPlayers,
-    Modules
-};
--- a/src/helpers/ua-parser-helpers.js
+++ b/src/helpers/ua-parser-helpers.js
@@ -1,42 +0,0 @@
-///////////////////////////////////////////////
-/*  Helpers for UAParser.js v2.0.0-alpha.3
-    https://github.com/faisalman/ua-parser-js
-    Author: Faisal Salman <f@faisalman.com>
-    MIT License */
-//////////////////////////////////////////////
-
-/*jshint esversion: 6 */ 
-
-/*
-    # Reference:
-    https://www.chromium.org/updates/ua-reduction/
-
-    # Desktop
-    ---
-    Format:
-    Mozilla/5.0 (<unifiedPlatform>) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/<majorVersion>.0.0.0 Safari/537.36
-
-    Possible <unifiedPlatform> values:
-    - 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 
-
-    # Mobile & Tablet: (except iOS/Android WebView)
-    ---
-    Format:
-    Mozilla/5.0 (Linux; Android 10; K) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/<majorVersion>.0.0.0 <deviceCompat> Safari/537.36
-    
-    Possible <deviceCompat> values:
-    - "Mobile"
-    - "" (empty string for Tablets & Desktop)
-*/
-
-const frozenUA = /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/;
-
-const isFrozenUA = str => frozenUA.test(str);
-
-module.exports = { 
-    isFrozenUA
-};
--- a/src/helpers/ua-parser-helpers.mjs
+++ b/src/helpers/ua-parser-helpers.mjs
@@ -1,46 +0,0 @@
-// Generated ESM version of UAParser.js helpers
-// DO NOT EDIT THIS FILE!
-// Source: /src/helpers/ua-parser-helpers.js
-
-///////////////////////////////////////////////
-/*  Helpers for UAParser.js v2.0.0-alpha.3
-    https://github.com/faisalman/ua-parser-js
-    Author: Faisal Salman <f@faisalman.com>
-    MIT License */
-//////////////////////////////////////////////
-
-/*jshint esversion: 6 */ 
-
-/*
-    # Reference:
-    https://www.chromium.org/updates/ua-reduction/
-
-    # Desktop
-    ---
-    Format:
-    Mozilla/5.0 (<unifiedPlatform>) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/<majorVersion>.0.0.0 Safari/537.36
-
-    Possible <unifiedPlatform> values:
-    - 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 
-
-    # Mobile & Tablet: (except iOS/Android WebView)
-    ---
-    Format:
-    Mozilla/5.0 (Linux; Android 10; K) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/<majorVersion>.0.0.0 <deviceCompat> Safari/537.36
-    
-    Possible <deviceCompat> values:
-    - "Mobile"
-    - "" (empty string for Tablets & Desktop)
-*/
-
-const frozenUA = /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/;
-
-const isFrozenUA = str => frozenUA.test(str);
-
-export { 
-    isFrozenUA
-};
--- a/src/main/ua-parser.mjs
+++ b/src/main/ua-parser.mjs
--- a/src/main/ua-parser.js
+++ b/src/main/ua-parser.js
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////////
-/* UAParser.js v2.0.0-alpha.3
-   Copyright © 2012-2023 Faisal Salman <f@faisalman.com>
+/* UAParser.js v0.7.34
+   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. 
@@ -8,19 +8,16 @@
   Source : https://github.com/faisalman/ua-parser-js */
 /////////////////////////////////////////////////////////////////////////////////

-/* jshint esversion: 3 */ 
-/* globals window */
-
 (function (window, undefined) {

    'use strict';
-    
+
    //////////////
    // Constants
    /////////////


-    var LIBVERSION  = '2.0.0-alpha.3',
+    var LIBVERSION  = '0.7.34',
        EMPTY       = '',
        UNKNOWN     = '?',
        FUNC_TYPE   = 'function',
@@ -40,57 +37,31 @@
        SMARTTV     = 'smarttv',
        WEARABLE    = 'wearable',
        EMBEDDED    = 'embedded',
-        USER_AGENT  = 'user-agent',
-        UA_MAX_LENGTH = 350,
-        BRANDS      = 'brands',
-        FULLVERLIST = 'fullVersionList',
-        PLATFORM    = 'platform',
-        PLATFORMVER = 'platformVersion',
-        BITNESS     = 'bitness',
-        CH_HEADER   = 'sec-ch-ua',
-        CH_HEADER_FULL_VER_LIST = CH_HEADER + '-full-version-list',
-        CH_HEADER_ARCH      = CH_HEADER + '-arch',
-        CH_HEADER_BITNESS   = CH_HEADER + '-' + BITNESS,
-        CH_HEADER_MOBILE    = CH_HEADER + '-' + MOBILE,
-        CH_HEADER_MODEL     = CH_HEADER + '-' + MODEL,
-        CH_HEADER_PLATFORM  = CH_HEADER + '-' + PLATFORM,
-        CH_HEADER_PLATFORM_VER = CH_HEADER_PLATFORM + '-version',
-        CH_ALL_VALUES       = [BRANDS, FULLVERLIST, MOBILE, MODEL, PLATFORM, PLATFORMVER, ARCHITECTURE, BITNESS],
-        UA_BROWSER  = 'browser',
-        UA_CPU      = 'cpu',
-        UA_DEVICE   = 'device',
-        UA_ENGINE   = 'engine',
-        UA_OS       = 'os',
-        UA_RESULT   = 'result',
-        AMAZON      = 'Amazon',
-        APPLE       = 'Apple',
-        ASUS        = 'ASUS',
-        BLACKBERRY  = 'BlackBerry',
-        GOOGLE      = 'Google',
-        HUAWEI      = 'Huawei',
-        LG          = 'LG',
-        MICROSOFT   = 'Microsoft',
-        MOTOROLA    = 'Motorola',
-        SAMSUNG     = 'Samsung',
-        SHARP       = 'Sharp',
-        SONY        = 'Sony',
-        XIAOMI      = 'Xiaomi',
-        ZEBRA       = 'Zebra',
-        PREFIX_MOBILE  = 'Mobile ',
-        SUFFIX_BROWSER = ' Browser',
-        CHROME      = 'Chrome',
-        EDGE        = 'Edge',
-        FIREFOX     = 'Firefox',
-        OPERA       = 'Opera',
+        UA_MAX_LENGTH = 350;
+
+    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',
+        SHARP   = 'Sharp',
+        SONY    = 'Sony',
+        VIERA   = 'Viera',
+        XIAOMI  = 'Xiaomi',
+        ZEBRA   = 'Zebra',
        FACEBOOK    = 'Facebook',
-        WINDOWS     = 'Windows';
-   
-    var NAVIGATOR           = (typeof window !== UNDEF_TYPE && window.navigator) ? 
-                                window.navigator : 
-                                undefined,
-        NAVIGATOR_UADATA    = (NAVIGATOR && NAVIGATOR.userAgentData) ? 
-                                NAVIGATOR.userAgentData : 
-                                undefined;
+        CHROMIUM_OS = 'Chromium OS',
+        MAC_OS  = 'Mac OS';

    ///////////
    // Helper
@@ -99,7 +70,11 @@
    var extend = function (regexes, extensions) {
            var mergedRegexes = {};
            for (var i in regexes) {
-                mergedRegexes[i] = extensions[i] && extensions[i].length % 2 === 0 ? extensions[i].concat(regexes[i]) : regexes[i];
+                if (extensions[i] && extensions[i].length % 2 === 0) {
+                    mergedRegexes[i] = extensions[i].concat(regexes[i]);
+                } else {
+                    mergedRegexes[i] = regexes[i];
+                }
            }
            return mergedRegexes;
        },
@@ -111,55 +86,17 @@
            return enums;
        },
        has = function (str1, str2) {
-            if (typeof str1 === OBJ_TYPE && str1.length > 0) {
-                for (var i in str1) {
-                    if (lowerize(str1[i]) == lowerize(str2)) return true;
-                }
-                return false;
-            }
            return typeof str1 === STR_TYPE ? lowerize(str2).indexOf(lowerize(str1)) !== -1 : false;
        },
-        isExtensions = function (obj) {
-            for (var prop in obj) {
-                return /^(browser|cpu|device|engine|os)$/.test(prop);
-            }
-        },
-        itemListToArray = function (header) {
-            if (!header) return undefined;
-            var arr = [];
-            var tokens = strip(/\\?\"/g, header).split(', ');
-            for (var i = 0; i < tokens.length; i++) {
-                var token = tokens[i].split(';v=');
-                arr[i] = { brand : token[0], version : token[1] };
-            }
-            return arr;
-        },
        lowerize = function (str) {
-            return typeof(str) === STR_TYPE ? str.toLowerCase() : str;
+            return str.toLowerCase();
        },
        majorize = function (version) {
-            return typeof(version) === STR_TYPE ? strip(/[^\d\.]/g, version).split('.')[0] : undefined;
-        },
-        setProps = function (arr) {
-            for (var i in arr) {
-                var propName = arr[i];
-                if (typeof propName == OBJ_TYPE && propName.length == 2) {
-                    this[propName[0]] = propName[1];
-                } else {
-                    this[propName] = undefined;
-                }
-            }
-            return this;
-        },
-        strip = function (pattern, str) {
-            return str.replace(pattern, EMPTY);
-        },
-        stripQuotes = function (val) {
-            return typeof val === STR_TYPE ? strip(/\"/g, val) : val; 
+            return typeof(version) === STR_TYPE ? version.replace(/[^\d\.]/g, EMPTY).split('.')[0] : undefined;
        },
        trim = function (str, len) {
            if (typeof(str) === STR_TYPE) {
-                str = strip(/^\s\s*/, str);
+                str = str.replace(/^\s\s*/, EMPTY);
                return typeof(len) === UNDEF_TYPE ? str : str.substring(0, UA_MAX_LENGTH);
            }
    };
@@ -170,8 +107,6 @@

    var rgxMapper = function (ua, arrays) {

-            if(!ua || !arrays) return;
-
            var i = 0, j, k, p, q, matches, match;

            // loop through all regexes maps
@@ -244,7 +179,18 @@
    // String map
    //////////////

-    var windowsVersionMap = {
+    // 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',
@@ -262,13 +208,12 @@
    // Regex map
    /////////////

-    var defaultRegexes = {
+    var regexes = {

        browser : [[

-            // Most common regardless engine
            /\b(?:crmo|crios)\/([\w\.]+)/i                                      // Chrome for Android/iOS
-            ], [VERSION, [NAME, PREFIX_MOBILE + 'Chrome']], [
+            ], [VERSION, [NAME, 'Chrome']], [
            /edg(?:e|ios|a)?\/([\w\.]+)/i                                       // Microsoft Edge
            ], [VERSION, [NAME, 'Edge']], [

@@ -292,12 +237,11 @@

            // 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(?!.+naver)|qqbrowserlite|qq|duckduckgo)\/([-\w\.]+)/i,
-                                                                                // Rekonq/Puffin/Brave/Whale/QQBrowserLite/QQ//Vivaldi/DuckDuckGo
-            /(heytap|ovi)browser\/([\d\.]+)/i,                                  // HeyTap/Ovi
+                                                                                // Rekonq/Puffin/Brave/Whale/QQBrowserLite/QQ, aka ShouQ
            /(weibo)__([\d\.]+)/i                                               // Weibo
            ], [NAME, VERSION], [
            /(?:\buc? ?browser|(?:juc.+)ucweb)[\/ ]?([\w\.]+)/i                 // UCBrowser
-            ], [VERSION, [NAME, 'UCBrowser']], [
+            ], [VERSION, [NAME, 'UC'+BROWSER]], [
            /microm.+\bqbcore\/([\w\.]+)/i,                                     // WeChat Desktop for Windows Built-in Browser
            /\bqbcore\/([\w\.]+).+microm/i
            ], [VERSION, [NAME, 'WeChat(Win) Desktop']], [
@@ -307,10 +251,10 @@
            ], [VERSION, [NAME, 'Konqueror']], [
            /trident.+rv[: ]([\w\.]{1,9})\b.+like gecko/i                       // IE11
            ], [VERSION, [NAME, 'IE']], [
-            /ya(?:search)?browser\/([\w\.]+)/i                                  // Yandex
+            /yabrowser\/([\w\.]+)/i                                             // Yandex
            ], [VERSION, [NAME, 'Yandex']], [
            /(avast|avg)\/([\w\.]+)/i                                           // Avast/AVG Secure Browser
-            ], [[NAME, /(.+)/, '$1 Secure' + SUFFIX_BROWSER], VERSION], [
+            ], [[NAME, /(.+)/, '$1 Secure '+BROWSER], VERSION], [
            /\bfocus\/([\w\.]+)/i                                               // Firefox Focus
            ], [VERSION, [NAME, FIREFOX+' Focus']], [
            /\bopt\/([\w\.]+)/i                                                 // Opera Touch
@@ -322,13 +266,13 @@
            /coast\/([\w\.]+)/i                                                 // Opera Coast
            ], [VERSION, [NAME, OPERA+' Coast']], [
            /miuibrowser\/([\w\.]+)/i                                           // MIUI Browser
-            ], [VERSION, [NAME, 'MIUI' + SUFFIX_BROWSER]], [
-            /fxios\/([\w\.-]+)/i                                                // Firefox for iOS
-            ], [VERSION, [NAME, PREFIX_MOBILE + FIREFOX]], [
+            ], [VERSION, [NAME, 'MIUI '+BROWSER]], [
+            /fxios\/([-\w\.]+)/i                                                // Firefox for iOS
+            ], [VERSION, [NAME, FIREFOX]], [
            /\bqihu|(qi?ho?o?|360)browser/i                                     // 360
-            ], [[NAME, '360' + SUFFIX_BROWSER]], [
+            ], [[NAME, '360 '+BROWSER]], [
            /(oculus|samsung|sailfish|huawei)browser\/([\w\.]+)/i
-            ], [[NAME, /(.+)/, '$1' + SUFFIX_BROWSER], VERSION], [               // Oculus/Samsung/Sailfish/Huawei Browser
+            ], [[NAME, /(.+)/, '$1 '+BROWSER], VERSION], [                      // Oculus/Samsung/Sailfish/Huawei Browser
            /(comodo_dragon)\/([\w\.]+)/i                                       // Comodo Dragon
            ], [[NAME, /_/g, ' '], VERSION], [
            /(electron)\/([\w\.]+) safari/i,                                    // Electron-based App
@@ -347,12 +291,10 @@
            /(naver)\(.*?(\d+\.[\w\.]+).*\)/i,                                  // Naver InApp
            /safari (line)\/([\w\.]+)/i,                                        // Line App for iOS
            /\b(line)\/([\w\.]+)\/iab/i,                                        // Line App for Android
-            /(chromium|instagram|snapchat)[\/ ]([-\w\.]+)/i                     // Chromium/Instagram/Snapchat
+            /(chromium|instagram)[\/ ]([-\w\.]+)/i                              // Chromium/Instagram
            ], [NAME, VERSION], [
            /\bgsa\/([\w\.]+) .*safari\//i                                      // Google Search Appliance on iOS
            ], [VERSION, [NAME, 'GSA']], [
-            /musical_ly(?:.+app_?version\/|_)([\w\.]+)/i                        // TikTok
-            ], [VERSION, [NAME, 'TikTok']], [

            /headlesschrome(?:\/([\w\.]+)| )/i                                  // Chrome Headless
            ], [VERSION, [NAME, CHROME+' Headless']], [
@@ -361,29 +303,22 @@
            ], [[NAME, CHROME+' WebView'], VERSION], [

            /droid.+ version\/([\w\.]+)\b.+(?:mobile safari|safari)/i           // Android Browser
-            ], [VERSION, [NAME, 'Android' + SUFFIX_BROWSER]], [
-
-            /chrome\/([\w\.]+) mobile/i                                         // Chrome Mobile
-            ], [VERSION, [NAME, PREFIX_MOBILE + 'Chrome']], [
+            ], [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                 // Safari Mobile
-            ], [VERSION, [NAME, PREFIX_MOBILE + 'Safari']], [
-            /iphone .*mobile(?:\/\w+ | ?)safari/i
-            ], [[NAME, PREFIX_MOBILE + 'Safari']], [
-            /version\/([\w\.\,]+) .*(safari)/i                                  // Safari
+            /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, '1']], [
+            ], [NAME, [VERSION, strMapper, oldSafariMap]], [

            /(webkit|khtml)\/([\w\.]+)/i
            ], [NAME, VERSION], [

            // Gecko based
-            /(?:mobile|tablet);.*(firefox)\/([\w\.-]+)/i                        // Firefox Mobile
-            ], [[NAME, PREFIX_MOBILE + FIREFOX], VERSION], [
            /(navigator|netscape\d?)\/([-\w\.]+)/i                              // Netscape
            ], [[NAME, 'Netscape'], VERSION], [
            /mobile vr; rv:([\w\.]+)\).+firefox/i                               // Firefox Reality
@@ -405,19 +340,21 @@
            ], [NAME, VERSION], [
            
            /(cobalt)\/([\w\.]+)/i                                              // Cobalt
-            ], [NAME, [VERSION, /[^\d\.]+./, EMPTY]]
+            ], [NAME, [VERSION, /master.|lts./, ""]]
        ],

        cpu : [[

-            /\b(?:(amd|x|x86[-_]?|wow|win)64)\b/i                               // AMD64 (x64)
+            /(?:(amd|x(?:(?:86|64)[-_])?|wow|win)64)[;\)]/i                     // AMD64 (x64)
            ], [[ARCHITECTURE, 'amd64']], [

-            /(ia32(?=;))/i,                                                     // IA32 (quicktime)
+            /(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
+            /\b(aarch64|arm(v?8e?l?|_?64))\b/i                                 // ARM64
            ], [[ARCHITECTURE, 'arm64']], [

            /\b(arm(?:v[67])?ht?n?[fl]p?)\b/i                                   // ARMHF
@@ -453,7 +390,7 @@
            ], [MODEL, [VENDOR, SAMSUNG], [TYPE, MOBILE]], [

            // Apple
-            /(?:\/|\()(ip(?:hone|od)[\w, ]*)(?:\/|;)/i                          // iPod/iPhone
+            /\((ip(?:hone|od)[\w ]*);/i                                         // iPod/iPhone
            ], [MODEL, [VENDOR, APPLE], [TYPE, MOBILE]], [
            /\((ipad);[-\w\),; ]+apple/i,                                       // iPad
            /applecoremedia\/[\w\.]+ \((ipad)/i,
@@ -474,7 +411,7 @@
            ], [MODEL, [VENDOR, HUAWEI], [TYPE, MOBILE]], [

            // Xiaomi
-            /\b(poco[\w ]+|m2\d{3}j\d\d[a-z]{2})(?: bui|\))/i,                  // Xiaomi POCO
+            /\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
@@ -543,7 +480,7 @@

            // Amazon
            /(alexa)webm/i,
-            /(kf[a-z]{2}wi|aeo[c-r]{2})( bui|\))/i,                             // Kindle Fire without Silk / Echo Show
+            /(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
@@ -582,7 +519,7 @@
            ], [MODEL, [VENDOR, 'Meizu'], [TYPE, MOBILE]], [

            // MIXED
-            /(blackberry|benq|palm(?=\-)|sonyericsson|acer|asus|dell|meizu|motorola|polytron|infinix|tecno)[-_ ]?([-\w]*)/i,
+            /(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
@@ -595,20 +532,69 @@
            /(kobo)\s(ereader|touch)/i,                                         // Kobo
            /(archos) (gamepad2?)/i,                                            // Archos
            /(hp).+(touchpad(?!.+tablet)|tablet)/i,                             // HP TouchPad
-            /(kindle)\/([\w\.]+)/i                                              // Kindle
+            /(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.+; ([c6]+|et5[16]|mc[239][23]x?|vc8[03]x?)\)/i               // Zebra
+            /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]], [
@@ -627,12 +613,12 @@
            ], [VENDOR, [MODEL, APPLE+' TV'], [TYPE, SMARTTV]], [
            /crkey/i                                                            // Google Chromecast
            ], [[MODEL, CHROME+'cast'], [VENDOR, GOOGLE], [TYPE, SMARTTV]], [
-            /droid.+aft(\w+)( bui|\))/i                                         // Fire TV
+            /droid.+aft(\w)( bui|\))/i                                          // Fire TV
            ], [MODEL, [VENDOR, AMAZON], [TYPE, SMARTTV]], [
            /\(dtv[\);].+(aquos)/i,
            /(aquos-tv[\w ]+)\)/i                                               // Sharp
            ], [MODEL, [VENDOR, SHARP], [TYPE, SMARTTV]],[
-            /(bravia[\w ]+)( bui|\))/i                                          // Sony
+            /(bravia[\w ]+)( bui|\))/i                                              // Sony
            ], [MODEL, [VENDOR, SONY], [TYPE, SMARTTV]], [
            /(mitv-\w{5}) bui/i                                                 // Xiaomi
            ], [MODEL, [VENDOR, XIAOMI], [TYPE, SMARTTV]], [
@@ -649,11 +635,11 @@
            ///////////////////

            /(ouya)/i,                                                          // Ouya
-            /(nintendo) (\w+)/i                                                 // Nintendo
+            /(nintendo) ([wids3utch]+)/i                                        // Nintendo
            ], [VENDOR, MODEL, [TYPE, CONSOLE]], [
            /droid.+; (shield) bui/i                                            // Nvidia
            ], [MODEL, [VENDOR, 'Nvidia'], [TYPE, CONSOLE]], [
-            /(playstation \w+)/i                                                // Playstation
+            /(playstation [345portablevi]+)/i                                   // Playstation
            ], [MODEL, [VENDOR, SONY], [TYPE, CONSOLE]], [
            /\b(xbox(?: one)?(?!; xbox))[\); ]/i                                // Microsoft Xbox
            ], [MODEL, [VENDOR, MICROSOFT], [TYPE, CONSOLE]], [
@@ -679,8 +665,6 @@

            /(tesla)(?: qtcarbrowser|\/[-\w\.]+)/i                              // Tesla
            ], [VENDOR, [TYPE, EMBEDDED]], [
-            /(aeobc)\b/i                                                        // Echo Dot
-            ], [MODEL, [VENDOR, AMAZON], [TYPE, EMBEDDED]], [

            ////////////////////
            // MIXED (GENERIC)
@@ -710,8 +694,7 @@
            /(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
-            /\b(libweb)/i
+            /(icab)[\/ ]([23]\.[\d\.]+)/i                                       // iCab
            ], [NAME, VERSION], [

            /rv\:([\w\.]{1,9})\b.+(gecko)/i                                     // Gecko
@@ -728,16 +711,15 @@
            /(windows)[\/ ]?([ntce\d\. ]+\w)(?!.+xbox)/i
            ], [NAME, [VERSION, strMapper, windowsVersionMap]], [
            /(win(?=3|9|n)|win 9x )([nt\d\.]+)/i
-            ], [[NAME, WINDOWS], [VERSION, strMapper, windowsVersionMap]], [
+            ], [[NAME, 'Windows'], [VERSION, strMapper, windowsVersionMap]], [

            // iOS/macOS
            /ip[honead]{2,4}\b(?:.*os ([\w]+) like mac|; opera)/i,              // iOS
-            /(?:ios;fbsv\/|iphone.+ios[\/ ])([\d\.]+)/i,
            /cfnetwork\/.+darwin/i
            ], [[VERSION, /_/g, '.'], [NAME, 'iOS']], [
            /(mac os x) ?([\w\. ]*)/i,
            /(macintosh|mac_powerpc\b)(?!.+haiku)/i                             // Mac OS
-            ], [[NAME, 'macOS'], [VERSION, /_/g, '.']], [
+            ], [[NAME, MAC_OS], [VERSION, /_/g, '.']], [

            // Mobile OSes
            /droid ([\w\.]+)\b.+(android[- ]x86|harmonyos)/i                    // Android-x86/HarmonyOS
@@ -763,7 +745,7 @@
            /crkey\/([\d\.]+)/i                                                 // Google Chromecast
            ], [VERSION, [NAME, CHROME+'cast']], [
            /(cros) [\w]+(?:\)| ([\w\.]+)\b)/i                                  // Chromium OS
-            ], [[NAME, "Chrome OS"], VERSION],[
+            ], [[NAME, CHROMIUM_OS], VERSION],[

            // Smart TVs
            /panasonic;(viera)/i,                                               // Panasonic Viera
@@ -771,7 +753,7 @@
            /(nettv)\/(\d+\.[\w\.]+)/i,                                         // NetTV

            // Console
-            /(nintendo|playstation) (\w+)/i,                                    // Nintendo/Playstation
+            /(nintendo|playstation) ([wids345portablevuch]+)/i,                 // Nintendo/Playstation
            /(xbox); +xbox ([^\);]+)/i,                                         // Microsoft Xbox (360, One, X, S, Series X, Series S)

            // Other
@@ -789,372 +771,105 @@
            ], [[NAME, 'Solaris'], VERSION], [
            /((?:open)?solaris)[-\/ ]?([\w\.]*)/i,                              // Solaris
            /(aix) ((\d)(?=\.|\)| )[\w\.])*/i,                                  // AIX
-            /\b(beos|os\/2|amigaos|morphos|openvms|fuchsia|hp-ux|serenityos)/i, // BeOS/OS2/AmigaOS/MorphOS/OpenVMS/Fuchsia/HP-UX/SerenityOS
+            /\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]
        ]
    };

-    /////////////////
-    // Factories
-    ////////////////
-
-    var defaultProps = (function () {
-            var props = { init : {}, isIgnore : {}, isIgnoreRgx : {}, toString : {}};
-            setProps.call(props.init, [
-                [UA_BROWSER, [NAME, VERSION, MAJOR]],
-                [UA_CPU, [ARCHITECTURE]],
-                [UA_DEVICE, [TYPE, MODEL, VENDOR]],
-                [UA_ENGINE, [NAME, VERSION]],
-                [UA_OS, [NAME, VERSION]]
-            ]);
-            setProps.call(props.isIgnore, [
-                [UA_BROWSER, [VERSION, MAJOR]],
-                [UA_ENGINE, [VERSION]],
-                [UA_OS, [VERSION]]
-            ]);
-            setProps.call(props.isIgnoreRgx, [
-                [UA_BROWSER, / ?browser$/i],
-                [UA_OS, / ?os$/i]
-            ]);
-            setProps.call(props.toString, [
-                [UA_BROWSER, [NAME, VERSION]],
-                [UA_CPU, [ARCHITECTURE]],
-                [UA_DEVICE, [VENDOR, MODEL]],
-                [UA_ENGINE, [NAME, VERSION]],
-                [UA_OS, [NAME, VERSION]]
-            ]);
-            return props;
-    })();
-
-    var createIData = function (item, itemType) {
-
-        var init_props = defaultProps.init[itemType],
-            is_ignoreProps = defaultProps.isIgnore[itemType] || 0,
-            is_ignoreRgx = defaultProps.isIgnoreRgx[itemType] || 0,
-            toString_props = defaultProps.toString[itemType] || 0;
-
-        function IData () {
-            setProps.call(this, init_props);
-        }
-
-        IData.prototype.getItem = function () {
-            return item;
-        };
-
-        IData.prototype.withClientHints = function () {
-
-            // nodejs / non-client-hints browsers
-            if (!NAVIGATOR_UADATA) {
-                return item
-                        .parseCH()
-                        .get();
-            }
-
-            // browsers based on chromium 85+
-            return NAVIGATOR_UADATA
-                    .getHighEntropyValues(CH_ALL_VALUES)
-                    .then(function (res) {
-                        return item
-                                .setCH(new UACHData(res, false))
-                                .parseCH()
-                                .get();
-            });
-        };
-
-        IData.prototype.withFeatureCheck = function () {
-            return item.detectFeature().get();
-        };
-
-        if (itemType != UA_RESULT) {
-            IData.prototype.is = function (strToCheck) {
-                var is = false;
-                for (var i in this) {
-                    if (this.hasOwnProperty(i) && !has(is_ignoreProps, i) && lowerize(is_ignoreRgx ? strip(is_ignoreRgx, this[i]) : this[i]) == lowerize(is_ignoreRgx ? strip(is_ignoreRgx, strToCheck) : strToCheck)) {
-                        is = true;
-                        if (strToCheck != UNDEF_TYPE) break;
-                    } else if (strToCheck == UNDEF_TYPE && is) {
-                        is = !is;
-                        break;
-                    }
-                }
-                return is;
-            };
-            IData.prototype.toString = function () {
-                var str = EMPTY;
-                for (var i in toString_props) {
-                    if (typeof(this[toString_props[i]]) !== UNDEF_TYPE) {
-                        str += (str ? ' ' : EMPTY) + this[toString_props[i]];
-                    }
-                }
-                return str || UNDEF_TYPE;
-            };
-        }
-
-        if (!NAVIGATOR_UADATA) {
-            IData.prototype.then = function (cb) { 
-                var that = this;
-                var IDataResolve = function () {
-                    for (var prop in that) {
-                        if (that.hasOwnProperty(prop)) {
-                            this[prop] = that[prop];
-                        }
-                    }
-                };
-                IDataResolve.prototype = {
-                    is : IData.prototype.is,
-                    toString : IData.prototype.toString
-                };
-                var resolveData = new IDataResolve();
-                cb(resolveData);
-                return resolveData;
-            };
-        }
-
-        return new IData();
-    };
-
    /////////////////
    // Constructor
    ////////////////

-    function UACHData (uach, isHttpUACH) {
-        uach = uach || {};
-        setProps.call(this, CH_ALL_VALUES);
-        if (isHttpUACH) {
-            setProps.call(this, [
-                [BRANDS, itemListToArray(uach[CH_HEADER])],
-                [FULLVERLIST, itemListToArray(uach[CH_HEADER_FULL_VER_LIST])],
-                [MOBILE, /\?1/.test(uach[CH_HEADER_MOBILE])],
-                [MODEL, stripQuotes(uach[CH_HEADER_MODEL])],
-                [PLATFORM, stripQuotes(uach[CH_HEADER_PLATFORM])],
-                [PLATFORMVER, stripQuotes(uach[CH_HEADER_PLATFORM_VER])],
-                [ARCHITECTURE, stripQuotes(uach[CH_HEADER_ARCH])],
-                [BITNESS, stripQuotes(uach[CH_HEADER_BITNESS])]
-            ]);
-        } else {
-            for (var prop in uach) {
-                if(this.hasOwnProperty(prop) && typeof uach[prop] !== UNDEF_TYPE) this[prop] = uach[prop];
-            }
-        }
-    }
-
-    function UAItem (itemType, ua, rgxMap, uaCH) {
-
-        this.get = function (prop) {
-            if (!prop) return this.data;
-            return this.data.hasOwnProperty(prop) ? this.data[prop] : undefined;
-        };
-
-        this.set = function (prop, val) {
-            this.data[prop] = val;
-            return this;
-        };
-
-        this.setCH = function (ch) {
-            this.uaCH = ch;
-            return this;
-        };
-
-        this.detectFeature = function () {
-            if (NAVIGATOR && NAVIGATOR.userAgent == this.ua) {
-                switch (this.itemType) {
-                    case UA_BROWSER:
-                        // Brave-specific detection
-                        if (NAVIGATOR.brave && typeof NAVIGATOR.brave.isBrave == FUNC_TYPE) {
-                            this.set(NAME, 'Brave');
-                        }
-                        break;
-                    case UA_DEVICE:
-                        // Chrome-specific detection: check for 'mobile' value of navigator.userAgentData
-                        if (!this.get(TYPE) && NAVIGATOR_UADATA && NAVIGATOR_UADATA[MOBILE]) {
-                            this.set(TYPE, MOBILE);
-                        }
-                        // iPadOS-specific detection: identified as Mac, but has some iOS-only properties
-                        if (this.get(MODEL) == 'Macintosh' && NAVIGATOR && typeof NAVIGATOR.standalone !== UNDEF_TYPE && NAVIGATOR.maxTouchPoints && NAVIGATOR.maxTouchPoints > 2) {
-                            this.set(MODEL, 'iPad')
-                                .set(TYPE, TABLET);
-                        }
-                        break;
-                    case UA_OS:
-                        // Chrome-specific detection: check for 'platform' value of navigator.userAgentData
-                        if (!this.get(NAME) && NAVIGATOR_UADATA && NAVIGATOR_UADATA[PLATFORM]) {
-                            this.set(NAME, NAVIGATOR_UADATA[PLATFORM]);
-                        }
-                        break;
-                    case UA_RESULT:
-                        var data = this.data;
-                        var detect = function (itemType) {
-                            return data[itemType]
-                                    .getItem()
-                                    .detectFeature()
-                                    .get();
-                        };
-                        this.set(UA_BROWSER, detect(UA_BROWSER))
-                            .set(UA_CPU, detect(UA_CPU))
-                            .set(UA_DEVICE, detect(UA_DEVICE))
-                            .set(UA_ENGINE, detect(UA_ENGINE))
-                            .set(UA_OS, detect(UA_OS));
-                }
-            }
-            return this;
-        };
-
-        this.parseUA = function () {
-            if (this.itemType != UA_RESULT) {
-                rgxMapper.call(this.data, this.ua, this.rgxMap);
-            }
-            if (this.itemType == UA_BROWSER) {
-                this.set(MAJOR, majorize(this.get(VERSION)));
-            }
-            return this;
-        };
-
-        this.parseCH = function () {
-            var ua = this.ua,
-                uaCH = this.uaCH,
-                rgxMap = this.rgxMap;
-    
-            switch (this.itemType) {
-                case UA_BROWSER:
-                    var brands = uaCH[FULLVERLIST] || uaCH[BRANDS];
-                    if (brands) {
-                        for (var i in brands) {
-                            var brandName = brands[i].brand,
-                                brandVersion = brands[i].version;
-                            if (!/not.a.brand/i.test(brandName) && (i < 1 || /chromi/i.test(this.get(NAME)))) {
-                                this.set(NAME, strip(GOOGLE+' ', brandName))
-                                    .set(VERSION, brandVersion)
-                                    .set(MAJOR, majorize(brandVersion));
-                            }
-                        }
-                    }
-                    break;
-                case UA_CPU:
-                    var archName = uaCH[ARCHITECTURE];
-                    if (archName) {
-                        if (archName && uaCH[BITNESS] == '64') archName += '64';
-                        rgxMapper.call(this.data, archName + ';', rgxMap);
-                    }
-                    break;
-                case UA_DEVICE:
-                    if (uaCH[MOBILE]) {
-                        this.set(TYPE, MOBILE);
-                    }
-                    if (uaCH[MODEL]) {
-                        this.set(MODEL, uaCH[MODEL]);
-                    }
-                    break;
-                case UA_OS:
-                    var osName = uaCH[PLATFORM];
-                    if(osName) {
-                        var osVersion = uaCH[PLATFORMVER];
-                        if (osName == WINDOWS) osVersion = (parseInt(majorize(osVersion), 10) >= 13 ? '11' : '10');
-                        this.set(NAME, osName)
-                            .set(VERSION, osVersion);
-                    }
-                    break;
-                case UA_RESULT:
-                    var data = this.data;
-                    var parse = function (itemType) {
-                        return data[itemType]
-                                .getItem()
-                                .setCH(uaCH)
-                                .parseCH()
-                                .get();
-                    };
-                    this.set(UA_BROWSER, parse(UA_BROWSER))
-                        .set(UA_CPU, parse(UA_CPU))
-                        .set(UA_DEVICE, parse(UA_DEVICE))
-                        .set(UA_ENGINE, parse(UA_ENGINE))
-                        .set(UA_OS, parse(UA_OS));
-            }
-            return this;
-        };
-
-        setProps.call(this, [
-            ['itemType', itemType],
-            ['ua', ua],
-            ['uaCH', uaCH],
-            ['rgxMap', rgxMap],
-            ['data', createIData(this, itemType)]
-        ]);
-
-        return this;
-    }
-
-    function UAParser (ua, extensions, headers) {
+    var UAParser = function (ua, extensions) {

        if (typeof ua === OBJ_TYPE) {
-            if (isExtensions(ua)) {
-                if (typeof extensions === OBJ_TYPE) {
-                    headers = extensions;               // case UAParser(extensions, headers)           
-                }
-                extensions = ua;                        // case UAParser(extensions)
-            } else {
-                headers = ua;                           // case UAParser(headers)
-                extensions = undefined;
-            }
+            extensions = ua;
            ua = undefined;
-        } else if (typeof ua === STR_TYPE && !isExtensions(extensions)) {
-            headers = extensions;                       // case UAParser(ua, headers)
-            extensions = undefined;
        }
-        
+
        if (!(this instanceof UAParser)) {
-            return new UAParser(ua, extensions, headers).getResult();
+            return new UAParser(ua, extensions).getResult();
        }

-        var userAgent = typeof ua === STR_TYPE ? ua :                                       // Passed user-agent string
-                            ((NAVIGATOR && NAVIGATOR.userAgent) ? NAVIGATOR.userAgent :     // navigator.userAgent
-                                (headers && headers[USER_AGENT] ? headers[USER_AGENT] :     // User-Agent from passed headers
-                                    EMPTY)),                                                // empty string
+        var _navigator = (typeof window !== UNDEF_TYPE && window.navigator) ? window.navigator : undefined;
+        var _ua = ua || ((_navigator && _navigator.userAgent) ? _navigator.userAgent : EMPTY);
+        var _uach = (_navigator && _navigator.userAgentData) ? _navigator.userAgentData : undefined;
+        var _rgxmap = extensions ? extend(regexes, extensions) : regexes;

-            httpUACH = new UACHData(headers, true),
-            regexMap = extensions ? 
-                        extend(defaultRegexes, extensions) : 
-                        defaultRegexes,
-
-            createItemFunc = function (itemType) {
-                if (itemType == UA_RESULT) {
-                    return function () {
-                        return new UAItem(itemType, userAgent, regexMap, httpUACH)
-                                    .set('ua', userAgent)
-                                    .set(UA_BROWSER, this.getBrowser())
-                                    .set(UA_CPU, this.getCPU())
-                                    .set(UA_DEVICE, this.getDevice())
-                                    .set(UA_ENGINE, this.getEngine())
-                                    .set(UA_OS, this.getOS())
-                                    .get();
-                    };
-                } else {
-                    return function () {
-                        return new UAItem(itemType, userAgent, regexMap[itemType], httpUACH)
-                                    .parseUA()
-                                    .get();
-                    };
-                }
+        this.getBrowser = function () {
+            var _browser = {};
+            _browser[NAME] = undefined;
+            _browser[VERSION] = undefined;
+            rgxMapper.call(_browser, _ua, _rgxmap.browser);
+            _browser[MAJOR] = majorize(_browser[VERSION]);
+            // Brave-specific detection
+            if (_navigator && _navigator.brave && typeof _navigator.brave.isBrave == FUNC_TYPE) {
+                _browser[NAME] = 'Brave';
+            }
+            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);
+            if (!_device[TYPE] && _uach && _uach.mobile) {
+                _device[TYPE] = MOBILE;
+            }
+            // iPadOS-specific detection: identified as Mac, but has some iOS-only properties
+            if (_device[MODEL] == 'Macintosh' && _navigator && typeof _navigator.standalone !== UNDEF_TYPE && _navigator.maxTouchPoints && _navigator.maxTouchPoints > 2) {
+                _device[MODEL] = 'iPad';
+                _device[TYPE] = TABLET;
+            }
+            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);
+            if (!_os[NAME] && _uach && _uach.platform != 'Unknown') {
+                _os[NAME] = _uach.platform  
+                                    .replace(/chrome os/i, CHROMIUM_OS)
+                                    .replace(/macos/i, MAC_OS);           // backward compatibility
+            }
+            return _os;
+        };
+        this.getResult = function () {
+            return {
+                ua      : this.getUA(),
+                browser : this.getBrowser(),
+                engine  : this.getEngine(),
+                os      : this.getOS(),
+                device  : this.getDevice(),
+                cpu     : this.getCPU()
            };
-            
-        // public methods
-        setProps.call(this, [
-            ['getBrowser', createItemFunc(UA_BROWSER)],
-            ['getCPU', createItemFunc(UA_CPU)],
-            ['getDevice', createItemFunc(UA_DEVICE)],
-            ['getEngine', createItemFunc(UA_ENGINE)],
-            ['getOS', createItemFunc(UA_OS)],
-            ['getResult', createItemFunc(UA_RESULT)],
-            ['getUA', function () { return userAgent; }],
-            ['setUA', function (ua) {
-                if (typeof ua === STR_TYPE)
-                    userAgent = ua.length > UA_MAX_LENGTH ? trim(ua, UA_MAX_LENGTH) : ua;
-                return this;
-            }]
-        ])
-        .setUA(userAgent);
-
+        };
+        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]);
--- a/test/specs/browser-all.json
+++ b/test/specs/browser-all.json
@@ -199,46 +199,6 @@
            "major"   : "100"
        }
    },
-    {
-        "desc"    : "Chrome 112.0 on Win10",
-        "ua"      : "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/112.0.0.0 Safari/537.36",
-        "expect"  :
-        {
-            "name"    : "Chrome",
-            "version" : "112.0.0.0",
-            "major"   : "112"
-        }
-    },
-    {
-        "desc"    : "Chrome 112.0 on macOS",
-        "ua"      : "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/112.0.0.0 Safari/537.36",
-        "expect"  :
-        {
-            "name"    : "Chrome",
-            "version" : "112.0.0.0",
-            "major"   : "112"
-        }
-    },
-    {
-        "desc"    : "Chrome 111.0 on Linux",
-        "ua"      : "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/111.0.0.0 Safari/537.36",
-        "expect"  :
-        {
-            "name"    : "Chrome",
-            "version" : "111.0.0.0",
-            "major"   : "111"
-        }
-    },
-    {
-        "desc"    : "Chrome 111.0 on ChromeOS",
-        "ua"      : "Mozilla/5.0 (X11; CrOS x86_64 14541.0.0) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/111.0.0.0 Safari/537.36",
-        "expect"  :
-        {
-            "name"    : "Chrome",
-            "version" : "111.0.0.0",
-            "major"   : "111"
-        }
-    },
    {
            "desc"    : "Chrome Headless",
            "ua"      : "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) HeadlessChrome Safari/537.36",
@@ -274,7 +234,7 @@
        "ua"      : "Mozilla/5.0 (iPhone; U; CPU iPhone OS 5_1_1 like Mac OS X; en) AppleWebKit/534.46.0 (KHTML, like Gecko) CriOS/19.0.1084.60 Mobile/9B206 Safari/7534.48.3",
        "expect"  :
        {
-            "name"    : "Mobile Chrome",
+            "name"    : "Chrome",
            "version" : "19.0.1084.60",
            "major"   : "19"
        }
@@ -294,7 +254,7 @@
        "ua"      : "Mozilla/5.0 (Linux; U; Android-4.0.3; en-us; Galaxy Nexus Build/IML74K) AppleWebKit/535.7 (KHTML, like Gecko) CrMo/16.0.912.75 Mobile Safari/535.7",
        "expect"  :
        {
-            "name"    : "Mobile Chrome",
+            "name"    : "Chrome",
            "version" : "16.0.912.75",
            "major"   : "16"
        }
@@ -548,16 +508,6 @@
            "major"   : "1"
        }
    },
-    {
-        "desc"    : "HeyTap",
-        "ua"      : "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/90.0.4430.61 Safari/537.36 HeyTapBrowser/40.8.10.1",
-        "expect"  :
-        {
-            "name"    : "HeyTap",
-            "version" : "40.8.10.1",
-            "major"   : "40"
-        }
-    },
    {
        "desc"    : "HuaweiBrowser",
        "ua"      : "Mozilla/5.0 (Linux; Android 6.0.1; LYA-AL00；HMSCore/4.0.0 GMS/10.4 ) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/70.0.3538.64 HuaweiBrowser/10.0.3.102 Mobile Safari/537.36",
@@ -808,16 +758,6 @@
            "major"   : "4"
        }
    },
-    {
-        "desc"    : "Mobile Safari",
-        "ua"      : "Mozilla/5.0 (iPhone; CPU iPhone OS 16_3 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko)  Mobile/15E148 Safari/604.1",
-        "expect"  :
-        {
-            "name"    : "Mobile Safari",
-            "version" : "undefined",
-            "major"   : "undefined"
-        }
-    },
    {
        "desc"    : "Mosaic",
        "ua"      : "NCSA_Mosaic/2.6 (X11; SunOS 4.1.3 sun4m)",
@@ -1124,8 +1064,8 @@
        "expect"  :
        {
            "name"    : "Safari",
-            "version" : "1",
-            "major"   : "1"
+            "version" : "2.0.4",
+            "major"   : "2"
        }
    },
    {
@@ -1358,66 +1298,6 @@
            "major"   : "1"
        }
    },
-    {
-        "desc"    : "Yandex",
-        "ua"      : "Mozilla/5.0 (Linux; arm_64; Android 11; M2101K7AG) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/102.0.5005.125 YaApp_Android/22.70 YaSearchBrowser/22.70 BroPP/1.0 SA/3 Mobile Safari/537.36",
-        "expect"  :
-        {
-            "name"    : "Yandex",
-            "version" : "22.70",
-            "major"   : "22"
-        }
-    },
-    {
-        "desc"    : "Yandex",
-        "ua"      : "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/110.0.0.0 YaBrowser/23.3.0.2246 Yowser/2.5 Safari/537.36",
-        "expect"  :
-        {
-            "name"    : "Yandex",
-            "version" : "23.3.0.2246",
-            "major"   : "23"
-        }
-    },
-    {
-        "desc"    : "Yandex on Android",
-        "ua"      : "Mozilla/5.0 (Linux; arm_64; Android 13; SM-G965F) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/113.0.5672.76 YaBrowser/21.3.4.59 Mobile Safari/537.36",
-        "expect"  :
-        {
-            "name"    : "Yandex",
-            "version" : "21.3.4.59",
-            "major"   : "21"
-        }
-    },
-    {
-        "desc"    : "Yandex on iPhone",
-        "ua"      : "Mozilla/5.0 (iPhone; CPU iPhone OS 16_4_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/16.4 YaBrowser/23.3.3.330 Mobile/15E148 Safari/604.1",
-        "expect"  :
-        {
-            "name"    : "Yandex",
-            "version" : "23.3.3.330",
-            "major"   : "23"
-        }
-    },
-    {
-        "desc"    : "Yandex on iPad",
-        "ua"      : "Mozilla/5.0 (iPad; CPU OS 16_4_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/16.4 YaBrowser/23.3.3.330 Mobile/15E148 Safari/605.1",
-        "expect"  :
-        {
-            "name"    : "Yandex",
-            "version" : "23.3.3.330",
-            "major"   : "23"
-        }
-    },
-    {
-        "desc"    : "Yandex on iPod",
-        "ua"      : "Mozilla/5.0 (iPod touch; CPU iPhone 16_4_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/16.4 YaBrowser/23.3.3.330 Mobile/15E148 Safari/605.1",
-        "expect"  :
-        {
-            "name"    : "Yandex",
-            "version" : "23.3.3.330",
-            "major"   : "23"
-        }
-    },
    {
        "desc"    : "Puffin",
        "ua"      : "Mozilla/5.0 (Linux; Android 6.0.1; Lenovo P2a42 Build/MMB29M; en-us) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/42.0.2311.135 Mobile Safari/537.36 Puffin/6.0.8.15804AP",
@@ -1513,27 +1393,17 @@
        "ua"      : "Mozilla/5.0 (iPhone; CPU iPhone OS 9_1 like Mac OS X) AppleWebKit/601.1.46 (KHTML, like Gecko) FxiOS/1.1 Mobile/13B143 Safari/601.1.46",
        "expect"  :
        {
-            "name"    : "Mobile Firefox",
+            "name"    : "Firefox",
            "version" : "1.1",
            "major"   : "1"
        }
    },
-    {
-        "desc"    : "Firefox on iOS",
-        "ua"      : "Mozilla/5.0 (iPhone; CPU iPhone OS 16_4_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) FxiOS/112.0 Mobile/15E148 Safari/605.1.15",
-        "expect"  :
-        {
-            "name"    : "Mobile Firefox",
-            "version" : "112.0",
-            "major"   : "112"
-        }
-    },
    {
        "desc"    : "Firefox iOS using iPad",
        "ua"      : "Mozilla/5.0 (iPad; CPU iPhone OS 8_3 like Mac OS X) AppleWebKit/600.1.4 (KHTML, like Gecko) FxiOS/1.0 Mobile/12F69 Safari/600.1.4",
        "expect"  :
        {
-            "name"    : "Mobile Firefox",
+            "name"    : "Firefox",
            "version" : "1.0",
            "major"   : "1"
        }
@@ -1812,72 +1682,5 @@
            "version": "10.25.0",
            "major"  : "10"
        }
-    },
-    {
-        "desc"     : "TikTok",
-        "ua"       : "Mozilla/5.0 (Linux; Android 11; 21061119AG Build/RP1A.200720.011; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/92.0.4515.131 Mobile Safari/537.36 trill_2022109040 JsSdk/1.0 NetType/MOBILE Channel/googleplay AppName/musical_ly app_version/21.9.4 ByteLocale/ru-RU ByteFullLocale/ru-RU Region/KG BytedanceWebview/d8a21c6",
-        "expect"   : {
-            "name"   : "TikTok",
-            "version": "21.9.4",
-            "major"  : "21"
-        }
-    },
-    {
-        "desc"     : "TikTok",
-        "ua"       : "Mozilla/5.0 (iPhone; CPU iPhone OS 14_8 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148 musical_ly_21.1.0 JsSdk/2.0 NetType/4G Channel/App Store ByteLocale/ru Region/RU ByteFullLocale/ru-RU isDarkMode/1 WKWebView/1 BytedanceWebview/d8a21c6",
-        "expect"   : {
-            "name"   : "TikTok",
-            "version": "21.1.0",
-            "major"  : "21"
-        }
-    },
-    {
-        "desc"     : "TikTok",
-        "ua"       : "Mozilla/5.0 (Linux; Android 10; STK-LX1 Build/HONORSTK-LX1; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/110.0.5481.153 Mobile Safari/537.36 musical_ly_2022803040 JsSdk/1.0 NetType/WIFI Channel/huaweiadsglobal_int AppName/musical_ly app_version/28.3.4 ByteLocale/en ByteFullLocale/en Region/IQ Spark/1.2.7-alpha.8 AppVersion/28.3.4 PIA/1.5.11 BytedanceWebview/d8a21c6",
-        "expect"   : {
-            "name"   : "TikTok",
-            "version": "28.3.4",
-            "major"  : "28"
-        }
-    },
-    {
-        "desc"    : "Chrome Mobile",
-        "ua"      : "Mozilla/5.0 (Linux; Android 7.1.2; Nexus 5X Build/N2G47W) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/58.0.3029.83 Mobile Safari/537.36",
-        "expect"  :
-        {
-            "name"    : "Mobile Chrome",
-            "version" : "58.0.3029.83",
-            "major"   : "58"
-        }
-    },
-    {
-        "desc"    : "Firefox Mobile",
-        "ua"      : "Mozilla/5.0 (Linux; Android 7.1.2; Nexus 5X Build/N2G47W) AppleWebKit/537.36 (KHTML, like Gecko) FxiOS/7.5b3349 Mobile/14F89 Safari/603.2.4",
-        "expect"  :
-        {
-            "name"    : "Mobile Firefox",
-            "version" : "7.5b3349",
-            "major"   : "7"
-        }
-    },
-    {
-        "desc"    : "Firefox Mobile",
-        "ua"      : "Mozilla/5.0 (Android 5.0; Mobile; rv:41.0) Gecko/41.0 Firefox/41.0",
-        "expect"  :
-        {
-            "name"    : "Mobile Firefox",
-            "version" : "41.0",
-            "major"   : "41"
-        }
-    },
-    {
-        "desc"    : "Snapchat",
-        "ua"      : "Mozilla/5.0 (iPhone; CPU iPhone OS 16_0_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/16.0 Mobile/15E148 Snapchat/12.33.0.36 (like Safari/8614.1.25.0.31, panda)",
-        "expect"  :
-        {
-            "name"    : "Snapchat",
-            "version" : "12.33.0.36",
-            "major"   : "12"
-        }
    }
-]
+]
--- a/test/specs/cpu-all.json
+++ b/test/specs/cpu-all.json
@@ -23,46 +23,6 @@
            "architecture"  : "amd64"
        }
    },
-    {
-        "desc"    : "Vivaldi on Windows",
-        "ua"      : "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/113.0.0.0 Safari/537.36 Vivaldi/6.0.2979.18",
-        "expect"  :
-        {
-            "architecture"  : "amd64"
-        }
-    },
-    {
-        "desc"    : "Vivaldi on Windows",
-        "ua"      : "Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/113.0.0.0 Safari/537.36 Vivaldi/6.0.2979.18",
-        "expect"  :
-        {
-            "architecture"  : "amd64"
-        }
-    },
-    {
-        "desc"    : "Vivaldi on Linux",
-        "ua"      : "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/113.0.0.0 Safari/537.36 Vivaldi/6.0.2979.18",
-        "expect"  :
-        {
-            "architecture"  : "amd64"
-        }
-    },
-    {
-        "desc"    : "Vivaldi on Linux",
-        "ua"      : "Mozilla/5.0 (X11; Linux i686) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/113.0.0.0 Safari/537.36 Vivaldi/6.0.2979.18",
-        "expect"  :
-        {
-            "architecture"  : "ia32"
-        }
-    },
-    {
-        "desc": "Xiaomi POCO M2 Pro",
-        "ua": "Mozilla/5.0 (Linux; arm_64; Android 11; POCO M2 Pro) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/106.0.0.0 YaBrowser/22.11.7.42.00 SA/3 Mobile Safari/537.36",
-        "expect"  :
-        {
-            "architecture"  : "arm64"
-        }
-    },
    {
        "desc"    : "win64",
        "ua"      : "Mozilla/4.0 (compatible; MSIE 7.0; Windows NT 6.2; Win64; x64; Trident/6.0; .NET4.0E; .NET4.0C)",
@@ -246,13 +206,5 @@
        {
            "architecture"  : "irix64"
        }
-    },
-    {
-        "desc"    : "68k",
-        "ua"      : "'Mozilla/1.1 (Macintosh; U; 68K)'",
-        "expect"  : 
-        {
-            "architecture"  : "68k"
-        }
    }
 ]
--- a/test/specs/device-all.json
+++ b/test/specs/device-all.json
--- a/test/specs/engine-all.json
+++ b/test/specs/engine-all.json
@@ -53,15 +53,6 @@
            "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",
--- a/test/jazzer-fuzz-test.js
+++ b/test/jazzer-fuzz-test.js
@@ -1,20 +0,0 @@
-const { FuzzedDataProvider } = require('@jazzer.js/core');
-const UAParser = require('ua-parser-js');
-const UA_MAX_LENGTH = 350;
-
-module.exports.fuzz = function (buffer) {
-    const data = new FuzzedDataProvider(buffer);
-    const userAgent = data.consumeString(UA_MAX_LENGTH, 'utf-8', true);
-    const start = process.hrtime();
-    
-    UAParser(userAgent);
-
-    const elapsed = process.hrtime(start);
-    const milisec = (elapsed[0]*1e3+elapsed[1]*1e-6).toFixed(3);
-    if (milisec > 1000) {
-        throw new Error(
-            `Potential ReDoS\n` +
-            `Time taken: ${milisec} ms.\n` +
-            `User agent: ${userAgent}`);
-    }
-};
--- a/test/specs/extension-mediaplayer.json
+++ b/test/specs/extension-mediaplayer.json
--- a/test/mocha-test-es6.mjs
+++ b/test/mocha-test-es6.mjs
@@ -1,27 +0,0 @@
-import { UAParser } from 'ua-parser-js';
-import { CPUArch, DeviceType, EngineName } from 'ua-parser-js/enums';
-import * as assert from 'assert';
-
-describe('Returns', () => {
-    it('getResult() should returns object', () => {
-        assert.deepEqual(new UAParser('').getResult(), 
-            {
-                ua : '',
-                //ua_ch : { architecture: undefined, bitness: undefined, brands: undefined, fullVersionList: undefined, mobile: false, model: undefined, platform: undefined, platformVersion: undefined },
-                browser: { name: undefined, version: undefined, major: undefined },
-                cpu: { architecture: undefined },
-                device: { vendor: undefined, model: undefined, type: undefined },
-                engine: { name: undefined, version: undefined},
-                os: { name: undefined, version: undefined }
-        });
-    });
-});
-
-describe('Enums', () => {    
-    it('Can use enum', () => {
-        const { cpu, device, engine } = UAParser('Mozilla/5.0 (X11; U; Linux armv7l; en-GB; rv:1.9.2a1pre) Gecko/20090928 Firefox/3.5 Maemo Browser 1.4.1.22 RX-51 N900');
-        assert.strictEqual(cpu.is(CPUArch.ARM), true);
-        assert.strictEqual(device.is(DeviceType.MOBILE), true);
-        assert.strictEqual(engine.is(EngineName.GECKO), true);
-    });
-});
--- a/test/mocha-test-extension.js
+++ b/test/mocha-test-extension.js
@@ -1,79 +0,0 @@
-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('ua-parser-js');
-const Ext = require('ua-parser-js/extensions');
-
-describe('Bots', () => {
-    it('Can detect bots', () => {
-        const googleBot = 'Googlebot-Video/1.0';
-        const gptBot = 'Mozilla/5.0 AppleWebKit/537.36 (KHTML, like Gecko; compatible; GPTBot/1.0; +https://openai.com/gptbot)';
-        const msnBot = 'msnbot-media/1.1 (+http://search.msn.com/msnbot.htm)';
-        const bingPreview = 'Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/534+ (KHTML, like Gecko) BingPreview/1.0b';
-        const opera = 'Opera/8.5 (Macintosh; PPC Mac OS X; U; en)';
-        const wget = 'Wget/1.21.1';
-        const facebookBot = 'Mozilla/5.0 (compatible; FacebookBot/1.0; +https://developers.facebook.com/docs/sharing/webmasters/facebookbot/)';
-        const outlook = 'Mozilla/4.0 (compatible; MSIE 7.0; Windows NT 10.0; WOW64; Trident/7.0; .NET4.0C; .NET4.0E; .NET CLR 2.0.50727; .NET CLR 3.0.30729; .NET CLR 3.5.30729; Microsoft Outlook 16.0.9126; Microsoft Outlook 16.0.9126; ms-office; MSOffice 16)';
-        const thunderbird = 'Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.13.0';
-        const axios = 'axios/1.3.5';
-        const jsdom = 'Mozilla/5.0 (darwin) AppleWebKit/537.36 (KHTML, like Gecko) jsdom/20.0.3';
-        const scrapy = 'Scrapy/1.5.0 (+https://scrapy.org)';
-
-        const botParser = new UAParser(Ext.Bots);
-        assert.deepEqual(botParser.setUA(googleBot).getBrowser(), {name: "Googlebot-Video", version: "1.0", major: "1", type: "bot"});
-        assert.deepEqual(botParser.setUA(gptBot).getBrowser(), {name: "GPTBot", version: "1.0", major: "1", type: "bot"});
-        assert.deepEqual(botParser.setUA(msnBot).getBrowser(), {name: "msnbot-media", version: "1.1", major: "1", type: "bot"});
-        assert.deepEqual(botParser.setUA(bingPreview).getBrowser(), {name: "BingPreview", version: "1.0b", major: "1", type: "bot"});
-        assert.deepEqual(botParser.setUA(opera).getBrowser(), {name: "Opera", version: "8.5", major: "8"});
-
-        // try merging Bots & CLIs
-        const botsAndCLIs = { browser : [...Ext.Bots.browser, ...Ext.CLIs.browser]};
-        const botsAndCLIsParser = new UAParser(botsAndCLIs);
-        assert.deepEqual(botsAndCLIsParser.setUA(wget).getBrowser(), {name: "Wget", version: "1.21.1", major: "1", type:"cli"});
-        assert.deepEqual(botsAndCLIsParser.setUA(facebookBot).getBrowser(), {name: "FacebookBot", version: "1.0", major: "1", type:"bot"});
-
-        const emailParser = new UAParser(Ext.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(Ext.Modules);
-        assert.deepEqual(moduleParser.setUA(axios).getBrowser(), {name: "axios", version: "1.3.5", major: "1", type: "module"});
-        assert.deepEqual(moduleParser.setUA(jsdom).getBrowser(), {name: "jsdom", version: "20.0.3", major: "20", type: "module"});
-        assert.deepEqual(moduleParser.setUA(scrapy).getBrowser(), {name: "Scrapy", version: "1.5.0", major: "1", type: "module"});
-    });
-});
-
-// TODO : move test spec to JSON file
-
-describe('Testing regexes', () => {
-
-    let regexes;
-
-    before('Read main js file', () => {
-        let code = fs.readFileSync('src/extensions/ua-parser-extensions.js', 'utf8').toString();
-        let ast = parseJS(code, { sourceType: 'script' });
-        regexes = [];
-        traverse(ast, {
-            RegExpLiteral: (path) => {
-                regexes.push(path.node.pattern);
-            }
-        });
-        if (regexes.length === 0) {
-            throw new Error('Regexes cannot be empty!');
-        }
-    });
-
-    describe('Begin testing', () => {
-        it('all regexes in extension file', () => {
-            regexes.forEach(regex => {
-                describe('Test against `safe-regex` : ' + regex, () => {
-                    it('should be safe from potentially vulnerable regex', () => {
-                        assert.strictEqual(safe(regex), true);
-                    });
-                });
-            });
-        });
-    });
-});
--- a/test/mocha-test-helpers.js
+++ b/test/mocha-test-helpers.js
@@ -1,35 +0,0 @@
-const { isFrozenUA } = require('ua-parser-js/helpers');
-const assert = require('assert');
-
-describe('isFrozenUA', () => {
-    it('Returns whether a user agent is frozen', () => {
-
-        const regularWindowsUA = "Mozilla/5.0 (Windows NT 6.3; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/93.0.1234.56 Safari/537.36";
-        const freezedWindowsUA = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/93.0.0.0 Safari/537.36";
-
-        const regularMacUA = "";
-        const freezedMacUA = "";
-
-        const regularLinuxUA = "";
-        const freezedLinuxUA = "";
-
-        const regularCrOSUA = "";
-        const freezedCrOSUA = "";
-
-        const regularFuchsiaUA = "";
-        const freezedFuchsiaUA = "";
-
-	    const regularMobileUA = "Mozilla/5.0 (Linux; Android 9; SM-A205U) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/93.0.1234.56 Mobile Safari/537.36";
-        const freezedMobileUA = "Mozilla/5.0 (Linux; Android 10; K) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/93.0.0.0 Mobile Safari/537.36";
-
-        const regularTabletUA = "Mozilla/5.0 (Linux; Android 9; SM-T810) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/93.0.1234.56 Safari/537.36";
-        const freezedTabletUA = "Mozilla/5.0 (Linux; Android 10; K) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/93.0.0.0 Safari/537.36";
-
-        assert.strictEqual(isFrozenUA(regularWindowsUA), false);
-        assert.strictEqual(isFrozenUA(freezedWindowsUA), true);
-        assert.strictEqual(isFrozenUA(regularMobileUA), false);
-        assert.strictEqual(isFrozenUA(freezedMobileUA), true);
-        assert.strictEqual(isFrozenUA(regularTabletUA), false);
-        assert.strictEqual(isFrozenUA(freezedTabletUA), true);
-    });
-});
--- a/test/mocha-test.js
+++ b/test/mocha-test.js
--- a/test/specs/os-all.json
+++ b/test/specs/os-all.json
@@ -670,7 +670,7 @@
        "ua"      : "Mozilla/5.0 (X11; CrOS x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/99.0.0.0 Safari/537.36",
        "expect"  :
        {
-            "name"    : "Chrome OS",
+            "name"    : "Chromium OS",
            "version" : "undefined"
        }
    },
@@ -679,7 +679,7 @@
        "ua"      : "Mozilla/5.0 (X11; CrOS x86_64 10575.58.0) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/67.0.3396.99 Safari/537.36",
        "expect"  :
        {
-            "name"    : "Chrome OS",
+            "name"    : "Chromium OS",
            "version" : "10575.58.0"
        }
    },
@@ -764,24 +764,6 @@
            "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]",
@@ -814,7 +796,7 @@
        "ua"      : "Mozilla/4.0 (compatible; MSIE 5.0b1; Mac_PowerPC)",
        "expect"  :
        {
-            "name"    : "macOS",
+            "name"    : "Mac OS",
            "version" : "undefined"
        }
    },
@@ -823,7 +805,7 @@
        "ua"      : "Mozilla/5.0 (Macintosh; Intel Mac OS X x.y; rv:10.0) Gecko/20100101 Firefox/10.0",
        "expect"  :
        {
-            "name"    : "macOS",
+            "name"    : "Mac OS",
            "version" : "x.y"
        }
    },
@@ -832,7 +814,7 @@
        "ua"      : "Mozilla/5.0 (Macintosh; PPC Mac OS X x.y; rv:10.0) Gecko/20100101 Firefox/10.0",
        "expect"  :
        {
-            "name"    : "macOS",
+            "name"    : "Mac OS",
            "version" : "x.y"
        }
    },
@@ -841,7 +823,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"    : "macOS",
+            "name"    : "Mac OS",
            "version" : "10.6.8"
        }
    },
@@ -1213,14 +1195,5 @@
            "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"
-        }
    }
 ]
--- a/test/playwright-test-browser.spec.mjs
+++ b/test/playwright-test-browser.spec.mjs
@@ -1,77 +0,0 @@
-// @ts-check
-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'
-                    });
-                }
-            }
-        });
-    });
-
-    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');
-});
-
-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');
-});
--- a/test/specs/extension-device.json
+++ b/test/specs/extension-device.json
@@ -1,342 +0,0 @@
-[{
-    "desc": "Essential PH-1",
-    "ua": "Mozilla/5.0 (Linux; Android 9; PH-1 Build/PPR1.180905.036) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/69.0.3497.86 Mobile Safari/537.36",
-    "expect": {
-        "vendor": "Essential",
-        "model": "PH-1",
-        "type": "mobile"
-    }
-},
-{
-    "desc": "Gigaset Tablet",
-    "ua": "Mozilla/5.0 (Linux; Android 4.2.2; Gigaset QV830 Build/JDQ39) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Safari/537.36",
-    "expect": {
-        "vendor": "Gigaset",
-        "model": "QV830",
-        "type": "tablet"
-    }
-},
-{
-    "desc": "RCA Voyager III Tablet",
-    "ua": "Mozilla/5.0 (Linux; Android 6.0.1; RCT6973W43 Build/MMB29M) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Safari/537.36",
-    "expect": {
-        "vendor": "RCA",
-        "model": "RCT6973W43",
-        "type": "tablet"
-    }
-},
-{
-    "desc": "RCA Voyager II Tablet",
-    "ua": "Mozilla/5.0 (Linux; Android 5.0; RCT6773W22B Build/LRX21M) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Safari/537.36",
-    "expect": {
-        "vendor": "RCA",
-        "model": "RCT6773W22B",
-        "type": "tablet"
-    }
-},
-{
-    "desc": "Verizon Quanta Tablet",
-    "ua": "Mozilla/5.0 (Linux; Android 4.4.2; QMV7B Build/KOT49H) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Safari/537.36",
-    "expect": {
-        "vendor": "Verizon",
-        "model": "QMV7B",
-        "type": "tablet"
-    }
-},
-{
-    "desc": "Verizon Ellipsis 8 Tablet",
-    "ua": "Mozilla/5.0 (Linux; Android 5.1.1; QTAQZ3 Build/LMY47V) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Safari/537.36",
-    "expect": {
-        "vendor": "Verizon",
-        "model": "QTAQZ3",
-        "type": "tablet"
-    }
-},
-{
-    "desc": "Verizon Ellipsis 8HD Tablet",
-    "ua": "Mozilla/5.0 (Linux; Android 6.0.1; QTASUN1 Build/MMB29M) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/51.0.2704.81 Safari/537.36",
-    "expect": {
-        "vendor": "Verizon",
-        "model": "QTASUN1",
-        "type": "tablet"
-    }
-},
-{
-    "desc": "Dell Venue 8 Tablet",
-    "ua": "Mozilla/5.0 (Linux; Android 4.4.2; Venue 8 3830 Build/KOT49H) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Safari/537.36",
-    "expect": {
-        "vendor": "Dell",
-        "model": "Venue 8 3830",
-        "type": "tablet"
-    }
-},
-{
-    "desc": "Dell Venue 7 Tablet",
-    "ua": "Mozilla/5.0 (Linux; Android 4.4.2; Venue 7 3730 Build/KOT49H) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Safari/537.36",
-    "expect": {
-        "vendor": "Dell",
-        "model": "Venue 7 3730",
-        "type": "tablet"
-    }
-},
-{
-    "desc": "Barnes & Noble Nook HD+ Tablet",
-    "ua": "Mozilla/5.0 (Linux; U; Android 4.1.2; en-us; Barnes & Noble Nook HD+ Build/JZO54K; CyanogenMod-10) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Mobile Safari/534.30",
-    "expect": {
-        "vendor": "Barnes & Noble",
-        "model": "Nook HD+",
-        "type": "tablet"
-    }
-},
-{
-    "desc": "Barnes & Noble V400 Tablet",
-    "ua": "Mozilla/5.0 (Linux; Android 4.0.4; BNTV400 Build/IMM76L) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/42.0.2311.111 Safari/537.36",
-    "expect": {
-        "vendor": "Barnes & Noble",
-        "model": "V400",
-        "type": "tablet"
-    }
-},
-{
-    "desc": "NuVision TM101A540N Tablet",
-    "ua": "Mozilla/5.0 (Linux; Android 5.1; TM101A540N Build/LMY47I; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/50.0.2661.86 Safari/537.36",
-    "expect": {
-        "vendor": "NuVision",
-        "model": "TM101A540N",
-        "type": "tablet"
-    }
-},
-{
-    "desc": "ZTE-Z431",
-    "ua": "ZTE-Z431/1.4.0 NetFront/4.2 QTV5.1 Profile/MIDP-2.1 Configuration/CLDC-1.1",
-    "expect": {
-        "vendor": "ZTE",
-        "model": "Z431",
-        "type": "mobile"
-    }
-},
-{
-    "desc": "ZTE",
-    "ua": "Mozilla/5.0 (Linux; U; Android 4.1.2; en-us; ZTE-Z740G Build/JZO54K) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Mobile Safari/534.30",
-    "expect": {
-        "vendor": "ZTE",
-        "model": "Z740G",
-        "type": "mobile"
-    }
-},
-{
-    "desc": "ZTE K Series Tablet",
-    "ua": "Mozilla/5.0 (Linux; Android 6.0.1; K88 Build/MMB29M) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Safari/537.36",
-    "expect": {
-        "vendor": "ZTE",
-        "model": "K88",
-        "type": "tablet"
-    }
-},
-{
-    "desc": "ZTE Nubia Red Magic 3",
-    "ua": "Mozilla/5.0 (Linux; Android 9; NX629J Build/PKQ1.190321.001; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/66.0.3359.126 MQQBrowser/6.2 TBS/45016 Mobile Safari/537.36 MMWEBID/4064 MicroMessenger/7.0.10.1580(0x27000A34) Process/tools NetType/WIFI Language/zh_CN ABI/arm64",
-    "expect": {
-        "vendor": "ZTE",
-        "model": "NX629J",
-        "type": "mobile"
-    }
-},
-{
-    "desc": "ZTE Blade A5",
-    "ua": "Mozilla/5.0 (Linux; Android 9; ZTE Blade A5 2019) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/79.0.3945.116 Mobile Safari/537.36",
-    "expect": {
-        "vendor": "ZTE",
-        "model": "Blade A5 2019",
-        "type": "mobile"
-    }
-},
-{
-    "desc": "ZTE BLADE V0730",
-    "ua": "Mozilla/5.0 (Linux; Android 6.0; ZTE BLADE V0730) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/79.0.3945.116 Mobile Safari/537.36",
-    "expect": {
-        "vendor": "ZTE",
-        "model": "BLADE V0730",
-        "type": "mobile"
-    }
-},
-{
-    "desc": "ZTE B2017G",
-    "ua": "Mozilla/5.0 (Linux; Android 7.1.1; ZTE B2017G) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/79.0.3945.93 Mobile Safari/537.36",
-    "expect": {
-        "vendor": "ZTE",
-        "model": "B2017G",
-        "type": "mobile"
-    }
-},
-{
-    "desc": "Swizz GEN610",
-    "ua": "Mozilla/5.0 (Linux; Android 4.4.2; GEN610 Build/KOT49H) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/47.0.2526.83 Mobile Safari/537.36",
-    "expect": {
-        "vendor": "Swiss",
-        "model": "GEN610",
-        "type": "mobile"
-    }
-},
-{
-    "desc": "Swizz ZUR700",
-    "ua": "Mozilla/5.0 (Linux; Android 4.4.2; ZUR700 Build/KVT49L) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/41.0.2272.96 Safari/537.36",
-    "expect": {
-        "vendor": "Swiss",
-        "model": "ZUR700",
-        "type": "tablet"
-    }
-},
-{
-    "desc": "Zeki TB782b Tablet",
-    "ua": "Mozilla/5.0 (Linux; U; Android 4.0.4; en-US; TB782B Build/IMM76D) AppleWebKit/534.31 (KHTML, like Gecko) UCBrowser/9.0.2.299 U3/0.8.0 Mobile Safari/534.31",
-    "expect": {
-        "vendor": "Zeki",
-        "model": "TB782B",
-        "type": "tablet"
-    }
-},
-{
-    "desc": "Dragon Touch Tablet",
-    "ua": "Mozilla/5.0 (Linux; Android 4.0.4; DT9138B Build/IMM76D) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/29.0.1547.72 Mobile Safari/537.36",
-    "expect": {
-        "vendor": "Dragon Touch",
-        "model": "9138B",
-        "type": "tablet"
-    }
-},
-{
-    "desc": "Insignia Tablet",
-    "ua": "Mozilla/5.0 (Linux; U; Android 6.0.1; NS-P08A7100 Build/MMB29M; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/56.0.2924.87 Safari/537.36",
-    "expect": {
-        "vendor": "Insignia",
-        "model": "NS-P08A7100",
-        "type": "tablet"
-    }
-},
-{
-    "desc": "Voice Xtreme V75",
-    "ua": "Mozilla/5.0 (Linux; U; Android 4.2.1; en-us; V75 Build/JOP40D) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Mobile Safari/534.30",
-    "expect": {
-        "vendor": "Voice",
-        "model": "V75",
-        "type": "mobile"
-    }
-},
-{
-    "desc": "LvTel V11",
-    "ua": "Mozilla/5.0 (Linux; Android 5.1.1; V11 Build/LMY47V) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/39.0.0.0 Safari/537.36",
-    "expect": {
-        "vendor": "LvTel",
-        "model": "V11",
-        "type": "mobile"
-    }
-},
-{
-    "desc": "Envizen Tablet V100MD",
-    "ua": "Mozilla/5.0 (Linux; U; Android 4.1.1; en-us; V100MD Build/V100MD.20130816) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Safari/534.30",
-    "expect": {
-        "vendor": "Envizen",
-        "model": "V100MD",
-        "type": "tablet"
-    }
-},
-{
-    "desc": "Rotor Tablet",
-    "ua": "mozilla/5.0 (linux; android 5.0.1; tu_1491 build/lrx22c) applewebkit/537.36 (khtml, like gecko) chrome/43.0.2357.93 safari/537.36",
-    "expect": {
-        "vendor": "Rotor",
-        "model": "1491",
-        "type": "tablet"
-    }
-},
-{
-    "desc": "MachSpeed Tablets",
-    "ua": "Mozilla/5.0 (Linux; Android 4.4.2; Trio 7.85 vQ Build/Trio_7.85_vQ) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/30.0.0.0 Safari/537.36",
-    "expect": {
-        "vendor": "MachSpeed",
-        "model": "Trio 7.85 vQ",
-        "type": "tablet"
-    }
-},
-{
-    "desc": "Trinity Tablets",
-    "ua": "Mozilla/5.0 (Linux; Android 5.0.1; Trinity T101 Build/LRX22C) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/47.0.2526.83 Safari/537.36",
-    "expect": {
-        "vendor": "Trinity",
-        "model": "T101",
-        "type": "tablet"
-    }
-},
-{
-    "desc": "NextBook Next7",
-    "ua": "Mozilla/5.0 (Linux; U; Android 4.0.4; en-us; Next7P12 Build/IMM76I) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Safari/534.30",
-    "expect": {
-        "vendor": "NextBook",
-        "model": "Next7P12",
-        "type": "tablet"
-    }
-},
-{
-    "desc": "NextBook Tablets",
-    "ua": "Mozilla/5.0 (Linux; Android 5.0; NXA8QC116 Build/LRX21V) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Safari/537.36",
-    "expect": {
-        "vendor": "NextBook",
-        "model": "NXA8QC116",
-        "type": "tablet"
-    }
-},
-{
-    "desc": "Le Pan Tablets",
-    "ua": "Mozilla/5.0 (Linux; Android 4.2.2; Le Pan TC802A Build/JDQ39) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Safari/537.36",
-    "expect": {
-        "vendor": "Le Pan",
-        "model": "TC802A",
-        "type": "tablet"
-    }
-},
-{
-    "desc": "Le Pan Tablets",
-    "ua": "Mozilla/5.0 (Linux; Android 4.2.2; Le Pan TC802A Build/JDQ39) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Safari/537.36",
-    "expect": {
-        "vendor": "Le Pan",
-        "model": "TC802A",
-        "type": "tablet"
-    }
-},
-{
-    "desc": "AT&T Radiant Core U304AA",
-    "ua": "Dalvik/2.1.0 (Linux; U; Android 9; U304AA Build/P00610)",
-    "expect": {
-        "vendor": "AT&T",
-        "model": "U304AA",
-        "type": "mobile"
-    }
-},
-{
-    "desc": "Vodafone Smart Tab 4G",
-    "ua": "Mozilla/5.0 (Linux; Android 4.4.4; Vodafone Smart Tab 4G) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/81.0.4044.138 Safari/537.36",
-    "expect": {
-        "vendor": "Vodafone",
-        "model": "Smart Tab 4G",
-        "type": "tablet"
-    }
-},
-{
-    "desc": "Vodafone Smart ultra 6",
-    "ua": "Mozilla/5.0 (Linux; Android 5.0.2; Vodafone Smart ultra 6 Build/LRX22G) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/44.0.2403.133 Mobile Safari/537.36",
-    "expect": {
-        "vendor": "Vodafone",
-        "model": "Smart ultra 6",
-        "type": "tablet"
-    }
-},
-{
-    "desc": "4ife 4K Smart TV Box",
-    "ua": "Mozilla/5.0 (Linux; Android 4.4.2; 4ife 4K Smart TV Box Build/KOT49H) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/30.0.0.0 Safari/537.36 Vinebre",
-    "expect": {
-        "vendor": "undefined",
-        "model": "undefined",
-        "type": "smarttv"
-    }
-}]
--- a/test/test.js
+++ b/test/test.js
Author	SHA1	Message	Date
Faisal Salman	3218051f07	Bump version 0.7.34	2023-03-05 20:46:16 +07:00
Faisal Salman	551ad88474	Add new device: Apple Watch, new os: watchOS (cherry picked from commit `18730452f2`)	2023-03-04 22:45:23 +07:00
Faisal Salman	097f736c4d	Fix #387 #554 - Detect iPadOS 13 https://stackoverflow.com/questions/9038625/detect-if-device-is-ios (cherry picked from commit `5ea9f0ec16`)	2023-03-04 22:43:28 +07:00
Faisal Salman	73c25771dc	Fix #498 - Detect Brave Browser by checking navigator.brave https://github.com/brave/brave-browser/issues/10165#issuecomment-641128278 (cherry picked from commit `03b0a5afa6`)	2023-03-04 22:42:39 +07:00