abbot-http-client 0.0.60 → 0.0.62

package/dist/index.cjs

@@ -112,8 +112,31 @@ var AxiosBase = class {
   }
 };
 
+// src/encryption/es.ts
+var ES = class {
+  static e(value) {
+    return Array.from(value).map((c) => c.charCodeAt(0)).reverse().map((e, i) => i % 2 === 0 ? e + 1 : e - 1).map((e, i) => i % 3 === 0 ? e * 2 : e);
+  }
+  static d(value) {
+    const result = value.map((e, i) => i % 3 === 0 ? Math.round(e / 2) : e).map((e, i) => i % 2 === 0 ? e - 1 : e + 1);
+    return String.fromCharCode.apply(null, result.reverse());
+  }
+  static a2b(value) {
+    const charactors = "abcdefghijklmnopqrstuvwxyz";
+    const randomChar = (max) => Math.floor(Math.random() * max);
+    const result = value.map(
+      (e, i) => `${String(e)}${i === value.length - 1 ? "" : charactors[randomChar(26)]}`
+    ).join("");
+    return result;
+  }
+  static b2a(value) {
+    if (!value) return [];
+    const result = value.split(/[a-z]/);
+    return result.map((e) => Number(e));
+  }
+};
+
 // src/encryption/cryp.ts
-var crypto = __toESM(require("crypto"), 1);
 var Cryp = class _Cryp {
   static TAG_SIZE = 16;
   // bytes
@@ -123,51 +146,86 @@ var Cryp = class _Cryp {
   static ALGO = "aes-256-gcm";
   key;
   iv;
-  constructor(key, iv) {
-    this.key = key;
-    this.iv = iv ?? _Cryp.genIv();
+  constructor(cryptProps, apiKey) {
+    this.key = cryptProps.key ? cryptProps.key : ES.d(ES.b2a(apiKey));
+    this.iv = cryptProps.iv ?? _Cryp.genIv();
   }
-  encrypt(text) {
+  async 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");
+    const keyBytes = _Cryp.txtToBytes(this.key);
+    const ivBytes = _Cryp.txtToBytes(this.iv);
+    const textBytes = _Cryp.txtToBytes(text);
+    const cryptoKey = await window.crypto.subtle.importKey(
+      "raw",
+      keyBytes,
+      { name: "AES-GCM" },
+      false,
+      ["encrypt"]
+    );
+    const encrypted = new Uint8Array(
+      await window.crypto.subtle.encrypt(
+        {
+          name: "AES-GCM",
+          iv: ivBytes,
+          tagLength: _Cryp.TAG_SIZE * 8
+          // bits
+        },
+        cryptoKey,
+        textBytes
+      )
+    );
+    return _Cryp.bytesToBase64(encrypted);
   }
-  decryptText(text) {
+  async 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");
+    const keyBytes = _Cryp.txtToBytes(this.key);
+    const ivBytes = _Cryp.txtToBytes(this.iv);
+    const encryptedBytes = _Cryp.base64ToBytes(text);
+    const cryptoKey = await crypto.subtle.importKey(
+      "raw",
+      keyBytes,
+      { name: "AES-GCM" },
+      false,
+      ["decrypt"]
+    );
+    const decrypted = new Uint8Array(
+      await crypto.subtle.decrypt(
+        {
+          name: "AES-GCM",
+          iv: ivBytes,
+          tagLength: _Cryp.TAG_SIZE * 8
+        },
+        cryptoKey,
+        encryptedBytes
+      )
+    );
+    return new TextDecoder().decode(decrypted);
   }
-  decrypt(text) {
+  async 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);
+    const keyBytes = _Cryp.txtToBytes(this.key);
+    const ivBytes = _Cryp.txtToBytes(this.iv);
+    const encryptedBytes = _Cryp.base64ToBytes(text);
+    const cryptoKey = await window.crypto.subtle.importKey(
+      "raw",
+      keyBytes,
+      { name: "AES-GCM" },
+      false,
+      ["decrypt"]
+    );
+    const decrypted = new Uint8Array(
+      await crypto.subtle.decrypt(
+        {
+          name: "AES-GCM",
+          iv: ivBytes,
+          tagLength: _Cryp.TAG_SIZE * 8
+        },
+        cryptoKey,
+        encryptedBytes
+      )
+    );
+    const result = new TextDecoder().decode(decrypted);
+    return JSON.parse(result);
   }
   static genIv() {
     let result = "";
@@ -177,29 +235,21 @@ var Cryp = class _Cryp {
     }
     return result;
   }
-};
-
-// src/encryption/es.ts
-var ES = class {
-  static e(value) {
-    return Array.from(value).map((c) => c.charCodeAt(0)).reverse().map((e, i) => i % 2 === 0 ? e + 1 : e - 1).map((e, i) => i % 3 === 0 ? e * 2 : e);
+  static txtToBytes(txt) {
+    return new TextEncoder().encode(txt);
   }
-  static d(value) {
-    const result = value.map((e, i) => i % 3 === 0 ? Math.round(e / 2) : e).map((e, i) => i % 2 === 0 ? e - 1 : e + 1);
-    return String.fromCharCode.apply(null, result.reverse());
+  static bytesToBase64(bytes) {
+    let binary = "";
+    bytes.forEach((b) => binary += String.fromCharCode(b));
+    return btoa(binary);
   }
-  static a2b(value) {
-    const charactors = "abcdefghijklmnopqrstuvwxyz";
-    const randomChar = (max) => Math.floor(Math.random() * max);
-    const result = value.map(
-      (e, i) => `${String(e)}${i === value.length - 1 ? "" : charactors[randomChar(26)]}`
-    ).join("");
-    return result;
-  }
-  static b2a(value) {
-    if (!value) return [];
-    const result = value.split(/[a-z]/);
-    return result.map((e) => Number(e));
+  static base64ToBytes(base64) {
+    const binary = atob(base64);
+    const bytes = new Uint8Array(binary.length);
+    for (let i = 0; i < binary.length; i++) {
+      bytes[i] = binary.charCodeAt(i);
+    }
+    return bytes;
   }
 };
 
@@ -278,11 +328,11 @@ var AbbotHttp = class extends AxiosBase {
   }
   createAxiosInstance(option) {
     const axios2 = this.axiosInstance();
-    const { cryp, iv } = this.prepareRequestConfig();
+    const { cryp, iv } = this.prepareRequestConfig(option);
     axios2.cryp = cryp;
     axios2.log = new AbbLog(cryp);
     axios2.interceptors.request.use(
-      (config) => {
+      async (config) => {
         const req = { ...config };
         req.responseType = option?.responseType ?? "json";
         if (this.config.devMode) {
@@ -294,14 +344,14 @@ var AbbotHttp = class extends AxiosBase {
           if (req.data) {
             if (req.data instanceof FormData) {
               if (req.data.get("param")) {
-                req.data.set(
-                  "param",
-                  cryp.encrypt(req.data.get("param")?.toString())
+                const param = await cryp.encrypt(
+                  req.data.get("param")?.toString()
                 );
+                req.data.set("param", param);
               }
             } else {
               const payload = {};
-              payload.param = cryp.encrypt(JSON.stringify(req.data));
+              payload.param = await cryp.encrypt(JSON.stringify(req.data));
               const body = payload ? new URLSearchParams(payload).toString() : "";
               req.data = body;
               req.headers.setContentType(
@@ -328,12 +378,12 @@ var AbbotHttp = class extends AxiosBase {
         if (option?.isDownload) {
           const contentTypes = ["application/json", "text/plain"];
           if (contentTypes.includes(contentType) && response.data instanceof Blob) {
-            res.data = cryp.decrypt(await response.data.text());
+            res.data = await cryp.decrypt(await response.data.text());
           } else {
             res.data = response.data;
           }
         } else {
-          res.data = cryp.decrypt(response.data);
+          res.data = await cryp.decrypt(response.data);
         }
         if (this.config.devMode) axios2.log.logResponse(res.data);
         return res;
@@ -347,9 +397,15 @@ var AbbotHttp = class extends AxiosBase {
     );
     return axios2;
   }
-  prepareRequestConfig() {
-    const iv = Secure.createId();
-    const cryp = new Cryp(this.config.app.apiKey, iv);
+  prepareRequestConfig(option) {
+    const iv = Cryp.genIv();
+    const cryp = new Cryp(
+      {
+        iv,
+        key: option?.isInit ? null : this.config.app.encKey
+      },
+      this.config.app.apiKey
+    );
     const form = new URLSearchParams();
     return { cryp, iv, form };
   }

package/dist/index.d.cts

@@ -7,6 +7,7 @@ interface AbbotConfig {
         headers: {
             accept: string;
             lang: string;
+            app_version?: string;
             post: {
                 contentType: string;
             };
@@ -37,14 +38,21 @@ declare class Cryp {
     private static readonly ALGO;
     key: string;
     iv: string;
-    constructor(key: string, iv?: string);
-    encrypt(text?: string): string;
-    decryptText(text?: string): string;
-    decrypt<T = any>(text?: string): T | null;
+    constructor(cryptProps: Partial<{
+        iv: string;
+        key: string | null;
+    }>, apiKey: string);
+    encrypt(text?: string): Promise<string>;
+    decryptText(text?: string): Promise<string>;
+    decrypt<T>(text?: string): Promise<T | null>;
     static genIv(): string;
+    private static txtToBytes;
+    private static bytesToBase64;
+    private static base64ToBytes;
 }
 
 interface MethodOption {
+    isInit: boolean;
     contentType: string;
     responseType: ResponseType;
     isDownload: boolean;

package/dist/index.d.ts

@@ -7,6 +7,7 @@ interface AbbotConfig {
         headers: {
             accept: string;
             lang: string;
+            app_version?: string;
             post: {
                 contentType: string;
             };
@@ -37,14 +38,21 @@ declare class Cryp {
     private static readonly ALGO;
     key: string;
     iv: string;
-    constructor(key: string, iv?: string);
-    encrypt(text?: string): string;
-    decryptText(text?: string): string;
-    decrypt<T = any>(text?: string): T | null;
+    constructor(cryptProps: Partial<{
+        iv: string;
+        key: string | null;
+    }>, apiKey: string);
+    encrypt(text?: string): Promise<string>;
+    decryptText(text?: string): Promise<string>;
+    decrypt<T>(text?: string): Promise<T | null>;
     static genIv(): string;
+    private static txtToBytes;
+    private static bytesToBase64;
+    private static base64ToBytes;
 }
 
 interface MethodOption {
+    isInit: boolean;
     contentType: string;
     responseType: ResponseType;
     isDownload: boolean;

package/dist/index.js

@@ -65,8 +65,31 @@ var AxiosBase = class {
   }
 };
 
+// src/encryption/es.ts
+var ES = class {
+  static e(value) {
+    return Array.from(value).map((c) => c.charCodeAt(0)).reverse().map((e, i) => i % 2 === 0 ? e + 1 : e - 1).map((e, i) => i % 3 === 0 ? e * 2 : e);
+  }
+  static d(value) {
+    const result = value.map((e, i) => i % 3 === 0 ? Math.round(e / 2) : e).map((e, i) => i % 2 === 0 ? e - 1 : e + 1);
+    return String.fromCharCode.apply(null, result.reverse());
+  }
+  static a2b(value) {
+    const charactors = "abcdefghijklmnopqrstuvwxyz";
+    const randomChar = (max) => Math.floor(Math.random() * max);
+    const result = value.map(
+      (e, i) => `${String(e)}${i === value.length - 1 ? "" : charactors[randomChar(26)]}`
+    ).join("");
+    return result;
+  }
+  static b2a(value) {
+    if (!value) return [];
+    const result = value.split(/[a-z]/);
+    return result.map((e) => Number(e));
+  }
+};
+
 // src/encryption/cryp.ts
-import * as crypto from "crypto";
 var Cryp = class _Cryp {
   static TAG_SIZE = 16;
   // bytes
@@ -76,51 +99,86 @@ var Cryp = class _Cryp {
   static ALGO = "aes-256-gcm";
   key;
   iv;
-  constructor(key, iv) {
-    this.key = key;
-    this.iv = iv ?? _Cryp.genIv();
+  constructor(cryptProps, apiKey) {
+    this.key = cryptProps.key ? cryptProps.key : ES.d(ES.b2a(apiKey));
+    this.iv = cryptProps.iv ?? _Cryp.genIv();
   }
-  encrypt(text) {
+  async 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");
+    const keyBytes = _Cryp.txtToBytes(this.key);
+    const ivBytes = _Cryp.txtToBytes(this.iv);
+    const textBytes = _Cryp.txtToBytes(text);
+    const cryptoKey = await window.crypto.subtle.importKey(
+      "raw",
+      keyBytes,
+      { name: "AES-GCM" },
+      false,
+      ["encrypt"]
+    );
+    const encrypted = new Uint8Array(
+      await window.crypto.subtle.encrypt(
+        {
+          name: "AES-GCM",
+          iv: ivBytes,
+          tagLength: _Cryp.TAG_SIZE * 8
+          // bits
+        },
+        cryptoKey,
+        textBytes
+      )
+    );
+    return _Cryp.bytesToBase64(encrypted);
   }
-  decryptText(text) {
+  async 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");
+    const keyBytes = _Cryp.txtToBytes(this.key);
+    const ivBytes = _Cryp.txtToBytes(this.iv);
+    const encryptedBytes = _Cryp.base64ToBytes(text);
+    const cryptoKey = await crypto.subtle.importKey(
+      "raw",
+      keyBytes,
+      { name: "AES-GCM" },
+      false,
+      ["decrypt"]
+    );
+    const decrypted = new Uint8Array(
+      await crypto.subtle.decrypt(
+        {
+          name: "AES-GCM",
+          iv: ivBytes,
+          tagLength: _Cryp.TAG_SIZE * 8
+        },
+        cryptoKey,
+        encryptedBytes
+      )
+    );
+    return new TextDecoder().decode(decrypted);
   }
-  decrypt(text) {
+  async 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);
+    const keyBytes = _Cryp.txtToBytes(this.key);
+    const ivBytes = _Cryp.txtToBytes(this.iv);
+    const encryptedBytes = _Cryp.base64ToBytes(text);
+    const cryptoKey = await window.crypto.subtle.importKey(
+      "raw",
+      keyBytes,
+      { name: "AES-GCM" },
+      false,
+      ["decrypt"]
+    );
+    const decrypted = new Uint8Array(
+      await crypto.subtle.decrypt(
+        {
+          name: "AES-GCM",
+          iv: ivBytes,
+          tagLength: _Cryp.TAG_SIZE * 8
+        },
+        cryptoKey,
+        encryptedBytes
+      )
+    );
+    const result = new TextDecoder().decode(decrypted);
+    return JSON.parse(result);
   }
   static genIv() {
     let result = "";
@@ -130,29 +188,21 @@ var Cryp = class _Cryp {
     }
     return result;
   }
-};
-
-// src/encryption/es.ts
-var ES = class {
-  static e(value) {
-    return Array.from(value).map((c) => c.charCodeAt(0)).reverse().map((e, i) => i % 2 === 0 ? e + 1 : e - 1).map((e, i) => i % 3 === 0 ? e * 2 : e);
+  static txtToBytes(txt) {
+    return new TextEncoder().encode(txt);
   }
-  static d(value) {
-    const result = value.map((e, i) => i % 3 === 0 ? Math.round(e / 2) : e).map((e, i) => i % 2 === 0 ? e - 1 : e + 1);
-    return String.fromCharCode.apply(null, result.reverse());
+  static bytesToBase64(bytes) {
+    let binary = "";
+    bytes.forEach((b) => binary += String.fromCharCode(b));
+    return btoa(binary);
   }
-  static a2b(value) {
-    const charactors = "abcdefghijklmnopqrstuvwxyz";
-    const randomChar = (max) => Math.floor(Math.random() * max);
-    const result = value.map(
-      (e, i) => `${String(e)}${i === value.length - 1 ? "" : charactors[randomChar(26)]}`
-    ).join("");
-    return result;
-  }
-  static b2a(value) {
-    if (!value) return [];
-    const result = value.split(/[a-z]/);
-    return result.map((e) => Number(e));
+  static base64ToBytes(base64) {
+    const binary = atob(base64);
+    const bytes = new Uint8Array(binary.length);
+    for (let i = 0; i < binary.length; i++) {
+      bytes[i] = binary.charCodeAt(i);
+    }
+    return bytes;
   }
 };
 
@@ -231,11 +281,11 @@ var AbbotHttp = class extends AxiosBase {
   }
   createAxiosInstance(option) {
     const axios2 = this.axiosInstance();
-    const { cryp, iv } = this.prepareRequestConfig();
+    const { cryp, iv } = this.prepareRequestConfig(option);
     axios2.cryp = cryp;
     axios2.log = new AbbLog(cryp);
     axios2.interceptors.request.use(
-      (config) => {
+      async (config) => {
         const req = { ...config };
         req.responseType = option?.responseType ?? "json";
         if (this.config.devMode) {
@@ -247,14 +297,14 @@ var AbbotHttp = class extends AxiosBase {
           if (req.data) {
             if (req.data instanceof FormData) {
               if (req.data.get("param")) {
-                req.data.set(
-                  "param",
-                  cryp.encrypt(req.data.get("param")?.toString())
+                const param = await cryp.encrypt(
+                  req.data.get("param")?.toString()
                 );
+                req.data.set("param", param);
               }
             } else {
               const payload = {};
-              payload.param = cryp.encrypt(JSON.stringify(req.data));
+              payload.param = await cryp.encrypt(JSON.stringify(req.data));
               const body = payload ? new URLSearchParams(payload).toString() : "";
               req.data = body;
               req.headers.setContentType(
@@ -281,12 +331,12 @@ var AbbotHttp = class extends AxiosBase {
         if (option?.isDownload) {
           const contentTypes = ["application/json", "text/plain"];
           if (contentTypes.includes(contentType) && response.data instanceof Blob) {
-            res.data = cryp.decrypt(await response.data.text());
+            res.data = await cryp.decrypt(await response.data.text());
           } else {
             res.data = response.data;
           }
         } else {
-          res.data = cryp.decrypt(response.data);
+          res.data = await cryp.decrypt(response.data);
         }
         if (this.config.devMode) axios2.log.logResponse(res.data);
         return res;
@@ -300,9 +350,15 @@ var AbbotHttp = class extends AxiosBase {
     );
     return axios2;
   }
-  prepareRequestConfig() {
-    const iv = Secure.createId();
-    const cryp = new Cryp(this.config.app.apiKey, iv);
+  prepareRequestConfig(option) {
+    const iv = Cryp.genIv();
+    const cryp = new Cryp(
+      {
+        iv,
+        key: option?.isInit ? null : this.config.app.encKey
+      },
+      this.config.app.apiKey
+    );
     const form = new URLSearchParams();
     return { cryp, iv, form };
   }

package/package.json

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