karin-plugin-kkk 2.20.0 → 2.20.2

package/lib/core_chunk/{main-BKpxoNf0.js → main-Du8yBcGG.js}

@@ -1,6 +1,6 @@
 import { n as __esmMin, o as __toESM, r as __export } from "./rolldown-runtime-BMXAG3ag.js";
-import { E as zhCN, T as init_locale, _n as init_zod, a as init_lib, cn as require_express, dn as init_source, et as init_date_fns, fn as AxiosError$1, gn as init_esm, hn as Xhshow, i as require_qr_code_styling, it as differenceInSeconds, ln as require_protobufjs, mn as axios_default, n as require_dist, nt as formatDistanceToNow, o as Window, on as require_png, pn as init_axios, r as require_lib, rt as format, sn as require_jsQR, t as require_heic_convert, tt as fromUnixTime, un as Chalk, vn as zod_default } from "./vendor-CZcAPGm1.js";
-import { n as init_client, r as reactServerRender } from "./template-BMkKJo_s.js";
+import { E as zhCN, T as init_locale, _n as zod_default, a as init_lib, cn as require_protobufjs, dn as AxiosError$1, et as init_date_fns, fn as init_axios, gn as init_zod, hn as init_esm, i as require_qr_code_styling, it as differenceInSeconds, ln as Chalk, mn as Xhshow, n as require_dist, nt as formatDistanceToNow, o as Window, on as require_jsQR, pn as axios_default, r as require_lib, rt as format, sn as require_express, t as require_heic_convert, tt as fromUnixTime, un as init_source } from "./vendor-B3KhGHI_.js";
+import { n as init_client, r as reactServerRender } from "./template-CQ-u6h09.js";
 import { createRequire } from "node:module";
 import karin$1, { BOT_CONNECT, app, authMiddleware, checkPkgUpdate, checkPort, common, components, config, copyConfigSync, createBadRequestResponse, createNotFoundResponse, createServerErrorResponse, createSuccessResponse, db, defineConfig, ffmpeg, ffprobe, filesByExt, getBot, hooks, karin, karinPathHtml, karinPathTemp, logger, logs, mkdirSync, range, render, requireFileSync, restart, segment, updatePkg, watch } from "node-karin";
 import fs from "node:fs";
@@ -13,6 +13,7 @@ import { karinPathBase, karinPathTemp as karinPathTemp$1 } from "node-karin/root
 import sqlite3 from "node-karin/sqlite3";
 import YAML from "node-karin/yaml";
 import util from "node:util";
+import { Transformer } from "@napi-rs/image";
 import axios, { AxiosError } from "node-karin/axios";
 import { pipeline } from "node:stream/promises";
 import { Transform } from "node:stream";
@@ -6148,7 +6149,7 @@ var init_Config = __esmMin(() => {
 		return getConfigInstance()[prop];
 	} });
 });
-var Base, statBotId$1, Count, uploadFile, downloadVideo, downloadFile, processFilename;
+var Base, Count, uploadFile, downloadVideo, downloadFile, processFilename;
 var init_Base = __esmMin(() => {
 	init_utils$1();
 	init_Config();
@@ -6162,50 +6163,6 @@ var init_Base = __esmMin(() => {
 			this.headers = BASE_HEADERS;
 		}
 	};
-	statBotId$1 = (pushList) => {
-		const platformBotCount = {
-			douyin: /* @__PURE__ */ new Map(),
-			bilibili: /* @__PURE__ */ new Map()
-		};
-		pushList.douyin.forEach((item) => {
-			item.group_id.forEach((gid) => {
-				const botId = gid.split(":")[1];
-				platformBotCount.douyin.set(botId, (platformBotCount.douyin.get(botId) ?? 0) + 1);
-			});
-		});
-		pushList.bilibili.forEach((item) => {
-			item.group_id.forEach((gid) => {
-				const botId = gid.split(":")[1];
-				platformBotCount.bilibili.set(botId, (platformBotCount.bilibili.get(botId) ?? 0) + 1);
-			});
-		});
-		let douyinMaxCount = 0;
-		let douyinMostFrequentBot = "";
-		platformBotCount.douyin.forEach((count, botId) => {
-			if (count > douyinMaxCount) {
-				douyinMaxCount = count;
-				douyinMostFrequentBot = botId;
-			}
-		});
-		let biliMaxCount = 0;
-		let biliMostFrequentBot = "";
-		platformBotCount.bilibili.forEach((count, botId) => {
-			if (count > biliMaxCount) {
-				biliMaxCount = count;
-				biliMostFrequentBot = botId;
-			}
-		});
-		return {
-			douyin: {
-				botId: douyinMostFrequentBot,
-				count: douyinMaxCount
-			},
-			bilibili: {
-				botId: biliMostFrequentBot,
-				count: biliMaxCount
-			}
-		};
-	};
 	Count = (count) => {
 		if (count >= 1e8) return (count / 1e8).toFixed(1) + "亿";
 		else if (count >= 1e4) return (count / 1e4).toFixed(1) + "万";
@@ -6386,16 +6343,15 @@ var init_build_metadata = __esmMin(() => {
 		return `${date.getFullYear()}年${String(date.getMonth() + 1).padStart(2, "0")}月${String(date.getDate()).padStart(2, "0")}日 ${String(date.getHours()).padStart(2, "0")}:${String(date.getMinutes()).padStart(2, "0")}`;
 	};
 });
-var import_jsQR$1, import_png$1, QRCodeScanner;
+var import_jsQR, QRCodeScanner;
 var init_QRCodeScanner = __esmMin(() => {
-	import_jsQR$1 = __toESM(require_jsQR(), 1);
-	import_png$1 = require_png();
+	import_jsQR = __toESM(require_jsQR(), 1);
 	QRCodeScanner = class {
 		static async scanFromUrl(imageUrl) {
 			try {
 				const response = await axios.get(imageUrl, { responseType: "arraybuffer" });
 				const buffer = Buffer.from(response.data);
-				return await this.scanFromBuffer(buffer);
+				return this.scanFromBuffer(buffer);
 			} catch (error) {
 				logger.error("识别二维码时发生错误:", error);
 				return null;
@@ -6472,10 +6428,10 @@ var init_QRCodeScanner = __esmMin(() => {
 			]) try {
 				logger.debug(`  尝试策略: ${strategy.name}`);
 				const processedData = strategy.enhance ? this.enhanceContrast(imageData) : imageData;
-				const code = (0, import_jsQR$1.default)(processedData.data, processedData.width, processedData.height, strategy.options);
+				const code = (0, import_jsQR.default)(processedData.data, processedData.width, processedData.height, strategy.options);
 				if (code && code.data) {
-					logger.mark(`✓ 成功识别二维码 [区域: ${regionName}] [策略: ${strategy.name}]`);
-					logger.mark(`  二维码内容: ${code.data}`);
+					logger.debug(`✓ 成功识别二维码 [区域: ${regionName}] [策略: ${strategy.name}]`);
+					logger.debug(`  二维码内容: ${code.data}`);
 					return code.data;
 				} else logger.debug(`  策略 ${strategy.name} 未识别到二维码`);
 			} catch (err) {
@@ -6484,81 +6440,120 @@ var init_QRCodeScanner = __esmMin(() => {
 			logger.debug(`  区域 ${regionName} 识别失败，尝试下一个区域`);
 			return null;
 		}
-		static async scanFromBuffer(buffer) {
+		static parseImageBuffer(buffer) {
 			try {
-				let imageData;
-				try {
-					const png = import_png$1.PNG.sync.read(buffer);
-					imageData = {
-						width: png.width,
-						height: png.height,
-						data: Uint8ClampedArray.from(png.data)
+				const transformer = new Transformer(buffer);
+				const metadata = transformer.metadataSync();
+				const width = metadata.width;
+				const height = metadata.height;
+				const rawPixels = transformer.rawPixelsSync();
+				logger.debug(`图片解析成功: ${width}x${height}, 格式: ${metadata.format}`);
+				logger.debug(`原始像素数据长度: ${rawPixels.length}, 预期长度(RGBA): ${width * height * 4}`);
+				const expectedRGBA = width * height * 4;
+				const expectedRGB = width * height * 3;
+				if (rawPixels.length === expectedRGB) {
+					logger.debug("检测到 RGB 格式，转换为 RGBA");
+					const rgbaData = new Uint8ClampedArray(expectedRGBA);
+					for (let i = 0, j = 0; i < rawPixels.length; i += 3, j += 4) {
+						rgbaData[j] = rawPixels[i];
+						rgbaData[j + 1] = rawPixels[i + 1];
+						rgbaData[j + 2] = rawPixels[i + 2];
+						rgbaData[j + 3] = 255;
+					}
+					return {
+						width,
+						height,
+						data: rgbaData
+					};
+				} else if (rawPixels.length === expectedRGBA) {
+					logger.debug("检测到 RGBA 格式");
+					return {
+						width,
+						height,
+						data: Uint8ClampedArray.from(rawPixels)
 					};
-					logger.mark(`图片解析成功: ${png.width}x${png.height}, 数据大小: ${(png.data.length / 1024 / 1024).toFixed(2)}MB`);
-				} catch (err) {
-					logger.warn("图片格式不支持，目前仅支持 PNG 格式的二维码识别", err);
+				} else {
+					logger.warn(`像素数据长度不匹配: ${rawPixels.length}, 预期 RGB: ${expectedRGB}, RGBA: ${expectedRGBA}`);
 					return null;
 				}
+			} catch (err) {
+				logger.warn("图片解析失败:", err);
+				return null;
+			}
+		}
+		static scanFromBuffer(buffer) {
+			try {
+				const imageData = this.parseImageBuffer(buffer);
+				if (!imageData) return null;
 				const { width, height } = imageData;
+				const dataSizeMB = (width * height * 4 / 1024 / 1024).toFixed(2);
+				logger.debug(`图片数据: ${width}x${height}, 内存占用: ${dataSizeMB}MB`);
 				if (width <= 2048 && height <= 2048) {
 					logger.debug("图片尺寸适中，使用全图识别策略");
 					const result = this.tryRecognizeInRegion(imageData, "全图");
 					if (result) return result;
 				}
-				logger.mark(`图片尺寸较大 (${width}x${height})，使用分块扫描策略`);
+				logger.debug(`图片尺寸较大 (${width}x${height})，使用分块扫描策略`);
 				const scanRegions = [];
 				const blockSize = 1024;
-				logger.debug("添加顶部扫描区域");
+				logger.debug("添加四角扫描区域");
 				scanRegions.push({
-					name: "顶部左",
+					name: "左上角",
 					x: 0,
 					y: 0,
 					w: Math.min(blockSize, width),
 					h: Math.min(blockSize, height)
 				});
 				if (width > blockSize) scanRegions.push({
-					name: "顶部右",
-					x: width - blockSize,
+					name: "右上角",
+					x: width - Math.min(blockSize, width),
 					y: 0,
-					w: blockSize,
+					w: Math.min(blockSize, width),
 					h: Math.min(blockSize, height)
 				});
-				if (width > blockSize * 2) scanRegions.push({
-					name: "顶部中",
-					x: Math.floor((width - blockSize) / 2),
-					y: 0,
-					w: blockSize,
+				if (height > blockSize) scanRegions.push({
+					name: "左下角",
+					x: 0,
+					y: height - Math.min(blockSize, height),
+					w: Math.min(blockSize, width),
 					h: Math.min(blockSize, height)
 				});
-				if (height > blockSize) {
-					logger.debug("添加底部扫描区域");
+				if (width > blockSize && height > blockSize) scanRegions.push({
+					name: "右下角",
+					x: width - Math.min(blockSize, width),
+					y: height - Math.min(blockSize, height),
+					w: Math.min(blockSize, width),
+					h: Math.min(blockSize, height)
+				});
+				if (width > blockSize * 2) {
+					logger.debug("添加顶部/底部中间扫描区域");
 					scanRegions.push({
-						name: "底部左",
-						x: 0,
-						y: height - blockSize,
-						w: Math.min(blockSize, width),
-						h: blockSize
+						name: "顶部中",
+						x: Math.floor((width - blockSize) / 2),
+						y: 0,
+						w: blockSize,
+						h: Math.min(blockSize, height)
 					});
-					if (width > blockSize) scanRegions.push({
-						name: "底部右",
-						x: width - blockSize,
+					if (height > blockSize) scanRegions.push({
+						name: "底部中",
+						x: Math.floor((width - blockSize) / 2),
 						y: height - blockSize,
 						w: blockSize,
 						h: blockSize
 					});
 				}
 				if (height > blockSize * 2) {
-					logger.debug("添加中部扫描区域");
+					logger.debug("添加左右中间扫描区域");
 					const middleY = Math.floor((height - blockSize) / 2);
 					scanRegions.push({
-						name: "中部左",
+						name: "左中",
 						x: 0,
 						y: middleY,
 						w: Math.min(blockSize, width),
 						h: blockSize
 					});
 					if (width > blockSize) scanRegions.push({
-						name: "中部右",
+						name: "右中",
 						x: width - blockSize,
 						y: middleY,
 						w: blockSize,
@@ -6582,14 +6577,14 @@ var init_QRCodeScanner = __esmMin(() => {
 						break;
 					}
 				}
-				logger.mark(`共生成 ${scanRegions.length} 个扫描区域，开始逐个扫描`);
+				logger.debug(`共生成 ${scanRegions.length} 个扫描区域，开始逐个扫描`);
 				for (let i = 0; i < scanRegions.length; i++) {
 					const region = scanRegions[i];
 					logger.debug(`[${i + 1}/${scanRegions.length}] 扫描区域: ${region.name} (位置: ${region.x},${region.y}, 尺寸: ${region.w}x${region.h})`);
 					const regionData = this.extractRegion(imageData, region.x, region.y, region.w, region.h);
 					const result = this.tryRecognizeInRegion(regionData, region.name);
 					if (result) {
-						logger.mark(`二维码识别完成，共扫描了 ${i + 1}/${scanRegions.length} 个区域`);
+						logger.debug(`二维码识别完成，共扫描了 ${i + 1}/${scanRegions.length} 个区域`);
 						return result;
 					}
 				}
@@ -6771,6 +6766,9 @@ var init_Common = __esmMin(async () => {
 	};
 	Common = new Tools();
 });
+var init_EmojiReaction = __esmMin(() => {
+	init_Config();
+});
 async function detectEncoder$1(codec) {
 	if (cachedEncoders$1[codec]) return cachedEncoders$1[codec];
 	logger.debug(`[BiliDanmaku] 开始检测 ${codec.toUpperCase()} 编码器...`);
@@ -7474,6 +7472,16 @@ async function getMediaDuration(path$1) {
 	const { stdout } = await ffprobe(`-v error -show_entries format=duration -of default=noprint_wrappers=1:nokey=1 "${path$1}"`);
 	return parseFloat(parseFloat(stdout.trim()).toFixed(2));
 }
+async function loopVideo(inputPath, outputPath, loopCount) {
+	if (loopCount <= 1) {
+		fs.copyFileSync(inputPath, outputPath);
+		return true;
+	}
+	const result = await ffmpeg(`-y -stream_loop ${loopCount - 1} -i "${inputPath}" -c copy "${outputPath}"`);
+	if (result.status) logger.mark(`视频重放成功: ${outputPath}`);
+	else logger.error("视频重放失败", result);
+	return result.status;
+}
 async function mergeVideoAudio(videoPath, audioPath, resultPath) {
 	const result = await ffmpeg(`-y -i "${videoPath}" -i "${audioPath}" -c copy "${resultPath}"`);
 	if (result.status) logger.mark(`视频合成成功: ${resultPath}`);
@@ -7527,38 +7535,6 @@ async function mergeLiveImageContinuous(options, context) {
 		}
 	};
 }
-async function batchMergeLiveImages(videos, bgmPath, outputDir, mode = "independent", loopCount = 3) {
-	const results = [];
-	if (mode === "independent") for (const video of videos) {
-		const outputPath = `${outputDir}${video.outputName}`;
-		const success = await mergeLiveImageIndependent({
-			videoPath: video.path,
-			outputPath,
-			loopCount
-		}, bgmPath);
-		results.push({
-			success,
-			outputPath
-		});
-	}
-	else {
-		let context = await createLiveImageContext(bgmPath);
-		for (const video of videos) {
-			const outputPath = `${outputDir}${video.outputName}`;
-			const result = await mergeLiveImageContinuous({
-				videoPath: video.path,
-				outputPath,
-				loopCount
-			}, context);
-			context = result.context;
-			results.push({
-				success: result.success,
-				outputPath
-			});
-		}
-	}
-	return results;
-}
 var init_FFmpeg = __esmMin(async () => {
 	await init_utils$1();
 	await init_danmaku$1();
@@ -8103,12 +8079,12 @@ var init_Network$1 = __esmMin(() => {
 	};
 });
 var init_Network = __esmMin(() => {
-	init_constants();
 	init_Downloader();
 	init_helpers();
 	init_Network$1();
 	init_ThrottleStream();
 	init_types();
+	init_constants();
 });
 var init_Networks = __esmMin(() => {
 	init_Network();
@@ -8293,48 +8269,12 @@ var init_Render = __esmMin(async () => {
 		return ret;
 	};
 });
-var utils_exports = __export({
-	BASE_HEADERS: () => BASE_HEADERS,
-	Base: () => Base,
-	Common: () => Common,
-	Count: () => Count,
-	DEFAULT_THROTTLE_CONFIG: () => DEFAULT_THROTTLE_CONFIG,
-	Downloader: () => Downloader,
-	Network: () => Network,
-	Networks: () => Network,
-	QRCodeScanner: () => QRCodeScanner,
-	Render: () => Render,
-	Root: () => Root,
-	ThrottleStream: () => ThrottleStream,
-	baseHeaders: () => BASE_HEADERS,
-	batchMergeLiveImages: () => batchMergeLiveImages,
-	burnDanmakuToVideo: () => burnBiliDanmaku,
-	burnDouyinDanmaku: () => burnDouyinDanmaku,
-	compressVideo: () => compressVideo,
-	createLiveImageContext: () => createLiveImageContext,
-	danmakuToASS: () => generateBiliASS,
-	downloadFile: () => downloadFile,
-	downloadVideo: () => downloadVideo,
-	formatBuildTime: () => formatBuildTime,
-	formatBytes: () => formatBytes,
-	getBuildMetadata: () => getBuildMetadata,
-	getErrorDescription: () => getErrorDescription,
-	getMediaDuration: () => getMediaDuration,
-	isRecoverableNetworkError: () => isRecoverableNetworkError,
-	isThrottlingError: () => isThrottlingError,
-	mergeAndBurnDanmaku: () => mergeAndBurnBili,
-	mergeLiveImageContinuous: () => mergeLiveImageContinuous,
-	mergeLiveImageIndependent: () => mergeLiveImageIndependent,
-	mergeVideoAudio: () => mergeVideoAudio,
-	sanitizeHeaders: () => sanitizeHeaders,
-	statBotId: () => statBotId$1,
-	uploadFile: () => uploadFile
-}, 1);
 var init_utils$1 = __esmMin(async () => {
 	init_root();
 	init_Base();
 	init_build_metadata();
 	init_Common();
+	init_EmojiReaction();
 	init_FFmpeg();
 	init_Networks();
 	init_QRCodeScanner();
@@ -8502,6 +8442,14 @@ var init_bilibili = __esmMin(async () => {
 		async unsubscribeBilibiliUser(groupId, host_mid) {
 			const result = await this.runQuery("DELETE FROM GroupUserSubscriptions WHERE groupId = ? AND host_mid = ?", [groupId, host_mid]);
 			await this.runQuery("DELETE FROM DynamicCaches WHERE groupId = ? AND host_mid = ?", [groupId, host_mid]);
+			const remainingSubscriptions = await this.getQuery("SELECT COUNT(*) as count FROM GroupUserSubscriptions WHERE host_mid = ?", [host_mid]);
+			if (remainingSubscriptions && remainingSubscriptions.count === 0) {
+				logger.info(`[BilibiliDB] 用户 ${host_mid} 已无任何群组订阅，清理相关数据`);
+				await this.runQuery("DELETE FROM BilibiliUsers WHERE host_mid = ?", [host_mid]);
+				await this.runQuery("DELETE FROM FilterWords WHERE host_mid = ?", [host_mid]);
+				await this.runQuery("DELETE FROM FilterTags WHERE host_mid = ?", [host_mid]);
+				await this.runQuery("DELETE FROM DynamicCaches WHERE host_mid = ?", [host_mid]);
+			}
 			return result.changes > 0;
 		}
 		async addDynamicCache(dynamic_id, host_mid, groupId, dynamic_type) {
@@ -8880,11 +8828,24 @@ var init_douyin = __esmMin(async () => {
 					logger.info("[DouyinDB] 检测到 AwemeCaches 表缺少 pushType 字段，开始执行迁移...");
 					await this.runQuery("ALTER TABLE AwemeCaches ADD COLUMN pushType TEXT DEFAULT 'post'");
 					await this.runQuery("ALTER TABLE AwemeCaches RENAME TO AwemeCaches_old");
-					await this.runQuery(`\n          CREATE TABLE IF NOT EXISTS AwemeCaches (\n            id INTEGER PRIMARY KEY AUTOINCREMENT,\n            aweme_id TEXT NOT NULL,\n            sec_uid TEXT NOT NULL,\n            groupId TEXT NOT NULL,\n            pushType TEXT DEFAULT 'post',\n            createdAt TEXT DEFAULT CURRENT_TIMESTAMP,\n            updatedAt TEXT DEFAULT CURRENT_TIMESTAMP,\n            FOREIGN KEY (sec_uid) REFERENCES DouyinUsers(sec_uid),\n            FOREIGN KEY (groupId) REFERENCES Groups(id),\n            UNIQUE(aweme_id, sec_uid, groupId, pushType)\n          )\n        `);
+					await this.runQuery(`\n          CREATE TABLE IF NOT EXISTS AwemeCaches (\n            id INTEGER PRIMARY KEY AUTOINCREMENT,\n            aweme_id TEXT NOT NULL,\n            sec_uid TEXT NOT NULL,\n            groupId TEXT NOT NULL,\n            pushType TEXT DEFAULT 'post',\n            createdAt TEXT DEFAULT CURRENT_TIMESTAMP,\n            updatedAt TEXT DEFAULT CURRENT_TIMESTAMP,\n            FOREIGN KEY (sec_uid) REFERENCES DouyinUsers(sec_uid),\n            UNIQUE(aweme_id, sec_uid, groupId, pushType)\n          )\n        `);
 					await this.runQuery(`\n          INSERT INTO AwemeCaches (id, aweme_id, sec_uid, groupId, pushType, createdAt, updatedAt)\n          SELECT id, aweme_id, sec_uid, groupId, pushType, createdAt, updatedAt\n          FROM AwemeCaches_old\n        `);
 					await this.runQuery("DROP TABLE AwemeCaches_old");
 					logger.info("[DouyinDB] AwemeCaches 表迁移完成");
 				}
+				try {
+					const tableInfo = await this.allQuery("SELECT sql FROM sqlite_master WHERE type='table' AND name='AwemeCaches'");
+					if (tableInfo.length > 0 && tableInfo[0].sql.includes("FOREIGN KEY (groupId) REFERENCES Groups(id)")) {
+						logger.info("[DouyinDB] 检测到 AwemeCaches 表存在错误的外键约束，开始修复...");
+						await this.runQuery("ALTER TABLE AwemeCaches RENAME TO AwemeCaches_old");
+						await this.runQuery(`\n            CREATE TABLE IF NOT EXISTS AwemeCaches (\n              id INTEGER PRIMARY KEY AUTOINCREMENT,\n              aweme_id TEXT NOT NULL,\n              sec_uid TEXT NOT NULL,\n              groupId TEXT NOT NULL,\n              pushType TEXT DEFAULT 'post',\n              createdAt TEXT DEFAULT CURRENT_TIMESTAMP,\n              updatedAt TEXT DEFAULT CURRENT_TIMESTAMP,\n              FOREIGN KEY (sec_uid) REFERENCES DouyinUsers(sec_uid),\n              UNIQUE(aweme_id, sec_uid, groupId, pushType)\n            )\n          `);
+						await this.runQuery(`\n            INSERT INTO AwemeCaches (id, aweme_id, sec_uid, groupId, pushType, createdAt, updatedAt)\n            SELECT id, aweme_id, sec_uid, groupId, pushType, createdAt, updatedAt\n            FROM AwemeCaches_old\n          `);
+						await this.runQuery("DROP TABLE AwemeCaches_old");
+						logger.info("[DouyinDB] AwemeCaches 表外键约束修复完成");
+					}
+				} catch (error) {
+					logger.debug("[DouyinDB] 外键约束检查/修复跳过:", error);
+				}
 			} catch (error) {
 				logger.error("[DouyinDB] 数据库迁移失败:", error);
 			}
@@ -8895,7 +8856,7 @@ var init_douyin = __esmMin(async () => {
 				`CREATE TABLE IF NOT EXISTS Groups (\n        id TEXT NOT NULL,\n        botId TEXT NOT NULL,\n        createdAt TEXT DEFAULT CURRENT_TIMESTAMP,\n        updatedAt TEXT DEFAULT CURRENT_TIMESTAMP,\n        PRIMARY KEY (id, botId),\n        FOREIGN KEY (botId) REFERENCES Bots(id)\n      )`,
 				`CREATE TABLE IF NOT EXISTS DouyinUsers (\n        sec_uid TEXT PRIMARY KEY,\n        short_id TEXT,\n        remark TEXT,\n        living INTEGER DEFAULT 0,\n        filterMode TEXT DEFAULT 'blacklist',\n        createdAt TEXT DEFAULT CURRENT_TIMESTAMP,\n        updatedAt TEXT DEFAULT CURRENT_TIMESTAMP\n      )`,
 				`CREATE TABLE IF NOT EXISTS GroupUserSubscriptions (\n        groupId TEXT,\n        sec_uid TEXT,\n        createdAt TEXT DEFAULT CURRENT_TIMESTAMP,\n        updatedAt TEXT DEFAULT CURRENT_TIMESTAMP,\n        PRIMARY KEY (groupId, sec_uid),\n        FOREIGN KEY (groupId) REFERENCES Groups(id),\n        FOREIGN KEY (sec_uid) REFERENCES DouyinUsers(sec_uid)\n      )`,
-				`CREATE TABLE IF NOT EXISTS AwemeCaches (\n        id INTEGER PRIMARY KEY AUTOINCREMENT,\n        aweme_id TEXT NOT NULL,\n        sec_uid TEXT NOT NULL,\n        groupId TEXT NOT NULL,\n        pushType TEXT DEFAULT 'post',\n        createdAt TEXT DEFAULT CURRENT_TIMESTAMP,\n        updatedAt TEXT DEFAULT CURRENT_TIMESTAMP,\n        FOREIGN KEY (sec_uid) REFERENCES DouyinUsers(sec_uid),\n        FOREIGN KEY (groupId) REFERENCES Groups(id),\n        UNIQUE(aweme_id, sec_uid, groupId, pushType)\n      )`,
+				`CREATE TABLE IF NOT EXISTS AwemeCaches (\n        id INTEGER PRIMARY KEY AUTOINCREMENT,\n        aweme_id TEXT NOT NULL,\n        sec_uid TEXT NOT NULL,\n        groupId TEXT NOT NULL,\n        pushType TEXT DEFAULT 'post',\n        createdAt TEXT DEFAULT CURRENT_TIMESTAMP,\n        updatedAt TEXT DEFAULT CURRENT_TIMESTAMP,\n        FOREIGN KEY (sec_uid) REFERENCES DouyinUsers(sec_uid),\n        UNIQUE(aweme_id, sec_uid, groupId, pushType)\n      )`,
 				`CREATE TABLE IF NOT EXISTS FilterWords (\n        id INTEGER PRIMARY KEY AUTOINCREMENT,\n        sec_uid TEXT NOT NULL,\n        word TEXT NOT NULL,\n        createdAt TEXT DEFAULT CURRENT_TIMESTAMP,\n        updatedAt TEXT DEFAULT CURRENT_TIMESTAMP,\n        FOREIGN KEY (sec_uid) REFERENCES DouyinUsers(sec_uid),\n        UNIQUE(sec_uid, word)\n      )`,
 				`CREATE TABLE IF NOT EXISTS FilterTags (\n        id INTEGER PRIMARY KEY AUTOINCREMENT,\n        sec_uid TEXT NOT NULL,\n        tag TEXT NOT NULL,\n        createdAt TEXT DEFAULT CURRENT_TIMESTAMP,\n        updatedAt TEXT DEFAULT CURRENT_TIMESTAMP,\n        FOREIGN KEY (sec_uid) REFERENCES DouyinUsers(sec_uid),\n        UNIQUE(sec_uid, tag)\n      )`,
 				`CREATE TABLE IF NOT EXISTS ListSnapshots (\n        id INTEGER PRIMARY KEY AUTOINCREMENT,\n        sec_uid TEXT NOT NULL,\n        pushType TEXT NOT NULL,\n        aweme_id TEXT NOT NULL,\n        createdAt TEXT DEFAULT CURRENT_TIMESTAMP,\n        updatedAt TEXT DEFAULT CURRENT_TIMESTAMP,\n        FOREIGN KEY (sec_uid) REFERENCES DouyinUsers(sec_uid),\n        UNIQUE(sec_uid, pushType, aweme_id)\n      )`
@@ -9038,6 +8999,14 @@ var init_douyin = __esmMin(async () => {
 		async unsubscribeDouyinUser(groupId, sec_uid) {
 			const result = await this.runQuery("DELETE FROM GroupUserSubscriptions WHERE groupId = ? AND sec_uid = ?", [groupId, sec_uid]);
 			await this.runQuery("DELETE FROM AwemeCaches WHERE groupId = ? AND sec_uid = ?", [groupId, sec_uid]);
+			const remainingSubscriptions = await this.getQuery("SELECT COUNT(*) as count FROM GroupUserSubscriptions WHERE sec_uid = ?", [sec_uid]);
+			if (remainingSubscriptions && remainingSubscriptions.count === 0) {
+				logger.info(`[DouyinDB] 用户 ${sec_uid} 已无任何群组订阅，清理相关数据`);
+				await this.runQuery("DELETE FROM DouyinUsers WHERE sec_uid = ?", [sec_uid]);
+				await this.runQuery("DELETE FROM FilterWords WHERE sec_uid = ?", [sec_uid]);
+				await this.runQuery("DELETE FROM FilterTags WHERE sec_uid = ?", [sec_uid]);
+				await this.runQuery("DELETE FROM AwemeCaches WHERE sec_uid = ?", [sec_uid]);
+			}
 			return result.changes > 0;
 		}
 		async addAwemeCache(aweme_id, sec_uid, groupId, pushType = "post") {
@@ -12926,15 +12895,16 @@ var init_setup = __esmMin(async () => {
 });
 await init_module();
 await init_semver();
-var requireVersion = "1.14.1";
+var requireVersion = "1.14.4";
 if (process.env.NODE_ENV !== "development" && isSemverGreater(requireVersion, Root.karinVersion)) {
 	const msg = `[karin-plugin-kkk] 插件构建时的 karin 版本 (${requireVersion}) 高于当前运行版本 (${Root.karinVersion})，可能会出现兼容性问题！`;
 	logger.warn(msg);
 	const notifiedSet = /* @__PURE__ */ new Set();
 	karin$1.on(BOT_CONNECT, async (bot) => {
+		const botId = bot.selfId;
+		if (botId === "console") return;
 		await new Promise((resolve$1) => setTimeout(resolve$1, 2e3));
 		const masters = config.master();
-		const botId = bot.selfId;
 		logger.info(`[karin-plugin-kkk] 监测到 Bot 连接: ${botId}, 准备发送版本警告`);
 		let warningImage = null;
 		try {
@@ -17220,20 +17190,23 @@ var DouYin = class extends Base {
 							const processedImages = [];
 							const temp = [];
 							g_title = VideoData.data.aweme_detail.preview_title.substring(0, 50).replace(/[\\/:*?"<>|\r\n]/g, " ");
-							let mp3Path = "";
-							if (VideoData.data.aweme_detail.music.play_url.uri === "") mp3Path = JSON.parse(VideoData.data.aweme_detail.music.extra).original_song_url;
-							else mp3Path = VideoData.data.aweme_detail.music.play_url.uri;
-							const liveimgbgm = await downloadFile(mp3Path, {
-								title: `Douyin_tmp_A_${Date.now()}.mp3`,
-								headers: this.headers
-							});
-							temp.push(liveimgbgm);
-							const mergeMode = Config.douyin.liveImageMergeMode ?? "independent";
+							let liveimgbgm = null;
 							let bgmContext = null;
-							if (mergeMode === "continuous") bgmContext = await createLiveImageContext(liveimgbgm.filepath);
+							const mergeMode = Config.douyin.liveImageMergeMode ?? "independent";
+							if (VideoData.data.aweme_detail.music) {
+								let mp3Path = "";
+								if (VideoData.data.aweme_detail.music.play_url.uri === "") mp3Path = JSON.parse(VideoData.data.aweme_detail.music.extra).original_song_url;
+								else mp3Path = VideoData.data.aweme_detail.music.play_url.uri;
+								liveimgbgm = await downloadFile(mp3Path, {
+									title: `Douyin_tmp_A_${Date.now()}.mp3`,
+									headers: this.headers
+								});
+								temp.push(liveimgbgm);
+								if (mergeMode === "continuous") bgmContext = await createLiveImageContext(liveimgbgm.filepath);
+							}
 							for (const [index, imageItem] of images.entries()) {
 								imagenum++;
-								if (imageItem.clip_type === 2) {
+								if (imageItem.clip_type === 2 || imageItem.clip_type === void 0) {
 									image_url = imageItem.url_list[2] || imageItem.url_list[1];
 									processedImages.push(segment.image(image_url));
 									if (Config.app.removeCache === false) {
@@ -17254,7 +17227,12 @@ var DouYin = class extends Base {
 									const outputPath = Common.tempDri.video + `Douyin_Result_${Date.now()}.mp4`;
 									let success;
 									const loopCount = imageItem.clip_type === 4 ? 1 : 3;
-									if (mergeMode === "continuous" && bgmContext) {
+									if (!liveimgbgm) if (loopCount > 1) success = await loopVideo(liveimg.filepath, outputPath, loopCount);
+									else {
+										fs.renameSync(liveimg.filepath, outputPath);
+										success = true;
+									}
+									else if (mergeMode === "continuous" && bgmContext) {
 										const result = await mergeLiveImageContinuous({
 											videoPath: liveimg.filepath,
 											outputPath,
@@ -17327,22 +17305,25 @@ var DouYin = class extends Base {
 					case VideoData.data.aweme_detail.is_slides === true && VideoData.data.aweme_detail.images !== null: {
 						const images = [];
 						const temp = [];
-						let mp3Path = "";
-						if (VideoData.data.aweme_detail.music.play_url.uri === "") mp3Path = JSON.parse(VideoData.data.aweme_detail.music.extra).original_song_url;
-						else mp3Path = VideoData.data.aweme_detail.music.play_url.uri;
-						const liveimgbgm = await downloadFile(mp3Path, {
-							title: `Douyin_tmp_A_${Date.now()}.mp3`,
-							headers: this.headers
-						});
-						temp.push(liveimgbgm);
+						let liveimgbgm = null;
+						let bgmContext = null;
+						const mergeMode = Config.douyin.liveImageMergeMode ?? "independent";
+						if (VideoData.data.aweme_detail.music) {
+							let mp3Path = "";
+							if (VideoData.data.aweme_detail.music.play_url.uri === "") mp3Path = JSON.parse(VideoData.data.aweme_detail.music.extra).original_song_url;
+							else mp3Path = VideoData.data.aweme_detail.music.play_url.uri;
+							liveimgbgm = await downloadFile(mp3Path, {
+								title: `Douyin_tmp_A_${Date.now()}.mp3`,
+								headers: this.headers
+							});
+							temp.push(liveimgbgm);
+							if (mergeMode === "continuous") bgmContext = await createLiveImageContext(liveimgbgm.filepath);
+						}
 						const images1 = VideoData.data.aweme_detail.images ?? [];
 						if (!images1.length) logger.debug("未获取到合辑的图片数据");
-						const mergeMode = Config.douyin.liveImageMergeMode ?? "independent";
-						let bgmContext = null;
-						if (mergeMode === "continuous") bgmContext = await createLiveImageContext(liveimgbgm.filepath);
 						for (const item of images1) {
 							imagenum++;
-							if (item.clip_type === 2) {
+							if (item.clip_type === 2 || item.clip_type === void 0) {
 								images.push(segment.image(item.url_list[0]));
 								continue;
 							}
@@ -17354,7 +17335,12 @@ var DouYin = class extends Base {
 								const outputPath = Common.tempDri.video + `Douyin_Result_${Date.now()}.mp4`;
 								let success;
 								const loopCount = item.clip_type === 4 ? 1 : 3;
-								if (mergeMode === "continuous" && bgmContext) {
+								if (!liveimgbgm) if (loopCount > 1) success = await loopVideo(liveimg.filepath, outputPath, loopCount);
+								else {
+									fs.renameSync(liveimg.filepath, outputPath);
+									success = true;
+								}
+								else if (mergeMode === "continuous" && bgmContext) {
 									const result = await mergeLiveImageContinuous({
 										videoPath: liveimg.filepath,
 										outputPath,
@@ -17471,7 +17457,7 @@ var DouYin = class extends Base {
 							gender: userProfile.data.user.gender ?? 0,
 							user_age: userProfile.data.user.user_age ?? 0
 						} : void 0,
-						image_url: this.is_mp4 ? VideoData.data.aweme_detail.video.animated_cover?.url_list[0] ?? VideoData.data.aweme_detail.video.cover_original_scale.url_list[0] : VideoData.data.aweme_detail.images[0].url_list[0],
+						image_url: this.is_mp4 ? VideoData.data.aweme_detail.video.animated_cover?.url_list[0] ?? VideoData.data.aweme_detail.video.cover_original_scale?.url_list[0] ?? VideoData.data.aweme_detail.video.cover.url_list[0] : VideoData.data.aweme_detail.images[0].url_list[0],
 						cover_size: this.is_mp4 ? VideoData.data.aweme_detail.video.cover ? {
 							width: VideoData.data.aweme_detail.video.cover_original_scale.width,
 							height: VideoData.data.aweme_detail.video.cover_original_scale.height
@@ -17569,13 +17555,12 @@ var DouYin = class extends Base {
 								await Common.removeFile(videoFile.filepath, true);
 								const stats = fs.statSync(filePath);
 								const fileSizeInMB = Number((stats.size / (1024 * 1024)).toFixed(2));
-								const { uploadFile: uploadFile$1 } = await init_utils$1().then(() => utils_exports);
-								if (fileSizeInMB > Config.upload.groupfilevalue) await uploadFile$1(this.e, {
+								if (fileSizeInMB > Config.upload.groupfilevalue) await uploadFile(this.e, {
 									filepath: filePath,
 									totalBytes: fileSizeInMB,
 									originTitle: g_title || ""
 								}, "", { useGroupFile: true });
-								else await uploadFile$1(this.e, {
+								else await uploadFile(this.e, {
 									filepath: filePath,
 									totalBytes: fileSizeInMB,
 									originTitle: g_title || ""
@@ -18223,7 +18208,7 @@ var DouYinpush = class extends Base {
 				if (pushItem.pushType === "favorite") {
 					const authorUserInfo = "author_user_info" in Detail_Data ? Detail_Data.author_user_info : void 0;
 					img$2 = await Render("douyin/favorite-list", {
-						image_url: iddata.is_mp4 ? Detail_Data.video.animated_cover?.url_list[0] ?? Detail_Data.video.cover_original_scale.url_list[0] : Detail_Data.images[0].url_list[0],
+						image_url: iddata.is_mp4 ? Detail_Data.video.animated_cover?.url_list[0] ?? Detail_Data.video.cover_original_scale?.url_list[0] ?? Detail_Data.video.cover.url_list[0] : Detail_Data.images[0].url_list[0],
 						desc: this.desc(Detail_Data, Detail_Data.desc),
 						dianzan: this.count(Detail_Data.statistics.digg_count),
 						pinglun: this.count(Detail_Data.statistics.comment_count),
@@ -18242,7 +18227,7 @@ var DouYinpush = class extends Base {
 				} else if (pushItem.pushType === "recommend") {
 					const authorUserInfo = "author_user_info" in Detail_Data ? Detail_Data.author_user_info : void 0;
 					img$2 = await Render("douyin/recommend-list", {
-						image_url: iddata.is_mp4 ? Detail_Data.video.animated_cover?.url_list[0] ?? Detail_Data.video.cover_original_scale.url_list[0] : Detail_Data.images[0].url_list[0],
+						image_url: iddata.is_mp4 ? Detail_Data.video.animated_cover?.url_list[0] ?? Detail_Data.video.cover_original_scale?.url_list[0] ?? Detail_Data.video.cover.url_list[0] : Detail_Data.images[0].url_list[0],
 						desc: this.desc(Detail_Data, Detail_Data.desc),
 						dianzan: this.count(Detail_Data.statistics.digg_count),
 						pinglun: this.count(Detail_Data.statistics.comment_count),
@@ -18298,7 +18283,7 @@ var DouYinpush = class extends Base {
 					})()
 				});
 			}
-			for (const target of pushItem.targets) try {
+			for (const target of pushItem.targets) {
 				let status = { message_id: "" };
 				const { groupId, botId } = target;
 				if (!skip) {
@@ -18336,24 +18321,24 @@ var DouYinpush = class extends Base {
 							if (Detail_Data.is_slides === true && Detail_Data.images) {
 								const images = [];
 								const temp = [];
-								let mp3Path = "";
-								if (Detail_Data.music.play_url.uri === "") mp3Path = JSON.parse(Detail_Data.music.extra).original_song_url;
-								else mp3Path = Detail_Data.music.play_url.uri;
-								const liveimgbgm = await downloadFile(mp3Path, {
-									title: `Douyin_tmp_A_${Date.now()}.mp3`,
-									headers: douyinBaseHeaders
-								});
-								temp.push(liveimgbgm);
-								const images1 = Detail_Data.images ?? [];
-								if (!images1.length) logger.debug("未获取到合辑的图片数据");
-								const mergeMode = Config.douyin.liveImageMergeMode ?? "independent";
+								let liveimgbgm = null;
 								let bgmContext = null;
-								if (mergeMode === "continuous") {
-									const { createLiveImageContext: createLiveImageContext$1 } = await init_utils$1().then(() => utils_exports);
-									bgmContext = await createLiveImageContext$1(liveimgbgm.filepath);
+								const mergeMode = Config.douyin.liveImageMergeMode ?? "independent";
+								if (Detail_Data.music) {
+									let mp3Path = "";
+									if (Detail_Data.music.play_url.uri === "") mp3Path = JSON.parse(Detail_Data.music.extra).original_song_url;
+									else mp3Path = Detail_Data.music.play_url.uri;
+									liveimgbgm = await downloadFile(mp3Path, {
+										title: `Douyin_tmp_A_${Date.now()}.mp3`,
+										headers: douyinBaseHeaders
+									});
+									temp.push(liveimgbgm);
+									if (mergeMode === "continuous") bgmContext = await createLiveImageContext(liveimgbgm.filepath);
 								}
+								const images1 = Detail_Data.images ?? [];
+								if (!images1.length) logger.debug("未获取到合辑的图片数据");
 								for (const item of images1) {
-									if (item.clip_type === 2) {
+									if (item.clip_type === 2 || item.clip_type === void 0) {
 										images.push(segment.image(item.url_list[0]));
 										continue;
 									}
@@ -18362,37 +18347,40 @@ var DouYinpush = class extends Base {
 										headers: douyinBaseHeaders
 									});
 									if (liveimg.filepath) {
-										const { Common: Common$1, mergeLiveImageContinuous: mergeLiveImageContinuous$1, mergeLiveImageIndependent: mergeLiveImageIndependent$1 } = await init_utils$1().then(() => utils_exports);
-										const outputPath = Common$1.tempDri.video + `Douyin_Result_${Date.now()}.mp4`;
+										const outputPath = Common.tempDri.video + `Douyin_Result_${Date.now()}.mp4`;
 										let success;
 										const loopCount = item.clip_type === 4 ? 1 : 3;
-										if (mergeMode === "continuous" && bgmContext) {
-											const result = await mergeLiveImageContinuous$1({
+										if (!liveimgbgm) if (loopCount > 1) success = await loopVideo(liveimg.filepath, outputPath, loopCount);
+										else {
+											fs.renameSync(liveimg.filepath, outputPath);
+											success = true;
+										}
+										else if (mergeMode === "continuous" && bgmContext) {
+											const result = await mergeLiveImageContinuous({
 												videoPath: liveimg.filepath,
 												outputPath,
 												loopCount
 											}, bgmContext);
 											success = result.success;
 											bgmContext = result.context;
-										} else success = await mergeLiveImageIndependent$1({
+										} else success = await mergeLiveImageIndependent({
 											videoPath: liveimg.filepath,
 											outputPath,
 											loopCount
 										}, liveimgbgm.filepath);
 										if (success) {
-											const fs$1 = await import("node:fs");
-											const filePath = Common$1.tempDri.video + `tmp_${Date.now()}.mp4`;
-											fs$1.default.renameSync(outputPath, filePath);
+											const filePath = Common.tempDri.video + `tmp_${Date.now()}.mp4`;
+											fs.renameSync(outputPath, filePath);
 											logger.mark(`视频文件重命名完成: ${outputPath.split("/").pop()} -> ${filePath.split("/").pop()}`);
 											logger.mark("正在尝试删除缓存文件");
-											await Common$1.removeFile(liveimg.filepath, true);
+											await Common.removeFile(liveimg.filepath, true);
 											temp.push({
 												filepath: filePath,
 												totalBytes: 0
 											});
 											images.push(segment.video("file://" + filePath));
 											if (item.clip_type === 5 && item.url_list?.[0]) images.push(segment.image(item.url_list[0]));
-										} else await Common$1.removeFile(liveimg.filepath, true);
+										} else await Common.removeFile(liveimg.filepath, true);
 									}
 								}
 								const bot = karin$1.getBot(botId);
@@ -18407,30 +18395,27 @@ var DouYinpush = class extends Base {
 								} catch (error) {
 									logger.error(`发送合辑失败: ${error}`);
 								} finally {
-									for (const item of temp) {
-										const { Common: Common$1 } = await init_utils$1().then(() => utils_exports);
-										await Common$1.removeFile(item.filepath, true);
-									}
+									for (const item of temp) await Common.removeFile(item.filepath, true);
 								}
-							} else if (Detail_Data.images) if (Detail_Data.images.some((item) => item.clip_type !== 2)) {
+							} else if (Detail_Data.images) if (Detail_Data.images.some((item) => item.clip_type !== 2 && item.clip_type !== void 0)) {
 								const processedImages = [];
 								const temp = [];
-								let mp3Path = "";
-								if (Detail_Data.music.play_url.uri === "") mp3Path = JSON.parse(Detail_Data.music.extra).original_song_url;
-								else mp3Path = Detail_Data.music.play_url.uri;
-								const liveimgbgm = await downloadFile(mp3Path, {
-									title: `Douyin_tmp_A_${Date.now()}.mp3`,
-									headers: douyinBaseHeaders
-								});
-								temp.push(liveimgbgm);
-								const mergeMode = Config.douyin.liveImageMergeMode ?? "independent";
+								let liveimgbgm = null;
 								let bgmContext = null;
-								if (mergeMode === "continuous") {
-									const { createLiveImageContext: createLiveImageContext$1 } = await init_utils$1().then(() => utils_exports);
-									bgmContext = await createLiveImageContext$1(liveimgbgm.filepath);
+								const mergeMode = Config.douyin.liveImageMergeMode ?? "independent";
+								if (Detail_Data.music) {
+									let mp3Path = "";
+									if (Detail_Data.music.play_url.uri === "") mp3Path = JSON.parse(Detail_Data.music.extra).original_song_url;
+									else mp3Path = Detail_Data.music.play_url.uri;
+									liveimgbgm = await downloadFile(mp3Path, {
+										title: `Douyin_tmp_A_${Date.now()}.mp3`,
+										headers: douyinBaseHeaders
+									});
+									temp.push(liveimgbgm);
+									if (mergeMode === "continuous") bgmContext = await createLiveImageContext(liveimgbgm.filepath);
 								}
 								for (const item of Detail_Data.images) {
-									if (item.clip_type === 2) {
+									if (item.clip_type === 2 || item.clip_type === void 0) {
 										const image_url = item.url_list[2] ?? item.url_list[1];
 										processedImages.push(segment.image(image_url));
 										continue;
@@ -18440,37 +18425,40 @@ var DouYinpush = class extends Base {
 										headers: douyinBaseHeaders
 									});
 									if (liveimg.filepath) {
-										const { Common: Common$1, mergeLiveImageContinuous: mergeLiveImageContinuous$1, mergeLiveImageIndependent: mergeLiveImageIndependent$1 } = await init_utils$1().then(() => utils_exports);
-										const outputPath = Common$1.tempDri.video + `Douyin_Result_${Date.now()}.mp4`;
+										const outputPath = Common.tempDri.video + `Douyin_Result_${Date.now()}.mp4`;
 										let success;
 										const loopCount = item.clip_type === 4 ? 1 : 3;
-										if (mergeMode === "continuous" && bgmContext) {
-											const result = await mergeLiveImageContinuous$1({
+										if (!liveimgbgm) if (loopCount > 1) success = await loopVideo(liveimg.filepath, outputPath, loopCount);
+										else {
+											fs.renameSync(liveimg.filepath, outputPath);
+											success = true;
+										}
+										else if (mergeMode === "continuous" && bgmContext) {
+											const result = await mergeLiveImageContinuous({
 												videoPath: liveimg.filepath,
 												outputPath,
 												loopCount
 											}, bgmContext);
 											success = result.success;
 											bgmContext = result.context;
-										} else success = await mergeLiveImageIndependent$1({
+										} else success = await mergeLiveImageIndependent({
 											videoPath: liveimg.filepath,
 											outputPath,
 											loopCount
 										}, liveimgbgm.filepath);
 										if (success) {
-											const fs$1 = await import("node:fs");
-											const filePath = Common$1.tempDri.video + `tmp_${Date.now()}.mp4`;
-											fs$1.default.renameSync(outputPath, filePath);
+											const filePath = Common.tempDri.video + `tmp_${Date.now()}.mp4`;
+											fs.renameSync(outputPath, filePath);
 											logger.mark(`视频文件重命名完成: ${outputPath.split("/").pop()} -> ${filePath.split("/").pop()}`);
 											logger.mark("正在尝试删除缓存文件");
-											await Common$1.removeFile(liveimg.filepath, true);
+											await Common.removeFile(liveimg.filepath, true);
 											temp.push({
 												filepath: filePath,
 												totalBytes: 0
 											});
 											processedImages.push(segment.video("file://" + filePath));
 											if (item.clip_type === 5 && item.url_list?.[0]) processedImages.push(segment.image(item.url_list[0]));
-										} else await Common$1.removeFile(liveimg.filepath, true);
+										} else await Common.removeFile(liveimg.filepath, true);
 									}
 								}
 								const bot = karin$1.getBot(botId);
@@ -18485,10 +18473,7 @@ var DouYinpush = class extends Base {
 								} catch (error) {
 									logger.error(`发送图集失败: ${error}`);
 								} finally {
-									for (const item of temp) {
-										const { Common: Common$1 } = await init_utils$1().then(() => utils_exports);
-										await Common$1.removeFile(item.filepath, true);
-									}
+									for (const item of temp) await Common.removeFile(item.filepath, true);
 								}
 							} else {
 								const imageres = [];
@@ -18513,8 +18498,6 @@ var DouYinpush = class extends Base {
 					}
 				}
 				if (skip || pushItem.pushType !== "live" && status.message_id) await douyinDBInstance.addAwemeCache(actualAwemeId, pushItem.sec_uid, groupId, pushItem.pushType);
-			} catch (error) {
-				throw new Error(`${error}`);
 			}
 		}
 		return true;
@@ -18939,8 +18922,6 @@ var Kuaishou = class extends Base {
 		return true;
 	}
 };
-var import_jsQR = __toESM(require_jsQR(), 1);
-var import_png = require_png();
 await init_module();
 await init_Config();
 var safeScreenshot = async (page, screenshotPath) => {
@@ -19280,12 +19261,11 @@ var waitQrcode = async (page) => {
 			const response = await fetch(originalImage);
 			imageBuffer = Buffer.from(await response.arrayBuffer());
 		}
-		const png = import_png.PNG.sync.read(imageBuffer);
-		const code = (0, import_jsQR.default)(Uint8ClampedArray.from(png.data), png.width, png.height);
-		if (code && code.data) {
-			logger.mark("二维码解码成功:", code.data);
+		const qrContent = QRCodeScanner.scanFromBuffer(imageBuffer);
+		if (qrContent) {
+			logger.mark("二维码解码成功:", qrContent);
 			return {
-				url: code.data,
+				url: qrContent,
 				originalImage
 			};
 		}