@hylid/env 2.12.0-alpha.29 → 2.12.0-alpha.31

package/lib/checker/mp.js

@@ -1,23 +1,23 @@
 import { CLIENT } from "../constants";
 export var mpChecker = [{
   name: CLIENT.DEMO,
-  match: [/demo/i]
+  match: [/demo/]
 }, {
   name: CLIENT.ALIPAY,
-  match: [/alipay/i]
+  match: [/alipay/]
 }, {
   name: CLIENT.ALIPAYHK,
-  match: [/hk/i]
+  match: [/hk/]
 }, {
   name: CLIENT.TNGD,
-  match: [/tngd/i]
+  match: [/tngd/]
 }, {
   name: CLIENT.GCASH,
-  match: [/gcash/i]
+  match: [/gcash/]
 }, {
   name: CLIENT.TRUEMONEY,
-  match: [/tmn/i]
+  match: [/tmn/]
 }, {
   name: CLIENT.DANA,
-  match: [/dana/i]
+  match: [/dana/]
 }];

package/lib/checker/mpWeb.js

@@ -1,7 +1,14 @@
 import { CLIENT, HAVE_GRIVER, HAVE_MINIPROGRAM, NO_GRIVER } from "../constants";
+// 优先从 URL 里带过来 __app__ 参数进行识别
 export var mpWebChecker = [{
   name: CLIENT.DEMO,
   match: [/alipayIDE/i] // IDE 识别为 demo
+}, {
+  name: CLIENT.ALIPAYHK,
+  match: [HAVE_MINIPROGRAM, NO_GRIVER, /AlipayClientHK/]
+}, {
+  name: CLIENT.TNGD,
+  match: [HAVE_MINIPROGRAM, /TNGKit|Touch 'n Go/]
 }, {
   name: CLIENT.ALIPAY,
   match: [HAVE_MINIPROGRAM, NO_GRIVER, /alipay/i]

package/lib/checker/web.js

@@ -1,35 +1,35 @@
 import { CLIENT, NO_MINIPROGRAM, NO_GRIVER, HAVE_GRIVER } from "../constants";
 export var webChecker = [{
-  name: CLIENT.ALIPAY,
-  match: [NO_MINIPROGRAM, NO_GRIVER, /AlipayClient/i]
-}, {
   name: CLIENT.ALIPAYHK,
-  match: [NO_MINIPROGRAM, NO_GRIVER, /AlipayClientHK/i]
+  match: [NO_MINIPROGRAM, NO_GRIVER, /AlipayClientHK/]
 }, {
   name: CLIENT.TNGD,
-  match: [NO_MINIPROGRAM, HAVE_GRIVER, /TNGKit|Touch 'n Go/i]
+  match: [NO_MINIPROGRAM, HAVE_GRIVER, /TNGKit|Touch 'n Go/]
 }, {
   name: CLIENT.TNGD_H5NG,
-  match: [NO_MINIPROGRAM, /TNGKit|Touch 'n Go/i, /IAPWebH5NG/i]
+  match: [NO_MINIPROGRAM, /TNGKit|Touch 'n Go/, /IAPWebH5NG/]
 }, {
   name: CLIENT.GCASH,
-  match: [NO_MINIPROGRAM, HAVE_GRIVER, /GCash/i]
+  match: [NO_MINIPROGRAM, HAVE_GRIVER, /GCash/]
 }, {
   name: CLIENT.TRUEMONEY,
   match: [NO_MINIPROGRAM, HAVE_GRIVER, /TrueMoney/i]
 }, {
   name: CLIENT.KAKAOPAY,
-  match: [NO_MINIPROGRAM, /PAYCLIENT|KAKAOTALK|KAKAOPAY/i]
+  match: [NO_MINIPROGRAM, /PAYCLIENT|KAKAOTALK|KAKAOPAY/]
 }, {
   name: CLIENT.KAKAOTALK,
-  match: [NO_MINIPROGRAM, /ALIPAYCONNECT_KAKAO_TALK/i]
+  match: [NO_MINIPROGRAM, /ALIPAYCONNECT_KAKAO_TALK/]
 }, {
   name: CLIENT.NAVERPAY,
-  match: [NO_MINIPROGRAM, /NAVER/i]
+  match: [NO_MINIPROGRAM, /NAVER/]
 }, {
   name: CLIENT.MPAY,
   match: [NO_MINIPROGRAM, /mpay|macaupay/i]
 }, {
   name: CLIENT.TOSSPAY,
   match: [NO_MINIPROGRAM, /Toss/i]
+}, {
+  name: CLIENT.ALIPAY,
+  match: [NO_MINIPROGRAM, NO_GRIVER, /AlipayClient/]
 }];

package/lib/utils.js

@@ -7,10 +7,16 @@ export function isNotMP() {
 }
 export function getMatchName(checks, pattern) {
   var matches = checks.filter(function (check) {
+    console.log('xxxxx', check, check.match.every(function (reg) {
+      return reg.test(pattern);
+    }), [/miniprogram/i, /^((?!griver).)*$/i, /alipay/i].every(function (reg) {
+      return reg.test(pattern);
+    }));
     return check.match.every(function (reg) {
       return reg.test(pattern);
     });
   });
+  console.log('查看匹配哈哈哈', matches);
   if (!matches.length) return;
   var defaultName = matches[0].name;
   if (matches.length > 1) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hylid/env",
-  "version": "2.12.0-alpha.29",
+  "version": "2.12.0-alpha.31",
   "main": "lib/index.js",
   "files": [
     "lib"