abbot-http-client 0.0.28 → 0.0.30

package/dist/index.cjs

@@ -30,10 +30,10 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/index.ts
 var index_exports = {};
 __export(index_exports, {
+  AbbotHttp: () => AbbotHttp,
   AppError: () => AppError,
   RestError: () => RestError,
-  catchError: () => catchError,
-  create: () => create
+  catchError: () => catchError
 });
 module.exports = __toCommonJS(index_exports);
 
@@ -46,6 +46,19 @@ async function catchError(promise, errorToCatch) {
   });
 }
 
+// src/error.ts
+var AppError = class extends Error {
+  name = "App Error";
+};
+var RestError = class extends Error {
+  name = "Rest Error";
+  res;
+  constructor(rs) {
+    super(rs.message);
+    this.res = rs;
+  }
+};
+
 // src/http.ts
 var import_axios2 = require("axios");
 
@@ -109,9 +122,9 @@ var Cryp = class {
   keyBuffer;
   iv;
   algConfig;
-  constructor(cryptProps) {
+  constructor(cryptProps, apiKey) {
     this.ivText = cryptProps.iv;
-    this.key = cryptProps.keyValue ? cryptProps.keyValue : ES.d(ES.b2a(getConfig().app?.apiKey));
+    this.key = cryptProps.keyValue ? cryptProps.keyValue : ES.d(ES.b2a(apiKey));
     this.keyBuffer = import_crypto_ts.enc.Utf8.parse(this.key);
     this.iv = import_crypto_ts.enc.Utf8.parse(this.ivText);
     this.algConfig = { mode: import_crypto_ts.mode.CBC, padding: import_crypto_ts.pad.PKCS7, iv: this.iv };
@@ -140,34 +153,122 @@ var Cryp = class {
   }
 };
 
+// src/config/index.ts
+var defaultConfig = {
+  axios: {
+    baseUrl: "",
+    timeout: 5e3,
+    headers: {
+      accept: "*/*",
+      lang: "TH",
+      post: {
+        contentType: "application/x-www-form-urlencoded"
+      }
+    }
+  },
+  app: {
+    redirectUrl: "/login",
+    apiKey: "",
+    timezone: "Asia/Bangkok",
+    encKey: "",
+    trackingId: "",
+    userJwt: ""
+  },
+  devMode: false,
+  useAxiosInterceptors: false
+};
+
 // src/config/axiosFn.ts
 var import_axios = __toESM(require("axios"), 1);
-function axiosConf(cfg2) {
+function axiosConf(cfg) {
   const axiosObj = import_axios.default.create({
-    baseURL: cfg2.axios?.baseUrl,
+    baseURL: cfg.axios?.baseUrl,
     headers: {
       common: {
-        Accept: cfg2.axios?.headers?.accept,
-        "Accept-Language": cfg2.axios?.headers?.lang
+        Accept: cfg.axios?.headers?.accept,
+        "Accept-Language": cfg.axios?.headers?.lang
       },
       post: {
-        "Content-Type": cfg2.axios?.headers?.post?.contentType
+        "Content-Type": cfg.axios?.headers?.post?.contentType
       }
     },
-    timeout: cfg2.axios?.timeout,
+    timeout: cfg.axios?.timeout,
     withCredentials: true
   });
   return axiosObj;
 }
 
 // src/http.ts
-var CoreHttp = class {
-  config;
-  constructor(config) {
-    this.config = config;
+var AbbotHttp = class {
+  config = defaultConfig;
+  initConfig(config) {
+    this.config = this.deepMerge(this.config, config);
+  }
+  deepMerge(target, source) {
+    for (const key in source) {
+      const srcVal = source[key];
+      if (srcVal && typeof srcVal === "object" && !Array.isArray(srcVal)) {
+        target[key] = deepMerge(target[key], srcVal);
+      } else if (srcVal !== void 0) {
+        target[key] = srcVal;
+      }
+    }
+    return target;
   }
   createAxiosInstance(option) {
     const axios2 = axiosConf(this.config);
+    if (this.config.useAxiosInterceptors) {
+      const { cryp, iv } = this.prepareRequestConfig(option);
+      axios2.interceptors.request.use(
+        (config) => {
+          const req = { ...config };
+          if (config.method && config.method.toLowerCase() === "post") {
+            if (config.data) {
+              if (config.data instanceof FormData) {
+                if (config.data.get("param")) {
+                  config.data.set(
+                    "param",
+                    cryp.encrypt(config.data.get("param")?.toString())
+                  );
+                }
+              } else {
+                const payload = {};
+                payload.param = cryp.encrypt(JSON.stringify(config.data));
+                const body = payload ? new URLSearchParams(payload).toString() : "";
+                req.data = body;
+                req.headers.setContentType(
+                  option?.contentType ?? this.config.axios.headers.post.contentType
+                );
+              }
+            }
+          }
+          req.headers.set("data-code", iv);
+          if (this.config.app.trackingId) {
+            config.headers.set("X-Trace-Id", this.config.app.trackingId);
+          }
+          if (this.config.app.userJwt) {
+            config.headers.setAuthorization(
+              `Bearer ${this.config.app.userJwt}`
+            );
+          }
+          return req;
+        },
+        (error) => Promise.reject(error)
+      );
+      axios2.interceptors.response.use(
+        (response) => {
+          const res = { ...response };
+          res.data = cryp.decrypt(response.data);
+          return res.data;
+        },
+        (error) => {
+          return this.habdleError(error, cryp);
+        }
+      );
+    }
+    return axios2;
+  }
+  prepareRequestConfig(option) {
     const iv = Secure.createId();
     if (this.config.devMode) {
       console.log({
@@ -175,133 +276,141 @@ var CoreHttp = class {
         keyValue: option?.isInit ? void 0 : this.config.app.encKey
       });
     }
-    const cryp = new Cryp({
-      iv,
-      keyValue: option?.isInit ? void 0 : this.config.app.encKey
-    });
-    axios2.interceptors.request.use(
-      (config) => {
-        const req = { ...config };
-        if (config.method && config.method.toLowerCase() === "post") {
-          if (config.data) {
-            if (config.data instanceof FormData) {
-              if (config.data.get("param")) {
-                config.data.set(
-                  "param",
-                  cryp.encrypt(config.data.get("param")?.toString())
-                );
-              }
-            } else {
-              const payload = {};
-              payload.param = cryp.encrypt(JSON.stringify(config.data));
-              const body = payload ? new URLSearchParams(payload).toString() : "";
-              req.data = body;
-              req.headers.setContentType(
-                option?.contentType ?? this.config.axios.headers.post.contentType
-              );
-            }
-          }
-        }
-        req.headers.set("data-code", iv);
-        if (this.config.app.trackingId) {
-          config.headers.set("X-Trace-Id", this.config.app.trackingId);
-        }
-        if (this.config.app.userJwt) {
-          config.headers.setAuthorization(`Bearer ${this.config.app.userJwt}`);
-        }
-        return req;
+    const cryp = new Cryp(
+      {
+        iv,
+        keyValue: option?.isInit ? void 0 : this.config.app.encKey
       },
-      (error) => Promise.reject(error)
+      this.config.app.apiKey
     );
-    axios2.interceptors.response.use(
-      (response) => {
-        const res = { ...response };
-        res.data = cryp.decrypt(response.data);
-        return res.data;
-      },
-      (error) => {
-        const err = {
+    const form = new URLSearchParams();
+    return { cryp, iv, form };
+  }
+  createAxiosRequestObj(iv) {
+    const headers = {
+      "data-code": iv
+    };
+    if (this.config.app.userJwt) {
+      headers.Authorization = `Bearer ${this.config.app.userJwt}`;
+    }
+    if (this.config.app.trackingId) {
+      headers["X-Trace-Id"] = this.config.app.trackingId;
+    }
+    return headers;
+  }
+  habdleError(error, cryp) {
+    const err = {
+      message: error.message,
+      code: error.code,
+      config: error.config,
+      request: error.request
+    };
+    if (error.response) {
+      if (error.response.data) {
+        const response = cryp.decrypt(error.response.data);
+        err.response = response;
+        return Promise.reject(
+          new import_axios2.AxiosError(
+            err.message,
+            err.code,
+            err.config,
+            err.request,
+            err.response
+          )
+        );
+      } else {
+        err.response = {
+          status: "error",
+          code: error.response.status,
           message: error.message,
-          code: error.code,
-          config: error.config,
-          request: error.request
+          data: null
         };
-        if (error.response) {
-          if (error.response.data) {
-            const response = cryp.decrypt(error.response.data);
-            err.response = response;
-            return Promise.reject(
-              new import_axios2.AxiosError(
-                err.message,
-                err.code,
-                err.config,
-                err.request,
-                err.response
-              )
-            );
-          } else {
-            err.response = {
-              status: "error",
-              code: error.response.status,
-              message: error.message,
-              data: null
-            };
-            return Promise.reject(
-              new import_axios2.AxiosError(
-                err.message,
-                err.code,
-                err.config,
-                err.request,
-                err.response
-              )
-            );
-          }
-        } else if (error.request) {
-          err.response = {
-            status: "error",
-            code: 0,
-            message: "No response received",
-            data: null
-          };
-          return Promise.reject(
-            new import_axios2.AxiosError(
-              err.message,
-              err.code,
-              err.config,
-              err.request,
-              err.response
-            )
-          );
-        } else {
-          err.response = {
-            status: "error",
-            code: 0,
-            message: error.message,
-            data: null
-          };
-          return Promise.reject(
-            new import_axios2.AxiosError(
-              err.message,
-              err.code,
-              err.config,
-              err.request,
-              err.response
-            )
-          );
-        }
+        return Promise.reject(
+          new import_axios2.AxiosError(
+            err.message,
+            err.code,
+            err.config,
+            err.request,
+            err.response
+          )
+        );
       }
-    );
-    return axios2;
+    } else if (error.request) {
+      err.response = {
+        status: "error",
+        code: 0,
+        message: "No response received",
+        data: null
+      };
+      return Promise.reject(
+        new import_axios2.AxiosError(
+          err.message,
+          err.code,
+          err.config,
+          err.request,
+          err.response
+        )
+      );
+    } else {
+      err.response = {
+        status: "error",
+        code: 0,
+        message: error.message,
+        data: null
+      };
+      return Promise.reject(
+        new import_axios2.AxiosError(
+          err.message,
+          err.code,
+          err.config,
+          err.request,
+          err.response
+        )
+      );
+    }
   }
   async post(url, param, option) {
     const axios2 = this.createAxiosInstance(option);
-    const response = await axios2.post(url, param);
-    return response;
+    if (!this.config.useAxiosInterceptors) {
+      const { cryp, iv, form } = this.prepareRequestConfig(option);
+      const config = {
+        headers: this.createAxiosRequestObj(iv)
+      };
+      if (param) {
+        form.append("param", encodeURI(cryp.encrypt(JSON.stringify(param))));
+      }
+      try {
+        const response = await axios2.post(url, form, config);
+        const res = { ...response };
+        res.data = cryp.decrypt(response.data);
+        return res.data;
+      } catch (err) {
+        return this.habdleError(err, cryp);
+      }
+    } else {
+      const response = await axios2.post(url, param);
+      return response;
+    }
   }
   async get(url, option) {
     const axios2 = this.createAxiosInstance(option);
-    const response = await axios2.get(url);
-    return response;
+    if (!this.config.useAxiosInterceptors) {
+      const { cryp, iv } = this.prepareRequestConfig(option);
+      const config = {
+        headers: this.createAxiosRequestObj(iv)
+      };
+      try {
+        const response = await axios2.get(url, config);
+        const res = { ...response };
+        res.data = cryp.decrypt(response.data);
+        return res.data;
+      } catch (err) {
+        return this.habdleError(err, cryp);
+      }
+    } else {
+      const response = await axios2.get(url);
+      return response;
+    }
   }
   async uploadFile(url, file, param1, param2, param3) {
     let response;
@@ -336,66 +445,10 @@ var CoreHttp = class {
     return this.config;
   }
 };
-
-// src/config/core.ts
-var cfg = {
-  axios: {
-    baseUrl: "",
-    timeout: 5e3,
-    headers: {
-      accept: "*/*",
-      lang: "TH",
-      post: {
-        contentType: "application/x-www-form-urlencoded"
-      }
-    }
-  },
-  app: {
-    redirectUrl: "/login",
-    apiKey: "",
-    timezone: "Asia/Bangkok",
-    encKey: "",
-    trackingId: "",
-    userJwt: ""
-  },
-  devMode: false
-};
-function getConfig() {
-  return cfg;
-}
-function deepMerge(target, source) {
-  for (const key in source) {
-    const srcVal = source[key];
-    if (srcVal && typeof srcVal === "object" && !Array.isArray(srcVal)) {
-      target[key] = deepMerge(target[key], srcVal);
-    } else if (srcVal !== void 0) {
-      target[key] = srcVal;
-    }
-  }
-  return target;
-}
-function create(config) {
-  cfg = deepMerge(cfg, config);
-  const http = new CoreHttp(cfg);
-  return http;
-}
-
-// src/error.ts
-var AppError = class extends Error {
-  name = "App Error";
-};
-var RestError = class extends Error {
-  name = "Rest Error";
-  res;
-  constructor(rs) {
-    super(rs.message);
-    this.res = rs;
-  }
-};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  AbbotHttp,
   AppError,
   RestError,
-  catchError,
-  create
+  catchError
 });

package/dist/index.d.cts

@@ -1,8 +1,19 @@
-import { AxiosResponse, AxiosError } from 'axios';
+import { AxiosResponse, AxiosInstance, AxiosError } from 'axios';
+
+declare class Cryp {
+    ivText: string;
+    key: string;
+    private keyBuffer;
+    private iv;
+    private algConfig;
+    constructor(cryptProps: {
+        iv: string;
+        keyValue?: string;
+    }, apiKey: string);
+    encrypt(textValue?: string): string;
+    decrypt<T>(encryptedValue?: string): T | null;
+}
 
-type DeepPartial<T> = T extends object ? {
-    [P in keyof T]?: DeepPartial<T[P]>;
-} : T;
 interface AbbotConfig {
     axios: {
         baseUrl: string;
@@ -24,9 +35,12 @@ interface AbbotConfig {
         userJwt: string;
     };
     devMode: boolean;
+    useAxiosInterceptors: boolean;
 }
-declare function create(config: DeepPartial<AbbotConfig>): CoreHttp;
 
+type DeepPartial<T> = T extends object ? {
+    [P in keyof T]?: DeepPartial<T[P]>;
+} : T;
 interface MethodOption {
     isInit: boolean;
     contentType: string;
@@ -38,10 +52,18 @@ interface AbbotResponse$1<T> {
     status: string;
     data: T;
 }
-declare class CoreHttp {
-    private config;
-    constructor(config: AbbotConfig);
-    private createAxiosInstance;
+declare class AbbotHttp {
+    protected config: AbbotConfig;
+    initConfig(config: DeepPartial<AbbotConfig>): void;
+    protected deepMerge<T>(target: T, source: DeepPartial<T>): T;
+    protected createAxiosInstance(option?: Partial<MethodOption>): AxiosInstance;
+    protected prepareRequestConfig(option?: Partial<MethodOption>): {
+        cryp: Cryp;
+        iv: string;
+        form: URLSearchParams;
+    };
+    protected createAxiosRequestObj(iv: string): Record<string, any>;
+    protected habdleError(error: any, cryp: Cryp): Promise<never>;
     post<T>(url: string, param?: Record<string, any> | null, option?: Partial<MethodOption>): Promise<AbbotResponse$1<T>>;
     get<T>(url: string, option?: Partial<MethodOption>): Promise<AbbotResponse$1<T>>;
     uploadFile<T>(url: string, file: File, param?: Record<string, any> | null, option?: Partial<MethodOption>): Promise<AbbotResponse$1<T>>;
@@ -62,4 +84,4 @@ declare class RestError<T extends AxiosError> extends Error {
 
 type AbbotResponse<T> = AbbotResponse$1<T>;
 
-export { type AbbotConfig, type AbbotResponse, AppError, RestError, catchError, create };
+export { type AbbotConfig, AbbotHttp, type AbbotResponse, AppError, RestError, catchError };

package/dist/index.d.ts

@@ -1,8 +1,19 @@
-import { AxiosResponse, AxiosError } from 'axios';
+import { AxiosResponse, AxiosInstance, AxiosError } from 'axios';
+
+declare class Cryp {
+    ivText: string;
+    key: string;
+    private keyBuffer;
+    private iv;
+    private algConfig;
+    constructor(cryptProps: {
+        iv: string;
+        keyValue?: string;
+    }, apiKey: string);
+    encrypt(textValue?: string): string;
+    decrypt<T>(encryptedValue?: string): T | null;
+}
 
-type DeepPartial<T> = T extends object ? {
-    [P in keyof T]?: DeepPartial<T[P]>;
-} : T;
 interface AbbotConfig {
     axios: {
         baseUrl: string;
@@ -24,9 +35,12 @@ interface AbbotConfig {
         userJwt: string;
     };
     devMode: boolean;
+    useAxiosInterceptors: boolean;
 }
-declare function create(config: DeepPartial<AbbotConfig>): CoreHttp;
 
+type DeepPartial<T> = T extends object ? {
+    [P in keyof T]?: DeepPartial<T[P]>;
+} : T;
 interface MethodOption {
     isInit: boolean;
     contentType: string;
@@ -38,10 +52,18 @@ interface AbbotResponse$1<T> {
     status: string;
     data: T;
 }
-declare class CoreHttp {
-    private config;
-    constructor(config: AbbotConfig);
-    private createAxiosInstance;
+declare class AbbotHttp {
+    protected config: AbbotConfig;
+    initConfig(config: DeepPartial<AbbotConfig>): void;
+    protected deepMerge<T>(target: T, source: DeepPartial<T>): T;
+    protected createAxiosInstance(option?: Partial<MethodOption>): AxiosInstance;
+    protected prepareRequestConfig(option?: Partial<MethodOption>): {
+        cryp: Cryp;
+        iv: string;
+        form: URLSearchParams;
+    };
+    protected createAxiosRequestObj(iv: string): Record<string, any>;
+    protected habdleError(error: any, cryp: Cryp): Promise<never>;
     post<T>(url: string, param?: Record<string, any> | null, option?: Partial<MethodOption>): Promise<AbbotResponse$1<T>>;
     get<T>(url: string, option?: Partial<MethodOption>): Promise<AbbotResponse$1<T>>;
     uploadFile<T>(url: string, file: File, param?: Record<string, any> | null, option?: Partial<MethodOption>): Promise<AbbotResponse$1<T>>;
@@ -62,4 +84,4 @@ declare class RestError<T extends AxiosError> extends Error {
 
 type AbbotResponse<T> = AbbotResponse$1<T>;
 
-export { type AbbotConfig, type AbbotResponse, AppError, RestError, catchError, create };
+export { type AbbotConfig, AbbotHttp, type AbbotResponse, AppError, RestError, catchError };

package/dist/index.js

@@ -7,8 +7,23 @@ async function catchError(promise, errorToCatch) {
   });
 }
 
+// src/error.ts
+var AppError = class extends Error {
+  name = "App Error";
+};
+var RestError = class extends Error {
+  name = "Rest Error";
+  res;
+  constructor(rs) {
+    super(rs.message);
+    this.res = rs;
+  }
+};
+
 // src/http.ts
-import { AxiosError } from "axios";
+import {
+  AxiosError
+} from "axios";
 
 // src/encryption/secure.ts
 var Secure = class {
@@ -70,9 +85,9 @@ var Cryp = class {
   keyBuffer;
   iv;
   algConfig;
-  constructor(cryptProps) {
+  constructor(cryptProps, apiKey) {
     this.ivText = cryptProps.iv;
-    this.key = cryptProps.keyValue ? cryptProps.keyValue : ES.d(ES.b2a(getConfig().app?.apiKey));
+    this.key = cryptProps.keyValue ? cryptProps.keyValue : ES.d(ES.b2a(apiKey));
     this.keyBuffer = enc.Utf8.parse(this.key);
     this.iv = enc.Utf8.parse(this.ivText);
     this.algConfig = { mode: mode.CBC, padding: pad.PKCS7, iv: this.iv };
@@ -101,34 +116,122 @@ var Cryp = class {
   }
 };
 
+// src/config/index.ts
+var defaultConfig = {
+  axios: {
+    baseUrl: "",
+    timeout: 5e3,
+    headers: {
+      accept: "*/*",
+      lang: "TH",
+      post: {
+        contentType: "application/x-www-form-urlencoded"
+      }
+    }
+  },
+  app: {
+    redirectUrl: "/login",
+    apiKey: "",
+    timezone: "Asia/Bangkok",
+    encKey: "",
+    trackingId: "",
+    userJwt: ""
+  },
+  devMode: false,
+  useAxiosInterceptors: false
+};
+
 // src/config/axiosFn.ts
 import axios from "axios";
-function axiosConf(cfg2) {
+function axiosConf(cfg) {
   const axiosObj = axios.create({
-    baseURL: cfg2.axios?.baseUrl,
+    baseURL: cfg.axios?.baseUrl,
     headers: {
       common: {
-        Accept: cfg2.axios?.headers?.accept,
-        "Accept-Language": cfg2.axios?.headers?.lang
+        Accept: cfg.axios?.headers?.accept,
+        "Accept-Language": cfg.axios?.headers?.lang
       },
       post: {
-        "Content-Type": cfg2.axios?.headers?.post?.contentType
+        "Content-Type": cfg.axios?.headers?.post?.contentType
       }
     },
-    timeout: cfg2.axios?.timeout,
+    timeout: cfg.axios?.timeout,
     withCredentials: true
   });
   return axiosObj;
 }
 
 // src/http.ts
-var CoreHttp = class {
-  config;
-  constructor(config) {
-    this.config = config;
+var AbbotHttp = class {
+  config = defaultConfig;
+  initConfig(config) {
+    this.config = this.deepMerge(this.config, config);
+  }
+  deepMerge(target, source) {
+    for (const key in source) {
+      const srcVal = source[key];
+      if (srcVal && typeof srcVal === "object" && !Array.isArray(srcVal)) {
+        target[key] = deepMerge(target[key], srcVal);
+      } else if (srcVal !== void 0) {
+        target[key] = srcVal;
+      }
+    }
+    return target;
   }
   createAxiosInstance(option) {
     const axios2 = axiosConf(this.config);
+    if (this.config.useAxiosInterceptors) {
+      const { cryp, iv } = this.prepareRequestConfig(option);
+      axios2.interceptors.request.use(
+        (config) => {
+          const req = { ...config };
+          if (config.method && config.method.toLowerCase() === "post") {
+            if (config.data) {
+              if (config.data instanceof FormData) {
+                if (config.data.get("param")) {
+                  config.data.set(
+                    "param",
+                    cryp.encrypt(config.data.get("param")?.toString())
+                  );
+                }
+              } else {
+                const payload = {};
+                payload.param = cryp.encrypt(JSON.stringify(config.data));
+                const body = payload ? new URLSearchParams(payload).toString() : "";
+                req.data = body;
+                req.headers.setContentType(
+                  option?.contentType ?? this.config.axios.headers.post.contentType
+                );
+              }
+            }
+          }
+          req.headers.set("data-code", iv);
+          if (this.config.app.trackingId) {
+            config.headers.set("X-Trace-Id", this.config.app.trackingId);
+          }
+          if (this.config.app.userJwt) {
+            config.headers.setAuthorization(
+              `Bearer ${this.config.app.userJwt}`
+            );
+          }
+          return req;
+        },
+        (error) => Promise.reject(error)
+      );
+      axios2.interceptors.response.use(
+        (response) => {
+          const res = { ...response };
+          res.data = cryp.decrypt(response.data);
+          return res.data;
+        },
+        (error) => {
+          return this.habdleError(error, cryp);
+        }
+      );
+    }
+    return axios2;
+  }
+  prepareRequestConfig(option) {
     const iv = Secure.createId();
     if (this.config.devMode) {
       console.log({
@@ -136,133 +239,141 @@ var CoreHttp = class {
         keyValue: option?.isInit ? void 0 : this.config.app.encKey
       });
     }
-    const cryp = new Cryp({
-      iv,
-      keyValue: option?.isInit ? void 0 : this.config.app.encKey
-    });
-    axios2.interceptors.request.use(
-      (config) => {
-        const req = { ...config };
-        if (config.method && config.method.toLowerCase() === "post") {
-          if (config.data) {
-            if (config.data instanceof FormData) {
-              if (config.data.get("param")) {
-                config.data.set(
-                  "param",
-                  cryp.encrypt(config.data.get("param")?.toString())
-                );
-              }
-            } else {
-              const payload = {};
-              payload.param = cryp.encrypt(JSON.stringify(config.data));
-              const body = payload ? new URLSearchParams(payload).toString() : "";
-              req.data = body;
-              req.headers.setContentType(
-                option?.contentType ?? this.config.axios.headers.post.contentType
-              );
-            }
-          }
-        }
-        req.headers.set("data-code", iv);
-        if (this.config.app.trackingId) {
-          config.headers.set("X-Trace-Id", this.config.app.trackingId);
-        }
-        if (this.config.app.userJwt) {
-          config.headers.setAuthorization(`Bearer ${this.config.app.userJwt}`);
-        }
-        return req;
+    const cryp = new Cryp(
+      {
+        iv,
+        keyValue: option?.isInit ? void 0 : this.config.app.encKey
       },
-      (error) => Promise.reject(error)
+      this.config.app.apiKey
     );
-    axios2.interceptors.response.use(
-      (response) => {
-        const res = { ...response };
-        res.data = cryp.decrypt(response.data);
-        return res.data;
-      },
-      (error) => {
-        const err = {
+    const form = new URLSearchParams();
+    return { cryp, iv, form };
+  }
+  createAxiosRequestObj(iv) {
+    const headers = {
+      "data-code": iv
+    };
+    if (this.config.app.userJwt) {
+      headers.Authorization = `Bearer ${this.config.app.userJwt}`;
+    }
+    if (this.config.app.trackingId) {
+      headers["X-Trace-Id"] = this.config.app.trackingId;
+    }
+    return headers;
+  }
+  habdleError(error, cryp) {
+    const err = {
+      message: error.message,
+      code: error.code,
+      config: error.config,
+      request: error.request
+    };
+    if (error.response) {
+      if (error.response.data) {
+        const response = cryp.decrypt(error.response.data);
+        err.response = response;
+        return Promise.reject(
+          new AxiosError(
+            err.message,
+            err.code,
+            err.config,
+            err.request,
+            err.response
+          )
+        );
+      } else {
+        err.response = {
+          status: "error",
+          code: error.response.status,
           message: error.message,
-          code: error.code,
-          config: error.config,
-          request: error.request
+          data: null
         };
-        if (error.response) {
-          if (error.response.data) {
-            const response = cryp.decrypt(error.response.data);
-            err.response = response;
-            return Promise.reject(
-              new AxiosError(
-                err.message,
-                err.code,
-                err.config,
-                err.request,
-                err.response
-              )
-            );
-          } else {
-            err.response = {
-              status: "error",
-              code: error.response.status,
-              message: error.message,
-              data: null
-            };
-            return Promise.reject(
-              new AxiosError(
-                err.message,
-                err.code,
-                err.config,
-                err.request,
-                err.response
-              )
-            );
-          }
-        } else if (error.request) {
-          err.response = {
-            status: "error",
-            code: 0,
-            message: "No response received",
-            data: null
-          };
-          return Promise.reject(
-            new AxiosError(
-              err.message,
-              err.code,
-              err.config,
-              err.request,
-              err.response
-            )
-          );
-        } else {
-          err.response = {
-            status: "error",
-            code: 0,
-            message: error.message,
-            data: null
-          };
-          return Promise.reject(
-            new AxiosError(
-              err.message,
-              err.code,
-              err.config,
-              err.request,
-              err.response
-            )
-          );
-        }
+        return Promise.reject(
+          new AxiosError(
+            err.message,
+            err.code,
+            err.config,
+            err.request,
+            err.response
+          )
+        );
       }
-    );
-    return axios2;
+    } else if (error.request) {
+      err.response = {
+        status: "error",
+        code: 0,
+        message: "No response received",
+        data: null
+      };
+      return Promise.reject(
+        new AxiosError(
+          err.message,
+          err.code,
+          err.config,
+          err.request,
+          err.response
+        )
+      );
+    } else {
+      err.response = {
+        status: "error",
+        code: 0,
+        message: error.message,
+        data: null
+      };
+      return Promise.reject(
+        new AxiosError(
+          err.message,
+          err.code,
+          err.config,
+          err.request,
+          err.response
+        )
+      );
+    }
   }
   async post(url, param, option) {
     const axios2 = this.createAxiosInstance(option);
-    const response = await axios2.post(url, param);
-    return response;
+    if (!this.config.useAxiosInterceptors) {
+      const { cryp, iv, form } = this.prepareRequestConfig(option);
+      const config = {
+        headers: this.createAxiosRequestObj(iv)
+      };
+      if (param) {
+        form.append("param", encodeURI(cryp.encrypt(JSON.stringify(param))));
+      }
+      try {
+        const response = await axios2.post(url, form, config);
+        const res = { ...response };
+        res.data = cryp.decrypt(response.data);
+        return res.data;
+      } catch (err) {
+        return this.habdleError(err, cryp);
+      }
+    } else {
+      const response = await axios2.post(url, param);
+      return response;
+    }
   }
   async get(url, option) {
     const axios2 = this.createAxiosInstance(option);
-    const response = await axios2.get(url);
-    return response;
+    if (!this.config.useAxiosInterceptors) {
+      const { cryp, iv } = this.prepareRequestConfig(option);
+      const config = {
+        headers: this.createAxiosRequestObj(iv)
+      };
+      try {
+        const response = await axios2.get(url, config);
+        const res = { ...response };
+        res.data = cryp.decrypt(response.data);
+        return res.data;
+      } catch (err) {
+        return this.habdleError(err, cryp);
+      }
+    } else {
+      const response = await axios2.get(url);
+      return response;
+    }
   }
   async uploadFile(url, file, param1, param2, param3) {
     let response;
@@ -297,65 +408,9 @@ var CoreHttp = class {
     return this.config;
   }
 };
-
-// src/config/core.ts
-var cfg = {
-  axios: {
-    baseUrl: "",
-    timeout: 5e3,
-    headers: {
-      accept: "*/*",
-      lang: "TH",
-      post: {
-        contentType: "application/x-www-form-urlencoded"
-      }
-    }
-  },
-  app: {
-    redirectUrl: "/login",
-    apiKey: "",
-    timezone: "Asia/Bangkok",
-    encKey: "",
-    trackingId: "",
-    userJwt: ""
-  },
-  devMode: false
-};
-function getConfig() {
-  return cfg;
-}
-function deepMerge(target, source) {
-  for (const key in source) {
-    const srcVal = source[key];
-    if (srcVal && typeof srcVal === "object" && !Array.isArray(srcVal)) {
-      target[key] = deepMerge(target[key], srcVal);
-    } else if (srcVal !== void 0) {
-      target[key] = srcVal;
-    }
-  }
-  return target;
-}
-function create(config) {
-  cfg = deepMerge(cfg, config);
-  const http = new CoreHttp(cfg);
-  return http;
-}
-
-// src/error.ts
-var AppError = class extends Error {
-  name = "App Error";
-};
-var RestError = class extends Error {
-  name = "Rest Error";
-  res;
-  constructor(rs) {
-    super(rs.message);
-    this.res = rs;
-  }
-};
 export {
+  AbbotHttp,
   AppError,
   RestError,
-  catchError,
-  create
+  catchError
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "abbot-http-client",
-  "version": "0.0.28",
+  "version": "0.0.30",
   "description": "This package helps Abbot team to handle all the axios requests.",
   "main": "./dist/index.js",
   "module": "./dist/index.mjs",