Merge branch 'master' into gpu-detect-experimental

.github/FUNDING.yml

@@ -1,12 +0,0 @@
-# These are supported funding model platforms
-
-github: faisalman
-patreon: # Replace with a single Patreon username
-open_collective: ua-parser-js
-ko_fi: # Replace with a single Ko-fi username
-tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
-community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
-liberapay: # Replace with a single Liberapay username
-issuehunt: # Replace with a single IssueHunt username
-otechie: # Replace with a single Otechie username
-custom: ['https://www.paypal.me/faisalman/']

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

.github/ISSUE_TEMPLATE/custom.md

@@ -1,10 +0,0 @@
----
-name: Custom issue template
-about: Describe this issue template's purpose here.
-title: ''
-labels: ''
-assignees: ''
-
----
-
-

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

.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}}"

.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

.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

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

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

.github/workflows/test-ci.yml

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

.gitignore

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

.npmrc

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

.travis.yml

@@ -0,0 +1,13 @@
+language: node_js
+node_js:
+    - stable
+    - lts/*
+
+notifications:
+  email: false
+
+cache:
+    directories:
+        - node_modules
+
+sudo: false

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "ua-parser-js",
-  "version": "2.0.0-alpha.3",
+  "version": "0.7.20",
   "authors": [
     "Faisal Salman <f@faisalman.com>"
   ],

changelog.md

@@ -1,97 +0,0 @@
-# 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
-- Add new devices : Kobo e-Reader, Apple Watch, and some new SmartTV devices
-- Add new OS : watchOS
-- Improve browser detection : Kakao, Naver, Brave
-- Improve device detection : Oculus, iPad
-- Improve OS detection : Chrome OS
-- Using navigator.userAgentData as fallback for device.type & os.name
-
-## Version 0.7.33 / 1.0.33
-
-- Add new browser : Cobalt
-- Identify Macintosh as an Apple device
-- Fix ReDoS vulnerability
-
-## Version 0.7.32 / 1.0.32
-
-- Add new browser : DuckDuckGo, Huawei Browser, LinkedIn
-- Add new OS : HarmonyOS
-- Add some Huawei models
-- Add Sharp Aquos TV
-- Improve detection Xiaomi Mi CC9 
-- Fix Sony Xperia 1 III misidentified as Acer tablet
-- Fix Detect Sony BRAVIA as SmartTV 
-- Fix Detect Xiaomi Mi TV as SmartTV 
-- Fix Detect Galaxy Tab S8 as tablet 
-- Fix WeGame mistakenly identified as WeChat
-- Fix included commas in Safari / Mobile Safari version
-- Increase UA_MAX_LENGTH to 350
-
-## Version 0.7.31 / 1.0.2
-
-- Fix OPPO Reno A5 incorrect detection
-- Fix TypeError Bug
-- Use AST to extract regexes and verify them with safe-regex
-
-## Version 0.7.30 / 1.0.1
-
-- Add new browser : Obigo, UP.Browser, Klar
-- Add new device : Oculus, Roku
-- Add new OS: Maemo, HP-UX, Android-x86, Deepin, elementary OS, GhostBSD, Linspire, Manjaro, Sabayon
-- Improve detection for Sony Xperia 1ii, LG Android TV, and some more devices
-- Improve detection for ARM64 CPU
-- Improve detection for Windows Mobile, Netscape, Mac on PowerPC
-- Categorize PDA as mobile
-- Fix Sharp devices misjudged as Huawei
-- Fix trailing comma for ES3 compatibility
-- Some code refactor
-
-# Version 0.8
-
-Version 0.8 was created by accident. This version is now deprecated and no longer maintained, please update to version 0.7 / 1.0.

license.md

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2012-2023 Faisal Salman <<f@faisalman.com>>
+Copyright (c) 2012-2019 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

package.js

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

package.json

@@ -1,12 +1,11 @@
 {
   "title": "UAParser.js",
   "name": "ua-parser-js",
-  "version": "2.0.0-alpha.3",
+  "version": "0.7.20",
   "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": "Lightweight JavaScript-based user-agent string parser",
   "keywords": [
     "user-agent",
-    "client-hints",
     "parser",
     "browser",
     "engine",
@@ -16,176 +15,111 @@
     "jquery-plugin",
     "ecosystem:jquery"
   ],
-  "homepage": "https://github.com/faisalman/ua-parser-js",
+  "homepage": "http://github.com/faisalman/ua-parser-js",
   "contributors": [
     "Aamir Poonawalla <aamir@urx.com>",
     "Admas <mollases@users.noreply.github.com>",
     "algenon <m@antonz.ru>",
-    "Alvin Portillo <alvin@8thwall.com>",
+    "Alvin Portillo <portilloalvin@gmail.com>",
-    "Amumu <yoyo837@hotmail.com>",
     "Andrea Vaghi <andrea.vaghi@jobrapido.com>",
     "Anton Zhiyanov <m@antonz.ru>",
     "Arturo Mejia <amejia@blim.com>",
     "Arun Rama Reddy <arunramareddy@gmail.com>",
     "Austin Pray <austin@austinpray.com>",
-    "Bendeguz <symunona@gmail.com>",
     "Benjamin Bertrand <bertrand.design@gmail.com>",
     "Benjamin Urban <benjamin.urban@sueddeutsche.de>",
     "boneyao <admin@boneyao.com>",
     "Carl C Von Lewin <carlchristianlewin@gmail.com>",
     "CESAR RAMOS <c@imagenproactiva.com>",
-    "Chad Killingsworth <ckillingsworth@jackhenry.com>",
     "Christopher De Cairos <chris.decairos@gmail.com>",
-    "Cyrille David <cyrille@qonto.eu>",
     "Dario Vladovic <d.vladimyr@gmail.com>",
-    "David Annez <david.annez@gmail.com>",
     "Davit Barbakadze <jayarjo@gmail.com>",
     "ddivernois <david-emmanuel.divernois@amadeus.com>",
-    "Deliaz <D3liaz@gmail.com>",
     "Demis Palma <demis.palma@gmail.com>",
     "dhoko <aurelien@protonmail.com>",
     "dianhe <dianhe@webank.com>",
-    "dineshks1 <dineshks1@d.kumar44@outlook.com>",
     "Dmitry Tyschenko <dtyschenko@gmail.com>",
     "Douglas Li <doug@knotch.it>",
     "Dumitru Uzun <contact@duzun.me>",
-    "Dustin <duburns@fanatics.com>",
-    "Elchin Valiyev <elchin.valiyev@autodesk.com>",
-    "Emil Hesslow <hesslow@gmail.com>",
-    "Eric Redon <eric.redon@coox.org>",
     "Eric Schrenker <eric.schrenker@gmail.com>",
     "Erik Hesselink <hesselink@gmail.com>",
     "Fabian Becker <halfdan@xnorfz.de>",
-    "Faisal Salman <f@faisalman.com>",
+    "Faisal Salman <fyzlman@gmail.com>",
     "Frédéric Camblor <fcamblor@gmail.com>",
-    "Frederik Ring <frederik.ring@gmail.com>",
-    "Gerald Host <me@jacobford.co.uk>",
     "Germán M. Bravo <german.mb@gmail.com>",
     "Grigory Dmitrenko <grigory@snsk.ru>",
-    "gulpin <gulping.gulpin@gmail.com>",
     "Hendrik Helwich <h.helwich@iplabs.de>",
     "Hermann Ebert <ebbmo@HE.local>",
-    "hr6r <hedian@gmail.com>",
-    "Igor Topal <i.topal@smartweb.com.ua>",
-    "Ildar Kamalov <i.kamalov@adguard.com>",
-    "insanehong <insane.hong@navercorp.com>",
     "jackpoll <jackpoll123456@gmail.com>",
     "Jake Mc <startswithaj@users.noreply.github.com>",
-    "JBYoshi <12983479+JBYoshi@users.noreply.github.com>",
-    "Joey Parrish <joeyparrish@google.com>",
     "John Tantalo <john.tantalo@gmail.com>",
     "John Yanarella <jmy@codecatalyst.com>",
     "Jon Buckley <jon@jbuckley.ca>",
-    "Josh Goldberg <joshuakgoldberg@outlook.com>",
-    "Junki-Ishida <junki_ishida@dwango.co.jp>",
     "Kendall Buchanan <kendall@kendagriff.com>",
     "Lee Treveil <leetreveil@gmail.com>",
     "leonardo <leofiore@libero.it>",
     "Levente Balogh <balogh.levente.hu@gmail.com>",
     "Liam Quinn <lquinn@blackberry.com>",
     "Lithin <lithin@webklipper.com>",
-    "ll-syber <670159357@qq.com>",
     "Loris Guignard <loris.guignard@gmail.com>",
     "Lukas Drgon <lukas.drgon@gmail.com>",
     "Lukas Eipert <leipert@users.noreply.github.com>",
     "Malash <i@malash.me>",
     "Martynas <martynas@firmfirm.co>",
-    "Masahiko Sato <masasato@yahoo-corp.jp>",
     "Matt Brophy <matt@brophy.org>",
-    "Matthew Origer <karatecowboy@gmail.com>",
-    "Maximilian Haupt <mail@maximilianhaupt.com>",
     "Max Maurer <maxemanuel.maurer@gmail.com>",
-    "Max Nordlund <max.nordlund@gmail.com>",
+    "Maximilian Haupt <mail@maximilianhaupt.com>",
     "Michael Hess <mhess@connectify.me>",
-    "MimyyK <michele.marais@hakisa.com>",
     "naoh <naoh.cs03g@nctu.edu.tw>",
-    "Nicholas Ionata <nionata@ufl.edu>",
-    "Nikhil Motiani <nikhil.motiani@outlook.com>",
     "Nik Rolls <nik@rolls.cc>",
-    "nionata <n.ionata129@gmail.com>",
+    "Nikhil Motiani <nikhil.m@247-inc.com>",
     "niris <nirisix@gmail.com>",
     "Nobuo Okada <nookada@yahoo-corp.jp>",
-    "o.drapeza <o.drapeza@tinkoff.ru>",
     "otakuSiD <otakusid@gmail.com>",
-    "patrick-nurt <github@pereira.dk>",
-    "Pavel Studeny <studeny@avast.com>",
     "Peter Dave Hello <PeterDaveHello@users.noreply.github.com>",
     "philippsimon <github@philippsimon.de>",
     "Pieter Hendrickx <pieter.hendrickx@belfius.be>",
     "Piper Chester <piperchester@gmail.com>",
-    "Queen Vinyl Darkscratch <vinyldarkscratch@gmail.com>",
-    "Raine Makelainen <raine.makelainen@jolla.com>",
-    "Raman Savaryn <homeneartheocean@gmail.com>",
     "Robert Tod <robert@qubit.com>",
-    "roman.savarin <roman.savarin@skywindgroup.com>",
     "Ron Korland <ron@testim.io>",
     "Ross Noble <rosshnoble@gmail.com>",
-    "ruicong <466403866@qq.com>",
     "Sandro Sonntag <sandro.sonntag@adorsys.de>",
     "sgautrea <shanegautreau@gmail.com>",
     "Shane Gautreau <sgautrea@opentext.com>",
     "Shane Thacker <shane@steadymade.com>",
-    "Shreedhar <shreedhar@uber.com>",
+    "shchotse <topal@mail.ua>",
     "Simon Eisenmann <simon@longsleep.org>",
     "Simon Lang <me@simonlang.org>",
     "Stiekel <histkc@gmail.com>",
-    "sUP <dani3l@gmail.com>",
     "Sylvain Gizard <sylvain.gizard@gmail.com>",
     "szchenghuang <szchenghuang@gmail.com>",
-    "Tanguy Krotoff <tkrotoff@gmail.com>",
-    "Tony Tomarchio <tony@tomarchio.cc>",
-    "Ulrich Schmidt <u.schmidt@velian.de>",
     "Vadim Kurachevsky <vadim@hmvs.org>",
-    "Yılmaz <yilmazdemir36@gmail.com>",
+    "Yun Young-jin <yupmin@yupmin-office-macmini.local>"
-    "yuanyang <work_yuanyang@163.com>",
-    "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"
-    }
-  },
-  "files": [
-    "dist",
-    "src"
   ],
+  "main": "src/ua-parser.js",
   "scripts": {
-    "build": "./script/build-dist.sh && ./script/build-module.js",
+    "build": "uglifyjs src/ua-parser.js -o dist/ua-parser.min.js --comments '/UAParser\\.js/' && uglifyjs src/ua-parser.js -o dist/ua-parser.pack.js --comments '/UAParser\\.js/' --compress --mangle",
-    "fuzz": "jazzer ./test/jazzer-fuzz-test.js --sync",
+    "test": "jshint src/ua-parser.js && mocha -R nyan test/test.js",
-    "test": "./script/test-all.sh",
+    "verup": "node ./node_modules/verup",
-    "test:jshint": "jshint src && jshint script",
+    "version": "node ./node_modules/verup 0"
-    "test:lockfile-lint": "npx lockfile-lint -p package-lock.json",
+  },
-    "test:mocha": "mocha -R list test/mocha*js",
+  "verup": {
-    "test:playwright": "playwright test"
+    "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",
+    "jshint": "~1.1.0",
-    "@babel/traverse": "7.15.4",
+    "mocha": "~1.8.0",
-    "@jazzer.js/core": "^1.4.0",
+    "requirejs": "^2.3.2",
-    "@playwright/test": "~1.32.2",
+    "uglify-js": "~2.7.5",
-    "jshint": "~2.13.6",
+    "verup": "^1.3.x"
-    "mocha": "~8.2.0",
-    "requirejs": "2.3.2",
-    "safe-regex": "^2.1.1",
-    "uglify-js": "~3.12.0"
   },
   "repository": {
     "type": "git",
@@ -197,25 +131,10 @@
   },
   "directories": {
     "dist": "dist",
-    "script": "script",
     "src": "src",
     "test": "test"
   },
   "bugs": "https://github.com/faisalman/ua-parser-js/issues",
   "demo": "https://faisalman.github.io/ua-parser-js",
-  "download": "https://raw.github.com/faisalman/ua-parser-js/master/dist/ua-parser.min.js",
+  "download": "https://raw.github.com/faisalman/ua-parser-js/master/dist/ua-parser.min.js"
-  "funding": [
-    {
-      "type": "opencollective",
-      "url": "https://opencollective.com/ua-parser-js"
-    },
-    {
-      "type": "paypal",
-      "url": "https://paypal.me/faisalman"
-    },
-    {
-      "type": "github",
-      "url": "https://github.com/sponsors/faisalman"
-    }
-  ]
 }

readme.md

@@ -1,471 +1,144 @@
-<p align="center">
-    <img src="https://raw.githubusercontent.com/faisalman/ua-parser-js/gh-pages/images/logo.png" width="256" height="256"> 
-</p>
-
-<p align="center">
-<a href="https://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">
-</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).
+<img align="right" src="https://raw.githubusercontent.com/faisalman/ua-parser-js/gh-pages/images/logo.png"> A JavaScript-based User-Agent string parser. Can be used either in browser (client-side) or in node.js (server-side) environment. Also available as jQuery/Zepto plugin, Bower/Meteor package, & RequireJS/AMD module. This library aims to identify detailed type of web browser, layout engine, operating system, cpu architecture, and device type/model, entirely from user-agent string with a relatively small footprint (~17KB when minified / ~6KB gzipped). Written in vanilla JavaScript, which means it doesn't require any other library and can be used independently. However, it's not recommended to use this library as browser detection since the result may not be more accurate than using feature detection.
+
+[![Build Status](https://travis-ci.org/faisalman/ua-parser-js.svg?branch=master)](https://travis-ci.org/faisalman/ua-parser-js)
+[![NPM downloads](https://img.shields.io/npm/dw/ua-parser-js.svg)](https://www.npmjs.com/package/ua-parser-js)
+[![NPM](https://img.shields.io/npm/v/ua-parser-js.svg)](https://www.npmjs.com/package/ua-parser-js)
+[![Bower](https://img.shields.io/bower/v/ua-parser-js.svg)](https://bower.io/)
+[![CDNJS](https://img.shields.io/cdnjs/v/UAParser.js.svg)](https://cdnjs.com/libraries/UAParser.js)
 
 * Author    : Faisal Salman <<f@faisalman.com>>
-* Demo      : https://faisalman.github.io/ua-parser-js
+* Demo      : http://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
 
-***
+# Constructor
 
-### From Our Sponsors:
+* `new UAParser([uastring][,extensions])`
-<table>
+    * returns new instance
-<thead>
-</thead>
-<tbody>
-<tr>
-<td colspan="2">
-<a href="https://opencollective.com/ua-parser-js">↗ Become a sponsor</a>
-</td>
-</tr>
-</tbody>
-</table>
 
----
+* `UAParser([uastring][,extensions])`
+    * returns result object `{ ua: '', browser: {}, cpu: {}, device: {}, engine: {}, gpu: {}, os: {} }`
 
-# Version 2.0
+# Methods
-What's new & breaking, please read [CHANGELOG](changelog.md) before upgrading.
 
-# Documentation
+* `getBrowser()`
-### `UAParser([user-agent:string][,extensions:object][,headers:object(since@2.0)]):IData`
+    * returns `{ name: '', version: '' }`
-
-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.
-Like so:
-
-```js
-let parser = new UAParser("your user-agent here"); // you need to pass the user-agent for nodejs
-console.log(parser); // {}
-let parserResults = parser.getResult();
-console.log(parserResults);
-/* 
-  {
-    ua      : "",
-    browser : {},
-    engine  : {},
-    os      : {},
-    device  : {},
-    cpu     : {}
-  } 
-*/
-```
-
-#### * `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.
 
 ```sh
-returns result object `{ ua: '', browser: {}, cpu: {}, device: {}, engine: {}, os: {} }`
-```
-
-## `UAParser`:
-
-#### Methods table
-The methods are self explanatory, here's a small overview on all the available methods:
- *  `getResult()` - returns all function object calls, user-agent string, browser info, cpu, device, engine, os:
-`{ ua: '', browser: {}, cpu: {}, device: {}, engine: {}, os: {} }`.
-
- *  `getBrowser()`      - returns the browser name and version.
- *  `getDevice()`       - returns the device model, type, vendor.
- *  `getEngine()`       - returns the current browser engine name and version.
- *  `getOS()`           - returns the running operating system name and version.
- *  `getCPU()`          - returns CPU architectural design name.
- *  `getUA()`           - returns the user-agent string.
- *  `setUA(ua)`         - set a custom user-agent to be parsed.
-
----
-
-#### * `getResult():IData`
-
-```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,
+2345Explorer, Amaya, Android Browser, Arora, Avant, BIDUBrowser, Baidu,
-BIDUBrowser, Baidu, Basilisk, Blazer, Bolt, Brave, Bowser, Camino, Chimera,
+Basilisk, Blazer, Bolt, Bowser, Camino, Chimera, Chrome Headless,
-[Mobile] Chrome [Headless/WebView], Chromium, Cobalt, Comodo Dragon, Dillo,
+Chrome WebView, Chrome, Chromium, Comodo Dragon, Dillo, Dolphin, Doris, Edge,
-Dolphin, Doris, DuckDuckGo, Edge, Electron, Epiphany, Facebook, Falkon, Fennec, 
+Epiphany, Facebook, Falkon, Fennec, Firebird, Firefox, Flock, GSA, GoBrowser,
-Firebird, [Mobile] Firefox [Focus/Reality], Flock, Flow, GSA, GoBrowser, HeyTap,
+ICE Browser, IE, IEMobile, IceApe, IceCat, IceDragon, Iceape, Iceweasel,
-Huawei Browser, ICE Browser, IE, IEMobile, IceApe, IceCat, IceDragon, Iceweasel, 
+Iridium, Iron, Jasmine, K-Meleon, Kindle, Konqueror, LBBROWSER Line, Links,
-Instagram, Iridium, Iron, Jasmine, Kakao[Story/Talk], K-Meleon, Kindle, Klar, 
+Lunascape, Lynx, MIUI Browser, Maemo Browser, Maemo, Maxthon, MetaSr Midori,
-Konqueror, LBBROWSER, Line, LinkedIn, Links, Lunascape, Lynx, MIUI Browser, 
+Minimo, Mobile Safari, Mosaic, Mozilla, NetFront, NetSurf, Netfront, Netscape,
-Maemo Browser, Maemo, Maxthon, MetaSr Midori, Minimo, Mosaic, Mozilla, NetFront, 
+NokiaBrowser, Oculus Browser, OmniWeb, Opera Coast, Opera Mini, Opera Mobi,
-NetSurf, Netfront, Netscape, NokiaBrowser, Obigo, Oculus Browser, OmniWeb, 
+Opera Tablet, Opera, PaleMoon, PhantomJS, Phoenix, Polaris, Puffin, QQ,
-Opera Coast, Opera [Mini/Mobi/Tablet], PaleMoon, PhantomJS, Phoenix, Polaris, 
+QQBrowser, QQBrowserLite, Quark, QupZilla, RockMelt, Safari, Samsung Browser, 
-Puffin, QQ, QQBrowser, QQBrowserLite, Quark, QupZilla, RockMelt, [Mobile] Safari, 
+SeaMonkey, Silk, Skyfire, Sleipnir, Slim, SlimBrowser, Swiftfox, Tizen Browser,
-Sailfish Browser, Samsung Browser, SeaMonkey, Silk, Skyfire, Sleipnir, Slim, 
+UCBrowser, Vivaldi, Waterfox, WeChat, Yandex, baidu, iCab, w3m, ...
-SlimBrowser, Snapchat, Swiftfox, Tesla, TikTok, 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
 
-##########
-# NOTE: 'desktop' is not a possible device type. 
-# UAParser only reports info directly available from the UA string, which is not the case for 'desktop' device type.
-# If you wish to detect desktop devices, you must handle the needed logic yourself.
-# You can read more about it in this issue: https://github.com/faisalman/ua-parser-js/issues/182
-##########
-
 # Possible 'device.vendor':
-Acer, Alcatel, Amazon, Apple, Archos, ASUS, AT&T, BenQ, BlackBerry, Dell,
+Acer, Alcatel, Amazon, Apple, Archos, Asus, BenQ, BlackBerry, Dell, Essential,
-Essential, Facebook, Fairphone, GeeksPhone, Google, HP, HTC, Huawei, Infinix, Jolla, 
+GeeksPhone, Google, HP, HTC, Huawei, Jolla, Lenovo, LG, Meizu, Microsoft, Motorola,
-Kobo, Lenovo, LG, Meizu, Microsoft, Motorola, Nexian, Nintendo, Nokia, Nvidia, 
+Nexian, Nintendo, Nokia, Nvidia, OnePlus, Ouya, Palm, Panasonic, Pebble, Polytron,
-OnePlus, OPPO, Ouya, Palm, Panasonic, Pebble, Polytron, Realme, RIM, Roku, Samsung, 
+RIM, Samsung, Sharp, Siemens, Sony[Ericsson], Sprint, Xbox, Xiaomi, ZTE, ...
-Sharp, Siemens, Sony[Ericsson], Sprint, Tecno, 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, 
+Amaya, Blink, EdgeHTML, Gecko, Goanna, iCab, KHTML, Links, Lynx, NetFront, NetSurf,
-NetFront, NetSurf, Presto, Tasman, Trident, w3m, WebKit
+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,
+AIX, Amiga OS, Android, Arch, Bada, BeOS, BlackBerry, CentOS, Chromium OS, Contiki,
-Contiki, Fedora, Firefox OS, FreeBSD, Debian, Deepin, DragonFly, elementary OS, 
+Fedora, Firefox OS, FreeBSD, Debian, DragonFly, Fuchsia, Gentoo, GNU, Haiku, Hurd, iOS, 
-Fuchsia, Gentoo, GhostBSD, GNU, Haiku, HarmonyOS, HP-UX, Hurd, iOS, Joli, KaiOS, 
+Joli, Linpus, Linux, Mac OS, Mageia, Mandriva, MeeGo, Minix, Mint, Morph OS, NetBSD, 
-Linpus, Linspire,Linux, Mac OS, Maemo, Mageia, Mandriva, Manjaro, MeeGo, Minix, 
+Nintendo, OpenBSD, OpenVMS, OS/2, Palm, PC-BSD, PCLinuxOS, Plan9, Playstation, QNX, RedHat, 
-Mint, Morph OS, NetBSD, NetRange, NetTV, Nintendo, OpenBSD, OpenVMS, OS/2, Palm, 
+RIM Tablet OS, RISC OS, Sailfish, Series40, Slackware, Solaris, SUSE, Symbian, Tizen, 
-PC-BSD, PCLinuxOS, Plan9, PlayStation, QNX, Raspbian, RedHat, RIM Tablet OS, 
+Ubuntu, Unix, VectorLinux, WebOS, Windows [Phone/Mobile], Zenwalk, ...
-RISC OS, Sabayon, Sailfish, SerenityOS, Series40, Slackware, Solaris, SUSE, Symbian, 
-Tizen, Ubuntu, Unix, VectorLinux, Viera, watchOS, WebOS, Windows [Phone/Mobile], 
-Zenwalk, ...
 
 # 'os.version' determined dynamically
 ```
 
-#### * `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]
+68k, amd64, arm[64], avr, ia[32/64], irix[64], mips[64], pa-risc, ppc, sparc[64]
 ```
 
-#### * `getUA():string`
+* `getGPU()`
+    * returns `{ vendor: '', model: '' }`
 
 ```sh
-returns user-agent string of current instance
+# Possible 'gpu.vendor'
+ATI, Intel, NVIDIA, Qualcomm, SiS
+
+# 'gpu.model' determined dynamically
 ```
 
-#### * `setUA(ua:string):UAParser`
+* `getResult()`
+    * returns `{ ua: '', browser: {}, cpu: {}, device: {}, engine: {}, os: {} }`
 
-```sh
+* `getUA()`
-set user-agent string to be parsed
+    * returns UA string of current instance
-returns current instance
-```
 
----
+* `setRenderer(rendererstr)`
+    * set Renderer string to parse
+    * returns current instance
 
-## `IData`: `since@2.0`
+* `setUA(uastring)`
+    * set UA string to parse
+    * returns current instance
 
-#### 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
 
----
+# Example
-
-#### * `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
-```
-
-
-# Usage
-
-## Using HTML
 
 ```html
 <!doctype html>
 <html>
 <head>
-<script src="ua-parser.min.js"></script>
+<script type="text/javascript" src="ua-parser.min.js"></script>
-<script>
+<script type="text/javascript">
 
-    var uap = new UAParser();
+	var parser = new UAParser();
-    console.log(uap.getResult());
+
+    // by default it takes ua string from current browser's window.navigator.userAgent
+    console.log(parser.getResult());
     /*
-        /// This will print an object structured like this:
+        /// this will print an object structured like this:
         {
             ua: "",
             browser: {
                 name: "",
-                version: "",
+                version: ""
-                major: ""
             },
             engine: {
                 name: "",
@@ -482,17 +155,21 @@ console.log(browser.name); // Thunderbird
             },
             cpu: {
                 architecture: ""
+            },
+            gpu: {
+                vendor: "",
+                model: ""
             }
         }
     */
-    // Default result depends on current window.navigator.userAgent value
 
-    // Now let's try a custom user-agent string as an example
+    // let's test 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";
+    var uastring = "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);
+    parser.setUA(uastring);
-    var result = uap.getResult();
+
-    // You can also use UAParser constructor directly without having to create an instance:
+    var result = parser.getResult();
-    // var ua = UAParser(uastring1);
+    // this will also produce the same result (without instantiation):
+    // var result = UAParser(uastring);
 
     console.log(result.browser);        // {name: "Chromium", version: "15.0.874.106"}
     console.log(result.device);         // {model: undefined, type: undefined, vendor: undefined}
@@ -501,16 +178,16 @@ console.log(browser.name); // Thunderbird
     console.log(result.engine.name);    // "WebKit"
     console.log(result.cpu.architecture);   // "amd64"
 
-    // Do some other tests
+    // 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(parser.setUA(uastring2).getBrowser().name); // "Konqueror"
-    console.log(uap.getOS());                            // {name: "OpenBSD", version: undefined}
+    console.log(parser.getOS());                            // {name: "OpenBSD", version: undefined}
-    console.log(uap.getEngine());                        // {name: "KHTML", version: "4.1.4"}
+    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(parser.setUA(uastring3).getDevice().model); // "PlayBook"
-    console.log(uap.getOS())                             // {name: "RIM Tablet OS", version: "1.0.0"}
+    console.log(parser.getOS())                             // {name: "RIM Tablet OS", version: "1.0.0"}
-    console.log(uap.getBrowser().name);                  // "Safari"
+    console.log(parser.getBrowser().name);                  // "Safari"
 
 </script>
 </head>
@@ -521,32 +198,17 @@ console.log(browser.name); // Thunderbird
 
 ## Using node.js
 
-Note: Device information is not available in the NodeJS environment.
-
 ```sh
 $ npm install ua-parser-js
 ```
 
 ```js
 var http = require('http');
-var uap = require('ua-parser-js');
+var parser = require('ua-parser-js');
 
 http.createServer(function (req, res) {
     // get user-agent header
-    var ua = uap(req.headers['user-agent']);
+    var ua = parser(req.headers['user-agent']);
-
-    /* // BEGIN since@2.0 - you can also pass client-hints data to UAParser
-
-    // note: only works in secure context (https:// or localhost or file://)
-
-    var getHighEntropyValues = 'Sec-CH-UA-Full-Version-List, Sec-CH-UA-Mobile, Sec-CH-UA-Model, Sec-CH-UA-Platform, Sec-CH-UA-Platform-Version, Sec-CH-UA-Arch, Sec-CH-UA-Bitness';
-    res.setHeader('Accept-CH', getHighEntropyValues);
-    res.setHeader('Critical-CH', getHighEntropyValues);
-    
-    var ua = uap(req.headers).withClientHints();
-
-    // END since@2.0 */
-
     // write the result as response
     res.end(JSON.stringify(ua, null, '  '));
 })
@@ -555,17 +217,38 @@ http.createServer(function (req, res) {
 console.log('Server running at http://127.0.0.1:1337/');
 ```
 
-## Using ES Modules
+## Using requirejs
 
 ```js
-import { UAParser } from 'ua-parser-js';
+requirejs.config({
+    baseUrl : 'js/lib', // path to your script directory
+    paths   : {
+        'ua-parser-js' : 'ua-parser.min'
+    }
+});
 
-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');
+requirejs(['ua-parser-js'], function(UAParser) {
+    var parser = new UAParser();
+    console.log(parser.getResult());
+});
+```
 
-console.log(browser.name);          // Maemo Browser
+## Using CDN
-console.log(cpu.is('arm'));         // true
+
-console.log(device.is('mobile'));   // true
+```html
-console.log(device.model);          // N900
+<script src="https://cdn.jsdelivr.net/npm/ua-parser-js@0/dist/ua-parser.min.js"></script>
+```
+
+## Using bower
+
+```sh
+$ bower install ua-parser-js
+```
+
+## Using meteor
+
+```sh
+$ meteor add faisalman:ua-parser-js
 ```
 
 ## Using TypeScript
@@ -578,18 +261,18 @@ $ npm install --save @types/ua-parser-js
 
 ## Using jQuery/Zepto ($.ua)
 
-Although written in vanilla js, this library will automatically detect if jQuery/Zepto is present and create `$.ua` object (with values based on its User-Agent) along with `window.UAParser` constructor. To get/set user-agent you can use: `$.ua.get()` / `$.ua.set(uastring)`.
+Although written in vanilla js (which means it doesn't depends on jQuery), this library will automatically detect if jQuery/Zepto is present and create `$.ua` object based on browser's user-agent (although in case you need, `window.UAParser` constructor is still present). To get/set user-agent you can use: `$.ua.get()` / `$.ua.set(uastring)`. 
 
 ```js
-// Say we are in a browser with default user-agent: 'Mozilla/5.0 (Linux; U; Android 2.3.4; en-us; Sprint APA7373KT Build/GRJ22) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0':
+// In browser with default user-agent: 'Mozilla/5.0 (Linux; U; Android 2.3.4; en-us; Sprint APA7373KT Build/GRJ22) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0':
 
-// Get the details
+// Do some tests
 console.log($.ua.device);           // {vendor: "HTC", model: "Evo Shift 4G", type: "mobile"}
 console.log($.ua.os);               // {name: "Android", version: "2.3.4"}
 console.log($.ua.os.name);          // "Android"
 console.log($.ua.get());            // "Mozilla/5.0 (Linux; U; Android 2.3.4; en-us; Sprint APA7373KT Build/GRJ22) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0"
 
-// Now lets try to reset to another custom user-agent
+// reset to custom user-agent
 $.ua.set('Mozilla/5.0 (Linux; U; Android 3.0.1; en-us; Xoom Build/HWI69) AppleWebKit/534.13 (KHTML, like Gecko) Version/4.0 Safari/534.13');
 
 // Test again
@@ -603,36 +286,54 @@ console.log(parseInt($.ua.browser.version.split('.')[0], 10));  // 4
 $('body').addClass('ua-browser-' + $.ua.browser.name + ' ua-devicetype-' + $.ua.device.type);
 ```
 
+## Extending regex patterns
+
+* `UAParser([uastring,] extensions)`
+
+Pass your own regexes to extend the limited matching rules.
+
+```js
+// Example:
+var myOwnRegex = [[/(myownbrowser)\/([\w\.]+)/i], [UAParser.BROWSER.NAME, UAParser.BROWSER.VERSION]];
+var myParser = new UAParser({ browser: myOwnRegex });
+var uaString = 'Mozilla/5.0 MyOwnBrowser/1.3';
+console.log(myParser.setUA(uaString).getBrowser());   // {name: "MyOwnBrowser", version: "1.3"}
+```
+
+
 # Development
 
-## Backers & Sponsors
+## Contribute
-
-<a href="https://opencollective.com/ua-parser-js"><img src="https://opencollective.com/ua-parser-js/organizations.svg?avatarHeight=64"></a>
-<a href="https://opencollective.com/ua-parser-js"><img src="https://opencollective.com/ua-parser-js/individuals.svg?avatarHeight=64"></a>
-
-<a href="https://www.paypal.me/faisalman/"><img src="https://cdn.rawgit.com/twolfson/paypal-github-button/1.0.0/dist/button.svg" height="40"></a>
-
-## Contributors
-
-<a href="https://github.com/faisalman/ua-parser-js/graphs/contributors">
-  <img src="https://contrib.rocks/image?repo=faisalman/ua-parser-js" />
-</a>
-
-Made with [contributors-img](https://contrib.rocks).
-
-## How To Contribute
 
 * Fork and clone this repository
 * Make some changes as required
-* Write unit test to showcase its functionality
+* Write a unit test to showcase your feature
-* Run the test suites to make sure it's not breaking anything `$ npm test`
+* Run the test suites to make sure the changes you made didn't break anything `$ npm run test`
-* Submit a pull request under `develop` branch
+* Commit and push to your own repository
+* Submit a pull request to this repository under `develop` branch
+* Profit? $$$
+
+## Build
+
+Build a minified & packed script
+
+```sh
+$ npm run build
+```
+
+
+# Donate
+
+Do you use & like UAParser.js but you don’t find a way to show some love? If yes, please consider donating to support this project. Otherwise, no worries, regardless of whether there is support or not, I will keep maintaining this project. Still, if you buy me a cup of coffee I would be more than happy though :)
+
+[![Support via PayPal](https://cdn.rawgit.com/twolfson/paypal-github-button/1.0.0/dist/button.svg)](https://www.paypal.me/faisalman/)
+
 
 # License
 
 MIT License
 
-Copyright (c) 2012-2023 Faisal Salman <<f@faisalman.com>>
+Copyright (c) 2012-2019 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

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

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']]);

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 

security.md

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

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
-};

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
-};

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
-};

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
-};

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
-};

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
-};

src/ua-parser.js

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

test/browser-test.json

@@ -1,14 +1,4 @@
 [
-    {
-        "desc"    : "360 Browser on iOS",
-        "ua"      : "Mozilla/5.0 (iPhone; CPU iPhone OS 12_4_1 like Mac OS X) AppleWebKit/607.3.9 (KHTML, like Gecko) Mobile/16G102 QHBrowser/317 QihooBrowser/4.0.10",
-        "expect"  :
-        {
-            "name"    : "360 Browser",
-            "version" : "undefined",
-            "major"   : "undefined"
-        }
-    },
     {
         "desc"    : "Android Browser on Galaxy Nexus",
         "ua"      : "Mozilla/5.0 (Linux; U; Android 4.0.2; en-us; Galaxy Nexus Build/ICL53F) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Mobile Safari/534.30",
@@ -99,32 +89,12 @@
             "major"   : "undefined"
         }
     },
-    {
-        "desc"    : "Avast Secure Browser",
-        "ua"      : "Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/72.0.3626.121 Safari/537.36 Avast/72.0.1174.122",
-        "expect"  :
-        {
-            "name"    : "Avast Secure Browser",
-            "version" : "72.0.1174.122",
-            "major"   : "72"
-        }
-    },
-    {
-        "desc"    : "AVG Secure Browser",
-        "ua"      : "Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/72.0.3626.121 Safari/537.36 AVG/72.0.719.123",
-        "expect"  :
-        {
-            "name"    : "AVG Secure Browser",
-            "version" : "72.0.719.123",
-            "major"   : "72"
-        }
-    },
     {
         "desc"    : "Baidu",
         "ua"      : "Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; SV1; baidubrowser 1.x)",
         "expect"  :
         {
-            "name"    : "baidubrowser",
+            "name"    : "baidu",
             "version" : "1.x",
             "major"   : "1"
         }
@@ -159,16 +129,6 @@
             "major"   : "2"
         }
     },
-    {
-        "desc"    : "Camino on Mac",
-        "ua"      : "Mozilla/5.0 (Macintosh; Intel Mac OS X 10.5; rv:2.0.1) Gecko/20100101 Firefox/4.0.1 Camino/2.2.1",
-        "expect"  :
-        {
-            "name"    : "Camino",
-            "version" : "2.2.1",
-            "major"   : "2"
-        }
-    },
     {
         "desc"    : "Chimera",
         "ua"      : "Mozilla/5.0 (Macintosh; U; PPC Mac OS X; pl-PL; rv:1.0.1) Gecko/20021111 Chimera/0.6",
@@ -189,56 +149,6 @@
             "major"   : "20"
         }
     },
-    {
-        "desc"    : "Chrome",
-        "ua"      : "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/100.0.4758.102 Safari/537.36",
-        "expect"  :
-        {
-            "name"    : "Chrome",
-            "version" : "100.0.4758.102",
-            "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 +184,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,21 +204,11 @@
         "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"
         }
     },
-    {
-        "desc"    : "Coc Coc Browser",
-        "ua"      : "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_3) AppleWebKit/537.36 (KHTML, like Gecko) coc_coc_browser/78.0.129 Chrome/72.0.3626.129 Safari/537.36",
-        "expect"  :
-        {
-            "name"    : "Coc Coc",
-            "version" : "78.0.129",
-            "major"   : "78"
-        }
-    },
     {
         "desc"    : "Dillo",
         "ua"      : "Dillo/2.2",
@@ -339,16 +239,6 @@
             "major"   : "1"
         }
     },
-    {
-        "desc"    : "DuckDuckGo",
-        "ua"      : "Mozilla/5.0 (Linux; Android 8.1.0) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/92.0.4515.131 Mobile DuckDuckGo/5 Safari/537.36",
-        "expect"  :
-        {
-            "name"    : "DuckDuckGo",
-            "version" : "5",
-            "major"   : "5"
-        }
-    },
     {
         "desc"    : "Epiphany",
         "ua"      : "Mozilla/5.0 (X11; U; FreeBSD i386; en-US; rv:1.7) Gecko/20040628 Epiphany/1.2.6",
@@ -359,16 +249,6 @@
             "major"   : "1"
         }
     },
-    {
-        "desc"    : "Flow",
-        "ua"      : "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_0) EkiohFlow/5.7.4.30559 Flow/5.7.4 (like Gecko Firefox/53.0 rv:53.0)",
-        "expect"  :
-        {
-            "name"    : "Flow",
-            "version" : "5.7.4",
-            "major"   : "5"
-        }
-    },
     {
         "desc"    : "Waterfox",
         "ua"      : "Mozilla/5.0 (X11; Linux x86_64; rv:55.0) Gecko/20100101 Firefox/55.2.2 Waterfox/55.2.2",
@@ -400,7 +280,7 @@
         }
     },
     {
-        "desc"    : "Facebook in-App Browser for Android with version",
+        "desc"    : "Facebook in-App Browser for Android",
         "ua"      : "Mozilla/5.0 (Linux; Android 5.0; SM-G900P Build/LRX21T; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/43.0.2357.121 Mobile Safari/537.36 [FB_IAB/FB4A;FBAV/35.0.0.48.273;]",
         "expect"  :
         {
@@ -410,7 +290,7 @@
         }
     },
     {
-        "desc"    : "Facebook in-App Browser for iOS with version",
+        "desc"    : "Facebook in-App Browser for iOS",
         "ua"      : "Mozilla/5.0 (iPhone; CPU iPhone OS 10_3_1 like Mac OS X) AppleWebKit/603.1.30 (KHTML, like Gecko) Mobile/14E304 [FBAN/FBIOS;FBAV/91.0.0.41.73;FBBV/57050710;FBDV/iPhone8,1;FBMD/iPhone;FBSN/iOS;FBSV/10.3.1;FBSS/2;FBCR/Telekom.de;FBID/phone;FBLC/de_DE;FBOP/5;FBRV/0])",
         "expect"  :
         {
@@ -419,26 +299,6 @@
             "major"   : "91"
         }
     },
-    {
-        "desc"    : "Facebook in-App Browser for iOS without version",
-        "ua"      : "Mozilla/5.0 (iPhone; CPU iPhone OS 13_3_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148 [FBAN/FBIOS;FBDV/iPhone10,2;FBMD/iPhone;FBSN/iOS;FBSV/13.3.1;FBSS/3;FBID/phone;FBLC/en_US;FBOP/5;FBCR/]",
-        "expect"  :
-        {
-            "name"    : "Facebook",
-            "version" : "undefined",
-            "major"   : "undefined"
-        }
-    },
-    {
-        "desc"    : "Instagram in-App Browser for iOS",
-        "ua"      : "Mozilla/5.0 (iPhone; CPU iPhone OS 14_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148 Instagram 142.0.0.22.109 (iPhone12,5; iOS 14_1; en_US; en-US; scale=3.00; 1242x2688; 214888322) NW/1",
-        "expect"  :
-        {
-            "name"    : "Instagram",
-            "version" : "142.0.0.22.109",
-            "major"   : "142"
-        }
-    },
     {
         "desc"    : "Falkon",
         "ua"      : "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Falkon/3.0.0 Chrome/61.0.3163.140 Safari/537.36",
@@ -469,36 +329,6 @@
             "major"   : "15"
         }
     },
-    {
-        "desc"    : "Firefox",
-        "ua"      : "Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:100.0) Gecko/20100101 Firefox/100.0",
-        "expect"  :
-        {
-            "name"    : "Firefox",
-            "version" : "100.0",
-            "major"   : "100"
-        }
-    },
-    {
-        "desc"    : "Firefox Reality",
-        "ua"      : "Mozilla/5.0 (Android 7.1.2; Mobile VR; rv:65.0) Gecko/65.0 Firefox/65.0",
-        "expect"  :
-        {
-            "name"    : "Firefox Reality",
-            "version" : "65.0",
-            "major"   : "65"
-        }
-    },
-    {
-        "desc"    : "Firefox-based browser",
-        "ua"      : "Mozilla/5.0 (X11; Linux x86_64; rv:80.0) Gecko/20100101 Firefox/80.0 AppName/1.0",
-        "expect"  :
-        {
-            "name"    : "Firefox",
-            "version" : "80.0",
-            "major"   : "80"
-        }
-    },
     {
         "desc"    : "Fennec",
         "ua"      : "Mozilla/5.0 (X11; U; Linux armv61; en-US; rv:1.9.1b2pre) Gecko/20081015 Fennec/1.0a1",
@@ -509,16 +339,6 @@
             "major"   : "1"
         }
     },
-    {
-        "desc"    : "Firefox for Maemo (Nokia N900)",
-        "ua"      : "Mozilla/5.0 (Maemo; Linux armv7l; rv:10.0.1) Gecko/20100101 Firefox/10.0.1 Fennec/10.0.1",
-        "expect"  :
-        {
-            "name"    : "Fennec",
-            "version" : "10.0.1",
-            "major"   : "10"
-        }
-    },
     {
         "desc": "Firefox Focus",
         "ua": "Mozilla/5.0 (Linux; Android 7.0) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Focus/6.1.1 Chrome/68.0.3440.91 Mobile Safari/537.36",
@@ -548,56 +368,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",
-        "expect"  :
-        {
-            "name"    : "Huawei Browser",
-            "version" : "10.0.3.102",
-            "major"   : "10"
-        }
-    },
-    {
-        "desc"    : "HuaweiBrowser",
-        "ua"      : "Mozilla/5.0 (Linux; Android 6.0.1; LYA-AL00；HMSCore/4.0.0 ) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/70.0.3538.64 HuaweiBrowser/10.0.3.102 Mobile Safari/537.36",
-        "expect"  :
-        {
-            "name"    : "Huawei Browser",
-            "version" : "10.0.3.102",
-            "major"   : "10"
-        }
-    },
-    {
-        "desc"    : "HuaweiBrowser",
-        "ua"      : "Mozilla/5.0 (Linux; Android 6.0.1; LYA-AL00；GMS/10.4 ) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/70.0.3538.64 HuaweiBrowser/10.0.3.102 Mobile Safari/537.36",
-        "expect"  :
-        {
-            "name"    : "Huawei Browser",
-            "version" : "10.0.3.102",
-            "major"   : "10"
-        }
-    },
-    {
-        "desc"    : "HuaweiBrowser",
-        "ua"      : "Mozilla/5.0 (Linux; Android 6.0.1; LYA-AL00 ) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/70.0.3538.64 HuaweiBrowser/10.0.3.102 Mobile Safari/537.36",
-        "expect"  :
-        {
-            "name"    : "Huawei Browser",
-            "version" : "10.0.3.102",
-            "major"   : "10"
-        }
-    },
     {
         "desc"    : "IceApe",
         "ua"      : "Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9.1.19) Gecko/20110817 Iceape/2.0.14",
@@ -808,16 +578,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)",
@@ -878,16 +638,6 @@
             "major"   : "8"
         }
     },
-    {
-        "desc"    : "Netscape 6",
-        "ua"      : "Mozilla/5.0 (Windows; U; Win95; de-DE; rv:0.9.2) Gecko/20010726 Netscape6/6.1",
-        "expect"  :
-        {
-            "name"    : "Netscape",
-            "version" : "6.1",
-            "major"   : "6"
-        }
-    },
     {
         "desc"    : "Nokia Browser",
         "ua"      : "Mozilla/5.0 (Symbian/3; Series60/5.2 NokiaN8-00/025.007; Profile/MIDP-2.1 Configuration/CLDC-1.1 ) AppleWebKit/533.4 (KHTML, like Gecko) NokiaBrowser/7.3.1.37 Mobile Safari/533.4 3gpp-gba",
@@ -898,26 +648,6 @@
             "major"   : "7"
         }
     },
-    {
-        "desc"    : "Obigo",
-        "ua"      : "LG-GS290/V100 Obigo/WAP2.0 Profile/MIDP-2.1 Configuration/CLDC-1.1",
-        "expect"  :
-        {
-            "name"    : "Obigo",
-            "version" : "WAP2.0",
-            "major"   : "2"
-        }
-    },
-    {
-        "desc"    : "Obigo",
-        "ua"      : "LG/KU990i/v10a Browser/Obigo-Q05A/3.6 MMS/LG-MMS-V1.0/1.2 Java/ASVM/1.0 Profile/MIDP-2.0 Configuration/CLDC-1.1",
-        "expect"  :
-        {
-            "name"    : "Obigo",
-            "version" : "Q05A",
-            "major"   : "05"
-        }
-    },
     {
         "desc"    : "Oculus Browser",
         "ua"      : "Mozilla/5.0 (Linux; Android 7.0; SM-G920I Build/NRD90M) AppleWebKit/537.36 (KHTML, like Gecko) OculusBrowser/3.4.9 SamsungBrowser/4.0 Chrome/57.0.2987.146 Mobile VR Safari/537.36",
@@ -928,16 +658,6 @@
             "major"   : "3"
         }
     },
-    {
-        "desc"    : "Oculus Browser",
-        "ua"      : "Mozilla/5.0 (Linux; Android 10; Quest 2) AppleWebKit/537.36 (KHTML, like Gecko) OculusBrowser/15.0.0.0.22.280317669 SamsungBrowser/4.0 Chrome/89.0.4389.90 VR Safari/537.36",
-        "expect"  :
-        {
-            "name"    : "Oculus Browser",
-            "version" : "15.0.0.0.22.280317669",
-            "major"   : "15"
-        }
-    },
     {
         "desc"    : "OmniWeb",
         "ua"      : "Mozilla/5.0 (Macintosh; U; PPC Mac OS X; en-US) AppleWebKit/85 (KHTML, like Gecko) OmniWeb/v558.48",
@@ -1124,8 +844,8 @@
         "expect"  :
         {
             "name"    : "Safari",
-            "version" : "1",
+            "version" : "2.0.4",
-            "major"   : "1"
+            "major"   : "2"
         }
     },
     {
@@ -1148,16 +868,6 @@
             "major"   : "2"
         }
     },
-    {
-        "desc"    : "SeaMonkey on Mac",
-        "ua"      : "Mozilla/5.0 (Macintosh; Intel Mac OS X 10.5; rv:10.0.1) Gecko/20100101 Firefox/10.0.1 SeaMonkey/2.7.1",
-        "expect"  :
-        {
-            "name"    : "SeaMonkey",
-            "version" : "2.7.1",
-            "major"   : "2"
-        }
-    },
     {
         "desc"    : "Silk Browser",
         "ua"      : "Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10_6_3; en-us; Silk/1.1.0-84)",
@@ -1198,26 +908,6 @@
             "major"   : "undefined"
         }
     },
-    {
-        "desc"    : "Tesla",
-        "ua"      : "Mozilla/5.0 (X11; GNU/Linux) AppleWebKit/601.1 (KHTML, like Gecko) Tesla QtCarBrowser Safari/601.1",
-        "expect"  :
-        {
-            "name"    : "Tesla",
-            "version" : "undefined",
-            "major"   : "undefined"
-        }
-    },
-    {
-        "desc"    : "Tesla",
-        "ua"      : "Mozilla/5.0 (X11; GNU/Linux) AppleWebKit/537.36 (KHTML, like Gecko) Chromium/79.0.3945.130 Chrome/79.0.3945.130 Safari/537.36 Tesla/2020.16.2.1-e99c70fff409",
-        "expect"  :
-        {
-            "name"    : "Tesla",
-            "version" : "2020.16.2.1-e99c70fff409",
-            "major"   : "2020"
-        }
-    },
     {
         "desc"    : "Tizen Browser",
         "ua"      : "Mozilla/5.0 (Linux; U; Tizen/1.0 like Android; en-us; AppleWebKit/534.46 (KHTML, like Gecko) Tizen Browser/1.0 Mobile",
@@ -1288,16 +978,6 @@
             "major"   : "7"
         }
     },
-    {
-        "desc"    : "UPBrowser",
-        "ua"      : "BenQ-CF61/1.00/WAP2.0/MIDP2.0/CLDC1.0 UP.Browser/6.3.0.4.c.1.102 (GUI) MMP/2.0",
-        "expect"  :
-        {
-            "name"    : "UP.Browser",
-            "version" : "6.3.0.4.c.1.102",
-            "major"   : "6"
-        }
-    },
     {
         "desc": "WeChat on iOS",
         "ua": "Mozilla/5.0 (iPhone; CPU iPhone OS 8_4_1 like Mac OS X) AppleWebKit/600.1.4 (KHTML, like Gecko) Mobile/12H321 MicroMessenger/6.3.6 NetType/WIFI Language/zh_CN",
@@ -1318,16 +998,6 @@
             "major": "6"
         }
     },
-    {
-        "desc": "WeiBo on Android",
-        "ua": "Mozilla/5.0 (iPhone; CPU iPhone OS 12_0 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/16A366 Weibo (iPhone8,2__weibo__8.9.3__iphone__os12.0)",
-        "expect":
-        {
-            "name": "weibo",
-            "version": "8.9.3",
-            "major": "8"
-        }
-    },
     {
         "desc"    : "Vivaldi",
         "ua"      : "Mozilla/5.0 (Windows NT 6.0) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/40.0.2214.89 Vivaldi/1.0.83.38 Safari/537.36",
@@ -1338,16 +1008,6 @@
             "major"   : "1"
         }
     },
-    {
-        "desc"    : "Viera",
-        "ua"      : "HbbTV/1.2.1 (;Panasonic;VIERA 2015;3.014;a001-003 4000-0000;)",
-        "expect"  :
-        {
-            "name"    : "VIERA",
-            "version" : "undefined",
-            "major"   : "undefined"
-        }
-    },
     {
         "desc"    : "Yandex",
         "ua"      : "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_8_2) AppleWebKit/536.5 (KHTML, like Gecko) YaBrowser/1.0.1084.5402 Chrome/19.0.1084.5402 Safari/536.5",
@@ -1358,66 +1018,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",
@@ -1429,7 +1029,7 @@
         }
     },
     {
-        "desc"    : "Microsoft Edge 0.1",
+        "desc"    : "Microsoft Edge",
         "ua"      : "Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/39.0.2171.71 Safari/537.36 Edge/12.0",
         "expect"  :
         {
@@ -1438,36 +1038,6 @@
             "major"   : "12"
         }
     },
-    {
-        "desc"    : "Microsoft Edge 42",
-        "ua"      : "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/64.0.3282.140 Safari/537.36 Edge/17.17134",
-        "expect"  :
-        {
-            "name"    : "Edge",
-            "version" : "17.17134",
-            "major"   : "17"
-        }
-    },
-    {
-        "desc"    : "Microsoft Edge 44",
-        "ua"      : "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/64.0.3282.140 Safari/537.36 Edge/18.17763",
-        "expect"  :
-        {
-            "name"    : "Edge",
-            "version" : "18.17763",
-            "major"   : "18"
-        }
-    },
-    {
-        "desc"    : "Microsoft Edge 100",
-        "ua"      : "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/100.0.1108.55 Safari/537.36 Edg/100.0.1108.55",
-        "expect"  :
-        {
-            "name"    : "Edge",
-            "version" : "100.0.1108.55",
-            "major"   : "100"
-        }
-    },
     {
         "desc"    : "Microsoft Edge on iOS",
         "ua"      : "Mozilla/5.0 (iPhone; CPU iPhone OS 11_4 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/11.0 EdgiOS/42.1.1.0 Mobile/15F79 Safari/605.1.15",
@@ -1513,31 +1083,11 @@
         "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",
-            "version" : "1.0",
-            "major"   : "1"
-        }
-    },
     {
         "desc"    : "QQ on iOS",
         "ua"      : "Mozilla/5.0 (iPhone; CPU iPhone OS 10_0_2 like Mac OS X) AppleWebKit/602.1.50 (KHTML, like Gecko) Mobile/14A456 QQ/6.5.3.410 V1_IPH_SQ_6.5.3_1_APP_A Pixel/1080 Core/UIWebView NetType/WIFI Mem/26",
@@ -1558,26 +1108,6 @@
             "major"   : "6"
         }
     },
-    {
-        "desc"    : "baidu app on iOS",
-        "ua"      : "Mozilla/5.0 (iPhone; CPU iPhone OS 12_1_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/16C101 main%2F1.0 baiduboxapp/11.12.0.18 (Baidu; P2 12.1.2)",
-        "expect"  :
-        {
-            "name"    : "baiduboxapp",
-            "version" : "11.12.0.18",
-            "major"   : "11"
-        }
-    },
-    {
-        "desc"    : "baidu app on Android",
-        "ua"      : "Mozilla/5.0 (Linux; Android 8.1.0; BKK-AL10 Build/HONORBKK-AL10; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/63.0.3239.83 Mobile Safari/537.36 T7/11.11 baiduboxapp/11.11.0.0 (Baidu; P1 8.1.0)",
-        "expect"  :
-        {
-            "name"    : "baiduboxapp",
-            "version" : "11.11.0.0",
-            "major"   : "11"
-        }
-    },
     {
         "desc"    : "WeChat Desktop for Windows Built-in Browser",
         "ua"      : "Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/39.0.2171.95 Safari/537.36 MicroMessenger/6.5.2.501 NetType/WIFI WindowsWechat QBCore/3.43.901.400 QQBrowser/9.0.2524.400",
@@ -1588,26 +1118,6 @@
             "major"   : "3"
         }
     },
-    {
-        "desc"    : "WeChat Desktop for Windows Built-in Browser major version in 4",
-        "ua"      : "mozilla/5.0 (windows nt 10.0; wow64) applewebkit/537.36 (khtml, like gecko) chrome/53.0.2785.116 safari/537.36 qbcore/4.0.1301.400 qqbrowser/9.0.2524.400 mozilla/5.0 (windows nt 6.1; wow64) applewebkit/537.36 (khtml, like gecko) chrome/81.0.4044.138 safari/537.36 nettype/wifi micromessenger/7.0.20.1781(0x6700143b) windowswechat",
-        "expect"  :
-        {
-            "name"    : "WeChat(Win) Desktop",
-            "version" : "4.0.1301.400",
-            "major"   : "4"
-        }
-    },
-    {
-        "desc"    : "Supposed not to be detected as WeChat",
-        "ua"      : "Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/70.0.3538.124 Safari/537.36 qblink wegame.exe WeGame/5.1.1.11100 QBCore/3.70.107.400 QQBrowser/9.0.2524.400",
-        "expect"  :
-        {
-            "name"    : "QQBrowser",
-            "version" : "9.0.2524.400",
-            "major"   : "9"
-        }
-    },
     {
         "desc"    : "GSA on iOS",
         "ua"      : "Mozilla/5.0 (iPhone; CPU iPhone OS 10_3_2 like Mac OS X) AppleWebKit/602.1.50 (KHTML, like Gecko) GSA/30.1.161623614 Mobile/14F89 Safari/602.1",
@@ -1673,211 +1183,5 @@
             "version" : "4.5.16",
             "major"   : "4"
         }
-    },
-    {
-        "desc"    : "Whale Browser",
-        "ua"      : "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_2) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/76.0.3809.146 Whale/2.6.90.14 Safari/537.36",
-        "expect"  :
-        {
-            "name"    : "Whale",
-            "version" : "2.6.90.14",
-            "major"   : "2"
-        }
-    },
-    {
-        "desc"    : "Electron",
-        "ua"      : "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Atom/1.41.0 Chrome/69.0.3497.128 Electron/4.2.7 Safari/537.36",
-        "expect"  :
-        {
-            "name"    : "Electron",
-            "version" : "4.2.7",
-            "major"   : "4"
-        }
-    },
-    {
-        "desc"    : "IE11 on Windows 7 (ua length >255)",
-        "ua"      : "Mozilla/5.0 (Windows NT 6.1; WOW64; APCPMS=^N201205020840572565478A37A6F9C41BD33F_9975^; Trident/7.0; SLCC2; .NET CLR 2.0.50727; .NET CLR 3.5.30729; .NET CLR 3.0.30729; Media Center PC 6.0; InfoPath.3; .NET4.0C; .NET4.0E; MARKANYEPS#25118; Zoom 3.6.0; rv:11.0) like Gecko",
-        "expect"  :
-        {
-            "name"    : "IE",
-            "version" : "11.0",
-            "major"   : "11"
-        }
-    },
-    {
-        "desc"    : "LinkedIn",
-        "ua"      : "Mozilla/5.0 (iPhone; CPU iPhone OS 15_4_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148 [LinkedInApp]",
-        "expect"  :
-        {
-            "name"    : "LinkedIn"
-        }
-    },
-    {
-        "desc"    : "Safari including comma in minor version number",
-        "ua"      : "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_6) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/15.6,2 Safari/605.1.15",
-        "expect"  :
-        {
-            "name"    : "Safari",
-            "version" : "15.6,2",
-            "major"   : "15"
-        }
-    },
-    {
-        "desc"    : "Mobile Safari including comma in minor version number",
-        "ua"      : "Mozilla/5.0 (iPhone; CPU iPhone OS 15_7 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/15.6,2 Mobile/15E148 Safari/604.1",
-        "expect"  :
-        {
-            "name"    : "Mobile Safari",
-            "version" : "15.6,2",
-            "major"   : "15"
-        }
-    },
-    {
-        "desc"     : "Cobalt 23 Master",
-        "ua"       : "Mozilla/5.0 (X11; Linux x86_64) Cobalt/23.master.0.0-devel (unlike Gecko) v8/8.8.278.8-jit gles Starboard/15",
-        "expect"   : {
-            "name"   : "Cobalt",
-            "version": "23.0.0",
-            "major"  : "23"
-        }
-    },
-    {
-        "desc"     : "Cobalt 23 LTS",
-        "ua"       : "Mozilla/5.0 (X11; Linux x86_64) Cobalt/23.lts.1.0-qa (unlike Gecko) v8/8.8.278.8-jit gles Starboard/15",
-        "expect"   : {
-            "name"   : "Cobalt",
-            "version": "23.1.0",
-            "major"  : "23"
-        }
-    },
-    {
-        "desc"     : "Cobalt 11",
-        "ua"       : "Mozilla/5.0 (X11; Linux x86_64) Cobalt/11.0-qa (unlike Gecko) Starboard/6",
-        "expect"   : {
-            "name"   : "Cobalt",
-            "version": "11.0",
-            "major"  : "11"
-        }
-    },
-    {
-        "desc"     : "Cobalt 9",
-        "ua"       : "Mozilla/5.0 (X11; Linux x86_64) Cobalt/9.0-qa (unlike Gecko) Starboard/4",
-        "expect"   : {
-            "name"   : "Cobalt",
-            "version": "9.0",
-            "major"  : "9"
-        }
-    },
-    {
-        "desc"     : "KakaoTalk App Android",
-        "ua"       : "Mozilla/5.0 (Linux; Android 12; SM-G988N Build/SP1A.210812.016; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/100.0.4896.79 Mobile Safari/537.36;KAKAOTALK 2409760",
-        "expect"   : {
-            "name"   : "KAKAOTALK",
-            "version": "2409760",
-            "major"  : "2409760"
-        }
-    },
-    {
-        "desc"     : "KakaoStory App Android",
-        "ua"       : "Mozilla/5.0 (Linux; Android 12; SM-G988N Build/SP1A.210812.016; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/100.0.4896.79 Mobile Safari/537.36 KAKAOSTORY/6.8.3_21046",
-        "expect"   : {
-            "name"   : "KAKAOSTORY",
-            "version": "6.8.3_21046",
-            "major"  : "6"
-        }
-    },
-    {
-        "desc"     : "KakaoTalk App iOS",
-        "ua"       : "Mozilla/5.0 (iPhone; CPU; iPhone OS 15_4_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148 BizWebView KAKAOTALK 9.7.6",
-        "expect"   : {
-            "name"   : "KAKAOTALK",
-            "version": "9.7.6",
-            "major"  : "9"
-        }
-    },
-    {
-        "desc"     : "Naver App Android",
-        "ua"       : "Mozilla/5.0 (Linux; Android 12; SM-G988N Build/SP1A.210812.016; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/90.0.4430.232 Whale/1.0.0.0 Crosswalk/26.90.3.21 Mobile Safari/537.36 NAVER(inapp; search; 1010; 11.11.2)",
-        "expect"   : {
-            "name"   : "NAVER",
-            "version": "11.11.2",
-            "major"  : "11"
-        }
-    },
-    {
-        "desc"     : "Naver App iOS",
-        "ua"       : "Mozilla/5.0 (iPhone; CPU iPhone OS 13_5_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/13.0 Mobile/15E148 Safari/605.1 NAVER(inapp; search; 720; 10.25.0; 11PRO)",
-        "expect"   : {
-            "name"   : "NAVER",
-            "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"
-        }
     }
 ]

test/cpu-test.json

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

test/engine-test.json

@@ -5,7 +5,7 @@
         "expect"  :
         {
             "name"    : "Blink",
-            "version" : "57.0.2987.146"
+            "version" : "undefined"
         }
     },
     {
@@ -17,15 +17,6 @@
             "version" : "12.0"
         }
     },
-    {
-        "desc"    : "Flow",
-        "ua"      : "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_0) EkiohFlow/5.7.4.30559 Flow/5.7.4 (like Gecko Firefox/53.0 rv:53.0)",
-        "expect"  :
-        {
-            "name"    : "Flow",
-            "version" : "5.7.4.30559"
-        }
-    },
     {
         "desc"    : "Gecko",
         "ua"      : "Mozilla/5.0 (X11; Linux x86_64; rv:2.0b9pre) Gecko/20110111 Firefox/4.0b9pre",
@@ -53,15 +44,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",
@@ -115,50 +97,5 @@
             "name"    : "WebKit",
             "version" : "537.36"
         }
-    },
-    {
-        "desc"    : "WebOS TV 5.x",
-        "ua"      : "Mozilla/5.0 (Web0S; Linux/SmartTV) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/68.0.3440.106 Safari/537.36 WebAppManager",
-        "expect"  :
-        {
-            "name"    : "Blink",
-            "version" : "68.0.3440.106"
-        }
-    },
-    {
-        "desc"    : "WebOS TV 4.x",
-        "ua"      : "Mozilla/5.0 (Web0S; Linux/SmartTV) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/53.0.2785.34 Safari/537.36 WebAppManager",
-        "expect"  :
-        {
-            "name"    : "Blink",
-            "version" : "53.0.2785.34"
-        }
-    },
-    {
-        "desc"    : "WebOS TV 3.x",
-        "ua"      : "Mozilla/5.0 (Web0S; Linux/SmartTV) AppleWebKit/537.36 (KHTML, like Gecko) QtWebEngine/5.2.1 Chrome/38.0.2125.122 Safari/537.36 WebAppManager",
-        "expect"  :
-        {
-            "name"    : "Blink",
-            "version" : "38.0.2125.122"
-        }
-    },
-    {
-        "desc"    : "WebOS TV 2.x",
-        "ua"      : "Mozilla/5.0 (Web0S; Linux/SmartTV) AppleWebKit/538.2 (KHTML, like Gecko) Large Screen WebAppManager Safari/538.2",
-        "expect"  :
-        {
-            "name"    : "WebKit",
-            "version" : "538.2"
-        }
-    },
-    {
-        "desc"    : "WebOS TV 1.x",
-        "ua"      : "Mozilla/5.0 (Web0S; Linux/SmartTV) AppleWebKit/537.41 (KHTML, like Gecko) Large Screen WebAppManager Safari/537.41",
-        "expect"  :
-        {
-            "name"    : "WebKit",
-            "version" : "537.41"
-        }
     }
 ]

test/gpu-test.json

@@ -0,0 +1,56 @@
+[
+    {
+        "desc"    : "Intel",
+        "renderer": "Intel HD Graphics 4000 OpenGL Engine",
+        "expect"  :
+        {
+            "vendor"  : "Intel",
+            "model"   : "HD Graphics 4000"
+        }
+    },
+    {
+        "desc"    : "Intel",
+        "renderer": "Intel Iris Pro OpenGL Engine",
+        "expect"  :
+        {
+            "vendor"  : "Intel",
+            "model"   : "Iris Pro"
+        }
+    },
+    {
+        "desc"    : "Intel",
+        "renderer": "Intel GMA X3100 OpenGL Engine",
+        "expect"  :
+        {
+            "vendor"  : "Intel",
+            "model"   : "GMA X3100"
+        }
+    },
+    {
+        "desc"    : "ATI",
+        "renderer": "ATI Radeon HD 6750M OpenGL Engine",
+        "expect"  :
+        {
+            "vendor"  : "ATI",
+            "model"   : "Radeon HD 6750M"
+        }
+    },
+    {
+        "desc"    : "NVIDIA",
+        "renderer": "NVIDIA GeForce GT 650M OpenGL Engine",
+        "expect"  :
+        {
+            "vendor"  : "NVIDIA",
+            "model"   : "GeForce GT 650M"
+        }
+    },
+    {
+        "desc"    : "Qualcomm",
+        "renderer": "Adreno (TM) 320",
+        "expect"  :
+        {
+            "vendor"  : "Qualcomm",
+            "model"   : "Adreno 320"
+        }
+    }
+]

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}`);
-    }
-};

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);
-    });
-});

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);
-                    });
-                });
-            });
-        });
-    });
-});

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);
-    });
-});

test/os-test.json

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

test/playwright-test-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');
-});

test/specs/cpu-all.json

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

test/specs/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"
-    }
-}]

test/test.js

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