From 9bed2b143705d467398075304b4c8904be017817 Mon Sep 17 00:00:00 2001
From: Faisal Salman <f@faisalman.com>
Date: Mon, 12 Apr 2021 15:16:28 +0700
Subject: [PATCH] Add new device vendor: Roku

Source: https://github.com/WhichBrowser/Parser-PHP/blob/master/tests/data/television/roku.yaml
---
 readme.md             |  2 +-
 src/ua-parser.js      |  7 +++++--
 test/device-test.json | 27 +++++++++++++++++++++++++++
 3 files changed, 33 insertions(+), 3 deletions(-)

diff --git a/readme.md b/readme.md
index b03e7b8..bcd4d3b 100644
--- a/readme.md
+++ b/readme.md
@@ -64,7 +64,7 @@ console, mobile, tablet, smarttv, wearable, embedded
 Acer, Alcatel, Amazon, Apple, Archos, ASUS, AT&T, BenQ, BlackBerry, Dell,
 Essential, Fairphone, GeeksPhone, Google, HP, HTC, Huawei, Jolla, Lenovo, LG, 
 Meizu, Microsoft, Motorola, Nexian, Nintendo, Nokia, Nvidia, OnePlus, OPPO, Ouya,
-Palm, Panasonic, Pebble, Polytron, Realme, RIM, Samsung, Sharp, Siemens,
+Palm, Panasonic, Pebble, Polytron, Realme, RIM, Roku, Samsung, Sharp, Siemens,
 Sony[Ericsson], Sprint, Tesla, Vivo, Vodafone, Xbox, Xiaomi, Zebra, ZTE, ...
 
 # 'device.model' determined dynamically
diff --git a/src/ua-parser.js b/src/ua-parser.js
index 92c177b..72fdc1c 100755
--- a/src/ua-parser.js
+++ b/src/ua-parser.js
@@ -90,8 +90,10 @@
             return typeof(version) === STR_TYPE ? version.replace(/[^\d\.]/g, EMPTY).split('.')[0] : undefined;
         },
         trim = function (str, len) {
-            str = str.replace(/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g, EMPTY);
-            return typeof(len) === UNDEF_TYPE ? str : str.substring(0, UA_MAX_LENGTH);
+            if (typeof(str) === STR_TYPE) {
+                str = str.replace(/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g, EMPTY);
+                return typeof(len) === UNDEF_TYPE ? str : str.substring(0, UA_MAX_LENGTH);
+            }
     };
 
     ///////////////
@@ -623,6 +625,7 @@
             ], [MODEL, [VENDOR, AMAZON], [TYPE, SMARTTV]], [
             /\(dtv[\);].+(aquos)/i                                              // Sharp
             ], [MODEL, [VENDOR, 'Sharp'], [TYPE, SMARTTV]], [
+            /\b(roku)[\dx]*[\)\/]((?:dvp-)?[\d\.]*)/i,                          // Roku
             /hbbtv\/\d+\.\d+\.\d+\s+\([\w\s]*;\s*(\w[^;]*);([^;]*)/i            // HbbTV devices
             ], [[VENDOR, trim], [MODEL, trim], [TYPE, SMARTTV]], [
             /\b(android tv|smart[-\s]?tv|opera tv|tv; rv:)\b/i                  // SmartTV from Unidentified Vendors
diff --git a/test/device-test.json b/test/device-test.json
index eab9070..8d83c6d 100644
--- a/test/device-test.json
+++ b/test/device-test.json
@@ -846,6 +846,33 @@
             "type": "smarttv"
         }
     },
+    {
+        "desc": "Roku",
+        "ua": "Mozilla/5.0 (Roku) AppleWebKit/537.36 (KHTML, like Gecko) Web/1.1 Safari/537.36",
+        "expect": {
+            "vendor": "Roku",
+            "model": "",
+            "type": "smarttv"
+        }
+    },
+    {
+        "desc": "Roku",
+        "ua": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/70.0.3538.77 Safari/537.36 Roku/DVP-8.10 (468.10E04145A)",
+        "expect": {
+            "vendor": "Roku",
+            "model": "DVP-8.10",
+            "type": "smarttv"
+        }
+    },
+    {
+        "desc": "Roku",
+        "ua": "Roku4640X/DVP-7.70 (297.70E04154A)",
+        "expect": {
+            "vendor": "Roku",
+            "model": "DVP-7.70",
+            "type": "smarttv"
+        }
+    },
     {
         "desc": "Kindle Fire HD",
         "ua": "Mozilla/5.0 (Linux; U; Android 4.0.3; en-us; KFTT Build/IML74K) AppleWebKit/535.19 (KHTML, like Gecko) Silk/3.4 Mobile Safari/535.19 Silk-Accelerated=true",