@king-3/file-kit 1.3.1 → 1.4.1

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";
@@ -164,8 +165,16 @@ const base64ToBuffer = (data) => Buffer.from(data, "base64");
 //#endregion
 //#region src/utils/time.ts
 function nowUTC8() {
-	const now = /* @__PURE__ */ new Date();
-	return new Date(now.getTime() + 480 * 60 * 1e3).toISOString().replace("T", " ").substring(0, 19);
+	return (/* @__PURE__ */ new Date()).toLocaleString("zh-CN", {
+		timeZone: "Asia/Shanghai",
+		year: "numeric",
+		month: "2-digit",
+		day: "2-digit",
+		hour: "2-digit",
+		minute: "2-digit",
+		second: "2-digit",
+		hour12: false
+	}).replace(/\//g, "-");
 }
 
 //#endregion
@@ -225,7 +234,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.1";
 const CLI_ALIAS = "fkt";
 /**
 * 默认配置
@@ -349,7 +358,7 @@ async function getInputPath(providedPath, options) {
 	}
 	return inputPath;
 }
-async function getPassword(providedPwd) {
+async function getPassword(providedPwd, options) {
 	let userPwd = providedPwd;
 	if (!userPwd) {
 		userPwd = await password$1({
@@ -359,14 +368,14 @@ async function getPassword(providedPwd) {
 				if (value.length < 6) return "密码长度至少 6 位";
 			}
 		});
-		await password$1({
+		if (options?.confirm) await password$1({
 			message: "请再次输入密码:",
 			validate: (value) => {
 				if (value !== userPwd) return "两次密码不一致";
 			}
 		});
 	} else if (typeof userPwd === "string" && userPwd.length < 6) {
-		logger.error(`'密码长度至少 6 位'`);
+		logger.error("密码长度至少 6 位");
 		process.exit(1);
 	}
 	return userPwd;
@@ -441,7 +450,7 @@ var base64_default = defineCommand({
 		const typedArgs = args;
 		const ctx = createCommandContext(rawArgs);
 		ctx.showIntro();
-		tryCatch(async () => {
+		await tryCatch(async () => {
 			const inputPath = await ctx.getInput(typedArgs.input, {
 				message: "请输入文件路径",
 				placeholder: "file.txt"
@@ -459,9 +468,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 +483,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 +509,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 +550,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;
@@ -573,14 +597,14 @@ var decrypt_default = defineCommand({
 		const typedArgs = args;
 		const ctx = createCommandContext(rawArgs);
 		ctx.showIntro();
-		tryCatch(async () => {
+		await tryCatch(async () => {
 			const inputPath = await ctx.getInput(typedArgs.input, {
 				message: "请输入文件路径",
 				placeholder: "*.crypto.txt",
 				validateExtension: ".crypto.txt"
 			});
 			const outputDir = await ctx.getOutput(typedArgs.output, { defaultDir: path.dirname(inputPath) });
-			const password$2 = await getPassword(typedArgs.password);
+			const password$2 = await getPassword(typedArgs.password, { confirm: false });
 			const loading$1 = ctx.loading("正在解密");
 			const outputPath = await decrypt(await loadArchive(inputPath, "crypto"), outputDir, { password: password$2 });
 			loading$1.close(`文件已解密到: ${cyan(outputPath)}`);
@@ -617,13 +641,13 @@ var encrypt_default = defineCommand({
 		const typedArgs = args;
 		const ctx = createCommandContext(rawArgs);
 		ctx.showIntro();
-		tryCatch(async () => {
+		await tryCatch(async () => {
 			const inputPath = await ctx.getInput(typedArgs.input, {
 				message: "请输入文件路径",
 				placeholder: "file.txt"
 			});
 			const outputDir = await ctx.getOutput(typedArgs.output, { defaultDir: path$1.dirname(inputPath) });
-			const password$2 = await getPassword(typedArgs.password);
+			const password$2 = await getPassword(typedArgs.password, { confirm: true });
 			console.log(gray("│"));
 			logger.warn(yellow("请妥善保管密码，丢失后无法恢复文件！"));
 			const outputPath = buildOutputPath(inputPath, outputDir, "crypto.txt");
@@ -657,7 +681,7 @@ var restore_default = defineCommand({
 		const typedArgs = args;
 		const ctx = createCommandContext(rawArgs);
 		ctx.showIntro();
-		tryCatch(async () => {
+		await tryCatch(async () => {
 			const inputPath = await ctx.getInput(typedArgs.input, {
 				message: "请输入文件路径",
 				placeholder: "*.base64.txt",
@@ -899,7 +923,7 @@ var video_to_audio_default = defineCommand({
 		const typedArgs = args;
 		const ctx = createCommandContext(rawArgs);
 		ctx.showIntro();
-		tryCatch(async () => {
+		await tryCatch(async () => {
 			const inputPath = await ctx.getInput(typedArgs.input, {
 				message: "请输入视频文件路径",
 				placeholder: "video.mp4"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@king-3/file-kit",
-  "version": "1.3.1",
+  "version": "1.4.1",
   "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"
   },