From e32cf1394288bff88e2a77b34bd876747e4d7ccb Mon Sep 17 00:00:00 2001
From: Faisal Salman <f@faisalman.com>
Date: Sat, 21 Dec 2024 13:05:57 +0700
Subject: [PATCH] Backport - Improve browser detection: `2345` & `360`

(cherry picked from commit 2624a92b39cc89cbae7cf3deb35cab9b806d4c94)
---
 src/ua-parser.js       | 15 +++++-----
 test/browser-test.json | 66 +++++++++++++++++++++++++++++++++---------
 2 files changed, 61 insertions(+), 20 deletions(-)

diff --git a/src/ua-parser.js b/src/ua-parser.js
index c8e3d05..bf3ebe2 100755
--- a/src/ua-parser.js
+++ b/src/ua-parser.js
@@ -276,11 +276,11 @@
             /coast\/([\w\.]+)/i                                                 // Opera Coast
             ], [VERSION, [NAME, OPERA+' Coast']], [
             /miuibrowser\/([\w\.]+)/i                                           // MIUI Browser
-            ], [VERSION, [NAME, 'MIUI '+BROWSER]], [
-            /fxios\/([-\w\.]+)/i                                                // Firefox for iOS
-            ], [VERSION, [NAME, FIREFOX]], [
-            /\bqihu|(qi?ho?o?|360)browser/i                                     // 360
-            ], [[NAME, '360' + SUFFIX_BROWSER]], [
+            ], [VERSION, [NAME, 'MIUI' + SUFFIX_BROWSER]], [
+            /fxios\/([\w\.-]+)/i                                                // Firefox for iOS
+            ], [VERSION, [NAME, PREFIX_MOBILE + FIREFOX]], [
+            /\bqihoobrowser\/?([\w\.]*)/i                                       // 360
+            ], [VERSION, [NAME, '360']], [
             /\b(qq)\/([\w\.]+)/i                                                // QQ
             ], [[NAME, /(.+)/, '$1Browser'], VERSION], [
             /(oculus|sailfish|huawei|vivo|pico)browser\/([\w\.]+)/i
@@ -293,12 +293,13 @@
             ], [[NAME, 'Sogou Mobile'], VERSION], [
             /(electron)\/([\w\.]+) safari/i,                                    // Electron-based App
             /(tesla)(?: qtcarbrowser|\/(20\d\d\.[-\w\.]+))/i,                   // Tesla
-            /m?(qqbrowser|2345Explorer)[\/ ]?([\w\.]+)/i                        // QQBrowser/2345 Browser
+            /m?(qqbrowser|2345(?=browser|chrome|explorer))\w*[\/ ]?v?([\w\.]+)/i   // QQ/2345
             ], [NAME, VERSION], [
             /(lbbrowser|rekonq)/i,                                              // LieBao Browser/Rekonq
             /\[(linkedin)app\]/i                                                // LinkedIn App for iOS & Android
             ], [NAME], [
-            /ome\/([\w\.]+) \w* ?(iron) saf/i                                   // Iron
+            /ome\/([\w\.]+) \w* ?(iron) saf/i,                                  // Iron
+            /ome\/([\w\.]+).+qihu (360)[es]e/i                                  // 360
             ], [VERSION, NAME], [
 
             // WebView
diff --git a/test/browser-test.json b/test/browser-test.json
index 3047958..214f214 100644
--- a/test/browser-test.json
+++ b/test/browser-test.json
@@ -1,12 +1,62 @@
 [
+    {
+        "desc"    : "2345 Browser",
+        "ua"      : "Mozilla/5.0 (Linux; Android 7.0; MI NOTE Pro Build/NRD90M; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/61.0.3163.98 Mobile Safari/537.36 Mb2345Browser/15.6.2",
+        "expect"  :
+        {
+            "name"    : "2345",
+            "version" : "15.6.2",
+            "major"   : "15"
+        }
+    },
+    {
+        "desc"    : "2345 Chrome",
+        "ua"      : "Mozilla/5.0 (Windows NT 6.3) AppleWebKit/537.36 (KHTML like Gecko) Chrome/39.0.2171.99 Safari/537.36 2345chrome v3.0.0.9739",
+        "expect"  :
+        {
+            "name"    : "2345",
+            "version" : "3.0.0.9739",
+            "major"   : "3"
+        }
+    },
+    {
+        "desc"    : "2345 Explorer",
+        "ua"      : "Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.90 Safari/537.36 2345Explorer/9.2.1.17116",
+        "expect"  :
+        {
+            "name"    : "2345",
+            "version" : "9.2.1.17116",
+            "major"   : "9"
+        }
+    },
     {
         "desc"    : "360 Browser on iOS",
         "ua"      : "Mozilla/5.0 (iPhone; CPU iPhone OS 12_4_1 like Mac OS X) AppleWebKit/607.3.9 (KHTML, like Gecko) Mobile/16G102 QHBrowser/317 QihooBrowser/4.0.10",
         "expect"  :
         {
-            "name"    : "360 Browser",
-            "version" : "undefined",
-            "major"   : "undefined"
+            "name"    : "360",
+            "version" : "4.0.10",
+            "major"   : "4"
+        }
+    },
+    {
+        "desc"    : "360 Secure Browser on Windows 10",
+        "ua"      : "Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/86.0.4240.198 Safari/537.36 QIHU 360SE",
+        "expect"  :
+        {
+            "name"    : "360",
+            "version" : "86.0.4240.198",
+            "major"   : "86"
+        }
+    },
+    {
+        "desc"    : "360 Speed Browser on Windows 10",
+        "ua"      : "Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/86.0.4240.198 Safari/537.36 QIHU 360EE",
+        "expect"  :
+        {
+            "name"    : "360",
+            "version" : "86.0.4240.198",
+            "major"   : "86"
         }
     },
     {
@@ -2097,16 +2147,6 @@
             "name"    : "LBBROWSER"
         }
     },
-    {
-        "desc"    : "2345 Browser",
-        "ua"      : "Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.90 Safari/537.36 2345Explorer/9.2.1.17116",
-        "expect"  :
-        {
-            "name"    : "2345Explorer",
-            "version" : "9.2.1.17116",
-            "major"   : "9"
-        }
-    },
     {
         "desc"    : "QQBrowserLite",
         "ua"      : "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_12_1) AppleWebKit/602.2.14 (KHTML, like Gecko) Version/10.0.1 Safari/602.2.14 QQBrowserLite/1.1.0",