Update version number to 0.7.24

Fix potential ReDoS vulnerability as reported by Doyensec
Merge pull request #479 from joeyparrish/develop
2025-11-15 14:42:16 +03:00 · 2021-02-12 10:01:25 +07:00 · 2021-02-12 09:53:26 +07:00 · 2021-02-10 15:41:56 +07:00 · 2021-02-09 12:42:27 -08:00 · 2021-02-09 12:24:17 -08:00
12 changed files with 457 additions and 102 deletions
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,3 +1,6 @@
+arch:
+ - amd64
+ - ppc64le
 language: node_js
 node_js:
    - stable
--- a/bower.json
+++ b/bower.json
@@ -1,6 +1,6 @@
 {
  "name": "ua-parser-js",
-  "version": "0.7.22",
+  "version": "0.7.24",
  "authors": [
    "Faisal Salman <f@faisalman.com>"
  ],
--- a/dist/ua-parser.min.js
+++ b/dist/ua-parser.min.js
--- a/dist/ua-parser.pack.js
+++ b/dist/ua-parser.pack.js
--- a/license.md
+++ b/license.md
@@ -1,6 +1,6 @@
 MIT License

-Copyright (c) 2012-2019 Faisal Salman <<f@faisalman.com>>
+Copyright (c) 2012-2021 Faisal Salman <<f@faisalman.com>>

 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
--- a/package.js
+++ b/package.js
@@ -1,6 +1,6 @@
 Package.describe({
  name: 'faisalman:ua-parser-js',
-  version: '0.7.22',
+  version: '0.7.24',
  summary: 'Lightweight JavaScript-based user-agent string parser',
  git: 'https://github.com/faisalman/ua-parser-js.git',
  documentation: 'readme.md'
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
  "title": "UAParser.js",
  "name": "ua-parser-js",
-  "version": "0.7.22",
+  "version": "0.7.24",
  "author": "Faisal Salman <f@faisalman.com> (http://faisalman.com)",
  "description": "Lightweight JavaScript-based user-agent string parser",
  "keywords": [
@@ -15,7 +15,7 @@
    "jquery-plugin",
    "ecosystem:jquery"
  ],
-  "homepage": "http://github.com/faisalman/ua-parser-js",
+  "homepage": "https://github.com/faisalman/ua-parser-js",
  "contributors": [
    "Aamir Poonawalla <aamir@urx.com>",
    "Admas <mollases@users.noreply.github.com>",
@@ -94,7 +94,8 @@
    "Sylvain Gizard <sylvain.gizard@gmail.com>",
    "szchenghuang <szchenghuang@gmail.com>",
    "Vadim Kurachevsky <vadim@hmvs.org>",
-    "Yun Young-jin <yupmin@yupmin-office-macmini.local>"
+    "Yun Young-jin <yupmin@yupmin-office-macmini.local>",
+    "Insanehong <insae.hong@navercorp.com>"
  ],
  "main": "src/ua-parser.js",
  "scripts": {
@@ -115,10 +116,10 @@
    ]
  },
  "devDependencies": {
-    "jshint": "~1.1.0",
-    "mocha": "~1.8.0",
+    "jshint": "~2.12.0",
+    "mocha": "~8.2.0",
    "requirejs": "^2.3.2",
-    "uglify-js": "~2.7.5",
+    "uglify-js": "~3.12.0",
    "verup": "^1.3.x"
  },
  "repository": {
--- a/readme.md
+++ b/readme.md
@@ -27,26 +27,26 @@

 ```sh
 # Possible 'browser.name':
-2345Explorer, 360 Browser, Amaya, Android Browser, Arora, Avant, Avast, AVG, 
-BIDUBrowser, Baidu, Basilisk, Blazer, Bolt, Brave, Bowser, Camino, Chimera, 
-Chrome Headless, Chrome WebView, Chrome, Chromium, Comodo Dragon, Dillo, 
-Dolphin, Doris, Edge, Epiphany, Facebook, Falkon, Fennec, Firebird, Firefox, 
-Flock, GSA, GoBrowser, ICE Browser, IE, IEMobile, IceApe, IceCat, IceDragon, 
-Iceape, Iceweasel, Iridium, Iron, Jasmine, K-Meleon, Kindle, Konqueror, 
-LBBROWSER Line, Links, Lunascape, Lynx, MIUI Browser, Maemo Browser, Maemo, 
-Maxthon, MetaSr Midori, Minimo, Mobile Safari, Mosaic, Mozilla, NetFront, 
-NetSurf, Netfront, Netscape, NokiaBrowser, Oculus Browser, OmniWeb, 
-Opera Coast, Opera Mini, Opera Mobi, Opera Tablet, Opera, PaleMoon, PhantomJS, 
-Phoenix, Polaris, Puffin, QQ, QQBrowser, QQBrowserLite, Quark, QupZilla, 
-RockMelt, Safari, Sailfish Browser, Samsung Browser, SeaMonkey, Silk, Skyfire, 
-Sleipnir, Slim, SlimBrowser, Swiftfox, Tizen Browser, UCBrowser, Vivaldi, 
-Waterfox, WeChat, Yandex, baidu, iCab, w3m, ...
+2345Explorer, 360 Browser, Amaya, Android Browser, Arora, Avant, Avast, AVG,
+BIDUBrowser, Baidu, Basilisk, Blazer, Bolt, Brave, Bowser, Camino, Chimera,
+Chrome Headless, Chrome WebView, Chrome, Chromium, Comodo Dragon, Dillo,
+Dolphin, Doris, Edge, Epiphany, Facebook, Falkon, Fennec, Firebird, Firefox,
+Flock, GSA, GoBrowser, ICE Browser, IE, IEMobile, IceApe, IceCat, IceDragon,
+Iceape, Iceweasel, Iridium, Iron, Jasmine, K-Meleon, Kindle, Konqueror,
+LBBROWSER Line, Links, Lunascape, Lynx, MIUI Browser, Maemo Browser, Maemo,
+Maxthon, MetaSr Midori, Minimo, Mobile Safari, Mosaic, Mozilla, NetFront,
+NetSurf, Netfront, Netscape, NokiaBrowser, Oculus Browser, OmniWeb,
+Opera Coast, Opera Mini, Opera Mobi, Opera Tablet, Opera, PaleMoon, PhantomJS,
+Phoenix, Polaris, Puffin, QQ, QQBrowser, QQBrowserLite, Quark, QupZilla,
+RockMelt, Safari, Sailfish Browser, Samsung Browser, SeaMonkey, Silk, Skyfire,
+Sleipnir, Slim, SlimBrowser, Swiftfox, Tizen Browser, UCBrowser, Vivaldi,
+Waterfox, WeChat, Yandex, baidu, iCab, w3m, Whale Browser...

 # 'browser.version' determined dynamically
 ```

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

 ```sh
 # Possible 'device.type':
@@ -66,7 +66,7 @@ RIM, Samsung, Sharp, Siemens, Sony[Ericsson], Sprint, Xbox, Xiaomi, ZTE, ...

 ```sh
 # Possible 'engine.name'
-Amaya, Blink, EdgeHTML, Gecko, Goanna, iCab, KHTML, Links, Lynx, NetFront, 
+Amaya, Blink, EdgeHTML, Gecko, Goanna, iCab, KHTML, Links, Lynx, NetFront,
 NetSurf, Presto, Tasman, Trident, w3m, WebKit

 # 'engine.version' determined dynamically
@@ -77,12 +77,12 @@ NetSurf, Presto, Tasman, Trident, w3m, WebKit

 ```sh
 # Possible 'os.name'
-AIX, Amiga OS, Android, Arch, Bada, BeOS, BlackBerry, CentOS, Chromium OS, 
-Contiki, Fedora, Firefox OS, FreeBSD, Debian, DragonFly, Fuchsia, Gentoo, GNU, 
-Haiku, Hurd, iOS, Joli, KaiOS, Linpus, Linux, Mac OS, Mageia, Mandriva, MeeGo, 
-Minix, Mint, Morph OS, NetBSD, Nintendo, OpenBSD, OpenVMS, OS/2, Palm, PC-BSD, 
-PCLinuxOS, Plan9, Playstation, QNX, RedHat, RIM Tablet OS, RISC OS, Sailfish, 
-Series40, Slackware, Solaris, SUSE, Symbian, Tizen, Ubuntu, Unix, VectorLinux, 
+AIX, Amiga OS, Android, Arch, Bada, BeOS, BlackBerry, CentOS, Chromium OS,
+Contiki, Fedora, Firefox OS, FreeBSD, Debian, DragonFly, Fuchsia, Gentoo, GNU,
+Haiku, Hurd, iOS, Joli, KaiOS, Linpus, Linux, Mac OS, Mageia, Mandriva, MeeGo,
+Minix, Mint, Morph OS, NetBSD, Nintendo, OpenBSD, OpenVMS, OS/2, Palm, PC-BSD,
+PCLinuxOS, Plan9, PlayStation, QNX, RedHat, RIM Tablet OS, RISC OS, Sailfish,
+Series40, Slackware, Solaris, SUSE, Symbian, Tizen, Ubuntu, Unix, VectorLinux,
 WebOS, Windows [Phone/Mobile], Zenwalk, ...

 # 'os.version' determined dynamically
@@ -245,7 +245,7 @@ $ npm install --save @types/ua-parser-js

 ## Using jQuery/Zepto ($.ua)

-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)`. 
+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
 // 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':
@@ -317,7 +317,7 @@ Do you use & like UAParser.js but you don’t find a way to show some love? If y

 MIT License

-Copyright (c) 2012-2019 Faisal Salman <<f@faisalman.com>>
+Copyright (c) 2012-2021 Faisal Salman <<f@faisalman.com>>

 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
--- a/src/ua-parser.js
+++ b/src/ua-parser.js
@@ -1,9 +1,9 @@
 /*!
- * UAParser.js v0.7.22
+ * UAParser.js v0.7.24
 * Lightweight JavaScript-based User-Agent string parser
 * https://github.com/faisalman/ua-parser-js
 *
- * Copyright © 2012-2019 Faisal Salman <f@faisalman.com>
+ * Copyright © 2012-2021 Faisal Salman <f@faisalman.com>
 * Licensed under MIT License
 */

@@ -16,7 +16,7 @@
    /////////////


-    var LIBVERSION  = '0.7.22',
+    var LIBVERSION  = '0.7.24',
        EMPTY       = '',
        UNKNOWN     = '?',
        FUNC_TYPE   = 'function',
@@ -222,7 +222,7 @@

            // Presto based
            /(opera\smini)\/([\w\.-]+)/i,                                       // Opera Mini
-            /(opera\s[mobiletab]+).+version\/([\w\.-]+)/i,                      // Opera Mobi/Tablet
+            /(opera\s[mobiletab]{3,6}).+version\/([\w\.-]+)/i,                  // Opera Mobi/Tablet
            /(opera).+version\/([\w\.]+)/i,                                     // Opera > 9.80
            /(opera)[\/\s]+([\w\.]+)/i                                          // Opera < 9.80
            ], [NAME, VERSION], [
@@ -252,7 +252,7 @@
            /(konqueror)\/([\w\.]+)/i                                           // Konqueror
            ], [[NAME, 'Konqueror'], VERSION], [

-            /(trident).+rv[:\s]([\w\.]+).+like\sgecko/i                         // IE11
+            /(trident).+rv[:\s]([\w\.]{1,9}).+like\sgecko/i                     // IE11
            ], [[NAME, 'IE'], VERSION], [

            /(edge|edgios|edga|edg)\/((\d+)?[\w\.]+)/i                          // Microsoft Edge
@@ -291,6 +291,9 @@
            /(brave)\/([\w\.]+)/i                                               // Brave browser
            ], [[NAME, 'Brave'], VERSION], [

+            /(whale)\/([\w\.]+)/i                                               // Whale browser
+            ], [[NAME, 'Whale'], VERSION], [
+
            /(qqbrowserlite)\/([\w\.]+)/i                                       // QQBrowserLite
            ], [NAME, VERSION], [

@@ -315,8 +318,11 @@
            /xiaomi\/miuibrowser\/([\w\.]+)/i                                   // MIUI Browser
            ], [VERSION, [NAME, 'MIUI Browser']], [

-            /;fbav\/([\w\.]+);/i                                                // Facebook App for iOS & Android
+            /;fbav\/([\w\.]+);/i                                                // Facebook App for iOS & Android with version
            ], [VERSION, [NAME, 'Facebook']], [
+            
+            /FBAN\/FBIOS|FB_IAB\/FB4A/i                                         // Facebook App for iOS & Android without version
+            ], [[NAME, 'Facebook']], [

            /safari\s(line)\/([\w\.]+)/i,                                       // Line App for iOS
            /android.+(line)\/([\w\.]+)\/iab/i                                  // Line App for Android
@@ -334,7 +340,10 @@
            /android.+version\/([\w\.]+)\s+(?:mobile\s?safari|safari)*/i        // Android Browser
            ], [VERSION, [NAME, 'Android Browser']], [

-            /(sailfishbrowser)\/([\w\.]+)/i                                     // Sailfish Browser
+            /(coc_coc_browser)\/([\w\.]+)/i                                     // Coc Coc Browser
+            ], [[NAME, 'Coc Coc'], VERSION], [
+
+              /(sailfishbrowser)\/([\w\.]+)/i                                     // Sailfish Browser
            ], [[NAME, 'Sailfish Browser'], VERSION], [

            /(chrome|omniweb|arora|[tizenoka]{5}\s?browser)\/v?([\w\.]+)/i
@@ -356,13 +365,13 @@
            /fxios\/([\w\.-]+)/i                                                // Firefox for iOS
            ], [VERSION, [NAME, 'Firefox']], [

-            /version\/([\w\.]+).+?mobile\/\w+\s(safari)/i                       // Mobile Safari
+            /version\/([\w\.]+)\s.*mobile\/\w+\s(safari)/i                      // Mobile Safari
            ], [VERSION, [NAME, 'Mobile Safari']], [

-            /version\/([\w\.]+).+?(mobile\s?safari|safari)/i                    // Safari & Safari Mobile
+            /version\/([\w\.]+)\s.*(mobile\s?safari|safari)/i                   // Safari & Safari Mobile
            ], [VERSION, NAME], [

-            /webkit.+?(gsa)\/([\w\.]+).+?(mobile\s?safari|safari)(\/[\w\.]+)/i  // Google Search Appliance on iOS
+            /webkit.+?(gsa)\/([\w\.]+)\s.*(mobile\s?safari|safari)(\/[\w\.]+)/i // Google Search Appliance on iOS
            ], [[NAME, 'GSA'], VERSION], [

            /webkit.+?(mobile\s?safari|safari)(\/[\w\.]+)/i                     // Safari < 3.0
@@ -380,7 +389,8 @@
            /(firefox|seamonkey|k-meleon|icecat|iceape|firebird|phoenix|palemoon|basilisk|waterfox)\/([\w\.-]+)$/i,

                                                                                // Firefox/SeaMonkey/K-Meleon/IceCat/IceApe/Firebird/Phoenix
-            /(mozilla)\/([\w\.]+).+rv\:.+gecko\/\d+/i,                          // Mozilla
+            /(firefox)\/([\w\.]+)\s[\w\s\-]+\/[\w\.]+$/i,                       // Other Firefox-based
+            /(mozilla)\/([\w\.]+)\s.+rv\:.+gecko\/\d+/i,                        // Mozilla

            // Other
            /(polaris|lynx|dillo|icab|doris|amaya|w3m|netsurf|sleipnir)[\/\s]?([\w\.]+)/i,
@@ -437,11 +447,11 @@
            /(dell)\s(strea[kpr\s\d]*[\dko])/i                                  // Dell Streak
            ], [VENDOR, MODEL, [TYPE, TABLET]], [

-            /(kf[A-z]+)\sbuild\/.+silk\//i                                      // Kindle Fire HD
+            /(kf[A-z]+)(\sbuild\/|\)).+silk\//i                                 // Kindle Fire HD
            ], [MODEL, [VENDOR, 'Amazon'], [TYPE, TABLET]], [
-            /(sd|kf)[0349hijorstuw]+\sbuild\/.+silk\//i                         // Fire Phone
+            /(sd|kf)[0349hijorstuw]+(\sbuild\/|\)).+silk\//i                    // Fire Phone
            ], [[MODEL, mapper.str, maps.device.amazon.model], [VENDOR, 'Amazon'], [TYPE, MOBILE]], [
-            /android.+aft([bms])\sbuild/i                                       // Fire TV
+            /android.+aft([\w])(\sbuild\/|\))/i                                 // Fire TV
            ], [MODEL, [VENDOR, 'Amazon'], [TYPE, SMARTTV]], [

            /\((ip[honed|\s\w*]+);.+(apple)/i                                   // iPod/iPhone
@@ -480,7 +490,7 @@
            /(sprint\s(\w+))/i                                                  // Sprint Phones
            ], [[VENDOR, mapper.str, maps.device.sprint.vendor], [MODEL, mapper.str, maps.device.sprint.model], [TYPE, MOBILE]], [

-            /(htc)[;_\s-]+([\w\s]+(?=\)|\sbuild)|\w+)/i,                        // HTC
+            /(htc)[;_\s-]{1,2}([\w\s]+(?=\)|\sbuild)|\w+)/i,                    // HTC
            /(zte)-(\w*)/i,                                                     // ZTE
            /(alcatel|geeksphone|nexian|panasonic|(?=;\s)sony)[_\s-]?([\w-]*)/i
                                                                                // Alcatel/GeeksPhone/Nexian/Panasonic/Sony
@@ -489,8 +499,9 @@
            /(nexus\s9)/i                                                       // HTC Nexus 9
            ], [MODEL, [VENDOR, 'HTC'], [TYPE, TABLET]], [

-            /d\/huawei([\w\s-]+)[;\)]/i,
-            /(nexus\s6p|vog-l29|ane-lx1|eml-l29|ele-l29)/i                              // Huawei
+            /d\/huawei([\w\s-]+)[;\)]/i,                                        // Huawei
+            /android.+\s(nexus\s6p|vog-[at]?l\d\d|ane-[at]?l[x\d]\d|eml-a?l\d\da?|lya-[at]?l\d[\dc]|clt-a?l\d\di?)/i
+
            ], [MODEL, [VENDOR, 'Huawei'], [TYPE, MOBILE]], [

            /android.+(bah2?-a?[lw]\d{2})/i                                     // Huawei MediaPad
@@ -522,7 +533,7 @@
            /\(dtv[\);].+(aquos)/i                                              // Sharp
            ], [MODEL, [VENDOR, 'Sharp'], [TYPE, SMARTTV]], [

-            /android.+((sch-i[89]0\d|shw-m380s|gt-p\d{4}|gt-n\d+|sgh-t8[56]9|nexus 10))/i,
+            /android.+((sch-i[89]0\d|shw-m380s|SM-P605|SM-P610|SM-P587|gt-p\d{4}|gt-n\d+|sgh-t8[56]9|nexus 10))/i,
            /((SM-T\w+))/i
            ], [[VENDOR, 'Samsung'], MODEL, [TYPE, TABLET]], [                  // Samsung
            /smart-tv.+(samsung)/i
@@ -546,8 +557,9 @@
            ], [MODEL, [VENDOR, 'LG'], [TYPE, TABLET]], [
            /android\s3\.[\s\w;-]{10}(lg?)-([06cv9]{3,4})/i                     // LG Tablet
            ], [[VENDOR, 'LG'], MODEL, [TYPE, TABLET]], [
-            /(lg) netcast\.tv/i                                                 // LG SmartTV
-            ], [VENDOR, MODEL, [TYPE, SMARTTV]], [
+            /linux;\snetcast.+smarttv/i,                                        // LG SmartTV
+            /lg\snetcast\.tv-201\d/i
+            ], [[VENDOR, 'LG'], MODEL, [TYPE, SMARTTV]], [
            /(nexus\s[45])/i,                                                   // LG
            /lg[e;\s\/-]+(\w*)/i,
            /android.+lg(\-?[\d\w]+)\s+build/i
@@ -578,16 +590,17 @@
            /android.+;\s(pixel c)[\s)]/i                                       // Google Pixel C
            ], [MODEL, [VENDOR, 'Google'], [TYPE, TABLET]], [

-            /android.+;\s(pixel( [23])?( xl)?)[\s)]/i                              // Google Pixel
+            /android.+;\s(pixel( [2-9]a?)?( xl)?)[\s)]/i                        // Google Pixel
            ], [MODEL, [VENDOR, 'Google'], [TYPE, MOBILE]], [

            /android.+;\s(\w+)\s+build\/hm\1/i,                                 // Xiaomi Hongmi 'numeric' models
-            /android.+(hm[\s\-_]*note?[\s_]*(?:\d\w)?)\s+build/i,               // Xiaomi Hongmi
-            /android.+(mi[\s\-_]*(?:a\d|one|one[\s_]plus|note lte)?[\s_]*(?:\d?\w?)[\s_]*(?:plus)?)\s+build/i,    
+            /android.+(hm[\s\-_]?note?[\s_]?(?:\d\w)?)\sbuild/i,                // Xiaomi Hongmi
+            /android.+(redmi[\s\-_]?(?:note|k)?(?:[\s_]?[\w\s]+))(?:\sbuild|\))/i,      
+                                                                                // Xiaomi Redmi
+            /android.+(mi[\s\-_]?(?:a\d|one|one[\s_]plus|note lte)?[\s_]?(?:\d?\w?)[\s_]?(?:plus)?)\sbuild/i    
                                                                                // Xiaomi Mi
-            /android.+(redmi[\s\-_]*(?:note)?(?:[\s_]?[\w\s]+))\s+build/i       // Redmi Phones
            ], [[MODEL, /_/g, ' '], [VENDOR, 'Xiaomi'], [TYPE, MOBILE]], [
-            /android.+(mi[\s\-_]*(?:pad)(?:[\s_]?[\w\s]+))\s+build/i            // Mi Pad tablets
+            /android.+(mi[\s\-_]?(?:pad)(?:[\s_]?[\w\s]+))(?:\sbuild|\))/i     // Mi Pad tablets
            ],[[MODEL, /_/g, ' '], [VENDOR, 'Xiaomi'], [TYPE, TABLET]], [
            /android.+;\s(m[1-5]\snote)\sbuild/i                                // Meizu
            ], [MODEL, [VENDOR, 'Meizu'], [TYPE, MOBILE]], [
@@ -601,13 +614,13 @@
            /android.+[;\/]\s*(RCT[\d\w]+)\s+build/i                            // RCA Tablets
            ], [MODEL, [VENDOR, 'RCA'], [TYPE, TABLET]], [

-            /android.+[;\/\s]+(Venue[\d\s]{2,7})\s+build/i                      // Dell Venue Tablets
+            /android.+[;\/\s](Venue[\d\s]{2,7})\s+build/i                       // Dell Venue Tablets
            ], [MODEL, [VENDOR, 'Dell'], [TYPE, TABLET]], [

            /android.+[;\/]\s*(Q[T|M][\d\w]+)\s+build/i                         // Verizon Tablet
            ], [MODEL, [VENDOR, 'Verizon'], [TYPE, TABLET]], [

-            /android.+[;\/]\s+(Barnes[&\s]+Noble\s+|BN[RT])(V?.*)\s+build/i     // Barnes & Noble Tablet
+            /android.+[;\/]\s+(Barnes[&\s]+Noble\s+|BN[RT])(\S(?:.*\S)?)\s+build/i     // Barnes & Noble Tablet
            ], [[VENDOR, 'Barnes & Noble'], MODEL, [TYPE, TABLET]], [

            /android.+[;\/]\s+(TM\d{3}.*\b)\s+build/i                           // Barnes & Noble Tablet
@@ -650,7 +663,7 @@
            /android.+[;\/]\s*(Le[\s\-]+Pan)[\s\-]+(\w{1,9})\s+build/i          // Le Pan Tablets
            ], [VENDOR, MODEL, [TYPE, TABLET]], [

-            /android.+[;\/]\s*(Trio[\s\-]*.*)\s+build/i                         // MachSpeed Tablets
+            /android.+[;\/]\s*(Trio[\s\w\-\.]+)\s+build/i                       // MachSpeed Tablets
            ], [MODEL, [VENDOR, 'MachSpeed'], [TYPE, TABLET]], [

            /android.+[;\/]\s*(Trinity)[\-\s]*(T\d{3})\s+build/i                // Trinity Tablets
@@ -659,11 +672,17 @@
            /android.+[;\/]\s*TU_(1491)\s+build/i                               // Rotor Tablets
            ], [MODEL, [VENDOR, 'Rotor'], [TYPE, TABLET]], [

-            /android.+(KS(.+))\s+build/i                                        // Amazon Kindle Tablets
-            ], [MODEL, [VENDOR, 'Amazon'], [TYPE, TABLET]], [
+            //android.+(KS(.+))\s+build/i                                        // Amazon Kindle Tablets
+            //], [MODEL, [VENDOR, 'Amazon'], [TYPE, TABLET]], [

            /android.+(Gigaset)[\s\-]+(Q\w{1,9})\s+build/i                      // Gigaset Tablets
            ], [VENDOR, MODEL, [TYPE, TABLET]], [
+                                                                                // Android Phones from Unidentified Vendors
+            /android .+?; ([^;]+?)(?: build|\) applewebkit).+? mobile safari/i
+            ], [MODEL, [TYPE, MOBILE]], [
+                                                                                // Android Tablets from Unidentified Vendors
+            /android .+?;\s([^;]+?)(?: build|\) applewebkit).+?(?! mobile) safari/i
+            ], [MODEL, [TYPE, TABLET]], [

            /\s(tablet|tab)[;\/]/i,                                             // Unidentifiable Tablet
            /\s(mobile)(?:[;\/]|\ssafari)/i                                     // Unidentifiable Mobile
@@ -673,7 +692,10 @@
            ], [[TYPE, SMARTTV]], [

            /(android[\w\.\s\-]{0,9});.+build/i                                 // Generic Android Device
-            ], [MODEL, [VENDOR, 'Generic']]
+            ], [MODEL, [VENDOR, 'Generic']], [
+
+            /(phone)/i
+            ], [[TYPE, MOBILE]]
        ],

        engine : [[
@@ -685,7 +707,7 @@
            ], [VERSION, [NAME, 'Blink']], [

            /(presto)\/([\w\.]+)/i,                                             // Presto
-            /(webkit|trident|netfront|netsurf|amaya|lynx|w3m|goanna)\/([\w\.]+)/i,     
+            /(webkit|trident|netfront|netsurf|amaya|lynx|w3m|goanna)\/([\w\.]+)/i,
                                                                                // WebKit/Trident/NetFront/NetSurf/Amaya/Lynx/w3m/Goanna
            /(khtml|tasman|links)[\/\s]\(?([\w\.]+)/i,                          // KHTML/Tasman/Links
            /(icab)[\/\s]([23]\.[\d\.]+)/i                                      // iCab
@@ -697,6 +719,9 @@

        os : [[

+            // Xbox, consider this before other Windows-based devices
+            /(xbox);\s+xbox\s([^\);]+)/i,                                       // Microsoft Xbox (360, One, X, S, Series X, Series S)
+
            // Windows based
            /microsoft\s(windows)\s(vista|xp)/i                                 // Windows (iTunes)
            ], [NAME, VERSION], [
@@ -722,6 +747,10 @@
            /mozilla.+\(mobile;.+gecko.+firefox/i                               // Firefox OS
            ], [[NAME, 'Firefox OS'], VERSION], [

+            // Google Chromecast
+            /crkey\/([\d\.]+)/i                                                 // Google Chromecast
+            ], [VERSION, [NAME, 'Chromecast']], [
+
            // Console
            /(nintendo|playstation)\s([wids34portablevu]+)/i,                   // Nintendo/Playstation

--- a/test/browser-test.json
+++ b/test/browser-test.json
@@ -239,6 +239,16 @@
            "major"   : "16"
        }
    },
+    {
+        "desc"    : "Coc Coc Browser",
+        "ua"      : "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_3) AppleWebKit/537.36 (KHTML, like Gecko) coc_coc_browser/78.0.129 Chrome/72.0.3626.129 Safari/537.36",
+        "expect"  :
+        {
+            "name"    : "Coc Coc",
+            "version" : "78.0.129",
+            "major"   : "78"
+        }
+    },
    {
        "desc"    : "Dillo",
        "ua"      : "Dillo/2.2",
@@ -310,7 +320,7 @@
        }
    },
    {
-        "desc"    : "Facebook in-App Browser for Android",
+        "desc"    : "Facebook in-App Browser for Android with version",
        "ua"      : "Mozilla/5.0 (Linux; Android 5.0; SM-G900P Build/LRX21T; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/43.0.2357.121 Mobile Safari/537.36 [FB_IAB/FB4A;FBAV/35.0.0.48.273;]",
        "expect"  :
        {
@@ -320,7 +330,7 @@
        }
    },
    {
-        "desc"    : "Facebook in-App Browser for iOS",
+        "desc"    : "Facebook in-App Browser for iOS with version",
        "ua"      : "Mozilla/5.0 (iPhone; CPU iPhone OS 10_3_1 like Mac OS X) AppleWebKit/603.1.30 (KHTML, like Gecko) Mobile/14E304 [FBAN/FBIOS;FBAV/91.0.0.41.73;FBBV/57050710;FBDV/iPhone8,1;FBMD/iPhone;FBSN/iOS;FBSV/10.3.1;FBSS/2;FBCR/Telekom.de;FBID/phone;FBLC/de_DE;FBOP/5;FBRV/0])",
        "expect"  :
        {
@@ -329,6 +339,16 @@
            "major"   : "91"
        }
    },
+    {
+        "desc"    : "Facebook in-App Browser for iOS without version",
+        "ua"      : "Mozilla/5.0 (iPhone; CPU iPhone OS 13_3_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148 [FBAN/FBIOS;FBDV/iPhone10,2;FBMD/iPhone;FBSN/iOS;FBSV/13.3.1;FBSS/3;FBID/phone;FBLC/en_US;FBOP/5;FBCR/]",
+        "expect"  :
+        {
+            "name"    : "Facebook",
+            "version" : "undefined",
+            "major"   : "undefined"
+        }
+    },
    {
        "desc"    : "Falkon",
        "ua"      : "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Falkon/3.0.0 Chrome/61.0.3163.140 Safari/537.36",
@@ -359,6 +379,16 @@
            "major"   : "15"
        }
    },
+    {
+        "desc"    : "Firefox-based browser",
+        "ua"      : "Mozilla/5.0 (X11; Linux x86_64; rv:80.0) Gecko/20100101 Firefox/80.0 AppName/1.0",
+        "expect"  :
+        {
+            "name"    : "Firefox",
+            "version" : "80.0",
+            "major"   : "80"
+        }
+    },
    {
        "desc"    : "Fennec",
        "ua"      : "Mozilla/5.0 (X11; U; Linux armv61; en-US; rv:1.9.1b2pre) Gecko/20081015 Fennec/1.0a1",
@@ -1200,7 +1230,7 @@
        "expect"  :
        {
            "name"    : "BIDUBrowser",
-            "version" : "8.7", 
+            "version" : "8.7",
            "major"   : "8"
        }
    },
@@ -1233,5 +1263,15 @@
            "version" : "4.5.16",
            "major"   : "4"
        }
+    },
+    {
+        "desc"    : "Whale Browser",
+        "ua"      : "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_2) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/76.0.3809.146 Whale/2.6.90.14 Safari/537.36",
+        "expect"  :
+        {
+            "name"    : "Whale",
+            "version" : "2.6.90.14",
+            "major"   : "2"
+        }
    }
 ]
--- a/test/device-test.json
+++ b/test/device-test.json
@@ -160,6 +160,24 @@
            "type": "mobile"
        }
    },
+    {
+        "desc": "LG Smart TV",
+        "ua": "Mozilla/5.0 (DirectFB; U; Linux mips; en) AppleWebKit/528.5+ (KHTML, like Gecko, Safari/528.5+) LG Browser (; LG NetCast.TV-2011)",
+        "expect": {
+            "vendor": "LG",
+            "model": "undefined",
+            "type": "smarttv"
+        }
+    },
+    {
+        "desc": "LG Smart TV",
+        "ua": "Mozilla/5.0 (Linux; NetCast; U) AppleWebKit/537.31 (KHTML, like Gecko) Chrome/53.0.2785 34 Safari/537.31 SmartTV/8.5",
+        "expect": {
+            "vendor": "LG",
+            "model": "undefined",
+            "type": "smarttv"
+        }
+    },
    {
        "desc": "Meizu M5 Note",
        "ua": "Mozilla/5.0 (Linux; Android 6.0; M5 Note Build/MRA58K; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/53.0.2785.49 Mobile MQQBrowser/6.2 TBS/043024 Safari/537.36 MicroMessenger/6.5.7.1040 NetType/WIFI Language/zh_CN",
@@ -324,6 +342,15 @@
            "type": "tablet"
        }
    },
+    {
+        "desc": "Kindle Fire HD",
+        "ua": "Mozilla/5.0 (Linux; U; Android 4.0.3; en-us; KFTT) AppleWebKit/535.19 (KHTML, like Gecko) Silk/3.4 Mobile Safari/535.19 Silk-Accelerated=true",
+        "expect": {
+            "vendor": "Amazon",
+            "model": "KFTT",
+            "type": "tablet"
+        }
+    },
    {
        "desc": "Samsung Galaxy Note 8",
        "ua": "Mozilla/5.0 (Linux; Android 4.2.2; GT-N5100 Build/JDQ39) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/35.0.1916.141 Safari/537.36",
@@ -351,6 +378,15 @@
            "type": "tablet"
        }
    },
+    {
+        "desc": "Samsung Galaxy Tab 6 Lite",
+        "ua": "Mozilla/5.0 (Linux; Android 10; SAMSUNG SM-P610) AppleWebKit/537.36 (KHTML, like Gecko) SamsungBrowser/12.0 Chrome/79.0.3945.136 Safari/537.36",
+        "expect": {
+            "vendor": "Samsung",
+            "model": "SM-P610",
+            "type": "tablet"
+        }
+    },
    {
        "desc": "Samsung SM-T700",
        "ua": "Mozilla/5.0 (Linux; Android 4.4.2; SM-T700 Build/KOT49H) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/36.0.1985.135 Safari/537.36",
@@ -378,6 +414,15 @@
            "type": "smarttv"
        }
    },
+    {
+        "desc": "Samsung Note 10.1",
+        "ua": "Mozilla/5.0 (Linux; Android 5.1.1; SM-P605) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/83.0.4103.106 Safari/537.36",
+        "expect": {
+          "vendor": "Samsung",
+          "model": "SM-P605",
+          "type": "tablet"
+        }
+    },
    {
        "desc": "Samsung SmartTV2012",
        "ua": "HbbTV/1.1.1 (;Samsung;SmartTV2012;;;) WebKit",
@@ -576,6 +621,69 @@
            "type": "mobile"
        }
    },
+    {
+        "desc": "Xiaomi MI PAD 2",
+        "ua": "Mozilla/5.0 (Linux; Android 5.1; MI PAD 2 Build/LMY47I; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/60.0.3112.107 Safari/537.36 [FB_IAB/FB4A;FBAV/137.0.0.24.91;]",
+        "expect": {
+            "vendor": "Xiaomi",
+            "model": "MI PAD 2",
+            "type": "tablet"
+        }
+    },
+    {
+        "desc": "Xiaomi MI PAD 4 PLUS",
+        "ua": "Mozilla/5.0 (Linux; Android 8.1; MI PAD 4 PLUS) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/76.0.3809.132 Safari/537.36",
+        "expect": {
+            "vendor": "Xiaomi",
+            "model": "MI PAD 4 PLUS",
+            "type": "tablet"
+        }
+    },
+    {
+        "desc": "Xiaomi Redmi 4A",
+        "ua": "Mozilla/5.0 (Linux; Android 6.0; Redmi 4A Build/MMB29M; xx-xx) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/56.0.2924.87 Mobile Safari/537.36",
+        "expect": {
+            "vendor": "Xiaomi",
+            "model": "Redmi 4A",
+            "type": "mobile"
+        }
+    },
+    {
+        "desc": "Xiaomi Redmi K30 5G",
+        "ua": "Mozilla/5.0 (Linux; Android 10; Redmi K30 5G) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/78.0.3904.96 Mobile Safari/537.36",
+        "expect": {
+            "vendor": "Xiaomi",
+            "model": "Redmi K30 5G",
+            "type": "mobile"
+        }
+    },
+    {
+        "desc": "Xiaomi Redmi K30 Pro",
+        "ua": "Mozilla/5.0 (Linux; Android 10; Redmi K30 Pro) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/81.0.4044.138 Mobile Safari/537.36",
+        "expect": {
+            "vendor": "Xiaomi",
+            "model": "Redmi K30 Pro",
+            "type": "mobile"
+        }
+    },
+    {
+        "desc": "Xiaomi Redmi Note 3",
+        "ua": "Mozilla/5.0 (Linux; Android 6.0.1; Redmi Note 3 Build/MMB29M) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/60.0.3112.116 Mobile Safari/537.36",
+        "expect": {
+            "vendor": "Xiaomi",
+            "model": "Redmi Note 3",
+            "type": "mobile"
+        }
+    },
+    {
+        "desc": "Xiaomi Redmi Note 9 Pro Max",
+        "ua": "Mozilla/5.0 (Linux; Android 10; Redmi Note 9 Pro Max) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/80.0.3987.99 Mobile Safari/537.36",
+        "expect": {
+            "vendor": "Xiaomi",
+            "model": "Redmi Note 9 Pro Max",
+            "type": "mobile"
+        }
+    },
    {
        "desc": "PlayStation 4",
        "ua": "Mozilla/5.0 (PlayStation 4 3.00) AppleWebKit/537.73 (KHTML, like Gecko)",
@@ -756,14 +864,82 @@
            "type": "mobile"
        }
    },
+    {
+        "desc": "Google Pixel 3a",
+        "ua": "Mozilla/5.0 (Linux; Android 10; Pixel 3a) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/78.0.3904.108 Mobile Safari/537.36",
+        "expect": {
+            "vendor": "Google",
+            "model": "Pixel 3a",
+            "type": "mobile"
+        }
+    },
+    {
+        "desc": "Google Pixel 3a XL",
+        "ua": "Mozilla/5.0 (Linux; Android 10; Pixel 3a XL) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/78.0.3904.108 Mobile Safari/537.36",
+        "expect": {
+            "vendor": "Google",
+            "model": "Pixel 3a XL",
+            "type": "mobile"
+        }
+    },
+    {
+        "desc": "Google Pixel 4",
+        "ua": "Mozilla/5.0 (Linux; Android 10; Pixel 4) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/78.0.3904.108 Mobile Safari/537.36",
+        "expect": {
+            "vendor": "Google",
+            "model": "Pixel 4",
+            "type": "mobile"
+        }
+    },
+    {
+        "desc": "Google Pixel 4 XL",
+        "ua": "Mozilla/5.0 (Linux; Android 10; Pixel 4 XL) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/78.0.3904.108 Mobile Safari/537.36",
+        "expect": {
+            "vendor": "Google",
+            "model": "Pixel 4 XL",
+            "type": "mobile"
+        }
+    },
    {
        "desc": "Generic Android Device",
-        "ua": "Mozilla/5.0  (Linux; U; Android 6.0.1; i980 Build/MRA58K) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Safari/537.36",
+        "ua": "Mozilla/5.0 (Linux; U; Android 6.0.1; i980 Build/MRA58K)",
        "expect": {
            "vendor": "Generic",
            "model": "Android 6.0.1"
        }
    },
+    {
+        "desc": "Android Phone Unidentified Vendor (docomo F-04K)",
+        "ua": "Mozilla/5.0 (Linux; Android 8.1.0; F-04K Build/V15R060P) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/64.0.3282.137 Mobile Safari/537.36",
+        "expect": {
+            "model": "F-04K",
+            "type": "mobile"
+        }
+    },
+    {
+        "desc": "Android Phone Unidentified Vendor (docomo SH-02M)",
+        "ua": "Mozilla/5.0 (Linux; Android 9; SH-02M) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/74.0.3729.136 Mobile Safari/537.36",
+        "expect": {
+            "model": "SH-02M",
+            "type": "mobile"
+        }
+    },
+    {
+        "desc": "Android Tablet Unidentified Vendor (docomo F-02K)",
+        "ua": "Mozilla/5.0 (Linux; Android 8.1.0; F-02K Build/V44R059G) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/65.0.3325.109 Safari/537.36",
+        "expect": {
+            "model": "F-02K",
+            "type": "tablet"
+        }
+    },
+    {
+        "desc": "Android Tablet Unidentified Vendor (docomo d-02K)",
+        "ua": "Mozilla/5.0 (Linux; Android 9; d-02K) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/74.0.3729.136 Safari/537.36",
+        "expect": {
+            "model": "d-02K",
+            "type": "tablet"
+        }
+    },
    {
        "desc": "LG VK Series Tablet",
        "ua": "Mozilla/5.0 (Linux; Android 5.0.2; VK700 Build/LRX22G) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/55.0.2883.84 Safari/537.36",
@@ -1025,6 +1201,15 @@
            "type": "tablet"
        }
    },
+    {
+        "desc": "Amazon Kindle Fire Tablet",
+        "ua": "Mozilla/5.0 (Linux; U; Android 4.4.3; en-us; KFSAWI) AppleWebKit/537.36 (KHTML, like Gecko) Silk/3.66 like Chrome/39.0.2171.93 Safari/537.36",
+        "expect": {
+            "vendor": "Amazon",
+            "model": "KFSAWI",
+            "type": "tablet"
+        }
+    },
    {
        "desc": "Amazon Fire TV",
        "ua": "Mozilla/5.0 (Linux; Android 4.2.2; AFTB Build/JDQ39) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.173 Mobile Safari/537.22",
@@ -1034,6 +1219,15 @@
            "type": "smarttv"
        }
    },
+    {
+        "desc": "Amazon Fire TV",
+        "ua": "Mozilla/5.0 (Linux; Android 5.1.1; AFTT) AppleWebKit/537.36 (KHTML, like Gecko) Silk/86.3.20 like Chrome/86.0.4240.198 Safari/537.36",
+        "expect": {
+            "vendor": "Amazon",
+            "model": "T",
+            "type": "smarttv"
+        }
+    },
    {
        "desc": "Gigaset Tablet",
        "ua": "Mozilla/5.0 (Linux; Android 4.2.2; Gigaset QV830 Build/JDQ39) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Safari/537.36",
@@ -1043,24 +1237,6 @@
            "type": "tablet"
        }
    },
-    {
-        "desc": "Redmi Note 3",
-        "ua": "Mozilla/5.0 (Linux; Android 6.0.1; Redmi Note 3 Build/MMB29M) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/60.0.3112.116 Mobile Safari/537.36",
-        "expect": {
-            "vendor": "Xiaomi",
-            "model": "Redmi Note 3",
-            "type": "mobile"
-        }
-    },
-    {
-        "desc": "MI PAD 2",
-        "ua": "Mozilla/5.0 (Linux; Android 5.1; MI PAD 2 Build/LMY47I; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/60.0.3112.107 Safari/537.36 [FB_IAB/FB4A;FBAV/137.0.0.24.91;]",
-        "expect": {
-            "vendor": "Xiaomi",
-            "model": "MI PAD 2",
-            "type": "tablet"
-        }
-    },
    {
        "desc": "HUAWEI MediaPad M3 Lite 10",
        "ua": "Mozilla/5.0 (Linux; Android 7.0; BAH-L09) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/70.0.3538.80 Safari/537.36",
@@ -1096,14 +1272,75 @@
          "model": "EML-L29",
          "type": "mobile"
      }
-    },
-    {
-      "desc": "Huawei P30",
-      "ua": "Mozilla/5.0 (Linux; Android 9; ELE-L29) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/73.0.3683.90 Mobile Safari/537.36",
-      "expect": {
-          "vendor": "Huawei",
-          "model": "ELE-L29",
-          "type": "mobile"
-      }
+  },
+  {
+    "desc": "Huawei P20 Pro",
+    "ua": "Mozilla/5.0 (Linux; Android 9; CLT-L29) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/78.0.3904.90 Mobile Safari/537.36",
+    "expect": {
+        "vendor": "Huawei",
+        "model": "CLT-L29",
+        "type": "mobile"
    }
+  },
+  {
+    "desc": "Huawei Mate 20 Pro",
+    "ua": "Mozilla/5.0 (Linux; Android 9; LYA-L09) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/78.0.3904.90 Mobile Safari/537.36",
+    "expect": {
+        "vendor": "Huawei",
+        "model": "LYA-L09",
+        "type": "mobile"
+    }
+  },
+  {
+    "desc": "Huawei Mate 20 Pro",
+    "ua": "Mozilla/5.0 (Linux; Android 9; LYA-AL00) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/78.0.3904.90 Mobile Safari/537.36",
+    "expect": {
+        "vendor": "Huawei",
+        "model": "LYA-AL00",
+        "type": "mobile"
+    }
+  },
+  {
+    "desc": "Huawei Mate 20 Pro",
+    "ua": "Mozilla/5.0 (Linux; Android 9; LYA-AL10) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/78.0.3904.90 Mobile Safari/537.36",
+    "expect": {
+        "vendor": "Huawei",
+        "model": "LYA-AL10",
+        "type": "mobile"
+    }
+  },
+  {
+    "desc": "Huawei Mate 20 Pro",
+    "ua": "Mozilla/5.0 (Linux; Android 9; LYA-L0C) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/78.0.3904.90 Mobile Safari/537.36",
+    "expect": {
+        "vendor": "Huawei",
+        "model": "LYA-L0C",
+        "type": "mobile"
+    }
+  },
+  {
+    "desc": "Huawei Mate 20 Pro",
+    "ua": "Mozilla/5.0 (Linux; Android 9; LYA-L29) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/78.0.3904.90 Mobile Safari/537.36",
+    "expect": {
+        "vendor": "Huawei",
+        "model": "LYA-L29",
+        "type": "mobile"
+    }
+  },
+  {
+    "desc": "Huawei Mate 20 Pro",
+    "ua": "Mozilla/5.0 (Linux; Android 9; LYA-TL00) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/78.0.3904.90 Mobile Safari/537.36",
+    "expect": {
+        "vendor": "Huawei",
+        "model": "LYA-TL00",
+        "type": "mobile"
+    }
+  },
+  {
+    "desc": "FaceBook Mobile App",
+    "ua": "[FBAN/FBIOS;FBAV/283.0.0.44.117;FBBV/238386386;FBDV/iPhone12,1;FBMD/iPhone;FBSN/iOS;FBSV/13.6.1;FBSS/2;FBID/phone;FBLC/en_US;FBOP/5;FBRV/240127608]",
+    "expect": {
+        "type": "mobile"
+    }
+  }
 ]
--- a/test/os-test.json
+++ b/test/os-test.json
@@ -251,6 +251,15 @@
            "version" : "undefined"
        }
    },
+    {
+        "desc"    : "Google Chromecast",
+        "ua"      : "Mozilla/5.0 (X11; Linux aarch64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/76.0.3809.81 Safari/537.36 CrKey/1.42.183786",
+        "expect"  :
+        {
+            "name"    : "Chromecast",
+            "version" : "1.42.183786"
+        }
+    },
    {
        "desc"    : "Nintendo",
        "ua"      : "",
@@ -278,6 +287,42 @@
            "version" : "4"
        }
    },
+    {
+        "desc"    : "Xbox 360",
+        "ua"      : "Mozilla/5.0 (Windows NT 10.0; Win64; x64; Xbox; Xbox 360) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/85.0.4183.121 Safari/537.36",
+        "expect"  :
+        {
+            "name"    : "Xbox",
+            "version" : "360"
+        }
+    },
+    {
+        "desc"    : "Xbox One",
+        "ua"      : "Mozilla/5.0 (Windows NT 10.0; Win64; x64; Xbox; Xbox One; WebView/3.0) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/70.0.3538.102 Safari/537.36 Edge/18.19041",
+        "expect"  :
+        {
+            "name"    : "Xbox",
+            "version" : "One"
+        }
+    },
+    {
+        "desc"    : "Xbox X",
+        "ua"      : "Mozilla/5.0 (Windows NT 10.0; Win64; x64; Xbox; Xbox X) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/48.0.2564.82 Safari/537.36 Edge/20.02",
+        "expect"  :
+        {
+            "name"    : "Xbox",
+            "version" : "X"
+        }
+    },
+    {
+        "desc"    : "Xbox Series X",
+        "ua"      : "Mozilla/5.0 (Windows NT 10.0; Win64; x64; Xbox; Xbox Series X) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/48.0.2564.82 Safari/537.36 Edge/20.02 ",
+        "expect"  :
+        {
+            "name"    : "Xbox",
+            "version" : "Series X"
+        }
+    },
    {
        "desc"    : "Mint",
        "ua"      : "",
Author	SHA1	Message	Date
Faisal Salman	9999815ac8	Update version number to 0.7.24	2021-02-12 10:01:25 +07:00
Faisal Salman	809439e20e	Fix potential ReDoS vulnerability as reported by Doyensec	2021-02-12 09:53:26 +07:00
Faisal Salman	5b83893476	Merge pull request #479 from joeyparrish/develop fix: Xbox OS detection	2021-02-10 15:41:56 +07:00
Joey Parrish	9d154cc41b	chore: Update build	2021-02-09 12:42:27 -08:00
Joey Parrish	7679003f87	fix: Xbox OS detection It is better to detect Xbox devices as having the OS "Xbox". Otherwise, they are detected as "Windows 10", making it difficult to see the difference between Legacy Edge on Windows and the Xbox browser. (Karma (https://github.com/karma-runner/karma) only shows the browser & OS on the status line.) With this change, Xbox 360, Xbox One, Xbox X/S, and Xbox Series X/S are all detected as OS "Xbox" with version "360", "One", etc.	2021-02-09 12:24:17 -08:00
Faisal Salman	45bf76a0fe	Merge pull request #474 from dust-off/master Fallback for Mobile	2021-01-08 14:41:15 +07:00
Dustin	f543c5ad72	facebook movile app with no browser info	2021-01-07 09:41:20 -08:00
Faisal Salman	89a72c27a7	Merge pull request #471 from jishidaaaaa/fix-firetv-detection Fix Detection Rule For Amazon Fire TV	2021-01-05 23:46:45 +07:00
Faisal Salman	314131d003	Merge pull request #472 from GeraldHost/master Update readme playstation typo	2021-01-05 23:44:08 +07:00
Gerald Host	386ebc29f1	feat: update readme playstation Update Playstation to PlayStation as "Playstation" is not a known user agent.	2021-01-05 12:59:41 +00:00
Junki-Ishida	b0f14de2a4	Fix Detection Rule For Amazon Fire TV	2021-01-05 21:19:07 +09:00
Faisal Salman	fd8a583020	Merge pull request #469 from bynice/patch-1 Update ua-parser.js	2021-01-02 11:02:15 +07:00
Faisal Salman	cc2da937c6	Merge pull request #368 from Deliaz/master Add Coc Coc browser detection	2020-12-17 20:07:49 +07:00
Yılmaz	34e2e800c5	Update ua-parser.js Samsung Tablet SM-P587 must be Tablet device type	2020-12-17 15:39:17 +03:00
Deliaz	26c74ef356	Merge branch 'develop' into master	2020-12-16 19:37:22 +02:00
Faisal Salman	e4b3029668	Merge pull request #466 from yoyo837/patch-1 Update homepage	2020-12-13 12:43:11 +07:00
Amumu	b7d4865afd	Update homepage	2020-12-13 10:59:01 +08:00
Faisal Salman	d5ab75a14e	Merge branch 'master' of github.com:faisalman/ua-parser-js	2020-12-10 10:47:08 +07:00
Faisal Salman	c7475db860	0.7.23	2020-12-10 10:45:16 +07:00
Faisal Salman	83d37b4887	Merge pull request #451 from dineshks1/master Adds travis jobs on ppc64le	2020-12-03 15:32:35 +07:00
Faisal Salman	2d53ceb8bf	Merge branch 'develop' of github.com:faisalman/ua-parser-js into develop	2020-12-01 10:50:17 +07:00
Faisal Salman	d107155a57	Merge pull request #463 from vinyldarkscratch/bump-deps Bump version for all dependencies	2020-12-01 10:36:46 +07:00
Faisal Salman	43fb4d16a7	Merge pull request #459 from WizKid/master Amazon Fire do not always contain build number	2020-12-01 10:36:11 +07:00
Faisal Salman	6d1f26df05	Fix ReDoS vulnerabilities reported by Snyk	2020-12-01 10:09:58 +07:00
Faisal Salman	86471ad7e2	Merge branch 'master' into develop	2020-11-30 23:16:15 +07:00
Faisal Salman	9dfa5fc675	Fix #453 - ReDoS vulnerability in MachSpeed tablets detection as reported by @migueldemoura	2020-11-30 23:15:30 +07:00
Queen Vinyl Darkscratch	4547dbc0b4	Bump version for all dependencies	2020-11-28 05:42:37 -08:00
Emil Hesslow	7b23335d29	Amazon Fire do not always contain build number	2020-11-23 13:43:33 -08:00
dineshks1	da53c35f91	Adds travis jobs on ppc64le	2020-10-28 12:12:40 +00:00
Faisal Salman	edd84eaa72	Fix #447 - Improve identification for LG SmartTV	2020-10-01 12:16:54 +07:00
Faisal Salman	1a75bc845f	Fix #444 - Identify unknown Firefox-based browser as "Firefox" rather than "Mozilla"	2020-09-17 23:29:17 +07:00
Faisal Salman	e96f95802d	Refine Xiaomi detection	2020-09-12 15:56:30 +07:00
Faisal Salman	aa190ad319	Merge branch 'master' into develop	2020-09-12 15:50:06 +07:00
Faisal Salman	3547f16d08	Merge pull request #437 from RomanSavarin/samsung-note-10 Detect Samsung Note 10.1 as a tablet	2020-09-11 21:31:46 +07:00
Raman Savaryn	da113f9fad	Merge branch 'develop' into samsung-note-10	2020-08-18 08:14:55 +03:00
Faisal Salman	150ad0b176	Merge pull request #439 from joeyparrish/develop Extract Chromecast firmware version	2020-08-13 13:58:24 +07:00
Faisal Salman	ba5324d3cd	Merge pull request #436 from derUli/develop Detect SM-P610 / Samsung Galaxy Tab S6 Lite as tablet	2020-08-13 13:55:39 +07:00
Faisal Salman	631d0501bb	Merge pull request #426 from nionata/feature/facebook Detect Facebook In-App Browsers without versions	2020-08-13 13:51:34 +07:00
Joey Parrish	20ceaf9000	Extract Chromecast firmware version Rather than put the CPU type as the OS version, for Chromecast, the firmware version would be much more useful. For example: Mozilla/5.0 (X11; Linux aarch64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/76.0.3809.81 Safari/537.36 CrKey/1.42.183786 This should produce: os: { name: "Chromecast", version: "1.42.183786" } Instead of: os: { name: "Linux", version: "aarch64" }	2020-08-12 11:00:51 -07:00
roman.savarin	a8972c7d70	Detect Samsung Note 10.1 as a tablet	2020-07-31 17:04:50 +03:00
Ulrich Schmidt	8196cb1c43	detect SM-P610 / Samsung Galaxy Tab S6 Lite as tablet	2020-07-21 14:18:50 +02:00
Nicholas Ionata	624eaf3f8a	Merge branch 'develop' into feature/facebook	2020-06-03 18:35:41 -04:00
nionata	4ca311224f	catch facebook in-app browsers that do not contain versions	2020-06-03 18:10:56 -04:00
Faisal Salman	1fc9d5a4a4	Merge pull request #409 from masahills/devlocal Detect Android models from unidentified device vendors.	2020-01-25 11:45:20 +07:00
Masahiko Sato	7568f0a6f5	Updated the regexp patterns to be simpler/safer.	2020-01-20 17:15:57 +09:00
Masahiko Sato	726a458c84	Try to detect Android device models from unidentified vendors.	2020-01-17 15:42:02 +09:00
Faisal Salman	4daaa41211	Merge pull request #406 from insanehong/develop Add Whale Browser@NAVER Corp to list of browsers	2020-01-08 00:01:48 +07:00
insanehong	74c973b0d8	Add new browser Whale@Naver Corp. - https://whale.naver.com	2020-01-07 17:29:14 +09:00
Faisal Salman	a8eac11d82	Simplify Huawei regex	2019-12-21 05:49:32 +07:00
Faisal Salman	e15ac48f0f	Merge branch 'develop' of github.com:faisalman/ua-parser-js into develop	2019-12-21 05:36:39 +07:00
Faisal Salman	74cb3d417b	Merge pull request #404 from 8thwall/huaweiProDevices Added Huawei P20 Pro and Huawei Mate P20 Pro Device Detection	2019-12-21 05:25:44 +07:00
Tony Tomarchio	b45bd07bab	Add additional model numbers for Huawei Mate 20 Pro	2019-12-19 11:10:06 -08:00
Tony Tomarchio	feafa4d027	Detect Huawei P20 Pro	2019-12-19 11:10:06 -08:00
Tony Tomarchio	fc08e23f54	Detect Huawei Mate 20 Pro	2019-12-19 11:10:06 -08:00
Faisal Salman	590234ba13	Merge pull request #402 from ChadKillingsworth/pixels Add detection for newer Pixel devices	2019-12-20 01:21:32 +07:00
Chad Killingsworth	ac123a98de	Add detection for newer Pixel devices	2019-12-04 07:08:51 -06:00
Deliaz	cd3ba72b2f	Add Coc Coc browser detection	2019-03-18 13:17:44 +07:00