abbot-http-client 0.0.44 → 0.0.46

package/dist/index.cjs

@@ -84,39 +84,6 @@ function deepMerge(target, source) {
   return target;
 }
 
-// src/log/core.ts
-var import_console_log_colors = require("console-log-colors");
-var AbbLog = class {
-  LogRequest = (cryp, method, path, req, res) => {
-    const log = [];
-    const isErr = res.status !== "ok";
-    log.push(`[${(0, import_console_log_colors.blueBright)(cryp.ivText)}]`);
-    log.push((0, import_console_log_colors.cyan)(this.getDate()));
-    log.push((0, import_console_log_colors.green)(`[${method}]`));
-    log.push((0, import_console_log_colors.magenta)(`[${path}]`));
-    console.log(log.join(""));
-    console.log(
-      `[${(0, import_console_log_colors.blueBright)(cryp.ivText)}] ${(0, import_console_log_colors.blue)("req:")} ${JSON.stringify(req)}`
-    );
-    console.log(
-      `[${(0, import_console_log_colors.blueBright)(cryp.ivText)}] ${isErr ? (0, import_console_log_colors.red)("res:") : (0, import_console_log_colors.blue)("res:")} ${JSON.stringify(res)}`
-    );
-  };
-  Info = (cryp, txt) => {
-    const log = [];
-    log.push(`[${(0, import_console_log_colors.blueBright)(cryp.ivText)}]`);
-    log.push((0, import_console_log_colors.cyan)(this.getDate()));
-    log.push((0, import_console_log_colors.green)(`[${txt}]`));
-  };
-  getDate = () => {
-    const today = /* @__PURE__ */ new Date();
-    const hours = String(today.getHours()).padStart(2, "0");
-    const minutes = String(today.getMinutes()).padStart(2, "0");
-    const seconds = String(today.getSeconds()).padStart(2, "0");
-    return `[${hours}:${minutes}:${seconds}]`;
-  };
-};
-
 // src/config/axiosFn.ts
 function axiosConf(cfg) {
   return import_axios.default.create({
@@ -140,9 +107,7 @@ var Axios = class {
     this.config = deepMerge(this.config, config);
   }
   axiosInstance() {
-    const ist = axiosConf(this.config);
-    ist.log = new AbbLog();
-    return ist;
+    return axiosConf(this.config);
   }
 };
 
@@ -239,6 +204,44 @@ var Secure = class {
 
 // src/http/core.ts
 var import_axios2 = require("axios");
+
+// src/log/core.ts
+var import_console_log_colors = require("console-log-colors");
+var AbbLog = class {
+  cryp;
+  log = [];
+  constructor(cryp) {
+    this.cryp = cryp;
+    this.log.push(`[${(0, import_console_log_colors.blueBright)(cryp.ivText)}]`);
+    this.log.push(`[${(0, import_console_log_colors.blueBright)(cryp.key)}]`);
+  }
+  logRequest(path, req) {
+    const temp = [...this.log];
+    temp.push((0, import_console_log_colors.cyan)(this.getDate()));
+    temp.push((0, import_console_log_colors.magenta)(`[${path}]`));
+    console.log(
+      `${temp.join("")}
+${(0, import_console_log_colors.blue)("req:")} ${req ? JSON.stringify(req) : "no data from log request"}`
+    );
+  }
+  logResponse(res) {
+    const temp = [...this.log];
+    temp.push((0, import_console_log_colors.cyan)(this.getDate()));
+    console.log(
+      `${temp.join("")}
+${(0, import_console_log_colors.blue)("res:")} ${res ? JSON.stringify(res) : "no data from log response"}`
+    );
+  }
+  getDate = () => {
+    const today = /* @__PURE__ */ new Date();
+    const hours = String(today.getHours()).padStart(2, "0");
+    const minutes = String(today.getMinutes()).padStart(2, "0");
+    const seconds = String(today.getSeconds()).padStart(2, "0");
+    return `[${hours}:${minutes}:${seconds}]`;
+  };
+};
+
+// src/http/core.ts
 var AbbotHttp = class extends Axios {
   constructor(config) {
     super(config);
@@ -250,11 +253,15 @@ var AbbotHttp = class extends Axios {
     const axios2 = this.axiosInstance();
     const { cryp, iv } = this.prepareRequestConfig(option);
     axios2.cryp = cryp;
+    axios2.log = new AbbLog(cryp);
     axios2.interceptors.request.use(
       (config) => {
         const req = { ...config };
         if (req.method && req.method.toLowerCase() === "post") {
           req.responseType = option?.responseType ?? "json";
+          if (this.config.devMode) {
+            axios2.log.logRequest(config.url ?? "", req.data);
+          }
           if (req.data) {
             if (req.data instanceof FormData) {
               if (req.data.get("param")) {
@@ -286,19 +293,29 @@ var AbbotHttp = class extends Axios {
       (error) => Promise.reject(error)
     );
     axios2.interceptors.response.use(
-      (response) => {
+      async (response) => {
         const res = { ...response };
         if (option?.isDownload) {
           const contentTypes = ["application/json", "text/plain"];
           if (contentTypes.includes(response.headers["content-type"])) {
-            res.data = cryp.decrypt(response.data);
+            const result = response.data instanceof Blob ? await response.data.text() : response.data;
+            res.data = cryp.decrypt(result);
+            if (this.config.devMode) {
+              axios2.log.logResponse(res.data);
+            }
           }
           return res;
         }
         res.data = cryp.decrypt(response.data);
+        if (this.config.devMode) {
+          axios2.log.logResponse(res.data);
+        }
         return res.data;
       },
       (error) => {
+        if (this.config.devMode) {
+          axios2.log.logResponse(error);
+        }
         return this.handleError(error, cryp);
       }
     );
@@ -390,17 +407,11 @@ var AbbotHttp = class extends Axios {
   async post(url, param, option) {
     const axios2 = this.createAxiosInstance(option);
     const response = await axios2.post(url, param);
-    if (this.config.devMode) {
-      axios2.log.LogRequest(axios2.cryp, "POST", url, param, response);
-    }
     return response;
   }
   async get(url, option) {
     const axios2 = this.createAxiosInstance(option);
     const response = await axios2.get(url);
-    if (this.config.devMode) {
-      axios2.log.LogRequest(axios2.cryp, "GET", url, {}, response);
-    }
     return response;
   }
   async download(url, param, option) {
@@ -410,9 +421,6 @@ var AbbotHttp = class extends Axios {
       responseType: "blob"
     });
     const response = await axios2.post(url, param);
-    if (this.config.devMode) {
-      axios2.log.LogRequest(axios2.cryp, "POST", url, param, response);
-    }
     return response;
   }
   async uploadFile(url, file, param1, param2, param3) {
@@ -433,9 +441,6 @@ var AbbotHttp = class extends Axios {
         formData.append("param", JSON.stringify(param));
       }
       response = await axios2.post(url, formData);
-      if (this.config.devMode) {
-        axios2.log.LogRequest(axios2.cryp, "POST", url, param, response);
-      }
     } else {
       const param = param1;
       const opt = param2;
@@ -445,9 +450,6 @@ var AbbotHttp = class extends Axios {
         formData.append("param", JSON.stringify(param));
       }
       response = await axios2.post(url, formData);
-      if (this.config.devMode) {
-        axios2.log.LogRequest(axios2.cryp, "POST", url, param, response);
-      }
     }
     return response;
   }

package/dist/index.d.cts

@@ -1,4 +1,4 @@
-import { AxiosResponse, ResponseType, AxiosInstance, AxiosError } from 'axios';
+import { ResponseType, AxiosResponse, AxiosInstance, AxiosError } from 'axios';
 
 interface AbbotConfig {
     axios: {
@@ -75,9 +75,12 @@ declare class Secure {
 }
 
 declare class AbbLog {
-    LogRequest: <T>(cryp: Cryp, method: "POST" | "GET", path: string, req: any, res: AbbotResponse<T> | AxiosResponse) => void;
-    Info: (cryp: Cryp, txt: string) => void;
-    getDate: () => string;
+    private cryp;
+    private log;
+    constructor(cryp: Cryp);
+    logRequest(path: string, req: any): void;
+    logResponse(res: any): void;
+    private getDate;
 }
 
 interface HttpInstance extends AxiosInstance {

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-import { AxiosResponse, ResponseType, AxiosInstance, AxiosError } from 'axios';
+import { ResponseType, AxiosResponse, AxiosInstance, AxiosError } from 'axios';
 
 interface AbbotConfig {
     axios: {
@@ -75,9 +75,12 @@ declare class Secure {
 }
 
 declare class AbbLog {
-    LogRequest: <T>(cryp: Cryp, method: "POST" | "GET", path: string, req: any, res: AbbotResponse<T> | AxiosResponse) => void;
-    Info: (cryp: Cryp, txt: string) => void;
-    getDate: () => string;
+    private cryp;
+    private log;
+    constructor(cryp: Cryp);
+    logRequest(path: string, req: any): void;
+    logResponse(res: any): void;
+    private getDate;
 }
 
 interface HttpInstance extends AxiosInstance {

package/dist/index.js

@@ -38,46 +38,6 @@ function deepMerge(target, source) {
   return target;
 }
 
-// src/log/core.ts
-import {
-  red,
-  green,
-  magenta,
-  cyan,
-  blueBright,
-  blue
-} from "console-log-colors";
-var AbbLog = class {
-  LogRequest = (cryp, method, path, req, res) => {
-    const log = [];
-    const isErr = res.status !== "ok";
-    log.push(`[${blueBright(cryp.ivText)}]`);
-    log.push(cyan(this.getDate()));
-    log.push(green(`[${method}]`));
-    log.push(magenta(`[${path}]`));
-    console.log(log.join(""));
-    console.log(
-      `[${blueBright(cryp.ivText)}] ${blue("req:")} ${JSON.stringify(req)}`
-    );
-    console.log(
-      `[${blueBright(cryp.ivText)}] ${isErr ? red("res:") : blue("res:")} ${JSON.stringify(res)}`
-    );
-  };
-  Info = (cryp, txt) => {
-    const log = [];
-    log.push(`[${blueBright(cryp.ivText)}]`);
-    log.push(cyan(this.getDate()));
-    log.push(green(`[${txt}]`));
-  };
-  getDate = () => {
-    const today = /* @__PURE__ */ new Date();
-    const hours = String(today.getHours()).padStart(2, "0");
-    const minutes = String(today.getMinutes()).padStart(2, "0");
-    const seconds = String(today.getSeconds()).padStart(2, "0");
-    return `[${hours}:${minutes}:${seconds}]`;
-  };
-};
-
 // src/config/axiosFn.ts
 function axiosConf(cfg) {
   return axios.create({
@@ -101,9 +61,7 @@ var Axios = class {
     this.config = deepMerge(this.config, config);
   }
   axiosInstance() {
-    const ist = axiosConf(this.config);
-    ist.log = new AbbLog();
-    return ist;
+    return axiosConf(this.config);
   }
 };
 
@@ -200,6 +158,44 @@ var Secure = class {
 
 // src/http/core.ts
 import { AxiosError } from "axios";
+
+// src/log/core.ts
+import { magenta, cyan, blueBright, blue } from "console-log-colors";
+var AbbLog = class {
+  cryp;
+  log = [];
+  constructor(cryp) {
+    this.cryp = cryp;
+    this.log.push(`[${blueBright(cryp.ivText)}]`);
+    this.log.push(`[${blueBright(cryp.key)}]`);
+  }
+  logRequest(path, req) {
+    const temp = [...this.log];
+    temp.push(cyan(this.getDate()));
+    temp.push(magenta(`[${path}]`));
+    console.log(
+      `${temp.join("")}
+${blue("req:")} ${req ? JSON.stringify(req) : "no data from log request"}`
+    );
+  }
+  logResponse(res) {
+    const temp = [...this.log];
+    temp.push(cyan(this.getDate()));
+    console.log(
+      `${temp.join("")}
+${blue("res:")} ${res ? JSON.stringify(res) : "no data from log response"}`
+    );
+  }
+  getDate = () => {
+    const today = /* @__PURE__ */ new Date();
+    const hours = String(today.getHours()).padStart(2, "0");
+    const minutes = String(today.getMinutes()).padStart(2, "0");
+    const seconds = String(today.getSeconds()).padStart(2, "0");
+    return `[${hours}:${minutes}:${seconds}]`;
+  };
+};
+
+// src/http/core.ts
 var AbbotHttp = class extends Axios {
   constructor(config) {
     super(config);
@@ -211,11 +207,15 @@ var AbbotHttp = class extends Axios {
     const axios2 = this.axiosInstance();
     const { cryp, iv } = this.prepareRequestConfig(option);
     axios2.cryp = cryp;
+    axios2.log = new AbbLog(cryp);
     axios2.interceptors.request.use(
       (config) => {
         const req = { ...config };
         if (req.method && req.method.toLowerCase() === "post") {
           req.responseType = option?.responseType ?? "json";
+          if (this.config.devMode) {
+            axios2.log.logRequest(config.url ?? "", req.data);
+          }
           if (req.data) {
             if (req.data instanceof FormData) {
               if (req.data.get("param")) {
@@ -247,19 +247,29 @@ var AbbotHttp = class extends Axios {
       (error) => Promise.reject(error)
     );
     axios2.interceptors.response.use(
-      (response) => {
+      async (response) => {
         const res = { ...response };
         if (option?.isDownload) {
           const contentTypes = ["application/json", "text/plain"];
           if (contentTypes.includes(response.headers["content-type"])) {
-            res.data = cryp.decrypt(response.data);
+            const result = response.data instanceof Blob ? await response.data.text() : response.data;
+            res.data = cryp.decrypt(result);
+            if (this.config.devMode) {
+              axios2.log.logResponse(res.data);
+            }
           }
           return res;
         }
         res.data = cryp.decrypt(response.data);
+        if (this.config.devMode) {
+          axios2.log.logResponse(res.data);
+        }
         return res.data;
       },
       (error) => {
+        if (this.config.devMode) {
+          axios2.log.logResponse(error);
+        }
         return this.handleError(error, cryp);
       }
     );
@@ -351,17 +361,11 @@ var AbbotHttp = class extends Axios {
   async post(url, param, option) {
     const axios2 = this.createAxiosInstance(option);
     const response = await axios2.post(url, param);
-    if (this.config.devMode) {
-      axios2.log.LogRequest(axios2.cryp, "POST", url, param, response);
-    }
     return response;
   }
   async get(url, option) {
     const axios2 = this.createAxiosInstance(option);
     const response = await axios2.get(url);
-    if (this.config.devMode) {
-      axios2.log.LogRequest(axios2.cryp, "GET", url, {}, response);
-    }
     return response;
   }
   async download(url, param, option) {
@@ -371,9 +375,6 @@ var AbbotHttp = class extends Axios {
       responseType: "blob"
     });
     const response = await axios2.post(url, param);
-    if (this.config.devMode) {
-      axios2.log.LogRequest(axios2.cryp, "POST", url, param, response);
-    }
     return response;
   }
   async uploadFile(url, file, param1, param2, param3) {
@@ -394,9 +395,6 @@ var AbbotHttp = class extends Axios {
         formData.append("param", JSON.stringify(param));
       }
       response = await axios2.post(url, formData);
-      if (this.config.devMode) {
-        axios2.log.LogRequest(axios2.cryp, "POST", url, param, response);
-      }
     } else {
       const param = param1;
       const opt = param2;
@@ -406,9 +404,6 @@ var AbbotHttp = class extends Axios {
         formData.append("param", JSON.stringify(param));
       }
       response = await axios2.post(url, formData);
-      if (this.config.devMode) {
-        axios2.log.LogRequest(axios2.cryp, "POST", url, param, response);
-      }
     }
     return response;
   }

package/package.json

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