@fctc/interface-logic 3.8.5 → 3.8.6

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)) {
@@ -2391,7 +2392,7 @@ var axiosClient = {
             });
           }
         }
-        return Promise.reject(await handleError3(error));
+        return Promise.reject(await handleError2(error));
       }
     );
     const handleResponse = (res) => {
@@ -2400,25 +2401,28 @@ 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") {
         window.location.href = `/login`;
       }
     };
+    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;
+    };
     function formatUrl(url, db2) {
       return url + (db2 ? "?db=" + db2 : "");
     }

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)) {
@@ -2355,7 +2356,7 @@ var axiosClient = {
             });
           }
         }
-        return Promise.reject(await handleError3(error));
+        return Promise.reject(await handleError2(error));
       }
     );
     const handleResponse = (res) => {
@@ -2364,25 +2365,28 @@ 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") {
         window.location.href = `/login`;
       }
     };
+    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;
+    };
     function formatUrl(url, db2) {
       return url + (db2 ? "?db=" + db2 : "");
     }

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)) {
@@ -2393,7 +2394,7 @@ var axiosClient = {
             });
           }
         }
-        return Promise.reject(await handleError3(error));
+        return Promise.reject(await handleError2(error));
       }
     );
     const handleResponse = (res) => {
@@ -2402,25 +2403,28 @@ 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") {
         window.location.href = `/login`;
       }
     };
+    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;
+    };
     function formatUrl(url, db2) {
       return url + (db2 ? "?db=" + db2 : "");
     }

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)) {
@@ -2355,7 +2356,7 @@ var axiosClient = {
             });
           }
         }
-        return Promise.reject(await handleError3(error));
+        return Promise.reject(await handleError2(error));
       }
     );
     const handleResponse = (res) => {
@@ -2364,25 +2365,28 @@ 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") {
         window.location.href = `/login`;
       }
     };
+    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;
+    };
     function formatUrl(url, db2) {
       return url + (db2 ? "?db=" + db2 : "");
     }

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)) {
@@ -6030,7 +6031,7 @@ var axiosClient = {
             });
           }
         }
-        return Promise.reject(await handleError3(error));
+        return Promise.reject(await handleError2(error));
       }
     );
     const handleResponse = (res) => {
@@ -6039,25 +6040,28 @@ 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") {
         window.location.href = `/login`;
       }
     };
+    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;
+    };
     function formatUrl(url, db2) {
       return url + (db2 ? "?db=" + db2 : "");
     }

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)) {
@@ -5987,7 +5988,7 @@ var axiosClient = {
             });
           }
         }
-        return Promise.reject(await handleError3(error));
+        return Promise.reject(await handleError2(error));
       }
     );
     const handleResponse = (res) => {
@@ -5996,25 +5997,28 @@ 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") {
         window.location.href = `/login`;
       }
     };
+    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;
+    };
     function formatUrl(url, db2) {
       return url + (db2 ? "?db=" + db2 : "");
     }

package/package.json

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