@hylid/env 2.12.0-alpha.41 → 2.12.0-alpha.9

package/lib/getClientName/getName4Mp.js

@@ -1,11 +1,9 @@
 import { mpChecker } from "../checker";
 import { CLIENT } from "../constants";
-import { getMatchName, isNotMP } from "../utils";
+import { getMatchName } from "../utils";
 export function getName4MP() {
   // 微信小程序
   // @ts-ignore
   if (typeof wx !== 'undefined') return CLIENT.WECHAT;
-  // 支付宝系小程序
-  if (isNotMP()) return;
   return getMatchName(mpChecker, my.getSystemInfoSync().app);
 }

package/lib/getClientName/getName4MpWeb.d.ts

@@ -1,6 +1 @@
-/**
- * 1. 优先从 URL 解析 __app__
- * 2. 其次从 Storage 解析 __app__
- * 3. 再之解析 userAgent
- */
 export declare function getName4MpWeb(): string | undefined;

package/lib/getClientName/getName4MpWeb.js

@@ -1,20 +1,5 @@
-import { mpChecker, mpWebChecker } from "../checker";
-import { CLIENT } from "../constants";
-import { getMatchName, getUrlClientName, getStorageClientName } from "../utils";
-/**
- * 1. 优先从 URL 解析 __app__
- * 2. 其次从 Storage 解析 __app__
- * 3. 再之解析 userAgent
- */
+import { mpWebChecker } from "../checker";
+import { getMatchName } from "../utils";
 export function getName4MpWeb() {
-  var appName = getUrlClientName() || getStorageClientName();
-  if (appName) {
-    // 如果 hylid-bridge 的 client 枚举值找到了 app，则优先用 hylid-bridge 的
-    if (Object.keys(CLIENT).find(function (i) {
-      return CLIENT[i] === appName;
-    })) return appName;
-    // 套壳的 __app__ 参数，一般是壳子拼的，值从 getSystemInfoSync 取的，所以使用 mpChecker
-    return getMatchName(mpChecker, appName);
-  }
   return getMatchName(mpWebChecker, window.navigator.userAgent);
 }

package/lib/getClientName/getName4Web.d.ts

@@ -1 +1 @@
-export declare function getName4Web(): string | undefined;
+export declare function getName4Web(): string;

package/lib/getClientName/getName4Web.js

@@ -1,16 +1,6 @@
-import { webChecker, mpChecker } from "../checker";
+import { webChecker } from "../checker";
 import { CLIENT } from "../constants";
-import { getMatchName, getUrlClientName, getStorageClientName } from "../utils";
+import { getMatchName } from "../utils";
 export function getName4Web() {
-  var appName = getUrlClientName() || getStorageClientName();
-  // 无法识别的，可以手动指定 __app__ 参数
-  if (appName) {
-    // 如果 hylid-bridge 的 client 枚举值找到了 app，则优先用 hylid-bridge 的
-    if (Object.keys(CLIENT).find(function (i) {
-      return CLIENT[i] === appName;
-    })) return appName;
-    // 指定的 __app__ 和小程序返回值对齐
-    return getMatchName(mpChecker, appName);
-  }
   return getMatchName(webChecker, window.navigator.userAgent) || CLIENT.H5;
 }

package/lib/index.d.ts

@@ -1,6 +1,9 @@
 import { ClientEnv, PlatformEnv } from './types';
-declare let client: string | undefined;
-declare let platform: string | undefined;
+export declare function getDefaultDiscernEnv(): {
+    client: string | undefined;
+    platform: string | undefined;
+};
+declare let client: string | undefined, platform: string | undefined;
 interface CustomEnv {
     client?: string;
     platform?: string;

package/lib/index.js

@@ -1,34 +1,39 @@
-import { createCommonEnv, notice } from "./utils";
+import { createCommonEnv, getSettingName, isMP, notice } from "./utils";
 import { getName4MP, getName4MpWeb, getName4Web } from "./getClientName";
 import { CLIENT, PLATFORM } from "./constants";
-var client;
-var platform;
-/**
- * 优先判断小程序，根据 my.SDKVersion 是否存在进行判断
- * 其次判断套壳 H5，根据 UA 是否存在 miniprogram 字段进行判断
- * 再者判断端内 H5，UA 不存在 miniprogram 且含有钱包特征值进行判断
- * 不满足上面的条件时，判断为端外 H5
- */
-// 小程序
-client = getName4MP();
-if (client) {
-  platform = PLATFORM.MP;
-} else {
-  // 套壳 H5
-  client = getName4MpWeb();
-  if (client) {
-    platform = PLATFORM.MPWEB;
+export function getDefaultDiscernEnv() {
+  var client;
+  var platform;
+  if (isMP()) {
+    client = getName4MP();
+    platform = PLATFORM.MP;
   } else {
-    // 端内/端外 H5
-    client = getName4Web();
-    if (client) {
-      platform = PLATFORM.WEB;
+    var setting = getSettingName();
+    if (setting.platform) {
+      platform = setting.platform;
+      client = setting.client || (platform === 'mpweb' ? getName4MpWeb() : getName4Web());
+    } else {
+      // 如果只设置了 client，默认是套壳场景
+      client = setting.client || getName4MpWeb();
+      if (client) {
+        platform = PLATFORM.MPWEB;
+      } else {
+        client = getName4Web();
+        platform = PLATFORM.WEB;
+      }
     }
   }
+  if (!platform || !client) {
+    notice('Cannot identify your client.');
+  }
+  return {
+    client: client,
+    platform: platform
+  };
 }
-if (!platform) {
-  notice('Cannot identify your client.');
-}
+var _a = getDefaultDiscernEnv(),
+  client = _a.client,
+  platform = _a.platform;
 export function customEnv(config) {
   var custom = typeof config === 'function' ? config({
     client: client,

package/lib/utils.d.ts

@@ -1,7 +1,6 @@
 import { Checker } from './types';
-export declare function isNotMP(): boolean;
+export declare function isMP(): boolean;
 export declare function getMatchName(checks: Checker[], pattern: string): string | undefined;
 export declare function createCommonEnv<T>(source: Record<string, string>, current?: string): T;
 export declare function notice(text: string): void;
-export declare function getUrlClientName(): string;
-export declare function getStorageClientName(): string | null;
+export declare function getSettingName(): any;

package/lib/utils.js

@@ -1,8 +1,10 @@
-export function isNotMP() {
+export function isMP() {
+  // @ts-ignore
+  if (typeof wx !== 'undefined') return true;
   // 小程序一定有 my
-  if (typeof my == 'undefined') return true;
+  if (typeof my === 'undefined') return false;
   // SDKVersion 只在小程序有
-  if (typeof my.SDKVersion !== 'string') return true;
+  if (typeof my.SDKVersion === 'string') return true;
   return false;
 }
 export function getMatchName(checks, pattern) {
@@ -30,10 +32,15 @@ export function createCommonEnv(source, current) {
 export function notice(text) {
   console.info("[hylid-env]: ".concat(text));
 }
-export function getUrlClientName() {
-  return (window.location.search.match(/[?&]__app__=([^?&=]+)/) || [])[1];
-}
-export function getStorageClientName() {
-  // __app__ 值和 getSystemInfo 里的 app 保持对齐
-  return localStorage.getItem('__app__');
+export function getSettingName() {
+  var client = (window.location.search.match(/[?&]__app__=([^?&=]+)/) || [])[1];
+  var platform = (window.location.search.match(/[?&]__platform__=([^?&=]+)/) || [])[1];
+  if (client || platform) {
+    localStorage.setItem('__hy_env__', JSON.stringify({
+      client: client,
+      platform: platform
+    }));
+  }
+  var cached = localStorage.getItem('__hy_env__');
+  return cached ? JSON.parse(cached) : {};
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hylid/env",
-  "version": "2.12.0-alpha.41",
+  "version": "2.12.0-alpha.9",
   "main": "lib/index.js",
   "files": [
     "lib"
@@ -10,6 +10,5 @@
   },
   "license": "MIT",
   "sideEffects": false,
-  "registry": "https://registry.npmjs.org/",
-  "repository": "https://code.alipay.com/ant-ife/hylid-bridge.git"
-}
+  "registry": "https://registry.npmjs.org/"
+}