Fix #433 #434 Huawei devices

faisalman · Mar 14, 2021 · d1ea2f0 · d1ea2f0
1 parent 9da55e9
commit d1ea2f0
Show file tree

Hide file tree

Showing 2 changed files with 42 additions and 5 deletions.
diff --git a/src/ua-parser.js b/src/ua-parser.js
@@ -282,7 +282,7 @@
             /(comodo_dragon)\/([\w\.]+)/i                                       // Comodo Dragon
             ], [[NAME, /_/g, ' '], VERSION], [
 
-            /((?:windowswechat)? qbcore)\/([\w\.]+).*(?:windowswechat)?/i,      // WeChat Desktop for Windows Built-in Browser
+            /((?:windowswechat)? qbcore)\/([\w\.]+).*(?:windowswechat)?/i       // WeChat Desktop for Windows Built-in Browser
             ], [[NAME, 'WeChat(Win) Desktop'], VERSION], [
 
             /(micromessenger)\/([\w\.]+)/i                                      // WeChat
@@ -504,7 +504,8 @@
             ], [MODEL, [VENDOR, 'HTC'], [TYPE, TABLET]], [
 
             /d\/huawei([\w\s-]+)[;\)]/i,                                        // Huawei
-            /android.+\s(nexus\s6p|vog-[at]?l\d\d|ane-[at]?l[x\d]\d|eml-a?l\d\da?|lya-[at]?l\d[\dc]|clt-a?l\d\di?)/i
+            /android.+\s(nexus\s6p|vog-[at]?l\d\d|ane-[at]?l[x\d]\d|eml-a?l\d\da?|lya-[at]?l\d[\dc]|clt-a?l\d\di?)/i,
+            /android.+\s((?:A(?:GS2?|KA|LP|N[AE]|QM|RE|SK|TH)|B(?:A(?:C|H2)|G2|KL|LA|MH|Z[AKT])|C(?:AZ|DY|LT|OL|[MOR]R)|DUK|E(?:BG|DI|L[ES]|ML|V[AR])|FRD|G(?:LK|RA)|H(?:D[LN]|MA|LK|RY|WI)|INE|J(?:DN2|MM|NY|SN)|K(?:NT|OB|SA)|L(?:IO|LD|ON|[RY]A)|M(?:AR|ED|[HL]A|ON|RX|T7)|N(?:EO|TS|XT)|OXF|P(?:AR|CT|IC|LK|RA)|R(?:IO|VL)|S(?:C[ML]|EA|HT|PN|TF)|T(?:A[HS]|NY)|V(?:[CI]E|KY|OG|RD)|W(?:AS|LZ)|Y(?:635|AL))-[ATU][LN][01259][019])[;\)\s]/i
 
             ], [MODEL, [VENDOR, 'Huawei'], [TYPE, MOBILE]], [
 

diff --git a/test/device-test.json b/test/device-test.json
@@ -1391,11 +1391,47 @@
     }
   },
   {
-    "desc": "Huawei Mate 20 Pro",
-    "ua": "Mozilla/5.0 (Linux; Android 9; LYA-TL00) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/78.0.3904.90 Mobile Safari/537.36",
+    "desc": "Huawei P40",
+    "ua": "Mozilla/5.0 (Linux; Android 10; ANA-AN00 Build/HUAWEIANA-AN00; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/76.0.3809.89 Mobile Safari/537.36 T7/11.26 SP-engine/2.22.0 baiduboxapp/11.26.0.10 (Baidu; P1 10) NABar/1.0",
+    "expect": {
+        "vendor": "Huawei",
+        "model": "ANA-AN00",
+        "type": "mobile"
+    }
+  },
+  {
+    "desc": "Huawei P40 Pro",
+    "ua": "Mozilla/5.0 (Linux; Android 10; ELS-AN00 Build/HUAWEIELS-AN00; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/78.0.3904.108 Mobile Safari/537.36 mailapp/6.0.0",
+    "expect": {
+        "vendor": "Huawei",
+        "model": "ELS-AN00",
+        "type": "mobile"
+    }
+  },
+  {
+    "desc": "Huawei 30 Pro+",
+    "ua": "Mozilla/5.0 (Linux; Android 10; EBG-AN10 Build/HUAWEIEBG-AN10) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/69.0.3497.86 Mobile Safari/537.36 EdgA/42.0.0.2741",
+    "expect": {
+        "vendor": "Huawei",
+        "model": "EBG-AN10",
+        "type": "mobile"
+    }
+  },
+  {
+    "desc": "Huawei 30S",
+    "ua": "Mozilla/5.0 (Linux; Android 10; CDY-AN90 Build/HUAWEICDY-AN90; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/78.0.3904.108 Mobile Safari/537.36 mailapp/5.8.0",
+    "expect": {
+        "vendor": "Huawei",
+        "model": "CDY-AN90",
+        "type": "mobile"
+    }
+  },
+  {
+    "desc": "Huawei Enjoy10e",
+    "ua": "Dalvik/2.1.0 (Linux; U; Android 10; MED-AL00 Build/HUAWEIMED-AL00)",
     "expect": {
         "vendor": "Huawei",
-        "model": "LYA-TL00",
+        "model": "MED-AL00",
         "type": "mobile"
     }
   },