feat(sync) Detect devices for exist brands (matomo-org#7939)

feat(device) detect brand Samsung: Galaxy W24 Fold (SM-W9024), Galaxy Xcover 6 Pro (SM-G736U), Galaxy S23 FE (SM-S711N), Galaxy Tab S9 11" WiFi (SM-X710), Galaxy Tab S10+ 12.4" WiFi (SM-X820), Galaxy Tab S10+ 12.4" 5G (SM-X826B)
feat(device) detect brand Xiaomi: Mi 8 SE, Mi 8 Youth, Mi 8 Pro, Mi 8
feat(device) detect brand Samsung: Galaxy Z Fold 6 (SM-F956N)
feat(device) detect brand CUBOT: Max 5
feat(device) detect brand iTel: P65 (P671L)
feat(device) detect brand Lenovo: Z6 Pro (L78051)
feat(device) detect brand Cat: S52
feat(device) detect brand Lava: Z3 (LZG403 25I)
feat(device) detect brand Huawei: Mate 10 (ALP-L09S)
feat(device) detect brand Teclast: P25T
feat(device) detect brand Vekta: LD-32SF4850BS
feat(device) detect brand TopDevice: TDTV24BS01H
feat(device) detect brand Tuvio: TD43FFBHV1, TD43UFBHV1, TD50UFBHV1, TD50UFGHV1, TD65UFBSV1
feat(device) detect brand Lenovo: Tab M10 HD (TB-X306X, TB-X306F)
feat(device) detect brand Starlight: Gionee Star
feat(device) detect brand Neffos: X20
feat(device) detect brand Minix: MNBP-300G
feat(device) detect brand Prestigio: PTV50SS08X
feat(device) detect brand HIPER: H24YQ2200GR
feat(device) detect brand Novex: NVX-75U131MSY, NVX-32H219MSY
feat(device) detect brand CENTEK: CT-8750
feat(device) detect brand Hiberg: QLED 65Y (HIBERGQLED65Y), 65Y UHD (HIBERG65YUHD)
feat(device) detect brand Huawei: P smart (FIG-L31), Y6 (2019), Y6 Prime (2018), Y6 Pro (2019)
feat(device) detect brand ZTE: Blade A7 (2020), Blade A5 (2020), Blade A5 (2019), Blade A3 (2020),  Blade A3 (2019),  Blade L8, Blade V10, Blade A3 Lite, Blade 20 Smart
feat(device) detect brand Lenovo: Z5s (L78071), Z5 (L78011), S5 Pro GT (L58091), K10 Plus (L39051), A7 (L19111), A6 Note (L19041)
feat(device) detect brand Huawei: Pura 70 (ADY-AL10)
feat(device) detect brand Motorola: Moto G100, Moto G Pure (XT2163-4), Moto G Fast (XT2045-3)
feat(device) detect brand Xiaomi: Mi Max 2 (MDE40)
feat(device) detect brand ZTE: ZMax 5G (Z7540)
feat(device) detect brand TCL: 403 (T431P)
feat(device) detect brand POCO: C51 (2302EPCC4H)
feat(device) detect brand Nubia: Focus 5G (NX302J)
---
feat(client) detect mobile apps: Klara, Edmodo (matomo-org#7940)
---
feat(sync) Adds detection for Meta Horizon (matomo-org#7928)
---
feat(sync) Improve Android regexes (matomo-org#7945)
* Improve Android regexes and add tests
---
feat(sync) Improves version detection for Android (matomo-org#7946)
---
feat(sync) Adds detection for Smart Tech brand and RTOS & Next os, and improves detection for Hisense, MediaTek, Next & NextStar (matomo-org#7941)
* Improves detection for Next & NextStar devices
* Adds detection for RTOS & Next
* Adds detection for Smart Tech brand
* Improves detection for Hisense devices
* Remove MediaTek since is not a brand
---
feat(sync) Adds detection for All Star, Astro (UA), astro (MY), FUJICOM, GN Electronics, TUCSON, UNITED brands and improves detection for various brands (matomo-org#7948)
* Adds detection for GN Electronics brand
* Improves detection for Graetz
* Adds detection for UNITED brand
* Adds detection for FUJICOM brand
* Adds detection for TUCSON brand
* Adds detection for astro brand
* Improves detection for LG devices
* Improves detection for AWOX devices
* Improves detection for Blaupunkt devices
* Improves detection for Botech devices
* Improves detection for BAUHN devices
* Adds detection for All Star brand
* Improves detection for AXEN devices
* Improves detection for GVC Pro devices
* Improves detection for PEAQ devices
* Improves detection for Hyundai devices
---
feat(sync) Detect new brands: MEGAMAX, PLDT and Detect devices for exist brands (matomo-org#7952)
feat(device) detect brand DNS: S3504 Meteor 3.5"
feat(device) detect brand QMobile: Y2 Tab
feat(device) detect new brand PLDT: TelPad MT7
feat(device) detect brand Vivo: X200 (V2415A)
feat(device) detect brand TCL: 10 5G UW
feat(device) detect new brand MEGAMAX: 42MG11FSM
feat(device) detect brand Oilsky: M303 Pro
feat(device) detect brand Meizu: X8
feat(device) detect brand Vivo: X200 Pro Mini (V2419A)
feat(device) detect brand Hotwav: Cyber 13
feat(device) detect brand OnePlus: 13 (PJZ110)
feat(device) detect brand CUBOT: King Kong Star 2
feat(device) detect brand Maunfeld: MLT55USD02G, MLT43FSX02
feat(device) detect brand Vityaz: 32LH1212
feat(device) detect brand DEXP: U55F8000QG
feat(device) detect brand Tuvio: TD55UFGHV1

Author: sanchezzzhak

client-hints.js

@@ -110,9 +110,13 @@ class ClientHints {
    */
   #parseHints(hints, result) {
     for (let key in hints) {
-      let value = hints[key];
+      const value = hints[key];
       const lowerCaseKey = key.toLowerCase().replace('_', '-');
 
+      if (void 0  === value || null === value || '' === value) {
+        continue;
+      }
+
       switch (lowerCaseKey) {
         case 'http-sec-ch-ua-arch':
         case 'sec-ch-ua-arch':

parser/device/brand-short.js

@@ -58,6 +58,7 @@ module.exports = {
   '6L': 'ALDI SÜD',
   '3L': 'Alfawise',
   '4A': 'Aligator',
+  'ALS': 'All Star',
   'AA': 'AllCall',
   '3A': 'AllDocube',
   'A2': 'Allview',
@@ -108,7 +109,8 @@ module.exports = {
   '59': 'ArtLine',
   '8A': 'Asano',
   '90': 'Asanzo',
-  '1U': 'Astro',
+  '1U': 'Astro (UA)',
+  'AST': 'astro (MY)',
   'A4': 'Ask',
   'A8': 'Assistant',
   'ASS': 'ASSE',
@@ -572,6 +574,7 @@ module.exports = {
   '1F': 'FMT',
   'FPT': 'FPT',
   'FG': 'Fuego',
+  'FUJ': 'FUJICOM',
   'FU': 'Fujitsu',
   '4F': 'Funai',
   '5J': 'Fusion5',
@@ -618,6 +621,7 @@ module.exports = {
   '38': 'GLONYX',
   'U6': 'Glofiish',
   'GLO': 'Glory Star',
+  'GNE': 'GN Electronics',
   'G7': 'GoGEN',
   'GC': 'GOCLEVER',
   '5G': 'Gocomma',
@@ -1027,12 +1031,12 @@ module.exports = {
   '0M': 'Mecool',
   'MEM': 'MeMobile',
   'MC': 'Mediacom',
-  'MK': 'MediaTek',
   'MD': 'Medion',
   'M2': 'MEEG',
   'MEG': 'MEGA VISION',
   'MCA': 'Megacable',
   'MP': 'MegaFon',
+  'MGX': 'MEGAMAX',
   'X0': 'mPhone',
   '3M': 'Meitu',
   'M1': 'Meizu',
@@ -1276,6 +1280,7 @@ module.exports = {
   'PND': 'Panodic',
   'PA1': 'Panoramic',
   'PLT': 'Platoon',
+  'PLD': 'PLDT',
   '94': 'Packard Bell',
   'H9': 'Parrot Mobile',
   'PAR': 'Partner Mobile',
@@ -1511,6 +1516,7 @@ module.exports = {
   '19': 'Smailo',
   'SR': 'Smart Electronic',
   'SMA': 'Smart Kassel',
+  'STE': 'Smart Tech',
   '49': 'Smart',
   '47': 'SmartBook',
   '3B': 'Smartab',
@@ -1706,6 +1712,7 @@ module.exports = {
   'UR': 'Turkcell',
   '4U': 'TuCEL',
   'TUV': 'Tuvio',
+  'TUC': 'TUCSON',
   '2U': 'Türk Telekom',
   'TV': 'TVC',
   'TW': 'TWM',
@@ -1732,6 +1739,7 @@ module.exports = {
   'UNI': 'Unistrong',
   'U2': 'UNIWA',
   'UND': 'Uniden',
+  'UNE': 'UNITED',
   'UGR': 'United Group',
   'UO': 'Unnecto',
   'UNN': 'Unnion Technologies',

parser/os-abstract-parser.js

@@ -277,6 +277,12 @@ class OsAbstractParser extends ParserAbstract {
         short = data.short_name;
       }
 
+      // Meta Horizon is reported as Linux in client hints
+      if ('GNU/Linux' === name && 'Meta Horizon' === data.name) {
+        name = data.name;
+        short = data.short_name;
+      }
+
     } else if (data) {
       name = data.name;
       version = data.version;

parser/os/os_families.js

@@ -3,7 +3,7 @@ module.exports = {
   'Android': [
   'AND', 'CYN', 'FIR', 'REM', 'RZD', 'MLD', 'MCD', 'YNS', 'GRI', 'HAR',
   'ADR', 'CLR', 'BOS', 'REV', 'LEN', 'SIR', 'RRS', 'WER', 'PIC', 'ARM',
-  'HEL', 'BYI', 'RIS', 'PUF', 'LEA',
+  'HEL', 'BYI', 'RIS', 'PUF', 'LEA', 'MET',
   ],
   'AmigaOS': ['AMG', 'MOR', 'ARO'],
   'BlackBerry': ['BLB', 'QNX'],
@@ -30,7 +30,7 @@ module.exports = {
   'Mac': ['MAC'],
   'Mobile Gaming Console': ['PSP', 'NDS', 'XBX'],
   'OpenVMS': ['OVS'],
-  'Real-time OS': ['MTK', 'TDX', 'MRE', 'JME', 'REX'],
+  'Real-time OS': ['MTK', 'TDX', 'MRE', 'JME', 'REX', 'RXT'],
   'Other Mobile': ['WOS', 'POS', 'SBA', 'TIZ', 'SMG', 'MAE', 'LUN', 'GEO'],
   'Symbian': ['SYM', 'SYS', 'SY3', 'S60', 'S40'],
   'Unix': [

parser/os/os_systems.js

@@ -87,6 +87,7 @@ module.exports = {
   'MAG': 'Mageia',
   'MDR': 'Mandriva',
   'SMG': 'MeeGo',
+  'MET': 'Meta Horizon',
   'MCD': 'MocorDroid',
   'MON': 'moonOS',
   'EZX': 'Motorola EZX',
@@ -136,6 +137,7 @@ module.exports = {
   'RRS': 'Resurrection Remix OS',
   'REX': 'REX',
   'RZD': 'RazoDroiD',
+  'RXT': 'RTOS & Next',
   'SAB': 'Sabayon',
   'SSE': 'SUSE',
   'SAF': 'Sailfish OS',

regexes/client/mobile_apps.yml

@@ -2620,6 +2620,14 @@
   name: 'TownNews Now'
   version: '$1'
 
+- regex: '^Klara/'
+  name: 'Klara'
+  version: ''
+
+- regex: 'EdmodoAndroid/([\d.]+)'
+  name: 'Edmodo'
+  version: '$1'
+
 # Electron generic apps
 - regex: ' (?!(?:AppleWebKit|brave|Cypress|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'

regexes/device/mobiles.yml

@@ -125,9 +125,13 @@ Surfans:
 
 # Oilsky (oilsky.com.cn)
 Oilsky:
-  regex: 'Oilsky (M501)(?:[);/ ]|$)'
+  regex: 'Oilsky (M501|M303)(?:-Pro)?(?:[);/ ]|$)'
   device: 'portable media player'
-  model: '$1'
+  models:
+    - regex: 'M303-Pro'
+      model: 'M303 Pro'
+    - regex: '(M501|M303)'
+      model: '$1'
 
 Diofox:
   regex: 'Diofox[ _](M8)(?:[);/ ]|$)'

regexes/device/portable_media_player.yml

@@ -278,12 +278,36 @@ Fuego:
     - regex: '_TV_[A-Z0-9]+_([0-9]{4});'
       model: 'Smart TV ($1)'
 
+# FUJICOM (https://fujicom.com/)
+FUJICOM:
+  regex: 'FUJICOM[;,]'
+  device: 'tv'
+  models:
+    - regex: '_TV_[A-Z0-9]+_([0-9]{4});'
+      model: 'Smart TV ($1)'
+
+# GN Electronics (https://www.gnelectronics.in/)
+GN Electronics:
+  regex: 'GN_ELECTRONICS[;,]'
+  device: 'tv'
+  models:
+    - regex: '_TV_[A-Z0-9]+_([0-9]{4});'
+      model: 'Smart TV ($1)'
+
 # GoGEN (https://www.gogen.cz/)
 GoGEN:
   regex: 'GOGEN[;,]'
   device: 'tv'
   model: ''
 
+# Graetz (https://www.graetzitalia.it/)
+Graetz:
+  regex: 'GRAETZ[;,]'
+  device: 'tv'
+  models:
+    - regex: '_TV_[A-Z0-9]+_([0-9]{4});'
+      model: 'Smart TV ($1)'
+
 # Grundig
 Grundig:
   regex: '(OWB|(?:Amazon.+)?Grundig)'
@@ -656,14 +680,6 @@ Manhattan:
     - regex: 'T3'
       model: 'T3'
 
-# MediaTek
-MediaTek:
-  regex: 'MTK|MediaTek;'
-  device: 'tv'
-  models:
-    - regex: '(MT[0-9]{4})'
-      model: '$1'
-
 # Medion
 Medion:
   regex: 'Medion'
@@ -1090,6 +1106,14 @@ TOKYO:
     - regex: 'TOKTCLED32S'
       model: 'TOKTCLED32S'
 
+# TUCSON
+TUCSON:
+  regex: 'TUCSON[;,]'
+  device: 'tv'
+  models:
+    - regex: '_TV_[A-Z0-9]+_([0-9]{4});'
+      model: 'Smart TV ($1)'
+
 # Turbo-X
 Turbo-X:
   regex: 'TURBO-X[;,]'
@@ -1118,6 +1142,14 @@ Tsinghua Tongfang:
     - regex: 'LE40GY15'
       model: 'LE40GY15'
 
+# UNITED (http://www.united-tv.eu/en/)
+UNITED:
+  regex: 'UNITED[;,]'
+  device: 'tv'
+  models:
+    - regex: '_TV_[A-Z0-9]+_([0-9]{4});'
+      model: 'Smart TV ($1)'
+
 # VANGUARD
 VANGUARD:
   regex: 'VANGUARD[;,]'
@@ -1220,8 +1252,9 @@ Xiaomi:
 
 # Unknown
 Unknown:
-  regex: 'OEM, ([a-z0-9_ -]+), (?:wired|wireless)|_TV_[A-Z0-9]+_([0-9]{4});'
-  device: 'tv'
+  regex: 'OEM, ([a-z0-9_ -]+), (?:wired|wireless)|_TV_[A-Z0-9]+_([0-9]{4});|LaTivu_(?:\d+[.\d]+)_([0-9]{4})'
   models:
     - regex: '_TV_[A-Z0-9]+_([0-9]{4});'
       model: 'Smart TV ($1)'
+    - regex: 'LaTivu_(?:\d+[.\d]+)_([0-9]{4})'
+      model: 'Smart TV ($1)'

regexes/device/televisions.yml

@@ -5,6 +5,20 @@
 # @license http://www.gnu.org/licenses/lgpl.html LGPL v3 or later
 ###############
 
+##########
+# RTOS & Next
+##########
+- regex: '^NEXT '
+  name: 'RTOS & Next'
+  version: ''
+
+##########
+# Meta Horizon (https://developers.meta.com/horizon)
+##########
+- regex: '(?:Pacific|(?<!like )Quest).+OculusBrowser|Standalone HMD|PortalGo'
+  name: 'Meta Horizon'
+  version: ''
+
 ##########
 # LeafOS (https://www.leafos.org/)
 ##########
@@ -733,52 +747,48 @@
 - regex: '(?:Android API \d+|\d+/tclwebkit(?:\d+[.\d]*)|(?:(?<!\d )Android/\d{2}|(?<!; |\d{4}/)Android (?!1[0-5])\d{2})(?![^ ]))'
   name: 'Android'
   versions:
-    - regex: '(?:Android API 35|35/tclwebkit|Android[ /]35)'
+    - regex: 'Android API 35|35/tclwebkit|Android[ /]35'
       version: '15'
-    - regex: '(?:Android API 34|34/tclwebkit|Android[ /]34)'
+    - regex: 'Android API 34|34/tclwebkit|Android[ /]34'
       version: '14'
-    - regex: '(?:Android API 33|33/tclwebkit|Android[ /]33)'
+    - regex: 'Android API 33|33/tclwebkit|Android[ /]33'
       version: '13'
-    - regex: '(?:Android API 32|32/tclwebkit|Android[ /]32)'
+    - regex: 'Android API 32|32/tclwebkit|Android[ /]32'
       version: '12.1'
-    - regex: '(?:Android API 31|31/tclwebkit|Android[ /]31)'
+    - regex: 'Android API 31|31/tclwebkit|Android[ /]31'
       version: '12'
-    - regex: '(?:Android API 30|30/tclwebkit|Android[ /]30)'
+    - regex: 'Android API 30|30/tclwebkit|Android[ /]30'
       version: '11'
-    - regex: '(?:Android API 29|29/tclwebkit|Android[ /]29)'
+    - regex: 'Android API 29|29/tclwebkit|Android[ /]29'
       version: '10'
-    - regex: '(?:Android API 28|28/tclwebkit|Android[ /]28)'
+    - regex: 'Android API 28|28/tclwebkit|Android[ /]28'
       version: '9'
-    - regex: '(?:Android API 27|27/tclwebkit|Android[ /]27)'
+    - regex: 'Android API 27|27/tclwebkit|Android[ /]27'
       version: '8.1'
-    - regex: '(?:Android API 26|26/tclwebkit|Android[ /]26)'
+    - regex: 'Android API 26|26/tclwebkit|Android[ /]26'
       version: '8'
-    - regex: '(?:Android API 25|25/tclwebkit|Android[ /]25)'
+    - regex: 'Android API 25|25/tclwebkit|Android[ /]25'
       version: '7.1'
-    - regex: '(?:Android API 24|24/tclwebkit|Android[ /]24)'
+    - regex: 'Android API 24|24/tclwebkit|Android[ /]24'
       version: '7'
-    - regex: '(?:Android API 23|23/tclwebkit|Android[ /]23)'
+    - regex: 'Android API 23|23/tclwebkit|Android[ /]23'
       version: '6'
-    - regex: '(?:Android API 22|22/tclwebkit|Android[ /]22)'
+    - regex: 'Android API 22|22/tclwebkit|Android[ /]22'
       version: '5.1'
-    - regex: '(?:21/tclwebkit|Android[ /]21)'
+    - regex: 'Android API 21|21/tclwebkit|Android[ /]21'
       version: '5'
-    - regex: '(?:20|19)/tclwebkit'
-      version: '4.4'
-    - regex: 'Android[ /](?:20|19)'
+    - regex: 'Android API (?:20|19)|(?:20|19)/tclwebkit|Android[ /](?:20|19)'
       version: '4.4'
-    - regex: '(?:18/tclwebkit|Android[ /]18)'
+    - regex: 'Android API 18|18/tclwebkit|Android[ /]18'
       version: '4.3'
-    - regex: '(?:17/tclwebkit|Android[ /]17)'
+    - regex: 'Android API 17|17/tclwebkit|Android[ /]17'
       version: '4.2'
-    - regex: '(?:16/tclwebkit|Android[ /]16)'
-      version: '4.2'
-    - regex: '15/tclwebkit'
+    - regex: 'Android API 16|16/tclwebkit|Android[ /]16'
+      version: '4.1'
+    - regex: 'Android API 15|15/tclwebkit|Android[ /]15'
       version: '4.0.3'
-    - regex: '15/tclwebkit'
+    - regex: 'Android API 14|14/tclwebkit|Android[ /]14'
       version: '4.0.1'
-    - regex: 'Android[ /]15'
-      version: '4'
 
 ##########
 # Android
@@ -835,7 +845,7 @@
   name: 'Android'
   version: ''
 
-- regex: 'BeyondPod|AntennaPod|Podkicker|DoggCatcher|okhttp|Podcatcher Deluxe|Sonos/.+\(ACR_|Linux x86_64; Quest|.*WhatsApp/.*A$'
+- regex: 'BeyondPod|AntennaPod|Podkicker|DoggCatcher|okhttp|Podcatcher Deluxe|Sonos/.+\(ACR_|.*WhatsApp/.*A$'
   name: 'Android'
   version: ''
 

regexes/oss.yml

@@ -2303,3 +2303,15 @@
     type: mobile app
     name: TownNews Now
     version: "4.0"
+-
+  user_agent: Klara/1 CFNetwork/1128.0.1 Darwin/19.6.0
+  client:
+    type: mobile app
+    name: Klara
+    version: ""
+-
+  user_agent: Dalvik/2.1.0 (Linux; U; Android 11; SM-A725M Build/RP1A.200720.012) EdmodoAndroid/10.43.5(69a222)
+  client:
+    type: mobile app
+    name: Edmodo
+    version: 10.43.5