@king-3/file-kit 1.3.1 → 1.4.0

package/dist/cli.js

@@ -6,7 +6,8 @@ import fs from "node:fs/promises";
 import { Buffer } from "node:buffer";
 import { accessSync, existsSync, mkdirSync } from "node:fs";
 import { confirm, intro, isCancel, outro, password, select, spinner, text } from "@clack/prompts";
-import { createCipheriv, createDecipheriv, pbkdf2Sync, randomBytes } from "node:crypto";
+import { createCipheriv, createDecipheriv, randomBytes } from "node:crypto";
+import { argon2id, hash } from "argon2";
 import path$1 from "node:path/posix";
 import ffmpegPath from "@ffmpeg-installer/ffmpeg";
 import { execa } from "execa";
@@ -225,7 +226,7 @@ async function base64ToFile(archiveData, outputDir = ".") {
 //#endregion
 //#region src/config/defaults.ts
 const CLI_NAME = "File Kit";
-const CLI_VERSION = "1.3.1";
+const CLI_VERSION = "1.4.0";
 const CLI_ALIAS = "fkt";
 /**
 * 默认配置
@@ -459,9 +460,14 @@ var base64_default = defineCommand({
 //#region src/config/crypto-algorithm.ts
 const CRYPTO_ALGORITHM = {
 	name: "aes-256-gcm",
-	ivLength: 16,
+	ivLength: 12,
 	saltLength: 32,
-	iterations: 1e5
+	keyLength: 32,
+	argon2: {
+		memoryCost: 131072,
+		timeCost: 3,
+		parallelism: 4
+	}
 };
 
 //#endregion
@@ -469,8 +475,18 @@ const CRYPTO_ALGORITHM = {
 /**
 * 从密码派生密钥
 */
-const deriveKey = (password$2, salt) => {
-	return pbkdf2Sync(password$2, salt, 1e5, 32, "sha256");
+const deriveKey = async (password$2, salt) => {
+	const { argon2: argon2Config } = CRYPTO_ALGORITHM;
+	const result = await hash(password$2, {
+		type: argon2id,
+		salt,
+		memoryCost: argon2Config.memoryCost,
+		timeCost: argon2Config.timeCost,
+		parallelism: argon2Config.parallelism,
+		hashLength: CRYPTO_ALGORITHM.keyLength,
+		raw: true
+	});
+	return Buffer.from(result);
 };
 /**
 * 加密文件
@@ -485,7 +501,7 @@ async function encrypt(filePath, outputPath, options) {
 		const fileExt = getFileExt(filePath);
 		const salt = randomBytes(CRYPTO_ALGORITHM.saltLength);
 		const iv = randomBytes(CRYPTO_ALGORITHM.ivLength);
-		const key = deriveKey(options.password, salt);
+		const key = await deriveKey(options.password, salt);
 		const cipher = createCipheriv(CRYPTO_ALGORITHM.name, key, iv);
 		const encrypted = Buffer.concat([cipher.update(fileBuffer), cipher.final()]);
 		const authTag = cipher.getAuthTag();
@@ -526,7 +542,7 @@ async function decrypt(archiveData, outputDir = ".", options) {
 		const iv = base64ToBuffer(file.iv);
 		const authTag = base64ToBuffer(file.authTag);
 		const encrypted = base64ToBuffer(file.encrypted);
-		const key = deriveKey(options.password, salt);
+		const key = await deriveKey(options.password, salt);
 		const decipher = createDecipheriv(CRYPTO_ALGORITHM.name, key, iv);
 		decipher.setAuthTag(authTag);
 		let decrypted;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@king-3/file-kit",
-  "version": "1.3.1",
+  "version": "1.4.0",
   "description": "多功能文件工具箱（Base64 转换 · 视频转音频 · 加密/解密）",
   "type": "module",
   "keywords": [
@@ -41,6 +41,7 @@
     "@clack/prompts": "^0.11.0",
     "@ffmpeg-installer/ffmpeg": "^1.1.0",
     "ansis": "^4.2.0",
+    "argon2": "^0.44.0",
     "citty": "^0.1.6",
     "execa": "^9.6.1"
   },