Skip to content

Commit

Permalink
Improves engine detection for DuckDuckGo Privacy Browser, Phoenix Bro…
Browse files Browse the repository at this point in the history
…wser and Yandex Browser (matomo-org#7709)

* Remove default engine for Phoenix Browser
* Remove default engine for DuckDuckGo Privacy Browser
* Improve regex for Yandex Browser

Detect new brands: AAUW, Aocwei, Rocket, SMUX and Detect devices for exist brands (matomo-org#7710)
feat(device) detect brand Weimei: Neon 2
feat(device) detect new brand Aocwei: X900
feat(device) detect brand Freetel: Fun +
feat(device) detect new brand SMUX: A1
feat(device) detect brand HTC: U12 Plus (2Q55100)
feat(device) detect brand Magnus: Bravo Z11
feat(device) detect brand Gionee: F100L
feat(device) detect brand Asus: ZenFone Selfie (Z00UDH)
feat(device) detect brand Huawei: Pura 70 (ADY-LX9), Pura 70 Pro+ (HBN-LX9), Nova 5i (GLK-LX2)
feat(device) detect brand Maxwest: Gravity 5.5 LTE
feat(device) detect brand Reeder: P11SE Art
feat(device) detect brand Archos: 9.4" FFF
feat(device) detect brand Vivo: Y28 (V2352), Y51 PK, Y10 (V2140A)
feat(device) detect brand Realme: C65 (RMX3910)
feat(device) detect brand ENIE: VT8216
feat(device) detect brand Xiaomi: Redmi 13 (2404ARN45A)
feat(device) detect new brand AAUW: M50
feat(device) detect new brand Rocket: ZC-P95
feat(device) detect brand Divisat: J-Link II
feat(device) detect brand Samsung: Galaxy Watch 4 Classic 42mm (SM-R885U)
feat(device) detect brand Xiaomi: Redmi 12C (22120RN86H), Redmi A3x (24048RN6CG)
feat(device) detect brand Vivo: Y03 (V2406), Y18 (V2345)
feat(device) detect brand Digma: Hit 16 10.4" (HS1003PL, HS1001PL)
feat(device) detect brand RIM: KEY2, Motion
feat(device) detect brand Comio: X1 Note
feat(device) detect brand Orbic: Q10
feat(device) detect brand Realme: C65 5G (RMX3997)
feat(device) detect brand Motorola: Moto G10 Power (PAMR0008IN)
feat(device) detect brand Google: Pixel 9 Pro XL
feat(device) detect brand POCO: F6 Pro, F6 (24069PC21G), M6 (2404APC5FG)
feat(device) detect brand Sparx: Ultra 11
feat(device) detect brand MeMobile: Grace 10
feat(device) detect brand Coolpad: CP12P
feat(device) detect brand Qilive: QT23109BP, QT22101B
feat(device) detect brand AllDocube: iPlay 60 Lite
feat(device) detect brand Ulefone: Armor Pad 3 Pro
feat(device) detect brand UMIDIGI: F3 5G (MP13)
feat(device) detect brand OnePlus: Nord N30 SE 5G (CPH2605)
feat(device) detect brand SPC: Smart Ultimate
feat(device) detect brand Huawei: Pura 70 Ultra (HBP-LX9), Pura 70 Pro+ (HBN-AL80), Honor Pad 9 12.1" 5G (HEY2-N09)
  • Loading branch information
sanchezzzhak committed Jun 19, 2024
1 parent a66ee28 commit 6668174
Show file tree
Hide file tree
Showing 12 changed files with 1,358 additions and 51 deletions.
4 changes: 4 additions & 0 deletions parser/device/brand-short.js
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ module.exports = {
'20': 'Alcor',
'XY': 'Alps',
'XYA': 'XY Auto',
'AAU': 'AAUW',
'7L': 'ALDI NORD',
'6L': 'ALDI SÜD',
'3L': 'Alfawise',
Expand Down Expand Up @@ -86,6 +87,7 @@ module.exports = {
'55': 'AOpen',
'RW': 'Aoro',
'9Y': 'Aocos',
'AOW': 'Aocwei',
'AP': 'Apple',
'ARC': 'Arçelik',
'AR': 'Archos',
Expand Down Expand Up @@ -1322,6 +1324,7 @@ module.exports = {
'RR': 'Roadrover',
'QR': 'ROADMAX',
'ROC': 'Roam Cat',
'ROT': 'Rocket',
'R1': 'Rokit',
'ROI': 'ROiK',
'RK': 'Roku',
Expand Down Expand Up @@ -1422,6 +1425,7 @@ module.exports = {
'SM1': 'Smartex',
'SC': 'Smartfren',
'S7': 'Smartisan',
'SMU': 'SMUX',
'JR': 'Sylvania',
'SYH': 'SYH',
'3Y': 'Smarty',
Expand Down
10 changes: 6 additions & 4 deletions regexes/client/browsers.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1078,8 +1078,6 @@
- regex: 'PHX/(?:(\d+[\.\d]+))?'
name: 'Phoenix Browser'
version: '$1'
engine:
default: 'Blink'

# PrivacyWall (https://play.google.com/store/apps/details?id=org.privacywall.browser)
- regex: 'PrivacyWall/(?:(\d+[\.\d]+))?'
Expand Down Expand Up @@ -2205,7 +2203,7 @@
version: '$1'
engine:
default: 'WebKit'
- regex: 'iP(?:hone|ad);.+YaBrowser(?:/(\d+[\.\d]*)) Mobile'
- regex: 'iP(?:hone|ad).*YaBrowser(?:/(\d+[\.\d]*))'
name: 'Yandex Browser'
version: '$1'
engine:
Expand Down Expand Up @@ -2379,7 +2377,11 @@
versions:
28: 'Blink'

- regex: '(?:DDG-Android-|DuckDuckGo/|ddg_android/)(\d+[\.\d]*)'
# DuckDuckGo Privacy Browser
- regex: 'DuckDuckGo/(\d+[\.\d]*)'
name: 'DuckDuckGo Privacy Browser'
version: '$1'
- regex: '(?:DDG-Android-|ddg_android/)(\d+[\.\d]*)'
name: 'DuckDuckGo Privacy Browser'
version: '$1'
engine:
Expand Down
2 changes: 2 additions & 0 deletions regexes/device-info/device.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6880,6 +6880,8 @@ poco:
2305epcc4g: '->c51'

oppo:
cph2643: '->f27 pro+'
f27 pro+: 'RE=2024.06;SZ=74.3x162.7x7.9;WT=177;DS=6.7;RS=1080x2412;OI=1;OV=14;CP=368;RM=8192;'
a15: 'RE=2020.10;SZ=75.4x164x7.9;WT=175;DS=6.52;RS=720x1600;OI=1;OV=10;CP=38;RM=2048;'
a31c: 'RE=2015.04;SZ=65.5x131.9x8;WT=135;DS=4.5;RS=480x854;OI=1;OV=4.4;CP=17;RM=1024;'
f5 youth: 'RE=2017.11;SZ=76x156.5x7.5;WT=152;DS=6.0;RS=1080x2160;OI=1;OV=7.1;CP=166;RM=3072;'
Expand Down
7 changes: 7 additions & 0 deletions regexes/device-info/hardware-cpu.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2477,3 +2477,10 @@ cpu:
clock_rate: 2200
process: 12nm
gpu_id: 25
368:
name: MediaTek Dimensity 7050
type: ARM
cores: 8
clock_rate: 2600
process: 6nm
gpu_id: 121
3 changes: 3 additions & 0 deletions regexes/device-info/hardware-gpu.yml
Original file line number Diff line number Diff line change
Expand Up @@ -359,3 +359,6 @@ gpu:
120:
name: ARM Mali-G76 MC4
clock_rate: 900
121:
name: ARM Mali-G68 MP4
clock_rate: 950
186 changes: 139 additions & 47 deletions regexes/device/mobiles.yml

Large diffs are not rendered by default.

27 changes: 27 additions & 0 deletions tests/fixtures/clients/browser.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9433,3 +9433,30 @@
engine: ""
engine_version: ""
family: ""
-
user_agent: Mozilla/5.0 (iPhone; CPU iPhone OS 12_5_7 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) PHX/13.3
client:
type: browser
name: Phoenix Browser
version: "13.3"
engine: WebKit
engine_version: 605.1.15
family: Chrome
-
user_agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/17.4 DuckDuckGo/7 Safari/605.1.15
client:
type: browser
name: DuckDuckGo Privacy Browser
version: "7"
engine: WebKit
engine_version: 605.1.15
family: Chrome
-
user_agent: Mozilla/5.0 (iPhone; CPU iPhone OS 17_4 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/17.0 YaBrowser/24.4.5.383.10 SA/3 Mobile/15E148 Safari/604.1
client:
type: browser
name: Yandex Browser
version: 24.4.5.383.10
engine: WebKit
engine_version: 605.1.15
family: ""
18 changes: 18 additions & 0 deletions tests/fixtures/devices/smart_speaker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -221,3 +221,21 @@
model: SmartSpeak Duo Max
os_family: Android
browser_family: Chrome
-
user_agent: Mozilla/5.0 (X11; Linux armv7l) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/90.0.4430.225 Safari/537.36 CrKey/1.56.500000 DeviceType/SmartSpeaker
os:
name: GNU/Linux
version: ""
platform: "ARM"
client:
type: browser
name: Chrome
version: 90.0.4430.225
engine: Blink
engine_version: 90.0.4430.225
device:
type: smart speaker
brand: Google
model: Chromecast
os_family: GNU/Linux
browser_family: Chrome
Loading

0 comments on commit 6668174

Please sign in to comment.