abbot-http-client 0.0.57 → 0.0.59

package/dist/index.cjs

@@ -113,7 +113,71 @@ var AxiosBase = class {
 };
 
 // src/encryption/cryp.ts
-var import_crypto_ts = require("crypto-ts");
+var crypto = __toESM(require("crypto"), 1);
+var Cryp = class _Cryp {
+  static TAG_SIZE = 16;
+  // bytes
+  static NONCE_SIZE = 12;
+  // bytes
+  static CHAR = "0123456789";
+  static ALGO = "aes-256-gcm";
+  key;
+  iv;
+  constructor(key, iv) {
+    this.key = key;
+    this.iv = iv ?? _Cryp.genIv();
+  }
+  encrypt(text) {
+    if (!text) return "";
+    const keyBuf = Buffer.from(this.key, "utf8");
+    const ivBuf = Buffer.from(this.iv, "utf8");
+    const cipher = crypto.createCipheriv(_Cryp.ALGO, keyBuf, ivBuf);
+    const encrypted = Buffer.concat([
+      cipher.update(text, "utf8"),
+      cipher.final()
+    ]);
+    const tag = cipher.getAuthTag();
+    return Buffer.concat([encrypted, tag]).toString("base64");
+  }
+  decryptText(text) {
+    if (!text) return "";
+    const data = Buffer.from(text, "base64");
+    const ciphertext = data.subarray(0, data.length - _Cryp.TAG_SIZE);
+    const tag = data.subarray(data.length - _Cryp.TAG_SIZE);
+    const keyBuf = Buffer.from(this.key, "utf8");
+    const ivBuf = Buffer.from(this.iv, "utf8");
+    const decipher = crypto.createDecipheriv(_Cryp.ALGO, keyBuf, ivBuf);
+    decipher.setAuthTag(tag);
+    const decrypted = Buffer.concat([
+      decipher.update(ciphertext),
+      decipher.final()
+    ]);
+    return decrypted.toString("utf8");
+  }
+  decrypt(text) {
+    if (!text) return null;
+    const data = Buffer.from(text, "base64");
+    const ciphertext = data.subarray(0, data.length - _Cryp.TAG_SIZE);
+    const tag = data.subarray(data.length - _Cryp.TAG_SIZE);
+    const keyBuf = Buffer.from(this.key, "utf8");
+    const ivBuf = Buffer.from(this.iv, "utf8");
+    const decipher = crypto.createDecipheriv(_Cryp.ALGO, keyBuf, ivBuf);
+    decipher.setAuthTag(tag);
+    const decrypted = Buffer.concat([
+      decipher.update(ciphertext),
+      decipher.final()
+    ]).toString("utf8");
+    return JSON.parse(decrypted);
+  }
+  static genIv() {
+    let result = "";
+    for (let i = 0; i < _Cryp.NONCE_SIZE; i++) {
+      const index = Math.floor(Math.random() * _Cryp.CHAR.length);
+      result += _Cryp.CHAR[index];
+    }
+    return result;
+  }
+};
 
 // src/encryption/es.ts
 var ES = class {
@@ -139,44 +203,6 @@ var ES = class {
   }
 };
 
-// src/encryption/cryp.ts
-var Cryp = class {
-  ivText;
-  key;
-  keyBuffer;
-  iv;
-  algConfig;
-  constructor(cryptProps, apiKey) {
-    this.ivText = cryptProps.iv;
-    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 };
-  }
-  encrypt(textValue) {
-    if (!textValue) return "";
-    if (!textValue.length) return textValue;
-    const cipher = import_crypto_ts.AES.encrypt(textValue, this.keyBuffer, this.algConfig);
-    return cipher.toString();
-  }
-  decrypt(encryptedValue) {
-    try {
-      if (!encryptedValue || !encryptedValue.length) return null;
-      const decryptValue = import_crypto_ts.AES.decrypt(
-        encryptedValue,
-        this.keyBuffer,
-        this.algConfig
-      );
-      const decryptData = decryptValue.toString(import_crypto_ts.enc.Utf8);
-      const jsonData = JSON.parse(decryptData);
-      return jsonData;
-    } catch (err) {
-      console.error(err);
-      return null;
-    }
-  }
-};
-
 // src/encryption/secure.ts
 var Secure = class {
   static keySize = 16;
@@ -213,7 +239,7 @@ var AbbLog = class {
   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.iv)}]`);
     this.log.push(`[${(0, import_console_log_colors.blueBright)(cryp.key)}]`);
   }
   logRequest(path, req) {
@@ -252,17 +278,19 @@ var AbbotHttp = class extends AxiosBase {
   }
   createAxiosInstance(option) {
     const axios2 = this.axiosInstance();
-    const { cryp, iv } = this.prepareRequestConfig(option);
+    const { cryp, iv } = this.prepareRequestConfig();
     axios2.cryp = cryp;
     axios2.log = new AbbLog(cryp);
     axios2.interceptors.request.use(
       (config) => {
         const req = { ...config };
+        req.responseType = option?.responseType ?? "json";
+        if (this.config.devMode) {
+          const method = req.method?.toLowerCase() || "";
+          const payload = method === "get" ? req.params : req.data;
+          axios2.log.logRequest(req.url ?? "", payload);
+        }
         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")) {
@@ -319,15 +347,9 @@ var AbbotHttp = class extends AxiosBase {
     );
     return axios2;
   }
-  prepareRequestConfig(option) {
+  prepareRequestConfig() {
     const iv = Secure.createId();
-    const cryp = new Cryp(
-      {
-        iv,
-        keyValue: option?.isInit ? null : this.config.app.encKey
-      },
-      this.config.app.apiKey
-    );
+    const cryp = new Cryp(this.config.app.apiKey, iv);
     const form = new URLSearchParams();
     return { cryp, iv, form };
   }
@@ -393,7 +415,7 @@ var AbbotHttp = class extends AxiosBase {
       };
       if (error.code === "ECONNABORTED") {
         err.response.code = -1;
-        err.response.message = "\u0E01\u0E32\u0E23\u0E14\u0E33\u0E40\u0E19\u0E34\u0E19\u0E01\u0E32\u0E23\u0E43\u0E0A\u0E49\u0E40\u0E27\u0E25\u0E32\u0E19\u0E32\u0E40\u0E01\u0E34\u0E19\u0E44\u0E1B";
+        err.response.message = "\u0E01\u0E32\u0E23\u0E14\u0E33\u0E40\u0E19\u0E34\u0E19\u0E01\u0E32\u0E23\u0E43\u0E0A\u0E49\u0E40\u0E27\u0E25\u0E32\u0E19\u0E32\u0E19\u0E40\u0E01\u0E34\u0E19\u0E44\u0E1B";
         err.response.detail = "\u0E01\u0E23\u0E38\u0E13\u0E32\u0E25\u0E2D\u0E07\u0E43\u0E2B\u0E21\u0E48\u0E2D\u0E35\u0E01\u0E04\u0E23\u0E31\u0E49\u0E07";
       } else if (error.code === "ERR_NETWORK") {
         err.response.code = -2;

package/dist/index.d.cts

@@ -31,21 +31,20 @@ type DeepPartial<T> = T extends object ? {
 declare function deepMerge<T>(target: T, source: DeepPartial<T>): T;
 
 declare class Cryp {
-    ivText: string;
+    private static readonly TAG_SIZE;
+    private static readonly NONCE_SIZE;
+    private static readonly CHAR;
+    private static readonly ALGO;
     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;
+    iv: string;
+    constructor(key: string, iv?: string);
+    encrypt(text?: string): string;
+    decryptText(text?: string): string;
+    decrypt<T = any>(text?: string): T | null;
+    static genIv(): string;
 }
 
 interface MethodOption {
-    isInit: boolean;
     contentType: string;
     responseType: ResponseType;
     isDownload: boolean;

package/dist/index.d.ts

@@ -31,21 +31,20 @@ type DeepPartial<T> = T extends object ? {
 declare function deepMerge<T>(target: T, source: DeepPartial<T>): T;
 
 declare class Cryp {
-    ivText: string;
+    private static readonly TAG_SIZE;
+    private static readonly NONCE_SIZE;
+    private static readonly CHAR;
+    private static readonly ALGO;
     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;
+    iv: string;
+    constructor(key: string, iv?: string);
+    encrypt(text?: string): string;
+    decryptText(text?: string): string;
+    decrypt<T = any>(text?: string): T | null;
+    static genIv(): string;
 }
 
 interface MethodOption {
-    isInit: boolean;
     contentType: string;
     responseType: ResponseType;
     isDownload: boolean;

package/dist/index.js

@@ -66,7 +66,71 @@ var AxiosBase = class {
 };
 
 // src/encryption/cryp.ts
-import { AES, enc, mode, pad } from "crypto-ts";
+import * as crypto from "crypto";
+var Cryp = class _Cryp {
+  static TAG_SIZE = 16;
+  // bytes
+  static NONCE_SIZE = 12;
+  // bytes
+  static CHAR = "0123456789";
+  static ALGO = "aes-256-gcm";
+  key;
+  iv;
+  constructor(key, iv) {
+    this.key = key;
+    this.iv = iv ?? _Cryp.genIv();
+  }
+  encrypt(text) {
+    if (!text) return "";
+    const keyBuf = Buffer.from(this.key, "utf8");
+    const ivBuf = Buffer.from(this.iv, "utf8");
+    const cipher = crypto.createCipheriv(_Cryp.ALGO, keyBuf, ivBuf);
+    const encrypted = Buffer.concat([
+      cipher.update(text, "utf8"),
+      cipher.final()
+    ]);
+    const tag = cipher.getAuthTag();
+    return Buffer.concat([encrypted, tag]).toString("base64");
+  }
+  decryptText(text) {
+    if (!text) return "";
+    const data = Buffer.from(text, "base64");
+    const ciphertext = data.subarray(0, data.length - _Cryp.TAG_SIZE);
+    const tag = data.subarray(data.length - _Cryp.TAG_SIZE);
+    const keyBuf = Buffer.from(this.key, "utf8");
+    const ivBuf = Buffer.from(this.iv, "utf8");
+    const decipher = crypto.createDecipheriv(_Cryp.ALGO, keyBuf, ivBuf);
+    decipher.setAuthTag(tag);
+    const decrypted = Buffer.concat([
+      decipher.update(ciphertext),
+      decipher.final()
+    ]);
+    return decrypted.toString("utf8");
+  }
+  decrypt(text) {
+    if (!text) return null;
+    const data = Buffer.from(text, "base64");
+    const ciphertext = data.subarray(0, data.length - _Cryp.TAG_SIZE);
+    const tag = data.subarray(data.length - _Cryp.TAG_SIZE);
+    const keyBuf = Buffer.from(this.key, "utf8");
+    const ivBuf = Buffer.from(this.iv, "utf8");
+    const decipher = crypto.createDecipheriv(_Cryp.ALGO, keyBuf, ivBuf);
+    decipher.setAuthTag(tag);
+    const decrypted = Buffer.concat([
+      decipher.update(ciphertext),
+      decipher.final()
+    ]).toString("utf8");
+    return JSON.parse(decrypted);
+  }
+  static genIv() {
+    let result = "";
+    for (let i = 0; i < _Cryp.NONCE_SIZE; i++) {
+      const index = Math.floor(Math.random() * _Cryp.CHAR.length);
+      result += _Cryp.CHAR[index];
+    }
+    return result;
+  }
+};
 
 // src/encryption/es.ts
 var ES = class {
@@ -92,44 +156,6 @@ var ES = class {
   }
 };
 
-// src/encryption/cryp.ts
-var Cryp = class {
-  ivText;
-  key;
-  keyBuffer;
-  iv;
-  algConfig;
-  constructor(cryptProps, apiKey) {
-    this.ivText = cryptProps.iv;
-    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 };
-  }
-  encrypt(textValue) {
-    if (!textValue) return "";
-    if (!textValue.length) return textValue;
-    const cipher = AES.encrypt(textValue, this.keyBuffer, this.algConfig);
-    return cipher.toString();
-  }
-  decrypt(encryptedValue) {
-    try {
-      if (!encryptedValue || !encryptedValue.length) return null;
-      const decryptValue = AES.decrypt(
-        encryptedValue,
-        this.keyBuffer,
-        this.algConfig
-      );
-      const decryptData = decryptValue.toString(enc.Utf8);
-      const jsonData = JSON.parse(decryptData);
-      return jsonData;
-    } catch (err) {
-      console.error(err);
-      return null;
-    }
-  }
-};
-
 // src/encryption/secure.ts
 var Secure = class {
   static keySize = 16;
@@ -166,7 +192,7 @@ var AbbLog = class {
   log = [];
   constructor(cryp) {
     this.cryp = cryp;
-    this.log.push(`[${blueBright(cryp.ivText)}]`);
+    this.log.push(`[${blueBright(cryp.iv)}]`);
     this.log.push(`[${blueBright(cryp.key)}]`);
   }
   logRequest(path, req) {
@@ -205,17 +231,19 @@ var AbbotHttp = class extends AxiosBase {
   }
   createAxiosInstance(option) {
     const axios2 = this.axiosInstance();
-    const { cryp, iv } = this.prepareRequestConfig(option);
+    const { cryp, iv } = this.prepareRequestConfig();
     axios2.cryp = cryp;
     axios2.log = new AbbLog(cryp);
     axios2.interceptors.request.use(
       (config) => {
         const req = { ...config };
+        req.responseType = option?.responseType ?? "json";
+        if (this.config.devMode) {
+          const method = req.method?.toLowerCase() || "";
+          const payload = method === "get" ? req.params : req.data;
+          axios2.log.logRequest(req.url ?? "", payload);
+        }
         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")) {
@@ -272,15 +300,9 @@ var AbbotHttp = class extends AxiosBase {
     );
     return axios2;
   }
-  prepareRequestConfig(option) {
+  prepareRequestConfig() {
     const iv = Secure.createId();
-    const cryp = new Cryp(
-      {
-        iv,
-        keyValue: option?.isInit ? null : this.config.app.encKey
-      },
-      this.config.app.apiKey
-    );
+    const cryp = new Cryp(this.config.app.apiKey, iv);
     const form = new URLSearchParams();
     return { cryp, iv, form };
   }
@@ -346,7 +368,7 @@ var AbbotHttp = class extends AxiosBase {
       };
       if (error.code === "ECONNABORTED") {
         err.response.code = -1;
-        err.response.message = "\u0E01\u0E32\u0E23\u0E14\u0E33\u0E40\u0E19\u0E34\u0E19\u0E01\u0E32\u0E23\u0E43\u0E0A\u0E49\u0E40\u0E27\u0E25\u0E32\u0E19\u0E32\u0E40\u0E01\u0E34\u0E19\u0E44\u0E1B";
+        err.response.message = "\u0E01\u0E32\u0E23\u0E14\u0E33\u0E40\u0E19\u0E34\u0E19\u0E01\u0E32\u0E23\u0E43\u0E0A\u0E49\u0E40\u0E27\u0E25\u0E32\u0E19\u0E32\u0E19\u0E40\u0E01\u0E34\u0E19\u0E44\u0E1B";
         err.response.detail = "\u0E01\u0E23\u0E38\u0E13\u0E32\u0E25\u0E2D\u0E07\u0E43\u0E2B\u0E21\u0E48\u0E2D\u0E35\u0E01\u0E04\u0E23\u0E31\u0E49\u0E07";
       } else if (error.code === "ERR_NETWORK") {
         err.response.code = -2;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "abbot-http-client",
-  "version": "0.0.57",
+  "version": "0.0.59",
   "description": "This package helps Abbot team to handle all the axios requests.",
   "main": "./dist/index.js",
   "module": "./dist/index.mjs",
@@ -20,7 +20,6 @@
     "@types/node": "^24.0.14",
     "axios": "^1.10.0",
     "console-log-colors": "^0.5.0",
-    "crypto-ts": "^1.0.2",
     "ts-node": "^10.9.2",
     "typescript": "^5.8.3"
   },