@hylid/env 0.0.90011267721-dev.4 → 0.0.90011283857-dev.2

package/lib/constants.d.ts

@@ -29,7 +29,6 @@ export declare const CLIENT: {
     WECHAT: string;
     TNGD_H5NG: string;
     WORLDFIRST: string;
-    SSR_NODE: string;
 };
 export declare const HAVE_MINIPROGRAM: RegExp;
 export declare const NO_MINIPROGRAM: RegExp;

package/lib/constants.js

@@ -29,8 +29,7 @@ export var CLIENT = {
   H5: 'h5',
   WECHAT: 'wechat',
   TNGD_H5NG: 'tngdh5ng',
-  WORLDFIRST: 'worldfirst',
-  SSR_NODE: 'SSR_NODE'
+  WORLDFIRST: 'worldfirst'
 };
 export var HAVE_MINIPROGRAM = /miniprogram/i;
 export var NO_MINIPROGRAM = /^((?!miniprogram).)*$/i;

package/lib/getClientName/getName4Mp.js

@@ -1,13 +1,5 @@
 import { mpChecker } from "../checker";
-import { getMatchName, browserAPI } from "../utils";
+import { getMatchName } from "../utils";
 export function getName4MP() {
-  // SSR 兼容：检测是否在小程序环境
-  if (!browserAPI.isMiniProgram()) {
-    return undefined;
-  }
-  try {
-    return getMatchName(mpChecker, my.getSystemInfoSync().app);
-  } catch (e) {
-    return undefined;
-  }
+  return getMatchName(mpChecker, my.getSystemInfoSync().app);
 }

package/lib/getClientName/getName4MpWeb.js

@@ -1,7 +1,5 @@
 import { mpWebChecker } from "../checker";
-import { getMatchName, browserAPI } from "../utils";
+import { getMatchName } from "../utils";
 export function getName4MpWeb() {
-  var navigator = browserAPI.getNavigator();
-  if (!navigator) return '';
-  return getMatchName(mpWebChecker, navigator.userAgent);
+  return getMatchName(mpWebChecker, window.navigator.userAgent);
 }

package/lib/getClientName/getName4Web.js

@@ -1,8 +1,6 @@
 import { webChecker } from "../checker";
 import { CLIENT } from "../constants";
-import { getMatchName, browserAPI } from "../utils";
+import { getMatchName } from "../utils";
 export function getName4Web() {
-  var navigator = browserAPI.getNavigator();
-  if (!navigator) return CLIENT.H5;
-  return getMatchName(webChecker, navigator.userAgent) || CLIENT.H5;
+  return getMatchName(webChecker, window.navigator.userAgent) || CLIENT.H5;
 }

package/lib/index.d.ts

@@ -1,10 +1,10 @@
 import { ClientEnv, PlatformEnv } from './types';
 import version from './version';
 export declare function getDefaultDiscernEnv(): {
-    client: string;
-    platform: string;
+    client: string | undefined;
+    platform: string | undefined;
 };
-declare let client: string, platform: string;
+declare let client: string | undefined, platform: string | undefined;
 interface CustomEnv {
     client?: string;
     platform?: string;
@@ -13,6 +13,5 @@ export declare function customEnv(config: CustomEnv | ((env: CustomEnv) => Custo
 declare const clientEnv: ClientEnv;
 declare const platformEnv: PlatformEnv;
 export { CLIENT, PLATFORM } from './constants';
-export { browserAPI } from './utils';
 export { client, platform, clientEnv, platformEnv, version };
 export type { ClientEnv, PlatformEnv, CustomEnv };

package/lib/index.js

@@ -1,17 +1,10 @@
-import { createCommonEnv, getSettingName, isMP, notice, browserAPI } from "./utils";
+import { createCommonEnv, getSettingName, isMP, notice } from "./utils";
 import { getName4MP, getName4MpWeb, getName4Web } from "./getClientName";
 import { CLIENT, PLATFORM } from "./constants";
 import version from "./version";
 export function getDefaultDiscernEnv() {
   var client;
   var platform;
-  // SSR 兼容：在服务端返回默认值
-  if (!browserAPI.isBrowser() && !browserAPI.isMiniProgram()) {
-    return {
-      client: CLIENT.SSR_NODE,
-      platform: PLATFORM.WEB
-    };
-  }
   if (isMP()) {
     client = getName4MP();
     platform = PLATFORM.MP;
@@ -34,16 +27,10 @@ export function getDefaultDiscernEnv() {
   }
   if (!platform || !client) {
     notice('Cannot identify your client.');
-    // SSR 兼容：提供默认值
-    return {
-      client: CLIENT.H5,
-      platform: PLATFORM.WEB
-    };
   }
-  // 增加兜底值
   return {
-    client: client || CLIENT.H5,
-    platform: platform || PLATFORM.WEB
+    client: client,
+    platform: platform
   };
 }
 var _a = getDefaultDiscernEnv(),
@@ -54,12 +41,12 @@ export function customEnv(config) {
     client: client,
     platform: platform
   }) : config;
-  if (custom === null || custom === void 0 ? void 0 : custom.client) {
+  if (custom.client) {
     client = custom.client;
     // @ts-ignore
     clientEnv["is".concat(client.toUpperCase())] = true;
   }
-  if (custom === null || custom === void 0 ? void 0 : custom.platform) {
+  if (custom.platform) {
     platform = custom.platform;
     // @ts-ignore
     platformEnv["is".concat(platform.toUpperCase())] = true;
@@ -68,5 +55,4 @@ export function customEnv(config) {
 var clientEnv = createCommonEnv(CLIENT, client);
 var platformEnv = createCommonEnv(PLATFORM, platform);
 export { CLIENT, PLATFORM } from "./constants";
-export { browserAPI } from "./utils";
 export { client, platform, clientEnv, platformEnv, version };

package/lib/utils.d.ts

@@ -1,17 +1,4 @@
 import { Checker } from './types';
-export declare const browserAPI: {
-    isBrowser: () => boolean;
-    isMiniProgram: () => boolean;
-    getWindow: () => (Window & typeof globalThis) | null;
-    getNavigator: () => Navigator | null;
-    localStorage: {
-        getItem: (key: string) => string | null;
-        setItem: (key: string, value: string) => boolean;
-    };
-    history: {
-        replaceState: (state: any, title: string, url: string) => 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;

package/lib/utils.js

@@ -8,69 +8,11 @@ var __assign = this && this.__assign || function () {
   };
   return __assign.apply(this, arguments);
 };
-// SSR 兼容性工具函数
-export var browserAPI = {
-  // 检测是否在浏览器环境
-  isBrowser: function isBrowser() {
-    return typeof window !== 'undefined' && typeof document !== 'undefined';
-  },
-  // 检测是否在小程序环境
-  isMiniProgram: function isMiniProgram() {
-    return typeof my !== 'undefined';
-  },
-  // 安全的 window 访问
-  getWindow: function getWindow() {
-    return typeof window !== 'undefined' ? window : null;
-  },
-  // 安全的 navigator 访问
-  getNavigator: function getNavigator() {
-    if (typeof window === 'undefined' || typeof window.navigator === 'undefined') {
-      return null;
-    }
-    return window.navigator;
-  },
-  // 安全的 localStorage 访问
-  localStorage: {
-    getItem: function getItem(key) {
-      if (typeof window === 'undefined') return null;
-      try {
-        return localStorage.getItem(key);
-      } catch (e) {
-        return null;
-      }
-    },
-    setItem: function setItem(key, value) {
-      if (typeof window === 'undefined') return false;
-      try {
-        localStorage.setItem(key, value);
-        return true;
-      } catch (e) {
-        return false;
-      }
-    }
-  },
-  // 安全的 history 访问
-  history: {
-    replaceState: function replaceState(state, title, url) {
-      if (typeof window === 'undefined' || !window.history) return false;
-      try {
-        window.history.replaceState(state, title, url);
-        return true;
-      } catch (e) {
-        return false;
-      }
-    }
-  }
-};
 export function isMP() {
-  // SSR 兼容：检测是否在小程序环境
+  // 小程序一定有 my
   if (typeof my === 'undefined') return false;
   // SDKVersion 只在小程序有
-  try {
-    if (typeof my.SDKVersion === 'string') return true;
-  } catch (e) {
-    return false;
-  }
+  if (typeof my.SDKVersion === 'string') return true;
   return false;
 }
 export function getMatchName(checks, pattern) {
@@ -99,54 +41,32 @@ export function notice(text) {
   console.info("[hylid-env]: ".concat(text));
 }
 export function getSettingName() {
-  var _a, _b;
+  var _a;
   var ENV_KEY = '__hy_env__';
-  // SSR 兼容：检测是否在浏览器环境
-  if (!browserAPI.isBrowser()) {
-    return {};
-  }
-  var window = browserAPI.getWindow();
-  if (!window) return {};
-  var clientMatch = ((_a = window.location.search) === null || _a === void 0 ? void 0 : _a.match(/__app__=([^&]*)/)) || [],
-    _c = void 0;
+  var clientMatch = ((_a = window.location.search) === null || _a === void 0 ? void 0 : _a.match(/__app__=([^&]*)/)) || [];
   var client = clientMatch[1];
-  var platformMatch = ((_b = window.location.search) === null || _b === void 0 ? void 0 : _b.match(/__platform__=([^&]*)/)) || [],
-    _d = void 0;
+  var platformMatch = window.location.search.match(/__platform__=([^&]*)/) || [];
   var platform = platformMatch[1];
-  // SSR 兼容：安全的 localStorage 访问
-  var env = {};
-  try {
-    env = JSON.parse(browserAPI.localStorage.getItem(ENV_KEY) || '{}') || {};
-  } catch (e) {
-    env = {};
-  }
+  var env = JSON.parse(localStorage.getItem(ENV_KEY) || '{}') || {};
   if (client) {
     env.client = client;
   }
   if (platform) {
     env.platform = platform;
   }
-  // SSR 兼容：安全的 localStorage 设置
-  browserAPI.localStorage.setItem(ENV_KEY, JSON.stringify(env));
-  // SSR 兼容：安全的 history API 访问
-  if (clientMatch[1]) {
-    try {
-      var search = window.location.search.replace(new RegExp("".concat(clientMatch[0], "(&)*")), '');
-      var hash = window.location.hash || '';
-      var newUrl = "".concat(window.location.pathname).concat(search).concat(hash);
-      browserAPI.history.replaceState(null, '', newUrl);
-    } catch (e) {
-      // 不处理
-    }
-  }
-  // SSR 兼容：安全的缓存读取
-  var cached = {};
   try {
-    cached = JSON.parse(browserAPI.localStorage.getItem(ENV_KEY) || '{}');
+    localStorage.setItem(ENV_KEY, JSON.stringify(env));
   } catch (e) {
-    cached = {};
+    // 不处理
+  }
+  if (clientMatch[1]) {
+    var search = window.location.search.replace(new RegExp("".concat(clientMatch[0], "(&)*")), '');
+    var hash = window.location.hash || '';
+    var newUrl = "".concat(window.location.pathname).concat(search).concat(hash);
+    history.replaceState(null, '', newUrl);
   }
-  var crossBridgeStorage = browserAPI.localStorage.getItem('_CB__app__');
+  var cached = JSON.parse(localStorage.getItem(ENV_KEY) || '{}');
+  var crossBridgeStorage = localStorage.getItem('_CB__app__');
   return crossBridgeStorage ? __assign(__assign({}, cached), {
     client: crossBridgeStorage
   }) : cached;

package/lib/version.js

@@ -1 +1 @@
-export default '0.0.90011267721-dev.4';
+export default '0.0.90011283857-dev.2';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hylid/env",
-  "version": "0.0.90011267721-dev.4",
+  "version": "0.0.90011283857-dev.2",
   "main": "lib/index.js",
   "files": [
     "lib"