Update patch version to 1.0.33 as a mirror of 0.7.33

`trim()` function contains a regular expression that is vulnerable to ReDoS but was uncaught by `safe-regex` module.

.github/FUNDING.yml

@@ -0,0 +1,12 @@
+# 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

@@ -0,0 +1,20 @@
+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

.gitignore

@@ -1,12 +1,18 @@
 node_modules/
 npm-debug.log
-<<<<<<< HEAD
+
 ### vim ###
 .*.s[a-w][a-z]
 *.un~
 Session.vim
 .netrwhist
 *~
+.versions
+
+### editors ###
+.vscode
+.idea
+*.sublime-*
 
 ### OSX ###
 .DS_Store
@@ -14,13 +20,9 @@ Session.vim
 .LSOverride
 Icon
 
-
 # Thumbnails
 ._*
 
 # Files that might appear on external disk
 .Spotlight-V100
 .Trashes
-=======
-.idea
->>>>>>> baf4bb99b4ef92c71419931e8fd334e34c051e52

.jshintrc

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

.npmrc

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

.travis.yml

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

bower.json

@@ -1,26 +1,17 @@
 {
-    "name": "ua-parser-js",
-    "version": "0.6.3-ktb",
-    "authors": [
-        "Faisal Salman <fyzlman@gmail.com>"
-    ],
-    "private": false,
-    "main": "src/ua-parser.js",
-    "ignore": [
-        "build",
-        "node_modules",
-        "bower_components",
-        "test",
-        "tests"
-    ],
-    "contributors": [
-        "Faisal Salman <fyzlman@gmail.com>",
-        "Christopher De Cairos <chris.decairos@gmail.com>",
-        "John Tantalo <john.tantalo@gmail.com>",
-        "Jon Buckley <jon@jbuckley.ca>",
-        "Lee Treveil <leetreveil@gmail.com>"
-    ],
-    "dependencies": {
-
-    }
+  "name": "ua-parser-js",
+  "version": "1.0.33",
+  "authors": [
+    "Faisal Salman <f@faisalman.com>"
+  ],
+  "private": false,
+  "main": "src/ua-parser.js",
+  "ignore": [
+    "build",
+    "node_modules",
+    "bower_components",
+    "test",
+    "tests"
+  ],
+  "dependencies": {}
 }

build/build.sh

@@ -1,37 +0,0 @@
-#!/bin/bash
-
-# dependencies
-JSHINT_DIR="node_modules/jshint/bin/jshint"
-MOCHA_DIR="node_modules/mocha/bin/mocha"
-UGLIFY_DIR="node_modules/uglify-js/bin/uglifyjs"
-
-# check module directory & install if not found
-function check_module {
-    if ! type $2 &> /dev/null
-    then        
-        echo "$2 is not found"
-        if ! type "npm" &> /dev/null
-        then
-            echo "npm is not installed"
-            echo "Exiting"
-            exit 1
-        else
-            echo "Installing $1..."
-            npm install $1
-        fi
-    fi
-}
-
-check_module "jshint" $JSHINT_DIR
-check_module "mocha" $MOCHA_DIR
-check_module "uglify-js" $UGLIFY_DIR
-
-echo "Verifiying code..."
-$JSHINT_DIR src/ua-parser.js
-
-echo "Running test..."
-$MOCHA_DIR -R nyan test/test.js
-
-echo "Minifying script..."
-$UGLIFY_DIR src/ua-parser.js > src/ua-parser.min.js
-echo "OK"

changelog.md

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

component.json

@@ -1,14 +0,0 @@
-{
-  "name": "ua-parser-js",
-  "version": "0.6.16",
-  "description": "Lightweight JavaScript-based user-agent string parser",
-  "keywords": ["user-agent", "parser", "browser", "engine", "os", "device", "cpu"],
-  "scripts": ["src/ua-parser.js"],
-  "main": "src/ua-parser.js",
-  "license": "MIT",
-  "development": {
-    "jshint/jshint": "*",
-    "visionmedia/mocha": "*",
-    "mishoo/uglifyjs2": "*"
-  }
-}

dist/ua-parser.html

@@ -0,0 +1 @@
+<script src="./ua-parser.min.js"></script>

license.md

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2012-2021 Faisal Salman <<f@faisalman.com>>
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package.js

@@ -0,0 +1,12 @@
+Package.describe({
+  name: 'faisalman:ua-parser-js',
+  version: '1.0.33',
+  summary: 'Lightweight JavaScript-based user-agent string parser',
+  git: 'https://github.com/faisalman/ua-parser-js.git',
+  documentation: 'readme.md'
+});
+
+Package.onUse(function (api) {
+  api.addFiles("src/ua-parser.js");
+  api.export("UAParser");
+});

package.json

@@ -1,9 +1,9 @@
 {
   "title": "UAParser.js",
   "name": "ua-parser-js",
-  "version": "0.6.16",
-  "author": "Faisal Salman <fyzlman@gmail.com> (http://faisalman.com)",
-  "description": "Lightweight JavaScript-based user-agent string parser",
+  "version": "1.0.33",
+  "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",
   "keywords": [
     "user-agent",
     "parser",
@@ -11,44 +11,192 @@
     "engine",
     "os",
     "device",
-    "cpu"
+    "cpu",
+    "jquery-plugin",
+    "ecosystem:jquery"
   ],
-  "homepage": "http://github.com/faisalman/ua-parser-js",
+  "homepage": "https://github.com/faisalman/ua-parser-js",
   "contributors": [
-    "Faisal Salman <fyzlman@gmail.com>",
+    "Aamir Poonawalla <aamir@urx.com>",
+    "Admas <mollases@users.noreply.github.com>",
+    "algenon <m@antonz.ru>",
+    "Alvin Portillo <alvin@8thwall.com>",
+    "Amumu <yoyo837@hotmail.com>",
+    "Andrea Vaghi <andrea.vaghi@jobrapido.com>",
+    "Anton Zhiyanov <m@antonz.ru>",
+    "Arturo Mejia <amejia@blim.com>",
+    "Arun Rama Reddy <arunramareddy@gmail.com>",
+    "Austin Pray <austin@austinpray.com>",
+    "Bendeguz <symunona@gmail.com>",
+    "Benjamin Bertrand <bertrand.design@gmail.com>",
+    "Benjamin Urban <benjamin.urban@sueddeutsche.de>",
+    "boneyao <admin@boneyao.com>",
+    "Carl C Von Lewin <carlchristianlewin@gmail.com>",
+    "CESAR RAMOS <c@imagenproactiva.com>",
+    "Chad Killingsworth <ckillingsworth@jackhenry.com>",
     "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>",
+    "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>",
-    "Lee Treveil <leetreveil@gmail.com>"
+    "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>",
+    "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>",
+    "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>",
+    "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>",
+    "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"
+  ],
   "scripts": {
-    "test": "./build/build.sh"
+    "build": "uglifyjs src/ua-parser.js -o dist/ua-parser.min.js --comments '/^ UA/' && uglifyjs src/ua-parser.js -o dist/ua-parser.pack.js --comments '/^ UA/' --compress --mangle",
+    "test": "jshint src/ua-parser.js && mocha -R nyan test/test.js",
+    "test-ci": "jshint src/ua-parser.js && mocha -R spec test/test.js",
+    "verup": "node ./node_modules/verup",
+    "version": "node ./node_modules/verup 0"
+  },
+  "verup": {
+    "files": [
+      "bower.json",
+      "package.js",
+      "src/ua-parser.js"
+    ],
+    "regs": [
+      "^((?:\\$|(\\s*\\*\\s*@)|(\\s*(?:var|,)?\\s+))(?:LIBVERSION|version)[\\s\\:='\"]+)([0-9]+(?:\\.[0-9]+){2,2})",
+      "^(\\/?\\s?\\*.*v)([0-9]+(?:\\.[0-9]+){2,2})"
+    ]
   },
   "devDependencies": {
-    "jshint": "~1.1.0",
-    "mocha": "~1.7.1",
-    "uglify-js": "~1.3.4"
+    "@babel/parser": "7.15.8",
+    "@babel/traverse": "7.15.4",
+    "jshint": "~2.12.0",
+    "mocha": "~8.2.0",
+    "requirejs": "^2.3.2",
+    "safe-regex": "^2.1.1",
+    "uglify-js": "~3.12.0",
+    "verup": "^1.3.x"
   },
-  "repository" : {
+  "repository": {
     "type": "git",
     "url": "https://github.com/faisalman/ua-parser-js.git"
   },
-  "licenses": [
-    {
-      "type": "GPLv2",
-      "url": "http://www.gnu.org/licenses/gpl-2.0.html"
-    },
-    {
-      "type": "MIT",
-      "url": "http://www.opensource.org/licenses/mit-license.php"
-    }
-  ],
+  "license": "MIT",
   "engines": {
     "node": "*"
   },
   "directories": {
-    "lib": "src",
+    "dist": "dist",
+    "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",
+  "funding": [
+    {
+      "type": "opencollective",
+      "url": "https://opencollective.com/ua-parser-js"
+    },
+    {
+      "type": "paypal",
+      "url": "https://paypal.me/faisalman"
+    }
+  ]
 }

readme.md

@@ -1,49 +1,122 @@
+<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
 
-Lightweight JavaScript-based User-Agent string parser. Supports browser & node.js environment. Also available as Component package, Bower package, jQuery.ua, & AMD module
+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).
 
-[![Build Status](https://travis-ci.org/faisalman/ua-parser-js.png?branch=master)](https://travis-ci.org/faisalman/ua-parser-js)
-
-* Author    : Faisalman <<fyzlman@gmail.com>>
-* Demo      : http://faisalman.github.com/ua-parser-js
+* Author    : Faisal Salman <<f@faisalman.com>>
+* Demo      : https://faisalman.github.io/ua-parser-js
 * Source    : https://github.com/faisalman/ua-parser-js
 
-## Features
+# Documentation
+### UAParser([user-agent][,extensions])
+typeof `user-agent` "string".
 
-Extract detailed type of web browser, layout engine, operating system, cpu architecture, and device purely from user-agent string with relatively lightweight footprint (~7KB minified / ~3KB gzipped). Written in vanilla js, which means it doesn't depends on any other library.
+typeof `extensions` "array".
 
-![It's over 9000](https://pbs.twimg.com/media/A9LpEG6CIAA5VrT.jpg)
+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
+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: {} }`
 
 ## 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: '', major: '', version: '' }`
+    * returns `{ name: '', version: '' }`
 
-```
+```sh
 # Possible 'browser.name':
-Amaya, Arora, Avant, Baidu, Blazer, Bolt, Camino, Chimera, Chrome, Chromium, 
-Comodo Dragon, Conkeror, Dillo, Dolphin, Doris, Epiphany, Fennec, Firebird, 
-Firefox, Flock, GoBrowser, iCab, ICE Browser, IceApe, IceCat, IceDragon, 
-Iceweasel, IE [Mobile], Iron, Jasmine, K-Meleon, Konqueror, Kindle, Links, 
-Lunascape, Lynx, Maemo, Maxthon, Midori, Minimo, [Mobile] Safari, Mosaic, Mozilla, 
-Netfront, Netscape, NetSurf, Nokia, OmniWeb, Opera [Mini/Mobi/Tablet], Phoenix, 
-Polaris, QQBrowser, RockMelt, Silk, Skyfire, SeaMonkey, SlimBrowser, Swiftfox, 
-Tizen, UCBrowser, w3m, Yandex
+2345Explorer, 360 Browser, Amaya, Android Browser, Arora, Avant, Avast, AVG,
+BIDUBrowser, Baidu, Basilisk, Blazer, Bolt, Brave, Bowser, Camino, Chimera,
+Chrome Headless, Chrome WebView, Chrome, Chromium, Comodo Dragon, Dillo,
+Dolphin, Doris, DuckDuckGo, Edge, Electron, Epiphany, Facebook, Falkon, Fennec, 
+Firebird, Firefox [Focus/Reality], Flock, Flow, GSA, GoBrowser, Huawei Browser, 
+ICE Browser, IE, IEMobile, IceApe, IceCat, IceDragon, Iceweasel, Instagram, 
+Iridium, Iron, Jasmine, K-Meleon, Kindle, Klar, Konqueror, LBBROWSER, Line, 
+LinkedIn, Links, Lunascape, Lynx, MIUI Browser, Maemo Browser, Maemo, Maxthon, 
+MetaSr Midori, Minimo, Mobile Safari, Mosaic, Mozilla, NetFront, NetSurf, Netfront, 
+Netscape, NokiaBrowser, Obigo, Oculus Browser, OmniWeb, Opera Coast, 
+Opera [Mini/Mobi/Tablet], PaleMoon, PhantomJS, Phoenix, Polaris, Puffin, QQ, 
+QQBrowser, QQBrowserLite, Quark, QupZilla, RockMelt, Safari, Sailfish Browser, 
+Samsung Browser, SeaMonkey, Silk, Skyfire, Sleipnir, Slim, SlimBrowser, Swiftfox, 
+Tesla, Tizen Browser, UCBrowser, UP.Browser, Vivaldi, Waterfox, WeChat, Weibo, 
+Yandex, baidu, iCab, w3m, Whale Browser...
 
-# 'browser.version' & 'browser.major' determined dynamically
+# 'browser.version' determined dynamically
 ```
 
 * `getDevice()`
-    * returns `{ model: '', type: '', vendor: '' }` 
+    * returns `{ model: '', type: '', vendor: '' }`
 
-```
+```sh
 # Possible 'device.type':
-console, mobile, tablet
+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, Apple, Asus, BenQ, BlackBerry, Dell, GeeksPhone, HP, HTC, Huawei, 
-Lenovo, LG, Meizu, Motorola, Nexian, Nintendo, Nokia, Palm, Panasonic, 
-RIM, Samsung, Siemens, Sony-Ericsson, Sprint, ZTE
+Acer, Alcatel, Amazon, Apple, Archos, ASUS, AT&T, BenQ, BlackBerry, Dell,
+Essential, Fairphone, GeeksPhone, Google, HP, HTC, Huawei, Jolla, Lenovo, LG, 
+Meizu, Microsoft, Motorola, Nexian, Nintendo, Nokia, Nvidia, OnePlus, OPPO, Ouya,
+Palm, Panasonic, Pebble, Polytron, Realme, RIM, Roku, Samsung, Sharp, Siemens,
+Sony[Ericsson], Sprint, Tesla, Vivo, Vodafone, Xbox, Xiaomi, Zebra, ZTE, ...
 
 # 'device.model' determined dynamically
 ```
@@ -51,10 +124,10 @@ RIM, Samsung, Siemens, Sony-Ericsson, Sprint, ZTE
 * `getEngine()`
     * returns `{ name: '', version: '' }`
 
-```
+```sh
 # Possible 'engine.name'
-Amaya, Gecko, iCab, KHTML, Links, Lynx, NetFront, NetSurf, Presto, Tasman, 
-Trident, w3m, WebKit
+Amaya, Blink, EdgeHTML, Flow, Gecko, Goanna, iCab, KHTML, Links, Lynx, NetFront,
+NetSurf, Presto, Tasman, Trident, w3m, WebKit
 
 # 'engine.version' determined dynamically
 ```
@@ -62,14 +135,16 @@ Trident, w3m, WebKit
 * `getOS()`
     * returns `{ name: '', version: '' }`
 
-```
+```sh
 # Possible 'os.name'
-AIX, Amiga OS, Android, Arch, Bada, BeOS, BlackBerry, CentOS, Chromium OS, 
-Fedora, Firefox OS, FreeBSD, Debian, DragonFly, Gentoo, GNU, Haiku, Hurd, iOS, 
-Joli, Linux, Mac OS, Mandriva, MeeGo, Minix, Mint, Morph OS, NetBSD, Nintendo, 
-OpenBSD, OS/2, Palm, PCLinuxOS, Plan9, Playstation, QNX, RedHat, RIM Tablet OS, 
-RISC OS, Slackware, Solaris, SUSE, Symbian, Tizen, Ubuntu, UNIX, WebOS, 
-Windows [Phone/Mobile], Zenwalk
+AIX, Amiga OS, Android[-x86], Arch, Bada, BeOS, BlackBerry, CentOS, Chromium OS,
+Contiki, Fedora, Firefox OS, FreeBSD, Debian, Deepin, DragonFly, elementary OS, 
+Fuchsia, Gentoo, GhostBSD, GNU, Haiku, HarmonyOS, HP-UX, Hurd, iOS, Joli, KaiOS, 
+Linpus, Linspire,Linux, Mac OS, Maemo, Mageia, Mandriva, Manjaro, MeeGo, Minix, 
+Mint, Morph OS, NetBSD, Nintendo, OpenBSD, OpenVMS, OS/2, Palm, PC-BSD, PCLinuxOS, 
+Plan9, PlayStation, QNX, Raspbian, RedHat, RIM Tablet OS, RISC OS, Sabayon, 
+Sailfish, Series40, Slackware, Solaris, SUSE, Symbian, Tizen, Ubuntu, Unix, 
+VectorLinux, WebOS, Windows [Phone/Mobile], Zenwalk, ...
 
 # 'os.version' determined dynamically
 ```
@@ -77,39 +152,39 @@ Windows [Phone/Mobile], Zenwalk
 * `getCPU()`
     * returns `{ architecture: '' }`
 
-```
+```sh
 # Possible 'cpu.architecture'
-68k, amd64, arm, ia32, ia64, irix, irix64, mips, mips64, pa-risc, ppc, sparc, sparc64
+68k, amd64, arm[64/hf], avr, ia[32/64], irix[64], mips[64], pa-risc, ppc, sparc[64]
 ```
 
-* `getResult()`
-    * returns `{ ua: '', browser: {}, cpu: {}, device: {}, engine: {}, os: {} }`
 * `getUA()`
     * returns UA string of current instance
-* `setUA(uastring)`
-    * set & parse UA string
 
-## Example
+* `setUA(uastring)`
+    * set UA string to be parsed
+    * returns current instance
+
+# Usage
+
+## Using HTML
 
 ```html
 <!doctype html>
 <html>
 <head>
-<script type="text/javascript" src="ua-parser.min.js"></script>
-<script type="text/javascript">
+<script src="ua-parser.min.js"></script>
+<script>
 
-	var parser = new UAParser();
-
-    // by default it takes ua string from current browser's window.navigator.userAgent
+    var parser = new UAParser();
     console.log(parser.getResult());
     /*
-        /// this will print an object structured like this:
+        /// This will print an object structured like this:
         {
             ua: "",
             browser: {
                 name: "",
                 version: "",
-                major: ""
+                major: "" //@deprecated
             },
             engine: {
                 name: "",
@@ -129,23 +204,23 @@ Windows [Phone/Mobile], Zenwalk
             }
         }
     */
+    // Default result depends on current window.navigator.userAgent value
 
-    // let's test a custom user-agent string as an example
-    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(uastring);
-
+    // Now let's try a custom user-agent string as an example
+    var uastring1 = "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/535.2 (KHTML, like Gecko) Ubuntu/11.10 Chromium/15.0.874.106 Chrome/15.0.874.106 Safari/535.2";
+    parser.setUA(uastring1);
     var result = parser.getResult();
-    // this will also produce the same result (without instantiation):
-    // var result = UAParser(uastring);
+    // You can also use UAParser constructor directly without having to create an instance:
+    // var result = UAParser(uastring1);
 
-    console.log(result.browser);        // {name: "Chromium", major: "15", version: "15.0.874.106"}
+    console.log(result.browser);        // {name: "Chromium", version: "15.0.874.106"}
     console.log(result.device);         // {model: undefined, type: undefined, vendor: undefined}
     console.log(result.os);             // {name: "Ubuntu", version: "11.10"}
     console.log(result.os.version);     // "11.10"
     console.log(result.engine.name);    // "WebKit"
     console.log(result.cpu.architecture);   // "amd64"
 
-    // do some other tests
+    // 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}
@@ -163,60 +238,51 @@ Windows [Phone/Mobile], Zenwalk
 </html>
 ```
 
-### Using node.js
+## Using node.js
+
+Note: Device information is not available in the NodeJS environment.
 
 ```sh
 $ npm install ua-parser-js
 ```
 
 ```js
-var UAParser = require('ua-parser-js');
-var parser = new UAParser();
-var ua = request.headers['user-agent'];     // user-agent header from an HTTP request
-console.log(parser.setUA(ua).getResult());
+var http = require('http');
+var parser = require('ua-parser-js');
+
+http.createServer(function (req, res) {
+    // get user-agent header
+    var ua = parser(req.headers['user-agent']);
+    // write the result as response
+    res.end(JSON.stringify(ua, null, '  '));
+})
+.listen(1337, '127.0.0.1');
+
+console.log('Server running at http://127.0.0.1:1337/');
 ```
 
-### Using requirejs
-
-```js
-require(['ua-parser'], function(UAParser) {
-    var parser = new UAParser();
-    console.log(parser.getResult());
-});
-```
-
-### Using component
+## Using TypeScript
 
 ```sh
-$ component install faisalman/ua-parser-js
+$ npm install --save @types/ua-parser-js
+# Download TS type definition from DefinitelyTyped repository:
+# https://github.com/DefinitelyTyped/DefinitelyTyped/tree/master/types/ua-parser-js
 ```
 
+## Using jQuery/Zepto ($.ua)
+
+Although written in vanilla js, this library will automatically detect if jQuery/Zepto is present and create `$.ua` object (with values based on its User-Agent) along with `window.UAParser` constructor. To get/set user-agent you can use: `$.ua.get()` / `$.ua.set(uastring)`.
+
 ```js
-var UAParser = require('ua-parser-js');
-var parser = new UAParser();
-console.log(parser.getResult());
-```
+// 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':
 
-### Using bower
-
-```sh
-$ bower install ua-parser-js
-```
-
-### Using jQuery.ua
-
-Although written in vanilla js (which means it doesn't depends on jQuery), this library will automatically detect if jQuery 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
-// 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':
-
-// Do some tests
+// Get the details
 console.log($.ua.device);           // {vendor: "HTC", model: "Evo Shift 4G", type: "mobile"}
 console.log($.ua.os);               // {name: "Android", version: "2.3.4"}
 console.log($.ua.os.name);          // "Android"
 console.log($.ua.get());            // "Mozilla/5.0 (Linux; U; Android 2.3.4; en-us; Sprint APA7373KT Build/GRJ22) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0"
 
-// reset to custom user-agent
+// Now lets try to reset to another custom user-agent
 $.ua.set('Mozilla/5.0 (Linux; U; Android 3.0.1; en-us; Xoom Build/HWI69) AppleWebKit/534.13 (KHTML, like Gecko) Version/4.0 Safari/534.13');
 
 // Test again
@@ -224,36 +290,70 @@ console.log($.ua.browser.name);     // "Safari"
 console.log($.ua.engine.name);      // "Webkit"
 console.log($.ua.device);           // {vendor: "Motorola", model: "Xoom", type: "tablet"}
 console.log(parseInt($.ua.browser.version.split('.')[0], 10));  // 4
+
+// Add class to <body> tag
+// <body class="ua-browser-safari ua-devicetype-tablet">
+$('body').addClass('ua-browser-' + $.ua.browser.name + ' ua-devicetype-' + $.ua.device.type);
 ```
 
-## Development
+## Using Extension
 
-Install dependencies
+* `UAParser([uastring,] extensions)`
 
-```sh
-$ npm install jshint
-$ npm install mocha
-$ npm install uglify-js
+```js
+// Example:
+var myOwnListOfBrowsers = [
+    [/(mybrowser)\/([\w\.]+)/i], [UAParser.BROWSER.NAME, UAParser.BROWSER.VERSION]
+];
+var myParser = new UAParser({ browser: myOwnListOfBrowsers });
+var myUA = 'Mozilla/5.0 MyBrowser/1.3';
+console.log(myParser.setUA(myUA).getBrowser());  // {name: "MyBrowser", version: "1.3"}
 ```
 
-Verify, test, & minify script
+# Development
 
-```sh
-$ ./build/build.sh
-```
+## Sponsors
 
-## License
+<a href="https://opencollective.com/ua-parser-js"><img src="https://opencollective.com/ua-parser-js/tiers/backers.svg?avatarHeight=64" height="80"/></a> <a href="https://opencollective.com/ua-parser-js"><img src="https://opencollective.com/ua-parser-js/tiers/sponsors.svg?avatarHeight=64" height="80"/></a>
 
-Dual licensed under GPLv2 & MIT
+<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>
 
-Copyright © 2012-2013 Faisalman <<fyzlman@gmail.com>>
+## Contributors
 
-Permission is hereby granted, free of charge, to any person obtaining a copy of 
-this software and associated documentation files (the "Software"), to deal in 
-the Software without restriction, including without limitation the rights to use, 
-copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the 
-Software, and to permit persons to whom the Software is furnished to do so, 
-subject to the following conditions:
+<a href="https://github.com/faisalman/ua-parser-js/graphs/contributors">
+  <img src="https://contrib.rocks/image?repo=faisalman/ua-parser-js" />
+</a>
 
-The above copyright notice and this permission notice shall be included in all 
+Made with [contributors-img](https://contrib.rocks).
+
+## How To Contribute
+
+* Fork and clone this repository
+* Make some changes as required
+* Write unit test to showcase its functionality
+* Run the test suites to make sure it's not breaking anything `$ npm test`
+* Submit a pull request under `develop` branch
+
+# License
+
+MIT License
+
+Copyright (c) 2012-2021 Faisal Salman <<f@faisalman.com>>
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
 copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

security.md

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

test/cpu-test.json

@@ -40,13 +40,93 @@
         }
     },
     {
-        "desc"    : "ARMv6",
+        "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",
@@ -79,6 +159,14 @@
             "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",
@@ -87,6 +175,14 @@
             "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)",
@@ -104,19 +200,11 @@
         }
     },
     {
-        "desc"    : "KTB iPad",
-        "ua"      :  "APP-BE Test/1.0 (iPad; Apple; CPU iPhone OS 7_0_2 like Mac OS X)",
-        "expect"  :
+        "desc"    : "IRIX64",
+        "ua"      : "Mozilla/4.8C-SGI [en] (X11; U; IRIX64 6.5 IP27",
+        "expect"  : 
         {
-            "architecture"  : "undefined"
-        }
-    },
-    {
-        "desc"    : "KTB-Nexus 5",
-        "ua"      : "APP-My App/1.0 (Linux; Android 4.2.1; Nexus 5 Build/JOP40D)",
-        "expect"  :
-        {
-            "architecture"  : "undefined"
+            "architecture"  : "irix64"
         }
     }
 ]

test/engine-test.json

@@ -1,4 +1,31 @@
 [
+    {
+        "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"
+        }
+    },
+    {
+        "desc"    : "EdgeHTML",
+        "ua"      : "Mozilla/5.0 (Windows NT 6.4; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/36.0.1985.143 Safari/537.36 Edge/12.0",
+        "expect"  :
+        {
+            "name"    : "EdgeHTML",
+            "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",
@@ -8,6 +35,15 @@
             "version" : "2.0b9pre"
         }
     },
+    {
+        "desc"    : "Goanna",
+        "ua"      : "Mozilla/5.0 (Windows NT 5.1; rv:38.9) Gecko/20100101 Goanna/2.2 Firefox/38.9 PaleMoon/26.5.0",
+        "expect"  :
+        {
+            "name"    : "Goanna",
+            "version" : "2.2"
+        }
+    },
     {
         "desc"    : "KHTML",
         "ua"      : "Mozilla/5.0 (compatible; Konqueror/4.5; FreeBSD) KHTML/4.5.4 (like Gecko)",
@@ -63,22 +99,57 @@
         }
     },
     {
-        "desc"    : "KTA Mobile App",
-        "ua"      : "APP-BE Test/1.0 (iPad; Apple; CPU iPhone OS 7_0_2 like Mac OS X)",
+        "desc"    : "WebKit",
+        "ua"      : "Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.36 (KHTML like Gecko) Chrome/27.0.1453.110 Safari/537.36",
         "expect"  :
         {
-            "name"    : "Mobile-App",
-            "version" : "1.0"
+            "name"    : "WebKit",
+            "version" : "537.36"
         }
     },
     {
-        "desc"    : "KTB-Nexus 5",
-        "ua"      : "APP-My App/1.0 (Linux; Android 4.2.1; Nexus 5 Build/JOP40D)",
+        "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"    : "Mobile-App",
-            "version" : "1.0"
+            "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/mediaplayer-test.json

@@ -0,0 +1,582 @@
+[
+    {
+        "desc"    : "Coremedia",
+        "ua"      : "Apple Mac OS X v10.6.4 CoreMedia v1.0.0.10F2108",
+        "expect"  : 
+        {
+            "name"    : "CoreMedia",
+            "version" : "1.0.0.10F2108",
+            "major"   : "1"
+        }
+    },
+    {
+        "desc"    : "AppleCoreMedia",
+        "ua"      : "AppleCoreMedia/1.0.0.10A403 (iPad; U; CPU OS 6_0 like Mac OS X; it_it)",
+        "expect"  : 
+        {
+            "name"    : "AppleCoreMedia",
+            "version" : "1.0.0.10A403",
+            "major"   : "1"
+        }
+    },
+    {
+        "desc"    : "AppleTv",
+        "ua"      : "AppleTV/3.0.2 (Macintosh; Intel Mac OS X 10.4.7) AppleWebKit/528.18",
+        "expect"  : 
+        {
+            "name"    : "WebKit",
+            "version" : "528.18",
+            "major"   : "528"
+        }
+    },
+    {
+        "desc"    : "Aqualung",
+        "ua"      : "Aqualung/R-1114",
+        "expect"  : 
+        {
+            "name"    : "Aqualung",
+            "version" : "R-1114",
+            "major"   : "undefined"
+        }
+    },
+    {
+        "desc"    : "Ares",
+        "ua"      : "Ares 2.2.4.3048",
+        "expect"  : 
+        {
+            "name"    : "Ares",
+            "version" : "2.2.4.3048",
+            "major"   : "2"
+        }
+    },
+    {
+        "desc"    : "Audacious",
+        "ua"      : "Audacious/3.2.2 neon/0.29.3",
+        "expect"  : 
+        {
+            "name"    : "Audacious",
+            "version" : "3.2.2",
+            "major"   : "3"
+        }
+    },
+    {
+        "desc"    : "AudiMusicStream",
+        "ua"      : "AudiMusicStream/3020.130826151911",
+        "expect"  : 
+        {
+            "name"    : "AudiMusicStream",
+            "version" : "3020.130826151911",
+            "major"   : "3020"
+        }
+    },
+    {
+        "desc"    : "BASS",
+        "ua"      : "BASS/2.4",
+        "expect"  : 
+        {
+            "name"    : "BASS",
+            "version" : "2.4",
+            "major"   : "2"
+        }
+    },
+    {
+        "desc"    : "BSPlayer",
+        "ua"      : "BSPlayer/2",
+        "expect"  : 
+        {
+            "name"    : "BSPlayer",
+            "version" : "2",
+            "major"   : "2"
+        }
+    },
+    {
+        "desc"    : "Core",
+        "ua"      : "CORE/6.506.4.1",
+        "expect"  : 
+        {
+            "name"    : "CORE",
+            "version" : "6.506.4.1",
+            "major"   : "6"
+        }
+    },
+    {
+        "desc"    : "Clementine",
+        "ua"      : "Clementine 1.1",
+        "expect"  : 
+        {
+            "name"    : "Clementine",
+            "version" : "1.1",
+            "major"   : "1"
+        }
+    },
+    {
+        "desc"    : "Dalvik",
+        "ua"      : "Dalvik/1.2.0 (Linux; U; Android 2.2.1; GT-S5830L Build/FROYO)",
+        "expect"  : 
+        {
+            "name"    : "Dalvik",
+            "version" : "1.2.0",
+            "major"   : "1"
+        }
+    },
+    {
+        "desc"    : "NexPlayer",
+        "ua"      : "E97510d/ Player/NexPlayer 4.0",
+        "expect"  : 
+        {
+            "name"    : "NexPlayer",
+            "version" : "4.0",
+            "major"   : "4"
+        }
+    },
+    {
+        "desc"    : "FLRP",
+        "ua"      : "FLRP/2.5 CFNetwork/609.1.4 Darwin/13.0.0",
+        "expect"  : 
+        {
+            "name"    : "Flip Player",
+            "version" : "2.5",
+            "major"   : "2"
+        }
+    },
+    {
+        "desc"    : "FStream",
+        "ua"      : "FStream",
+        "expect"  : 
+        {
+            "name"    : "FStream",
+            "version" : "undefined",
+            "major"   : "undefined"
+        }
+    },
+    {
+        "desc"    : "GStreamer",
+        "ua"      : "GStreamer souphttpsrc (compatible; LG NetCast.TV-2012) libsoup/2.34.2",
+        "expect"  : 
+        {
+            "name"    : "GStreamer",
+            "version" : "2.34.2",
+            "major"   : "2"
+        }
+    },
+    {
+        "desc"    : "GnomeMplayer",
+        "ua"      : "GnomeMplayer/1.0.2",
+        "expect"  : 
+        {
+            "name"    : "GnomeMplayer",
+            "version" : "1.0.2",
+            "major"   : "1"
+        }
+    },
+    {
+        "desc"    : "HTC Streaming Player",
+        "ua"      : "HTC Streaming Player htc_asia_wwe / 1.0 / endeavoru / 4.1.1",
+        "expect"  : 
+        {
+            "name"    : "HTC Streaming Player",
+            "version" : "1.0",
+            "major"   : "1"
+        }
+    },
+    {
+        "desc"    : "HTC One S",
+        "ua"      : "HTC_One_S/3.16.111.10",
+        "expect"  : 
+        {
+            "name"    : "HTC One S",
+            "version" : "3.16.111.10",
+            "major"   : "3"
+        }
+    },
+    {
+        "desc"    : "Java",
+        "ua"      : "Java/1.4.1_04",
+        "expect"  : 
+        {
+            "name"    : "Java",
+            "version" : "1.4.1_04",
+            "major"   : "1"
+        }
+    },
+    {
+        "desc"    : "LG Player",
+        "ua"      : "LG Player 1.0; Android",
+        "expect"  : 
+        {
+            "name"    : "LG Player",
+            "version" : "1.0",
+            "major"   : "1"
+        }
+    },
+    {
+        "desc"    : "NexPlayer",
+        "ua"      : "LG-P700/V10k-DEC-12-2012 Player/NexPlayer 4.0 for Android",
+        "expect"  : 
+        {
+            "name"    : "NexPlayer",
+            "version" : "4.0",
+            "major"   : "4"
+        }
+    },
+    {
+        "desc"    : "LG Player",
+        "ua"      : "LGE400/V10b Player/LG Player 1.0",
+        "expect"  : 
+        {
+            "name"    : "LG Player",
+            "version" : "1.0",
+            "major"   : "1"
+        }
+    },
+    {
+        "desc"    : "Lavf",
+        "ua"      : "Lavf52.111.0",
+        "expect"  : 
+        {
+            "name"    : "Lavf",
+            "version" : "52.111.0",
+            "major"   : "52"
+        }
+    },
+    {
+        "desc"    : "Lyssna",
+        "ua"      : "Lyssna/46 CFNetwork/609.1.4 Darwin/13.0.0",
+        "expect"  : 
+        {
+            "name"    : "Lyssna",
+            "version" : "46",
+            "major"   : "46"
+        }
+    },
+    {
+        "desc"    : "MPlayer",
+        "ua"      : "MPlayer 1.1-4.2.1",
+        "expect"  : 
+        {
+            "name"    : "MPlayer",
+            "version" : "1.1-4.2.1",
+            "major"   : ""
+        }
+    },
+    {
+        "desc"    : "MPlayer SVN",
+        "ua"      : "MPlayer SVN-r33713-4.6.1",
+        "expect"  : 
+        {
+            "name"    : "MPlayer",
+            "version" : "r33713-4.6.1",
+            "major"   : "undefined"
+        }
+    },
+    {
+        "desc"    : "MPlayer ubuntu",
+        "ua"      : "MPlayer svn r34540 (Ubuntu), built with gcc-4.6",
+        "expect"  : 
+        {
+            "name"    : "MPlayer",
+            "version" : "r34540",
+            "major"   : "undefined"
+        }
+    },
+    {
+        "desc"    : "MoC",
+        "ua"      : "Music On Console/2.5.0-beta1",
+        "expect"  : 
+        {
+            "name"    : "Music On Console",
+            "version" : "2.5.0-beta1",
+            "major"   : "2"
+        }
+    },
+    {
+        "desc"    : "MPD",
+        "ua"      : "Music Player Daemon 0.17.4",
+        "expect"  : 
+        {
+            "name"    : "Music Player Daemon",
+            "version" : "0.17.4",
+            "major"   : "0"
+        }
+    },
+    {
+        "desc"    : "NSPlayer",
+        "ua"      : "NSPlayer/11.0.5358.4827 WMFSDK/11.0",
+        "expect"  : 
+        {
+            "name"    : "NSPlayer",
+            "version" : "11.0.5358.4827",
+            "major"   : "11"
+        }
+    },
+    {
+        "desc"    : "Nero Home",
+        "ua"      : "Nero Home/1.5.3.0 (compatible; Nero AG; Nero Home 1.5.3.0)",
+        "expect"  : 
+        {
+            "name"    : "Nero Home",
+            "version" : "1.5.3.0",
+            "major"   : "1"
+        }
+    },
+    {
+        "desc"    : "NexPlayer",
+        "ua"      : "NexPlayer 4.0 for Android( stagefright alternative )",
+        "expect"  : 
+        {
+            "name"    : "NexPlayer",
+            "version" : "4.0",
+            "major"   : "4"
+        }
+    },
+    {
+        "desc"    : "Nokia3xx",
+        "ua"      : "Nokia303/14.87 CLDC-1.1",
+        "expect"  : 
+        {
+            "name"    : "Nokia303",
+            "version" : "14.87",
+            "major"   : "14"
+        }
+    },
+    {
+        "desc"    : "MPlayer SVN Sherpya",
+        "ua"      : "MPlayer Sherpya-SVN-r33124-4.2.5",
+        "expect"  : 
+        {
+            "name"    : "MPlayer",
+            "version" : "r33124-4.2.5",
+            "major"   : "undefined"
+        }
+    },
+    {
+        "desc"    : "Philips Songbird",
+        "ua"      : "NotMoz/5.0 (Windows; U; Windows NT 5.1; it; rv:1.9.2.3) Gecko/20101207 Philips-Songbird/5.4.1980 Songbird/1.9.4 (20110302030555)",
+        "expect"  : 
+        {
+            "name"    : "Songbird",
+            "version" : "1.9.4",
+            "major"   : "1"
+        }
+    },
+    {
+        "desc"    : "Ossproxy",
+        "ua"      : "OSSProxy 1.3.336.320 (Build 336.320 Win32 en-us)(Aug 16 2013 17:38:43)",
+        "expect"  : 
+        {
+            "name"    : "OSSProxy",
+            "version" : "1.3.336.320",
+            "major"   : "1"
+        }
+    },
+    {
+        "desc"    : "Winamp3",
+        "ua"      : "Nullsoft Winamp3 version 3.0 (compatible)",
+        "expect"  : 
+        {
+            "name"    : "Winamp",
+            "version" : "3.0",
+            "major"   : "3"
+        }
+    },
+    {
+        "desc"    : "PSP",
+        "ua"      : "PSP-InternetRadioPlayer/1.00",
+        "expect"  : 
+        {
+            "name"    : "PSP-InternetRadioPlayer",
+            "version" : "1.00",
+            "major"   : "1"
+        }
+    },
+    {
+        "desc"    : "urllib",
+        "ua"      : "Python-urllib/2.7",
+        "expect"  : 
+        {
+            "name"    : "Python-urllib",
+            "version" : "2.7",
+            "major"   : "2"
+        }
+    },
+    {
+        "desc"    : "QuickTime",
+        "ua"      : "QuickTime/7.5.6 (qtver=7.5.6;cpu=IA32;os=Mac 10.5.8)",
+        "expect"  : 
+        {
+            "name"    : "QuickTime",
+            "version" : "7.5.6",
+            "major"   : "7"
+        }
+    },
+    {
+        "desc"    : "RMA",
+        "ua"      : "RMA/1.0 (compatible; RealMedia)",
+        "expect"  : 
+        {
+            "name"    : "RMA",
+            "version" : "1.0",
+            "major"   : "1"
+        }
+    },
+    {
+        "desc"    : "RadioApp",
+        "ua"      : "RadioApp/1.0 CFNetwork/609.1.4 Darwin/11.4.2",
+        "expect"  : 
+        {
+            "name"    : "RadioApp",
+            "version" : "1.0",
+            "major"   : "1"
+        }
+    },
+    {
+        "desc"    : "RadioClientApplication",
+        "ua"      : "RadioClientApplication/20 CFNetwork/609.1.4 Darwin/13.0.0",
+        "expect"  : 
+        {
+            "name"    : "RadioClientApplication",
+            "version" : "20",
+            "major"   : "undefined"
+        }
+    },
+    {
+        "desc"    : "stagefright",
+        "ua"      : "Samsung GT-I9070 stagefright/1.1 (Linux;Android 2.3.6)",
+        "expect"  : 
+        {
+            "name"    : "stagefright",
+            "version" : "1.1",
+            "major"   : "1"
+        }
+    },
+    {
+        "desc"    : "Soundtap",
+        "ua"      : "Soundtap/1.2.4 CFNetwork/672.0.2 Darwin/14.0.0",
+        "expect"  : 
+        {
+            "name"    : "Soundtap",
+            "version" : "1.2.4",
+            "major"   : "1"
+        }
+    },
+    {
+        "desc"    : "Streamium",
+        "ua"      : "Streamium/1.0",
+        "expect"  : 
+        {
+            "name"    : "Streamium",
+            "version" : "1.0",
+            "major"   : "1"
+        }
+    },
+    {
+        "desc"    : "Totem",
+        "ua"      : "Totem/3.0.1",
+        "expect"  : 
+        {
+            "name"    : "Totem",
+            "version" : "3.0.1",
+            "major"   : "3"
+        }
+    },
+    {
+        "desc"    : "VLC",
+        "ua"      : "VLC media player - version 0.8.6c Janus - (c) 1996-2007 the VideoLAN team",
+        "expect"  : 
+        {
+            "name"    : "VLC",
+            "version" : "0.8.6c",
+            "major"   : "0"
+        }
+    },
+    {
+        "desc"    : "VLC",
+        "ua"      : "VLC/2.0.0 LibVLC/2.0.0",
+        "expect"  : 
+        {
+            "name"    : "VLC",
+            "version" : "2.0.0",
+            "major"   : "2"
+        }
+    },
+    {
+        "desc"    : "Videos",
+        "ua"      : "Videos/3.8.2",
+        "expect"  : 
+        {
+            "name"    : "Video",
+            "version" : "3.8.2",
+            "major"   : "3"
+        }
+    },
+    {
+        "desc"    : "Wget",
+        "ua"      : "Wget/1.12 (darwin10.7.0)",
+        "expect"  : 
+        {
+            "name"    : "Wget",
+            "version" : "1.12",
+            "major"   : "1"
+        }
+    },
+    {
+        "desc"    : "Winamp",
+        "ua"      : "Winamp 2.81",
+        "expect"  : 
+        {
+            "name"    : "Winamp",
+            "version" : "2.81",
+            "major"   : "2"
+        }
+    },
+    {
+        "desc"    : "Winamp",
+        "ua"      : "WinampMPEG/2.00",
+        "expect"  : 
+        {
+            "name"    : "Winamp",
+            "version" : "2.00",
+            "major"   : "2"
+        }
+    },
+    {
+        "desc"    : "Windows Media Player",
+        "ua"      : "Windows-Media-Player/10.00.00.4019",
+        "expect"  : 
+        {
+            "name"    : "Windows Media Player",
+            "version" : "10.00.00.4019",
+            "major"   : "10"
+        }
+    },
+    {
+        "desc"    : "XBMC",
+        "ua"      : "XBMC/12.0 Git:20130127-fb595f2 (Windows NT 6.1;WOW64;Win64;x64; http://www.xbmc.org)",
+        "expect"  : 
+        {
+            "name"    : "XBMC",
+            "version" : "12.0",
+            "major"   : "12"
+        }
+    },
+    {
+        "desc"    : "rad.io",
+        "ua"      : "rad.io 1.18.1 rv:593 (iPhone 4S; iPhone OS 7.0.4; it_IT)",
+        "expect"  : 
+        {
+            "name"    : "rad.io",
+            "version" : "1.18.1",
+            "major"   : "1"
+        }
+    },
+    {
+        "desc"    : "BE-Test",
+        "ua"      : "APP-BE Test/1.0 (iPad; Apple; CPU iPhone OS 7_0_2 like Mac OS X)",
+        "expect"  :
+        {
+            "name"    : "BE Test",
+            "version" : "1.0",
+            "major"   : "1"
+        }
+    }
+]

ua-parser-js.jquery.json

@@ -1,32 +0,0 @@
-{
-    "title": "UAParser.js",
-    "name": "ua-parser-js",
-    "version": "0.6.16",
-    "description": "Lightweight JavaScript-based user-agent string parser",
-    "keywords": [
-        "user-agent",
-        "parser",
-        "browser",
-        "engine",
-        "os",
-        "device",
-        "cpu"
-    ],
-    "homepage": "https://faisalman.github.com/ua-parser-js",
-    "author": {
-        "name": "Faisal Salman",
-        "email": "fyzlman@gmail.com"
-    },
-    "dependencies": {
-        "jquery": ">=1.5"
-    },
-    "licenses": [
-        {
-            "type": "MIT",
-            "url": "http://www.opensource.org/licenses/mit-license.php"
-        }
-    ],
-    "bugs": "https://github.com/faisalman/ua-parser-js/issues",
-    "docs": "https://github.com/faisalman/ua-parser-js",
-    "download": "https://raw.github.com/faisalman/ua-parser-js/master/src/ua-parser.min.js"
-}