@0xchain/request 1.1.0-beta.61 → 1.1.0-beta.63

package/dist/index.js

@@ -1,8 +1,8 @@
 import axios, { isAxiosError, AxiosError } from "axios";
 import qs from "qs";
-import Cookies from "js-cookie";
+import jsCookie from "js-cookie";
 import { logger } from "@0xchain/logger";
-import TokenManager, { isTokenExpired, getToken, removeAllToken, setToken } from "@0xchain/token";
+import { getToken, setToken, isTokenExpired } from "@0xchain/token";
 const isSimplifiedChinese = () => {
   return /^(zh-hans|zh-cn|zh-sg|zh-my)$/.test(window?.navigator.language.toLowerCase());
 };
@@ -79,8 +79,8 @@ async function commonHeader(config) {
       }
     }
   } else {
-    access_token = Cookies.get("access_token") || "";
-    language = Cookies.get("NEXT_LOCALE") || matchSystemLanguage() || "en";
+    access_token = jsCookie.get("access_token") || "";
+    language = jsCookie.get("NEXT_LOCALE") || matchSystemLanguage() || "en";
   }
   const isRefreshToken = config.headers?.["isRefreshToken"];
   setHeader(config, "Accept-Language", language);
@@ -193,15 +193,58 @@ function errorInterceptor(error) {
   logger.error({ message, details: err.details, errType: "server error" });
   return Promise.reject(err);
 }
-function ResponseInterceptor(response) {
-  const config = response.config;
-  if (config.returnFullResponse) {
-    return response;
+const refreshBaseURL = typeof window !== "undefined" ? process.env.NEXT_PUBLIC_AUTH_URL || window.location.origin : process.env.AUTH_INNER_API_URL || process.env.NEXT_PUBLIC_AUTH_URL;
+const refreshClient = axios.create({
+  baseURL: refreshBaseURL,
+  timeout: 1e4,
+  withCredentials: true,
+  paramsSerializer(params) {
+    return qs.stringify(params, { arrayFormat: "brackets" });
+  }
+});
+let refreshPromise = null;
+function refreshAccessToken() {
+  if (refreshPromise) {
+    return refreshPromise;
   }
-  if (response.status === 401) {
-    if (typeof window !== "undefined") {
-      TokenManager.removeAllToken();
+  const refresh_token = getToken("refresh_token");
+  if (!refresh_token) {
+    return Promise.resolve(null);
+  }
+  const pending = refreshClient.get("/api/refresh/token", {
+    params: {
+      grant_type: "refresh_token",
+      refresh_token
+    },
+    headers: {
+      isRefreshToken: true
+    }
+  }).then((res) => {
+    const data = res?.data?.data;
+    if (data?.access_token) {
+      setToken(data);
+      return data.access_token;
     }
+    return null;
+  }).catch(() => null).finally(() => {
+    refreshPromise = null;
+  });
+  refreshPromise = pending;
+  return pending;
+}
+function getCurrentAccessToken() {
+  return jsCookie.get("access_token") || getToken("access_token") || "";
+}
+function shouldSkipRefresh(config) {
+  const url = typeof config?.url === "string" ? config.url : "";
+  if (url.includes("/api/refresh/token")) return true;
+  if (url.includes("/v2/auth/")) return true;
+  if (config?.headers?.isRefreshToken) return true;
+  return false;
+}
+function handleBusinessResponse(response) {
+  const config = response.config;
+  if (config.returnFullResponse) {
     return response;
   }
   if (response.status === 200) {
@@ -247,6 +290,23 @@ function ResponseInterceptor(response) {
   }
   return response;
 }
+function createResponseInterceptor(instance) {
+  return async function ResponseInterceptor(response) {
+    if (response.status === 401) {
+      const config = response.config;
+      const canRetry = !isServerRuntime() && !shouldSkipRefresh(config) && !config.__isRetryAfterRefresh;
+      if (canRetry) {
+        const newAccessToken = await refreshAccessToken();
+        if (newAccessToken) {
+          config.__isRetryAfterRefresh = true;
+          return instance(config);
+        }
+      }
+      return response;
+    }
+    return handleBusinessResponse(response);
+  };
+}
 function setAuthHeader(config, accessToken) {
   const value = `Bearer ${accessToken}`;
   const h = config.headers;
@@ -256,16 +316,6 @@ function setAuthHeader(config, accessToken) {
     h.Authorization = value;
   }
 }
-let refreshPromise = null;
-const axiosInstance$1 = axios.create({
-  baseURL: process.env.AUTH_INNER_API_URL || process.env.NEXT_PUBLIC_AUTH_URL,
-  timeout: 1e4,
-  withCredentials: true,
-  // Always include credentials by default
-  paramsSerializer: function(params) {
-    return qs.stringify(params, { arrayFormat: "brackets" });
-  }
-});
 async function refreshToken(config) {
   if (isServerRuntime()) {
     return config;
@@ -273,13 +323,10 @@ async function refreshToken(config) {
   if (typeof config.url === "string" && config.url.includes("/api/refresh/token")) {
     return config;
   }
-  const headers = config.headers;
-  if (refreshPromise) {
-    await refreshPromise;
-    const accessAfterWait = Cookies.get("access_token") || getToken("access_token");
-    if (accessAfterWait) {
-      setAuthHeader(config, accessAfterWait);
-    }
+  if (typeof config.url === "string" && config.url.includes("/v2/auth/")) {
+    return config;
+  }
+  if (config.headers?.isRefreshToken) {
     return config;
   }
   let expired = false;
@@ -289,49 +336,10 @@ async function refreshToken(config) {
     expired = false;
   }
   if (expired) {
-    const refresh_token = getToken("refresh_token");
-    if (!refresh_token) {
-      removeAllToken();
-      return config;
-    }
-    if (refreshPromise) {
-      await refreshPromise;
-      const accessAfterWait = Cookies.get("access_token") || getToken("access_token");
-      if (accessAfterWait) {
-        setAuthHeader(config, accessAfterWait);
-      }
-      return config;
-    }
-    const refreshHeaders = { ...headers };
-    delete refreshHeaders.Authorization;
-    delete refreshHeaders.authorization;
-    refreshHeaders.isRefreshToken = true;
-    refreshPromise = axiosInstance$1.get(`/api/refresh/token`, {
-      params: {
-        grant_type: "refresh_token",
-        refresh_token
-      },
-      headers: {
-        ...refreshHeaders
-      }
-    }).then((res) => {
-      if (res?.data?.data) {
-        setToken(res.data.data);
-        return res.data.data;
-      } else {
-        removeAllToken();
-        return null;
-      }
-    }).catch(() => {
-      removeAllToken();
-      return null;
-    }).finally(() => {
-      refreshPromise = null;
-    });
-    await refreshPromise;
-    const accessAfterRefresh = Cookies.get("access_token") || getToken("access_token");
-    if (accessAfterRefresh) {
-      setAuthHeader(config, accessAfterRefresh);
+    const newAccessToken = await refreshAccessToken();
+    const accessToken = newAccessToken || getCurrentAccessToken();
+    if (accessToken) {
+      setAuthHeader(config, accessToken);
     }
   }
   return config;
@@ -350,7 +358,7 @@ const axiosInstance = axios.create({
 });
 axiosInstance.interceptors.request.use(refreshToken);
 axiosInstance.interceptors.request.use(commonHeader, errorInterceptor);
-axiosInstance.interceptors.response.use(ResponseInterceptor, errorInterceptor);
+axiosInstance.interceptors.response.use(createResponseInterceptor(axiosInstance), errorInterceptor);
 export {
   axiosInstance as default,
   setServerHeaderProvider

package/dist/interceptors/refreshToken.d.ts

@@ -1,3 +1,7 @@
 import { InternalAxiosRequestConfig } from 'axios';
+/**
+ * 请求前的「预测式刷新」：若本地判断 access_token 即将/已过期，提前刷新。
+ * 这是一层优化；真正的兜底由响应拦截器的 401 自动刷新+重放保证。
+ */
 export default function refreshToken(config: InternalAxiosRequestConfig): Promise<InternalAxiosRequestConfig<any>>;
 //# sourceMappingURL=refreshToken.d.ts.map

package/dist/interceptors/refreshToken.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"refreshToken.d.ts","sourceRoot":"","sources":["../../src/interceptors/refreshToken.ts"],"names":[],"mappings":"AAAA,OAAc,EAAoB,0BAA0B,EAAE,MAAM,OAAO,CAAC;AAwB5E,wBAA8B,YAAY,CACxC,MAAM,EAAE,0BAA0B,4CAkFnC"}
+{"version":3,"file":"refreshToken.d.ts","sourceRoot":"","sources":["../../src/interceptors/refreshToken.ts"],"names":[],"mappings":"AAAA,OAAO,EAAoB,0BAA0B,EAAE,MAAM,OAAO,CAAC;AAerE;;;GAGG;AACH,wBAA8B,YAAY,CACxC,MAAM,EAAE,0BAA0B,4CAkCnC"}

package/dist/interceptors/response.d.ts

@@ -1,3 +1,13 @@
-import { AxiosResponse } from 'axios';
-export default function ResponseInterceptor(response: AxiosResponse): any;
+import { AxiosInstance, AxiosResponse } from 'axios';
+/**
+ * 响应拦截器工厂。
+ *
+ * 业界标准 401 处理：业务接口返回 401 时，用 refresh_token 刷新一次并重放原请求；
+ * 仅当刷新失败时把 401 透传给上层（由显式 logout 决定是否清登录态）。
+ * - 仅在客户端重试（SSR 无 cookie jar）。
+ * - 每个请求最多重试一次，避免死循环。
+ * - /v2/auth/*、刷新接口本身不触发重试。
+ */
+export declare function createResponseInterceptor(instance: AxiosInstance): (response: AxiosResponse) => Promise<any>;
+export default createResponseInterceptor;
 //# sourceMappingURL=response.d.ts.map

package/dist/interceptors/response.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"response.d.ts","sourceRoot":"","sources":["../../src/interceptors/response.ts"],"names":[],"mappings":"AAAA,OAAO,EAAc,aAAa,EAAE,MAAM,OAAO,CAAC;AAKlD,MAAM,CAAC,OAAO,UAAU,mBAAmB,CAAC,QAAQ,EAAE,aAAa,GAAG,GAAG,CAuDxE"}
+{"version":3,"file":"response.d.ts","sourceRoot":"","sources":["../../src/interceptors/response.ts"],"names":[],"mappings":"AAAA,OAAO,EAAc,aAAa,EAAE,aAAa,EAA8B,MAAM,OAAO,CAAC;AAqE7F;;;;;;;;GAQG;AACH,wBAAgB,yBAAyB,CAAC,QAAQ,EAAE,aAAa,IACrB,UAAU,aAAa,KAAG,OAAO,CAAC,GAAG,CAAC,CAoBjF;AAED,eAAe,yBAAyB,CAAC"}

package/dist/tokenRefresh.d.ts

@@ -0,0 +1,7 @@
+/**
+ * 触发一次 token 刷新；并发调用共享同一个在途请求。
+ * @returns 新的 access_token；刷新失败返回 null。
+ */
+export declare function refreshAccessToken(): Promise<string | null>;
+export declare function getCurrentAccessToken(): string;
+//# sourceMappingURL=tokenRefresh.d.ts.map

package/dist/tokenRefresh.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"tokenRefresh.d.ts","sourceRoot":"","sources":["../src/tokenRefresh.ts"],"names":[],"mappings":"AA+BA;;;GAGG;AACH,wBAAgB,kBAAkB,IAAI,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAmC3D;AAED,wBAAgB,qBAAqB,IAAI,MAAM,CAE9C"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@0xchain/request",
-  "version": "1.1.0-beta.61",
+  "version": "1.1.0-beta.63",
   "type": "module",
   "main": "./dist/index.js",
   "module": "./dist/index.js",
@@ -32,8 +32,8 @@
     "qs": "6.14.0"
   },
   "dependencies": {
-    "@0xchain/logger": "1.1.0-beta.61",
-    "@0xchain/token": "1.1.0-beta.61"
+    "@0xchain/logger": "1.1.0-beta.63",
+    "@0xchain/token": "1.1.0-beta.63"
   },
   "nx": {
     "tags": [