phx-react 1.3.940 → 1.3.942

package/dist/cjs/axiosInstance.js

@@ -3,80 +3,41 @@ exports.__esModule = true;
 exports.PHXAxiosInstance = void 0;
 var tslib_1 = require("tslib");
 var axios_1 = tslib_1.__importDefault(require("axios"));
+var async_lock_1 = tslib_1.__importDefault(require("async-lock"));
 var read_env_config_1 = require("./read-env-config");
 var constants_1 = require("./utils/constants");
 var saveCookiesClient_1 = tslib_1.__importDefault(require("./components/Func/saveCookiesClient"));
 var getCookieSession_1 = tslib_1.__importDefault(require("./components/Func/getCookieSession"));
 var headers_1 = require("next/headers");
-var isRefreshing = false;
-var failedQueue = [];
+var lock = new async_lock_1["default"]();
+var isServer = typeof window === 'undefined';
 var publicUrl = (0, read_env_config_1.getEnv)('NEXT_PUBLIC_API_GATEWAY', process.env.NEXT_PUBLIC_API_GATEWAY);
 var internalUrl = (0, read_env_config_1.getEnv)('NEXT_PUBLIC_API_GATEWAY_INTERNAL', process.env.NEXT_PUBLIC_API_GATEWAY_INTERNAL);
-var isServer = typeof window === 'undefined';
-var processQueue = function (error, token) {
-    if (token === void 0) { token = null; }
-    failedQueue.forEach(function (prom) {
-        if (error) {
-            prom.reject(error);
-        }
-        else {
-            prom.resolve(token);
-        }
-    });
-    failedQueue = [];
-};
 var PHXAxiosInstance = axios_1["default"].create({
     baseURL: publicUrl
 });
 exports.PHXAxiosInstance = PHXAxiosInstance;
+// === GLOBAL CACHE ===
+var accessTokenCache = null;
+var refreshingPromise = null;
+// Lấy header (cookie + origin) khi chạy SSR
 var getAuthHeaders = function () {
-    if (isServer) {
-        // Server-side
-        var cookieStore = (0, headers_1.cookies)();
-        var cookieHeader = cookieStore
-            .getAll()
-            .map(function (_a) {
-            var name = _a.name, value = _a.value;
-            return "".concat(name, "=").concat(value);
-        })
-            .join('; ');
-        return {
-            Cookie: cookieHeader,
-            hostname: (0, headers_1.headers)().get('origin')
-        };
-    }
-    return {};
+    if (!isServer)
+        return {};
+    var cookieStore = (0, headers_1.cookies)();
+    var cookieHeader = cookieStore
+        .getAll()
+        .map(function (_a) {
+        var name = _a.name, value = _a.value;
+        return "".concat(name, "=").concat(value);
+    })
+        .join('; ');
+    return {
+        Cookie: cookieHeader,
+        hostname: (0, headers_1.headers)().get('origin') || undefined
+    };
 };
-var refreshAccessToken = function () { return tslib_1.__awaiter(void 0, void 0, void 0, function () {
-    var response, newToken, currentSession, err_1;
-    return tslib_1.__generator(this, function (_a) {
-        switch (_a.label) {
-            case 0:
-                _a.trys.push([0, 2, , 3]);
-                return [4 /*yield*/, axios_1["default"].post("".concat(isServer ? (0, headers_1.headers)().get('origin') : '', "/api/authenticate/refresh-token"), {}, {
-                        headers: getAuthHeaders()
-                    })];
-            case 1:
-                response = _a.sent();
-                newToken = response.data.token;
-                currentSession = (0, getCookieSession_1["default"])();
-                (0, saveCookiesClient_1["default"])({ value: tslib_1.__assign(tslib_1.__assign({}, currentSession), { access_token: newToken }) });
-                if (isServer) {
-                    // save refresh token from server site
-                    saveRefreshTokenServer(response);
-                }
-                return [2 /*return*/, newToken];
-            case 2:
-                err_1 = _a.sent();
-                if (!isServer) {
-                    // Cookies.remove(COOKIE_SESSION_SIGN_IN)
-                    window.location.href = constants_1.loginPage;
-                }
-                throw err_1;
-            case 3: return [2 /*return*/];
-        }
-    });
-}); };
+// Lưu lại refresh token từ header của response (chỉ SSR)
 var saveRefreshTokenServer = function (response) {
     var _a;
     var setCookieHeader = ((_a = response.headers['set-cookie']) === null || _a === void 0 ? void 0 : _a[0]) || '';
@@ -90,23 +51,71 @@ var saveRefreshTokenServer = function (response) {
         expires: new Date(Date.now() + 365 * 24 * 60 * 60 * 1000)
     });
 };
+// Hàm refresh access token, chỉ gọi 1 lần duy nhất tại một thời điểm
+var refreshAccessToken = function () { return tslib_1.__awaiter(void 0, void 0, void 0, function () {
+    return tslib_1.__generator(this, function (_a) {
+        if (!refreshingPromise) {
+            refreshingPromise = lock.acquire(constants_1.COOKIE_REFRESH_TOKEN, function () { return tslib_1.__awaiter(void 0, void 0, void 0, function () {
+                var url, response, newToken, currentSession, err_1;
+                return tslib_1.__generator(this, function (_a) {
+                    switch (_a.label) {
+                        case 0:
+                            _a.trys.push([0, 2, 3, 4]);
+                            url = "".concat(isServer ? (0, headers_1.headers)().get('origin') : '', "/api/authenticate/refresh-token");
+                            return [4 /*yield*/, axios_1["default"].post(url, {}, { headers: getAuthHeaders() })];
+                        case 1:
+                            response = _a.sent();
+                            newToken = response.data.token;
+                            currentSession = (0, getCookieSession_1["default"])();
+                            // Lưu lại vào cookie phía client
+                            currentSession === null || currentSession === void 0 ? true : delete currentSession.access_token;
+                            (0, saveCookiesClient_1["default"])({ value: tslib_1.__assign(tslib_1.__assign({}, currentSession), { access_token: newToken }) });
+                            // Cập nhật cache
+                            accessTokenCache = newToken;
+                            // Lưu refresh token phía server nếu SSR
+                            if (isServer) {
+                                saveRefreshTokenServer(response);
+                            }
+                            return [2 /*return*/, newToken];
+                        case 2:
+                            err_1 = _a.sent();
+                            if (!isServer) {
+                                window.location.href = constants_1.loginPage;
+                            }
+                            throw err_1;
+                        case 3:
+                            refreshingPromise = null;
+                            return [7 /*endfinally*/];
+                        case 4: return [2 /*return*/];
+                    }
+                });
+            }); });
+        }
+        return [2 /*return*/, refreshingPromise];
+    });
+}); };
+// Request interceptor: luôn thêm Authorization nếu có access_token
 PHXAxiosInstance.interceptors.request.use(function (config) { return tslib_1.__awaiter(void 0, void 0, void 0, function () {
-    var currentSession, authTokenCookie, err_2, newToken;
+    var token, session, err_2, fresh;
     var _a;
     return tslib_1.__generator(this, function (_b) {
         switch (_b.label) {
             case 0:
-                currentSession = (0, getCookieSession_1["default"])();
-                authTokenCookie = (currentSession === null || currentSession === void 0 ? void 0 : currentSession.access_token) || null;
-                if (!authTokenCookie) return [3 /*break*/, 7];
-                config.headers.Authorization = "Bearer ".concat(authTokenCookie);
+                config.headers = config.headers || {};
+                token = accessTokenCache;
+                if (!token) {
+                    session = (0, getCookieSession_1["default"])();
+                    token = (session === null || session === void 0 ? void 0 : session.access_token) || null;
+                    if (token)
+                        accessTokenCache = token;
+                }
+                if (!token) return [3 /*break*/, 7];
+                config.headers.Authorization = "Bearer ".concat(token);
                 if (!isServer) return [3 /*break*/, 7];
                 _b.label = 1;
             case 1:
                 _b.trys.push([1, 3, , 7]);
-                return [4 /*yield*/, axios_1["default"].post("".concat(internalUrl, "/authen/authenticate"), {}, {
-                        headers: tslib_1.__assign({ Authorization: "Bearer ".concat(authTokenCookie) }, getAuthHeaders())
-                    })];
+                return [4 /*yield*/, axios_1["default"].post("".concat(internalUrl, "/authen/authenticate"), {}, { headers: tslib_1.__assign({ Authorization: "Bearer ".concat(token) }, getAuthHeaders()) })];
             case 2:
                 _b.sent();
                 return [3 /*break*/, 7];
@@ -115,8 +124,8 @@ PHXAxiosInstance.interceptors.request.use(function (config) { return tslib_1.__a
                 if (!(((_a = err_2.response) === null || _a === void 0 ? void 0 : _a.status) === 401)) return [3 /*break*/, 5];
                 return [4 /*yield*/, refreshAccessToken()];
             case 4:
-                newToken = _b.sent();
-                config.headers.Authorization = "Bearer ".concat(newToken);
+                fresh = _b.sent();
+                config.headers.Authorization = "Bearer ".concat(fresh);
                 return [3 /*break*/, 6];
             case 5: throw err_2;
             case 6: return [3 /*break*/, 7];
@@ -124,44 +133,29 @@ PHXAxiosInstance.interceptors.request.use(function (config) { return tslib_1.__a
         }
     });
 }); });
-PHXAxiosInstance.interceptors.response.use(function (response) { return response; }, function (error) { return tslib_1.__awaiter(void 0, void 0, void 0, function () {
-    var originalRequest, newToken, err_3;
+// Response interceptor: bắt lỗi 401, gọi refresh và retry
+PHXAxiosInstance.interceptors.response.use(function (res) { return res; }, function (error) { return tslib_1.__awaiter(void 0, void 0, void 0, function () {
+    var originalRequest, newToken, e_1;
     var _a;
     return tslib_1.__generator(this, function (_b) {
         switch (_b.label) {
             case 0:
                 originalRequest = error.config;
-                if (!(((_a = error.response) === null || _a === void 0 ? void 0 : _a.status) === 401 && !originalRequest._retry)) return [3 /*break*/, 5];
-                if (isRefreshing) {
-                    return [2 /*return*/, new Promise(function (resolve, reject) {
-                            failedQueue.push({
-                                resolve: function (token) {
-                                    originalRequest.headers.Authorization = 'Bearer ' + token;
-                                    resolve(PHXAxiosInstance(originalRequest));
-                                },
-                                reject: function (err) { return reject(err); }
-                            });
-                        })];
-                }
+                if (!(((_a = error.response) === null || _a === void 0 ? void 0 : _a.status) === 401 && !originalRequest._retry)) return [3 /*break*/, 4];
                 originalRequest._retry = true;
-                isRefreshing = true;
                 _b.label = 1;
             case 1:
-                _b.trys.push([1, 3, 4, 5]);
+                _b.trys.push([1, 3, , 4]);
                 return [4 /*yield*/, refreshAccessToken()];
             case 2:
                 newToken = _b.sent();
-                processQueue(null, newToken);
+                originalRequest.headers = originalRequest.headers || {};
                 originalRequest.headers.Authorization = "Bearer ".concat(newToken);
                 return [2 /*return*/, PHXAxiosInstance(originalRequest)];
             case 3:
-                err_3 = _b.sent();
-                processQueue(err_3, null);
-                return [2 /*return*/, Promise.reject(err_3)];
-            case 4:
-                isRefreshing = false;
-                return [7 /*endfinally*/];
-            case 5: return [2 /*return*/, Promise.reject(error)];
+                e_1 = _b.sent();
+                return [2 /*return*/, Promise.reject(e_1)];
+            case 4: return [2 /*return*/, Promise.reject(error)];
         }
     });
 }); });

package/dist/cjs/axiosInstance.js.map

@@ -1 +1 @@
-{"version":3,"file":"axiosInstance.js","sourceRoot":"","sources":["../../src/axiosInstance.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"axiosInstance.js","sourceRoot":"","sources":["../../src/axiosInstance.ts"],"names":[],"mappings":"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"}

package/dist/cjs/components/Func/getCookieSession.js

@@ -5,16 +5,24 @@ var constants_1 = require("../../utils/constants");
 var js_cookie_1 = tslib_1.__importDefault(require("js-cookie"));
 var helpers_1 = require("../../helpers/helpers");
 var headers_1 = require("next/headers");
+var sessionStore_1 = require("./sessionStore");
 function PHXFuncGetCookieSession() {
     var _a;
+    var sessionInfo;
+    var cachedSession = (0, sessionStore_1.getSession)();
+    if (cachedSession)
+        return cachedSession;
     if (typeof window !== 'undefined') {
-        var sessionInfo = js_cookie_1["default"].get(constants_1.COOKIE_SESSION_SIGN_IN);
-        return sessionInfo ? (0, helpers_1.decryptCookie)(sessionInfo) : null;
+        sessionInfo = js_cookie_1["default"].get(constants_1.COOKIE_SESSION_SIGN_IN);
     }
     else {
         var cookieStore = (0, headers_1.cookies)();
-        var sessionInfo = (_a = cookieStore.get(constants_1.COOKIE_SESSION_SIGN_IN)) === null || _a === void 0 ? void 0 : _a.value;
-        return sessionInfo ? (0, helpers_1.decryptCookie)(sessionInfo) : null;
+        sessionInfo = (_a = cookieStore.get(constants_1.COOKIE_SESSION_SIGN_IN)) === null || _a === void 0 ? void 0 : _a.value;
+    }
+    if (sessionInfo) {
+        var sessionInfoDecrypt = (0, helpers_1.decryptCookie)(sessionInfo);
+        (0, sessionStore_1.setSession)(sessionInfoDecrypt);
+        return sessionInfoDecrypt;
     }
     return null;
 }

package/dist/cjs/components/Func/getCookieSession.js.map

@@ -1 +1 @@
-{"version":3,"file":"getCookieSession.js","sourceRoot":"","sources":["../../../../src/components/Func/getCookieSession.ts"],"names":[],"mappings":";;;AAAA,mDAA8D;AAC9D,gEAA+B;AAC/B,iDAAqD;AACrD,wCAAsC;AAmCtC,SAAwB,uBAAuB;;IAC7C,IAAI,OAAO,MAAM,KAAK,WAAW,EAAE;QACjC,IAAM,WAAW,GAAG,sBAAO,CAAC,GAAG,CAAC,kCAAsB,CAAC,CAAA;QACvD,OAAO,WAAW,CAAC,CAAC,CAAC,IAAA,uBAAa,EAAC,WAAW,CAAC,CAAC,CAAC,CAAC,IAAI,CAAA;KACvD;SAAM;QACL,IAAM,WAAW,GAAG,IAAA,iBAAO,GAAE,CAAA;QAC7B,IAAM,WAAW,GAAG,MAAA,WAAW,CAAC,GAAG,CAAC,kCAAsB,CAAC,0CAAE,KAAK,CAAA;QAClE,OAAO,WAAW,CAAC,CAAC,CAAC,IAAA,uBAAa,EAAC,WAAW,CAAC,CAAC,CAAC,CAAC,IAAI,CAAA;KACvD;IACD,OAAO,IAAI,CAAA;AACb,CAAC;AAVD,6CAUC"}
+{"version":3,"file":"getCookieSession.js","sourceRoot":"","sources":["../../../../src/components/Func/getCookieSession.ts"],"names":[],"mappings":";;;AAAA,mDAA8D;AAC9D,gEAA+B;AAC/B,iDAAqD;AACrD,wCAAsC;AACtC,+CAAuD;AAmCvD,SAAwB,uBAAuB;;IAC7C,IAAI,WAAW,CAAA;IACf,IAAM,aAAa,GAAG,IAAA,yBAAU,GAAE,CAAA;IAClC,IAAI,aAAa;QAAE,OAAO,aAAa,CAAA;IAEvC,IAAI,OAAO,MAAM,KAAK,WAAW,EAAE;QACjC,WAAW,GAAG,sBAAO,CAAC,GAAG,CAAC,kCAAsB,CAAC,CAAA;KAClD;SAAM;QACL,IAAM,WAAW,GAAG,IAAA,iBAAO,GAAE,CAAA;QAC7B,WAAW,GAAG,MAAA,WAAW,CAAC,GAAG,CAAC,kCAAsB,CAAC,0CAAE,KAAK,CAAA;KAC7D;IACD,IAAI,WAAW,EAAE;QACf,IAAM,kBAAkB,GAAG,IAAA,uBAAa,EAAC,WAAW,CAAC,CAAA;QACrD,IAAA,yBAAU,EAAC,kBAAkB,CAAC,CAAA;QAC9B,OAAO,kBAAkB,CAAA;KAC1B;IACD,OAAO,IAAI,CAAA;AACb,CAAC;AAjBD,6CAiBC"}

package/dist/cjs/components/Func/saveCookiesClient.js

@@ -5,9 +5,14 @@ var headers_1 = require("next/headers");
 var js_cookie_1 = tslib_1.__importDefault(require("js-cookie"));
 var constants_1 = require("../../utils/constants");
 var helpers_1 = require("../../helpers/helpers");
+var sessionStore_1 = require("./sessionStore");
 function saveCookiesClient(_a) {
     var value = _a.value, _b = _a.remember, remember = _b === void 0 ? true : _b;
-    var encrypted = (0, helpers_1.encryptDataSync)(value);
+    // update data session
+    var current = (0, sessionStore_1.getSession)() || {};
+    var newSession = tslib_1.__assign(tslib_1.__assign({}, current), value);
+    (0, sessionStore_1.setSession)(newSession);
+    var encrypted = (0, helpers_1.encryptDataSync)(newSession);
     var isServer = typeof window === 'undefined';
     if (isServer) {
         // Server-side

package/dist/cjs/components/Func/saveCookiesClient.js.map

@@ -1 +1 @@
-{"version":3,"file":"saveCookiesClient.js","sourceRoot":"","sources":["../../../../src/components/Func/saveCookiesClient.ts"],"names":[],"mappings":";;;AAAA,wCAAsC;AACtC,gEAA+B;AAC/B,mDAA8D;AAE9D,iDAAuD;AAEvD,SAAwB,iBAAiB,CAAC,EAAwE;QAAtE,KAAK,WAAA,EAAE,gBAAe,EAAf,QAAQ,mBAAG,IAAI,KAAA;IAChE,IAAM,SAAS,GAAG,IAAA,yBAAe,EAAC,KAAK,CAAC,CAAA;IACxC,IAAM,QAAQ,GAAG,OAAO,MAAM,KAAK,WAAW,CAAA;IAE9C,IAAI,QAAQ,EAAE;QACZ,cAAc;QACd,IAAI;YACF,IAAA,iBAAO,GAAE,CAAC,GAAG,CAAC,kCAAsB,EAAE,SAAS,EAAE;gBAC/C,IAAI,EAAE,GAAG;gBACT,QAAQ,EAAE,KAAK;gBACf,MAAM,EAAE,KAAK;gBACb,QAAQ,EAAE,KAAK;gBACf,OAAO,EAAE,QAAQ,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,GAAG,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS;aACjF,CAAC,CAAA;SACH;QAAC,OAAO,GAAG,EAAE;YACZ,OAAO,CAAC,IAAI,CAAC,wDAAwD,CAAC,CAAA;SACvE;KACF;SAAM;QACL,cAAc;QACd,sBAAO,CAAC,GAAG,CAAC,kCAAsB,EAAE,SAAS,EAAE;YAC7C,OAAO,EAAE,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,SAAS;YACnC,IAAI,EAAE,GAAG;YACT,QAAQ,EAAE,KAAK;SAChB,CAAC,CAAA;KACH;AACH,CAAC;AAzBD,uCAyBC"}
+{"version":3,"file":"saveCookiesClient.js","sourceRoot":"","sources":["../../../../src/components/Func/saveCookiesClient.ts"],"names":[],"mappings":";;;AAAA,wCAAsC;AACtC,gEAA+B;AAC/B,mDAA8D;AAE9D,iDAAuD;AACvD,+CAAuD;AAEvD,SAAwB,iBAAiB,CAAC,EAAwE;QAAtE,KAAK,WAAA,EAAE,gBAAe,EAAf,QAAQ,mBAAG,IAAI,KAAA;IAChE,sBAAsB;IACtB,IAAM,OAAO,GAAG,IAAA,yBAAU,GAAE,IAAI,EAAE,CAAA;IAClC,IAAM,UAAU,yCAAQ,OAAO,GAAK,KAAK,CAAE,CAAA;IAC3C,IAAA,yBAAU,EAAC,UAAU,CAAC,CAAA;IAEtB,IAAM,SAAS,GAAG,IAAA,yBAAe,EAAC,UAAU,CAAC,CAAA;IAC7C,IAAM,QAAQ,GAAG,OAAO,MAAM,KAAK,WAAW,CAAA;IAE9C,IAAI,QAAQ,EAAE;QACZ,cAAc;QACd,IAAI;YACF,IAAA,iBAAO,GAAE,CAAC,GAAG,CAAC,kCAAsB,EAAE,SAAS,EAAE;gBAC/C,IAAI,EAAE,GAAG;gBACT,QAAQ,EAAE,KAAK;gBACf,MAAM,EAAE,KAAK;gBACb,QAAQ,EAAE,KAAK;gBACf,OAAO,EAAE,QAAQ,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,GAAG,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS;aACjF,CAAC,CAAA;SACH;QAAC,OAAO,GAAG,EAAE;YACZ,OAAO,CAAC,IAAI,CAAC,wDAAwD,CAAC,CAAA;SACvE;KACF;SAAM;QACL,cAAc;QACd,sBAAO,CAAC,GAAG,CAAC,kCAAsB,EAAE,SAAS,EAAE;YAC7C,OAAO,EAAE,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,SAAS;YACnC,IAAI,EAAE,GAAG;YACT,QAAQ,EAAE,KAAK;SAChB,CAAC,CAAA;KACH;AACH,CAAC;AA9BD,uCA8BC"}

package/dist/cjs/components/Func/sessionStore.d.ts

@@ -0,0 +1,3 @@
+export declare function getSession(): Record<string, any> | null;
+export declare function setSession(newSession: Record<string, any>): void;
+export declare function clearSession(): void;

package/dist/cjs/components/Func/sessionStore.js

@@ -0,0 +1,17 @@
+"use strict";
+exports.__esModule = true;
+exports.clearSession = exports.setSession = exports.getSession = void 0;
+var sessionCache = null;
+function getSession() {
+    return sessionCache;
+}
+exports.getSession = getSession;
+function setSession(newSession) {
+    sessionCache = newSession;
+}
+exports.setSession = setSession;
+function clearSession() {
+    sessionCache = null;
+}
+exports.clearSession = clearSession;
+//# sourceMappingURL=sessionStore.js.map

package/dist/cjs/components/Func/sessionStore.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"sessionStore.js","sourceRoot":"","sources":["../../../../src/components/Func/sessionStore.ts"],"names":[],"mappings":";;;AAAA,IAAI,YAAY,GAA+B,IAAI,CAAA;AAEnD,SAAgB,UAAU;IACxB,OAAO,YAAY,CAAA;AACrB,CAAC;AAFD,gCAEC;AAED,SAAgB,UAAU,CAAC,UAA+B;IACxD,YAAY,GAAG,UAAU,CAAA;AAC3B,CAAC;AAFD,gCAEC;AAED,SAAgB,YAAY;IAC1B,YAAY,GAAG,IAAI,CAAA;AACrB,CAAC;AAFD,oCAEC"}

package/dist/esm/axiosInstance.js

@@ -1,78 +1,39 @@
 import { __assign, __awaiter, __generator } from "tslib";
 import axios from 'axios';
+import AsyncLock from 'async-lock';
 import { getEnv } from './read-env-config';
 import { COOKIE_REFRESH_TOKEN, loginPage } from './utils/constants';
 import saveCookiesClient from './components/Func/saveCookiesClient';
 import PHXFuncGetCookieSession from './components/Func/getCookieSession';
 import { cookies, headers } from 'next/headers';
-var isRefreshing = false;
-var failedQueue = [];
+var lock = new AsyncLock();
+var isServer = typeof window === 'undefined';
 var publicUrl = getEnv('NEXT_PUBLIC_API_GATEWAY', process.env.NEXT_PUBLIC_API_GATEWAY);
 var internalUrl = getEnv('NEXT_PUBLIC_API_GATEWAY_INTERNAL', process.env.NEXT_PUBLIC_API_GATEWAY_INTERNAL);
-var isServer = typeof window === 'undefined';
-var processQueue = function (error, token) {
-    if (token === void 0) { token = null; }
-    failedQueue.forEach(function (prom) {
-        if (error) {
-            prom.reject(error);
-        }
-        else {
-            prom.resolve(token);
-        }
-    });
-    failedQueue = [];
-};
 var PHXAxiosInstance = axios.create({
     baseURL: publicUrl
 });
+// === GLOBAL CACHE ===
+var accessTokenCache = null;
+var refreshingPromise = null;
+// Lấy header (cookie + origin) khi chạy SSR
 var getAuthHeaders = function () {
-    if (isServer) {
-        // Server-side
-        var cookieStore = cookies();
-        var cookieHeader = cookieStore
-            .getAll()
-            .map(function (_a) {
-            var name = _a.name, value = _a.value;
-            return "".concat(name, "=").concat(value);
-        })
-            .join('; ');
-        return {
-            Cookie: cookieHeader,
-            hostname: headers().get('origin')
-        };
-    }
-    return {};
+    if (!isServer)
+        return {};
+    var cookieStore = cookies();
+    var cookieHeader = cookieStore
+        .getAll()
+        .map(function (_a) {
+        var name = _a.name, value = _a.value;
+        return "".concat(name, "=").concat(value);
+    })
+        .join('; ');
+    return {
+        Cookie: cookieHeader,
+        hostname: headers().get('origin') || undefined
+    };
 };
-var refreshAccessToken = function () { return __awaiter(void 0, void 0, void 0, function () {
-    var response, newToken, currentSession, err_1;
-    return __generator(this, function (_a) {
-        switch (_a.label) {
-            case 0:
-                _a.trys.push([0, 2, , 3]);
-                return [4 /*yield*/, axios.post("".concat(isServer ? headers().get('origin') : '', "/api/authenticate/refresh-token"), {}, {
-                        headers: getAuthHeaders()
-                    })];
-            case 1:
-                response = _a.sent();
-                newToken = response.data.token;
-                currentSession = PHXFuncGetCookieSession();
-                saveCookiesClient({ value: __assign(__assign({}, currentSession), { access_token: newToken }) });
-                if (isServer) {
-                    // save refresh token from server site
-                    saveRefreshTokenServer(response);
-                }
-                return [2 /*return*/, newToken];
-            case 2:
-                err_1 = _a.sent();
-                if (!isServer) {
-                    // Cookies.remove(COOKIE_SESSION_SIGN_IN)
-                    window.location.href = loginPage;
-                }
-                throw err_1;
-            case 3: return [2 /*return*/];
-        }
-    });
-}); };
+// Lưu lại refresh token từ header của response (chỉ SSR)
 var saveRefreshTokenServer = function (response) {
     var _a;
     var setCookieHeader = ((_a = response.headers['set-cookie']) === null || _a === void 0 ? void 0 : _a[0]) || '';
@@ -86,23 +47,71 @@ var saveRefreshTokenServer = function (response) {
         expires: new Date(Date.now() + 365 * 24 * 60 * 60 * 1000)
     });
 };
+// Hàm refresh access token, chỉ gọi 1 lần duy nhất tại một thời điểm
+var refreshAccessToken = function () { return __awaiter(void 0, void 0, void 0, function () {
+    return __generator(this, function (_a) {
+        if (!refreshingPromise) {
+            refreshingPromise = lock.acquire(COOKIE_REFRESH_TOKEN, function () { return __awaiter(void 0, void 0, void 0, function () {
+                var url, response, newToken, currentSession, err_1;
+                return __generator(this, function (_a) {
+                    switch (_a.label) {
+                        case 0:
+                            _a.trys.push([0, 2, 3, 4]);
+                            url = "".concat(isServer ? headers().get('origin') : '', "/api/authenticate/refresh-token");
+                            return [4 /*yield*/, axios.post(url, {}, { headers: getAuthHeaders() })];
+                        case 1:
+                            response = _a.sent();
+                            newToken = response.data.token;
+                            currentSession = PHXFuncGetCookieSession();
+                            // Lưu lại vào cookie phía client
+                            currentSession === null || currentSession === void 0 ? true : delete currentSession.access_token;
+                            saveCookiesClient({ value: __assign(__assign({}, currentSession), { access_token: newToken }) });
+                            // Cập nhật cache
+                            accessTokenCache = newToken;
+                            // Lưu refresh token phía server nếu SSR
+                            if (isServer) {
+                                saveRefreshTokenServer(response);
+                            }
+                            return [2 /*return*/, newToken];
+                        case 2:
+                            err_1 = _a.sent();
+                            if (!isServer) {
+                                window.location.href = loginPage;
+                            }
+                            throw err_1;
+                        case 3:
+                            refreshingPromise = null;
+                            return [7 /*endfinally*/];
+                        case 4: return [2 /*return*/];
+                    }
+                });
+            }); });
+        }
+        return [2 /*return*/, refreshingPromise];
+    });
+}); };
+// Request interceptor: luôn thêm Authorization nếu có access_token
 PHXAxiosInstance.interceptors.request.use(function (config) { return __awaiter(void 0, void 0, void 0, function () {
-    var currentSession, authTokenCookie, err_2, newToken;
+    var token, session, err_2, fresh;
     var _a;
     return __generator(this, function (_b) {
         switch (_b.label) {
             case 0:
-                currentSession = PHXFuncGetCookieSession();
-                authTokenCookie = (currentSession === null || currentSession === void 0 ? void 0 : currentSession.access_token) || null;
-                if (!authTokenCookie) return [3 /*break*/, 7];
-                config.headers.Authorization = "Bearer ".concat(authTokenCookie);
+                config.headers = config.headers || {};
+                token = accessTokenCache;
+                if (!token) {
+                    session = PHXFuncGetCookieSession();
+                    token = (session === null || session === void 0 ? void 0 : session.access_token) || null;
+                    if (token)
+                        accessTokenCache = token;
+                }
+                if (!token) return [3 /*break*/, 7];
+                config.headers.Authorization = "Bearer ".concat(token);
                 if (!isServer) return [3 /*break*/, 7];
                 _b.label = 1;
             case 1:
                 _b.trys.push([1, 3, , 7]);
-                return [4 /*yield*/, axios.post("".concat(internalUrl, "/authen/authenticate"), {}, {
-                        headers: __assign({ Authorization: "Bearer ".concat(authTokenCookie) }, getAuthHeaders())
-                    })];
+                return [4 /*yield*/, axios.post("".concat(internalUrl, "/authen/authenticate"), {}, { headers: __assign({ Authorization: "Bearer ".concat(token) }, getAuthHeaders()) })];
             case 2:
                 _b.sent();
                 return [3 /*break*/, 7];
@@ -111,8 +120,8 @@ PHXAxiosInstance.interceptors.request.use(function (config) { return __awaiter(v
                 if (!(((_a = err_2.response) === null || _a === void 0 ? void 0 : _a.status) === 401)) return [3 /*break*/, 5];
                 return [4 /*yield*/, refreshAccessToken()];
             case 4:
-                newToken = _b.sent();
-                config.headers.Authorization = "Bearer ".concat(newToken);
+                fresh = _b.sent();
+                config.headers.Authorization = "Bearer ".concat(fresh);
                 return [3 /*break*/, 6];
             case 5: throw err_2;
             case 6: return [3 /*break*/, 7];
@@ -120,44 +129,29 @@ PHXAxiosInstance.interceptors.request.use(function (config) { return __awaiter(v
         }
     });
 }); });
-PHXAxiosInstance.interceptors.response.use(function (response) { return response; }, function (error) { return __awaiter(void 0, void 0, void 0, function () {
-    var originalRequest, newToken, err_3;
+// Response interceptor: bắt lỗi 401, gọi refresh và retry
+PHXAxiosInstance.interceptors.response.use(function (res) { return res; }, function (error) { return __awaiter(void 0, void 0, void 0, function () {
+    var originalRequest, newToken, e_1;
     var _a;
     return __generator(this, function (_b) {
         switch (_b.label) {
             case 0:
                 originalRequest = error.config;
-                if (!(((_a = error.response) === null || _a === void 0 ? void 0 : _a.status) === 401 && !originalRequest._retry)) return [3 /*break*/, 5];
-                if (isRefreshing) {
-                    return [2 /*return*/, new Promise(function (resolve, reject) {
-                            failedQueue.push({
-                                resolve: function (token) {
-                                    originalRequest.headers.Authorization = 'Bearer ' + token;
-                                    resolve(PHXAxiosInstance(originalRequest));
-                                },
-                                reject: function (err) { return reject(err); }
-                            });
-                        })];
-                }
+                if (!(((_a = error.response) === null || _a === void 0 ? void 0 : _a.status) === 401 && !originalRequest._retry)) return [3 /*break*/, 4];
                 originalRequest._retry = true;
-                isRefreshing = true;
                 _b.label = 1;
             case 1:
-                _b.trys.push([1, 3, 4, 5]);
+                _b.trys.push([1, 3, , 4]);
                 return [4 /*yield*/, refreshAccessToken()];
             case 2:
                 newToken = _b.sent();
-                processQueue(null, newToken);
+                originalRequest.headers = originalRequest.headers || {};
                 originalRequest.headers.Authorization = "Bearer ".concat(newToken);
                 return [2 /*return*/, PHXAxiosInstance(originalRequest)];
             case 3:
-                err_3 = _b.sent();
-                processQueue(err_3, null);
-                return [2 /*return*/, Promise.reject(err_3)];
-            case 4:
-                isRefreshing = false;
-                return [7 /*endfinally*/];
-            case 5: return [2 /*return*/, Promise.reject(error)];
+                e_1 = _b.sent();
+                return [2 /*return*/, Promise.reject(e_1)];
+            case 4: return [2 /*return*/, Promise.reject(error)];
         }
     });
 }); });

package/dist/esm/axiosInstance.js.map

@@ -1 +1 @@
-{"version":3,"file":"axiosInstance.js","sourceRoot":"","sources":["../../src/axiosInstance.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"axiosInstance.js","sourceRoot":"","sources":["../../src/axiosInstance.ts"],"names":[],"mappings":"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"}

package/dist/esm/components/Func/getCookieSession.js

@@ -2,16 +2,24 @@ import { COOKIE_SESSION_SIGN_IN } from '../../utils/constants';
 import Cookies from 'js-cookie';
 import { decryptCookie } from '../../helpers/helpers';
 import { cookies } from 'next/headers';
+import { getSession, setSession } from './sessionStore';
 export default function PHXFuncGetCookieSession() {
     var _a;
+    var sessionInfo;
+    var cachedSession = getSession();
+    if (cachedSession)
+        return cachedSession;
     if (typeof window !== 'undefined') {
-        var sessionInfo = Cookies.get(COOKIE_SESSION_SIGN_IN);
-        return sessionInfo ? decryptCookie(sessionInfo) : null;
+        sessionInfo = Cookies.get(COOKIE_SESSION_SIGN_IN);
     }
     else {
         var cookieStore = cookies();
-        var sessionInfo = (_a = cookieStore.get(COOKIE_SESSION_SIGN_IN)) === null || _a === void 0 ? void 0 : _a.value;
-        return sessionInfo ? decryptCookie(sessionInfo) : null;
+        sessionInfo = (_a = cookieStore.get(COOKIE_SESSION_SIGN_IN)) === null || _a === void 0 ? void 0 : _a.value;
+    }
+    if (sessionInfo) {
+        var sessionInfoDecrypt = decryptCookie(sessionInfo);
+        setSession(sessionInfoDecrypt);
+        return sessionInfoDecrypt;
     }
     return null;
 }

package/dist/esm/components/Func/getCookieSession.js.map

@@ -1 +1 @@
-{"version":3,"file":"getCookieSession.js","sourceRoot":"","sources":["../../../../src/components/Func/getCookieSession.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,MAAM,uBAAuB,CAAA;AAC9D,OAAO,OAAO,MAAM,WAAW,CAAA;AAC/B,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAA;AACrD,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAA;AAmCtC,MAAM,CAAC,OAAO,UAAU,uBAAuB;;IAC7C,IAAI,OAAO,MAAM,KAAK,WAAW,EAAE;QACjC,IAAM,WAAW,GAAG,OAAO,CAAC,GAAG,CAAC,sBAAsB,CAAC,CAAA;QACvD,OAAO,WAAW,CAAC,CAAC,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,IAAI,CAAA;KACvD;SAAM;QACL,IAAM,WAAW,GAAG,OAAO,EAAE,CAAA;QAC7B,IAAM,WAAW,GAAG,MAAA,WAAW,CAAC,GAAG,CAAC,sBAAsB,CAAC,0CAAE,KAAK,CAAA;QAClE,OAAO,WAAW,CAAC,CAAC,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,IAAI,CAAA;KACvD;IACD,OAAO,IAAI,CAAA;AACb,CAAC"}
+{"version":3,"file":"getCookieSession.js","sourceRoot":"","sources":["../../../../src/components/Func/getCookieSession.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,MAAM,uBAAuB,CAAA;AAC9D,OAAO,OAAO,MAAM,WAAW,CAAA;AAC/B,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAA;AACrD,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAA;AACtC,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAA;AAmCvD,MAAM,CAAC,OAAO,UAAU,uBAAuB;;IAC7C,IAAI,WAAW,CAAA;IACf,IAAM,aAAa,GAAG,UAAU,EAAE,CAAA;IAClC,IAAI,aAAa;QAAE,OAAO,aAAa,CAAA;IAEvC,IAAI,OAAO,MAAM,KAAK,WAAW,EAAE;QACjC,WAAW,GAAG,OAAO,CAAC,GAAG,CAAC,sBAAsB,CAAC,CAAA;KAClD;SAAM;QACL,IAAM,WAAW,GAAG,OAAO,EAAE,CAAA;QAC7B,WAAW,GAAG,MAAA,WAAW,CAAC,GAAG,CAAC,sBAAsB,CAAC,0CAAE,KAAK,CAAA;KAC7D;IACD,IAAI,WAAW,EAAE;QACf,IAAM,kBAAkB,GAAG,aAAa,CAAC,WAAW,CAAC,CAAA;QACrD,UAAU,CAAC,kBAAkB,CAAC,CAAA;QAC9B,OAAO,kBAAkB,CAAA;KAC1B;IACD,OAAO,IAAI,CAAA;AACb,CAAC"}

package/dist/esm/components/Func/saveCookiesClient.js

@@ -1,10 +1,16 @@
+import { __assign } from "tslib";
 import { cookies } from 'next/headers';
 import Cookies from 'js-cookie';
 import { COOKIE_SESSION_SIGN_IN } from '../../utils/constants';
 import { encryptDataSync } from '../../helpers/helpers';
+import { getSession, setSession } from './sessionStore';
 export default function saveCookiesClient(_a) {
     var value = _a.value, _b = _a.remember, remember = _b === void 0 ? true : _b;
-    var encrypted = encryptDataSync(value);
+    // update data session
+    var current = getSession() || {};
+    var newSession = __assign(__assign({}, current), value);
+    setSession(newSession);
+    var encrypted = encryptDataSync(newSession);
     var isServer = typeof window === 'undefined';
     if (isServer) {
         // Server-side

package/dist/esm/components/Func/saveCookiesClient.js.map

@@ -1 +1 @@
-{"version":3,"file":"saveCookiesClient.js","sourceRoot":"","sources":["../../../../src/components/Func/saveCookiesClient.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAA;AACtC,OAAO,OAAO,MAAM,WAAW,CAAA;AAC/B,OAAO,EAAE,sBAAsB,EAAE,MAAM,uBAAuB,CAAA;AAE9D,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAA;AAEvD,MAAM,CAAC,OAAO,UAAU,iBAAiB,CAAC,EAAwE;QAAtE,KAAK,WAAA,EAAE,gBAAe,EAAf,QAAQ,mBAAG,IAAI,KAAA;IAChE,IAAM,SAAS,GAAG,eAAe,CAAC,KAAK,CAAC,CAAA;IACxC,IAAM,QAAQ,GAAG,OAAO,MAAM,KAAK,WAAW,CAAA;IAE9C,IAAI,QAAQ,EAAE;QACZ,cAAc;QACd,IAAI;YACF,OAAO,EAAE,CAAC,GAAG,CAAC,sBAAsB,EAAE,SAAS,EAAE;gBAC/C,IAAI,EAAE,GAAG;gBACT,QAAQ,EAAE,KAAK;gBACf,MAAM,EAAE,KAAK;gBACb,QAAQ,EAAE,KAAK;gBACf,OAAO,EAAE,QAAQ,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,GAAG,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS;aACjF,CAAC,CAAA;SACH;QAAC,OAAO,GAAG,EAAE;YACZ,OAAO,CAAC,IAAI,CAAC,wDAAwD,CAAC,CAAA;SACvE;KACF;SAAM;QACL,cAAc;QACd,OAAO,CAAC,GAAG,CAAC,sBAAsB,EAAE,SAAS,EAAE;YAC7C,OAAO,EAAE,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,SAAS;YACnC,IAAI,EAAE,GAAG;YACT,QAAQ,EAAE,KAAK;SAChB,CAAC,CAAA;KACH;AACH,CAAC"}
+{"version":3,"file":"saveCookiesClient.js","sourceRoot":"","sources":["../../../../src/components/Func/saveCookiesClient.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAA;AACtC,OAAO,OAAO,MAAM,WAAW,CAAA;AAC/B,OAAO,EAAE,sBAAsB,EAAE,MAAM,uBAAuB,CAAA;AAE9D,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAA;AACvD,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAA;AAEvD,MAAM,CAAC,OAAO,UAAU,iBAAiB,CAAC,EAAwE;QAAtE,KAAK,WAAA,EAAE,gBAAe,EAAf,QAAQ,mBAAG,IAAI,KAAA;IAChE,sBAAsB;IACtB,IAAM,OAAO,GAAG,UAAU,EAAE,IAAI,EAAE,CAAA;IAClC,IAAM,UAAU,yBAAQ,OAAO,GAAK,KAAK,CAAE,CAAA;IAC3C,UAAU,CAAC,UAAU,CAAC,CAAA;IAEtB,IAAM,SAAS,GAAG,eAAe,CAAC,UAAU,CAAC,CAAA;IAC7C,IAAM,QAAQ,GAAG,OAAO,MAAM,KAAK,WAAW,CAAA;IAE9C,IAAI,QAAQ,EAAE;QACZ,cAAc;QACd,IAAI;YACF,OAAO,EAAE,CAAC,GAAG,CAAC,sBAAsB,EAAE,SAAS,EAAE;gBAC/C,IAAI,EAAE,GAAG;gBACT,QAAQ,EAAE,KAAK;gBACf,MAAM,EAAE,KAAK;gBACb,QAAQ,EAAE,KAAK;gBACf,OAAO,EAAE,QAAQ,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,GAAG,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS;aACjF,CAAC,CAAA;SACH;QAAC,OAAO,GAAG,EAAE;YACZ,OAAO,CAAC,IAAI,CAAC,wDAAwD,CAAC,CAAA;SACvE;KACF;SAAM;QACL,cAAc;QACd,OAAO,CAAC,GAAG,CAAC,sBAAsB,EAAE,SAAS,EAAE;YAC7C,OAAO,EAAE,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,SAAS;YACnC,IAAI,EAAE,GAAG;YACT,QAAQ,EAAE,KAAK;SAChB,CAAC,CAAA;KACH;AACH,CAAC"}

package/dist/esm/components/Func/sessionStore.d.ts

@@ -0,0 +1,3 @@
+export declare function getSession(): Record<string, any> | null;
+export declare function setSession(newSession: Record<string, any>): void;
+export declare function clearSession(): void;

package/dist/esm/components/Func/sessionStore.js

@@ -0,0 +1,11 @@
+var sessionCache = null;
+export function getSession() {
+    return sessionCache;
+}
+export function setSession(newSession) {
+    sessionCache = newSession;
+}
+export function clearSession() {
+    sessionCache = null;
+}
+//# sourceMappingURL=sessionStore.js.map

package/dist/esm/components/Func/sessionStore.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"sessionStore.js","sourceRoot":"","sources":["../../../../src/components/Func/sessionStore.ts"],"names":[],"mappings":"AAAA,IAAI,YAAY,GAA+B,IAAI,CAAA;AAEnD,MAAM,UAAU,UAAU;IACxB,OAAO,YAAY,CAAA;AACrB,CAAC;AAED,MAAM,UAAU,UAAU,CAAC,UAA+B;IACxD,YAAY,GAAG,UAAU,CAAA;AAC3B,CAAC;AAED,MAAM,UAAU,YAAY;IAC1B,YAAY,GAAG,IAAI,CAAA;AACrB,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "phx-react",
-  "version": "1.3.940",
+  "version": "1.3.942",
   "description": "PHX REACT",
   "main": "./dist/cjs/index.js",
   "module": "./dist/esm/index.js",
@@ -55,6 +55,7 @@
     "@storybook/testing-library": "^0.0.14-next.2",
     "@tailwindcss/forms": "^0.5.3",
     "@testing-library/react": "^15.0.6",
+    "@types/async-lock": "^1.4.2",
     "@types/crypto-js": "^4.2.2",
     "@types/jest": "^29.5.11",
     "@types/js-cookie": "^3.0.3",
@@ -95,6 +96,7 @@
     ]
   },
   "dependencies": {
+    "async-lock": "^1.4.1",
     "axios": "^1.5.0",
     "crypto-js": "^4.2.0",
     "date-fns": "^2.30.0",