@ichaingo/request 1.5.34 → 1.5.36

package/dist/__vite-browser-external-l0sNRNKZ.js

@@ -0,0 +1 @@
+

package/dist/index.js

@@ -9,18 +9,40 @@ const isSimplifiedChinese = () => {
 const matchSystemLanguage = () => {
   return isSimplifiedChinese() ? "zh-hans" : "";
 };
+let httpAgent;
+let httpsAgent;
+function isServerRuntime() {
+  return typeof window === "undefined" || process.env.IS_SERVER === "true";
+}
+function getHeader(config, key) {
+  const h = config.headers;
+  if ((h == null ? void 0 : h.get) && typeof h.get === "function") return h.get(key);
+  return h == null ? void 0 : h[key];
+}
+function setHeader(config, key, value) {
+  const h = config.headers;
+  if ((h == null ? void 0 : h.set) && typeof h.set === "function") {
+    h.set(key, value);
+  } else {
+    h[key] = value;
+  }
+}
 async function commonHeader(config) {
-  var _a;
+  var _a, _b;
   let access_token = "";
   let language = "";
-  if (process.env.IS_SERVER) {
+  if (isServerRuntime()) {
     const http = await import("http");
-    config.httpAgent = new http.Agent({
-      keepAlive: true
-    });
+    const https = await import("./__vite-browser-external-l0sNRNKZ.js");
+    const baseURL = config == null ? void 0 : config.baseURL;
+    const isHttps = typeof baseURL === "string" ? baseURL.startsWith("https://") : false;
+    if (!httpAgent) httpAgent = new http.Agent({ keepAlive: true });
+    if (!httpsAgent) httpsAgent = new https.Agent({ keepAlive: true });
+    config.httpAgent = isHttps ? void 0 : httpAgent;
+    config.httpsAgent = isHttps ? httpsAgent : void 0;
     try {
-      const startLanguage = config.headers.get("Accept-Language");
-      config.headers["x-whistle-nohost-env"] = process.env.NO_HOST_ENV || "ichaingo";
+      const startLanguage = getHeader(config, "Accept-Language");
+      setHeader(config, "x-whistle-nohost-env", process.env.NO_HOST_ENV || "ichaingo");
       const { cookies, headers } = await import("next/headers");
       const cookieStore = await cookies();
       access_token = ((_a = cookieStore.get("access_token")) == null ? void 0 : _a.value) || "";
@@ -33,12 +55,12 @@ async function commonHeader(config) {
     access_token = jsCookie.get("access_token") || "";
     language = jsCookie.get("NEXT_LOCALE") || matchSystemLanguage() || "en";
   }
-  const isRefreshToken = config.headers["isRefreshToken"];
-  config.headers["Accept-Language"] = language;
+  const isRefreshToken = (_b = config.headers) == null ? void 0 : _b["isRefreshToken"];
+  setHeader(config, "Accept-Language", language);
   if (access_token && !isRefreshToken) {
-    config.headers["Authorization"] = `Bearer ${access_token}`;
+    setHeader(config, "Authorization", `Bearer ${access_token}`);
   }
-  config.headers["devicetype"] = 1;
+  setHeader(config, "devicetype", 1);
   return config;
 }
 function buildErrorMessage(err) {
@@ -111,7 +133,9 @@ function ResponseInterceptor(response) {
     return response;
   }
   if (response.status === 401) {
-    TokenManager.removeAllToken();
+    if (typeof window !== "undefined") {
+      TokenManager.removeAllToken();
+    }
     return response;
   }
   if (response.status === 200) {
@@ -169,23 +193,44 @@ const axiosInstance$1 = axios.create({
   }
 });
 async function refreshToken(config) {
+  if (typeof window === "undefined" || process.env.IS_SERVER === "true") {
+    return config;
+  }
+  if (typeof config.url === "string" && config.url.includes("/api/refresh/token")) {
+    return config;
+  }
   const headers = config.headers;
   if (refreshPromise) {
     await refreshPromise;
     return config;
   }
-  if (await isTokenExpired()) {
+  let expired = false;
+  try {
+    expired = await isTokenExpired();
+  } catch {
+    expired = false;
+  }
+  if (expired) {
+    const refresh_token = getToken("refresh_token");
+    if (!refresh_token) {
+      removeAllToken();
+      return config;
+    }
     if (refreshPromise) {
       await refreshPromise;
       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: getToken("refresh_token")
+        refresh_token
       },
       headers: {
-        ...headers
+        ...refreshHeaders
       }
     }).then((res) => {
       var _a;
@@ -207,7 +252,7 @@ async function refreshToken(config) {
 }
 const axiosInstance = axios.create({
   baseURL: process.env.INNER_API_URL || process.env.NEXT_PUBLIC_API_URL,
-  timeout: 1e4,
+  timeout: Number(process.env.NEXT_PUBLIC_REQUEST_TIMEOUT_MS) || 1e4,
   withCredentials: true,
   // Always include credentials by default
   // Treat HTTP 401 as a non-error response so it goes through responseInterceptor.

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;AAErE,wBAAsB,YAAY,CAChC,MAAM,EAAE,0BAA0B,4CAmCnC"}
+{"version":3,"file":"commonHeader.d.ts","sourceRoot":"","sources":["../../src/interceptors/commonHeader.ts"],"names":[],"mappings":"AAEA,OAAO,EAAoB,0BAA0B,EAAE,MAAM,OAAO,CAAC;AAwBrE,wBAAsB,YAAY,CAChC,MAAM,EAAE,0BAA0B,4CAwCnC"}

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,EAAE,0BAA0B,EAAE,MAAM,OAAO,CAAC;AAY1D,wBAA8B,YAAY,CACxC,MAAM,EAAE,0BAA0B,4CAyCnC"}
+{"version":3,"file":"refreshToken.d.ts","sourceRoot":"","sources":["../../src/interceptors/refreshToken.ts"],"names":[],"mappings":"AAAA,OAAc,EAAE,0BAA0B,EAAE,MAAM,OAAO,CAAC;AAY1D,wBAA8B,YAAY,CACxC,MAAM,EAAE,0BAA0B,4CAqEnC"}

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,CAoDxE"}
+{"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ichaingo/request",
-  "version": "1.5.34",
+  "version": "1.5.36",
   "type": "module",
   "main": "./dist/index.js",
   "module": "./dist/index.js",
@@ -26,7 +26,7 @@
     "js-cookie": "3.0.5",
     "next": "15.5.6",
     "qs": "6.14.0",
-    "@ichaingo/token": "1.5.34",
-    "@ichaingo/logger": "1.5.34"
+    "@ichaingo/logger": "1.5.36",
+    "@ichaingo/token": "1.5.36"
   }
 }