Skip to content

Commit ba067bd

Browse files
committed
Backport - Fix #624 - Detect Amazon Echo
(cherry picked from commit df1a1c7)
1 parent 3218051 commit ba067bd

File tree

2 files changed

+30
-1
lines changed

2 files changed

+30
-1
lines changed

src/ua-parser.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -480,7 +480,7 @@
480480

481481
// Amazon
482482
/(alexa)webm/i,
483-
/(kf[a-z]{2}wi)( bui|\))/i, // Kindle Fire without Silk
483+
/(kf[a-z]{2}wi|aeo[c-r]{2})( bui|\))/i, // Kindle Fire without Silk / Echo Show
484484
/(kf[a-z]+)( bui|\)).+silk\//i // Kindle Fire HD
485485
], [MODEL, [VENDOR, AMAZON], [TYPE, TABLET]], [
486486
/((?:sd|kf)[0349hijorstuw]+)( bui|\)).+silk\//i // Fire Phone
@@ -665,6 +665,8 @@
665665

666666
/(tesla)(?: qtcarbrowser|\/[-\w\.]+)/i // Tesla
667667
], [VENDOR, [TYPE, EMBEDDED]], [
668+
/(aeobc)\b/i // Echo Dot
669+
], [MODEL, [VENDOR, AMAZON], [TYPE, EMBEDDED]], [
668670

669671
////////////////////
670672
// MIXED (GENERIC)

test/device-test.json

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1638,6 +1638,33 @@
16381638
"type": "tablet"
16391639
}
16401640
},
1641+
{
1642+
"desc": "Echo Show 5",
1643+
"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",
1644+
"expect": {
1645+
"vendor": "Amazon",
1646+
"model": "AEORK",
1647+
"type": "tablet"
1648+
}
1649+
},
1650+
{
1651+
"desc": "Echo Show 8",
1652+
"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",
1653+
"expect": {
1654+
"vendor": "Amazon",
1655+
"model": "AEOCH",
1656+
"type": "tablet"
1657+
}
1658+
},
1659+
{
1660+
"desc": "Echo Dot",
1661+
"ua": "Dalvik/2.1.0 (Linux; U; Android 5.1.1; AEOBC Build/LVY48F)",
1662+
"expect": {
1663+
"vendor": "Amazon",
1664+
"model": "AEOBC",
1665+
"type": "embedded"
1666+
}
1667+
},
16411668
{
16421669
"desc": "Samsung Galaxy A21s",
16431670
"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",

0 commit comments

Comments
 (0)