Merge branch 'master' into gpu-detect-experimental

.github/FUNDING.yml

@@ -1,12 +0,0 @@
-# These are supported funding model platforms
-
-github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
-patreon: # Replace with a single Patreon username
-open_collective: ua-parser-js
-ko_fi: # Replace with a single Ko-fi username
-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/workflows/run-test.yml

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

.jshintrc

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

.travis.yml

@@ -1,6 +1,3 @@
-arch:
- - amd64
- - ppc64le
 language: node_js
 node_js:
     - stable
@@ -14,5 +11,3 @@ cache:
         - node_modules
 
 sudo: false
-
-script: npm run test-ci

bower.json

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

changelog.md

@@ -1,115 +0,0 @@
-# UAParser.js Changelog
-
-# 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.41 / 1.0.41
-- Add new browser: Daum, Ladybird
-- Add new device vendor: HMD
-- Add new engine: LibWeb
-- Add new os: Windows IoT, Ubuntu Touch
-- Improve cpu detection: ARM, x86
-- Improve device vendor detection: Apple, Archos, Generic, Google, Honor, Huawei, Infinix, Nvidia, Lenovo, Nokia, OnePlus, Xiaomi
-- Improve device type detection: smarttv, wearables
-- Improve os detection: Linux, Symbian
-
-## Version 0.7.40 / 1.0.40
-- Add new browser: 115, LibreWolf, Slimboat, Slimjet
-- Add new device: Advan, Cat, Energizer, IMO, Micromax, Smartfren
-- Add new engine: ArkWeb, Servo
-- Add new os: OpenHarmony
-- Improve browser detection: 2345, 360, Dragon, Iron, Maxthon
-- Recognize Honor as a separate device vendor from Huawei
-- Fix Python Request mistakenly identified as Meta Quest
-
-## Version 0.7.39 / 1.0.39
-- Add new feature: executable command using `npx ua-parser-js "[INSERT-UA-HERE]"`
-- Add new browser: Helio, Pico Browser, Wolvic
-- Add new device vendor: itel, Nothing, TCL
-- Improve browser detection: ICEBrowser, Klar, QQBrowser, Quark, Rekonq, Sleipnir
-- Improve device detection: Xiaomi Pro, Amazon Echo Show, Samsung Galaxy Watch
-- Removed from browser: Viera
-
-## Version 0.7.38 / 1.0.38
-- Fix error on getOS() when userAgentData.platform is undefined
-- Add new browser: Opera GX, Twitter
-- Improve browser detection: DuckDuckGo
-- Improve device detection: OPPO Pad, Oculus Quest
-
-## Version 0.7.37 / 1.0.37
-- Fix misidentified WebView token as device model
-- Increase UA_MAX_LENGTH to 500
-- Add new browser: Alipay, Klarna, Smart Lenovo Browser, Vivo Browser
-- Add new device: Ulefone
-- Improve device detection: Realme, Xiaomi Redmi
-- Rename browser: Avant, Baidu, Samsung Internet, Sogou Explorer, Sogou Mobile, WeChat
-
-## Version 0.7.36 / 1.0.36
-- Add new browser: Snapchat
-- Add new devices: Infinix, Tecno
-- Improve device detection: Amazon Fire TV, Xiaomi POCO 
-- Improve OS detection: iOS
-
-## Version 0.7.35 / 1.0.35
-- Fix result from user-supplied user-agent being altered
-- Add new browser: Heytap, TikTok
-- Add new engine: LibWeb
-- Add new OS: SerenityOS
-- Improve browser detection: Yandex
-- Improve device detection: iPhone, Amazon Echo
-- Improve OS detection: iOS
-
-## Version 0.7.34 / 1.0.34
-- Fix Sharp Mobile detected as Huawei Tablet
-- Fix IE8 bug
-- Add new devices : Kobo e-Reader, Apple Watch, and some new SmartTV devices
-- Add new OS : watchOS
-- Improve browser detection : Kakao, Naver, Brave
-- Improve device detection : Oculus, iPad
-- Improve OS detection : Chrome OS
-- Using navigator.userAgentData as fallback for device.type & os.name
-
-## Version 0.7.33 / 1.0.33
-
-- Add new browser : Cobalt
-- Identify Macintosh as an Apple device
-- Fix ReDoS vulnerability
-
-## Version 0.7.32 / 1.0.32
-
-- Add new browser : DuckDuckGo, Huawei Browser, LinkedIn
-- Add new OS : HarmonyOS
-- Add some Huawei models
-- Add Sharp Aquos TV
-- Improve detection Xiaomi Mi CC9 
-- Fix Sony Xperia 1 III misidentified as Acer tablet
-- Fix Detect Sony BRAVIA as SmartTV 
-- Fix Detect Xiaomi Mi TV as SmartTV 
-- Fix Detect Galaxy Tab S8 as tablet 
-- Fix WeGame mistakenly identified as WeChat
-- Fix included commas in Safari / Mobile Safari version
-- Increase UA_MAX_LENGTH to 350
-
-## Version 0.7.31 / 1.0.2
-
-- Fix OPPO Reno A5 incorrect detection
-- Fix TypeError Bug
-- Use AST to extract regexes and verify them with safe-regex
-
-## Version 0.7.30 / 1.0.1
-
-- Add new browser : Obigo, UP.Browser, Klar
-- Add new device : Oculus, Roku
-- Add new OS: Maemo, HP-UX, Android-x86, Deepin, elementary OS, GhostBSD, Linspire, Manjaro, Sabayon
-- Improve detection for Sony Xperia 1ii, LG Android TV, and some more devices
-- Improve detection for ARM64 CPU
-- Improve detection for Windows Mobile, Netscape, Mac on PowerPC
-- Categorize PDA as mobile
-- Fix Sharp devices misjudged as Huawei
-- Fix trailing comma for ES3 compatibility
-- Some code refactor
-
-# Version 0.8
-
-Version 0.8 was created by accident. This version is now deprecated and no longer maintained, please update to version 0.7 / 1.0.

license.md

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2012-2025 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: '0.7.41',
+  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,161 +1,105 @@
 {
   "title": "UAParser.js",
   "name": "ua-parser-js",
-  "version": "0.7.41",
+  "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 data. Supports browser & node.js environment",
+  "description": "Lightweight JavaScript-based user-agent string parser",
   "keywords": [
-    "ua-parser-js",
     "user-agent",
+    "parser",
     "browser",
     "engine",
     "os",
     "device",
-    "mobile",
     "cpu",
-    "platform",
+    "jquery-plugin",
-    "detect",
+    "ecosystem:jquery"
-    "javascript",
-    "jquery",
-    "typescript",
-    "node-js",
-    "client-hints"
   ],
-  "homepage": "https://uaparser.dev",
+  "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>"
   ],
   "main": "src/ua-parser.js",
-  "files": [
-    "dist",
-    "src"
-  ],
-  "bin": "./script/cli.js",
   "scripts": {
-    "build": "uglifyjs src/ua-parser.js -o dist/ua-parser.min.js --comments '/^ UA/' && uglifyjs src/ua-parser.js -o dist/ua-parser.pack.js --comments '/^ UA/' --compress --mangle",
+    "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",
     "test": "jshint src/ua-parser.js && mocha -R nyan test/test.js",
-    "test-ci": "jshint src/ua-parser.js && mocha -R spec test/test.js",
     "verup": "node ./node_modules/verup",
     "version": "node ./node_modules/verup 0"
   },
@@ -167,17 +111,14 @@
     ],
     "regs": [
       "^((?:\\$|(\\s*\\*\\s*@)|(\\s*(?:var|,)?\\s+))(?:LIBVERSION|version)[\\s\\:='\"]+)([0-9]+(?:\\.[0-9]+){2,2})",
-      "^(\\/?\\s?\\*.*v)([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",
-    "jshint": "~2.12.0",
-    "mocha": "~8.2.0",
     "requirejs": "^2.3.2",
-    "safe-regex": "^2.1.1",
+    "uglify-js": "~2.7.5",
-    "uglify-js": "~3.12.0",
     "verup": "^1.3.x"
   },
   "repository": {
@@ -194,20 +135,6 @@
     "test": "test"
   },
   "bugs": "https://github.com/faisalman/ua-parser-js/issues",
-  "demo": "https://uaparser.dev",
+  "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,148 +1,61 @@
-<p align="center">
-    <img src="https://raw.githubusercontent.com/faisalman/ua-parser-js/gh-pages/images/logo.png" width="256" height="256"> 
-</p>
-
-<p align="center">
-<a href="https://travis-ci.org/faisalman/ua-parser-js"><img src="https://travis-ci.org/faisalman/ua-parser-js.svg?branch=master"></a>
-<a href="https://www.npmjs.com/package/ua-parser-js"><img src="https://img.shields.io/npm/v/ua-parser-js.svg"></a>
-<a href="https://www.npmjs.com/package/ua-parser-js"><img src="https://img.shields.io/npm/dw/ua-parser-js.svg"></a>
-<a href="https://www.jsdelivr.com/package/npm/ua-parser-js"><img src="https://data.jsdelivr.com/v1/package/npm/ua-parser-js/badge"></a>
-<a href="https://cdnjs.com/libraries/UAParser.js"><img src="https://img.shields.io/cdnjs/v/UAParser.js.svg"></a>
-</p>
-
 # UAParser.js
 
-JavaScript library to detect Browser, Engine, OS, CPU, and Device type/model from User-Agent data with relatively small footprint (~17KB minified, ~6KB gzipped) that can be used either in browser (client-side) or node.js (server-side).
+<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://uaparser.dev
+* 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.x#documentation
-  * v2 : https://docs.uaparser.dev
 
-***
+# Constructor
 
-### From Our Sponsors:
-<table>
-<thead>
-</thead>
-<tbody>
-<tr>
-<td colspan="2">
-<a href="https://opencollective.com/ua-parser-js">↗ Become a sponsor</a>
-</td>
-</tr>
-</tbody>
-</table>
-
-<a href="https://uaparser.dev"><img src="https://raw.githubusercontent.com/faisalman/ua-parser-js/gh-pages/images/uap-header.png"></a>
-
----
-
-# Documentation
-### UAParser([user-agent][,extensions])
-typeof `user-agent` "string".
-
-typeof `extensions` "array".
-
-In The Browser environment you dont need to pass the user-agent string to the function, you can just call the funtion and it should automatically get the string from the `window.navigator.userAgent`, but that is not the case in nodejs. The user-agent string must be passed in nodejs for the function to work.
-Usually you can find the user agent in:
-`request.headers["user-agent"]`.
-
-
-## Constructor
-When you call `UAParser` with the `new` keyword `UAParser` will return a new instance with an empty result object, you have to call one of the available methods to get the information from the user-agent string.
-Like so:
 * `new UAParser([uastring][,extensions])`
-```js
+    * returns new instance
-let parser = new UAParser("user-agent"); // you need to pass the user-agent for nodejs
-console.log(parser); // {}
-let parserResults = parser.getResult();
-console.log(parserResults);
-/** {
-  "ua": "",
-  "browser": {},
-  "engine": {},
-  "os": {},
-  "device": {},
-  "cpu": {}
-} */
-```
 
-When you call UAParser without the `new` keyword, it will automatically call `getResult()` function and return the parsed results.
 * `UAParser([uastring][,extensions])`
-    * returns result object `{ ua: '', browser: {}, cpu: {}, device: {}, engine: {}, os: {} }`
+    * returns result object `{ ua: '', browser: {}, cpu: {}, device: {}, engine: {}, gpu: {}, os: {} }`
 
-## Methods
+# Methods
-
-#### Methods table
-The methods are self explanatory, here's a small overview on all the available methods:
-*  `getResult()` - returns all function object calls, user-agent string, browser info, cpu, device, engine, os:
-`{ ua: '', browser: {}, cpu: {}, device: {}, engine: {}, os: {} }`.
-
- *  `getBrowser()`      - returns the browser name and version.
- *  `getDevice()`       - returns the device model, type, vendor.
- *  `getEngine()`       - returns the current browser engine name and version.
- *  `getOS()`           - returns the running operating system name and version.
- *  `getCPU()`          - returns CPU architectural design name.
- *  `getUA()`           - returns the user-agent string.
- *  `setUA(user-agent)` - set a custom user-agent to be parsed.
-
-
----
-
-* `getResult()`
-    * returns `{ ua: '', browser: {}, cpu: {}, device: {}, engine: {}, os: {} }`
 
 * `getBrowser()`
     * returns `{ name: '', version: '' }`
 
 ```sh
 # Possible 'browser.name':
-115 Browser, 2345Explorer, 360 Browser, Alipay, Amaya, Android Browser, Arora, 
+2345Explorer, Amaya, Android Browser, Arora, Avant, BIDUBrowser, Baidu,
-Avant, Avast, AVG, Baidu, Basilisk, Blazer, Bolt, Brave, Bowser, Camino, Chimera,
+Basilisk, Blazer, Bolt, Bowser, Camino, Chimera, Chrome Headless,
-Chrome Headless, Chrome WebView, Chrome, Chromium, Cobalt, Comodo Dragon, Daum,
+Chrome WebView, Chrome, Chromium, Comodo Dragon, Dillo, Dolphin, Doris, Edge,
-Dillo, Dolphin, Doris, DuckDuckGo, Edge, Electron, Epiphany, Facebook, Falkon, 
+Epiphany, Facebook, Falkon, Fennec, Firebird, Firefox, Flock, GSA, GoBrowser,
-Fennec, Firebird, Firefox [Focus/Reality], Flock, Flow, GSA, GoBrowser, Helio, 
+ICE Browser, IE, IEMobile, IceApe, IceCat, IceDragon, Iceape, Iceweasel,
-Heytap, Huawei Browser, iCab, ICE Browser, IE, IEMobile, IceApe, IceCat, 
+Iridium, Iron, Jasmine, K-Meleon, Kindle, Konqueror, LBBROWSER Line, Links,
-IceDragon, Iceweasel, Instagram, Iridium, Iron, Jasmine, Kakao[Story/Talk], 
+Lunascape, Lynx, MIUI Browser, Maemo Browser, Maemo, Maxthon, MetaSr Midori,
-K-Meleon, Kindle, Klar, Klarna, Konqueror, Ladybird, LBBROWSER, LibreWolf, Line, 
+Minimo, Mobile Safari, Mosaic, Mozilla, NetFront, NetSurf, Netfront, Netscape,
-LinkedIn, Links, Lunascape, Lynx, MIUI Browser, Maemo, Maxthon, Midori, Minimo, 
+NokiaBrowser, Oculus Browser, OmniWeb, Opera Coast, Opera Mini, Opera Mobi,
-Mobile Safari, Mosaic, Mozilla, NetFront, NetSurf, Netfront, Netscape, 
+Opera Tablet, Opera, PaleMoon, PhantomJS, Phoenix, Polaris, Puffin, QQ,
-NokiaBrowser, Obigo, Oculus Browser, OmniWeb, Opera Coast, 
+QQBrowser, QQBrowserLite, Quark, QupZilla, RockMelt, Safari, Samsung Browser, 
-Opera [GX/Mini/Mobi/Tablet], PaleMoon, PhantomJS, Phoenix, Pico Browser, Polaris, 
+SeaMonkey, Silk, Skyfire, Sleipnir, Slim, SlimBrowser, Swiftfox, Tizen Browser,
-Puffin, QQ, QQBrowser, QQBrowserLite, Quark, QupZilla, RockMelt, Safari, 
+UCBrowser, Vivaldi, Waterfox, WeChat, Yandex, baidu, iCab, w3m, ...
-Sailfish Browser, Samsung Internet, SeaMonkey, Silk, Skyfire, Sleipnir, 
-Slim[Browser/Boat/Jet], Smart Lenovo Browser, Snapchat, Sogou [Explorer/Mobile], 
-Swiftfox, Tesla, TikTok, Tizen Browser, Twitter, UCBrowser, UP.Browser, Vivaldi, 
-Vivo Browser, w3m, Waterfox, WeChat, Weibo, Whale Browser, Wolvic, Yandex, ...
 
 # 'browser.version' determined dynamically
 ```
 
 * `getDevice()`
-    * returns `{ model: '', type: '', vendor: '' }`
+    * returns `{ model: '', type: '', vendor: '' }` 
 
 ```sh
 # Possible 'device.type':
 console, mobile, tablet, smarttv, wearable, embedded
 
-##########
-# NOTE: 'desktop' is not a possible device type. 
-# UAParser only reports info directly available from the UA string, which is not the case for 'desktop' device type.
-# If you wish to detect desktop devices, you must handle the needed logic yourself.
-# You can read more about it in this issue: https://github.com/faisalman/ua-parser-js/issues/182
-##########
-
 # Possible 'device.vendor':
-Acer, Advan, Alcatel, Amazon, Apple, Archos, ASUS, AT&T, BenQ, BlackBerry, Cat, 
+Acer, Alcatel, Amazon, Apple, Archos, Asus, BenQ, BlackBerry, Dell, Essential,
-Dell, Energizer, Essential, Facebook, Fairphone, GeeksPhone, Google, HP, HMD, 
+GeeksPhone, Google, HP, HTC, Huawei, Jolla, Lenovo, LG, Meizu, Microsoft, Motorola,
-HTC, Huawei, IMO, Infinix, itel, Jolla, Kobo, Lenovo, LG, Meizu, Micromax, 
+Nexian, Nintendo, Nokia, Nvidia, OnePlus, Ouya, Palm, Panasonic, Pebble, Polytron,
-Microsoft, Motorola, Nexian, Nintendo, Nokia, Nothing, Nvidia, OnePlus, OPPO, 
+RIM, Samsung, Sharp, Siemens, Sony[Ericsson], Sprint, Xbox, Xiaomi, ZTE, ...
-Ouya, Palm, Panasonic, Pebble, Polytron, Realme, RIM, Roku, Samsung, Sharp, 
-Siemens, Smartfren, Sony[Ericsson], Sprint, TCL, Tecno, Tesla, Ulefone, Vivo, 
-Vodafone, Xbox, Xiaomi, Zebra, ZTE, ...
 
 # 'device.model' determined dynamically
 ```
@@ -152,8 +65,8 @@ Vodafone, Xbox, Xiaomi, Zebra, ZTE, ...
 
 ```sh
 # Possible 'engine.name'
-Amaya, ArkWeb, Blink, EdgeHTML, Flow, Gecko, Goanna, iCab, KHTML, LibWeb, Links, 
+Amaya, Blink, EdgeHTML, Gecko, Goanna, iCab, KHTML, Links, Lynx, NetFront, NetSurf,
-Lynx, NetFront, NetSurf, Presto, Servo, Tasman, Trident, w3m, WebKit
+Presto, Tasman, Trident, w3m, WebKit
 
 # 'engine.version' determined dynamically
 ```
@@ -163,15 +76,12 @@ Lynx, NetFront, NetSurf, Presto, Servo, Tasman, Trident, w3m, WebKit
 
 ```sh
 # 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, OpenHarmony, OpenVMS, 
+RIM Tablet OS, RISC OS, Sailfish, Series40, Slackware, Solaris, SUSE, Symbian, Tizen, 
-OS/2, Palm, PC-BSD, PCLinuxOS, Plan9, PlayStation, QNX, Raspbian, RedHat, 
+Ubuntu, Unix, VectorLinux, WebOS, Windows [Phone/Mobile], Zenwalk, ...
-RIM Tablet OS, RISC OS, Sabayon, Sailfish, SerenityOS, Series40, Slackware, 
-Solaris, SUSE, Symbian, Tizen, Ubuntu [Touch], Unix, VectorLinux, Viera, watchOS, 
-WebOS, Windows [Phone/Mobile/IoT], Zenwalk, ...
 
 # 'os.version' determined dynamically
 ```
@@ -181,38 +91,54 @@ WebOS, Windows [Phone/Mobile/IoT], Zenwalk, ...
 
 ```sh
 # Possible 'cpu.architecture'
-68k, amd64, arm[64/hf], avr, ia[32/64], irix[64], mips[64], pa-risc, ppc, 
+68k, amd64, arm[64], avr, ia[32/64], irix[64], mips[64], pa-risc, ppc, sparc[64]
-sparc[64]
 ```
 
+* `getGPU()`
+    * returns `{ vendor: '', model: '' }`
+
+```sh
+# Possible 'gpu.vendor'
+ATI, Intel, NVIDIA, Qualcomm, SiS
+
+# 'gpu.model' determined dynamically
+```
+
+* `getResult()`
+    * returns `{ ua: '', browser: {}, cpu: {}, device: {}, engine: {}, os: {} }`
+
 * `getUA()`
     * returns UA string of current instance
 
-* `setUA(uastring)`
+* `setRenderer(rendererstr)`
-    * set UA string to be parsed
+    * set Renderer string to parse
     * returns current instance
 
-# Usage
+* `setUA(uastring)`
+    * set UA string to parse
+    * returns current instance
 
-## Using HTML
+
+# Example
 
 ```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 parser = new UAParser();
+	var parser = new UAParser();
+
+    // 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: "" //@deprecated
             },
             engine: {
                 name: "",
@@ -229,17 +155,21 @@ sparc[64]
             },
             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";
-    parser.setUA(uastring1);
+    parser.setUA(uastring);
+
     var result = parser.getResult();
-    // You can also use UAParser constructor directly without having to create an instance:
+    // this will also produce the same result (without instantiation):
-    // var result = UAParser(uastring1);
+    // 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}
@@ -248,7 +178,7 @@ sparc[64]
     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(parser.setUA(uastring2).getBrowser().name); // "Konqueror"
     console.log(parser.getOS());                            // {name: "OpenBSD", version: undefined}
@@ -268,8 +198,6 @@ sparc[64]
 
 ## Using node.js
 
-Note: Device information is not available in the NodeJS environment.
-
 ```sh
 $ npm install ua-parser-js
 ```
@@ -289,6 +217,40 @@ http.createServer(function (req, res) {
 console.log('Server running at http://127.0.0.1:1337/');
 ```
 
+## Using requirejs
+
+```js
+requirejs.config({
+    baseUrl : 'js/lib', // path to your script directory
+    paths   : {
+        'ua-parser-js' : 'ua-parser.min'
+    }
+});
+
+requirejs(['ua-parser-js'], function(UAParser) {
+    var parser = new UAParser();
+    console.log(parser.getResult());
+});
+```
+
+## Using CDN
+
+```html
+<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
 
 ```sh
@@ -299,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
@@ -324,58 +286,54 @@ console.log(parseInt($.ua.browser.version.split('.')[0], 10));  // 4
 $('body').addClass('ua-browser-' + $.ua.browser.name + ' ua-devicetype-' + $.ua.device.type);
 ```
 
-## Using npx
+## Extending regex patterns
-
-UAParser.js can be executed as a command that returns the parsed data in JSON format:
-
-```sh
-$ npx ua-parser-js "[INSERT-UA-HERE]"
-```
-
-## Using Extension
 
 * `UAParser([uastring,] extensions)`
 
+Pass your own regexes to extend the limited matching rules.
+
 ```js
 // Example:
-var myOwnListOfBrowsers = [
+var myOwnRegex = [[/(myownbrowser)\/([\w\.]+)/i], [UAParser.BROWSER.NAME, UAParser.BROWSER.VERSION]];
-    [/(mybrowser)\/([\w\.]+)/i], [UAParser.BROWSER.NAME, UAParser.BROWSER.VERSION]
+var myParser = new UAParser({ browser: myOwnRegex });
-];
+var uaString = 'Mozilla/5.0 MyOwnBrowser/1.3';
-var myParser = new UAParser({ browser: myOwnListOfBrowsers });
+console.log(myParser.setUA(uaString).getBrowser());   // {name: "MyOwnBrowser", version: "1.3"}
-var myUA = 'Mozilla/5.0 MyBrowser/1.3';
-console.log(myParser.setUA(myUA).getBrowser());  // {name: "MyBrowser", 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-2024 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/cli.js

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

security.md

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

test/cpu-test.json

@@ -7,14 +7,6 @@
             "architecture"  : "ia32"
         }
     },
-    {
-        "desc"    : "i686",
-        "ua"      : "Mozilla/5.0 (X11; U; CrOS i686 9.10.0; en-US) AppleWebKit/532.5 (KHTML, like Gecko) Chrome/4.0.253.0 Safari/532.5",
-        "expect"  :
-        {
-            "architecture"  : "ia32"
-        }
-    },
     {
         "desc"    : "i386",
         "ua"      : "Mozilla/5.0 (X11; U; FreeBSD i386; en-US; rv:1.7) Gecko/20040628 Epiphany/1.2.6",
@@ -31,46 +23,6 @@
             "architecture"  : "amd64"
         }
     },
-    {
-        "desc"    : "Vivaldi on Windows",
-        "ua"      : "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/113.0.0.0 Safari/537.36 Vivaldi/6.0.2979.18",
-        "expect"  :
-        {
-            "architecture"  : "amd64"
-        }
-    },
-    {
-        "desc"    : "Vivaldi on Windows",
-        "ua"      : "Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/113.0.0.0 Safari/537.36 Vivaldi/6.0.2979.18",
-        "expect"  :
-        {
-            "architecture"  : "amd64"
-        }
-    },
-    {
-        "desc"    : "Vivaldi on Linux",
-        "ua"      : "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/113.0.0.0 Safari/537.36 Vivaldi/6.0.2979.18",
-        "expect"  :
-        {
-            "architecture"  : "amd64"
-        }
-    },
-    {
-        "desc"    : "Vivaldi on Linux",
-        "ua"      : "Mozilla/5.0 (X11; Linux i686) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/113.0.0.0 Safari/537.36 Vivaldi/6.0.2979.18",
-        "expect"  :
-        {
-            "architecture"  : "ia32"
-        }
-    },
-    {
-        "desc": "Xiaomi POCO M2 Pro",
-        "ua": "Mozilla/5.0 (Linux; arm_64; Android 11; POCO M2 Pro) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/106.0.0.0 YaBrowser/22.11.7.42.00 SA/3 Mobile Safari/537.36",
-        "expect"  :
-        {
-            "architecture"  : "arm64"
-        }
-    },
     {
         "desc"    : "win64",
         "ua"      : "Mozilla/4.0 (compatible; MSIE 7.0; Windows NT 6.2; Win64; x64; Trident/6.0; .NET4.0E; .NET4.0C)",
@@ -88,15 +40,7 @@
         }
     },
     {
-        "desc"    : "ARM",
+        "desc"    : "ARMv6",
-        "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"  :
         {
@@ -105,92 +49,12 @@
     },
     {
         "desc"    : "ARMv7",
-        "ua"      : "Mozilla/5.0 (Linux ARMv7) WebKitGTK+/3.4.9 vimprobable2",
-        "expect"  :
-        {
-            "architecture"  : "arm"
-        }
-    },
-    {
-        "desc"    : "ARMv7l",
-        "ua"      : "Mozilla/5.0 (SMART-TV; X11; Linux armv7l) AppleWebKit/537.42 (KHTML, like Gecko) Chromium/25.0.1349.2 Chrome/25.0.1349.2 Safari/537.42",
-        "expect"  :
-        {
-            "architecture"  : "arm"
-        }
-    },
-    {
-        "desc"    : "ARMv7l",
         "ua"      : "Mozilla/5.0 (X11; CrOS armv7l 9765.85.0) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/61.0.3163.123 Safari/537.36",
         "expect"  :
         {
             "architecture"  : "arm"
         }
     },
-    {
-        "desc"    : "Nokia N900 Linux mobile",
-        "ua"      : "Mozilla/5.0 (Maemo; Linux armv7l; rv:10.0) Gecko/20100101 Firefox/10.0 Fennec/10.0",
-        "expect"  :
-        {
-            "architecture"  : "arm"
-        }
-    },
-    {
-        "desc"    : "ARMEABI",
-        "ua"      : "[FBAN/FB4A;FBAV/237.0.0.44.120;FBBV/170693408;FBDM/{density=1.75,width=720,height=1280};FBLC/en_US;FBRV/172067074;FBCR/ ;FBMF/samsung;FBBD/samsung;FBPN/com.facebook.katana;FBDV/SM-S367VL;FBSV/9;FBBK/1;FBOP/19;FBCA/armeabi-v7a:armeabi;]",
-        "expect"  :
-        {
-            "architecture"  : "arm"
-        }
-    },
-    {
-        "desc"    : "ARMv8",
-        "ua"      : "Mozilla/5.0 (X11; Linux armv8l; rv:45.0) Gecko/20100101 Firefox/45.0",
-        "expect"  :
-        {
-            "architecture"  : "arm64"
-        }
-    },
-    {
-        "desc"    : "AARCH64",
-        "ua"      : "Mozilla/5.0 (X11; CrOS aarch64 13310.93.0) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/85.0.4183.133 Safari/537.36",
-        "expect"  :
-        {
-            "architecture"  : "arm64"
-        }
-    },
-    {
-        "desc"    : "ARM64",
-        "ua"      : "Mozilla/5.0 (Windows NT 10.0; ARM64; RM-1096) AppleWebKit/537.36 (KHTML like Gecko) Chrome/51.0.2704.79 Safari/537.36 Edge/14.14393",
-        "expect"  :
-        {
-            "architecture"  : "arm64"
-        }
-    },
-    {
-        "desc"    : "ARM64",
-        "ua"      : "Mozilla/5.0 (Linux; arm_64; Android 9; HRY-LX1T) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/78.0.3904.97 YaBrowser/19.12.1.121.00 Mobile Safari/537.36",
-        "expect"  :
-        {
-            "architecture"  : "arm64"
-        }
-    },
-    {
-        "desc"    : "Google Search App",
-        "ua"      : "Mozilla/5.0 (Linux; Android 9; JAT-LX1 Build/HONORJAT-LX1; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/83.0.4103.96 Mobile Safari/537.36 GoogleApp/11.11.10.21.arm",
-        "expect"  :
-        {
-            "architecture"  : "arm"
-        }
-    },
-    {
-        "desc"    : "Google Search App",
-        "ua"      : "Mozilla/5.0 (Linux; Android 6.0; M5s Build/MRA58K; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/44.0.2403.147 Mobile Safari/537.36 GSA/12.40.17.23.arm64",
-        "expect"  :
-        {
-            "architecture"  : "arm64"
-        }
-    },
     {
         "desc"    : "Pocket PC",
         "ua"      : "Opera/9.7 (Windows Mobile; PPC; Opera Mobi/35166; U; en) Presto/2.2.1",
@@ -223,14 +87,6 @@
             "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",
@@ -239,14 +95,6 @@
             "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)",
@@ -262,29 +110,5 @@
         {
             "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"
-        }
-    },
-    {
-        "desc"    : "x86",
-        "ua"      : "Mozilla/5.0 (Photon; U; QNX x86pc; en-US; rv:1.8.1.20) Gecko/20090127 BonEcho/2.0.0.20",
-        "expect"  : 
-        {
-            "architecture"  : "ia32"
-        }
     }
 ]

test/engine-test.json

@@ -1,20 +1,11 @@
 [
-    {
-        "desc"    : "ArkWeb",
-        "ua"      : "Mozilla/5.0 (Phone; OpenHarmony 4.1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/114.0.0.0 Safari/537.36 ArkWeb/4.1.6.1 Mobile",
-        "expect"  :
-        {
-            "name"    : "ArkWeb",
-            "version" : "4.1.6.1"
-        }
-    },
     {
         "desc"    : "Blink",
         "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",
         "expect"  :
         {
             "name"    : "Blink",
-            "version" : "57.0.2987.146"
+            "version" : "undefined"
         }
     },
     {
@@ -26,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",
@@ -62,24 +44,6 @@
             "version" : "4.5.4"
         }
     },
-    {
-        "desc"    : "LibWeb",
-        "ua"      : "Mozilla/5.0 (Linux; x86_64) Ladybird/1.0",
-        "expect"  :
-        {
-            "name"    : "LibWeb",
-            "version" : "undefined"
-        }
-    },
-    {
-        "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",
@@ -98,15 +62,6 @@
             "version" : "2.8.149"
         }
     },
-    {
-        "desc"    : "Servo",
-        "ua"      : "Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:109.0) Servo/1.0 Firefox/111.0",
-        "expect"  :
-        {
-            "name"    : "Servo",
-            "version" : "1.0"
-        }
-    },
     {
         "desc"    : "Tasman",
         "ua"      : "Mozilla/4.0 (compatible; MSIE 6.0; PPC Mac OS X 10.4.7; Tasman 1.0)",
@@ -142,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"
+        }
+    }
+]