@ichaingo/request 1.4.12 → 1.4.14

package/dist/index.js

@@ -1,159 +1,216 @@
-import E, { isAxiosError as C, AxiosError as w } from "axios";
-import A from "qs";
-import $ from "js-cookie";
-import { logger as U } from "@ichaingo/logger";
-import q, { isTokenExpired as O, getToken as b, removeAllToken as P } from "@ichaingo/token";
-const B = () => /^(zh-hans|zh-cn|zh-sg|zh-my)$/.test(window == null ? void 0 : window.navigator.language.toLowerCase()), S = () => B() ? "zh-hans" : "";
-async function z(e) {
-  var n;
-  let t = "", s = "";
+import axios, { isAxiosError, AxiosError } from "axios";
+import qs from "qs";
+import jsCookie from "js-cookie";
+import { logger } from "@ichaingo/logger";
+import TokenManager, { isTokenExpired, getToken, removeAllToken } from "@ichaingo/token";
+const isSimplifiedChinese = () => {
+  return /^(zh-hans|zh-cn|zh-sg|zh-my)$/.test(window == null ? void 0 : window.navigator.language.toLowerCase());
+};
+const matchSystemLanguage = () => {
+  return isSimplifiedChinese() ? "zh-hans" : "";
+};
+async function commonHeader(config) {
+  var _a;
+  let access_token = "";
+  let language = "";
   if (process.env.IS_SERVER) {
-    const c = await import("http");
-    e.httpAgent = new c.Agent({
-      keepAlive: !0
+    const http = await import("http");
+    config.httpAgent = new http.Agent({
+      keepAlive: true
     });
     try {
-      const r = e.headers.get("Accept-Language");
-      e.headers["x-whistle-nohost-env"] = process.env.NO_HOST_ENV || "ichaingo";
-      const { cookies: i, headers: u } = await import("next/headers");
-      t = ((n = (await i()).get("access_token")) == null ? void 0 : n.value) || "";
-      const d = await u();
-      s = r || d.get("x-next-intl-locale") || "en";
-    } catch (r) {
-      console.error("Error accessing cookies in server component:", r);
+      const startLanguage = config.headers.get("Accept-Language");
+      config.headers["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) || "";
+      const hList = await headers();
+      language = startLanguage || hList.get("x-next-intl-locale") || "en";
+    } catch (error) {
+      console.error("Error accessing cookies in server component:", error);
     }
-  } else
-    t = $.get("access_token") || "", s = $.get("NEXT_LOCALE") || S() || "en";
-  const a = e.headers.isRefreshToken;
-  return e.headers["Accept-Language"] = s, t && !a && (e.headers.Authorization = `Bearer ${t}`), e.headers.devicetype = 1, e;
+  } else {
+    access_token = jsCookie.get("access_token") || "";
+    language = jsCookie.get("NEXT_LOCALE") || matchSystemLanguage() || "en";
+  }
+  const isRefreshToken = config.headers["isRefreshToken"];
+  config.headers["Accept-Language"] = language;
+  if (access_token && !isRefreshToken) {
+    config.headers["Authorization"] = `Bearer ${access_token}`;
+  }
+  config.headers["devicetype"] = 1;
+  return config;
 }
-function H(e) {
-  var g, l, o, y, L, R, f, p, _, I, k;
-  const t = (l = (g = e.config) == null ? void 0 : g.method) == null ? void 0 : l.toUpperCase(), s = ((o = e.config) == null ? void 0 : o.baseURL) || "", a = (y = e.config) != null && y.url ? `${s || ""}${e.config.url}` : "", n = (L = e.response) == null ? void 0 : L.status, c = (R = e.response) == null ? void 0 : R.statusText, r = (f = e.response) == null ? void 0 : f.data, i = ((_ = (p = e.response) == null ? void 0 : p.headers) == null ? void 0 : _["x-request-id"]) || ((I = r == null ? void 0 : r.status) == null ? void 0 : I.requestId), u = (r == null ? void 0 : r.message) || (r == null ? void 0 : r.msg) || ((k = r == null ? void 0 : r.status) == null ? void 0 : k.msg), m = [
-    n ? `HTTP ${n}` : "HTTP ERROR",
-    t,
-    a,
-    c
-  ].filter(Boolean).join(" | "), d = u ? `server: ${u}` : void 0, h = i ? `requestId=${i}` : void 0;
-  return [m, d, h].filter(Boolean).join(" | ");
+function buildErrorMessage(err) {
+  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k;
+  const method = (_b = (_a = err.config) == null ? void 0 : _a.method) == null ? void 0 : _b.toUpperCase();
+  const baseURL = ((_c = err.config) == null ? void 0 : _c.baseURL) || "";
+  const url = ((_d = err.config) == null ? void 0 : _d.url) ? `${baseURL || ""}${err.config.url}` : "";
+  const status = (_e = err.response) == null ? void 0 : _e.status;
+  const statusText = (_f = err.response) == null ? void 0 : _f.statusText;
+  const respData = (_g = err.response) == null ? void 0 : _g.data;
+  const requestId = ((_i = (_h = err.response) == null ? void 0 : _h.headers) == null ? void 0 : _i["x-request-id"]) || ((_j = respData == null ? void 0 : respData.status) == null ? void 0 : _j.requestId);
+  const serverMsg = (respData == null ? void 0 : respData.message) || (respData == null ? void 0 : respData.msg) || ((_k = respData == null ? void 0 : respData.status) == null ? void 0 : _k.msg);
+  const summary = [
+    status ? `HTTP ${status}` : "HTTP ERROR",
+    method,
+    url,
+    statusText
+  ].filter(Boolean).join(" | ");
+  const shortMsg = serverMsg ? `server: ${serverMsg}` : void 0;
+  const ridMsg = requestId ? `requestId=${requestId}` : void 0;
+  return [summary, shortMsg, ridMsg].filter(Boolean).join(" | ");
 }
-function x(e) {
-  var c, r, i, u, m, d, h, g, l;
-  const t = e.config;
-  let s = t == null ? void 0 : t.data;
-  if (typeof s == "string")
+function buildDetails(err) {
+  var _a, _b, _c, _d, _e, _f, _g, _h, _i;
+  const cfg = err.config;
+  let body = cfg == null ? void 0 : cfg.data;
+  if (typeof body === "string") {
     try {
-      s = JSON.parse(s);
+      body = JSON.parse(body);
     } catch {
     }
-  const a = t == null ? void 0 : t.baseURL, n = t != null && t.url ? a ? `${a}${t.url}` : t.url : void 0;
+  }
+  const baseURL = cfg == null ? void 0 : cfg.baseURL;
+  const url = (cfg == null ? void 0 : cfg.url) ? baseURL ? `${baseURL}${cfg.url}` : cfg.url : void 0;
   return {
-    method: (c = t == null ? void 0 : t.method) == null ? void 0 : c.toUpperCase(),
-    url: n,
-    params: t == null ? void 0 : t.params,
-    data: s,
-    status: (r = e.response) == null ? void 0 : r.status,
-    statusText: (i = e.response) == null ? void 0 : i.statusText,
-    requestId: ((m = (u = e.response) == null ? void 0 : u.headers) == null ? void 0 : m["x-request-id"]) || ((g = (h = (d = e.response) == null ? void 0 : d.data) == null ? void 0 : h.status) == null ? void 0 : g.requestId),
-    responseData: (l = e.response) == null ? void 0 : l.data
+    method: (_a = cfg == null ? void 0 : cfg.method) == null ? void 0 : _a.toUpperCase(),
+    url,
+    params: cfg == null ? void 0 : cfg.params,
+    data: body,
+    status: (_b = err.response) == null ? void 0 : _b.status,
+    statusText: (_c = err.response) == null ? void 0 : _c.statusText,
+    requestId: ((_e = (_d = err.response) == null ? void 0 : _d.headers) == null ? void 0 : _e["x-request-id"]) || ((_h = (_g = (_f = err.response) == null ? void 0 : _f.data) == null ? void 0 : _g.status) == null ? void 0 : _h.requestId),
+    responseData: (_i = err.response) == null ? void 0 : _i.data
   };
 }
-function N(e) {
-  var n, c, r, i;
-  const t = C(e) ? e : new w(String(e));
-  if (t.code === "ECONNABORTED" || /timeout/i.test(t.message || "")) {
-    const u = (c = (n = t.config) == null ? void 0 : n.method) == null ? void 0 : c.toUpperCase(), m = ((r = t.config) == null ? void 0 : r.baseURL) || "", d = (i = t.config) != null && i.url ? `${m || ""}${t.config.url}` : "", h = ["TIMEOUT", u, d].filter(Boolean).join(" | ");
-    return t.summary = h, t.details = JSON.stringify(x(t)), U.error({ message: h, details: t.details, errType: "timeout" }), Promise.reject(t);
+function errorInterceptor(error) {
+  var _a, _b, _c, _d;
+  const err = isAxiosError(error) ? error : new AxiosError(String(error));
+  const isTimeout = err.code === "ECONNABORTED" || /timeout/i.test(err.message || "");
+  if (isTimeout) {
+    const method = (_b = (_a = err.config) == null ? void 0 : _a.method) == null ? void 0 : _b.toUpperCase();
+    const baseURL = ((_c = err.config) == null ? void 0 : _c.baseURL) || "";
+    const url = ((_d = err.config) == null ? void 0 : _d.url) ? `${baseURL || ""}${err.config.url}` : "";
+    const summary = [`TIMEOUT`, method, url].filter(Boolean).join(" | ");
+    err.summary = summary;
+    err.details = JSON.stringify(buildDetails(err));
+    logger.error({ message: summary, details: err.details, errType: "timeout" });
+    return Promise.reject(err);
   }
-  const a = H(t);
-  return t.summary = a, t.details = JSON.stringify(x(t)), U.error({ message: a, details: t.details, errType: "server error" }), Promise.reject(t);
+  const message = buildErrorMessage(err);
+  err.summary = message;
+  err.details = JSON.stringify(buildDetails(err));
+  logger.error({ message, details: err.details, errType: "server error" });
+  return Promise.reject(err);
 }
-function j(e) {
-  var s, a, n, c, r, i, u, m, d, h, g;
-  const t = e.config;
-  if (t.returnFullResponse)
-    return e;
-  if (e.status === 401) {
-    q.removeAllToken();
-    const l = ((s = t == null ? void 0 : t.headers) == null ? void 0 : s["Accept-Language"]) || "en";
-    return window.location.href = `${process.env.NEXT_PUBLIC_AUTH_URL}/${l}/login`, e;
+function ResponseInterceptor(response) {
+  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k;
+  const config = response.config;
+  if (config.returnFullResponse) {
+    return response;
   }
-  if (e.status === 200) {
-    if ((a = e.headers["content-type"]) != null && a.includes("text/event-stream"))
-      return e;
-    const l = e.data, o = l.status;
-    if (o && typeof o.code == "number" && ![0, 200].includes(o.code) && o.code !== 401) {
-      const y = new w(
-        (o == null ? void 0 : o.msg) || "Business error",
-        String(o.code),
-        e.config,
-        e.request,
-        e
-      ), L = `BIZ ${o.code} | ${(c = (n = e.config) == null ? void 0 : n.method) == null ? void 0 : c.toUpperCase()} | ${((r = e.config) == null ? void 0 : r.baseURL) || ""}${((i = e.config) == null ? void 0 : i.url) || ""} | server: ${o == null ? void 0 : o.msg}`, R = {
-        method: (m = (u = e.config) == null ? void 0 : u.method) == null ? void 0 : m.toUpperCase(),
-        url: (d = e.config) != null && d.baseURL ? `${e.config.baseURL}${e.config.url || ""}` : e.config.url,
-        params: (h = e.config) == null ? void 0 : h.params,
+  if (response.status === 401) {
+    TokenManager.removeAllToken();
+    const locale = ((_a = config == null ? void 0 : config.headers) == null ? void 0 : _a["Accept-Language"]) || "en";
+    window.location.href = `${process.env.NEXT_PUBLIC_AUTH_URL}/${locale}/login`;
+    return response;
+  }
+  if (response.status === 200) {
+    if ((_b = response.headers["content-type"]) == null ? void 0 : _b.includes("text/event-stream")) {
+      return response;
+    }
+    const data = response.data;
+    const businessStatus = data.status;
+    if (businessStatus && typeof businessStatus.code === "number" && ![0, 200].includes(businessStatus.code) && businessStatus.code !== 401) {
+      const err = new AxiosError(
+        (businessStatus == null ? void 0 : businessStatus.msg) || "Business error",
+        String(businessStatus.code),
+        response.config,
+        response.request,
+        response
+      );
+      const summary = `BIZ ${businessStatus.code} | ${(_d = (_c = response.config) == null ? void 0 : _c.method) == null ? void 0 : _d.toUpperCase()} | ${((_e = response.config) == null ? void 0 : _e.baseURL) || ""}${((_f = response.config) == null ? void 0 : _f.url) || ""} | server: ${businessStatus == null ? void 0 : businessStatus.msg}`;
+      const details = {
+        method: (_h = (_g = response.config) == null ? void 0 : _g.method) == null ? void 0 : _h.toUpperCase(),
+        url: ((_i = response.config) == null ? void 0 : _i.baseURL) ? `${response.config.baseURL}${response.config.url || ""}` : response.config.url,
+        params: (_j = response.config) == null ? void 0 : _j.params,
         data: (() => {
-          var p;
-          let f = (p = e.config) == null ? void 0 : p.data;
-          if (typeof f == "string")
+          var _a2;
+          let d = (_a2 = response.config) == null ? void 0 : _a2.data;
+          if (typeof d === "string") {
             try {
-              f = JSON.parse(f);
+              d = JSON.parse(d);
             } catch {
             }
-          return f;
+          }
+          return d;
         })(),
-        status: e.status,
-        statusText: e.statusText,
-        requestId: ((g = e.headers) == null ? void 0 : g["x-request-id"]) || (o == null ? void 0 : o.requestId),
-        responseData: l
+        status: response.status,
+        statusText: response.statusText,
+        requestId: ((_k = response.headers) == null ? void 0 : _k["x-request-id"]) || (businessStatus == null ? void 0 : businessStatus.requestId),
+        responseData: data
       };
-      throw process.env.NODE_ENV !== "development" && U.error({ summary: L, details: R, errType: "business error" }), y;
+      if (process.env.NODE_ENV !== "development") {
+        logger.error({ summary, details, errType: "business error" });
+      }
+      throw err;
     }
-    return l;
+    return data;
   }
-  return e;
+  return response;
 }
-let T = null;
-const M = E.create({
+let refreshPromise = null;
+const axiosInstance$1 = axios.create({
   baseURL: process.env.NEXT_PUBLIC_AUTH_URL,
   timeout: 1e4,
-  withCredentials: !0,
+  withCredentials: true,
   // Always include credentials by default
-  paramsSerializer: function(e) {
-    return A.stringify(e, { arrayFormat: "brackets" });
+  paramsSerializer: function(params) {
+    return qs.stringify(params, { arrayFormat: "brackets" });
   }
 });
-async function J(e) {
-  const t = e.headers;
-  return T ? (await T, e) : (O() && (T = (async () => {
-    var a;
-    const s = await M.get("/api/refresh/token", {
-      params: {
-        grant_type: "refresh_token",
-        refresh_token: b("refresh_token")
-      },
-      headers: {
-        ...t
+async function refreshToken(config) {
+  const headers = config.headers;
+  if (refreshPromise) {
+    await refreshPromise;
+    return config;
+  }
+  if (isTokenExpired()) {
+    refreshPromise = (async () => {
+      var _a;
+      const res = await axiosInstance$1.get(`/api/refresh/token`, {
+        params: {
+          grant_type: "refresh_token",
+          refresh_token: getToken("refresh_token")
+        },
+        headers: {
+          ...headers
+        }
+      });
+      if (!((_a = res == null ? void 0 : res.data) == null ? void 0 : _a.data)) {
+        removeAllToken();
       }
+      return Promise.resolve();
+    })().finally(() => {
+      refreshPromise = null;
     });
-    return (a = s == null ? void 0 : s.data) != null && a.data || P(), Promise.resolve();
-  })().finally(() => {
-    T = null;
-  }), await T), e);
+    await refreshPromise;
+  }
+  return config;
 }
-const v = E.create({
+const axiosInstance = axios.create({
   baseURL: process.env.ICHAINGO_INNER_API_URL || process.env.NEXT_PUBLIC_ICHAINGO_API_URL,
   timeout: 1e4,
-  withCredentials: !0,
+  withCredentials: true,
   // Always include credentials by default
-  paramsSerializer: function(e) {
-    return A.stringify(e, { arrayFormat: "brackets" });
+  paramsSerializer: function(params) {
+    return qs.stringify(params, { arrayFormat: "brackets" });
   }
 });
-v.interceptors.request.use(J);
-v.interceptors.request.use(z, N);
-v.interceptors.response.use(j, N);
+axiosInstance.interceptors.request.use(refreshToken);
+axiosInstance.interceptors.request.use(commonHeader, errorInterceptor);
+axiosInstance.interceptors.response.use(ResponseInterceptor, errorInterceptor);
 export {
-  v as default
+  axiosInstance as default
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ichaingo/request",
-  "version": "1.4.12",
+  "version": "1.4.14",
   "type": "module",
   "main": "./dist/index.js",
   "module": "./dist/index.js",
@@ -22,8 +22,8 @@
     "js-cookie": "3.0.5",
     "next": "^15.4.5",
     "qs": "6.14.0",
-    "@ichaingo/logger": "1.4.12",
-    "@ichaingo/token": "1.4.12"
+    "@ichaingo/logger": "1.4.14",
+    "@ichaingo/token": "1.4.14"
   },
   "devDependencies": {
     "@types/js-cookie": "^3.0.6",