Merge branch 'master' into feat/quark-detect

faisalman · Jul 31, 2024 · 1daa8f5 · 1daa8f5
2 parents c160b3e + 62fb6c2
commit 1daa8f5
Show file tree

Hide file tree

Showing 5 changed files with 54 additions and 3 deletions.
diff --git a/src/enums/ua-parser-enums.js b/src/enums/ua-parser-enums.js
@@ -52,6 +52,7 @@ const Browser = Object.freeze({
     FLOW: 'Flow',
     GO: 'GoBrowser',
     GOOGLE_SEARCH: 'GSA',
+    HELIO: 'Helio',
     HEYTAP: 'HeyTap',
     HUAWEI: 'Huawei Browser',
     ICAB: 'iCab',
@@ -343,7 +344,6 @@ const OS = Object.freeze({
     UBUNTU: 'Ubuntu',
     UNIX: 'Unix',
     VECTORLINUX: 'VectorLinux',
-    VIERA: 'Viera',
     WATCHOS: 'watchOS',
     WEBOS: 'WebOS',
     WINDOWS: 'Windows',

diff --git a/src/helpers/ua-parser-helpers.d.ts b/src/helpers/ua-parser-helpers.d.ts
@@ -4,12 +4,14 @@
 
 import { IResult } from "../main/ua-parser";
 
+declare function getDeviceVendor(model: string): string | undefined;
 declare function isAppleSilicon(res: IResult): boolean;
 declare function isChromeFamily(res: IResult): boolean;
 declare function isFrozenUA(ua: string): boolean;
 declare function isStandalonePWA(): boolean;
 
 export {
+    getDeviceVendor,
     isAppleSilicon,
     isChromeFamily,
     isFrozenUA,

diff --git a/src/helpers/ua-parser-helpers.js b/src/helpers/ua-parser-helpers.js
@@ -8,8 +8,29 @@
 /*jshint esversion: 6 */ 
 
 const { CPU, OS, Engine } = require('../enums/ua-parser-enums');
+const { UAParser } = require('../main/ua-parser');
 
-const isAppleSilicon = (res) => res.os.is(OS.MACOS) && res.cpu.is(CPU.ARM);
+const getDeviceVendor = (model) => UAParser(`Mozilla/5.0 (Linux; Android 10; ${model}) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/100.0.0.0 Safari/537.36`).device.vendor;
+
+const isAppleSilicon = (res) => {
+    if (res.os.is(OS.MACOS)) {
+        if (res.cpu.is(CPU.ARM)) {
+            return true;
+        }
+        try {
+            const canvas = document.createElement('canvas');
+            const webgl = canvas.getContext('webgl2') || canvas.getContext('webgl') || canvas.getContext('experimental-webgl');
+            const debug = webgl.getExtension('WEBGL_debug_renderer_info');
+            const renderer = webgl.getParameter(debug.UNMASKED_RENDERER_WEBGL);
+            if (renderer.match(/apple m\d/i)) {
+                return true;
+            }
+        } catch {
+            return false;
+        }
+    }
+    return false;
+}
 
 const isChromeFamily = (res) => res.engine.is(Engine.BLINK);
 
@@ -26,6 +47,7 @@ const isStandalonePWA = () => window && (window.matchMedia('(display-mode: stand
                                 document.referrer.startsWith('app-info://platform/microsoft-store'));
 
 module.exports = { 
+    getDeviceVendor,
     isAppleSilicon,
     isChromeFamily,
     isFrozenUA,

diff --git a/test/mocha-test-helpers.js b/test/mocha-test-helpers.js
@@ -1,6 +1,23 @@
 const assert = require('assert');
 const { UAParser } = require('../src/main/ua-parser');
-const { isAppleSilicon, isChromeFamily } = require('../src/helpers/ua-parser-helpers');
+const { getDeviceVendor, isAppleSilicon, isChromeFamily } = require('../src/helpers/ua-parser-helpers');
+
+describe('getDeviceVendor', () => {
+    it('Can guess the device vendor from a model name', () => {
+
+        const modelSM = 'SM-A605G';
+        const modelRedmi = 'Redmi Note 8';
+        const modelNexus = 'Nexus 6P';
+        const modelQuest = 'Quest 3';
+        const modelAquos = 'AQUOS-TVX19B';
+
+        assert.equal(getDeviceVendor(modelSM), 'Samsung');
+        assert.equal(getDeviceVendor(modelRedmi), 'Xiaomi');
+        assert.equal(getDeviceVendor(modelNexus), 'Huawei');
+        assert.equal(getDeviceVendor(modelQuest), 'Facebook');
+        assert.equal(getDeviceVendor(modelAquos), 'Sharp');
+    });
+});
 
 describe('isAppleSilicon', () => {
     it('Can detect Apple Silicon device', () => {

diff --git a/test/specs/browser-all.json b/test/specs/browser-all.json
@@ -698,6 +698,16 @@
             "major"   : "1"
         }
     },
+    {
+        "desc"    : "Helio",
+        "ua"      : "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/89.0.4389.72 Safari/537.36 Helio/0.98.20",
+        "expect"  :
+        {
+            "name"    : "Helio",
+            "version" : "0.98.20",
+            "major"   : "0"
+        }
+    },
     {
         "desc"    : "HeyTap",
         "ua"      : "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/90.0.4430.61 Safari/537.36 HeyTapBrowser/40.8.10.1",