Adds detection for Singlebox and improves detection for Skye (#7899)

* Improves detection for Skye ref #7898 * Adds detection for Singlebox ref #7897
matomo-org · Nov 5, 2024 · f134462 · f134462
1 parent 597a745
commit f134462
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 2 deletions.
diff --git a/Parser/Client/Browser.php b/Parser/Client/Browser.php
@@ -577,6 +577,7 @@ class Browser extends AbstractClientParser
         'K1' => 'Sidekick',
         'S1' => 'SimpleBrowser',
         '3S' => 'SilverMob US',
+        'ZB' => 'Singlebox',
         'SY' => 'Sizzy',
         'K3' => 'Skye',
         'SK' => 'Skyfire',
@@ -769,7 +770,7 @@ class Browser extends AbstractClientParser
             'M9', 'F9', '0P', '0A', 'JR', 'D3', 'TK', 'BP', '2F',
             '2M', 'K7', '1N', '8A', 'H7', 'X3', 'T4', 'X4', '5O',
             '8C', '3M', '6I', '2P', 'PU', '7I', 'X5', 'AL', '3P',
-            'W2',
+            'W2', 'ZB',
         ],
         'Firefox'            => [
             'FF', 'BI', 'BF', 'BH', 'BN', 'C0', 'CU', 'EI', 'F1',

diff --git a/Tests/Parser/Client/fixtures/browser.yml b/Tests/Parser/Client/fixtures/browser.yml
@@ -10321,3 +10321,21 @@
     engine: Blink
     engine_version: 107.0.4280.88
     family: Chrome
+-
+  user_agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Skye/6.4.1 Chrome/96.0.4664.110 Electron/16.0.7 Safari/537.36
+  client:
+    type: browser
+    name: Skye
+    version: 6.4.1
+    engine: Blink
+    engine_version: 96.0.4664.110
+    family: Chrome
+-
+  user_agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Singlebox/38.2.0 Chrome/116.0.5845.190 Electron/26.2.2 Safari/537.36
+  client:
+    type: browser
+    name: Singlebox
+    version: 38.2.0
+    engine: Blink
+    engine_version: 116.0.5845.190
+    family: Chrome
diff --git a/regexes/client/browsers.yml b/regexes/client/browsers.yml
@@ -5,6 +5,13 @@
 # @license http://www.gnu.org/licenses/lgpl.html LGPL v3 or later
 ###############
 
+# Singlebox (https://singlebox.app/en/)
+- regex: 'Singlebox/(\d+\.[\.\d]+)'
+  name: 'Singlebox'
+  version: '$1'
+  engine:
+    default: 'Blink'
+
 # RCA Tor Explorer
 - regex: 'RCATorExplorer'
   name: 'RCA Tor Explorer'

diff --git a/regexes/client/mobile_apps.yml b/regexes/client/mobile_apps.yml
@@ -2571,7 +2571,7 @@
   version: '$1'
 
 # Electron generic apps
-- regex: ' (?!(?:AppleWebKit|brave|Franz|Mailspring|Notion|Basecamp|Evernote|catalyst|ramboxpro|BlueMail|BeakerBrowser|Dezor|TweakStyle|Colibri|Polypane|VibeMate|(?:d|LT|Glass|Sushi|Flash|OhHai)Browser|Sizzy))([a-z0-9]*)(?:-desktop|-electron-app)?/(\d+\.[\d.]+).*Electron/'
+- regex: ' (?!(?:AppleWebKit|brave|Franz|Mailspring|Notion|Basecamp|Evernote|catalyst|ramboxpro|BlueMail|BeakerBrowser|Dezor|TweakStyle|Colibri|Polypane|Singlebox|Skye|VibeMate|(?:d|LT|Glass|Sushi|Flash|OhHai)Browser|Sizzy))([a-z0-9]*)(?:-desktop|-electron-app)?/(\d+\.[\d.]+).*Electron/'
   name: '$1'
   version: '$2'