koishi-plugin-bilibili-notify 3.3.4-alpha.4 → 3.3.6-alpha.0

package/lib/index.js

@@ -35,7 +35,6 @@ const cron = __toESM(require("cron"));
 const luxon = __toESM(require("luxon"));
 const __node_rs_jieba = __toESM(require("@node-rs/jieba"));
 const __node_rs_jieba_dict = __toESM(require("@node-rs/jieba/dict"));
-const __satorijs_element_jsx_runtime = __toESM(require("@satorijs/element/jsx-runtime"));
 require("koishi-plugin-puppeteer");
 const node_path = __toESM(require("node:path"));
 const node_url = __toESM(require("node:url"));
@@ -341,7 +340,7 @@ const stopwords = new Set([
 var stop_words_default = stopwords;
 
 //#endregion
-//#region src/command_register.tsx
+//#region src/command_register.ts
 var ComRegister = class {
 	static inject = [
 		"bilibili-notify",
@@ -623,7 +622,7 @@ var ComRegister = class {
 				["田七", 25]
 			];
 			const summary = this.config.liveSummary.join("\n").replace("-dmc", "114").replace("-mdn", "特工").replace("-dca", "514").replace("-un1", `${top5DanmakuMaker[0][0]}`).replace("-dc1", `${top5DanmakuMaker[0][1]}`).replace("-un2", `${top5DanmakuMaker[1][0]}`).replace("-dc2", `${top5DanmakuMaker[1][1]}`).replace("-un3", `${top5DanmakuMaker[2][0]}`).replace("-dc3", `${top5DanmakuMaker[2][1]}`).replace("-un4", `${top5DanmakuMaker[3][0]}`).replace("-dc4", `${top5DanmakuMaker[3][1]}`).replace("-un5", `${top5DanmakuMaker[4][0]}`).replace("-dc5", `${top5DanmakuMaker[4][1]}`).replaceAll("\\n", "\n");
-			await session.send(/* @__PURE__ */ (0, __satorijs_element_jsx_runtime.jsxs)("message", { children: [img, summary] }));
+			await session.send((0, koishi.h)("message", [img, koishi.h.text(summary)]));
 		});
 		biliCom.subcommand(".cap").action(async ({ session }) => {
 			const { code: userInfoCode, data: userInfoData } = await withRetry(async () => {
@@ -733,12 +732,12 @@ var ComRegister = class {
 		}
 	}
 	initAllManager() {
-		this.subManager = new Map();
-		this.dynamicTimelineManager = new Map();
-		this.liveAPIManager = new Map();
-		this.liveWSManager = new Map();
-		this.liveMsgManager = new Map();
-		this.pushArrMap = new Map();
+		this.subManager = /* @__PURE__ */ new Map();
+		this.dynamicTimelineManager = /* @__PURE__ */ new Map();
+		this.liveAPIManager = /* @__PURE__ */ new Map();
+		this.liveWSManager = /* @__PURE__ */ new Map();
+		this.liveMsgManager = /* @__PURE__ */ new Map();
+		this.pushArrMap = /* @__PURE__ */ new Map();
 	}
 	configSubsToSubscription(sub) {
 		const subs = {};
@@ -807,7 +806,6 @@ var ComRegister = class {
 		await this.sendPrivateMsg("插件发生未知错误，请检查机器人状态后使用指令 bn start 启动插件");
 		this.logger.error("插件发生未知错误，请检查机器人状态后使用指令 bn start 启动插件");
 		await this.ctx["bilibili-notify"].disposePlugin();
-		return;
 	}
 	async sendMessageWithRetry(bot, channelId, content) {
 		withRetry(async () => await bot.sendMessage(channelId, content), 1).catch(async (e) => {
@@ -902,43 +900,35 @@ var ComRegister = class {
 		}
 	}
 	async broadcastToTargets(uid, content, type) {
-		this.logger.info(`本次推送对象：${uid}，推送类型：${PushTypeMsg[type]}`);
 		const record = this.pushArrMap.get(uid);
-		this.logger.info("本次推送目标：");
-		if (type === PushType.StartBroadcasting && record.liveAtAllArr?.length >= 1) {
-			this.logger.info(record.liveAtAllArr);
+		if (!record) return;
+		const hasTargets = type === PushType.StartBroadcasting && record.liveAtAllArr?.length > 0 || type === PushType.Dynamic && (record.dynamicArr?.length > 0 || record.dynamicAtAllArr?.length > 0) || (type === PushType.Live || type === PushType.StartBroadcasting) && record.liveArr?.length > 0 || type === PushType.LiveGuardBuy && record.liveGuardBuyArr?.length > 0 || type === PushType.WordCloudAndLiveSummary && (record.wordcloudArr?.length > 0 || record.liveSummaryArr?.length > 0);
+		if (!hasTargets) return;
+		this.logger.info(`本次推送对象：${uid}，推送类型：${PushTypeMsg[type]}`);
+		if (type === PushType.StartBroadcasting && record.liveAtAllArr?.length > 0) {
+			this.logger.info("推送 @全体：", record.liveAtAllArr);
 			const atAllArr = structuredClone(record.liveAtAllArr);
-			await withRetry(async () => {
-				return await this.pushMessage(atAllArr, /* @__PURE__ */ (0, __satorijs_element_jsx_runtime.jsx)("message", { children: /* @__PURE__ */ (0, __satorijs_element_jsx_runtime.jsx)("at", { type: "all" }) }));
-			}, 1);
+			await withRetry(() => this.pushMessage(atAllArr, koishi.h.at("all")), 1);
 		}
-		if (type === PushType.Dynamic && record.dynamicArr?.length >= 1) {
-			if (record.dynamicAtAllArr?.length >= 1) {
-				this.logger.info(record.dynamicAtAllArr);
+		if (type === PushType.Dynamic && record.dynamicArr?.length > 0) {
+			if (record.dynamicAtAllArr?.length > 0) {
+				this.logger.info("推送动态 @全体：", record.dynamicAtAllArr);
 				const dynamicAtAllArr = structuredClone(record.dynamicAtAllArr);
-				await withRetry(async () => {
-					return await this.pushMessage(dynamicAtAllArr, /* @__PURE__ */ (0, __satorijs_element_jsx_runtime.jsx)("message", { children: /* @__PURE__ */ (0, __satorijs_element_jsx_runtime.jsx)("at", { type: "all" }) }));
-				}, 1);
+				await withRetry(() => this.pushMessage(dynamicAtAllArr, koishi.h.at("all")), 1);
 			}
-			this.logger.info(record.dynamicArr);
+			this.logger.info("推送动态：", record.dynamicArr);
 			const dynamicArr = structuredClone(record.dynamicArr);
-			await withRetry(async () => {
-				return await this.pushMessage(dynamicArr, /* @__PURE__ */ (0, __satorijs_element_jsx_runtime.jsx)("message", { children: content }));
-			}, 1);
+			await withRetry(() => this.pushMessage(dynamicArr, (0, koishi.h)("message", content)), 1);
 		}
-		if ((type === PushType.Live || type === PushType.StartBroadcasting) && record.liveArr?.length >= 1) {
-			this.logger.info(record.liveArr);
+		if ((type === PushType.Live || type === PushType.StartBroadcasting) && record.liveArr?.length > 0) {
+			this.logger.info("推送直播：", record.liveArr);
 			const liveArr = structuredClone(record.liveArr);
-			await withRetry(async () => {
-				return await this.pushMessage(liveArr, /* @__PURE__ */ (0, __satorijs_element_jsx_runtime.jsx)("message", { children: content }));
-			}, 1);
+			await withRetry(() => this.pushMessage(liveArr, (0, koishi.h)("message", content)), 1);
 		}
-		if (type === PushType.LiveGuardBuy && record.liveGuardBuyArr?.length >= 1) {
-			this.logger.info(record.liveGuardBuyArr);
+		if (type === PushType.LiveGuardBuy && record.liveGuardBuyArr?.length > 0) {
+			this.logger.info("推送直播守护购买：", record.liveGuardBuyArr);
 			const liveGuardBuyArr = structuredClone(record.liveGuardBuyArr);
-			await withRetry(async () => {
-				return await this.pushMessage(liveGuardBuyArr, /* @__PURE__ */ (0, __satorijs_element_jsx_runtime.jsx)("message", { children: content }));
-			}, 1);
+			await withRetry(() => this.pushMessage(liveGuardBuyArr, (0, koishi.h)(koishi.h.Fragment, (0, koishi.h)(content))), 1);
 		}
 		if (type === PushType.WordCloudAndLiveSummary) {
 			const wordcloudArr = structuredClone(record.wordcloudArr);
@@ -947,25 +937,16 @@ var ComRegister = class {
 			const wordcloudOnlyArr = wordcloudArr.filter((item) => !liveSummaryArr.includes(item));
 			const liveSummaryOnlyArr = liveSummaryArr.filter((item) => !wordcloudArr.includes(item));
 			if (wordcloudAndLiveSummaryArr.length > 0) {
-				this.logger.info("词云和直播总结");
-				this.logger.info(wordcloudAndLiveSummaryArr);
-				await withRetry(async () => {
-					return await this.pushMessage(wordcloudAndLiveSummaryArr, /* @__PURE__ */ (0, __satorijs_element_jsx_runtime.jsxs)("message", { children: [content[0], content[1]] }));
-				}, 1);
+				this.logger.info("推送词云和直播总结：", wordcloudAndLiveSummaryArr);
+				await withRetry(() => this.pushMessage(wordcloudAndLiveSummaryArr, (0, koishi.h)("message", [content[0], content[1]])), 1);
 			}
 			if (wordcloudOnlyArr.length > 0) {
-				this.logger.info("词云");
-				this.logger.info(wordcloudOnlyArr);
-				await withRetry(async () => {
-					return await this.pushMessage(wordcloudOnlyArr, /* @__PURE__ */ (0, __satorijs_element_jsx_runtime.jsx)("message", { children: content[0] }));
-				}, 1);
+				this.logger.info("推送词云：", wordcloudOnlyArr);
+				await withRetry(() => this.pushMessage(wordcloudOnlyArr, (0, koishi.h)("message", [content[0]])), 1);
 			}
 			if (liveSummaryOnlyArr.length > 0) {
-				this.logger.info("直播总结");
-				this.logger.info(liveSummaryOnlyArr);
-				await withRetry(async () => {
-					return await this.pushMessage(liveSummaryOnlyArr, /* @__PURE__ */ (0, __satorijs_element_jsx_runtime.jsx)("message", { children: content[1] }));
-				}, 1);
+				this.logger.info("推送直播总结：", liveSummaryOnlyArr);
+				await withRetry(() => this.pushMessage(liveSummaryOnlyArr, (0, koishi.h)("message", [content[1]])), 1);
 			}
 		}
 	}
@@ -979,24 +960,21 @@ var ComRegister = class {
 			});
 			if (!content) return;
 			if (content.code !== 0) switch (content.code) {
-				case -101: {
+				case -101:
 					this.logger.error("账号未登录，插件已停止工作，请登录");
 					await this.sendPrivateMsg("账号未登录，插件已停止工作，请登录");
 					await this.ctx["bilibili-notify"].disposePlugin();
 					break;
-				}
-				case -352: {
+				case -352:
 					this.logger.error("账号被风控，插件已停止工作，请输入指令 bili cap 根据提示解除风控");
 					await this.sendPrivateMsg("账号被风控，插件已停止工作，请输入指令 bili cap 根据提示解除风控");
 					await this.ctx["bilibili-notify"].disposePlugin();
 					break;
-				}
-				default: {
+				default:
 					this.logger.error(`获取动态信息错误，错误码为：${content.code}，错误为：${content.message}，请排除错误后输入指令 bn start 重启插件`);
 					await this.sendPrivateMsg(`获取动态信息错误，错误码为：${content.code}，错误为：${content.message}，请排除错误后输入指令 bn start 重启插件`);
 					await this.ctx["bilibili-notify"].disposePlugin();
 					break;
-				}
 			}
 			const items = content.data.items;
 			for (const item of items) {
@@ -1013,15 +991,15 @@ var ComRegister = class {
 						}, 1).catch(async (e) => {
 							if (e.message === "直播开播动态，不做处理") return;
 							if (e.message === "出现关键词，屏蔽该动态") {
-								if (this.config.filter.notify) await this.broadcastToTargets(uid, /* @__PURE__ */ (0, __satorijs_element_jsx_runtime.jsxs)("message", { children: [name$2, "发布了一条含有屏蔽关键字的动态"] }), PushType.Dynamic);
+								if (this.config.filter.notify) await this.broadcastToTargets(uid, (0, koishi.h)("message", `${name$2}发布了一条含有屏蔽关键字的动态`), PushType.Dynamic);
 								return;
 							}
 							if (e.message === "已屏蔽转发动态") {
-								if (this.config.filter.notify) await this.broadcastToTargets(uid, /* @__PURE__ */ (0, __satorijs_element_jsx_runtime.jsxs)("message", { children: [name$2, "转发了一条动态，已屏蔽"] }), PushType.Dynamic);
+								if (this.config.filter.notify) await this.broadcastToTargets(uid, (0, koishi.h)("message", `${name$2}转发了一条动态，已屏蔽`), PushType.Dynamic);
 								return;
 							}
 							if (e.message === "已屏蔽专栏动态") {
-								if (this.config.filter.notify) await this.broadcastToTargets(uid, /* @__PURE__ */ (0, __satorijs_element_jsx_runtime.jsxs)("message", { children: [name$2, "投稿了一条专栏，已屏蔽"] }), PushType.Dynamic);
+								if (this.config.filter.notify) await this.broadcastToTargets(uid, (0, koishi.h)("message", `${name$2}投稿了一条专栏，已屏蔽`), PushType.Dynamic);
 								return;
 							}
 							this.logger.error(`dynamicDetect generateDynamicImg() 推送卡片发送失败，原因：${e.message}`);
@@ -1035,18 +1013,12 @@ var ComRegister = class {
 						} else dUrl = `${name$2}发布了新视频：https:${item.modules.module_dynamic.major.archive.jump_url}`;
 						else dUrl = `${name$2}发布了一条动态：https://t.bilibili.com/${item.id_str}`;
 						this.logger.info("推送动态中...");
-						await this.broadcastToTargets(uid, /* @__PURE__ */ (0, __satorijs_element_jsx_runtime.jsxs)("message", { children: [koishi.h.image(buffer, "image/jpeg"), dUrl] }), PushType.Dynamic);
+						await this.broadcastToTargets(uid, (0, koishi.h)("message", [koishi.h.image(buffer, "image/jpeg"), koishi.h.text(dUrl)]), PushType.Dynamic);
 						if (this.config.pushImgsInDynamic) {
 							if (item.type === "DYNAMIC_TYPE_DRAW") {
 								const pics = item.modules?.module_dynamic?.major?.opus?.pics;
 								if (pics) {
-									const picsMsg = /* @__PURE__ */ (0, __satorijs_element_jsx_runtime.jsx)("message", {
-										forward: true,
-										children: pics.map((pic) => /* @__PURE__ */ (0, __satorijs_element_jsx_runtime.jsx)("img", {
-											src: pic.url,
-											alt: "动态图片"
-										}, pic.url))
-									});
+									const picsMsg = (0, koishi.h)("message", { forward: true }, pics.map((pic) => koishi.h.img(pic.url)));
 									await this.broadcastToTargets(uid, picsMsg, PushType.Dynamic);
 								}
 							}
@@ -1074,24 +1046,21 @@ var ComRegister = class {
 			});
 			if (!content) return;
 			if (content.code !== 0) switch (content.code) {
-				case -101: {
+				case -101:
 					this.logger.error("账号未登录，插件已停止工作，请登录");
 					await this.sendPrivateMsg("账号未登录，插件已停止工作，请登录");
 					await this.ctx["bilibili-notify"].disposePlugin();
 					break;
-				}
-				case -352: {
+				case -352:
 					this.logger.error("账号被风控，插件已停止工作，请输入指令 bili cap 根据提示解除风控");
 					await this.sendPrivateMsg("账号被风控，插件已停止工作，请输入指令 bili cap 根据提示解除风控");
 					await this.ctx["bilibili-notify"].disposePlugin();
 					break;
-				}
-				default: {
+				default:
 					this.logger.error(`获取动态信息错误，错误码为：${content.code}，错误为：${content.message}，请排除错误后输入指令 bn start 重启插件`);
 					await this.sendPrivateMsg(`获取动态信息错误，错误码为：${content.code}，错误为：${content.message}，请排除错误后输入指令 bn start 重启插件`);
 					await this.ctx["bilibili-notify"].disposePlugin();
 					break;
-				}
 			}
 			this.logger.info("获取动态信息成功！开始处理动态信息...");
 			const items = content.data.items;
@@ -1114,15 +1083,15 @@ var ComRegister = class {
 						}, 1).catch(async (e) => {
 							if (e.message === "直播开播动态，不做处理") return;
 							if (e.message === "出现关键词，屏蔽该动态") {
-								if (this.config.filter.notify) await this.broadcastToTargets(uid, /* @__PURE__ */ (0, __satorijs_element_jsx_runtime.jsxs)("message", { children: [name$2, "发布了一条含有屏蔽关键字的动态"] }), PushType.Dynamic);
+								if (this.config.filter.notify) await this.broadcastToTargets(uid, (0, koishi.h)("message", `${name$2}发布了一条含有屏蔽关键字的动态`), PushType.Dynamic);
 								return;
 							}
 							if (e.message === "已屏蔽转发动态") {
-								if (this.config.filter.notify) await this.broadcastToTargets(uid, /* @__PURE__ */ (0, __satorijs_element_jsx_runtime.jsxs)("message", { children: [name$2, "转发了一条动态，已屏蔽"] }), PushType.Dynamic);
+								if (this.config.filter.notify) await this.broadcastToTargets(uid, (0, koishi.h)("message", `${name$2}转发了一条动态，已屏蔽`), PushType.Dynamic);
 								return;
 							}
 							if (e.message === "已屏蔽专栏动态") {
-								if (this.config.filter.notify) await this.broadcastToTargets(uid, /* @__PURE__ */ (0, __satorijs_element_jsx_runtime.jsxs)("message", { children: [name$2, "投稿了一条专栏，已屏蔽"] }), PushType.Dynamic);
+								if (this.config.filter.notify) await this.broadcastToTargets(uid, (0, koishi.h)("message", `${name$2}投稿了一条专栏，已屏蔽`), PushType.Dynamic);
 								return;
 							}
 							this.logger.error(`dynamicDetect generateDynamicImg() 推送卡片发送失败，原因：${e.message}`);
@@ -1141,19 +1110,13 @@ var ComRegister = class {
 							this.logger.info("动态链接生成成功！");
 						}
 						this.logger.info("推送动态中...");
-						await this.broadcastToTargets(uid, /* @__PURE__ */ (0, __satorijs_element_jsx_runtime.jsxs)("message", { children: [koishi.h.image(buffer, "image/jpeg"), dUrl] }), PushType.Dynamic);
+						await this.broadcastToTargets(uid, (0, koishi.h)("message", [koishi.h.image(buffer, "image/jpeg"), koishi.h.text(dUrl)]), PushType.Dynamic);
 						if (this.config.pushImgsInDynamic) {
 							this.logger.info("需要发送动态中的图片，开始发送...");
 							if (item.type === "DYNAMIC_TYPE_DRAW") {
 								const pics = item.modules?.module_dynamic?.major?.opus?.pics;
 								if (pics) {
-									const picsMsg = /* @__PURE__ */ (0, __satorijs_element_jsx_runtime.jsx)("message", {
-										forward: true,
-										children: pics.map((pic) => /* @__PURE__ */ (0, __satorijs_element_jsx_runtime.jsx)("img", {
-											src: pic.url,
-											alt: "动态图片"
-										}, pic.url))
-									});
+									const picsMsg = (0, koishi.h)("message", { forward: true }, pics.map((pic) => koishi.h.img(pic.url)));
 									await this.broadcastToTargets(uid, picsMsg, PushType.Dynamic);
 								}
 							}
@@ -1214,7 +1177,7 @@ var ComRegister = class {
 			this.logger.error(`liveDetect generateLiveImg() 推送卡片生成失败，原因：${e.message}`);
 		});
 		if (!buffer) return await this.sendPrivateMsgAndStopService();
-		const msg = /* @__PURE__ */ (0, __satorijs_element_jsx_runtime.jsxs)("message", { children: [koishi.h.image(buffer, "image/jpeg"), liveNotifyMsg || ""] });
+		const msg = (0, koishi.h)("message", [koishi.h.image(buffer, "image/jpeg"), koishi.h.text(liveNotifyMsg || "")]);
 		return await this.broadcastToTargets(uid, msg, liveType === LiveType.StartBroadcasting ? PushType.StartBroadcasting : PushType.Live);
 	}
 	async segmentDanmaku(danmaku, danmakuWeightRecord) {
@@ -1299,10 +1262,14 @@ var ComRegister = class {
 			});
 			return flag;
 		};
+		const LIVE_EVENT_COOLDOWN = 10 * 1e3;
+		let lastLiveStart = 0;
+		let lastLiveEnd = 0;
 		const handler = {
 			onError: async () => {
 				liveStatus = false;
 				pushAtTimeTimer?.();
+				pushAtTimeTimer = null;
 				this.ctx["bilibili-notify-live"].closeListener(sub.roomid);
 				await this.sendPrivateMsg(`[${sub.roomid}]直播间连接发生错误！`);
 				this.logger.error(`[${sub.roomid}]直播间连接发生错误！`);
@@ -1319,19 +1286,20 @@ var ComRegister = class {
 				watchedNum = body.text_small;
 			},
 			onGuardBuy: ({ body }) => {
-				const content = /* @__PURE__ */ (0, __satorijs_element_jsx_runtime.jsxs)("message", { children: [
-					"【",
-					masterInfo.username,
-					"的直播间】",
-					body.user.uname,
-					"加入了大航海（",
-					body.gift_name,
-					"）"
-				] });
+				const content = (0, koishi.h)("message", [koishi.h.text(`【${masterInfo.username}的直播间】${body.user.uname}加入了大航海（${body.gift_name}）`)]);
 				this.broadcastToTargets(sub.uid, content, PushType.LiveGuardBuy);
 			},
 			onLiveStart: async () => {
-				if (liveStatus) return;
+				const now = Date.now();
+				if (now - lastLiveStart < LIVE_EVENT_COOLDOWN) {
+					this.logger.warn(`[${sub.roomid}] 开播事件冷却期内被忽略`);
+					return;
+				}
+				lastLiveStart = now;
+				if (liveStatus) {
+					this.logger.warn(`[${sub.roomid}] 已是开播状态，忽略重复开播事件`);
+					return;
+				}
 				liveStatus = true;
 				if (!await useMasterAndLiveRoomInfo(LiveType.StartBroadcasting)) {
 					liveStatus = false;
@@ -1352,6 +1320,16 @@ var ComRegister = class {
 				}
 			},
 			onLiveEnd: async () => {
+				const now = Date.now();
+				if (now - lastLiveEnd < LIVE_EVENT_COOLDOWN) {
+					this.logger.warn(`[${sub.roomid}] 下播事件冷却期内被忽略`);
+					return;
+				}
+				lastLiveEnd = now;
+				if (!liveStatus) {
+					this.logger.warn(`[${sub.roomid}] 已是下播状态，忽略重复下播事件`);
+					return;
+				}
 				liveStatus = false;
 				if (!await useMasterAndLiveRoomInfo(LiveType.StopBroadcast)) {
 					await this.sendPrivateMsg("获取直播间信息失败，推送直播下播卡片失败！");
@@ -1360,8 +1338,8 @@ var ComRegister = class {
 				liveRoomInfo.live_time = liveTime;
 				const followerChange = (() => {
 					const liveFollowerChangeNum = masterInfo.liveFollowerChange;
-					if (liveFollowerChangeNum > 0) return liveFollowerChangeNum >= 1e4 ? `+${liveFollowerChangeNum.toFixed(1)}万` : `+${liveFollowerChangeNum}`;
-					return liveFollowerChangeNum <= -1e4 ? `${liveFollowerChangeNum.toFixed(1)}万` : liveFollowerChangeNum.toString();
+					if (liveFollowerChangeNum > 0) return liveFollowerChangeNum >= 1e4 ? `+${(liveFollowerChangeNum / 1e4).toFixed(1)}万` : `+${liveFollowerChangeNum}`;
+					return liveFollowerChangeNum <= -1e4 ? `${(liveFollowerChangeNum / 1e4).toFixed(1)}万` : liveFollowerChangeNum.toString();
 				})();
 				const liveEndMsg = liveMsgObj.customLiveEnd.replace("-name", masterInfo.username).replace("-time", await this.ctx["bilibili-notify-generate-img"].getTimeDifference(liveTime)).replace("-follower_change", followerChange).replaceAll("\\n", "\n");
 				await this.sendLiveNotifyCard(LiveType.StopBroadcast, followerChange, {
@@ -1369,8 +1347,11 @@ var ComRegister = class {
 					masterInfo,
 					cardStyle: sub.customCardStyle
 				}, sub.uid, liveEndMsg);
-				pushAtTimeTimer();
-				pushAtTimeTimer = null;
+				if (pushAtTimeTimer) {
+					pushAtTimeTimer();
+					pushAtTimeTimer = null;
+					this.liveWSManager.delete(sub.roomid);
+				}
 				await sendDanmakuWordCloudAndLiveSummary(liveMsgObj.liveSummary);
 			}
 		};
@@ -1452,7 +1433,7 @@ var ComRegister = class {
 				if (!sub) return;
 				switch (item.live_status) {
 					case 0:
-					case 2: {
+					case 2:
 						if (LiveAPIStatus.live === true) {
 							if (!await useMasterAndLiveRoomInfo(LiveType.StopBroadcast, LiveAPIStatus)) {
 								await this.sendPrivateMsg("获取直播间信息失败，推送直播下播卡片失败！");
@@ -1476,8 +1457,7 @@ var ComRegister = class {
 							LiveAPIStatus.live = false;
 						}
 						break;
-					}
-					case 1: {
+					case 1:
 						if (LiveAPIStatus.live === false) {
 							if (!await useMasterAndLiveRoomInfo(LiveType.StopBroadcast, LiveAPIStatus)) {
 								await this.sendPrivateMsg("获取直播间信息失败，推送直播开播卡片失败！");
@@ -1516,7 +1496,6 @@ var ComRegister = class {
 							LiveAPIStatus.push = 0;
 						}
 						break;
-					}
 					default: break;
 				}
 			}
@@ -1536,7 +1515,7 @@ var ComRegister = class {
 		else {
 			const subTableArray = subInfo.split("\n");
 			subTableArray.splice(subTableArray.length - 1, 1);
-			table = /* @__PURE__ */ (0, __satorijs_element_jsx_runtime.jsxs)(__satorijs_element_jsx_runtime.Fragment, { children: [/* @__PURE__ */ (0, __satorijs_element_jsx_runtime.jsx)("p", { children: "当前订阅对象：" }), /* @__PURE__ */ (0, __satorijs_element_jsx_runtime.jsx)("ul", { children: subTableArray.map((str) => /* @__PURE__ */ (0, __satorijs_element_jsx_runtime.jsx)("li", { children: str })) })] });
+			table = (0, koishi.h)(koishi.h.Fragment, [(0, koishi.h)("p", "当前订阅对象："), (0, koishi.h)("ul", subTableArray.map((str) => (0, koishi.h)("li", str)))]);
 		}
 		this.subNotifier = this.ctx.notifier.create(table);
 	}
@@ -1775,7 +1754,7 @@ var ComRegister = class {
 	}
 };
 (function(_ComRegister) {
-	const Config$1 = _ComRegister.Config = koishi.Schema.object({
+	_ComRegister.Config = koishi.Schema.object({
 		advancedSub: koishi.Schema.boolean(),
 		subs: koishi.Schema.array(koishi.Schema.object({
 			name: koishi.Schema.string().required().description("备注"),
@@ -2118,7 +2097,7 @@ var GenerateImg = class extends koishi.Service {
 			switch (dynamic.type) {
 				case DYNAMIC_TYPE_WORD:
 				case DYNAMIC_TYPE_DRAW:
-				case DYNAMIC_TYPE_FORWARD: {
+				case DYNAMIC_TYPE_FORWARD:
 					basicDynamic();
 					if (dynamic.type === DYNAMIC_TYPE_FORWARD) {
 						if (this.giConfig.filter.enable && this.giConfig.filter.forward) throw new Error("已屏蔽转发动态");
@@ -2219,7 +2198,6 @@ var GenerateImg = class extends koishi.Service {
 						}
 					}
 					break;
-				}
 				case DYNAMIC_TYPE_AV: {
 					basicDynamic();
 					const archive = dynamic.modules.module_dynamic.major.archive;
@@ -2287,10 +2265,9 @@ var GenerateImg = class extends koishi.Service {
 				case DYNAMIC_TYPE_LIVE: return [`${upName}发起了直播预约，我暂时无法渲染，请自行查看`];
 				case DYNAMIC_TYPE_MEDIALIST: return [`${upName}分享了收藏夹，我暂时无法渲染，请自行查看`];
 				case DYNAMIC_TYPE_PGC: return [`${upName}发布了剧集（番剧、电影、纪录片），我暂时无法渲染，请自行查看`];
-				case DYNAMIC_TYPE_ARTICLE: {
+				case DYNAMIC_TYPE_ARTICLE:
 					if (this.giConfig.filter.enable && this.giConfig.filter.article) throw new Error("已屏蔽专栏动态");
 					return [`${upName}投稿了新专栏，我暂时无法渲染，请自行查看`];
-				}
 				case DYNAMIC_TYPE_MUSIC: return [`${upName}发行了新歌，我暂时无法渲染，请自行查看`];
 				case DYNAMIC_TYPE_COMMON_SQUARE: return [`${upName}发布了装扮｜剧集｜点评｜普通分享，我暂时无法渲染，请自行查看`];
 				case DYNAMIC_TYPE_COURSES_SEASON: return [`${upName}发布了新课程，我暂时无法渲染，请自行查看`];
@@ -3201,8 +3178,8 @@ var GenerateImg = class extends koishi.Service {
                 </div>
             </div>
 
-            <script src="${wordcloudJS}"></script>
-            <script src="${renderFunc}"></script>
+            <script src="${wordcloudJS}"><\/script>
+            <script src="${renderFunc}"><\/script>
             <script>
                 const canvas = document.getElementById('wordCloudCanvas');
                 const ctx = canvas.getContext('2d');
@@ -3226,7 +3203,7 @@ var GenerateImg = class extends koishi.Service {
                     densityTarget: 0.3,
                     weightExponent: 0.4
                 });
-            </script>
+            <\/script>
         </body>
 
         </html>
@@ -3240,30 +3217,26 @@ var GenerateImg = class extends koishi.Service {
 		let liveTime;
 		let cover;
 		switch (liveStatus) {
-			case 0: {
+			case 0:
 				titleStatus = "未直播";
 				liveTime = "未开播";
 				cover = true;
 				break;
-			}
-			case 1: {
+			case 1:
 				titleStatus = "开播啦";
 				liveTime = `开播时间：${time}`;
 				cover = true;
 				break;
-			}
-			case 2: {
+			case 2:
 				titleStatus = "正在直播";
 				liveTime = `直播时长：${await this.getTimeDifference(time)}`;
 				cover = false;
 				break;
-			}
-			case 3: {
+			case 3:
 				titleStatus = "下播啦";
 				liveTime = `开播时间：${time}`;
 				cover = true;
 				break;
-			}
 		}
 		return [
 			titleStatus,
@@ -3294,7 +3267,7 @@ var GenerateImg = class extends koishi.Service {
 		return parts.length > 0 ? `${sign}${parts.join("")}` : "0秒";
 	}
 	unixTimestampToString(timestamp) {
-		const date = new Date(timestamp * 1e3);
+		const date = /* @__PURE__ */ new Date(timestamp * 1e3);
 		const year = date.getFullYear();
 		const month = `0${date.getMonth() + 1}`.slice(-2);
 		const day = `0${date.getDate()}`.slice(-2);
@@ -3305,7 +3278,7 @@ var GenerateImg = class extends koishi.Service {
 	}
 };
 (function(_GenerateImg) {
-	const Config$1 = _GenerateImg.Config = koishi.Schema.object({
+	_GenerateImg.Config = koishi.Schema.object({
 		filter: koishi.Schema.object({
 			enable: koishi.Schema.boolean(),
 			notify: koishi.Schema.boolean(),
@@ -4032,15 +4005,13 @@ var BiliAPI = class extends koishi.Service {
 		}, { headers: { "Content-Type": "application/x-www-form-urlencoded" } });
 		switch (refreshData.code) {
 			case -101: return await this.createNewClient();
-			case -111: {
+			case -111:
 				await this.ctx.database.remove("loginBili", [1]);
 				notifyAndError("csrf 校验错误，请重新登录");
 				break;
-			}
-			case 86095: {
+			case 86095:
 				await this.ctx.database.remove("loginBili", [1]);
 				notifyAndError("refresh_csrf 错误或 refresh_token 与 cookie 不匹配，请重新登录");
-			}
 		}
 		const encryptedCookies = this.encrypt(this.getCookies());
 		const encryptedRefreshToken = this.encrypt(refreshData.data.refresh_token);
@@ -4057,11 +4028,10 @@ var BiliAPI = class extends koishi.Service {
 			refresh_token: refreshToken
 		}, { headers: { "Content-Type": "application/x-www-form-urlencoded" } });
 		switch (aceeptData.code) {
-			case -111: {
+			case -111:
 				await this.ctx.database.remove("loginBili", [1]);
 				notifyAndError("csrf 校验失败，请重新登录");
 				break;
-			}
 			case -400: throw new Error("请求错误");
 		}
 	}
@@ -4094,7 +4064,7 @@ var BiliAPI = class extends koishi.Service {
 	}
 };
 (function(_BiliAPI) {
-	const Config$1 = _BiliAPI.Config = koishi.Schema.object({
+	_BiliAPI.Config = koishi.Schema.object({
 		userAgent: koishi.Schema.string(),
 		key: koishi.Schema.string().pattern(/^[0-9a-f]{32}$/).required()
 	});