From 5c10e2b1070abb48f4549827533877f88139df93 Mon Sep 17 00:00:00 2001 From: Faisal Salman Date: Mon, 23 Oct 2023 23:19:45 +0700 Subject: [PATCH] Improve browser detection: rename "Samsung Browser" to "Samsung Internet" https://developer.samsung.com/internet/user-agent-string-format.html --- src/main/ua-parser.js | 6 ++++-- test/specs/browser-all.json | 36 +++++++++++++++++++++++++++++++++--- 2 files changed, 37 insertions(+), 5 deletions(-) diff --git a/src/main/ua-parser.js b/src/main/ua-parser.js index b2b803ea8..4995f9e9d 100755 --- a/src/main/ua-parser.js +++ b/src/main/ua-parser.js @@ -347,8 +347,10 @@ ], [VERSION, [NAME, PREFIX_MOBILE + FIREFOX]], [ /\bqihu|(qi?ho?o?|360)browser/i // 360 ], [[NAME, '360' + SUFFIX_BROWSER]], [ - /(oculus|samsung|sailfish|huawei|vivo)browser\/([\w\.]+)/i - ], [[NAME, /(.+)/, '$1' + SUFFIX_BROWSER], VERSION], [ // Oculus/Samsung/Sailfish/HuaweiBrowser/VivoBrowser + /(oculus|sailfish|huawei|vivo)browser\/([\w\.]+)/i + ], [[NAME, /(.+)/, '$1' + SUFFIX_BROWSER], VERSION], [ // Oculus/Sailfish/HuaweiBrowser/VivoBrowser + /samsungbrowser\/([\w\.]+)/i // Samsung Internet + ], [VERSION, [NAME, SAMSUNG + ' Internet']], [ /(comodo_dragon)\/([\w\.]+)/i // Comodo Dragon ], [[NAME, /_/g, ' '], VERSION], [ /metasr[\/ ]?([\d\.]+)/i // Sogou Explorer diff --git a/test/specs/browser-all.json b/test/specs/browser-all.json index 436179d67..743c8b87a 100644 --- a/test/specs/browser-all.json +++ b/test/specs/browser-all.json @@ -84,7 +84,7 @@ "ua" : "Mozilla/5.0 (Linux; Android 5.0.2; SAMSUNG SM-G925F Build/LRX22G) AppleWebKit/537.36 (KHTML, like Gecko) SamsungBrowser/3.0 Chrome/38.0.2125.102 Mobile Safari/537.36", "expect" : { - "name" : "Samsung Browser", + "name" : "Samsung Internet", "version" : "3.0", "major" : "3" } @@ -1189,11 +1189,41 @@ } }, { - "desc" : "Samsung Browser", + "desc" : "Samsung Internet for Android", "ua" : "Mozilla/5.0 (Linux; Android 6.0.1; SAMSUNG-SM-G925A Build/MMB29K) AppleWebKit/537.36 (KHTML, like Gecko) SamsungBrowser/4.0 Chrome/44.0.2403.133 Mobile Safari/537.36", "expect" : { - "name" : "Samsung Browser", + "name" : "Samsung Internet", + "version" : "4.0", + "major" : "4" + } + }, + { + "desc" : "Samsung Internet for Tizen Mobile", + "ua" : "Mozilla/5.0 (Linux; Tizen 2.3; SAMSUNG SM-Z130H) AppleWebKit/537.3 (KHTML, like Gecko) SamsungBrowser/1.0 Mobile Safari/537.3", + "expect" : + { + "name" : "Samsung Internet", + "version" : "1.0", + "major" : "1" + } + }, + { + "desc" : "Samsung Internet for Smart-TV", + "ua" : "Mozilla/5.0 (SMART-TV; Linux; Tizen 2.3) AppleWebkit/538.1 (KHTML, like Gecko) SamsungBrowser/1.0 TV Safari/538.1", + "expect" : + { + "name" : "Samsung Internet", + "version" : "1.0", + "major" : "1" + } + }, + { + "desc" : "Samsung Internet for Gear VR", + "ua" : "Mozilla/5.0 (Linux; Android 5.0.2; SAMSUNG SM-G925K Build/LRX22G) AppleWebKit/537.36 (KHTML, like Gecko) SamsungBrowser/4.0 Chrome/44.0.2403.133 Mobile VR Safari/537.36", + "expect" : + { + "name" : "Samsung Internet", "version" : "4.0", "major" : "4" }