Merge #23

Author: Simone Mariotti

src/Analyser/Header/Useragent/Browser.js

@@ -150,7 +150,13 @@ class Browser {
 
         /* Webview for Android 4.4 and higher */
 
-        if (version.split('.').slice(1, 3).join('.') === '0.0' && (/Version\//u.test(ua) || /Release\//u.test(ua))) {
+        if (
+          version
+            .split('.')
+            .slice(1, 3)
+            .join('.') === '0.0' &&
+          (/Version\//u.test(ua) || /Release\//u.test(ua))
+        ) {
           this.data.browser.using = new Using({
             name: 'Chromium WebView',
             version: new Version({value: version.split('.')[0]}),
@@ -248,7 +254,7 @@ class Browser {
 
         /* Oculus Chromium based browsers */
         if ((match = /OculusBrowser\/([0-9.]*)/u.exec(ua))) {
-          this.data.browser.name = 'Oculus Internet';
+          this.data.browser.name = 'Oculus Browser';
           this.data.browser.channel = null;
           this.data.browser.stock = true;
           this.data.browser.version = new Version({
@@ -261,6 +267,12 @@ class Browser {
             this.data.device.model = 'Gear VR';
             this.data.device.type = Constants.deviceType.HEADSET;
           }
+
+          if (/Pacific/.test(ua)) {
+            this.data.device.manufacturer = 'Oculus';
+            this.data.device.model = 'Go';
+            this.data.device.type = Constants.deviceType.HEADSET;
+          }
         }
       } else if (
         this.data.os.name &&

test/data/headset/device-gear.yaml

@@ -12,5 +12,5 @@
     result: { browser: { name: 'Samsung Internet', version: '4.0', type: browser }, engine: { name: Blink }, os: { name: Android, version: 6.0.1 }, device: { type: headset, manufacturer: Samsung, model: 'Gear VR' } }
 -
     headers: 'User-Agent: Mozilla/5.0 (Linux; Android 6.0.1; SM-G920F Build/MMB29K) AppleWebKit/537.36 (KHTML, like Gecko) OculusBrowser/3.1.0 SamsungBrowser/4.0 Chrome/57.0.2987.146 Mobile VR Safari/537.36'
-    readable: 'Oculus Internet 3.1 on a Samsung Gear VR running Android 6.0.1'
-    result: { browser: { name: 'Oculus Internet', version: '3.1', type: browser }, engine: { name: Blink }, os: { name: Android, version: 6.0.1 }, device: { type: headset, manufacturer: Samsung, model: 'Gear VR' } }
+    readable: 'Oculus Browser 3.1 on a Samsung Gear VR running Android 6.0.1'
+    result: { browser: { name: 'Oculus Browser', version: '3.1', type: browser }, engine: { name: Blink }, os: { name: Android, version: 6.0.1 }, device: { type: headset, manufacturer: Samsung, model: 'Gear VR' } }

test/data/headset/device-oculus.yaml

@@ -0,0 +1,4 @@
+-
+    headers: 'User-Agent: Mozilla/5.0 (Linux; Android 7.1.2; Pacific Build/N2G48H) AppleWebKit/537.36 (KHTML, like Gecko) OculusBrowser/4.6.0.114370170 SamsungBrowser/4.0 Chrome/61.0.3163.141 Mobile VR Safari/537.36'
+    readable: 'Oculus Browser 4.6 on an Oculus Go running Android 7.1.2'
+    result: { browser: { name: 'Oculus Browser', version: '4.6', type: browser }, engine: { name: Blink }, os: { name: Android, version: 7.1.2 }, device: { type: headset, manufacturer: Oculus, model: 'Go' } }