best-unit 1.2.11 → 1.2.13

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "best-unit",
   "private": false,
-  "version": "1.2.11",
+  "version": "1.2.13",
   "type": "module",
   "main": "dist/best-unit.cjs",
   "module": "dist/best-unit.js",

package/src/api/axiosInstance.ts

@@ -15,7 +15,7 @@ export interface CreateAxiosOptions {
 
 export function createAxiosInstance(options: CreateAxiosOptions = {}) {
   // 根据 fund_unit_params 中的 env 参数选择 API URL
-  let fundUnitParams = JSON.parse(
+  const fundUnitParams = JSON.parse(
     sessionStorage.getItem("fund_unit_params") || "{}"
   );
 
@@ -42,35 +42,17 @@ export function createAxiosInstance(options: CreateAxiosOptions = {}) {
 
   const instance: AxiosInstance = axios.create({ baseURL, timeout });
 
-  // 请求拦截：等待参数就绪、加 token、国际化
-  instance.interceptors.request.use(
-    async (config: InternalAxiosRequestConfig) => {
-      // 若参数未就绪，则等待至就绪
-      try {
-        const obj = JSON.parse(
-          sessionStorage.getItem("fund_unit_params") || "{}"
-        );
-        if (!obj || Object.keys(obj).length === 0) {
-          await waitUntilParamsReady();
-        }
-      } catch (_) {
-        await waitUntilParamsReady();
-      }
+  // 请求拦截：加 token、国际化
+  instance.interceptors.request.use((config: InternalAxiosRequestConfig) => {
+    const { token, locale } = fundUnitParams;
+    config.headers = {
+      ...config.headers,
+      Authorization: token,
+      "x-locale": locale === Locale.ZH ? "zh-CN" : "en-US",
+    } as any;
 
-      // 每次请求读取最新的 fund_unit_params，避免闭包老数据
-      const latestParams = JSON.parse(
-        sessionStorage.getItem("fund_unit_params") || "{}"
-      );
-      const { token, locale } = latestParams || {};
-      config.headers = {
-        ...config.headers,
-        Authorization: token,
-        "x-locale": locale === Locale.ZH ? "zh-CN" : "en-US",
-      } as any;
-
-      return config;
-    }
-  );
+    return config;
+  });
 
   // 响应拦截：code=0判定成功，其他走 onError
   instance.interceptors.response.use(
@@ -111,63 +93,13 @@ export function createAxiosInstance(options: CreateAxiosOptions = {}) {
 
 // 缓存 axios 实例
 let httpInstance: AxiosInstance | null = null;
-let creatingPromise: Promise<void> | null = null;
-
-// 等待 fund_unit_params 不为空对象（无超时）
-function waitUntilParamsReady(): Promise<void> {
-  return new Promise((resolve) => {
-    const check = () => {
-      try {
-        const obj = JSON.parse(
-          sessionStorage.getItem("fund_unit_params") || "{}"
-        );
-        if (obj && Object.keys(obj).length > 0) return resolve();
-      } catch (_) {
-        // ignore
-      }
-      setTimeout(check, 50);
-    };
-    check();
-  });
-}
 
 // 获取 axios 实例的函数
 export function http(): AxiosInstance {
-  if (httpInstance) return httpInstance;
-
-  async function ensureInstanceReady(): Promise<void> {
-    if (httpInstance) return;
-    if (!creatingPromise) {
-      creatingPromise = waitUntilParamsReady()
-        .then(() => {
-          httpInstance = createAxiosInstance();
-        })
-        .finally(() => {
-          creatingPromise = null;
-        });
-    }
-    return creatingPromise;
+  if (!httpInstance) {
+    httpInstance = createAxiosInstance();
   }
-
-  const proxy: any = {};
-  [
-    "request",
-    "get",
-    "delete",
-    "head",
-    "options",
-    "post",
-    "put",
-    "patch",
-  ].forEach((method) => {
-    proxy[method] = async (...args: any[]) => {
-      await ensureInstanceReady();
-      // @ts-ignore
-      return (httpInstance as any)[method](...args);
-    };
-  });
-
-  return proxy as AxiosInstance;
+  return httpInstance;
 }
 
 // 重置 axios 实例（当 fund_unit_params 更新时调用）