k9crypt 1.1.2 → 1.1.4

package/README.md

@@ -5,38 +5,72 @@
 This is a special encryption algorithm created for K9Crypt.
 
 ## Updates
-**v1.1.2**
-- The issue caused by modules has been resolved.
+
+**v1.1.4**
+
+- You can now use the module in both ES Modules and CommonJS formats. This makes it easier to switch between different module types in your project.
 
 ## Installation
 
 ```bash
-npm install k9crypt
+bun add k9crypt
+# npm install k9crypt
+# pnpm add k9crypt
+# yarn add k9crypt
 ```
 
 ## Usage
 
+Usage in CommonJS:
 ```javascript
 const k9crypt = require('k9crypt');
 
 async function test() {
-    const secretKey = 'VeryLongSecretKey!@#1234567890';
-    const encryptor = new k9crypt(secretKey);
-    const plaintext = 'Hello, World!';
-
-    try {
-        const encrypted = await encryptor.encrypt(plaintext);
-        console.log('Encrypted data:', encrypted);
-
-        const decrypted = await encryptor.decrypt(encrypted);
-        console.log('Decrypted data:', decrypted);
-    } catch (error) {
-        console.error('Encryption error:', error);
-    }
+  const secretKey = 'VeryLongSecretKey!@#1234567890';
+  const encryptor = new k9crypt(secretKey);
+  // Or you can use it without providing a secretKey value. A key will be generated by the system.
+  // const encryptor = new k9crypt();
+  const plaintext = 'Hello, World!';
+
+  try {
+    const encrypted = await encryptor.encrypt(plaintext);
+    console.log('Encrypted data:', encrypted);
+
+    const decrypted = await encryptor.decrypt(encrypted);
+    console.log('Decrypted data:', decrypted);
+  } catch (error) {
+    console.error('Encryption error:', error);
+  }
+}
+
+test();
+```
+
+Usage in ES Modules:
+```javascript
+import k9crypt from 'k9crypt';
+
+async function test() {
+  const secretKey = 'VeryLongSecretKey!@#1234567890';
+  const encryptor = new k9crypt(secretKey);
+  // Or you can use it without providing a secretKey value. A key will be generated by the system.
+  // const encryptor = new k9crypt();
+  const plaintext = 'Hello, World!';
+
+  try {
+    const encrypted = await encryptor.encrypt(plaintext);
+    console.log('Encrypted data:', encrypted);
+
+    const decrypted = await encryptor.decrypt(encrypted);
+    console.log('Decrypted data:', decrypted);
+  } catch (error) {
+    console.error('Encryption error:', error);
+  }
 }
 
 test();
 ```
 
 ## License
+
 This project is licensed under the MIT license.

package/{src → dist/cjs}/constants.js

@@ -1,3 +1,5 @@
+"use strict";
+
 module.exports = {
   SALT_SIZE: 32,
   IV_SIZE: 16,
@@ -6,5 +8,5 @@ module.exports = {
   PBKDF2_ITERATIONS: 310000,
   HASH_SEED: 0xCAFEBABE,
   PEPPER: 'veryLongAndComplexPepperValue123!@#$%^&*()_+[]{}|;:,.<>?',
-  HMAC_KEY: 'veryLongAndComplexHMACKeyValue456!@#$%^&*()_+[]{}|;:,.<>?',
+  HMAC_KEY: 'veryLongAndComplexHMACKeyValue456!@#$%^&*()_+[]{}|;:,.<>?'
 };

package/{src → dist/cjs}/index.js

@@ -1,21 +1,53 @@
-const crypto = require('crypto');
-const { compress, decompress } = require('./utils/compression');
-const { deriveKey } = require('./utils/keyDerivation');
-const { encrypt, decrypt } = require('./utils/encryption');
-const { hash, verifyHash } = require('./utils/hashing');
-const { SALT_SIZE, IV_SIZE, TAG_SIZE } = require('./constants');
+"use strict";
 
+const crypto = require('crypto');
+const {
+  compress,
+  decompress
+} = require('./utils/compression');
+const {
+  deriveKey
+} = require('./utils/keyDerivation');
+const {
+  encrypt,
+  decrypt
+} = require('./utils/encryption');
+const {
+  hash,
+  verifyHash
+} = require('./utils/hashing');
+const {
+  SALT_SIZE,
+  IV_SIZE,
+  TAG_SIZE
+} = require('./constants');
 class K9crypt {
   constructor(secretKey) {
-    this.secretKey = secretKey;
+    if (!secretKey) {
+      this.secretKey = crypto.randomBytes(50);
+      this._autoGenerated = true;
+    } else {
+      this._autoGenerated = false;
+      this.secretKey = secretKey;
+    }
+  }
+  getGenerated() {
+    return this._autoGenerated ? this.secretKey : null;
   }
-
   async encrypt(plaintext) {
     try {
       const compressed = await compress(plaintext);
       const salt = crypto.randomBytes(SALT_SIZE);
       const key = await deriveKey(this.secretKey, salt);
-      const { iv1, iv2, iv3, iv4, iv5, encrypted, tag1 } = encrypt(compressed, key);
+      const {
+        iv1,
+        iv2,
+        iv3,
+        iv4,
+        iv5,
+        encrypted,
+        tag1
+      } = encrypt(compressed, key);
       const dataToHash = Buffer.concat([salt, iv1, iv2, iv3, iv4, iv5, encrypted, tag1]);
       const dataHash = hash(dataToHash);
       const result = Buffer.concat([salt, iv1, iv2, iv3, iv4, iv5, encrypted, tag1, dataHash]);
@@ -24,7 +56,6 @@ class K9crypt {
       console.log('Encryption failed');
     }
   }
-
   async decrypt(ciphertext) {
     try {
       const data = Buffer.from(ciphertext, 'base64');
@@ -37,12 +68,10 @@ class K9crypt {
       const encrypted = data.slice(SALT_SIZE + 5 * IV_SIZE, -TAG_SIZE - 64);
       const tag1 = data.slice(-TAG_SIZE - 64, -64);
       const dataHash = data.slice(-64);
-
       const dataToVerify = data.slice(0, -64);
       if (!verifyHash(dataToVerify, dataHash)) {
         console.log('Data integrity check failed');
       }
-
       const key = await deriveKey(this.secretKey, salt);
       const decrypted = decrypt(encrypted, key, iv1, iv2, iv3, iv4, iv5, tag1);
       const decompressed = await decompress(decrypted);
@@ -52,5 +81,4 @@ class K9crypt {
     }
   }
 }
-
 module.exports = K9crypt;

package/{src → dist/cjs}/utils/compression.js

@@ -1,7 +1,8 @@
+"use strict";
+
 const zlib = require('zlib');
 const lzma = require('lzma-native');
-
-exports.compress = async (data) => {
+exports.compress = async data => {
   try {
     const brotliParams = {
       params: {
@@ -11,32 +12,25 @@ exports.compress = async (data) => {
         [zlib.constants.BROTLI_PARAM_LGWIN]: 24
       }
     };
-
     const brotliCompressed = await new Promise((resolve, reject) => {
       zlib.brotliCompress(Buffer.from(data, 'utf8'), brotliParams, (err, compressed) => {
-        if (err) reject(err);
-        else resolve(compressed);
+        if (err) reject(err);else resolve(compressed);
       });
     });
-
     const lzmaCompressed = await lzma.compress(brotliCompressed, 9);
     return lzmaCompressed;
   } catch (error) {
     throw new Error(`Compression error: ${error.message}`);
   }
 };
-
-exports.decompress = async (data) => {
+exports.decompress = async data => {
   try {
     const lzmaDecompressed = await lzma.decompress(data);
-
     const brotliDecompressed = await new Promise((resolve, reject) => {
       zlib.brotliDecompress(lzmaDecompressed, (err, decompressed) => {
-        if (err) reject(err);
-        else resolve(decompressed);
+        if (err) reject(err);else resolve(decompressed);
       });
     });
-
     return brotliDecompressed;
   } catch (error) {
     throw new Error(`Decompression error: ${error.message}`);

package/{src → dist/cjs}/utils/encryption.js

@@ -1,7 +1,12 @@
-const crypto = require('crypto');
-const { IV_SIZE } = require('../constants');
-const { reverseBuffer } = require('./math');
+"use strict";
 
+const crypto = require('crypto');
+const {
+  IV_SIZE
+} = require('../constants');
+const {
+  reverseBuffer
+} = require('./math');
 exports.encrypt = (data, key) => {
   const iv1 = crypto.randomBytes(IV_SIZE);
   const cipher1 = crypto.createCipheriv('aes-256-gcm', key, iv1);
@@ -25,10 +30,16 @@ exports.encrypt = (data, key) => {
   let encrypted5 = cipher5.update(encrypted4);
   encrypted5 = Buffer.concat([encrypted5, cipher5.final()]);
   const permutedEncrypted = reverseBuffer(encrypted5);
-
-  return { iv1, iv2, iv3, iv4, iv5, encrypted: permutedEncrypted, tag1 };
+  return {
+    iv1,
+    iv2,
+    iv3,
+    iv4,
+    iv5,
+    encrypted: permutedEncrypted,
+    tag1
+  };
 };
-
 exports.decrypt = (encrypted, key, iv1, iv2, iv3, iv4, iv5, tag1) => {
   const originalEncrypted = reverseBuffer(encrypted, true);
   const decipher5 = crypto.createDecipheriv('aes-256-ctr', key, iv5);
@@ -47,6 +58,5 @@ exports.decrypt = (encrypted, key, iv1, iv2, iv3, iv4, iv5, tag1) => {
   decipher1.setAuthTag(tag1);
   let decrypted1 = decipher1.update(decrypted2);
   decrypted1 = Buffer.concat([decrypted1, decipher1.final()]);
-
   return decrypted1;
 };

package/{src → dist/cjs}/utils/hashing.js

@@ -1,13 +1,16 @@
-const crypto = require('crypto');
-const { HMAC_KEY } = require('../constants');
-const { reverseHash } = require('./math');
+"use strict";
 
-exports.hash = (data) => {
+const crypto = require('crypto');
+const {
+  HMAC_KEY
+} = require('../constants');
+const {
+  reverseHash
+} = require('./math');
+exports.hash = data => {
   const hmac = crypto.createHmac('sha512', HMAC_KEY);
   hmac.update(data);
   const digest = hmac.digest();
-
   return reverseHash(digest);
 };
-
 exports.verifyHash = (data, hash) => crypto.timingSafeEqual(exports.hash(data), hash);

package/{src → dist/cjs}/utils/keyDerivation.js

@@ -1,15 +1,20 @@
-const crypto = require('crypto');
-const { PBKDF2_ITERATIONS, KEY_SIZE, PEPPER } = require('../constants');
-const { enhanceKey } = require('./math');
+"use strict";
 
+const crypto = require('crypto');
+const {
+  PBKDF2_ITERATIONS,
+  KEY_SIZE,
+  PEPPER
+} = require('../constants');
+const {
+  enhanceKey
+} = require('./math');
 exports.deriveKey = (password, salt) => {
   return new Promise((resolve, reject) => {
     const pepperedPassword = password + PEPPER;
     crypto.pbkdf2(pepperedPassword, salt, PBKDF2_ITERATIONS, KEY_SIZE, 'sha512', (err, key) => {
       if (err) reject(err);
-
       const enhancedKey = enhanceKey(key);
-
       resolve(enhancedKey);
     });
   });

package/{src → dist/cjs}/utils/math.js

@@ -1,14 +1,14 @@
+"use strict";
+
 exports.reverseBuffer = (data, reverse = false) => {
   if (reverse) {
     return Buffer.from(data.toString('hex').split('').reverse().join(''), 'hex');
   }
   return Buffer.from(data.toString('hex').split('').reverse().join(''), 'hex');
 };
-
-exports.reverseHash = (hash) => {
+exports.reverseHash = hash => {
   return Buffer.from(hash.toString('hex').split('').reverse().join(''), 'hex');
 };
-
-exports.enhanceKey = (key) => {
+exports.enhanceKey = key => {
   return Buffer.from(key.toString('hex').split('').reverse().join(''), 'hex');
-};
+};

package/dist/esm/constants.js

@@ -0,0 +1,12 @@
+"use strict";
+
+module.exports = {
+  SALT_SIZE: 32,
+  IV_SIZE: 16,
+  KEY_SIZE: 32,
+  TAG_SIZE: 16,
+  PBKDF2_ITERATIONS: 310000,
+  HASH_SEED: 0xCAFEBABE,
+  PEPPER: 'veryLongAndComplexPepperValue123!@#$%^&*()_+[]{}|;:,.<>?',
+  HMAC_KEY: 'veryLongAndComplexHMACKeyValue456!@#$%^&*()_+[]{}|;:,.<>?'
+};

package/dist/esm/index.js

@@ -0,0 +1,84 @@
+"use strict";
+
+const crypto = require('crypto');
+const {
+  compress,
+  decompress
+} = require('./utils/compression');
+const {
+  deriveKey
+} = require('./utils/keyDerivation');
+const {
+  encrypt,
+  decrypt
+} = require('./utils/encryption');
+const {
+  hash,
+  verifyHash
+} = require('./utils/hashing');
+const {
+  SALT_SIZE,
+  IV_SIZE,
+  TAG_SIZE
+} = require('./constants');
+class K9crypt {
+  constructor(secretKey) {
+    if (!secretKey) {
+      this.secretKey = crypto.randomBytes(50);
+      this._autoGenerated = true;
+    } else {
+      this._autoGenerated = false;
+      this.secretKey = secretKey;
+    }
+  }
+  getGenerated() {
+    return this._autoGenerated ? this.secretKey : null;
+  }
+  async encrypt(plaintext) {
+    try {
+      const compressed = await compress(plaintext);
+      const salt = crypto.randomBytes(SALT_SIZE);
+      const key = await deriveKey(this.secretKey, salt);
+      const {
+        iv1,
+        iv2,
+        iv3,
+        iv4,
+        iv5,
+        encrypted,
+        tag1
+      } = encrypt(compressed, key);
+      const dataToHash = Buffer.concat([salt, iv1, iv2, iv3, iv4, iv5, encrypted, tag1]);
+      const dataHash = hash(dataToHash);
+      const result = Buffer.concat([salt, iv1, iv2, iv3, iv4, iv5, encrypted, tag1, dataHash]);
+      return result.toString('base64');
+    } catch (error) {
+      console.log('Encryption failed');
+    }
+  }
+  async decrypt(ciphertext) {
+    try {
+      const data = Buffer.from(ciphertext, 'base64');
+      const salt = data.slice(0, SALT_SIZE);
+      const iv1 = data.slice(SALT_SIZE, SALT_SIZE + IV_SIZE);
+      const iv2 = data.slice(SALT_SIZE + IV_SIZE, SALT_SIZE + 2 * IV_SIZE);
+      const iv3 = data.slice(SALT_SIZE + 2 * IV_SIZE, SALT_SIZE + 3 * IV_SIZE);
+      const iv4 = data.slice(SALT_SIZE + 3 * IV_SIZE, SALT_SIZE + 4 * IV_SIZE);
+      const iv5 = data.slice(SALT_SIZE + 4 * IV_SIZE, SALT_SIZE + 5 * IV_SIZE);
+      const encrypted = data.slice(SALT_SIZE + 5 * IV_SIZE, -TAG_SIZE - 64);
+      const tag1 = data.slice(-TAG_SIZE - 64, -64);
+      const dataHash = data.slice(-64);
+      const dataToVerify = data.slice(0, -64);
+      if (!verifyHash(dataToVerify, dataHash)) {
+        console.log('Data integrity check failed');
+      }
+      const key = await deriveKey(this.secretKey, salt);
+      const decrypted = decrypt(encrypted, key, iv1, iv2, iv3, iv4, iv5, tag1);
+      const decompressed = await decompress(decrypted);
+      return decompressed.toString('utf8');
+    } catch (error) {
+      console.log('Decryption failed');
+    }
+  }
+}
+module.exports = K9crypt;

package/dist/esm/utils/compression.js

@@ -0,0 +1,38 @@
+"use strict";
+
+const zlib = require('zlib');
+const lzma = require('lzma-native');
+exports.compress = async data => {
+  try {
+    const brotliParams = {
+      params: {
+        [zlib.constants.BROTLI_PARAM_MODE]: zlib.constants.BROTLI_MODE_TEXT,
+        [zlib.constants.BROTLI_PARAM_QUALITY]: zlib.constants.BROTLI_MAX_QUALITY,
+        [zlib.constants.BROTLI_PARAM_SIZE_HINT]: Buffer.byteLength(data, 'utf8'),
+        [zlib.constants.BROTLI_PARAM_LGWIN]: 24
+      }
+    };
+    const brotliCompressed = await new Promise((resolve, reject) => {
+      zlib.brotliCompress(Buffer.from(data, 'utf8'), brotliParams, (err, compressed) => {
+        if (err) reject(err);else resolve(compressed);
+      });
+    });
+    const lzmaCompressed = await lzma.compress(brotliCompressed, 9);
+    return lzmaCompressed;
+  } catch (error) {
+    throw new Error(`Compression error: ${error.message}`);
+  }
+};
+exports.decompress = async data => {
+  try {
+    const lzmaDecompressed = await lzma.decompress(data);
+    const brotliDecompressed = await new Promise((resolve, reject) => {
+      zlib.brotliDecompress(lzmaDecompressed, (err, decompressed) => {
+        if (err) reject(err);else resolve(decompressed);
+      });
+    });
+    return brotliDecompressed;
+  } catch (error) {
+    throw new Error(`Decompression error: ${error.message}`);
+  }
+};

package/dist/esm/utils/encryption.js

@@ -0,0 +1,62 @@
+"use strict";
+
+const crypto = require('crypto');
+const {
+  IV_SIZE
+} = require('../constants');
+const {
+  reverseBuffer
+} = require('./math');
+exports.encrypt = (data, key) => {
+  const iv1 = crypto.randomBytes(IV_SIZE);
+  const cipher1 = crypto.createCipheriv('aes-256-gcm', key, iv1);
+  let encrypted1 = cipher1.update(data);
+  encrypted1 = Buffer.concat([encrypted1, cipher1.final()]);
+  const tag1 = cipher1.getAuthTag();
+  const iv2 = crypto.randomBytes(IV_SIZE);
+  const cipher2 = crypto.createCipheriv('aes-256-cbc', key, iv2);
+  let encrypted2 = cipher2.update(encrypted1);
+  encrypted2 = Buffer.concat([encrypted2, cipher2.final()]);
+  const iv3 = crypto.randomBytes(IV_SIZE);
+  const cipher3 = crypto.createCipheriv('aes-256-cfb', key, iv3);
+  let encrypted3 = cipher3.update(encrypted2);
+  encrypted3 = Buffer.concat([encrypted3, cipher3.final()]);
+  const iv4 = crypto.randomBytes(IV_SIZE);
+  const cipher4 = crypto.createCipheriv('aes-256-ofb', key, iv4);
+  let encrypted4 = cipher4.update(encrypted3);
+  encrypted4 = Buffer.concat([encrypted4, cipher4.final()]);
+  const iv5 = crypto.randomBytes(IV_SIZE);
+  const cipher5 = crypto.createCipheriv('aes-256-ctr', key, iv5);
+  let encrypted5 = cipher5.update(encrypted4);
+  encrypted5 = Buffer.concat([encrypted5, cipher5.final()]);
+  const permutedEncrypted = reverseBuffer(encrypted5);
+  return {
+    iv1,
+    iv2,
+    iv3,
+    iv4,
+    iv5,
+    encrypted: permutedEncrypted,
+    tag1
+  };
+};
+exports.decrypt = (encrypted, key, iv1, iv2, iv3, iv4, iv5, tag1) => {
+  const originalEncrypted = reverseBuffer(encrypted, true);
+  const decipher5 = crypto.createDecipheriv('aes-256-ctr', key, iv5);
+  let decrypted5 = decipher5.update(originalEncrypted);
+  decrypted5 = Buffer.concat([decrypted5, decipher5.final()]);
+  const decipher4 = crypto.createDecipheriv('aes-256-ofb', key, iv4);
+  let decrypted4 = decipher4.update(decrypted5);
+  decrypted4 = Buffer.concat([decrypted4, decipher4.final()]);
+  const decipher3 = crypto.createDecipheriv('aes-256-cfb', key, iv3);
+  let decrypted3 = decipher3.update(decrypted4);
+  decrypted3 = Buffer.concat([decrypted3, decipher3.final()]);
+  const decipher2 = crypto.createDecipheriv('aes-256-cbc', key, iv2);
+  let decrypted2 = decipher2.update(decrypted3);
+  decrypted2 = Buffer.concat([decrypted2, decipher2.final()]);
+  const decipher1 = crypto.createDecipheriv('aes-256-gcm', key, iv1);
+  decipher1.setAuthTag(tag1);
+  let decrypted1 = decipher1.update(decrypted2);
+  decrypted1 = Buffer.concat([decrypted1, decipher1.final()]);
+  return decrypted1;
+};

package/dist/esm/utils/hashing.js

@@ -0,0 +1,16 @@
+"use strict";
+
+const crypto = require('crypto');
+const {
+  HMAC_KEY
+} = require('../constants');
+const {
+  reverseHash
+} = require('./math');
+exports.hash = data => {
+  const hmac = crypto.createHmac('sha512', HMAC_KEY);
+  hmac.update(data);
+  const digest = hmac.digest();
+  return reverseHash(digest);
+};
+exports.verifyHash = (data, hash) => crypto.timingSafeEqual(exports.hash(data), hash);

package/dist/esm/utils/keyDerivation.js

@@ -0,0 +1,21 @@
+"use strict";
+
+const crypto = require('crypto');
+const {
+  PBKDF2_ITERATIONS,
+  KEY_SIZE,
+  PEPPER
+} = require('../constants');
+const {
+  enhanceKey
+} = require('./math');
+exports.deriveKey = (password, salt) => {
+  return new Promise((resolve, reject) => {
+    const pepperedPassword = password + PEPPER;
+    crypto.pbkdf2(pepperedPassword, salt, PBKDF2_ITERATIONS, KEY_SIZE, 'sha512', (err, key) => {
+      if (err) reject(err);
+      const enhancedKey = enhanceKey(key);
+      resolve(enhancedKey);
+    });
+  });
+};

package/dist/esm/utils/math.js

@@ -0,0 +1,14 @@
+"use strict";
+
+exports.reverseBuffer = (data, reverse = false) => {
+  if (reverse) {
+    return Buffer.from(data.toString('hex').split('').reverse().join(''), 'hex');
+  }
+  return Buffer.from(data.toString('hex').split('').reverse().join(''), 'hex');
+};
+exports.reverseHash = hash => {
+  return Buffer.from(hash.toString('hex').split('').reverse().join(''), 'hex');
+};
+exports.enhanceKey = key => {
+  return Buffer.from(key.toString('hex').split('').reverse().join(''), 'hex');
+};

package/package.json

@@ -1,10 +1,24 @@
 {
   "name": "k9crypt",
-  "version": "1.1.2",
+  "version": "1.1.4",
   "description": "A special encryption algorithm created for K9Crypt.",
-  "main": "index.js",
+  "type": "module",
+  "main": "./dist/cjs/index.js",
+  "module": "./dist/esm/index.js",
+  "exports": {
+    ".": {
+      "import": "./dist/esm/index.js",
+      "require": "./dist/cjs/index.js"
+    }
+  },
+  "files": [
+    "dist"
+  ],
   "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
+    "test": "echo \"Error: no test specified\" && exit 1",
+    "build:esm": "babel src --out-dir dist/esm --copy-files",
+    "build:cjs": "babel src --out-dir dist/cjs --copy-files --config-file ./babel.config.cjs",
+    "build": "bun run build:esm && bun run build:cjs"
   },
   "keywords": [
     "secure",
@@ -32,5 +46,10 @@
   "bugs": {
     "url": "https://github.com/K9Crypt/module/issues"
   },
-  "homepage": "https://k9crypt.xyz"
+  "homepage": "https://k9crypt.xyz",
+  "devDependencies": {
+    "@babel/cli": "^7.28.0",
+    "@babel/core": "^7.28.0",
+    "@babel/preset-env": "^7.28.0"
+  }
 }

package/index.js

@@ -1,3 +0,0 @@
-const k9crypt = require('./src/index');
-
-module.exports = k9crypt;