From ba067bd351040a57957a4f0965816897e0e3ddef Mon Sep 17 00:00:00 2001
From: Faisal Salman <f@faisalman.com>
Date: Sat, 18 Mar 2023 18:50:42 +0700
Subject: [PATCH] Backport - Fix #624 - Detect Amazon Echo

(cherry picked from commit df1a1c7bb4f6f8742db4a8185622411e6cd13ad4)
---
 src/ua-parser.js      |  4 +++-
 test/device-test.json | 27 +++++++++++++++++++++++++++
 2 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/src/ua-parser.js b/src/ua-parser.js
index 7c007d04..6ca1d13f 100755
--- a/src/ua-parser.js
+++ b/src/ua-parser.js
@@ -480,7 +480,7 @@
 
             // Amazon
             /(alexa)webm/i,
-            /(kf[a-z]{2}wi)( bui|\))/i,                                         // Kindle Fire without Silk
+            /(kf[a-z]{2}wi|aeo[c-r]{2})( 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
@@ -665,6 +665,8 @@
 
             /(tesla)(?: qtcarbrowser|\/[-\w\.]+)/i                              // Tesla
             ], [VENDOR, [TYPE, EMBEDDED]], [
+            /(aeobc)\b/i                                                        // Echo Dot
+            ], [MODEL, [VENDOR, AMAZON], [TYPE, EMBEDDED]], [
 
             ////////////////////
             // MIXED (GENERIC)
diff --git a/test/device-test.json b/test/device-test.json
index c40361f1..d23aba1e 100644
--- a/test/device-test.json
+++ b/test/device-test.json
@@ -1638,6 +1638,33 @@
             "type": "tablet"
         }
     },
+    {
+        "desc": "Echo Show 5",
+        "ua": "Mozilla/5.0 (Linux; Android 5.1; AEORK Build/LVY48F; xx-xx) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/70.0.3538.110 Mobile Safari/537.36",
+        "expect": {
+            "vendor": "Amazon",
+            "model": "AEORK",
+            "type": "tablet"
+        }
+    },
+    {
+        "desc": "Echo Show 8",
+        "ua": "Mozilla/5.0 (Linux; Android 7.1; AEOCH) AppleWebKit/537.36 (KHTML, like Gecko) Silk/77.2.21 like Chrome/77.0.3865.92 Mobile Safari/537.36",
+        "expect": {
+            "vendor": "Amazon",
+            "model": "AEOCH",
+            "type": "tablet"
+        }
+    },
+    {
+        "desc": "Echo Dot",
+        "ua": "Dalvik/2.1.0 (Linux; U; Android 5.1.1; AEOBC Build/LVY48F)",
+        "expect": {
+            "vendor": "Amazon",
+            "model": "AEOBC",
+            "type": "embedded"
+        }
+    },
     {
         "desc": "Samsung Galaxy A21s",
         "ua": "Mozilla/5.0 (Linux; Android 10; SAMSUNG SM-A217F) AppleWebKit/537.36 (KHTML, like Gecko) SamsungBrowser/11.0 Chrome/75.0.3770.143 Mobile Safari/537.36",