best-unit 1.2.9 → 1.2.11

package/package.json

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

package/src/api/axiosInstance.ts

@@ -19,24 +19,6 @@ export function createAxiosInstance(options: CreateAxiosOptions = {}) {
     sessionStorage.getItem("fund_unit_params") || "{}"
   );
 
-  // 简单同步轮询，尽量在不改动对外调用方式的情况下等待参数就绪
-  if (!fundUnitParams || Object.keys(fundUnitParams).length === 0) {
-    const start = Date.now();
-    const maxWaitMs = 3000; // 最多等待 3 秒
-    while (Date.now() - start < maxWaitMs) {
-      try {
-        const raw = sessionStorage.getItem("fund_unit_params") || "{}";
-        const obj = JSON.parse(raw);
-        if (obj && Object.keys(obj).length > 0) {
-          fundUnitParams = obj;
-          break;
-        }
-      } catch (_) {
-        // 略过解析错误，继续等待
-      }
-    }
-  }
-
   console.log("fundUnitParams", fundUnitParams);
   const { env } = fundUnitParams;
 
@@ -60,17 +42,35 @@ export function createAxiosInstance(options: CreateAxiosOptions = {}) {
 
   const instance: AxiosInstance = axios.create({ baseURL, timeout });
 
-  // 请求拦截：加 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;
+  // 请求拦截：等待参数就绪、加 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();
+      }
 
-    return config;
-  });
+      // 每次请求读取最新的 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;
+    }
+  );
 
   // 响应拦截：code=0判定成功，其他走 onError
   instance.interceptors.response.use(
@@ -111,13 +111,63 @@ 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) {
-    httpInstance = createAxiosInstance();
+  if (httpInstance) return httpInstance;
+
+  async function ensureInstanceReady(): Promise<void> {
+    if (httpInstance) return;
+    if (!creatingPromise) {
+      creatingPromise = waitUntilParamsReady()
+        .then(() => {
+          httpInstance = createAxiosInstance();
+        })
+        .finally(() => {
+          creatingPromise = null;
+        });
+    }
+    return creatingPromise;
   }
-  return httpInstance;
+
+  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;
 }
 
 // 重置 axios 实例（当 fund_unit_params 更新时调用）