Fix #636 - Add new browser: HeyTap | Fix #248 - Add 'Mobile' prefix for mobile version of Chrome, Firefox, Safari

faisalman · faisalman · commit 172f57ffea92 · 2023-03-22T11:51:28.000+07:00
diff --git a/readme.md b/readme.md
@@ -102,16 +102,16 @@ The methods are self explanatory, here's a small overview on all the available m
 # Possible 'browser.name':
 2345Explorer, 360 Browser, Amaya, Android Browser, Arora, Avant, Avast, AVG,
 BIDUBrowser, Baidu, Basilisk, Blazer, Bolt, Brave, Bowser, Camino, Chimera,
-Chrome [Mobile/Headless/WebView], Chromium, Cobalt, Comodo Dragon, Dillo,
+[Mobile] Chrome [Headless/WebView], Chromium, Cobalt, Comodo Dragon, Dillo,
 Dolphin, Doris, DuckDuckGo, Edge, Electron, Epiphany, Facebook, Falkon, Fennec, 
-Firebird, Firefox [Mobile/Focus/Reality], Flock, Flow, GSA, GoBrowser, 
+Firebird, [Mobile] Firefox [Focus/Reality], Flock, Flow, GSA, GoBrowser, HeyTap,
 Huawei Browser, ICE Browser, IE, IEMobile, IceApe, IceCat, IceDragon, Iceweasel, 
 Instagram, Iridium, Iron, Jasmine, Kakao[Story/Talk], K-Meleon, Kindle, Klar, 
 Konqueror, LBBROWSER, Line, LinkedIn, Links, Lunascape, Lynx, MIUI Browser, 
 Maemo Browser, Maemo, Maxthon, MetaSr Midori, Minimo, Mosaic, Mozilla, NetFront, 
 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 [Mobile], 
+Puffin, QQ, QQBrowser, QQBrowserLite, Quark, QupZilla, RockMelt, [Mobile] Safari, 
 Sailfish Browser, Samsung Browser, SeaMonkey, Silk, Skyfire, Sleipnir, Slim, 
 SlimBrowser, Swiftfox, Tesla, Tizen Browser, UCBrowser, UP.Browser, Viera, 
 Vivaldi, Waterfox, WeChat, Weibo, Yandex, baidu, iCab, w3m, Whale Browser, ...
diff --git a/src/ua-parser.js b/src/ua-parser.js
@@ -75,8 +75,8 @@
         XIAOMI      = 'Xiaomi',
         ZEBRA       = 'Zebra',
         ZTE         = 'ZTE',
-        SUFFIX_BROWSER = 'Browser',
-        SUFFIX_MOBILE  = 'Mobile',
+        PREFIX_MOBILE  = 'Mobile ',
+        SUFFIX_BROWSER = ' Browser',
         CHROME      = 'Chrome',
         EDGE        = 'Edge',
         FIREFOX     = 'Firefox',
@@ -280,8 +280,9 @@
 
         browser : [[
 
+            // Most common regardless engine
             /\b(?:crmo|crios)\/([\w\.]+)/i                                      // Chrome for Android/iOS
-            ], [VERSION, [NAME, 'Chrome']], [
+            ], [VERSION, [NAME, PREFIX_MOBILE + 'Chrome']], [
             /edg(?:e|ios|a)?\/([\w\.]+)/i                                       // Microsoft Edge
             ], [VERSION, [NAME, 'Edge']], [
 
@@ -305,11 +306,12 @@
 
             // Webkit/KHTML based                                               // Flock/RockMelt/Midori/Epiphany/Silk/Skyfire/Bolt/Iron/Iridium/PhantomJS/Bowser/QupZilla/Falkon
             /(flock|rockmelt|midori|epiphany|silk|skyfire|ovibrowser|bolt|iron|vivaldi|iridium|phantomjs|bowser|quark|qupzilla|falkon|rekonq|puffin|brave|whale(?!.+naver)|qqbrowserlite|qq|duckduckgo)\/([-\w\.]+)/i,
-                                                                                // Rekonq/Puffin/Brave/Whale/QQBrowserLite/QQ, aka ShouQ
+                                                                                // Rekonq/Puffin/Brave/Whale/QQBrowserLite/QQ//Vivaldi/DuckDuckGo
+            /(heytap|ovi)browser\/([\d\.]+)/i,                                  // HeyTap/Ovi
             /(weibo)__([\d\.]+)/i                                               // Weibo
             ], [NAME, VERSION], [
             /(?:\buc? ?browser|(?:juc.+)ucweb)[\/ ]?([\w\.]+)/i                 // UCBrowser
-            ], [VERSION, [NAME, 'UC'+SUFFIX_BROWSER]], [
+            ], [VERSION, [NAME, 'UCBrowser']], [
             /microm.+\bqbcore\/([\w\.]+)/i,                                     // WeChat Desktop for Windows Built-in Browser
             /\bqbcore\/([\w\.]+).+microm/i
             ], [VERSION, [NAME, 'WeChat(Win) Desktop']], [
@@ -322,7 +324,7 @@
             /ya(?:search)?browser\/([\w\.]+)/i                                  // Yandex
             ], [VERSION, [NAME, 'Yandex']], [
             /(avast|avg)\/([\w\.]+)/i                                           // Avast/AVG Secure Browser
-            ], [[NAME, /(.+)/, '$1 Secure '+SUFFIX_BROWSER], VERSION], [
+            ], [[NAME, /(.+)/, '$1 Secure' + SUFFIX_BROWSER], VERSION], [
             /\bfocus\/([\w\.]+)/i                                               // Firefox Focus
             ], [VERSION, [NAME, FIREFOX+' Focus']], [
             /\bopt\/([\w\.]+)/i                                                 // Opera Touch
@@ -334,13 +336,13 @@
             /coast\/([\w\.]+)/i                                                 // Opera Coast
             ], [VERSION, [NAME, OPERA+' Coast']], [
             /miuibrowser\/([\w\.]+)/i                                           // MIUI Browser
-            ], [VERSION, [NAME, 'MIUI '+SUFFIX_BROWSER]], [
+            ], [VERSION, [NAME, 'MIUI' + SUFFIX_BROWSER]], [
             /fxios\/([\w\.-]+)/i                                                // Firefox for iOS
-            ], [VERSION, [NAME, 'Firefox '+SUFFIX_MOBILE]], [
+            ], [VERSION, [NAME, PREFIX_MOBILE + 'Firefox']], [
             /\bqihu|(qi?ho?o?|360)browser/i                                     // 360
-            ], [[NAME, '360 '+SUFFIX_BROWSER]], [
+            ], [[NAME, '360' + SUFFIX_BROWSER]], [
             /(oculus|samsung|sailfish|huawei)browser\/([\w\.]+)/i
-            ], [[NAME, /(.+)/, '$1 '+SUFFIX_BROWSER], VERSION], [                      // Oculus/Samsung/Sailfish/Huawei Browser
+            ], [[NAME, /(.+)/, '$1' + SUFFIX_BROWSER], VERSION], [               // Oculus/Samsung/Sailfish/Huawei Browser
             /(comodo_dragon)\/([\w\.]+)/i                                       // Comodo Dragon
             ], [[NAME, /_/g, ' '], VERSION], [
             /(electron)\/([\w\.]+) safari/i,                                    // Electron-based App
@@ -371,19 +373,18 @@
             ], [[NAME, CHROME+' WebView'], VERSION], [
 
             /droid.+ version\/([\w\.]+)\b.+(?:mobile safari|safari)/i           // Android Browser
-            ], [VERSION, [NAME, 'Android '+SUFFIX_BROWSER]], [
+            ], [VERSION, [NAME, 'Android' + SUFFIX_BROWSER]], [
 
-            /chrome\/([\w\.]+) mobile/i,                                        // Chrome Mobile
-            /(?:(?:android.+)crmo|crios)\/([\w\.]+)/i                           // Chrome for Android/iOS
-            ], [VERSION, [NAME, 'Chrome '+SUFFIX_MOBILE]], [
+            /chrome\/([\w\.]+) mobile/i                                         // Chrome Mobile
+            ], [VERSION, [NAME, PREFIX_MOBILE + 'Chrome']], [
 
             /(chrome|omniweb|arora|[tizenoka]{5} ?browser)\/v?([\w\.]+)/i       // Chrome/OmniWeb/Arora/Tizen/Nokia
             ], [NAME, VERSION], [
 
             /version\/([\w\.\,]+) .*mobile(?:\/\w+ | ?)safari/i                 // Safari Mobile
-            ], [VERSION, [NAME, 'Safari '+SUFFIX_MOBILE]], [
+            ], [VERSION, [NAME, PREFIX_MOBILE + 'Safari']], [
             /iphone .*mobile(?:\/\w+ | ?)safari/i
-            ], [[NAME, 'Safari '+SUFFIX_MOBILE]], [
+            ], [[NAME, PREFIX_MOBILE + 'Safari']], [
             /version\/([\w\.\,]+) .*(safari)/i                                  // Safari
             ], [VERSION, NAME], [
             /webkit.+?(mobile ?safari|safari)(\/[\w\.]+)/i                      // Safari < 3.0
@@ -394,7 +395,7 @@
 
             // Gecko based
             /(?:mobile|tablet);.*(firefox)\/([\w\.-]+)/i                        // Firefox Mobile
-            ], [[NAME, 'Firefox '+SUFFIX_MOBILE], VERSION], [
+            ], [[NAME, PREFIX_MOBILE + 'Firefox'], VERSION], [
             /(navigator|netscape\d?)\/([-\w\.]+)/i                              // Netscape
             ], [[NAME, 'Netscape'], VERSION], [
             /mobile vr; rv:([\w\.]+)\).+firefox/i                               // Firefox Reality
diff --git a/test/browser-test.json b/test/browser-test.json
@@ -234,7 +234,7 @@
         "ua"      : "Mozilla/5.0 (iPhone; U; CPU iPhone OS 5_1_1 like Mac OS X; en) AppleWebKit/534.46.0 (KHTML, like Gecko) CriOS/19.0.1084.60 Mobile/9B206 Safari/7534.48.3",
         "expect"  :
         {
-            "name"    : "Chrome",
+            "name"    : "Mobile Chrome",
             "version" : "19.0.1084.60",
             "major"   : "19"
         }
@@ -254,7 +254,7 @@
         "ua"      : "Mozilla/5.0 (Linux; U; Android-4.0.3; en-us; Galaxy Nexus Build/IML74K) AppleWebKit/535.7 (KHTML, like Gecko) CrMo/16.0.912.75 Mobile Safari/535.7",
         "expect"  :
         {
-            "name"    : "Chrome",
+            "name"    : "Mobile Chrome",
             "version" : "16.0.912.75",
             "major"   : "16"
         }
@@ -508,6 +508,16 @@
             "major"   : "1"
         }
     },
+    {
+        "desc"    : "HeyTap",
+        "ua"      : "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/90.0.4430.61 Safari/537.36 HeyTapBrowser/40.8.10.1",
+        "expect"  :
+        {
+            "name"    : "HeyTap",
+            "version" : "40.8.10.1",
+            "major"   : "40"
+        }
+    },
     {
         "desc"    : "HuaweiBrowser",
         "ua"      : "Mozilla/5.0 (Linux; Android 6.0.1; LYA-AL00；HMSCore/4.0.0 GMS/10.4 ) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/70.0.3538.64 HuaweiBrowser/10.0.3.102 Mobile Safari/537.36",
@@ -753,7 +763,7 @@
         "ua"      : "Mozilla/5.0 (iPhone; U; CPU iPhone OS 4_0 like Mac OS X; en-us) AppleWebKit/532.9 (KHTML, like Gecko) Version/4.0.5 Mobile/8A293 Safari/6531.22.7",
         "expect"  :
         {
-            "name"    : "Safari Mobile",
+            "name"    : "Mobile Safari",
             "version" : "4.0.5",
             "major"   : "4"
         }
@@ -763,7 +773,7 @@
         "ua"      : "Mozilla/5.0 (iPhone; CPU iPhone OS 16_3 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko)  Mobile/15E148 Safari/604.1",
         "expect"  :
         {
-            "name"    : "Safari Mobile",
+            "name"    : "Mobile Safari",
             "version" : "undefined",
             "major"   : "undefined"
         }
@@ -1413,7 +1423,7 @@
         "ua"      : "Mozilla/5.0 (iPhone; CPU iPhone OS 9_1 like Mac OS X) AppleWebKit/601.1.46 (KHTML, like Gecko) FxiOS/1.1 Mobile/13B143 Safari/601.1.46",
         "expect"  :
         {
-            "name"    : "Firefox Mobile",
+            "name"    : "Mobile Firefox",
             "version" : "1.1",
             "major"   : "1"
         }
@@ -1423,7 +1433,7 @@
         "ua"      : "Mozilla/5.0 (iPad; CPU iPhone OS 8_3 like Mac OS X) AppleWebKit/600.1.4 (KHTML, like Gecko) FxiOS/1.0 Mobile/12F69 Safari/600.1.4",
         "expect"  :
         {
-            "name"    : "Firefox Mobile",
+            "name"    : "Mobile Firefox",
             "version" : "1.0",
             "major"   : "1"
         }
@@ -1617,7 +1627,7 @@
         "ua"      : "Mozilla/5.0 (iPhone; CPU iPhone OS 15_7 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/15.6,2 Mobile/15E148 Safari/604.1",
         "expect"  :
         {
-            "name"    : "Safari Mobile",
+            "name"    : "Mobile Safari",
             "version" : "15.6,2",
             "major"   : "15"
         }
@@ -1708,7 +1718,7 @@
         "ua"      : "Mozilla/5.0 (Linux; Android 7.1.2; Nexus 5X Build/N2G47W) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/58.0.3029.83 Mobile Safari/537.36",
         "expect"  :
         {
-            "name"    : "Chrome Mobile",
+            "name"    : "Mobile Chrome",
             "version" : "58.0.3029.83",
             "major"   : "58"
         }
@@ -1718,7 +1728,7 @@
         "ua"      : "Mozilla/5.0 (Linux; Android 7.1.2; Nexus 5X Build/N2G47W) AppleWebKit/537.36 (KHTML, like Gecko) FxiOS/7.5b3349 Mobile/14F89 Safari/603.2.4",
         "expect"  :
         {
-            "name"    : "Firefox Mobile",
+            "name"    : "Mobile Firefox",
             "version" : "7.5b3349",
             "major"   : "7"
         }
@@ -1728,7 +1738,7 @@
         "ua"      : "Mozilla/5.0 (Android 5.0; Mobile; rv:41.0) Gecko/41.0 Firefox/41.0",
         "expect"  :
         {
-            "name"    : "Firefox Mobile",
+            "name"    : "Mobile Firefox",
             "version" : "41.0",
             "major"   : "41"
         }

Original file line number	Diff line number	Diff line change
`@@ -234,7 +234,7 @@`
`234`	`234`	`"ua" : "Mozilla/5.0 (iPhone; U; CPU iPhone OS 5_1_1 like Mac OS X; en) AppleWebKit/534.46.0 (KHTML, like Gecko) CriOS/19.0.1084.60 Mobile/9B206 Safari/7534.48.3",`
`235`	`235`	`"expect" :`
`236`	`236`	`{`
`237`		`- "name" : "Chrome",`
	`237`	`+ "name" : "Mobile Chrome",`
`238`	`238`	`"version" : "19.0.1084.60",`
`239`	`239`	`"major" : "19"`
`240`	`240`	`}`
`@@ -254,7 +254,7 @@`
`254`	`254`	`"ua" : "Mozilla/5.0 (Linux; U; Android-4.0.3; en-us; Galaxy Nexus Build/IML74K) AppleWebKit/535.7 (KHTML, like Gecko) CrMo/16.0.912.75 Mobile Safari/535.7",`
`255`	`255`	`"expect" :`
`256`	`256`	`{`
`257`		`- "name" : "Chrome",`
	`257`	`+ "name" : "Mobile Chrome",`
`258`	`258`	`"version" : "16.0.912.75",`
`259`	`259`	`"major" : "16"`
`260`	`260`	`}`
`@@ -508,6 +508,16 @@`
`508`	`508`	`"major" : "1"`
`509`	`509`	`}`
`510`	`510`	`},`
	`511`	`+ {`
	`512`	`+ "desc" : "HeyTap",`
	`513`	`+ "ua" : "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/90.0.4430.61 Safari/537.36 HeyTapBrowser/40.8.10.1",`
	`514`	`+ "expect" :`
	`515`	`+ {`
	`516`	`+ "name" : "HeyTap",`
	`517`	`+ "version" : "40.8.10.1",`
	`518`	`+ "major" : "40"`
	`519`	`+ }`
	`520`	`+ },`
`511`	`521`	`{`
`512`	`522`	`"desc" : "HuaweiBrowser",`
`513`	`523`	`"ua" : "Mozilla/5.0 (Linux; Android 6.0.1; LYA-AL00；HMSCore/4.0.0 GMS/10.4 ) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/70.0.3538.64 HuaweiBrowser/10.0.3.102 Mobile Safari/537.36",`
`@@ -753,7 +763,7 @@`
`753`	`763`	`"ua" : "Mozilla/5.0 (iPhone; U; CPU iPhone OS 4_0 like Mac OS X; en-us) AppleWebKit/532.9 (KHTML, like Gecko) Version/4.0.5 Mobile/8A293 Safari/6531.22.7",`
`754`	`764`	`"expect" :`
`755`	`765`	`{`
`756`		`- "name" : "Safari Mobile",`
	`766`	`+ "name" : "Mobile Safari",`
`757`	`767`	`"version" : "4.0.5",`
`758`	`768`	`"major" : "4"`
`759`	`769`	`}`
`@@ -763,7 +773,7 @@`
`763`	`773`	`"ua" : "Mozilla/5.0 (iPhone; CPU iPhone OS 16_3 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148 Safari/604.1",`
`764`	`774`	`"expect" :`
`765`	`775`	`{`
`766`		`- "name" : "Safari Mobile",`
	`776`	`+ "name" : "Mobile Safari",`
`767`	`777`	`"version" : "undefined",`
`768`	`778`	`"major" : "undefined"`
`769`	`779`	`}`
`@@ -1413,7 +1423,7 @@`
`1413`	`1423`	`"ua" : "Mozilla/5.0 (iPhone; CPU iPhone OS 9_1 like Mac OS X) AppleWebKit/601.1.46 (KHTML, like Gecko) FxiOS/1.1 Mobile/13B143 Safari/601.1.46",`
`1414`	`1424`	`"expect" :`
`1415`	`1425`	`{`
`1416`		`- "name" : "Firefox Mobile",`
	`1426`	`+ "name" : "Mobile Firefox",`
`1417`	`1427`	`"version" : "1.1",`
`1418`	`1428`	`"major" : "1"`
`1419`	`1429`	`}`
`@@ -1423,7 +1433,7 @@`
`1423`	`1433`	`"ua" : "Mozilla/5.0 (iPad; CPU iPhone OS 8_3 like Mac OS X) AppleWebKit/600.1.4 (KHTML, like Gecko) FxiOS/1.0 Mobile/12F69 Safari/600.1.4",`
`1424`	`1434`	`"expect" :`
`1425`	`1435`	`{`
`1426`		`- "name" : "Firefox Mobile",`
	`1436`	`+ "name" : "Mobile Firefox",`
`1427`	`1437`	`"version" : "1.0",`
`1428`	`1438`	`"major" : "1"`
`1429`	`1439`	`}`
`@@ -1617,7 +1627,7 @@`
`1617`	`1627`	`"ua" : "Mozilla/5.0 (iPhone; CPU iPhone OS 15_7 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/15.6,2 Mobile/15E148 Safari/604.1",`
`1618`	`1628`	`"expect" :`
`1619`	`1629`	`{`
`1620`		`- "name" : "Safari Mobile",`
	`1630`	`+ "name" : "Mobile Safari",`
`1621`	`1631`	`"version" : "15.6,2",`
`1622`	`1632`	`"major" : "15"`
`1623`	`1633`	`}`
`@@ -1708,7 +1718,7 @@`
`1708`	`1718`	`"ua" : "Mozilla/5.0 (Linux; Android 7.1.2; Nexus 5X Build/N2G47W) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/58.0.3029.83 Mobile Safari/537.36",`
`1709`	`1719`	`"expect" :`
`1710`	`1720`	`{`
`1711`		`- "name" : "Chrome Mobile",`
	`1721`	`+ "name" : "Mobile Chrome",`
`1712`	`1722`	`"version" : "58.0.3029.83",`
`1713`	`1723`	`"major" : "58"`
`1714`	`1724`	`}`
`@@ -1718,7 +1728,7 @@`
`1718`	`1728`	`"ua" : "Mozilla/5.0 (Linux; Android 7.1.2; Nexus 5X Build/N2G47W) AppleWebKit/537.36 (KHTML, like Gecko) FxiOS/7.5b3349 Mobile/14F89 Safari/603.2.4",`
`1719`	`1729`	`"expect" :`
`1720`	`1730`	`{`
`1721`		`- "name" : "Firefox Mobile",`
	`1731`	`+ "name" : "Mobile Firefox",`
`1722`	`1732`	`"version" : "7.5b3349",`
`1723`	`1733`	`"major" : "7"`
`1724`	`1734`	`}`
`@@ -1728,7 +1738,7 @@`
`1728`	`1738`	`"ua" : "Mozilla/5.0 (Android 5.0; Mobile; rv:41.0) Gecko/41.0 Firefox/41.0",`
`1729`	`1739`	`"expect" :`
`1730`	`1740`	`{`
`1731`		`- "name" : "Firefox Mobile",`
	`1741`	`+ "name" : "Mobile Firefox",`
`1732`	`1742`	`"version" : "41.0",`
`1733`	`1743`	`"major" : "41"`
`1734`	`1744`	`}`