karin-plugin-kkk 2.21.0 → 2.21.1

package/CHANGELOG.md

@@ -2,6 +2,13 @@
 
 # Changelog
 
+## [2.21.1](https://github.com/ikenxuan/karin-plugin-kkk/compare/v2.21.0...v2.21.1) (2026-03-02)
+
+
+### 🐛 错误修复
+
+* 在线图片的上传方式配置 ([5d80aa5](https://github.com/ikenxuan/karin-plugin-kkk/commit/5d80aa571095e3851daa7120c724b75b38df83e7))
+
 ## [2.21.0](https://github.com/ikenxuan/karin-plugin-kkk/compare/v2.20.3...v2.21.0) (2026-03-02)
 
 

package/config/default_config/app.yaml

@@ -7,9 +7,6 @@ priority: 800
 # 缓存删除，非必要不修改！
 removeCache: true
 
-# 发送图片时由插件本地下载后使用 file 协议传递，而非直接传递 HTTP 链接给上游下载
-downloadImageLocally: false
-
 # 渲染精度，可选值50~200，建议100。设置高精度会提高图片的精细度，过高可能会影响渲染与发送速度
 renderScale: 100
 

package/config/default_config/upload.yaml

@@ -22,6 +22,12 @@ usegroupfile: false
 # 群文件上传阈值，当文件大小超过该值时将使用群文件上传，单位：MB，「使用群文件上传」开启后才会生效
 groupfilevalue: 100
 
+# 网络图片发送方式，可选值：url / file / base64
+# url: 直接传递 HTTP 链接给上游下载（可能因上游网络问题导致下载超时）
+# file: 下载到本地使用 file 协议发送（需 Karin 与协议端在同一系统）
+# base64: 下载后转换为 base64 发送（传输数据增大约 1/3，不在同一网络环境可能导致额外带宽成本）
+imageSendMode: url
+
 # 下载限速开关，开启后会限制下载速度，避免触发服务器风控导致连接被重置（ECONNRESET）
 # 如果你的网络带宽很大且下载时经常报错"连接被重置"，建议开启此选项
 downloadThrottle: false

package/lib/apps/admin.js

@@ -1,5 +1,5 @@
 import "../core_chunk/rolldown-runtime-BMXAG3ag.js";
-import { C as removeOldFiles, S as dylogin, w as task, x as biLogin } from "../core_chunk/main-eqK3KHoJ.js";
+import { C as removeOldFiles, S as dylogin, w as task, x as biLogin } from "../core_chunk/main-B-QVNIL7.js";
 import "../core_chunk/vendor-CYCcUtqE.js";
 import "../core_chunk/template-n3eb7E79.js";
 export { biLogin, dylogin, removeOldFiles, task };

package/lib/apps/help.js

@@ -1,5 +1,5 @@
 import "../core_chunk/rolldown-runtime-BMXAG3ag.js";
-import { b as version, y as help } from "../core_chunk/main-eqK3KHoJ.js";
+import { b as version, y as help } from "../core_chunk/main-B-QVNIL7.js";
 import "../core_chunk/vendor-CYCcUtqE.js";
 import "../core_chunk/template-n3eb7E79.js";
 export { help, version };

package/lib/apps/push.js

@@ -1,5 +1,5 @@
 import "../core_chunk/rolldown-runtime-BMXAG3ag.js";
-import { _ as setdyPush, d as bilibiliPushList, f as changeBotID, g as setbiliPush, h as forcePush, m as douyinPushList, p as douyinPush, u as bilibiliPush, v as testDouyinPush } from "../core_chunk/main-eqK3KHoJ.js";
+import { _ as setdyPush, d as bilibiliPushList, f as changeBotID, g as setbiliPush, h as forcePush, m as douyinPushList, p as douyinPush, u as bilibiliPush, v as testDouyinPush } from "../core_chunk/main-B-QVNIL7.js";
 import "../core_chunk/vendor-CYCcUtqE.js";
 import "../core_chunk/template-n3eb7E79.js";
 export { bilibiliPush, bilibiliPushList, changeBotID, douyinPush, douyinPushList, forcePush, setbiliPush, setdyPush, testDouyinPush };

package/lib/apps/qrlogin.js

@@ -1,5 +1,5 @@
 import "../core_chunk/rolldown-runtime-BMXAG3ag.js";
-import { l as qrLogin } from "../core_chunk/main-eqK3KHoJ.js";
+import { l as qrLogin } from "../core_chunk/main-B-QVNIL7.js";
 import "../core_chunk/vendor-CYCcUtqE.js";
 import "../core_chunk/template-n3eb7E79.js";
 export { qrLogin };

package/lib/apps/tools.js

@@ -1,5 +1,5 @@
 import "../core_chunk/rolldown-runtime-BMXAG3ag.js";
-import { a as douyinAPP, c as xiaohongshuAPP, i as bilibiliAPP, o as kuaishouAPP, s as prefix } from "../core_chunk/main-eqK3KHoJ.js";
+import { a as douyinAPP, c as xiaohongshuAPP, i as bilibiliAPP, o as kuaishouAPP, s as prefix } from "../core_chunk/main-B-QVNIL7.js";
 import "../core_chunk/vendor-CYCcUtqE.js";
 import "../core_chunk/template-n3eb7E79.js";
 export { bilibiliAPP, douyinAPP, kuaishouAPP, prefix, xiaohongshuAPP };

package/lib/apps/update.js

@@ -1,5 +1,5 @@
 import "../core_chunk/rolldown-runtime-BMXAG3ag.js";
-import { n as kkkUpdateCommand, r as update, t as kkkUpdate } from "../core_chunk/main-eqK3KHoJ.js";
+import { n as kkkUpdateCommand, r as update, t as kkkUpdate } from "../core_chunk/main-B-QVNIL7.js";
 import "../core_chunk/vendor-CYCcUtqE.js";
 import "../core_chunk/template-n3eb7E79.js";
 export { kkkUpdate, kkkUpdateCommand, update };

package/lib/build-metadata.json

@@ -1,10 +1,10 @@
 {
-  "version": "2.21.0",
-  "buildTime": "2026-03-02T08:01:57.263Z",
-  "buildTimestamp": 1772438517263,
+  "version": "2.21.1",
+  "buildTime": "2026-03-02T12:56:19.212Z",
+  "buildTimestamp": 1772456179213,
   "name": "karin-plugin-kkk",
   "description": "Karin 的「抖音」「B 站」视频解析/动态推送插件",
   "homepage": "https://github.com/ikenxuan/karin-plugin-kkk",
-  "commitHash": "6c66bfcb4ea81d16b9a251c0fa14e5dddee3e718",
-  "shortCommitHash": "6c66bfcb"
+  "commitHash": "e43173f44582ab306a63ac13df2c7a3c4fb33200",
+  "shortCommitHash": "e43173f4"
 }

package/lib/core_chunk/{main-eqK3KHoJ.js → main-B-QVNIL7.js}

@@ -6225,7 +6225,7 @@ var init_Base = __esmMin(() => {
 		} catch (error) {
 			if (options && options.active === false) await event.reply("视频文件上传失败" + JSON.stringify(error, null, 2));
 			logger.error("视频文件上传错误," + String(error));
-			return false;
+			throw error;
 		} finally {
 			const filePath = file.filepath;
 			logger.mark(`临时预览地址：http://localhost:${process.env.HTTP_PORT}/api/kkk/video/${encodeURIComponent(filePath.split("/").pop() ?? "")}`);
@@ -8279,29 +8279,55 @@ var init_ImageDownloader = __esmMin(() => {
 	ImageDownloader = class {
 		axiosInstance;
 		tempDir;
+		maxRetries = 3;
+		retryDelay = 1e3;
 		constructor(axiosInstance, tempDir) {
 			this.axiosInstance = axiosInstance;
 			this.tempDir = tempDir;
 			if (!fs.existsSync(this.tempDir)) fs.mkdirSync(this.tempDir, { recursive: true });
 		}
 		async processImage(imageUrl, title, index) {
-			if (!Config.app.downloadImageLocally) return imageUrl;
+			switch (Config.upload.imageSendMode) {
+				case "base64": try {
+					return await this.downloadAndConvertToBase64(imageUrl);
+				} catch (error) {
+					logger.error(`图片转换 base64 失败，回退到原始 URL: ${imageUrl}`, error);
+					return imageUrl;
+				}
+				case "file": try {
+					const result = await this.downloadImage(imageUrl, title, index);
+					if (result.shouldDelete) this.scheduleDelete(result.filePath);
+					return result.filePath;
+				} catch (error) {
+					logger.error(`图片下载失败，回退到原始 URL: ${imageUrl}`, error);
+					return imageUrl;
+				}
+				case "url":
+				default: return imageUrl;
+			}
+		}
+		async downloadAndConvertToBase64(imageUrl) {
+			const filename = this.generateFilename(imageUrl);
+			const filePath = path.join(this.tempDir, filename);
 			try {
-				const result = await this.downloadImage(imageUrl, title, index);
-				if (result.shouldDelete) this.scheduleDelete(result.filePath);
-				return result.filePath;
-			} catch (error) {
-				logger.error(`图片下载失败，回退到原始 URL: ${imageUrl}`, error);
-				return imageUrl;
+				const response = await this.downloadWithRetry(imageUrl);
+				fs.writeFileSync(filePath, response.data);
+				const base64 = fs.readFileSync(filePath).toString("base64");
+				logger.debug(`图片已下载并转换为 base64: ${imageUrl.substring(0, 50)}...`);
+				return `base64://${base64}`;
+			} finally {
+				if (Config.app.removeCache && fs.existsSync(filePath)) try {
+					fs.unlinkSync(filePath);
+					logger.debug(`临时文件已删除: ${filePath}`);
+				} catch (error) {
+					logger.error(`删除临时文件失败: ${filePath}`, error);
+				}
 			}
 		}
 		async downloadImage(imageUrl, title, index) {
 			const filename = this.generateFilename(imageUrl, title, index);
 			const filePath = path.join(this.tempDir, filename);
-			const response = await this.axiosInstance.get(imageUrl, {
-				responseType: "arraybuffer",
-				timeout: 3e4
-			});
+			const response = await this.downloadWithRetry(imageUrl);
 			fs.writeFileSync(filePath, response.data);
 			logger.debug(`图片已下载: ${filePath}`);
 			return {
@@ -8309,6 +8335,28 @@ var init_ImageDownloader = __esmMin(() => {
 				shouldDelete: true
 			};
 		}
+		async downloadWithRetry(imageUrl, retryCount = 0) {
+			try {
+				const response = await this.axiosInstance.get(imageUrl, {
+					responseType: "arraybuffer",
+					timeout: 3e4
+				});
+				if (retryCount > 0) logger.info(`图片下载成功（重试 ${retryCount} 次后）: ${imageUrl.substring(0, 50)}...`);
+				return response;
+			} catch (error) {
+				if (retryCount < this.maxRetries) {
+					const delay$1 = this.retryDelay * Math.pow(2, retryCount);
+					logger.warn(`图片下载失败，${delay$1}ms 后进行第 ${retryCount + 1}/${this.maxRetries} 次重试: ${imageUrl.substring(0, 50)}...`, error);
+					await this.sleep(delay$1);
+					return this.downloadWithRetry(imageUrl, retryCount + 1);
+				}
+				logger.error(`图片下载失败，已重试 ${this.maxRetries} 次: ${imageUrl}`, error);
+				throw error;
+			}
+		}
+		sleep(ms) {
+			return new Promise((resolve$1) => setTimeout(resolve$1, ms));
+		}
 		generateFilename(imageUrl, title, index) {
 			const ext = this.getExtension(imageUrl);
 			if (Config.app.removeCache) return `tmp_${Date.now()}${index !== void 0 ? `_${index}` : ""}${ext}`;
@@ -11225,12 +11273,6 @@ var init_app_schema = __esmMin(() => {
 				label: "缓存删除",
 				description: "下载的视频缓存自动删除，非必要不修改！"
 			},
-			{
-				key: "downloadImageLocally",
-				type: "switch",
-				label: "本地下载图片",
-				description: "发送图片时由插件本地下载后使用 file 协议传递，而非直接传递 HTTP 链接给上游下载"
-			},
 			{
 				type: "divider",
 				title: "解析优先级设置"
@@ -12622,6 +12664,26 @@ var init_upload_schema = __esmMin(() => {
 				disabled: $or($not("usegroupfile"), $var("sendbase64")),
 				rules: [{ min: 1 }]
 			},
+			{
+				key: "imageSendMode",
+				type: "radio",
+				label: "网络图片发送方式",
+				description: "选择发送网络图片的方式：\n• URL - 直接传递链接给上游（可能因上游网络问题超时）\n• File - 下载后用 file 协议发送（需 Karin 与协议端同系统）\n• Base64 - 转 base64 发送（传输数据增大 1/3，不在同一网络环境可能导致额外带宽成本）",
+				options: [
+					{
+						label: "URL 链接（直接传递）",
+						value: "url"
+					},
+					{
+						label: "File 协议（本地文件）",
+						value: "file"
+					},
+					{
+						label: "Base64（编码传输）",
+						value: "base64"
+					}
+				]
+			},
 			{
 				type: "divider",
 				title: "上传拦截配置"
@@ -13272,22 +13334,27 @@ var init_handler = __esmMin(async () => {
 	};
 	wrapWithErrorHandler = (fn, options) => async (e, next) => {
 		const emojiManager = e ? new EmojiReactionManager(e) : void 0;
+		let processingTimer = null;
+		let successTimer = null;
 		if (emojiManager) {
 			await emojiManager.add("EYES");
-			setTimeout(() => {
+			processingTimer = setTimeout(() => {
 				emojiManager.add("PROCESSING").catch(() => {});
 			}, 1500);
 		}
 		const ctx = logger.runContext(async () => fn(e, next));
 		try {
 			const result = await ctx.run();
-			if (emojiManager) setTimeout(() => {
+			if (emojiManager) successTimer = setTimeout(() => {
 				emojiManager.replace("PROCESSING", "SUCCESS").catch(() => {});
 			}, 1500);
 			return result;
 		} catch (error) {
+			if (processingTimer) clearTimeout(processingTimer);
+			if (successTimer) clearTimeout(successTimer);
 			if (emojiManager) {
-				await emojiManager.clearAll();
+				const processingEmojiId = emojiManager["getPlatformEmojiId"]("PROCESSING");
+				if (emojiManager.has(processingEmojiId)) await emojiManager.remove("PROCESSING");
 				await emojiManager.add("ERROR");
 			}
 			await new Promise((resolve$1) => setTimeout(resolve$1, 100));
@@ -14787,6 +14854,28 @@ const webConfig = defineConfig({
 							rules: [{ min: 1 }],
 							isDisabled: !all.upload.usegroupfile || all.upload.sendbase64
 						}),
+						components.radio.group("imageSendMode", {
+							label: "网络图片发送方式",
+							orientation: "vertical",
+							defaultValue: all.upload.imageSendMode,
+							radio: [
+								components.radio.create("imageSendMode:radio-1", {
+									label: "URL 链接（直接传递）",
+									description: "直接传递 HTTP 链接给上游下载，可能因上游网络问题导致下载超时",
+									value: "url"
+								}),
+								components.radio.create("imageSendMode:radio-2", {
+									label: "File 协议（本地文件）",
+									description: "下载到本地后使用 file 协议发送，需 Karin 与协议端在同一系统",
+									value: "file"
+								}),
+								components.radio.create("imageSendMode:radio-3", {
+									label: "Base64（编码传输）",
+									description: "下载后转换为 base64 发送，传输数据增大约 1/3，不在同一网络环境可能导致额外带宽成本",
+									value: "base64"
+								})
+							]
+						}),
 						components.divider.create("divider-upload-limit", {
 							description: "上传拦截配置",
 							descPosition: 20

package/lib/index.js

@@ -1,5 +1,5 @@
 import "./core_chunk/rolldown-runtime-BMXAG3ag.js";
-import "./core_chunk/main-eqK3KHoJ.js";
+import "./core_chunk/main-B-QVNIL7.js";
 import "./core_chunk/vendor-CYCcUtqE.js";
 import "./core_chunk/template-n3eb7E79.js";
 export {};

package/lib/root.js

@@ -1,4 +1,4 @@
 import "./core_chunk/rolldown-runtime-BMXAG3ag.js";
-import { D as Root, O as init_root } from "./core_chunk/main-eqK3KHoJ.js";
+import { D as Root, O as init_root } from "./core_chunk/main-B-QVNIL7.js";
 init_root();
 export { Root };

package/lib/web.config.js

@@ -1,5 +1,5 @@
 import "./core_chunk/rolldown-runtime-BMXAG3ag.js";
-import { E as web_config_default, T as webConfig } from "./core_chunk/main-eqK3KHoJ.js";
+import { E as web_config_default, T as webConfig } from "./core_chunk/main-B-QVNIL7.js";
 import "./core_chunk/vendor-CYCcUtqE.js";
 import "./core_chunk/template-n3eb7E79.js";
 export { web_config_default as default, webConfig };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "karin-plugin-kkk",
-  "version": "2.21.0",
+  "version": "2.21.1",
   "description": "Karin 的「抖音」「B 站」视频解析/动态推送插件",
   "keywords": [
     "karin-plugin",