abbot-http-client 0.0.34 → 0.0.36

package/dist/index.cjs

@@ -30,62 +30,87 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/index.ts
 var index_exports = {};
 __export(index_exports, {
+  AbbotHttp: () => AbbotHttp,
   AppError: () => AppError,
+  Axios: () => Axios,
+  Cryp: () => Cryp,
+  ES: () => ES,
   RestError: () => RestError,
+  Secure: () => Secure,
   catchError: () => catchError,
-  create: () => create
+  create: () => create,
+  deepMerge: () => deepMerge,
+  defaultConfig: () => defaultConfig
 });
 module.exports = __toCommonJS(index_exports);
 
-// src/catchError.ts
-async function catchError(promise, errorToCatch) {
-  return promise.then((data) => [void 0, data]).catch((error) => {
-    if (errorToCatch === void 0) return [error];
-    if (errorToCatch.some((e) => error instanceof e)) return [error];
-    throw error;
-  });
-}
+// src/config/axiosFn.ts
+var import_axios = __toESM(require("axios"), 1);
 
-// 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/config/core.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: null,
+    trackingId: "",
+    userJwt: null
+  },
+  devMode: false
 };
 
-// src/http.ts
-var import_axios2 = require("axios");
-
-// src/encryption/secure.ts
-var Secure = class {
-  static keySize = 16;
-  static a = 5;
-  static b = 9;
-  static char = "0123456789";
-  static createId = () => {
-    const keyId = Array(this.keySize).fill("").map(() => {
-      const value = Math.floor(Math.random() * 10);
-      return this.char[value];
-    });
-    return keyId.join("");
-  };
-  static createKey = (keyId) => {
-    const crKey = Array(this.keySize).fill("").map((_, i) => Number(this.a ** Number(keyId[i]) % this.b));
-    return crKey.join("");
-  };
-  static toBase64Length16 = (text) => {
-    if (text && text.length) {
-      const b64 = Buffer.from(encodeURI(text)).toString("base64");
-      return b64.substring(0, 16);
+// src/utilities.ts
+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 "";
-  };
+  }
+  return target;
+}
+
+// src/config/axiosFn.ts
+function axiosConf(cfg) {
+  const axiosObj = import_axios.default.create({
+    baseURL: cfg.axios?.baseUrl,
+    headers: {
+      common: {
+        Accept: cfg.axios?.headers?.accept,
+        "Accept-Language": cfg.axios?.headers?.lang
+      },
+      post: {
+        "Content-Type": cfg.axios?.headers?.post?.contentType
+      }
+    },
+    timeout: cfg.axios?.timeout,
+    withCredentials: true
+  });
+  return axiosObj;
+}
+var Axios = class {
+  config = defaultConfig;
+  constructor(config) {
+    this.config = deepMerge(this.config, config);
+  }
+  axiosInstance() {
+    const axios2 = axiosConf(this.config);
+    return axios2;
+  }
 };
 
 // src/encryption/cryp.ts
@@ -153,119 +178,88 @@ var Cryp = class {
   }
 };
 
-// src/config/index.ts
-var defaultConfig = {
-  axios: {
-    baseUrl: "",
-    timeout: 5e3,
-    headers: {
-      accept: "*/*",
-      lang: "TH",
-      post: {
-        contentType: "application/x-www-form-urlencoded"
-      }
+// src/encryption/secure.ts
+var Secure = class {
+  static keySize = 16;
+  static a = 5;
+  static b = 9;
+  static char = "0123456789";
+  static createId = () => {
+    const keyId = Array(this.keySize).fill("").map(() => {
+      const value = Math.floor(Math.random() * 10);
+      return this.char[value];
+    });
+    return keyId.join("");
+  };
+  static createKey = (keyId) => {
+    const crKey = Array(this.keySize).fill("").map((_, i) => Number(this.a ** Number(keyId[i]) % this.b));
+    return crKey.join("");
+  };
+  static toBase64Length16 = (text) => {
+    if (text && text.length) {
+      const b64 = Buffer.from(encodeURI(text)).toString("base64");
+      return b64.substring(0, 16);
     }
-  },
-  app: {
-    redirectUrl: "/login",
-    apiKey: "",
-    timezone: "Asia/Bangkok",
-    encKey: "",
-    trackingId: "",
-    userJwt: ""
-  },
-  devMode: false,
-  useAxiosInterceptors: false
+    return "";
+  };
 };
 
-// src/config/axiosFn.ts
-var import_axios = __toESM(require("axios"), 1);
-function axiosConf(cfg) {
-  const axiosObj = import_axios.default.create({
-    baseURL: cfg.axios?.baseUrl,
-    headers: {
-      common: {
-        Accept: cfg.axios?.headers?.accept,
-        "Accept-Language": cfg.axios?.headers?.lang
-      },
-      post: {
-        "Content-Type": cfg.axios?.headers?.post?.contentType
-      }
-    },
-    timeout: cfg.axios?.timeout,
-    withCredentials: true
-  });
-  return axiosObj;
-}
-
-// src/http.ts
-var AbbotHttp = class {
-  config = defaultConfig;
+// src/http/core.ts
+var import_axios2 = require("axios");
+var AbbotHttp = class extends Axios {
   constructor(config) {
-    this.config = this.deepMerge(this.config, config);
+    super(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;
+  getConfig() {
+    return this.config;
   }
   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
+    const axios2 = this.axiosInstance();
+    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);
         }
-      );
-    }
+        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) {
@@ -279,25 +273,13 @@ var AbbotHttp = class {
     const cryp = new Cryp(
       {
         iv,
-        keyValue: option?.isInit ? void 0 : this.config.app.encKey
+        keyValue: option?.isInit ? null : this.config.app.encKey
       },
       this.config.app.apiKey
     );
     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,
@@ -371,46 +353,13 @@ var AbbotHttp = class {
   }
   async post(url, param, option) {
     const axios2 = this.createAxiosInstance(option);
-    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;
-    }
+    const response = await axios2.post(url, param);
+    return response;
   }
   async get(url, option) {
     const axios2 = this.createAxiosInstance(option);
-    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;
-    }
+    const response = await axios2.get(url);
+    return response;
   }
   async uploadFile(url, file, param1, param2, param3) {
     let response;
@@ -441,20 +390,46 @@ var AbbotHttp = class {
     }
     return response;
   }
-  getConfig() {
-    return this.config;
+};
+
+// src/catchError.ts
+async function catchError(promise, errorToCatch) {
+  return promise.then((data) => [void 0, data]).catch((error) => {
+    if (errorToCatch === void 0) return [error];
+    if (errorToCatch.some((e) => error instanceof e)) return [error];
+    throw error;
+  });
+}
+
+// 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/config/core.ts
+// src/core.ts
 function create(config) {
   const http = new AbbotHttp(config);
   return http;
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  AbbotHttp,
   AppError,
+  Axios,
+  Cryp,
+  ES,
   RestError,
+  Secure,
   catchError,
-  create
+  create,
+  deepMerge,
+  defaultConfig
 });

package/dist/index.d.cts

@@ -1,18 +1,5 @@
-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;
-}
+import * as axios from 'axios';
+import { AxiosResponse, AxiosError } from 'axios';
 
 interface AbbotConfig {
     axios: {
@@ -31,44 +18,77 @@ interface AbbotConfig {
         apiKey: string;
         timezone: string;
         trackingId: string;
-        encKey: string;
-        userJwt: string;
+        encKey: string | null;
+        userJwt: string | null;
     };
     devMode: boolean;
-    useAxiosInterceptors: boolean;
 }
+declare const defaultConfig: AbbotConfig;
 
 type DeepPartial<T> = T extends object ? {
     [P in keyof T]?: DeepPartial<T[P]>;
 } : T;
+declare function deepMerge<T>(target: T, source: DeepPartial<T>): T;
+
+declare class Axios {
+    config: AbbotConfig;
+    constructor(config: DeepPartial<AbbotConfig>);
+    axiosInstance(): axios.AxiosInstance;
+}
+
+declare class Cryp {
+    ivText: string;
+    key: string;
+    private keyBuffer;
+    private iv;
+    private algConfig;
+    constructor(cryptProps: {
+        iv: string;
+        keyValue?: string | null;
+    }, apiKey: string);
+    encrypt(textValue?: string): string;
+    decrypt<T>(encryptedValue?: string): T | null;
+}
+
+declare class ES {
+    static e(value: string): number[];
+    static d(value: number[]): string;
+    static a2b(value: number[]): string;
+    static b2a(value: string | undefined): number[];
+}
+
+declare class Secure {
+    private static readonly keySize;
+    private static readonly a;
+    private static readonly b;
+    private static readonly char;
+    static createId: () => string;
+    static createKey: (keyId: string) => string;
+    static toBase64Length16: (text: string | undefined) => string;
+}
+
 interface MethodOption {
     isInit: boolean;
     contentType: string;
 }
-interface AbbotResponse$1<T> {
+interface AbbotResponse<T> {
     code: AxiosResponse["status"];
     detail: string | null;
     message: string;
     status: string;
     data: T;
 }
-declare class AbbotHttp {
-    protected config: AbbotConfig;
+
+declare class AbbotHttp extends Axios {
     constructor(config: DeepPartial<AbbotConfig>);
-    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>>;
-    uploadFile<T>(url: string, file: File[], fileKeys: string[], param?: Record<string, any> | null, option?: Partial<MethodOption>): Promise<AbbotResponse$1<T>>;
     getConfig(): AbbotConfig;
+    private createAxiosInstance;
+    private prepareRequestConfig;
+    private habdleError;
+    post<T>(url: string, param?: Record<string, any> | null, option?: Partial<MethodOption>): Promise<AbbotResponse<T>>;
+    get<T>(url: string, option?: Partial<MethodOption>): Promise<AbbotResponse<T>>;
+    uploadFile<T>(url: string, file: File, param?: Record<string, any> | null, option?: Partial<MethodOption>): Promise<AbbotResponse<T>>;
+    uploadFile<T>(url: string, file: File[], fileKeys: string[], param?: Record<string, any> | null, option?: Partial<MethodOption>): Promise<AbbotResponse<T>>;
 }
 
 declare function catchError<T, E extends new (err?: any) => Error>(promise: Promise<T>, errorToCatch?: E[]): Promise<[undefined, T] | [InstanceType<E>]>;
@@ -84,6 +104,4 @@ declare class RestError<T extends AxiosError> extends Error {
 
 declare function create(config: DeepPartial<AbbotConfig>): AbbotHttp;
 
-type AbbotResponse<T> = AbbotResponse$1<T>;
-
-export { type AbbotConfig, type AbbotResponse, AppError, RestError, catchError, create };
+export { type AbbotConfig, AbbotHttp, type AbbotResponse, AppError, Axios, Cryp, type DeepPartial, ES, type MethodOption, RestError, Secure, catchError, create, deepMerge, defaultConfig };

package/dist/index.d.ts

@@ -1,18 +1,5 @@
-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;
-}
+import * as axios from 'axios';
+import { AxiosResponse, AxiosError } from 'axios';
 
 interface AbbotConfig {
     axios: {
@@ -31,44 +18,77 @@ interface AbbotConfig {
         apiKey: string;
         timezone: string;
         trackingId: string;
-        encKey: string;
-        userJwt: string;
+        encKey: string | null;
+        userJwt: string | null;
     };
     devMode: boolean;
-    useAxiosInterceptors: boolean;
 }
+declare const defaultConfig: AbbotConfig;
 
 type DeepPartial<T> = T extends object ? {
     [P in keyof T]?: DeepPartial<T[P]>;
 } : T;
+declare function deepMerge<T>(target: T, source: DeepPartial<T>): T;
+
+declare class Axios {
+    config: AbbotConfig;
+    constructor(config: DeepPartial<AbbotConfig>);
+    axiosInstance(): axios.AxiosInstance;
+}
+
+declare class Cryp {
+    ivText: string;
+    key: string;
+    private keyBuffer;
+    private iv;
+    private algConfig;
+    constructor(cryptProps: {
+        iv: string;
+        keyValue?: string | null;
+    }, apiKey: string);
+    encrypt(textValue?: string): string;
+    decrypt<T>(encryptedValue?: string): T | null;
+}
+
+declare class ES {
+    static e(value: string): number[];
+    static d(value: number[]): string;
+    static a2b(value: number[]): string;
+    static b2a(value: string | undefined): number[];
+}
+
+declare class Secure {
+    private static readonly keySize;
+    private static readonly a;
+    private static readonly b;
+    private static readonly char;
+    static createId: () => string;
+    static createKey: (keyId: string) => string;
+    static toBase64Length16: (text: string | undefined) => string;
+}
+
 interface MethodOption {
     isInit: boolean;
     contentType: string;
 }
-interface AbbotResponse$1<T> {
+interface AbbotResponse<T> {
     code: AxiosResponse["status"];
     detail: string | null;
     message: string;
     status: string;
     data: T;
 }
-declare class AbbotHttp {
-    protected config: AbbotConfig;
+
+declare class AbbotHttp extends Axios {
     constructor(config: DeepPartial<AbbotConfig>);
-    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>>;
-    uploadFile<T>(url: string, file: File[], fileKeys: string[], param?: Record<string, any> | null, option?: Partial<MethodOption>): Promise<AbbotResponse$1<T>>;
     getConfig(): AbbotConfig;
+    private createAxiosInstance;
+    private prepareRequestConfig;
+    private habdleError;
+    post<T>(url: string, param?: Record<string, any> | null, option?: Partial<MethodOption>): Promise<AbbotResponse<T>>;
+    get<T>(url: string, option?: Partial<MethodOption>): Promise<AbbotResponse<T>>;
+    uploadFile<T>(url: string, file: File, param?: Record<string, any> | null, option?: Partial<MethodOption>): Promise<AbbotResponse<T>>;
+    uploadFile<T>(url: string, file: File[], fileKeys: string[], param?: Record<string, any> | null, option?: Partial<MethodOption>): Promise<AbbotResponse<T>>;
 }
 
 declare function catchError<T, E extends new (err?: any) => Error>(promise: Promise<T>, errorToCatch?: E[]): Promise<[undefined, T] | [InstanceType<E>]>;
@@ -84,6 +104,4 @@ declare class RestError<T extends AxiosError> extends Error {
 
 declare function create(config: DeepPartial<AbbotConfig>): AbbotHttp;
 
-type AbbotResponse<T> = AbbotResponse$1<T>;
-
-export { type AbbotConfig, type AbbotResponse, AppError, RestError, catchError, create };
+export { type AbbotConfig, AbbotHttp, type AbbotResponse, AppError, Axios, Cryp, type DeepPartial, ES, type MethodOption, RestError, Secure, catchError, create, deepMerge, defaultConfig };

package/dist/index.js

@@ -1,54 +1,70 @@
-// src/catchError.ts
-async function catchError(promise, errorToCatch) {
-  return promise.then((data) => [void 0, data]).catch((error) => {
-    if (errorToCatch === void 0) return [error];
-    if (errorToCatch.some((e) => error instanceof e)) return [error];
-    throw error;
-  });
-}
+// src/config/axiosFn.ts
+import axios from "axios";
 
-// 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/config/core.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: null,
+    trackingId: "",
+    userJwt: null
+  },
+  devMode: false
 };
 
-// src/http.ts
-import {
-  AxiosError
-} from "axios";
-
-// src/encryption/secure.ts
-var Secure = class {
-  static keySize = 16;
-  static a = 5;
-  static b = 9;
-  static char = "0123456789";
-  static createId = () => {
-    const keyId = Array(this.keySize).fill("").map(() => {
-      const value = Math.floor(Math.random() * 10);
-      return this.char[value];
-    });
-    return keyId.join("");
-  };
-  static createKey = (keyId) => {
-    const crKey = Array(this.keySize).fill("").map((_, i) => Number(this.a ** Number(keyId[i]) % this.b));
-    return crKey.join("");
-  };
-  static toBase64Length16 = (text) => {
-    if (text && text.length) {
-      const b64 = Buffer.from(encodeURI(text)).toString("base64");
-      return b64.substring(0, 16);
+// src/utilities.ts
+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 "";
-  };
+  }
+  return target;
+}
+
+// src/config/axiosFn.ts
+function axiosConf(cfg) {
+  const axiosObj = axios.create({
+    baseURL: cfg.axios?.baseUrl,
+    headers: {
+      common: {
+        Accept: cfg.axios?.headers?.accept,
+        "Accept-Language": cfg.axios?.headers?.lang
+      },
+      post: {
+        "Content-Type": cfg.axios?.headers?.post?.contentType
+      }
+    },
+    timeout: cfg.axios?.timeout,
+    withCredentials: true
+  });
+  return axiosObj;
+}
+var Axios = class {
+  config = defaultConfig;
+  constructor(config) {
+    this.config = deepMerge(this.config, config);
+  }
+  axiosInstance() {
+    const axios2 = axiosConf(this.config);
+    return axios2;
+  }
 };
 
 // src/encryption/cryp.ts
@@ -116,119 +132,88 @@ var Cryp = class {
   }
 };
 
-// src/config/index.ts
-var defaultConfig = {
-  axios: {
-    baseUrl: "",
-    timeout: 5e3,
-    headers: {
-      accept: "*/*",
-      lang: "TH",
-      post: {
-        contentType: "application/x-www-form-urlencoded"
-      }
+// src/encryption/secure.ts
+var Secure = class {
+  static keySize = 16;
+  static a = 5;
+  static b = 9;
+  static char = "0123456789";
+  static createId = () => {
+    const keyId = Array(this.keySize).fill("").map(() => {
+      const value = Math.floor(Math.random() * 10);
+      return this.char[value];
+    });
+    return keyId.join("");
+  };
+  static createKey = (keyId) => {
+    const crKey = Array(this.keySize).fill("").map((_, i) => Number(this.a ** Number(keyId[i]) % this.b));
+    return crKey.join("");
+  };
+  static toBase64Length16 = (text) => {
+    if (text && text.length) {
+      const b64 = Buffer.from(encodeURI(text)).toString("base64");
+      return b64.substring(0, 16);
     }
-  },
-  app: {
-    redirectUrl: "/login",
-    apiKey: "",
-    timezone: "Asia/Bangkok",
-    encKey: "",
-    trackingId: "",
-    userJwt: ""
-  },
-  devMode: false,
-  useAxiosInterceptors: false
+    return "";
+  };
 };
 
-// src/config/axiosFn.ts
-import axios from "axios";
-function axiosConf(cfg) {
-  const axiosObj = axios.create({
-    baseURL: cfg.axios?.baseUrl,
-    headers: {
-      common: {
-        Accept: cfg.axios?.headers?.accept,
-        "Accept-Language": cfg.axios?.headers?.lang
-      },
-      post: {
-        "Content-Type": cfg.axios?.headers?.post?.contentType
-      }
-    },
-    timeout: cfg.axios?.timeout,
-    withCredentials: true
-  });
-  return axiosObj;
-}
-
-// src/http.ts
-var AbbotHttp = class {
-  config = defaultConfig;
+// src/http/core.ts
+import { AxiosError } from "axios";
+var AbbotHttp = class extends Axios {
   constructor(config) {
-    this.config = this.deepMerge(this.config, config);
+    super(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;
+  getConfig() {
+    return this.config;
   }
   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
+    const axios2 = this.axiosInstance();
+    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);
         }
-      );
-    }
+        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) {
@@ -242,25 +227,13 @@ var AbbotHttp = class {
     const cryp = new Cryp(
       {
         iv,
-        keyValue: option?.isInit ? void 0 : this.config.app.encKey
+        keyValue: option?.isInit ? null : this.config.app.encKey
       },
       this.config.app.apiKey
     );
     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,
@@ -334,46 +307,13 @@ var AbbotHttp = class {
   }
   async post(url, param, option) {
     const axios2 = this.createAxiosInstance(option);
-    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;
-    }
+    const response = await axios2.post(url, param);
+    return response;
   }
   async get(url, option) {
     const axios2 = this.createAxiosInstance(option);
-    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;
-    }
+    const response = await axios2.get(url);
+    return response;
   }
   async uploadFile(url, file, param1, param2, param3) {
     let response;
@@ -404,19 +344,45 @@ var AbbotHttp = class {
     }
     return response;
   }
-  getConfig() {
-    return this.config;
+};
+
+// src/catchError.ts
+async function catchError(promise, errorToCatch) {
+  return promise.then((data) => [void 0, data]).catch((error) => {
+    if (errorToCatch === void 0) return [error];
+    if (errorToCatch.some((e) => error instanceof e)) return [error];
+    throw error;
+  });
+}
+
+// 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/config/core.ts
+// src/core.ts
 function create(config) {
   const http = new AbbotHttp(config);
   return http;
 }
 export {
+  AbbotHttp,
   AppError,
+  Axios,
+  Cryp,
+  ES,
   RestError,
+  Secure,
   catchError,
-  create
+  create,
+  deepMerge,
+  defaultConfig
 };

package/package.json

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