@alviere/core 0.18.0 → 0.18.1

package/dist/index.mjs

@@ -149,10 +149,10 @@ class Cryptor {
    *
    */
   constructor(logger) {
+    this.nonce = new Uint8Array(12);
     this.logger = logger;
     this.rsa_key = getRSA_PUB_KEY();
     this.key = this.generate_key();
-    this.nonce = this.generate_nonce();
     this.logger?.debug("🔐 Cryptor initialized");
   }
   /**
@@ -161,27 +161,21 @@ class Cryptor {
    * @returns
    */
   async encrypt(data) {
+    this.nonce = this.generate_nonce();
     const encoded = new TextEncoder().encode(JSON.stringify(data));
     const alg = { name: "AES-GCM", iv: this.nonce };
     const crypto_key = await this.import_key();
     const cipher = await crypto.subtle.encrypt(alg, crypto_key, encoded);
-    const cipherStr = this.bufferToStr(cipher);
-    const cipherB64 = btoa(cipherStr);
-    const keyStr = this.bufferToStr(this.key);
-    const keyB64 = btoa(keyStr);
-    const nonceStr = this.bufferToStr(this.nonce);
-    const nonceB64 = btoa(nonceStr);
+    const cipherB64 = btoa(this.bufferToStr(new Uint8Array(cipher)));
+    const keyB64 = btoa(this.bufferToStr(this.key));
+    const nonceB64 = btoa(this.bufferToStr(this.nonce));
     this.logger?.debug(`🔐 RSA_KEY: ${this.rsa_key.substring(0, 50)}...`);
     const publicKey = pki.publicKeyFromPem(this.rsa_key);
-    const keyNonceCipher = publicKey.encrypt(keyB64 + "::" + nonceB64);
-    const keyNonceB64 = btoa(keyNonceCipher);
+    const keyNonceB64 = btoa(publicKey.encrypt(keyB64 + "::" + nonceB64));
     const encrypted_request = {
       p: cipherB64,
-      // base64(AES-GCM(<sdk_envelope>))
       k: keyNonceB64,
-      // base64(RSA(base64(SDK_KEY)::base64(<sdk_nonce>)))
       i: getCERTIFICATE_ID()
-      // certificate id - configurable via environment variable
     };
     this.logger?.debug(
       `🔐 ENCRYPTED_REQUEST: p=${encrypted_request.p.substring(0, 20)}..., i=${encrypted_request.i}`
@@ -227,25 +221,12 @@ class Cryptor {
       "decrypt"
     ]);
   }
-  /**
-   *
-   * @param data
-   * @returns
-   */
-  async rsa_encrypt(data) {
-    this.logger?.debug(`🔐 RSA_ENCRYPT: Data to encrypt: ${data.substring(0, 50)}...`);
-    this.logger?.debug(`🔐 RSA_KEY: ${this.rsa_key.substring(0, 50)}...`);
-    const publicKey = pki.publicKeyFromPem(this.rsa_key);
-    return btoa(publicKey.encrypt(data));
-  }
   /**
    *
    * @param buf
    */
   bufferToStr(buf) {
-    const cb = Array.from(new Uint8Array(buf));
-    const cs = cb.map((byte) => String.fromCharCode(byte)).join("");
-    return cs;
+    return Array.from(buf).map((byte) => String.fromCharCode(byte)).join("");
   }
 }
 class Validator {