Merge pull request #113 from 599316527/master

增加手机百度和夸克浏览器的规则
hotoo · Apr 28, 2017 · cd92ccd · cd92ccd
2 parents 3f7f4fb + 47c63a1
commit cd92ccd
Show file tree

Hide file tree

Showing 3 changed files with 47 additions and 20 deletions.
diff --git a/lib/rules.js b/lib/rules.js
@@ -202,25 +202,8 @@ const OS = [
 ];
 
 const BROWSER = [
-  ["baiduboxapp",
-    function(ua) {
-      let back = 0;
-      let a;
-      if (/ baiduboxapp\//i.test(ua)) {
-        if (a = /([\d+.]+)_(?:diordna|enohpi)_/.exec(ua)) {
-          a = a[1].split(".");
-          back = a.reverse().join(".");
-        } else if ((a = /baiduboxapp\/([\d+.]+)/.exec(ua))) {
-          back = a[1];
-        }
-
-        return {
-          version: back,
-        };
-      }
-      return false;
-    },
-  ],
+  // 夸克浏览器
+  ["quark", /\bquark\/([0-9.]+)/],
   ["googlebot", /\bgooglebot\/([0-9.]+)/],
   // 百度搜索引擎爬虫：无线、网页搜索
   // http://help.baidu.com/question?prod_en=master&class=498&id=1000550

diff --git a/lib/web-rules.js b/lib/web-rules.js
@@ -87,7 +87,7 @@ const DEVICES = [
       return /\bhtc[ _\-]?([a-z0-9 ]+)/;
     }
   }],
-  ["oppo", /\boppo[_]([a-z0-9]+)/],
+  ["oppo", /\boppo[_ ]([a-z0-9]+)/],
   ["konka", /\bkonka[_\-]([a-z0-9]+)/],
   ["sonyericsson", /\bmt([a-z0-9]+)/],
   ["coolpad", /\bcoolpad[_ ]?([a-z0-9]+)/],
@@ -304,6 +304,26 @@ const BROWSER = [
       return /\b(?:ucbrowser|uc)\b/;
     }
   }],
+  ["baiduboxapp",
+    function(ua) {
+      let back = 0;
+      let a;
+      if (/ baiduboxapp\//i.test(ua)) {
+        if (a = /([\d+.]+)_(?:diordna|enohpi)_/.exec(ua)) {
+          a = a[1].split(".");
+          back = a.reverse().join(".");
+        } else if ((a = /baiduboxapp\/([\d+.]+)/.exec(ua))) {
+          back = a[1];
+        }
+
+        return {
+          version: back,
+        };
+      }
+      return false;
+    },
+  ],
+  ["oppobrowser", /\boppobrowser\/([0-9.]+)/],
   ["chrome", / (?:chrome|crios|crmo)\/([0-9.]+)/],
   // Android 默认浏览器。该规则需要在 safari 之前。
   ["android", function(ua){

diff --git a/tests/detector-spec.js b/tests/detector-spec.js
@@ -987,6 +987,30 @@ const UAs = [
     browser: "micromessenger/6.2.5.51;6.2.5.51;o",
     engine: (isBlinkEngine() ? "blink" : "webkit") + "/533.1;533.1;o",
   }],
+  ["Mozilla/5.0 (Linux; Android 7.0; E6683 Build/32.3.A.0.376) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/35.0.1916.138 Mobile Safari/537.36 T7/7.4 baiduboxapp/8.4 (Baidu; P1 7.0)", {
+    device: "android/-1",
+    os: "android/7.0",
+    browser: "baiduboxapp/8.4;8.4;o",
+    engine: (isBlinkEngine() ? "blink" : "webkit") + "/537.36;537.36;o",
+  }],
+  ["Mozilla/5.0 (iPhone; CPU iPhone OS 10_3_1 like Mac OS X) AppleWebKit/603.1.30 (KHTML, like Gecko) Mobile/14E304 baiduboxapp/0_01.0.4.8_enohpi_4331_057/1.3.01_1C2%259enohPi/1099a/5H651T3G1F97R4K26P7L7NDG6035130273SB73A96IJVT01J9UY/1", {
+    device: "iphone/-1",
+    os: "ios/10.3.1",
+    browser: "baiduboxapp/8.4.0.01;8.4.0.01;o",
+    engine: (isBlinkEngine() ? "blink" : "webkit") + "/603.1.30;603.1.30;o",
+  }],
+  ["Mozilla/5.0 (Linux; U; Android 7.0; zh-CN; E6683 Build/32.3.A.0.376) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/40.0.2214.89 Quark/1.6.8.909 Mobile Safari/537.36", {
+    device: "android/-1",
+    os: "android/7.0",
+    browser: "quark/1.6.8.909;1.6.8.909;o",
+    engine: (isBlinkEngine() ? "blink" : "webkit") + "/537.36;537.36;o",
+  }],
+  ["Mozilla/5.0 (Linux; U; Android 6.0.1; zh-cn; OPPO R9s Build/MMB29M) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/38.0.0.0 Mobile Safari/537.36 OppoBrowser/4.2.8", {
+    device: "oppo/r9s",
+    os: "android/6.0.1",
+    browser: "oppobrowser/4.2.8;4.2.8;o",
+    engine: (isBlinkEngine() ? "blink" : "webkit") + "/537.36;537.36;o",
+  }],
 
   // NA
   ["", {