Pr device info56 (#94)

* Adds detection for various devices and improves os detection (matomo-org#7179) * Adds detection for Digit4G brand and devices * Adds detection for JPay brand and devices * Adds detection for Teracube and devices * Adds detection for Völfen brand and device * Adds detection for eNOVA brand and device * Adds detection for TOSCIDO W109 * Adds detection for MobiIoT MobiGo 2 * Adds detection for T96 brand and device * Adds detection for Zealot brand and device * Adds detection for X88 brand and device * Adds detection for neoCore brand and device * Improves detection for Android TV and Changhong devices * Adds detection for Ricoh brand and device * Add website for iWaylink * Adds detection for Benesse TAB-A03-BR2 * Adds detection for DIXON TS-M103A * Adds detection for X96 brand and device * Adds detection for Sirin Labs Solarin and Sirin OS * Adds detection for Siragon SP-6150 * Adds detection for Novey brand and device * Adds detection for Unnion Technologies brand and device * Adds detection for Partner Mobile brand and device * Adds detection for Siragon SP-5300 * Adds detection for neoCore E1+ * Adds detection for Kodak Smartway T2 * Improves detection for H96 Max RK3318 * Adds detection for Maxwest Gravity 6P * Adds detection for Cellacom brand and device * Improves detection for TOSCIDO W109 * chore: update device and client indexes
sanchezzzhak · Jul 17, 2022 · 766c197 · 766c197
1 parent 342ad4e
commit 766c197
Show file tree

Hide file tree

Showing 15 changed files with 834 additions and 27 deletions.
diff --git a/parser/device-abstract-parser.js b/parser/device-abstract-parser.js
@@ -7,7 +7,7 @@ const COLLECTION_BRAND_LIST = helper.revertObject(
 );
 
 const DESKTOP_PATTERN = '(?:Windows (?:NT|IoT)|X11; Linux x86_64)';
-const DESKTOP_EXCLUDE_PATTERN = '^.+Mozilla/|Lenovo|compatible; MSIE|like iPhone|Windows Phone|Trident/|Tesla/|XBOX|Tablet PC|FBMD/|ARM; ?([^)]+)';
+const DESKTOP_EXCLUDE_PATTERN = ' Mozilla/|Andr[o0]id|Tablet|Mobile|iPhone|Windows Phone|ricoh|Lenovo|compatible; MSIE|Trident/|Tesla/|XBOX|FBMD/|ARM; ?([^)]+)';
 
 class DeviceParserAbstract extends ParserAbstract {
   constructor() {

diff --git a/parser/device/brand-short.js b/parser/device/brand-short.js
@@ -177,6 +177,7 @@ module.exports = {
   'CJ': 'Cavion',
   '4D': 'Canal Digital',
   '02': 'Cell-C',
+  'CEL': 'Cellacom',
   '34': 'CellAllure',
   '7C': 'Celcus',
   'CE': 'Celkon',
@@ -253,6 +254,7 @@ module.exports = {
   'D3': 'Digicel',
   'DH': 'Digihome',
   'DD': 'Digiland',
+  'DIG': 'Digit4G',
   'DIC': 'DIGICOM',
   'Q0': 'DIGIFORS',
   'DQ': 'DISH',
@@ -280,6 +282,7 @@ module.exports = {
   'DRE': 'DreamTab',
   'DU': 'Dune HD',
   'UD': 'DUNNS Mobile',
+  'ENO': 'eNOVA',
   'EB': 'E-Boda',
   'EJ': 'Engel',
   'ENA': 'ENACOM',
@@ -564,6 +567,7 @@ module.exports = {
   'UJ': 'Juniper Systems',
   'J5': 'Just5',
   '7J': 'Jumper',
+  'JPA': 'JPay',
   'JV': 'JVC',
   'JXD': 'JXD',
   'JS': 'Jesy',
@@ -751,6 +755,7 @@ module.exports = {
   'MG': 'MyWigo',
   'J3': 'Mymaga',
   '07': 'MyGica',
+  'NEO': 'neoCore',
   '08': 'Nabi',
   'N7': 'National',
   'NC': 'Navcity',
@@ -789,6 +794,7 @@ module.exports = {
   'N5': 'NOA',
   'N1': 'Noain',
   'N6': 'Nobby',
+  'NOV': 'Novey',
   '57': 'Nubia',
   'JN': 'NOBUX',
   'NB': 'Noblex',
@@ -857,6 +863,7 @@ module.exports = {
   'PT': 'Pantech',
   '94': 'Packard Bell',
   'H9': 'Parrot Mobile',
+  'PAR': 'Partner Mobile',
   'PAP': 'PAPYRE',
   'PB': 'PCBOX',
   'PC': 'PCD',
@@ -947,6 +954,7 @@ module.exports = {
   'RH': 'Remdun',
   'RP': 'Revo',
   '8R': 'Retroid Pocket',
+  'RIC': 'Ricoh',
   'RI': 'Rikomagic',
   'RM': 'RIM',
   'RN': 'Rinno',
@@ -1017,7 +1025,7 @@ module.exports = {
   '98': 'Simply',
   '52': 'Singtech',
   '31': 'Siragon',
-  '83': 'Sirin labs',
+  '83': 'Sirin Labs',
   '5Z': 'SK Broadband',
   'GK': 'SKG',
   'SW': 'Sky',
@@ -1086,6 +1094,7 @@ module.exports = {
   'SM': 'Symphony',
   '4S': 'Syrox',
   'TM': 'T-Mobile',
+  'T96': 'T96',
   'TK': 'Takara',
   '73': 'Tambo',
   '9N': 'Tanix',
@@ -1113,6 +1122,7 @@ module.exports = {
   'TE': 'Telit',
   '65': 'Telia',
   'PW': 'Telpo',
+  'TER': 'Teracube',
   'TD': 'Tesco',
   'TA': 'Tesla',
   '9T': 'Tetratab',
@@ -1180,6 +1190,7 @@ module.exports = {
   'US': 'Uniscope',
   'U2': 'UNIWA',
   'UO': 'Unnecto',
+  'UNN': 'Unnion Technologies',
   'UU': 'Unonu',
   'UN': 'Unowhy',
   'UY': 'UNNO',
@@ -1244,6 +1255,7 @@ module.exports = {
   'Z7': 'VOX',
   'VO': 'Voxtel',
   'VY': 'Voyo',
+  'VOL': 'Völfen',
   'VH': 'Vsmart',
   'V9': 'Vsun',
   'VU': 'Vulcan',
@@ -1281,6 +1293,8 @@ module.exports = {
   'XT': 'X-TIGI',
   'XV': 'X-View',
   'X4': 'X.Vision',
+  'X88': 'X88',
+  'X96': 'X96',
   'XG': 'Xgody',
   'QX': 'XGIMI',
   'XL': 'Xiaolajiao',
@@ -1312,6 +1326,7 @@ module.exports = {
   'YX': 'Yxtel',
   '0Z': 'Zatec',
   '2Z': 'Zaith',
+  'ZEA': 'Zealot',
   'PZ': 'Zebra',
   'ZE': 'Zeemi',
   'WZ': 'Zeeker',

diff --git a/parser/os/os_families.js b/parser/os/os_families.js
@@ -2,7 +2,7 @@
 module.exports = {
   'Android': [
     'AND', 'CYN', 'FIR', 'REM', 'RZD', 'MLD', 'MCD', 'YNS', 'GRI', 'HAR',
-    'ADR', 'CLR', 'BOS', 'REV', 'LEN',
+    'ADR', 'CLR', 'BOS', 'REV', 'LEN', 'SIR',
   ],
   'AmigaOS': ['AMG', 'MOR'],
   'BlackBerry': ['BLB', 'QNX'],

diff --git a/parser/os/os_systems.js b/parser/os/os_systems.js
@@ -98,6 +98,7 @@ module.exports = {
   'SSE': 'SUSE',
   'SAF': 'Sailfish OS',
   'SEE': 'SeewoOS',
+  'SIR': 'Sirin OS',
   'SLW': 'Slackware',
   'SOS': 'Solaris',
   'SYL': 'Syllable',

diff --git a/regexes/bots.yml b/regexes/bots.yml
@@ -1958,7 +1958,7 @@
 - regex: 'RSSRadio \(Push Notification Scanner;support@dorada\.co\.uk\)'
   name: 'RSSRadio Bot'
 
-- regex: '(A6-Indexer|nuhk|TsolCrawler|Yammybot|Openbot|Gulper Web Bot|grub-client|Download Demon|SearchExpress|Microsoft URL Control|borg|altavista|dataminr.com|tweetedtimes.com|TrendsmapResolver|teoma|blitzbot|oegp|furlbot|http%20client|polybot|htdig|mogimogi|larbin|scrubby|searchsight|seekbot|semanticdiscovery|snappy|vortex(?!(?: Build|Plus))|zeal|fast-webcrawler|converacrawler|dataparksearch|findlinks|BrowserMob|HttpMonitor|ThumbShotsBot|URL2PNG|ZooShot|GomezA|Google SketchUp|Read%20Later|RackspaceBot|robots|SeopultContentAnalyzer|7Siters|centuryb.o.t9|InterNaetBoten|EasyBib AutoCite|Bidtellect|tomnomnom/meg|My User Agent|cortex|CF-UC User Agent|Re-re Studio|adreview|AHC/|NameOfAgent|Request-Promise|ALittle Client|Hello, world|wp_is_mobile|0xAbyssalDoesntExist|Anarchy99)'
+- regex: '(A6-Indexer|nuhk|TsolCrawler|Yammybot|Openbot|Gulper Web Bot|grub-client|Download Demon|SearchExpress|Microsoft URL Control|borg|altavista|dataminr.com|tweetedtimes.com|TrendsmapResolver|teoma|blitzbot|oegp|furlbot|http%20client|polybot|htdig|mogimogi|larbin|scrubby|searchsight|seekbot|semanticdiscovery|snappy|vortex(?!(?: Build|Plus))|zeal(?!ot)|fast-webcrawler|converacrawler|dataparksearch|findlinks|BrowserMob|HttpMonitor|ThumbShotsBot|URL2PNG|ZooShot|GomezA|Google SketchUp|Read%20Later|RackspaceBot|robots|SeopultContentAnalyzer|7Siters|centuryb.o.t9|InterNaetBoten|EasyBib AutoCite|Bidtellect|tomnomnom/meg|My User Agent|cortex|CF-UC User Agent|Re-re Studio|adreview|AHC/|NameOfAgent|Request-Promise|ALittle Client|Hello, world|wp_is_mobile|0xAbyssalDoesntExist|Anarchy99)'
   name: 'Generic Bot'
 
 - regex: '^sentry'

diff --git a/regexes/client-index-hash.yml b/regexes/client-index-hash.yml
@@ -6234,6 +6234,9 @@ fd0d12b:
 73ef3023:
   - - 83
   - []
+12c462b0:
+  - - 360
+  - []
 17bed5e:
   - - 230
   - []

diff --git a/regexes/device-index-hash.yml b/regexes/device-index-hash.yml
@@ -656,6 +656,8 @@ teachtouch table:
   - TeachTouch
 desk21t-03:
   - actiMirror
+mobigo2:
+  - MobiIoT
 gi-626:
   - altron
 5039d_ru:
@@ -31762,6 +31764,32 @@ stg_p10:
   - STG Telecom
 heyou70:
   - Essentielb
+digit4g energy:
+  - Digit4G
+digit4g-pro:
+  - Digit4G
+teracube 2e:
+  - Teracube
+teracube one:
+  - Teracube
+solarin:
+  - Sirin Labs
+sp-6150:
+  - Siragon
+novey l2:
+  - Novey
+unsp7:
+  - Unnion Technologies
+ev1 pro:
+  - Partner Mobile
+sp-5300:
+  - Siragon
+kodak_smartway_t2:
+  - Kodak
+gravity_6p:
+  - Maxwest
+cellacom_s62:
+  - Cellacom
 trooper_x40:
   - Kazam
 kazam trooper x45:
@@ -32722,7 +32750,7 @@ hardcaseh550s:
 cubot j3 pro:
   - CUBOT
 finney u1:
-  - Sirin labs
+  - Sirin Labs
 gaamii g1:
   - Santin
 santin gaamii:
@@ -41582,6 +41610,26 @@ elite_octaxs:
   - Sky
 elite_octaplus:
   - Sky
+nexo-tab-7:
+  - Völfen
+enova tab 10 lte:
+  - eNOVA
+w-109:
+  - TOSCIDO
+neocore_n1g1:
+  - neoCore
+tab-a03-br2:
+  - Benesse
+ts_m103a:
+  - DIXON
+neocore e1-2:
+  - neoCore
+jp5 inmate media device:
+  - JPay
+jp5s inmate media device:
+  - JPay
+w109:
+  - TOSCIDO
 tq700:
   - GOCLEVER
 tpc-xte8:
@@ -43185,6 +43233,16 @@ neo-x8-plus:
   - Minix
 ttk box 214:
   - TTK-TV
+t96mini:
+  - T96
+zealot:
+  - Zealot
+x88pro10.r1.00.6330.d4:
+  - X88
+x96air_a100:
+  - X96
+h96max rk3318:
+  - H96
 bb2 pro:
   - Mecool
 kii pro: