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

package/dist/index.d.ts

@@ -12,5 +12,6 @@ export interface ApiError extends AxiosError {
 declare const axiosInstance: import('axios').AxiosInstance;
 export default axiosInstance;
 export { setServerHeaderProvider } from './interceptors/commonHeader';
+export { refreshAccessToken, getCurrentAccessToken } from './tokenRefresh';
 export type { ApiRequestConfig, ServerHeaderProvider, Pagination, Status, IResponse, IFilters, IPageRequest, } from './types';
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAc,EAAE,KAAK,UAAU,EAAE,MAAM,OAAO,CAAC;AAQ/C,MAAM,WAAW,WAAW,CAAC,CAAC;IAC5B,MAAM,EAAE;QACN,IAAI,EAAE,MAAM,CAAC;QACb,GAAG,EAAE,MAAM,CAAC;KACb,CAAC;IACF,IAAI,EAAE,CAAC,CAAC;CACT;AAED,MAAM,WAAW,QAAS,SAAQ,UAAU;IAC1C,IAAI,CAAC,EAAE,OAAO,CAAC;CAChB;AAGD,QAAA,MAAM,aAAa,+BAYjB,CAAC;AASH,eAAe,aAAa,CAAC;AAE7B,OAAO,EAAE,uBAAuB,EAAE,MAAM,6BAA6B,CAAC;AAEtE,YAAY,EACV,gBAAgB,EAChB,oBAAoB,EACpB,UAAU,EACV,MAAM,EACN,SAAS,EACT,QAAQ,EACR,YAAY,GACb,MAAM,SAAS,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAc,EAAE,KAAK,UAAU,EAAE,MAAM,OAAO,CAAC;AAQ/C,MAAM,WAAW,WAAW,CAAC,CAAC;IAC5B,MAAM,EAAE;QACN,IAAI,EAAE,MAAM,CAAC;QACb,GAAG,EAAE,MAAM,CAAC;KACb,CAAC;IACF,IAAI,EAAE,CAAC,CAAC;CACT;AAED,MAAM,WAAW,QAAS,SAAQ,UAAU;IAC1C,IAAI,CAAC,EAAE,OAAO,CAAC;CAChB;AAGD,QAAA,MAAM,aAAa,+BAYjB,CAAC;AASH,eAAe,aAAa,CAAC;AAE7B,OAAO,EAAE,uBAAuB,EAAE,MAAM,6BAA6B,CAAC;AAEtE,OAAO,EAAE,kBAAkB,EAAE,qBAAqB,EAAE,MAAM,gBAAgB,CAAC;AAE3E,YAAY,EACV,gBAAgB,EAChB,oBAAoB,EACpB,UAAU,EACV,MAAM,EACN,SAAS,EACT,QAAQ,EACR,YAAY,GACb,MAAM,SAAS,CAAA"}

package/dist/index.js

@@ -1,8 +1,8 @@
 import axios, { isAxiosError, AxiosError } from "axios";
 import qs from "qs";
 import jsCookie from "js-cookie";
+import { envCookieName, getToken, isTokenExpired } from "@0xchain/token";
 import { logger } from "@0xchain/logger";
-import { getToken, setToken, isTokenExpired } from "@0xchain/token";
 const isSimplifiedChinese = () => {
   return /^(zh-hans|zh-cn|zh-sg|zh-my)$/.test(window?.navigator.language.toLowerCase());
 };
@@ -71,7 +71,7 @@ async function commonHeader(config) {
         const startLanguage = getHeader(config, "Accept-Language");
         const { cookies, headers } = await import("next/headers");
         const cookieStore = await cookies();
-        access_token = cookieStore.get("access_token")?.value || "";
+        access_token = cookieStore.get(envCookieName("access_token"))?.value || "";
         const hList = await headers();
         language = startLanguage || hList.get("x-next-intl-locale") || "en";
       } catch (error) {
@@ -79,7 +79,7 @@ async function commonHeader(config) {
       }
     }
   } else {
-    access_token = jsCookie.get("access_token") || "";
+    access_token = jsCookie.get(envCookieName("access_token")) || "";
     language = jsCookie.get("NEXT_LOCALE") || matchSystemLanguage() || "en";
   }
   const isRefreshToken = config.headers?.["isRefreshToken"];
@@ -203,10 +203,16 @@ const refreshClient = axios.create({
   }
 });
 let refreshPromise = null;
+const REFRESH_DEDUPE_MS = 2e3;
+let lastRefreshAt = 0;
+let lastRefreshResult = null;
 function refreshAccessToken() {
   if (refreshPromise) {
     return refreshPromise;
   }
+  if (Date.now() - lastRefreshAt < REFRESH_DEDUPE_MS) {
+    return Promise.resolve(lastRefreshResult);
+  }
   const refresh_token = getToken("refresh_token");
   if (!refresh_token) {
     return Promise.resolve(null);
@@ -222,18 +228,21 @@ function refreshAccessToken() {
   }).then((res) => {
     const data = res?.data?.data;
     if (data?.access_token) {
-      setToken(data);
       return data.access_token;
     }
     return null;
-  }).catch(() => null).finally(() => {
+  }).catch(() => null).then((result) => {
+    lastRefreshAt = Date.now();
+    lastRefreshResult = result;
+    return result;
+  }).finally(() => {
     refreshPromise = null;
   });
   refreshPromise = pending;
   return pending;
 }
 function getCurrentAccessToken() {
-  return jsCookie.get("access_token") || getToken("access_token") || "";
+  return jsCookie.get(envCookieName("access_token")) || getToken("access_token") || "";
 }
 function shouldSkipRefresh(config) {
   const url = typeof config?.url === "string" ? config.url : "";
@@ -361,5 +370,7 @@ axiosInstance.interceptors.request.use(commonHeader, errorInterceptor);
 axiosInstance.interceptors.response.use(createResponseInterceptor(axiosInstance), errorInterceptor);
 export {
   axiosInstance as default,
+  getCurrentAccessToken,
+  refreshAccessToken,
   setServerHeaderProvider
 };

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

@@ -1 +1 @@
-{"version":3,"file":"commonHeader.d.ts","sourceRoot":"","sources":["../../src/interceptors/commonHeader.ts"],"names":[],"mappings":"AAEA,OAAO,EAAoB,0BAA0B,EAAE,MAAM,OAAO,CAAC;AACrE,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,UAAU,CAAC;AAQrD,wBAAgB,uBAAuB,CAAC,QAAQ,EAAE,oBAAoB,QAErE;AAyBD,wBAAsB,YAAY,CAChC,MAAM,EAAE,0BAA0B,4CAwDnC"}
+{"version":3,"file":"commonHeader.d.ts","sourceRoot":"","sources":["../../src/interceptors/commonHeader.ts"],"names":[],"mappings":"AAGA,OAAO,EAAoB,0BAA0B,EAAE,MAAM,OAAO,CAAC;AACrE,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,UAAU,CAAC;AAQrD,wBAAgB,uBAAuB,CAAC,QAAQ,EAAE,oBAAoB,QAErE;AAyBD,wBAAsB,YAAY,CAChC,MAAM,EAAE,0BAA0B,4CAwDnC"}

package/dist/tokenRefresh.d.ts

@@ -1,5 +1,9 @@
 /**
- * 触发一次 token 刷新；并发调用共享同一个在途请求。
+ * 触发一次 token 刷新；并发/紧邻调用共享同一个结果。
+ *
+ * 关键设计：cookie 由服务端 `/api/refresh/token` 的 Set-Cookie 统一写入，
+ * 客户端这里「绝不」再用 js-cookie 写一遍，避免双写竞态把 cookie 写坏。
+ *
  * @returns 新的 access_token；刷新失败返回 null。
  */
 export declare function refreshAccessToken(): Promise<string | null>;

package/dist/tokenRefresh.d.ts.map

@@ -1 +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"}
+{"version":3,"file":"tokenRefresh.d.ts","sourceRoot":"","sources":["../src/tokenRefresh.ts"],"names":[],"mappings":"AAqCA;;;;;;;GAOG;AACH,wBAAgB,kBAAkB,IAAI,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CA6C3D;AAED,wBAAgB,qBAAqB,IAAI,MAAM,CAE9C"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@0xchain/request",
-  "version": "1.1.0-beta.63",
+  "version": "1.1.0-beta.64",
   "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.63",
-    "@0xchain/token": "1.1.0-beta.63"
+    "@0xchain/logger": "1.1.0-beta.64",
+    "@0xchain/token": "1.1.0-beta.64"
   },
   "nx": {
     "tags": [