@ichaingo/request 1.3.3 → 1.3.4

package/dist/index.js

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

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,4CA2BnC"}
+{"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,4CAgCnC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ichaingo/request",
-  "version": "1.3.3",
+  "version": "1.3.4",
   "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.3.3",
-    "@ichaingo/token": "1.3.3"
+    "@ichaingo/logger": "1.3.4",
+    "@ichaingo/token": "1.3.4"
   },
   "devDependencies": {
     "@types/js-cookie": "^3.0.6",