best-unit 1.2.11 → 1.2.12

package/package.json

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

package/src/api/axiosInstance.ts

@@ -6,6 +6,7 @@ import type {
 } from "axios";
 import { message } from "@/components/common/message";
 import { Env, Locale } from "@/types";
+import { waitFundUnitReady } from "./waitUnit";
 
 export interface CreateAxiosOptions {
   baseURL?: string;
@@ -14,54 +15,41 @@ export interface CreateAxiosOptions {
 }
 
 export function createAxiosInstance(options: CreateAxiosOptions = {}) {
-  // 根据 fund_unit_params 中的 env 参数选择 API URL
-  let fundUnitParams = JSON.parse(
-    sessionStorage.getItem("fund_unit_params") || "{}"
-  );
-
-  console.log("fundUnitParams", fundUnitParams);
-  const { env } = fundUnitParams;
-
-  let apiUrl: string;
-  switch (env) {
-    case Env.DEV:
-    case Env.DEVELOPMENT:
-      apiUrl = "/api";
-      break;
-    case Env.TEST:
-      apiUrl = "https://fund.bestfulfill.tech/api/sdk";
-      break;
-    case Env.PROD:
-    case Env.PRODUCTION:
-    default:
-      apiUrl = "https://fund.bestfulfill.com/api/sdk";
-      break;
-  }
+  // 实例初始的 baseURL 仅作兜底，真正的 baseURL 在请求阶段基于最新 fund_unit_params 计算
+  let apiUrl: string = "https://fund.bestfulfill.com/api/sdk";
 
   const { baseURL = apiUrl, timeout = 10000, onError } = options;
 
   const instance: AxiosInstance = axios.create({ baseURL, timeout });
 
-  // 请求拦截：等待参数就绪、加 token、国际化
+  // 请求拦截：等待 fund_unit_params 就绪，动态设置 baseURL、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();
-      }
+      // 等待 fund_unit_params 非空
+      await waitFundUnitReady();
 
-      // 每次请求读取最新的 fund_unit_params，避免闭包老数据
-      const latestParams = JSON.parse(
+      const fundUnitParams = JSON.parse(
         sessionStorage.getItem("fund_unit_params") || "{}"
       );
-      const { token, locale } = latestParams || {};
+
+      const { env, token, locale } = fundUnitParams || {};
+
+      // 按 env 设置 baseURL（覆盖实例级 baseURL，以便热切换环境）
+      switch (env) {
+        case Env.DEV:
+        case Env.DEVELOPMENT:
+          config.baseURL = "/api";
+          break;
+        case Env.TEST:
+          config.baseURL = "https://fund.bestfulfill.tech/api/sdk";
+          break;
+        case Env.PROD:
+        case Env.PRODUCTION:
+        default:
+          config.baseURL = "https://fund.bestfulfill.com/api/sdk";
+          break;
+      }
+
       config.headers = {
         ...config.headers,
         Authorization: token,
@@ -111,63 +99,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 更新时调用）

package/src/api/waitUnit.ts

@@ -0,0 +1,62 @@
+// 等待 fund_unit_params 就绪的工具
+
+type ResolveFn = () => void;
+
+let pendingResolvers: ResolveFn[] = [];
+let pollingTimer: number | null = null;
+
+function readFundUnitParams(): Record<string, any> {
+  try {
+    const raw = sessionStorage.getItem("fund_unit_params") || "{}";
+    return JSON.parse(raw);
+  } catch (e) {
+    return {};
+  }
+}
+
+export function isFundUnitParamsReady(): boolean {
+  const params = readFundUnitParams();
+  // 判定“非空对象”
+  return params && typeof params === "object" && Object.keys(params).length > 0;
+}
+
+export function getFundUnitParams(): Record<string, any> {
+  return readFundUnitParams();
+}
+
+function startPollingIfNeeded(): void {
+  if (pollingTimer !== null) return;
+  // 轻量轮询，检测到就绪后立即 resolve 并停止
+  pollingTimer = window.setInterval(() => {
+    if (isFundUnitParamsReady()) {
+      if (pollingTimer !== null) {
+        window.clearInterval(pollingTimer);
+        pollingTimer = null;
+      }
+      const resolvers = pendingResolvers.slice();
+      pendingResolvers = [];
+      resolvers.forEach((resolve) => resolve());
+    }
+  }, 100);
+}
+
+// 对外暴露：等待 fund_unit_params 就绪
+export function waitFundUnitReady(): Promise<void> {
+  if (isFundUnitParamsReady()) return Promise.resolve();
+  startPollingIfNeeded();
+  return new Promise<void>((resolve) => {
+    pendingResolvers.push(resolve);
+  });
+}
+
+// 可选：手动通知（如果你在别处设置了 fund_unit_params 后希望立刻触发）
+export function notifyFundUnitParamsUpdated(): void {
+  if (!isFundUnitParamsReady()) return;
+  const resolvers = pendingResolvers.slice();
+  pendingResolvers = [];
+  resolvers.forEach((resolve) => resolve());
+  if (pollingTimer !== null) {
+    window.clearInterval(pollingTimer);
+    pollingTimer = null;
+  }
+}