From 33eb27d205f8e3ca54935dc3d87e620d09831394 Mon Sep 17 00:00:00 2001
From: Faisal Salman <f@faisalman.com>
Date: Tue, 10 Sep 2024 20:31:14 +0700
Subject: [PATCH] Backport - Improve detection: Amazon Echo Show devices

(cherry picked from commit b8d823dd574411906028c4ae3e4bd1bcc5ee936c)
---
 src/ua-parser.js      |  2 +-
 test/device-test.json | 18 ++++++++++++++++++
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/src/ua-parser.js b/src/ua-parser.js
index 3741150..5323b4a 100755
--- a/src/ua-parser.js
+++ b/src/ua-parser.js
@@ -506,7 +506,7 @@
 
             // Amazon
             /(alexa)webm/i,
-            /(kf[a-z]{2}wi|aeo[c-r]{2})( bui|\))/i,                             // Kindle Fire without Silk / Echo Show
+            /(kf[a-z]{2}wi|aeo(?!bc)\w\w)( bui|\))/i,                           // Kindle Fire without Silk / Echo Show
             /(kf[a-z]+)( bui|\)).+silk\//i                                      // Kindle Fire HD
             ], [MODEL, [VENDOR, AMAZON], [TYPE, TABLET]], [
             /((?:sd|kf)[0349hijorstuw]+)( bui|\)).+silk\//i                     // Fire Phone
diff --git a/test/device-test.json b/test/device-test.json
index 7bebc8d..df9a1c6 100644
--- a/test/device-test.json
+++ b/test/device-test.json
@@ -1871,6 +1871,24 @@
             "type": "tablet"
         }
     },
+    {
+        "desc": "Echo Show 8",
+        "ua": "Mozilla/5.0 (Linux; Android 7.1.2; AEOCW) AppleWebKit/537.36 (KHTML, like Gecko) Silk/106.3.3 like Chrome/106.0.5249.170 Safari/537.36",
+        "expect": {
+            "vendor": "Amazon",
+            "model": "AEOCW",
+            "type": "tablet"
+        }
+    },
+    {
+        "desc": "Echo Show 15",
+        "ua": "Mozilla/5.0 (Linux; Android 9; AEOHY) AppleWebKit/537.36 (KHTML, like Gecko) Silk/112.6.3 like Chrome/112.0.5615.213 Safari/537.36",
+        "expect": {
+            "vendor": "Amazon",
+            "model": "AEOHY",
+            "type": "tablet"
+        }
+    },
     {
         "desc": "Echo Dot",
         "ua": "Dalvik/2.1.0 (Linux; U; Android 5.1.1; AEOBC Build/LVY48F)",