@fctc/interface-logic 3.8.5 → 3.8.7

package/dist/configs.js

@@ -2303,7 +2303,7 @@ var axiosClient = {
         return handleResponse(response);
       },
       async (error) => {
-        const handleError3 = async (error2) => {
+        const handleError2 = async (error2) => {
           if (!error2.response) {
             return error2;
           }
@@ -2326,6 +2326,7 @@ var axiosClient = {
                 originalRequest,
                 token
               );
+              ensureApiV2(originalRequest);
               return instance.request(originalRequest);
             }).catch(async (err) => {
               if ((err.response?.status === 400 || err.response?.status === 401) && ["invalid_grant"].includes(err.response.data.error)) {
@@ -2369,6 +2370,7 @@ var axiosClient = {
                   data.access_token
                 );
                 processQueue(null, data.access_token);
+                ensureApiV2(originalRequest);
                 resolve(instance.request(originalRequest));
               }).catch(async (err) => {
                 console.log("catch error: ", err);
@@ -2391,7 +2393,7 @@ var axiosClient = {
             });
           }
         }
-        return Promise.reject(await handleError3(error));
+        return Promise.reject(await handleError2(error));
       }
     );
     const handleResponse = (res) => {
@@ -2400,19 +2402,6 @@ var axiosClient = {
       }
       return res;
     };
-    const handleError2 = (error) => {
-      if (error.isAxiosError && error.code === "ECONNABORTED") {
-        console.error("Request Timeout Error:", error);
-        return "Request Timeout Error";
-      } else if (error.isAxiosError && !error.response) {
-        console.error("Network Error:", error);
-        return "Network Error";
-      } else {
-        console.error("Other Error:", error?.response);
-        const errorMessage = error?.response?.data?.message || "An error occurred";
-        return { message: errorMessage, status: error?.response?.status };
-      }
-    };
     const clearAuthToken = async () => {
       await localStorage2.clearToken();
       if (typeof window !== "undefined") {
@@ -2425,6 +2414,22 @@ var axiosClient = {
     const getBaseUrl = (baseUrl, hardService) => {
       return `${baseUrl.replace(/\/$/, "")}/${hardService || sessionStorage2.getMenuFocus().service || config?.default_service}/api/v2`;
     };
+    const ensureApiV2 = (req) => {
+      try {
+        const baseUrl = (config?.baseUrl || "").replace(/\/$/, "");
+        const u = String(req?.url || "");
+        if (/\/api\/v2(\/|$)/.test(u)) return req;
+        const baseUrlEscaped = baseUrl.replace(/[-/\\^$*+?.()|[\]{}]/g, "\\$&");
+        const stripped = u.replace(new RegExp(`^${baseUrlEscaped}`), "");
+        const hardService = req?.headers?.["X-Hard-Service"] || req?.headers?.["x-hard-service"];
+        const prefix = getBaseUrl(baseUrl, hardService).replace(/\/$/, "");
+        const path = (stripped || u || "").replace(/^\/+/, "");
+        req.url = `${prefix}/${path}`;
+        req.baseURL = void 0;
+      } catch (_e) {
+      }
+      return req;
+    };
     const getHeaders = (header) => {
       const headers = {
         headers: {

package/dist/configs.mjs

@@ -2267,7 +2267,7 @@ var axiosClient = {
         return handleResponse(response);
       },
       async (error) => {
-        const handleError3 = async (error2) => {
+        const handleError2 = async (error2) => {
           if (!error2.response) {
             return error2;
           }
@@ -2290,6 +2290,7 @@ var axiosClient = {
                 originalRequest,
                 token
               );
+              ensureApiV2(originalRequest);
               return instance.request(originalRequest);
             }).catch(async (err) => {
               if ((err.response?.status === 400 || err.response?.status === 401) && ["invalid_grant"].includes(err.response.data.error)) {
@@ -2333,6 +2334,7 @@ var axiosClient = {
                   data.access_token
                 );
                 processQueue(null, data.access_token);
+                ensureApiV2(originalRequest);
                 resolve(instance.request(originalRequest));
               }).catch(async (err) => {
                 console.log("catch error: ", err);
@@ -2355,7 +2357,7 @@ var axiosClient = {
             });
           }
         }
-        return Promise.reject(await handleError3(error));
+        return Promise.reject(await handleError2(error));
       }
     );
     const handleResponse = (res) => {
@@ -2364,19 +2366,6 @@ var axiosClient = {
       }
       return res;
     };
-    const handleError2 = (error) => {
-      if (error.isAxiosError && error.code === "ECONNABORTED") {
-        console.error("Request Timeout Error:", error);
-        return "Request Timeout Error";
-      } else if (error.isAxiosError && !error.response) {
-        console.error("Network Error:", error);
-        return "Network Error";
-      } else {
-        console.error("Other Error:", error?.response);
-        const errorMessage = error?.response?.data?.message || "An error occurred";
-        return { message: errorMessage, status: error?.response?.status };
-      }
-    };
     const clearAuthToken = async () => {
       await localStorage2.clearToken();
       if (typeof window !== "undefined") {
@@ -2389,6 +2378,22 @@ var axiosClient = {
     const getBaseUrl = (baseUrl, hardService) => {
       return `${baseUrl.replace(/\/$/, "")}/${hardService || sessionStorage2.getMenuFocus().service || config?.default_service}/api/v2`;
     };
+    const ensureApiV2 = (req) => {
+      try {
+        const baseUrl = (config?.baseUrl || "").replace(/\/$/, "");
+        const u = String(req?.url || "");
+        if (/\/api\/v2(\/|$)/.test(u)) return req;
+        const baseUrlEscaped = baseUrl.replace(/[-/\\^$*+?.()|[\]{}]/g, "\\$&");
+        const stripped = u.replace(new RegExp(`^${baseUrlEscaped}`), "");
+        const hardService = req?.headers?.["X-Hard-Service"] || req?.headers?.["x-hard-service"];
+        const prefix = getBaseUrl(baseUrl, hardService).replace(/\/$/, "");
+        const path = (stripped || u || "").replace(/^\/+/, "");
+        req.url = `${prefix}/${path}`;
+        req.baseURL = void 0;
+      } catch (_e) {
+      }
+      return req;
+    };
     const getHeaders = (header) => {
       const headers = {
         headers: {

package/dist/environment.js

@@ -2305,7 +2305,7 @@ var axiosClient = {
         return handleResponse(response);
       },
       async (error) => {
-        const handleError3 = async (error2) => {
+        const handleError2 = async (error2) => {
           if (!error2.response) {
             return error2;
           }
@@ -2328,6 +2328,7 @@ var axiosClient = {
                 originalRequest,
                 token
               );
+              ensureApiV2(originalRequest);
               return instance.request(originalRequest);
             }).catch(async (err) => {
               if ((err.response?.status === 400 || err.response?.status === 401) && ["invalid_grant"].includes(err.response.data.error)) {
@@ -2371,6 +2372,7 @@ var axiosClient = {
                   data.access_token
                 );
                 processQueue(null, data.access_token);
+                ensureApiV2(originalRequest);
                 resolve(instance.request(originalRequest));
               }).catch(async (err) => {
                 console.log("catch error: ", err);
@@ -2393,7 +2395,7 @@ var axiosClient = {
             });
           }
         }
-        return Promise.reject(await handleError3(error));
+        return Promise.reject(await handleError2(error));
       }
     );
     const handleResponse = (res) => {
@@ -2402,19 +2404,6 @@ var axiosClient = {
       }
       return res;
     };
-    const handleError2 = (error) => {
-      if (error.isAxiosError && error.code === "ECONNABORTED") {
-        console.error("Request Timeout Error:", error);
-        return "Request Timeout Error";
-      } else if (error.isAxiosError && !error.response) {
-        console.error("Network Error:", error);
-        return "Network Error";
-      } else {
-        console.error("Other Error:", error?.response);
-        const errorMessage = error?.response?.data?.message || "An error occurred";
-        return { message: errorMessage, status: error?.response?.status };
-      }
-    };
     const clearAuthToken = async () => {
       await localStorage2.clearToken();
       if (typeof window !== "undefined") {
@@ -2427,6 +2416,22 @@ var axiosClient = {
     const getBaseUrl = (baseUrl, hardService) => {
       return `${baseUrl.replace(/\/$/, "")}/${hardService || sessionStorage2.getMenuFocus().service || config?.default_service}/api/v2`;
     };
+    const ensureApiV2 = (req) => {
+      try {
+        const baseUrl = (config?.baseUrl || "").replace(/\/$/, "");
+        const u = String(req?.url || "");
+        if (/\/api\/v2(\/|$)/.test(u)) return req;
+        const baseUrlEscaped = baseUrl.replace(/[-/\\^$*+?.()|[\]{}]/g, "\\$&");
+        const stripped = u.replace(new RegExp(`^${baseUrlEscaped}`), "");
+        const hardService = req?.headers?.["X-Hard-Service"] || req?.headers?.["x-hard-service"];
+        const prefix = getBaseUrl(baseUrl, hardService).replace(/\/$/, "");
+        const path = (stripped || u || "").replace(/^\/+/, "");
+        req.url = `${prefix}/${path}`;
+        req.baseURL = void 0;
+      } catch (_e) {
+      }
+      return req;
+    };
     const getHeaders = (header) => {
       const headers = {
         headers: {

package/dist/environment.mjs

@@ -2267,7 +2267,7 @@ var axiosClient = {
         return handleResponse(response);
       },
       async (error) => {
-        const handleError3 = async (error2) => {
+        const handleError2 = async (error2) => {
           if (!error2.response) {
             return error2;
           }
@@ -2290,6 +2290,7 @@ var axiosClient = {
                 originalRequest,
                 token
               );
+              ensureApiV2(originalRequest);
               return instance.request(originalRequest);
             }).catch(async (err) => {
               if ((err.response?.status === 400 || err.response?.status === 401) && ["invalid_grant"].includes(err.response.data.error)) {
@@ -2333,6 +2334,7 @@ var axiosClient = {
                   data.access_token
                 );
                 processQueue(null, data.access_token);
+                ensureApiV2(originalRequest);
                 resolve(instance.request(originalRequest));
               }).catch(async (err) => {
                 console.log("catch error: ", err);
@@ -2355,7 +2357,7 @@ var axiosClient = {
             });
           }
         }
-        return Promise.reject(await handleError3(error));
+        return Promise.reject(await handleError2(error));
       }
     );
     const handleResponse = (res) => {
@@ -2364,19 +2366,6 @@ var axiosClient = {
       }
       return res;
     };
-    const handleError2 = (error) => {
-      if (error.isAxiosError && error.code === "ECONNABORTED") {
-        console.error("Request Timeout Error:", error);
-        return "Request Timeout Error";
-      } else if (error.isAxiosError && !error.response) {
-        console.error("Network Error:", error);
-        return "Network Error";
-      } else {
-        console.error("Other Error:", error?.response);
-        const errorMessage = error?.response?.data?.message || "An error occurred";
-        return { message: errorMessage, status: error?.response?.status };
-      }
-    };
     const clearAuthToken = async () => {
       await localStorage2.clearToken();
       if (typeof window !== "undefined") {
@@ -2389,6 +2378,22 @@ var axiosClient = {
     const getBaseUrl = (baseUrl, hardService) => {
       return `${baseUrl.replace(/\/$/, "")}/${hardService || sessionStorage2.getMenuFocus().service || config?.default_service}/api/v2`;
     };
+    const ensureApiV2 = (req) => {
+      try {
+        const baseUrl = (config?.baseUrl || "").replace(/\/$/, "");
+        const u = String(req?.url || "");
+        if (/\/api\/v2(\/|$)/.test(u)) return req;
+        const baseUrlEscaped = baseUrl.replace(/[-/\\^$*+?.()|[\]{}]/g, "\\$&");
+        const stripped = u.replace(new RegExp(`^${baseUrlEscaped}`), "");
+        const hardService = req?.headers?.["X-Hard-Service"] || req?.headers?.["x-hard-service"];
+        const prefix = getBaseUrl(baseUrl, hardService).replace(/\/$/, "");
+        const path = (stripped || u || "").replace(/^\/+/, "");
+        req.url = `${prefix}/${path}`;
+        req.baseURL = void 0;
+      } catch (_e) {
+      }
+      return req;
+    };
     const getHeaders = (header) => {
       const headers = {
         headers: {

package/dist/provider.js

@@ -5942,7 +5942,7 @@ var axiosClient = {
         return handleResponse(response);
       },
       async (error) => {
-        const handleError3 = async (error2) => {
+        const handleError2 = async (error2) => {
           if (!error2.response) {
             return error2;
           }
@@ -5965,6 +5965,7 @@ var axiosClient = {
                 originalRequest,
                 token
               );
+              ensureApiV2(originalRequest);
               return instance.request(originalRequest);
             }).catch(async (err) => {
               if ((err.response?.status === 400 || err.response?.status === 401) && ["invalid_grant"].includes(err.response.data.error)) {
@@ -6008,6 +6009,7 @@ var axiosClient = {
                   data.access_token
                 );
                 processQueue(null, data.access_token);
+                ensureApiV2(originalRequest);
                 resolve(instance.request(originalRequest));
               }).catch(async (err) => {
                 console.log("catch error: ", err);
@@ -6030,7 +6032,7 @@ var axiosClient = {
             });
           }
         }
-        return Promise.reject(await handleError3(error));
+        return Promise.reject(await handleError2(error));
       }
     );
     const handleResponse = (res) => {
@@ -6039,19 +6041,6 @@ var axiosClient = {
       }
       return res;
     };
-    const handleError2 = (error) => {
-      if (error.isAxiosError && error.code === "ECONNABORTED") {
-        console.error("Request Timeout Error:", error);
-        return "Request Timeout Error";
-      } else if (error.isAxiosError && !error.response) {
-        console.error("Network Error:", error);
-        return "Network Error";
-      } else {
-        console.error("Other Error:", error?.response);
-        const errorMessage = error?.response?.data?.message || "An error occurred";
-        return { message: errorMessage, status: error?.response?.status };
-      }
-    };
     const clearAuthToken = async () => {
       await localStorage2.clearToken();
       if (typeof window !== "undefined") {
@@ -6064,6 +6053,22 @@ var axiosClient = {
     const getBaseUrl = (baseUrl, hardService) => {
       return `${baseUrl.replace(/\/$/, "")}/${hardService || sessionStorage2.getMenuFocus().service || config?.default_service}/api/v2`;
     };
+    const ensureApiV2 = (req) => {
+      try {
+        const baseUrl = (config?.baseUrl || "").replace(/\/$/, "");
+        const u = String(req?.url || "");
+        if (/\/api\/v2(\/|$)/.test(u)) return req;
+        const baseUrlEscaped = baseUrl.replace(/[-/\\^$*+?.()|[\]{}]/g, "\\$&");
+        const stripped = u.replace(new RegExp(`^${baseUrlEscaped}`), "");
+        const hardService = req?.headers?.["X-Hard-Service"] || req?.headers?.["x-hard-service"];
+        const prefix = getBaseUrl(baseUrl, hardService).replace(/\/$/, "");
+        const path = (stripped || u || "").replace(/^\/+/, "");
+        req.url = `${prefix}/${path}`;
+        req.baseURL = void 0;
+      } catch (_e) {
+      }
+      return req;
+    };
     const getHeaders = (header) => {
       const headers = {
         headers: {

package/dist/provider.mjs

@@ -5899,7 +5899,7 @@ var axiosClient = {
         return handleResponse(response);
       },
       async (error) => {
-        const handleError3 = async (error2) => {
+        const handleError2 = async (error2) => {
           if (!error2.response) {
             return error2;
           }
@@ -5922,6 +5922,7 @@ var axiosClient = {
                 originalRequest,
                 token
               );
+              ensureApiV2(originalRequest);
               return instance.request(originalRequest);
             }).catch(async (err) => {
               if ((err.response?.status === 400 || err.response?.status === 401) && ["invalid_grant"].includes(err.response.data.error)) {
@@ -5965,6 +5966,7 @@ var axiosClient = {
                   data.access_token
                 );
                 processQueue(null, data.access_token);
+                ensureApiV2(originalRequest);
                 resolve(instance.request(originalRequest));
               }).catch(async (err) => {
                 console.log("catch error: ", err);
@@ -5987,7 +5989,7 @@ var axiosClient = {
             });
           }
         }
-        return Promise.reject(await handleError3(error));
+        return Promise.reject(await handleError2(error));
       }
     );
     const handleResponse = (res) => {
@@ -5996,19 +5998,6 @@ var axiosClient = {
       }
       return res;
     };
-    const handleError2 = (error) => {
-      if (error.isAxiosError && error.code === "ECONNABORTED") {
-        console.error("Request Timeout Error:", error);
-        return "Request Timeout Error";
-      } else if (error.isAxiosError && !error.response) {
-        console.error("Network Error:", error);
-        return "Network Error";
-      } else {
-        console.error("Other Error:", error?.response);
-        const errorMessage = error?.response?.data?.message || "An error occurred";
-        return { message: errorMessage, status: error?.response?.status };
-      }
-    };
     const clearAuthToken = async () => {
       await localStorage2.clearToken();
       if (typeof window !== "undefined") {
@@ -6021,6 +6010,22 @@ var axiosClient = {
     const getBaseUrl = (baseUrl, hardService) => {
       return `${baseUrl.replace(/\/$/, "")}/${hardService || sessionStorage2.getMenuFocus().service || config?.default_service}/api/v2`;
     };
+    const ensureApiV2 = (req) => {
+      try {
+        const baseUrl = (config?.baseUrl || "").replace(/\/$/, "");
+        const u = String(req?.url || "");
+        if (/\/api\/v2(\/|$)/.test(u)) return req;
+        const baseUrlEscaped = baseUrl.replace(/[-/\\^$*+?.()|[\]{}]/g, "\\$&");
+        const stripped = u.replace(new RegExp(`^${baseUrlEscaped}`), "");
+        const hardService = req?.headers?.["X-Hard-Service"] || req?.headers?.["x-hard-service"];
+        const prefix = getBaseUrl(baseUrl, hardService).replace(/\/$/, "");
+        const path = (stripped || u || "").replace(/^\/+/, "");
+        req.url = `${prefix}/${path}`;
+        req.baseURL = void 0;
+      } catch (_e) {
+      }
+      return req;
+    };
     const getHeaders = (header) => {
       const headers = {
         headers: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fctc/interface-logic",
-  "version": "3.8.5",
+  "version": "3.8.7",
   "types": "dist/index.d.ts",
   "main": "dist/index.cjs",
   "module": "dist/index.mjs",