@clownlee/cores 1.0.23 → 1.0.25

package/dist/index.js

@@ -2531,9 +2531,34 @@ function handleRequestInterceptor(config, store, refreshConfig) {
   }
   return config;
 }
+const REDIRECT_TO_LOGIN_CODES = [2006, 2007, 2003, 2004, 2e3];
+let hasNotifiedToLogin = false;
+function notifyToLogin(code, message) {
+  if (hasNotifiedToLogin) {
+    return;
+  }
+  hasNotifiedToLogin = true;
+  window.parent.postMessage(
+    {
+      type: "error",
+      data: JSON.stringify({
+        code,
+        message,
+        action: "toLogin"
+      })
+    },
+    "*"
+  );
+}
 let isRefreshing = false;
 let refreshPromise = null;
 let failedQueue = [];
+function getRefreshErrorMessage(error) {
+  if (error instanceof Error) {
+    return error.message;
+  }
+  return "刷新 Token 失败";
+}
 function getRefreshTokenFromStore(store, refreshConfig, name = "refreshToken") {
   const state = store.$state;
   if (state && typeof state[name] === "string") {
@@ -2586,7 +2611,12 @@ async function refreshTokenApi(refreshConfig, prefix, refreshToken) {
       }
     }
   );
-  return response.data;
+  const { code, message, data } = response.data;
+  if (code !== 0 || !(data == null ? void 0 : data.accessToken)) {
+    notifyToLogin(code, message || "刷新 Token 失败");
+    throw new Error(message || "刷新 Token 失败");
+  }
+  return data;
 }
 async function handleTokenRefresh(refreshConfig, store, refreshTokenFromResponse, retryFn) {
   let refreshToken = refreshTokenFromResponse;
@@ -2596,7 +2626,9 @@ async function handleTokenRefresh(refreshConfig, store, refreshTokenFromResponse
   }
   let prefix = getRefreshTokenFromStore(store, refreshConfig, "prefix") || "Bearer";
   if (!refreshToken) {
-    throw new Error("Refresh token not found");
+    const message = "Refresh token not found";
+    notifyToLogin(void 0, message);
+    throw new Error(message);
   }
   if (isRefreshing && refreshPromise) {
     try {
@@ -2630,7 +2662,10 @@ async function handleTokenRefresh(refreshConfig, store, refreshTokenFromResponse
         state.refreshToken = newToken.refreshToken;
       }
       try {
-        localStorage.setItem("refreshToken", JSON.stringify(newToken.refreshToken));
+        localStorage.setItem(
+          "refreshToken",
+          JSON.stringify(newToken.refreshToken)
+        );
       } catch {
       }
     }
@@ -2642,6 +2677,7 @@ async function handleTokenRefresh(refreshConfig, store, refreshTokenFromResponse
     failedQueue = [];
     return await retryFn();
   } catch (refreshError) {
+    notifyToLogin(void 0, getRefreshErrorMessage(refreshError));
     isRefreshing = false;
     refreshPromise = null;
     failedQueue.forEach(({ reject }) => {
@@ -2651,44 +2687,35 @@ async function handleTokenRefresh(refreshConfig, store, refreshTokenFromResponse
     throw refreshError;
   }
 }
-const REDIRECT_TO_LOGIN_CODES = [2006, 2007, 2003, 2004, 2e3];
 const TOKEN_REFRESH_CODE = 2001;
 const TENANT_SUPER_ADMIN_FIRST_LOGIN_CODE = 2008;
-async function handleResponseInterceptor(response, store, refreshConfig) {
-  var _a, _b;
+function shouldNotifyToLogin(responseURL) {
+  if (!responseURL) {
+    return true;
+  }
+  return !responseURL.endsWith("login") && !responseURL.endsWith("register") && !responseURL.endsWith("register/tenants");
+}
+async function handleResponseInterceptor(response, store, refreshConfig, axiosInstance) {
+  var _a, _b, _c;
   const responseData = response == null ? void 0 : response.data;
   const code = responseData == null ? void 0 : responseData.code;
   if (REDIRECT_TO_LOGIN_CODES.includes(code)) {
-    if (!response.request.responseURL.endsWith("login") && !response.request.responseURL.endsWith("register") && !response.request.responseURL.endsWith("register/tenants")) {
-      window.parent.postMessage({
-        type: "error",
-        data: JSON.stringify({
-          code: responseData == null ? void 0 : responseData.code,
-          message: responseData == null ? void 0 : responseData.message,
-          action: "toLogin"
-        })
-      }, "*");
+    if (shouldNotifyToLogin((_a = response.request) == null ? void 0 : _a.responseURL)) {
+      notifyToLogin(responseData == null ? void 0 : responseData.code, responseData == null ? void 0 : responseData.message);
     }
     throw new Error(responseData == null ? void 0 : responseData.message);
   } else if (code === TOKEN_REFRESH_CODE) {
     const config = response.config;
     if (config._retry) {
-      window.parent.postMessage({
-        type: "error",
-        data: JSON.stringify({
-          code: responseData == null ? void 0 : responseData.code,
-          message: responseData == null ? void 0 : responseData.message,
-          action: "toLogin"
-        })
-      }, "*");
+      notifyToLogin(responseData == null ? void 0 : responseData.code, responseData == null ? void 0 : responseData.message);
       throw new Error(responseData == null ? void 0 : responseData.message);
     }
     if (!refreshConfig || !store) {
       return response;
     }
     config._retry = true;
-    const newAccessToken = (_a = responseData == null ? void 0 : responseData.data) == null ? void 0 : _a.accessToken;
-    const refreshToken = (_b = responseData == null ? void 0 : responseData.data) == null ? void 0 : _b.refreshToken;
+    const newAccessToken = (_b = responseData == null ? void 0 : responseData.data) == null ? void 0 : _b.accessToken;
+    const refreshToken = (_c = responseData == null ? void 0 : responseData.data) == null ? void 0 : _c.refreshToken;
     const retryFn = async () => {
       const originalRequest = {
         ...config,
@@ -2696,16 +2723,23 @@ async function handleResponseInterceptor(response, store, refreshConfig) {
           ...config.headers
         }
       };
-      if (newAccessToken) {
-        const headerName = (refreshConfig == null ? void 0 : refreshConfig.name) || "Authorization";
-        originalRequest.headers[headerName] = `Bearer ${newAccessToken}`;
+      const headerName = (refreshConfig == null ? void 0 : refreshConfig.name) || "Authorization";
+      const accessToken = getAccessTokenFromStore(store) || newAccessToken;
+      if (accessToken) {
+        originalRequest.headers[headerName] = `Bearer ${accessToken}`;
       }
-      return axios(originalRequest);
+      return axiosInstance.request(originalRequest);
     };
     try {
-      return await handleTokenRefresh(refreshConfig, store, refreshToken, retryFn);
+      return await handleTokenRefresh(
+        refreshConfig,
+        store,
+        refreshToken,
+        retryFn
+      );
     } catch (refreshError) {
-      throw refreshError;
+      return new Promise(() => {
+      });
     }
   } else if (code > 0 && code !== TENANT_SUPER_ADMIN_FIRST_LOGIN_CODE) {
     throw new Error((responseData == null ? void 0 : responseData.message) ?? "请求失败");
@@ -2742,7 +2776,7 @@ class RequestServiceClass {
     this.instance.interceptors.response.use(
       async (response) => {
         try {
-          return await handleResponseInterceptor(response, this.config.store, this.config.refresh);
+          return await handleResponseInterceptor(response, this.config.store, this.config.refresh, this.getInstance());
         } catch (error) {
           return handleResponseError(error);
         }
@@ -2773,7 +2807,7 @@ class RequestServiceClass {
     );
     this.instance.interceptors.response.use(
       async (response) => {
-        return handleResponseInterceptor(response, this.config.store, this.config.refresh);
+        return handleResponseInterceptor(response, this.config.store, this.config.refresh, this.getInstance());
       },
       async (error) => {
         return handleResponseError(error);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@clownlee/cores",
-  "version": "1.0.23",
+  "version": "1.0.25",
   "description": "公共核心库，提供统一的 HTTP 请求能力和自动 token 刷新功能",
   "type": "module",
   "main": "dist/index.js",
@@ -30,7 +30,7 @@
   "author": "",
   "license": "MIT",
   "dependencies": {
-    "@clownlee/http": "^1.0.8",
+    "@clownlee/http": "^1.0.10",
     "pinia": "^2.1.7",
     "vue": "^3.5.25",
     "cropper": "^4.1.0",