Skip to content

Commit 00ca879

Browse files
committed
Merge branch 'master' into devices
2 parents 21efc63 + fb97daa commit 00ca879

File tree

8 files changed

+265
-7
lines changed

8 files changed

+265
-7
lines changed

Parser/Device/AbstractDeviceParser.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -493,6 +493,7 @@ abstract class AbstractDeviceParser extends AbstractParser
493493
'UD' => 'DUNNS Mobile',
494494
'DUU' => 'Duubee',
495495
'DUR' => 'Durabook',
496+
'DUD' => 'DUDU AUTO',
496497
'DYO' => 'Dyon',
497498
'DYM' => 'Dykemann',
498499
'DTE' => 'D-Tech',

Tests/Parser/Client/fixtures/library.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -689,3 +689,9 @@
689689
type: library
690690
name: IPinfo
691691
version: 3.0.0
692+
-
693+
user_agent: quic-go HTTP/3
694+
client:
695+
type: library
696+
name: quic-go
697+
version: ""

Tests/fixtures/car_browser.yml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1061,3 +1061,21 @@
10611061
model: Apollo 10 Pro
10621062
os_family: Android
10631063
browser_family: Chrome
1064+
-
1065+
user_agent: Mozilla/5.0 (Linux; arm_64; Android 13; DUDU7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/126.0.6478.41 YaBrowser/24.7.6.41.01 Safari/537.36
1066+
os:
1067+
name: Android
1068+
version: "13"
1069+
platform: ARM
1070+
client:
1071+
type: browser
1072+
name: Yandex Browser
1073+
version: 24.7.6.41.01
1074+
engine: Blink
1075+
engine_version: 126.0.6478.41
1076+
device:
1077+
type: car browser
1078+
brand: DUDU AUTO
1079+
model: DUDU7
1080+
os_family: Android
1081+
browser_family: Unknown

Tests/fixtures/smartphone-41.yml

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -485,3 +485,57 @@
485485
model: Aqua S10 Pro
486486
os_family: Android
487487
browser_family: Chrome
488+
-
489+
user_agent: Mozilla/5.0 (Linux; arm_64; Android 10; SM-A920F) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/128.0.6613.112 YaBrowser/24.10.1.112.00 SA/3 Mobile Safari/537.36
490+
os:
491+
name: Android
492+
version: "10"
493+
platform: ARM
494+
client:
495+
type: browser
496+
name: Yandex Browser
497+
version: 24.10.1.112.00
498+
engine: Blink
499+
engine_version: 128.0.6613.112
500+
device:
501+
type: smartphone
502+
brand: Samsung
503+
model: Galaxy A9 (2018)
504+
os_family: Android
505+
browser_family: Unknown
506+
-
507+
user_agent: Mozilla/5.0 (Linux; arm_64; Android 14; TECNO CLA6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/128.0.6613.123 YaBrowser/24.10.2.123.00 SA/3 Mobile Safari/537.36
508+
os:
509+
name: Android
510+
version: "14"
511+
platform: ARM
512+
client:
513+
type: browser
514+
name: Yandex Browser
515+
version: 24.10.2.123.00
516+
engine: Blink
517+
engine_version: 128.0.6613.123
518+
device:
519+
type: smartphone
520+
brand: Tecno Mobile
521+
model: Camon 30S Pro
522+
os_family: Android
523+
browser_family: Unknown
524+
-
525+
user_agent: Mozilla/5.0 (Linux; Android 14; TECNO CLA5 Build/UP1A.231005.007; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/130.0.6723.58 YaBrowser/22.8.1.94 (lite) Mobile Safari/537.36
526+
os:
527+
name: Android
528+
version: "14"
529+
platform: ""
530+
client:
531+
type: browser
532+
name: Yandex Browser Lite
533+
version: 22.8.1.94
534+
engine: Blink
535+
engine_version: 130.0.6723.58
536+
device:
537+
type: smartphone
538+
brand: Tecno Mobile
539+
model: Camon 30S
540+
os_family: Android
541+
browser_family: Unknown

Tests/fixtures/tablet-12.yml

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -377,3 +377,39 @@
377377
model: Ultra Pad
378378
os_family: Android
379379
browser_family: Opera
380+
-
381+
user_agent: Mozilla/5.0 (Linux; arm_64; Android 13; Kenshi_K10) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/114.0.0.0 YaBrowser/23.7.0.284.01 Safari/537.36
382+
os:
383+
name: Android
384+
version: "13"
385+
platform: ARM
386+
client:
387+
type: browser
388+
name: Yandex Browser
389+
version: 23.7.0.284.01
390+
engine: Blink
391+
engine_version: 114.0.0.0
392+
device:
393+
type: tablet
394+
brand: KENSHI
395+
model: K10
396+
os_family: Android
397+
browser_family: Unknown
398+
-
399+
user_agent: Mozilla/5.0 (Linux; arm_64; Android 10; WO Pad Max) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/128.0.6613.123 YaBrowser/24.10.2.123.00 SA/3 Mobile Safari/537.36
400+
os:
401+
name: Android
402+
version: "10"
403+
platform: ARM
404+
client:
405+
type: browser
406+
name: Yandex Browser
407+
version: 24.10.2.123.00
408+
engine: Blink
409+
engine_version: 128.0.6613.123
410+
device:
411+
type: tablet
412+
brand: 'W&O'
413+
model: WO Pad Max
414+
os_family: Android
415+
browser_family: Unknown

Tests/fixtures/tv-4.yml

Lines changed: 126 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4287,6 +4287,132 @@
42874287
model: 49NANO866NA
42884288
os_family: Other Mobile
42894289
browser_family: Unknown
4290+
-
4291+
user_agent: Mozilla/5.0 (Linux; Android 9; DCTIW362_PLAY Build/PTT1.190826.001; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/123.0.6312.42 YaBrowser/23.9.0.75 (lite) TV Safari/537.36
4292+
os:
4293+
name: Android
4294+
version: "9"
4295+
platform: ""
4296+
client:
4297+
type: browser
4298+
name: Yandex Browser Lite
4299+
version: 23.9.0.75
4300+
engine: Blink
4301+
engine_version: 123.0.6312.42
4302+
device:
4303+
type: tv
4304+
brand: Sagemcom
4305+
model: DCTIW362 Play
4306+
os_family: Android
4307+
browser_family: Unknown
4308+
-
4309+
user_agent: Mozilla/5.0 (Linux; Android 11; 28LH8120T Build/RP1A.200720.011; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/113.0.5672.163 YaBrowser/24.1.2.86 (lite) TV Safari/537.36
4310+
os:
4311+
name: Android
4312+
version: "11"
4313+
platform: ""
4314+
client:
4315+
type: browser
4316+
name: Yandex Browser Lite
4317+
version: 24.1.2.86
4318+
engine: Blink
4319+
engine_version: 113.0.5672.163
4320+
device:
4321+
type: tv
4322+
brand: Asano
4323+
model: 28LH8120T 28.0"
4324+
os_family: Android
4325+
browser_family: Unknown
4326+
-
4327+
user_agent: Mozilla/5.0 (Linux; Android 11; 28LH8110T Build/RP1A.200720.011; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/113.0.5672.163 YaBrowser/24.1.2.86 (lite) TV Safari/537.36
4328+
os:
4329+
name: Android
4330+
version: "11"
4331+
platform: ""
4332+
client:
4333+
type: browser
4334+
name: Yandex Browser Lite
4335+
version: 24.1.2.86
4336+
engine: Blink
4337+
engine_version: 113.0.5672.163
4338+
device:
4339+
type: tv
4340+
brand: Asano
4341+
model: 28LH8110T 28.0"
4342+
os_family: Android
4343+
browser_family: Unknown
4344+
-
4345+
user_agent: Mozilla/5.0 (Linux; Android 9; VHIX-55U169TSY Build/PPR2.180905.006.A1; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/113.0.5672.163 YaBrowser/24.1.2.279 (lite) TV Safari/537.36
4346+
os:
4347+
name: Android
4348+
version: "9"
4349+
platform: ""
4350+
client:
4351+
type: browser
4352+
name: Yandex Browser Lite
4353+
version: 24.1.2.279
4354+
engine: Blink
4355+
engine_version: 113.0.5672.163
4356+
device:
4357+
type: tv
4358+
brand: Hi
4359+
model: VHIX-55U169TSY
4360+
os_family: Android
4361+
browser_family: Unknown
4362+
-
4363+
user_agent: Mozilla/5.0 (Linux; Android 9; VHIX-50U169TSY Build/PPR2.180905.006.A1; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/113.0.5672.163 YaBrowser/24.1.2.279 (lite) TV Safari/537.36
4364+
os:
4365+
name: Android
4366+
version: "9"
4367+
platform: ""
4368+
client:
4369+
type: browser
4370+
name: Yandex Browser Lite
4371+
version: 24.1.2.279
4372+
engine: Blink
4373+
engine_version: 113.0.5672.163
4374+
device:
4375+
type: tv
4376+
brand: Hi
4377+
model: VHIX-50U169TSY
4378+
os_family: Android
4379+
browser_family: Unknown
4380+
-
4381+
user_agent: Mozilla/5.0 (Linux; Android 11; YNDX-00076 Build/RD2A.211001.002; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/113.0.5672.163 YaBrowser/24.1.2.279 (lite) TV Safari/537.36
4382+
os:
4383+
name: Android
4384+
version: "11"
4385+
platform: ""
4386+
client:
4387+
type: browser
4388+
name: Yandex Browser Lite
4389+
version: 24.1.2.279
4390+
engine: Blink
4391+
engine_version: 113.0.5672.163
4392+
device:
4393+
type: tv
4394+
brand: Yandex
4395+
model: YNDX-00076
4396+
os_family: Android
4397+
browser_family: Unknown
4398+
-
4399+
user_agent: Mozilla/5.0 (Linux; Android 11; YNDX-00074 Build/RD2A.211001.002; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/113.0.5672.163 YaBrowser/24.1.2.279 (lite) TV Safari/537.36
4400+
os:
4401+
name: Android
4402+
version: "11"
4403+
platform: ""
4404+
client:
4405+
type: browser
4406+
name: Yandex Browser Lite
4407+
version: 24.1.2.279
4408+
engine: Blink
4409+
engine_version: 113.0.5672.163
4410+
device:
4411+
type: tv
4412+
brand: Yandex
4413+
model: YNDX-00074
4414+
os_family: Android
4415+
browser_family: Unknown
42904416
-
42914417
user_agent: 'Mozilla/5.0 (QtEmbedded; U; Linux; C) AppleWebKit/533.3 (KHTML, like Gecko) MAG200 stbapp ver: 6 rev: c8a6f17 Mobile Safari/533.3'
42924418
os:

regexes/client/libraries.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
url: 'https://github.com/imroc/req'
6060

6161
# quic-go
62-
- regex: 'quic-go-HTTP/3'
62+
- regex: 'quic-go[ -]HTTP/3'
6363
name: 'quic-go'
6464
version: ''
6565
url: 'https://github.com/lucas-clemente/quic-go'

regexes/device/mobiles.yml

Lines changed: 23 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25742,6 +25742,10 @@ Tecno Mobile:
2574225742
model: 'Camon 30 5G'
2574325743
- regex: 'Tecno[ _-]CL8(?:[);/ ]|$)'
2574425744
model: 'Camon 30 Pro 5G'
25745+
- regex: 'Tecno[ _-]CLA6(?:[);/ ]|$)'
25746+
model: 'Camon 30S Pro'
25747+
- regex: 'Tecno[ _-]CLA5(?:[);/ ]|$)'
25748+
model: 'Camon 30S'
2574525749
- regex: 'Tecno[ _-]CA6S?(?:[);/ ]|$)'
2574625750
model: 'Camon CM'
2574725751
- regex: 'Tecno[ _-]CA7(?:[);/ ]|$)'
@@ -31156,13 +31160,13 @@ NEXBOX:
3115631160
model: 'ID TV HPH07'
3115731161

3115831162
Yandex:
31159-
regex: '(?:YNDX-?00(?:0SB|10[12]|055|07[1235]|09[12])|YandexModule2-00001)(?:[);/ ]|$)'
31163+
regex: '(?:YNDX-?00(?:0SB|10[12]|055|07[1-6]|09[12])|YandexModule2-00001)(?:[);/ ]|$)'
3116031164
device: 'smartphone'
3116131165
models:
3116231166
- regex: 'YandexModule2-00001'
3116331167
device: 'tv'
3116431168
model: 'Module'
31165-
- regex: 'YNDX-?(0007[1235]|0009[12]|0010[12])'
31169+
- regex: 'YNDX-?(0007[1-6]|0009[12]|0010[12])'
3116631170
device: 'tv'
3116731171
model: 'YNDX-$1'
3116831172
- regex: 'YNDX-?000SB'
@@ -32892,7 +32896,7 @@ Winds:
3289232896

3289332897
# Asano
3289432898
Asano:
32895-
regex: '(?:32LH7010T|32LH8030S|43L[FU]8120T|43LU8030S|43LU8130S|32LH8[10]10T|32LH7030S|32LF7130S|28LH701[10]T|43LU8010T|24LH7011T|24L[HF]7020T|24LH8010T|40LF7030S|5[05]LU8120T|42LF7110T|32LF7120T|32LF8120T|50LU8110T|50LU8130S|40LF8120T|50LF7010T|43LF7010T|32LH8011T|32LF7111T)(?:[);/ ]|$)'
32899+
regex: '(?:32LH7010T|32LH8030S|43L[FU]8120T|43LU8030S|43LU8130S|32LH8[10]10T|32LH7030S|32LF7130S|28LH701[10]T|43LU8010T|24LH7011T|24L[HF]7020T|24LH8010T|28LH81[12]0T|40LF7030S|5[05]LU8120T|42LF7110T|32LF7120T|32LF8120T|50LU8110T|50LU8130S|40LF8120T|50LF7010T|43LF7010T|32LH8011T|32LF7111T)(?:[);/ ]|$)'
3289632900
device: 'tv'
3289732901
models:
3289832902
- regex: '(\d{2})(L[FHU]\d+[ST])(?:[);/ ]|$)'
@@ -41809,9 +41813,11 @@ VOLIA:
4180941813

4181041814
# Sagemcom (https://www.sagemcom.com/)
4181141815
Sagemcom:
41812-
regex: 'Sagemcom[;, \-_]|(DIW3930)(?:[);/ ]|$)'
41816+
regex: 'Sagemcom[;, \-_]|(DIW3930|DCTIW362_PLAY)(?:[);/ ]|$)'
4181341817
device: 'tv'
4181441818
models:
41819+
- regex: 'DCTIW362_PLAY'
41820+
model: 'DCTIW362 Play'
4181541821
- regex: '(DI384|DIW350|DIW387|DIW3930)(?:[);/ ]|$)'
4181641822
model: '$1'
4181741823
- regex: 'Sagemcom[;,] ([a-z0-9]+)(?:[);/ ]|$)'
@@ -41979,9 +41985,12 @@ S-Color:
4197941985

4198041986
# W&O
4198141987
W&O:
41982-
regex: '(?:X9 CALL2| WO [89])(?: Build|[);])'
41988+
regex: '(?:X9 CALL2| WO [89]|WO Pad Max)(?: Build|[);])'
4198341989
device: 'wearable'
4198441990
models:
41991+
- regex: 'WO Pad Max'
41992+
device: 'tablet'
41993+
model: 'WO Pad Max'
4198541994
- regex: 'WO ([89])'
4198641995
device: 'tablet'
4198741996
model: 'WO$1'
@@ -42070,7 +42079,7 @@ Lville:
4207042079

4207142080
# KENSHI
4207242081
KENSHI:
42073-
regex: '(?:Android 13(?:[\d.]*);(?: [\w-]+;)? (?:E1[1278]|E28|E38|H38|H21|H19|H11)|Armor_C1w|Armor P1s)(?:[);/ ]|$)'
42082+
regex: '(?:Android 13(?:[\d.]*);(?: [\w-]+;)? (?:E1[1278]|E28|E38|H38|H21|H19|H11)|Armor_C1w|Armor P1s|Kenshi[_ ]K10)(?:[);/ ]|$)'
4207442083
device: 'tablet'
4207542084
models:
4207642085
- regex: 'Armor_C1w'
@@ -42079,6 +42088,8 @@ KENSHI:
4207942088
- regex: 'Armor P1s'
4208042089
device: 'smartphone'
4208142090
model: 'Armor P1s'
42091+
- regex: 'Kenshi[_ ](K10)(?:[);/ ]|$)'
42092+
model: '$1'
4208242093
- regex: 'Android 13(?:[\d.]*);(?: [\w-]+;)? (E1[1278]|E28|E38|H38|H21|H19|H11)(?:[);/ ]|$)'
4208342094
model: '$1'
4208442095

@@ -42632,6 +42643,12 @@ AZOM:
4263242643
- regex: 'River 1'
4263342644
model: 'River 1'
4263442645

42646+
# DUDU AUTO (http://www.duduauto.top/)
42647+
DUDU AUTO:
42648+
regex: 'DUDU(\d)'
42649+
device: 'car browser'
42650+
model: 'DUDU$1'
42651+
4263542652
# Devices with undectable brand, but detectable model
4263642653
Unknown:
4263742654
regex: 'Plasma Mobile|WebTV/(\d+\.\d+)|TV Bro| BOX|BOX | BOX |roku|YouView|DirectFB|avdn/|wired|wireless|AndroidTV|cordova-amazon-fireos|wv-atv|SDSTB|SDOTT|(?:M10 Ultra|FO-R15|TVBOX|Smart[ _-]?TV|SmartATV|M8S\+ 4K|PCBox|rk(?:3128|322x|3368)(?:[_-]box)?|H10 PLAY|Smart AIO TV|TVBOX_L|L-BOX|TVBOX-5G|mips.+(?:Opera TV|wireless|wired)|smartbox|TV BOX|BOX TV|I12Pro Max|(?:audi_)?ks1280x480|AT&T TV|RealtekATV|AOSP on r33a0|tv001 on rtd289x|hx322x_box|X98_S500|8K3528-T|MX10|V88|H8S|X92|AI PONT|tv\.plus|WayDroid x86_64 Device|MediaBox|Cloud Phone|HK1RBOX-X4)(?:[);/ ]|$)'

0 commit comments

Comments
 (0)