@arex95/vue-core 1.1.37 → 1.1.39

package/dist/config/axios/axiosConfig.d.ts

@@ -10,12 +10,13 @@ export declare class AxiosService {
     private cancelTokenSource;
     private activeRequests;
     private readonly refreshTokenUrl;
-    private readonly refreshAuth;
+    private readonly auth;
     private isRefreshing;
     private failedQueue;
-    constructor(options: AxiosServiceOptions, refreshAuth: () => Promise<void>);
+    constructor(options: AxiosServiceOptions);
     private processQueue;
     private setAuthHeader;
+    private getLatestAuthToken;
     private initializeInterceptors;
     getActiveRequests(): number;
     getAxiosInstance(): AxiosInstance;

package/dist/config/axios/axiosInstance.d.ts

@@ -1,12 +1,41 @@
 import { AxiosInstance } from "axios";
+/**
+ * Configuration object for the Axios instance.
+ */
 interface AxiosConfig {
     baseURL: string;
 }
+/**
+ * Configuration object for a custom Axios instance.
+ */
 interface CustomAxiosConfig {
     baseURL: string;
     headers?: Record<string, string>;
 }
+/**
+ * Configures the global Axios instance with a base URL.
+ *
+ * @param {AxiosConfig} config - An object containing the base URL for the Axios instance.
+ * @param {string} config.baseURL - The base URL for the Axios instance.
+ *
+ * @returns {void}
+ */
 export declare const configAxios: (config: AxiosConfig) => void;
+/**
+ * Retrieves the configured Axios instance.
+ *
+ * @returns {AxiosService} The configured Axios instance.
+ * @throws Will throw an error if the Axios instance is not configured.
+ */
 export declare const getAxiosInstance: () => AxiosInstance;
+/**
+ * Creates a new AxiosService instance with custom headers.
+ *
+ * @param {CustomAxiosConfig} config - An object containing the base URL and optional custom headers.
+ * @param {string} config.baseURL - The base URL for the Axios instance.
+ * @param {Record<string, string>} [config.headers] - Custom headers to set (optional).
+ *
+ * @returns {AxiosService} The new AxiosService instance.
+ */
 export declare const createCustomAxiosInstance: (config: CustomAxiosConfig) => AxiosInstance;
 export {};

package/dist/index.mjs

@@ -993,131 +993,47 @@ const verifyAuth = async () => {
     }
 };
 
-class AxiosService {
-    instance;
-    cancelTokenSource;
-    activeRequests = 0;
-    refreshTokenUrl;
-    refreshAuth;
-    isRefreshing = false;
-    failedQueue = [];
-    constructor(options, refreshAuth) {
-        this.cancelTokenSource = axios.CancelToken.source();
-        this.refreshAuth = refreshAuth;
-        const endpointsConfig = getEndpointsConfig();
-        this.refreshTokenUrl = endpointsConfig.REFRESH;
-        this.instance = axios.create({
-            baseURL: options.baseURL ?? "",
-            timeout: options.timeout ?? 30000,
-            headers: {
-                Accept: "application/json",
-                "Content-Type": "application/json",
-                ...options.headers,
-            },
-            withCredentials: options.withCredentials ?? false,
-        });
-        this.initializeInterceptors();
-    }
-    processQueue(error, token = null) {
-        this.failedQueue.forEach((prom) => {
-            if (error) {
-                prom.reject(error);
-            }
-            else if (token) {
-                prom.resolve(token);
-            }
-        });
-        this.failedQueue = [];
-    }
-    setAuthHeader(config, token) {
-        if (config.headers) {
-            config.headers.Authorization = `Bearer ${token}`;
-        }
-    }
-    initializeInterceptors() {
-        this.instance.interceptors.request.use(async (config) => {
-            const token = await getAuthToken(getAppKey(), "any");
-            if (token) {
-                this.setAuthHeader(config, token);
-            }
-            config.cancelToken = this.cancelTokenSource.token;
-            this.activeRequests++;
-            return config;
-        }, (error) => {
-            handleError(error, false);
-            return Promise.reject(error);
-        });
-        this.instance.interceptors.response.use((response) => {
-            this.activeRequests--;
-            return response;
-        }, async (error) => {
-            this.activeRequests--;
-            const originalRequest = error.config;
-            const isAuthError = axios.isAxiosError(error) && error.response?.status === 401;
-            const isRefreshCall = originalRequest?.url === this.refreshTokenUrl;
-            const isRetry = originalRequest?._retry === true;
-            if (!isAuthError || isRefreshCall || isRetry) {
-                handleError(error, false);
-                return Promise.reject(error);
-            }
-            if (!originalRequest) {
-                handleError(error, false);
-                return Promise.reject(error);
-            }
-            if (this.isRefreshing) {
-                return new Promise((resolve, reject) => {
-                    this.failedQueue.push({ resolve, reject });
-                })
-                    .then((newToken) => {
-                    this.setAuthHeader(originalRequest, newToken);
-                    return this.instance(originalRequest);
-                })
-                    .catch((err) => {
-                    return Promise.reject(err);
-                });
-            }
-            this.isRefreshing = true;
-            originalRequest._retry = true;
-            try {
-                await this.refreshAuth();
-                const newToken = await getAuthToken(getAppKey(), "any");
-                if (newToken) {
-                    this.processQueue(null, newToken);
-                    this.setAuthHeader(originalRequest, newToken);
-                }
-                else {
-                    const refreshError = new Error("New token not found after refresh.");
-                    this.processQueue(refreshError, null);
-                    throw refreshError;
-                }
-                this.isRefreshing = false;
-                return this.instance(originalRequest);
-            }
-            catch (refreshError) {
-                this.processQueue(refreshError, null);
-                this.isRefreshing = false;
-                handleError(refreshError, false);
-                return Promise.reject(error);
-            }
-        });
-    }
-    getActiveRequests() {
-        return this.activeRequests;
-    }
-    getAxiosInstance() {
-        return this.instance;
-    }
-    cancelAllRequests() {
-        this.cancelTokenSource.cancel("Operation canceled by the user.");
-        this.cancelTokenSource = axios.CancelToken.source();
-    }
-    setHeader(key, value) {
-        this.instance.defaults.headers.common[key] = value;
-    }
-    removeHeader(key) {
-        delete this.instance.defaults.headers.common[key];
+let axiosInstance;
+/**
+ * Configures the global Axios instance with a base URL.
+ *
+ * @param {AxiosConfig} config - An object containing the base URL for the Axios instance.
+ * @param {string} config.baseURL - The base URL for the Axios instance.
+ *
+ * @returns {void}
+ */
+const configAxios = (config) => {
+    axiosInstance = new AxiosService({
+        baseURL: config.baseURL,
+    });
+};
+/**
+ * Retrieves the configured Axios instance.
+ *
+ * @returns {AxiosService} The configured Axios instance.
+ * @throws Will throw an error if the Axios instance is not configured.
+ */
+const getAxiosInstance = () => {
+    if (!axiosInstance) {
+        throw new Error("Axios instance not configured. Call configAxios first.");
     }
-}
+    return axiosInstance.getAxiosInstance();
+};
+/**
+ * Creates a new AxiosService instance with custom headers.
+ *
+ * @param {CustomAxiosConfig} config - An object containing the base URL and optional custom headers.
+ * @param {string} config.baseURL - The base URL for the Axios instance.
+ * @param {Record<string, string>} [config.headers] - Custom headers to set (optional).
+ *
+ * @returns {AxiosService} The new AxiosService instance.
+ */
+const createCustomAxiosInstance = (config) => {
+    return new AxiosService({
+        baseURL: config.baseURL,
+        headers: config.headers,
+    }).getAxiosInstance();
+};
 
 /**
  * Converts a Proxy object to a plain object.
@@ -1531,28 +1447,133 @@ function useAuth(secretKey = getAppKey()) {
     };
 }
 
-let axiosInstance;
-const auth = useAuth();
-const refreshAndForget = async () => {
-    await auth.refresh();
-};
-const configAxios = (config) => {
-    axiosInstance = new AxiosService({
-        baseURL: config.baseURL,
-    }, refreshAndForget);
-};
-const getAxiosInstance = () => {
-    if (!axiosInstance) {
-        throw new Error("Axios instance not configured. Call configAxios first.");
+class AxiosService {
+    instance;
+    cancelTokenSource;
+    activeRequests = 0;
+    refreshTokenUrl;
+    auth = useAuth();
+    isRefreshing = false;
+    failedQueue = [];
+    constructor(options) {
+        this.cancelTokenSource = axios.CancelToken.source();
+        const endpointsConfig = getEndpointsConfig();
+        this.refreshTokenUrl = endpointsConfig.REFRESH;
+        this.instance = axios.create({
+            baseURL: options.baseURL ?? "",
+            timeout: options.timeout ?? 30000,
+            headers: {
+                Accept: "application/json",
+                "Content-Type": "application/json",
+                ...options.headers,
+            },
+            withCredentials: options.withCredentials ?? false,
+        });
+        this.initializeInterceptors();
     }
-    return axiosInstance.getAxiosInstance();
-};
-const createCustomAxiosInstance = (config) => {
-    return new AxiosService({
-        baseURL: config.baseURL,
-        headers: config.headers,
-    }, refreshAndForget).getAxiosInstance();
-};
+    processQueue(error, token = null) {
+        this.failedQueue.forEach((prom) => {
+            if (error) {
+                prom.reject(error);
+            }
+            else if (token) {
+                prom.resolve(token);
+            }
+        });
+        this.failedQueue = [];
+    }
+    setAuthHeader(config, token) {
+        if (config.headers) {
+            config.headers.Authorization = `Bearer ${token}`;
+        }
+    }
+    async getLatestAuthToken() {
+        return await getAuthToken(getAppKey(), "any");
+    }
+    initializeInterceptors() {
+        this.instance.interceptors.request.use(async (config) => {
+            const token = await this.getLatestAuthToken();
+            if (token) {
+                this.setAuthHeader(config, token);
+            }
+            config.cancelToken = this.cancelTokenSource.token;
+            this.activeRequests++;
+            return config;
+        }, (error) => {
+            handleError(error, false);
+            return Promise.reject(error);
+        });
+        this.instance.interceptors.response.use((response) => {
+            this.activeRequests--;
+            return response;
+        }, async (error) => {
+            this.activeRequests--;
+            const originalRequest = error.config;
+            const isAuthError = axios.isAxiosError(error) && error.response?.status === 401;
+            const isRefreshCall = originalRequest?.url === this.refreshTokenUrl;
+            const isRetry = originalRequest?._retry === true;
+            if (!isAuthError || isRefreshCall || isRetry) {
+                handleError(error, false);
+                return Promise.reject(error);
+            }
+            if (!originalRequest) {
+                handleError(error, false);
+                return Promise.reject(error);
+            }
+            if (this.isRefreshing) {
+                return new Promise((resolve, reject) => {
+                    this.failedQueue.push({ resolve, reject });
+                })
+                    .then((newToken) => {
+                    this.setAuthHeader(originalRequest, newToken);
+                    return this.instance(originalRequest);
+                })
+                    .catch((err) => {
+                    return Promise.reject(err);
+                });
+            }
+            this.isRefreshing = true;
+            originalRequest._retry = true;
+            try {
+                await this.auth.refresh();
+                const newToken = await this.getLatestAuthToken();
+                if (newToken) {
+                    this.processQueue(null, newToken);
+                    this.setAuthHeader(originalRequest, newToken);
+                }
+                else {
+                    const refreshError = new Error("New token not found after refresh.");
+                    this.processQueue(refreshError, null);
+                    throw refreshError;
+                }
+                this.isRefreshing = false;
+                return this.instance(originalRequest);
+            }
+            catch (refreshError) {
+                this.processQueue(refreshError, null);
+                this.isRefreshing = false;
+                handleError(refreshError, false);
+                return Promise.reject(error);
+            }
+        });
+    }
+    getActiveRequests() {
+        return this.activeRequests;
+    }
+    getAxiosInstance() {
+        return this.instance;
+    }
+    cancelAllRequests() {
+        this.cancelTokenSource.cancel("Operation canceled by the user.");
+        this.cancelTokenSource = axios.CancelToken.source();
+    }
+    setHeader(key, value) {
+        this.instance.defaults.headers.common[key] = value;
+    }
+    removeHeader(key) {
+        delete this.instance.defaults.headers.common[key];
+    }
+}
 
 /**
  * Creates and downloads a file from Blob data.
@@ -3510,14 +3531,14 @@ const ArexVueCore = {
             accessTokenKey: options.tokenKeys.accessToken,
             refreshTokenKey: options.tokenKeys.refreshToken
         });
-        configAxios({
-            baseURL: options.apiUrl,
-        });
         configEndpoints({
             loginEndpoint: options.endpoints.login,
             refreshEndpoint: options.endpoints.refresh,
             logoutEndpoint: options.endpoints.logout,
         });
+        configAxios({
+            baseURL: options.apiUrl,
+        });
     },
 };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@arex95/vue-core",
-  "version": "1.1.37",
+  "version": "1.1.39",
   "description": "Opinionated Vue Core",
   "main": "dist/index.js",
   "module": "dist/index.mjs",