koishi-plugin-bilibili-notify 3.3.1-alpha.1 → 3.3.1-rc.1

package/lib/index.js

@@ -64,7 +64,7 @@ const BAConfigSchema = koishi.Schema.object({
 			"satori",
 			"chronocat",
 			"lark"
-		]).description("请选择您的私人机器人平台，目前支持QQ、QQ群、OneBot、Discord、RedBot、Telegram、Satori、ChronoCat、Lark。从2.0版本开始，只能在一个平台下使用本插件"),
+		]).description("请选择您的私人机器人平台"),
 		masterAccount: koishi.Schema.string().role("secret").required().description("主人账号，在Q群使用可直接使用QQ号，若在其他平台使用，请使用inspect插件获取自身ID"),
 		masterAccountGuildId: koishi.Schema.string().role("secret").description("主人账号所在的群组ID，只有在QQ频道、Discord这样的环境才需要填写，请使用inspect插件获取群组ID")
 	}), koishi.Schema.object({})])]),
@@ -364,17 +364,19 @@ var ComRegister = class {
 	rebootCount = 0;
 	subNotifier;
 	ctx;
-	subManager = [];
-	dynamicTimelineManager = new Map();
-	liveStatusManager = new Map();
-	liveMsgManager = new Map();
-	pushArrMap = new Map();
+	subManager;
+	dynamicTimelineManager;
+	liveAPIManager;
+	liveWSManager;
+	liveMsgManager;
+	pushArrMap;
 	loginDBData;
 	privateBot;
 	dynamicJob;
-	liveJob;
+	liveAPIJob;
 	_jieba = __node_rs_jieba.Jieba.withDict(__node_rs_jieba_dict.dict);
 	stopwords;
+	reciveSubTimes = 0;
 	constructor(ctx, config) {
 		this.ctx = ctx;
 		this.init(config);
@@ -409,7 +411,7 @@ var ComRegister = class {
 			} catch (_) {
 				return "bili login getLoginQRCode() 本次网络请求失败";
 			}
-			if (content.code !== 0) return await session.send("出问题咯，请联系管理员解决");
+			if (content.code !== 0) return await session.send("出问题咯！");
 			qrcode.default.toBuffer(content.data.url, {
 				errorCorrectionLevel: "H",
 				type: "png",
@@ -474,16 +476,16 @@ var ComRegister = class {
 		biliCom.subcommand(".ll").usage("展示当前正在直播的订阅对象").example("bili ll").action(async () => {
 			const { data: { live_users } } = await ctx["bilibili-notify-api"].getTheUserWhoIsLiveStreaming();
 			const subLiveUsers = [];
-			for (const sub of this.subManager) {
+			for (const [uid, sub] of this.subManager) {
 				let onLive = false;
 				if (live_users.items) {
-					for (const user of live_users.items) if (user.mid.toString() === sub.uid && sub.live) {
+					for (const user of live_users.items) if (user.mid.toString() === uid && sub.live) {
 						onLive = true;
 						break;
 					}
 				}
 				subLiveUsers.push({
-					uid: Number.parseInt(sub.uid),
+					uid: Number.parseInt(uid),
 					uname: sub.uname,
 					onLive
 				});
@@ -612,7 +614,7 @@ var ComRegister = class {
 				["初中", 4],
 				["毕业", 4]
 			];
-			await session.send(/* @__PURE__ */ (0, __satorijs_element_jsx_runtime.jsx)("message", { children: koishi.h.image(await this.ctx["bilibili-notify-generate-img"].generateWordCloudImg(words, "词云测试"), "image/jpg") }));
+			const img = koishi.h.image(await this.ctx["bilibili-notify-generate-img"].generateWordCloudImg(words, "词云测试"), "image/jpg");
 			const top5DanmakuMaker = [
 				["张三", 60],
 				["李四", 48],
@@ -620,8 +622,8 @@ var ComRegister = class {
 				["赵六", 27],
 				["田七", 25]
 			];
-			const danmakerRankMsg = 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(danmakerRankMsg);
+			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] }));
 		});
 		biliCom.subcommand(".cap").action(async ({ session }) => {
 			const { code: userInfoCode, data: userInfoData } = await withRetry(async () => {
@@ -643,7 +645,9 @@ var ComRegister = class {
 			const seccode = `${validate}|jordan`;
 			const { data: validateCaptchaData } = await ctx["bilibili-notify-api"].validateCaptcha(data.geetest.challenge, data.token, validate, seccode);
 			if (validateCaptchaData?.is_valid !== 1) return "验证不成功！";
-			await ctx["bilibili-notify-api"].getUserInfo("114514", validateCaptchaData.grisk_id);
+			await this.ctx.sleep(10 * 1e3);
+			const { code: validCode, data: validData } = await ctx["bilibili-notify-api"].getUserInfo("114514", validateCaptchaData.grisk_id);
+			if (validCode === -352 && validData.v_voucher) return "验证不成功！";
 			await session.send("验证成功！请重启插件");
 		});
 	}
@@ -660,25 +664,34 @@ var ComRegister = class {
 			return;
 		}
 		this.mergeStopWords(config.wordcloudStopWords);
-		if (config.advancedSub) {
-			this.ctx.on("bilibili-notify/advanced-sub", async (subs) => {
-				await this.initAsyncPart(subs);
-			});
-			this.ctx.emit("bilibili-notify/ready-to-recive");
-		} else if (config.subs && config.subs.length > 0) {
+		this.registeringForEvents();
+		if (config.advancedSub) this.ctx.emit("bilibili-notify/ready-to-recive");
+		else if (config.subs && config.subs.length > 0) {
 			const subs = this.configSubsToSubscription(config.subs);
 			await this.initAsyncPart(subs);
 		}
+	}
+	registeringForEvents() {
 		this.ctx.on("dispose", () => {
 			if (this.loginTimer) this.loginTimer();
 			if (this.dynamicJob) this.dynamicJob.stop();
-			if (this.liveJob) this.liveJob.stop();
+			if (this.liveAPIJob) this.liveAPIJob.stop();
+			for (const [roomId, timer] of this.liveWSManager) {
+				this.ctx["bilibili-notify-live"].closeListener(roomId);
+				if (timer) timer();
+			}
+		});
+		this.ctx.on("bilibili-notify/advanced-sub", async (subs) => {
+			if (this.reciveSubTimes >= 1) await this.ctx["bilibili-notify"].restartPlugin();
+			else await this.initAsyncPart(subs);
+			this.reciveSubTimes++;
 		});
 	}
 	async initAsyncPart(subs) {
-		const { code, msg } = await this.loadSubFromConfig(subs);
+		this.initAllManager();
+		const { code, message } = await this.loadSubFromConfig(subs);
 		if (code !== 0) {
-			this.logger.error(msg);
+			this.logger.error(message);
 			this.logger.error("订阅对象加载失败，插件初始化失败！");
 			await this.sendPrivateMsg("订阅对象加载失败，插件初始化失败！");
 			return;
@@ -698,9 +711,9 @@ var ComRegister = class {
 		this.stopwords = new Set([...stop_words_default, ...additionalStopWords]);
 	}
 	initManager() {
-		for (const sub of this.subManager) {
-			if (sub.dynamic) this.dynamicTimelineManager.set(sub.uid, Math.floor(luxon.DateTime.now().toSeconds()));
-			if (sub.live) this.liveStatusManager.set(sub.uid, {
+		for (const [uid, sub] of this.subManager) {
+			if (sub.dynamic) this.dynamicTimelineManager.set(uid, Math.floor(luxon.DateTime.now().toSeconds()));
+			if (sub.live) this.liveAPIManager.set(uid, {
 				roomId: sub.roomId,
 				live: false,
 				liveRoomInfo: void 0,
@@ -712,6 +725,14 @@ 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();
+	}
 	configSubsToSubscription(sub) {
 		const subs = {};
 		sub.forEach((s) => {
@@ -927,25 +948,21 @@ var ComRegister = class {
 			if (!content) return;
 			if (content.code !== 0) switch (content.code) {
 				case -101: {
-					this.logger.error("账号未登录，插件已停止工作，请登录后，输入指令 bn start 启动插件");
-					await this.sendPrivateMsg("账号未登录，插件已停止工作，请登录后，输入指令 bn start 启动插件");
+					this.logger.error("账号未登录，插件已停止工作，请登录");
+					await this.sendPrivateMsg("账号未登录，插件已停止工作，请登录");
 					await this.ctx["bilibili-notify"].disposePlugin();
 					break;
 				}
 				case -352: {
-					this.logger.error("账号被风控，插件已停止工作，请确认风控解除后，输入指令 bn start 启动插件");
-					await this.sendPrivateMsg("账号被风控，插件已停止工作，请确认风控解除后，输入指令 bn start 启动插件");
+					this.logger.error("账号被风控，插件已停止工作，请输入指令 bili cap 根据提示解除风控");
+					await this.sendPrivateMsg("账号被风控，插件已停止工作，请输入指令 bili cap 根据提示解除风控");
 					await this.ctx["bilibili-notify"].disposePlugin();
 					break;
 				}
-				case 4101128:
-				case 4101129: {
-					this.logger.error(`获取动态信息错误，错误码为：${content.code}，错误为：${content.message}`);
-					await this.sendPrivateMsg(`获取动态信息错误，错误码为：${content.code}，错误为：${content.message}`);
-					break;
-				}
 				default: {
-					await this.sendPrivateMsg(`获取动态信息错误，错误码为：${content.code}，错误为：${content.message}`);
+					this.logger.error(`获取动态信息错误，错误码为：${content.code}，错误为：${content.message}，请排除错误后输入指令 bn restart 重启插件`);
+					await this.sendPrivateMsg(`获取动态信息错误，错误码为：${content.code}，错误为：${content.message}，请排除错误后输入指令 bn restart 重启插件`);
+					await this.ctx["bilibili-notify"].disposePlugin();
 					break;
 				}
 			}
@@ -958,21 +975,21 @@ var ComRegister = class {
 				if (this.dynamicTimelineManager.has(uid)) {
 					const timeline = this.dynamicTimelineManager.get(uid);
 					if (timeline < postTime) {
-						const sub = this.subManager.find((sub$1) => sub$1.uid === uid);
+						const sub = this.subManager.get(uid);
 						const buffer = await withRetry(async () => {
 							return await this.ctx["bilibili-notify-generate-img"].generateDynamicImg(item, sub.customCardStyle.enable ? sub.customCardStyle : void 0);
 						}, 1).catch(async (e) => {
 							if (e.message === "直播开播动态，不做处理") return;
 							if (e.message === "出现关键词，屏蔽该动态") {
-								if (this.config.filter.notify) await this.broadcastToTargets(sub.uid, /* @__PURE__ */ (0, __satorijs_element_jsx_runtime.jsxs)("message", { children: [name$2, "发布了一条含有屏蔽关键字的动态"] }), PushType.Dynamic);
+								if (this.config.filter.notify) await this.broadcastToTargets(uid, /* @__PURE__ */ (0, __satorijs_element_jsx_runtime.jsxs)("message", { children: [name$2, "发布了一条含有屏蔽关键字的动态"] }), PushType.Dynamic);
 								return;
 							}
 							if (e.message === "已屏蔽转发动态") {
-								if (this.config.filter.notify) await this.broadcastToTargets(sub.uid, /* @__PURE__ */ (0, __satorijs_element_jsx_runtime.jsxs)("message", { children: [name$2, "转发了一条动态，已屏蔽"] }), PushType.Dynamic);
+								if (this.config.filter.notify) await this.broadcastToTargets(uid, /* @__PURE__ */ (0, __satorijs_element_jsx_runtime.jsxs)("message", { children: [name$2, "转发了一条动态，已屏蔽"] }), PushType.Dynamic);
 								return;
 							}
 							if (e.message === "已屏蔽专栏动态") {
-								if (this.config.filter.notify) await this.broadcastToTargets(sub.uid, /* @__PURE__ */ (0, __satorijs_element_jsx_runtime.jsxs)("message", { children: [name$2, "投稿了一条专栏，已屏蔽"] }), PushType.Dynamic);
+								if (this.config.filter.notify) await this.broadcastToTargets(uid, /* @__PURE__ */ (0, __satorijs_element_jsx_runtime.jsxs)("message", { children: [name$2, "投稿了一条专栏，已屏蔽"] }), PushType.Dynamic);
 								return;
 							}
 							this.logger.error(`dynamicDetect generateDynamicImg() 推送卡片发送失败，原因：${e.message}`);
@@ -986,7 +1003,7 @@ 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(sub.uid, /* @__PURE__ */ (0, __satorijs_element_jsx_runtime.jsxs)("message", { children: [koishi.h.image(buffer, "image/jpeg"), dUrl] }), PushType.Dynamic);
+						await this.broadcastToTargets(uid, /* @__PURE__ */ (0, __satorijs_element_jsx_runtime.jsxs)("message", { children: [koishi.h.image(buffer, "image/jpeg"), dUrl] }), PushType.Dynamic);
 						if (this.config.pushImgsInDynamic) {
 							if (item.type === "DYNAMIC_TYPE_DRAW") {
 								const pics = item.modules?.module_dynamic?.major?.opus?.pics;
@@ -998,7 +1015,7 @@ var ComRegister = class {
 											alt: "动态图片"
 										}, pic.url))
 									});
-									await this.broadcastToTargets(sub.uid, picsMsg, PushType.Dynamic);
+									await this.broadcastToTargets(uid, picsMsg, PushType.Dynamic);
 								}
 							}
 						}
@@ -1026,25 +1043,21 @@ var ComRegister = class {
 			if (!content) return;
 			if (content.code !== 0) switch (content.code) {
 				case -101: {
-					this.logger.error("账号未登录，插件已停止工作，请登录后，输入指令 bn start 启动插件");
-					await this.sendPrivateMsg("账号未登录，插件已停止工作，请登录后，输入指令 bn start 启动插件");
+					this.logger.error("账号未登录，插件已停止工作，请登录");
+					await this.sendPrivateMsg("账号未登录，插件已停止工作，请登录");
 					await this.ctx["bilibili-notify"].disposePlugin();
 					break;
 				}
 				case -352: {
-					this.logger.error("账号被风控，插件已停止工作，请确认风控解除后，输入指令 bn start 启动插件");
-					await this.sendPrivateMsg("账号被风控，插件已停止工作，请确认风控解除后，输入指令 bn start 启动插件");
+					this.logger.error("账号被风控，插件已停止工作，请输入指令 bili cap 根据提示解除风控");
+					await this.sendPrivateMsg("账号被风控，插件已停止工作，请输入指令 bili cap 根据提示解除风控");
 					await this.ctx["bilibili-notify"].disposePlugin();
 					break;
 				}
-				case 4101128:
-				case 4101129: {
-					this.logger.error(`获取动态信息错误，错误码为：${content.code}，错误为：${content.message}`);
-					await this.sendPrivateMsg(`获取动态信息错误，错误码为：${content.code}，错误为：${content.message}`);
-					break;
-				}
 				default: {
-					await this.sendPrivateMsg(`获取动态信息错误，错误码为：${content.code}，错误为：${content.message}`);
+					this.logger.error(`获取动态信息错误，错误码为：${content.code}，错误为：${content.message}，请排除错误后输入指令 bn restart 重启插件`);
+					await this.sendPrivateMsg(`获取动态信息错误，错误码为：${content.code}，错误为：${content.message}，请排除错误后输入指令 bn restart 重启插件`);
+					await this.ctx["bilibili-notify"].disposePlugin();
 					break;
 				}
 			}
@@ -1062,22 +1075,22 @@ var ComRegister = class {
 					this.logger.info(`上次推送时间线：${luxon.DateTime.fromSeconds(timeline).toFormat("yyyy-MM-dd HH:mm:ss")}`);
 					if (timeline < postTime) {
 						this.logger.info("需要推送该条动态，开始推送...");
-						const sub = this.subManager.find((sub$1) => sub$1.uid === uid);
+						const sub = this.subManager.get(uid);
 						this.logger.info("开始渲染推送卡片...");
 						const buffer = await withRetry(async () => {
 							return await this.ctx["bilibili-notify-generate-img"].generateDynamicImg(item, sub.customCardStyle.enable ? sub.customCardStyle : void 0);
 						}, 1).catch(async (e) => {
 							if (e.message === "直播开播动态，不做处理") return;
 							if (e.message === "出现关键词，屏蔽该动态") {
-								if (this.config.filter.notify) await this.broadcastToTargets(sub.uid, /* @__PURE__ */ (0, __satorijs_element_jsx_runtime.jsxs)("message", { children: [name$2, "发布了一条含有屏蔽关键字的动态"] }), PushType.Dynamic);
+								if (this.config.filter.notify) await this.broadcastToTargets(uid, /* @__PURE__ */ (0, __satorijs_element_jsx_runtime.jsxs)("message", { children: [name$2, "发布了一条含有屏蔽关键字的动态"] }), PushType.Dynamic);
 								return;
 							}
 							if (e.message === "已屏蔽转发动态") {
-								if (this.config.filter.notify) await this.broadcastToTargets(sub.uid, /* @__PURE__ */ (0, __satorijs_element_jsx_runtime.jsxs)("message", { children: [name$2, "转发了一条动态，已屏蔽"] }), PushType.Dynamic);
+								if (this.config.filter.notify) await this.broadcastToTargets(uid, /* @__PURE__ */ (0, __satorijs_element_jsx_runtime.jsxs)("message", { children: [name$2, "转发了一条动态，已屏蔽"] }), PushType.Dynamic);
 								return;
 							}
 							if (e.message === "已屏蔽专栏动态") {
-								if (this.config.filter.notify) await this.broadcastToTargets(sub.uid, /* @__PURE__ */ (0, __satorijs_element_jsx_runtime.jsxs)("message", { children: [name$2, "投稿了一条专栏，已屏蔽"] }), PushType.Dynamic);
+								if (this.config.filter.notify) await this.broadcastToTargets(uid, /* @__PURE__ */ (0, __satorijs_element_jsx_runtime.jsxs)("message", { children: [name$2, "投稿了一条专栏，已屏蔽"] }), PushType.Dynamic);
 								return;
 							}
 							this.logger.error(`dynamicDetect generateDynamicImg() 推送卡片发送失败，原因：${e.message}`);
@@ -1096,7 +1109,7 @@ var ComRegister = class {
 							this.logger.info("动态链接生成成功！");
 						}
 						this.logger.info("推送动态中...");
-						await this.broadcastToTargets(sub.uid, /* @__PURE__ */ (0, __satorijs_element_jsx_runtime.jsxs)("message", { children: [koishi.h.image(buffer, "image/jpeg"), dUrl] }), PushType.Dynamic);
+						await this.broadcastToTargets(uid, /* @__PURE__ */ (0, __satorijs_element_jsx_runtime.jsxs)("message", { children: [koishi.h.image(buffer, "image/jpeg"), dUrl] }), PushType.Dynamic);
 						if (this.config.pushImgsInDynamic) {
 							this.logger.info("需要发送动态中的图片，开始发送...");
 							if (item.type === "DYNAMIC_TYPE_DRAW") {
@@ -1109,7 +1122,7 @@ var ComRegister = class {
 											alt: "动态图片"
 										}, pic.url))
 									});
-									await this.broadcastToTargets(sub.uid, picsMsg, PushType.Dynamic);
+									await this.broadcastToTargets(uid, picsMsg, PushType.Dynamic);
 								}
 							}
 							this.logger.info("动态中的图片发送完毕！");
@@ -1198,13 +1211,12 @@ var ComRegister = class {
 			this.logger.info(top90Words);
 			this.logger.info("正在准备生成弹幕词云");
 			const buffer = await this.ctx["bilibili-notify-generate-img"].generateWordCloudImg(top90Words, masterInfo.username);
-			const img = /* @__PURE__ */ (0, __satorijs_element_jsx_runtime.jsx)("message", { children: koishi.h.image(buffer, "image/jpeg") });
+			const img = koishi.h.image(buffer, "image/jpeg");
 			this.logger.info("开始构建弹幕发送排行榜消息");
 			const danmakuMakerCount = Object.keys(danmakuMakerRecord).length;
 			const danmakuCount = Object.values(danmakuMakerRecord).reduce((sum, val) => sum + val, 0);
 			const top5DanmakuMaker = Object.entries(danmakuMakerRecord).sort((a, b) => b[1] - a[1]).slice(0, 5);
-			const danmakuMakerMsg = customLiveSummary.replace("-dmc", `${danmakuMakerCount}`).replace("-mdn", `${masterInfo.medalName}`).replace("-dca", `${danmakuCount}`).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");
-			const summary = /* @__PURE__ */ (0, __satorijs_element_jsx_runtime.jsx)("message", { children: danmakuMakerMsg });
+			const summary = customLiveSummary.replace("-dmc", `${danmakuMakerCount}`).replace("-mdn", `${masterInfo.medalName}`).replace("-dca", `${danmakuCount}`).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 this.broadcastToTargets(sub.uid, [img, summary], PushType.WordCloudAndLiveSummary);
 			Object.keys(danmakuWeightRecord).forEach((key) => delete danmakuWeightRecord[key]);
 			Object.keys(danmakuMakerRecord).forEach((key) => delete danmakuMakerRecord[key]);
@@ -1292,7 +1304,10 @@ var ComRegister = class {
 					masterInfo,
 					cardStyle: sub.customCardStyle
 				}, sub.uid, liveStartMsg);
-				if (this.config.pushTime !== 0 && !pushAtTimeTimer) pushAtTimeTimer = this.ctx.setInterval(pushAtTimeFunc, this.config.pushTime * 1e3 * 60 * 60);
+				if (this.config.pushTime !== 0 && !pushAtTimeTimer) {
+					pushAtTimeTimer = this.ctx.setInterval(pushAtTimeFunc, this.config.pushTime * 1e3 * 60 * 60);
+					this.liveWSManager.set(roomId, pushAtTimeTimer);
+				}
 			},
 			onLiveEnd: async () => {
 				liveStatus = false;
@@ -1328,29 +1343,32 @@ var ComRegister = class {
 				masterInfo,
 				cardStyle: sub.customCardStyle
 			}, sub.uid, liveMsg);
-			if (this.config.pushTime !== 0 && !pushAtTimeTimer) pushAtTimeTimer = this.ctx.setInterval(pushAtTimeFunc, this.config.pushTime * 1e3 * 60 * 60);
+			if (this.config.pushTime !== 0 && !pushAtTimeTimer) {
+				pushAtTimeTimer = this.ctx.setInterval(pushAtTimeFunc, this.config.pushTime * 1e3 * 60 * 60);
+				this.liveWSManager.set(roomId, pushAtTimeTimer);
+			}
 			liveStatus = true;
 		}
 	}
 	async liveDetectWithAPI() {
-		const useMasterAndLiveRoomInfo = async (liveType, liveStatus) => {
+		const useMasterAndLiveRoomInfo = async (liveType, LiveAPIStatus) => {
 			let flag = true;
-			liveStatus.liveRoomInfo = await this.useLiveRoomInfo(liveStatus.roomId).catch(() => {
+			LiveAPIStatus.liveRoomInfo = await this.useLiveRoomInfo(LiveAPIStatus.roomId).catch(() => {
 				flag = false;
 				return null;
 			});
-			if (!flag || !liveStatus.liveRoomInfo?.uid) {
+			if (!flag || !LiveAPIStatus.liveRoomInfo?.uid) {
 				flag = false;
 				return flag;
 			}
-			liveStatus.masterInfo = await this.useMasterInfo(liveStatus.liveRoomInfo.uid, liveStatus.masterInfo, liveType).catch(() => {
+			LiveAPIStatus.masterInfo = await this.useMasterInfo(LiveAPIStatus.liveRoomInfo.uid, LiveAPIStatus.masterInfo, liveType).catch(() => {
 				flag = false;
 				return null;
 			});
 			return flag;
 		};
 		const uids = [];
-		for (const [uid] of this.liveStatusManager.entries()) uids.push(uid);
+		for (const [uid] of this.liveAPIManager.entries()) uids.push(uid);
 		const useLiveInfo = async () => {
 			const { data: data$1 } = await withRetry(async () => await this.ctx["bilibili-notify-api"].getLiveRoomInfoByUids(uids), 3).catch(async () => {
 				return void 0;
@@ -1364,96 +1382,96 @@ var ComRegister = class {
 		const data = await useLiveInfo();
 		for (const item of Object.values(data)) {
 			const uid = item.uid.toString();
-			const liveStatus = this.liveStatusManager.get(uid);
+			const LiveAPIStatus = this.liveAPIManager.get(uid);
 			const liveMsgObj = this.liveMsgManager.get(uid);
-			const sub = this.subManager.find((sub$1) => sub$1.uid === uid);
+			const sub = this.subManager.get(uid);
 			if (item.live_status === 1) {
-				liveStatus.live = true;
-				await useMasterAndLiveRoomInfo(LiveType.FirstLiveBroadcast, liveStatus);
-				if (!liveStatus.liveStartTimeInit) {
-					liveStatus.liveStartTime = liveStatus.liveRoomInfo.live_time;
-					liveStatus.liveStartTimeInit = true;
+				LiveAPIStatus.live = true;
+				await useMasterAndLiveRoomInfo(LiveType.FirstLiveBroadcast, LiveAPIStatus);
+				if (!LiveAPIStatus.liveStartTimeInit) {
+					LiveAPIStatus.liveStartTime = LiveAPIStatus.liveRoomInfo.live_time;
+					LiveAPIStatus.liveStartTimeInit = true;
 				}
-				const liveMsg = liveMsgObj.customLive.replace("-name", liveStatus.masterInfo.username).replace("-time", await this.ctx["bilibili-notify-generate-img"].getTimeDifference(liveStatus.liveStartTime)).replace("-watched", "API模式无法获取").replaceAll("\\n", "\n").replace("-link", `https://live.bilibili.com/${liveStatus.liveRoomInfo.short_id === 0 ? liveStatus.liveRoomInfo.room_id : liveStatus.liveRoomInfo.short_id}`);
+				const liveMsg = liveMsgObj.customLive.replace("-name", LiveAPIStatus.masterInfo.username).replace("-time", await this.ctx["bilibili-notify-generate-img"].getTimeDifference(LiveAPIStatus.liveStartTime)).replace("-watched", "API模式无法获取").replaceAll("\\n", "\n").replace("-link", `https://live.bilibili.com/${LiveAPIStatus.liveRoomInfo.short_id === 0 ? LiveAPIStatus.liveRoomInfo.room_id : LiveAPIStatus.liveRoomInfo.short_id}`);
 				await this.sendLiveNotifyCard(LiveType.LiveBroadcast, "API", {
-					liveRoomInfo: liveStatus.liveRoomInfo,
-					masterInfo: liveStatus.masterInfo,
+					liveRoomInfo: LiveAPIStatus.liveRoomInfo,
+					masterInfo: LiveAPIStatus.masterInfo,
 					cardStyle: sub.customCardStyle
-				}, sub.uid, liveMsg);
+				}, uid, liveMsg);
 			}
 		}
 		const handler = async () => {
 			const data$1 = await useLiveInfo();
 			for (const item of Object.values(data$1)) {
 				const uid = item.uid.toString();
-				const liveStatus = this.liveStatusManager.get(uid);
+				const LiveAPIStatus = this.liveAPIManager.get(uid);
 				const liveMsgObj = this.liveMsgManager.get(uid);
-				const sub = this.subManager.find((sub$1) => sub$1.uid === uid);
+				const sub = this.subManager.get(uid);
 				if (!sub) return;
 				switch (item.live_status) {
 					case 0:
 					case 2: {
-						if (liveStatus.live === true) {
-							if (!await useMasterAndLiveRoomInfo(LiveType.StopBroadcast, liveStatus)) {
+						if (LiveAPIStatus.live === true) {
+							if (!await useMasterAndLiveRoomInfo(LiveType.StopBroadcast, LiveAPIStatus)) {
 								await this.sendPrivateMsg("获取直播间信息失败，推送直播下播卡片失败！");
 								return await this.sendPrivateMsgAndStopService();
 							}
-							if (liveStatus.liveStartTimeInit) {
-								liveStatus.liveRoomInfo.live_time = liveStatus.liveStartTime;
-								liveStatus.liveStartTimeInit = false;
+							if (LiveAPIStatus.liveStartTimeInit) {
+								LiveAPIStatus.liveRoomInfo.live_time = LiveAPIStatus.liveStartTime;
+								LiveAPIStatus.liveStartTimeInit = false;
 							}
 							const followerChange = (() => {
-								const liveFollowerChangeNum = liveStatus.masterInfo.liveFollowerChange;
+								const liveFollowerChangeNum = LiveAPIStatus.masterInfo.liveFollowerChange;
 								if (liveFollowerChangeNum > 0) return liveFollowerChangeNum >= 1e4 ? `+${liveFollowerChangeNum.toFixed(1)}万` : `+${liveFollowerChangeNum}`;
 								return liveFollowerChangeNum <= -1e4 ? `${liveFollowerChangeNum.toFixed(1)}万` : liveFollowerChangeNum.toString();
 							})();
-							const liveEndMsg = liveMsgObj.customLiveEnd.replace("-name", liveStatus.masterInfo.username).replace("-time", await this.ctx["bilibili-notify-generate-img"].getTimeDifference(liveStatus.liveStartTime)).replace("-follower_change", followerChange).replaceAll("\\n", "\n");
+							const liveEndMsg = liveMsgObj.customLiveEnd.replace("-name", LiveAPIStatus.masterInfo.username).replace("-time", await this.ctx["bilibili-notify-generate-img"].getTimeDifference(LiveAPIStatus.liveStartTime)).replace("-follower_change", followerChange).replaceAll("\\n", "\n");
 							await this.sendLiveNotifyCard(LiveType.StopBroadcast, followerChange, {
-								liveRoomInfo: liveStatus.liveRoomInfo,
-								masterInfo: liveStatus.masterInfo,
+								liveRoomInfo: LiveAPIStatus.liveRoomInfo,
+								masterInfo: LiveAPIStatus.masterInfo,
 								cardStyle: sub.customCardStyle
-							}, sub.uid, liveEndMsg);
-							liveStatus.live = false;
+							}, uid, liveEndMsg);
+							LiveAPIStatus.live = false;
 						}
 						break;
 					}
 					case 1: {
-						if (liveStatus.live === false) {
-							if (!await useMasterAndLiveRoomInfo(LiveType.StopBroadcast, liveStatus)) {
+						if (LiveAPIStatus.live === false) {
+							if (!await useMasterAndLiveRoomInfo(LiveType.StopBroadcast, LiveAPIStatus)) {
 								await this.sendPrivateMsg("获取直播间信息失败，推送直播开播卡片失败！");
 								return await this.sendPrivateMsgAndStopService();
 							}
-							liveStatus.liveStartTime = liveStatus.liveRoomInfo.live_time;
-							liveStatus.liveStartTimeInit = true;
-							const follower = liveStatus.masterInfo.liveOpenFollowerNum >= 1e4 ? `${(liveStatus.masterInfo.liveOpenFollowerNum / 1e4).toFixed(1)}万` : liveStatus.masterInfo.liveOpenFollowerNum.toString();
-							const liveStartMsg = liveMsgObj.customLiveStart.replace("-name", liveStatus.masterInfo.username).replace("-time", await this.ctx["bilibili-notify-generate-img"].getTimeDifference(liveStatus.liveStartTime)).replace("-follower", follower).replaceAll("\\n", "\n").replace("-link", `https://live.bilibili.com/${liveStatus.liveRoomInfo.short_id === 0 ? liveStatus.liveRoomInfo.room_id : liveStatus.liveRoomInfo.short_id}`);
+							LiveAPIStatus.liveStartTime = LiveAPIStatus.liveRoomInfo.live_time;
+							LiveAPIStatus.liveStartTimeInit = true;
+							const follower = LiveAPIStatus.masterInfo.liveOpenFollowerNum >= 1e4 ? `${(LiveAPIStatus.masterInfo.liveOpenFollowerNum / 1e4).toFixed(1)}万` : LiveAPIStatus.masterInfo.liveOpenFollowerNum.toString();
+							const liveStartMsg = liveMsgObj.customLiveStart.replace("-name", LiveAPIStatus.masterInfo.username).replace("-time", await this.ctx["bilibili-notify-generate-img"].getTimeDifference(LiveAPIStatus.liveStartTime)).replace("-follower", follower).replaceAll("\\n", "\n").replace("-link", `https://live.bilibili.com/${LiveAPIStatus.liveRoomInfo.short_id === 0 ? LiveAPIStatus.liveRoomInfo.room_id : LiveAPIStatus.liveRoomInfo.short_id}`);
 							await this.sendLiveNotifyCard(LiveType.StartBroadcasting, follower, {
-								liveRoomInfo: liveStatus.liveRoomInfo,
-								masterInfo: liveStatus.masterInfo,
+								liveRoomInfo: LiveAPIStatus.liveRoomInfo,
+								masterInfo: LiveAPIStatus.masterInfo,
 								cardStyle: sub.customCardStyle
-							}, sub.uid, liveStartMsg);
-							liveStatus.live = true;
+							}, uid, liveStartMsg);
+							LiveAPIStatus.live = true;
 						}
-						if (liveStatus.live === true) {
-							if (liveStatus.push < this.config.pushTime * 60 * 60 / 30) {
-								liveStatus.push++;
+						if (LiveAPIStatus.live === true) {
+							if (LiveAPIStatus.push < this.config.pushTime * 60 * 60 / 30) {
+								LiveAPIStatus.push++;
 								break;
 							}
-							if (!await useMasterAndLiveRoomInfo(LiveType.LiveBroadcast, liveStatus)) {
+							if (!await useMasterAndLiveRoomInfo(LiveType.LiveBroadcast, LiveAPIStatus)) {
 								await this.sendPrivateMsg("获取直播间信息失败，推送直播卡片失败！");
 								return await this.sendPrivateMsgAndStopService();
 							}
-							if (!liveStatus.liveStartTimeInit) {
-								liveStatus.liveStartTime = liveStatus.liveRoomInfo.live_time;
-								liveStatus.liveStartTimeInit = true;
+							if (!LiveAPIStatus.liveStartTimeInit) {
+								LiveAPIStatus.liveStartTime = LiveAPIStatus.liveRoomInfo.live_time;
+								LiveAPIStatus.liveStartTimeInit = true;
 							}
-							const liveMsg = liveMsgObj.customLive.replace("-name", liveStatus.masterInfo.username).replace("-time", await this.ctx["bilibili-notify-generate-img"].getTimeDifference(liveStatus.liveStartTime)).replace("-watched", "API模式无法获取").replaceAll("\\n", "\n").replace("-link", `https://live.bilibili.com/${liveStatus.liveRoomInfo.short_id === 0 ? liveStatus.liveRoomInfo.room_id : liveStatus.liveRoomInfo.short_id}`);
+							const liveMsg = liveMsgObj.customLive.replace("-name", LiveAPIStatus.masterInfo.username).replace("-time", await this.ctx["bilibili-notify-generate-img"].getTimeDifference(LiveAPIStatus.liveStartTime)).replace("-watched", "API模式无法获取").replaceAll("\\n", "\n").replace("-link", `https://live.bilibili.com/${LiveAPIStatus.liveRoomInfo.short_id === 0 ? LiveAPIStatus.liveRoomInfo.room_id : LiveAPIStatus.liveRoomInfo.short_id}`);
 							await this.sendLiveNotifyCard(LiveType.LiveBroadcast, "API", {
-								liveRoomInfo: liveStatus.liveRoomInfo,
-								masterInfo: liveStatus.masterInfo,
+								liveRoomInfo: LiveAPIStatus.liveRoomInfo,
+								masterInfo: LiveAPIStatus.masterInfo,
 								cardStyle: sub.customCardStyle
-							}, sub.uid, liveMsg);
-							liveStatus.push = 0;
+							}, uid, liveMsg);
+							LiveAPIStatus.push = 0;
 						}
 						break;
 					}
@@ -1465,7 +1483,7 @@ var ComRegister = class {
 	}
 	subShow() {
 		let table = "";
-		for (const sub of this.subManager) table += `UID:${sub.uid}  ${sub.dynamic ? "已订阅动态" : ""}  ${sub.live ? "已订阅直播" : ""}\n`;
+		for (const [uid, sub] of this.subManager) table += `UID:${uid}  ${sub.dynamic ? "已订阅动态" : ""}  ${sub.live ? "已订阅直播" : ""}\n`;
 		return table ? table : "没有订阅任何UP";
 	}
 	updateSubNotifier() {
@@ -1500,22 +1518,22 @@ var ComRegister = class {
 						this.ctx.database.set("loginBili", 1, { dynamic_group_id: this.loginDBData.dynamic_group_id });
 						return {
 							code: 0,
-							msg: "分组已存在"
+							message: "分组已存在"
 						};
 					}
 				} else if (createGroupData.code !== 0) return {
 					code: createGroupData.code,
-					msg: createGroupData.message
+					message: createGroupData.message
 				};
 				this.ctx.database.set("loginBili", 1, { dynamic_group_id: createGroupData.data.tagid.toString() });
 				return {
 					code: createGroupData.code,
-					msg: createGroupData.message
+					message: createGroupData.message
 				};
 			}
 			return {
 				code: 0,
-				msg: "分组已存在"
+				message: "分组已存在"
 			};
 		};
 		const resp = await checkGroupIsReady();
@@ -1531,93 +1549,105 @@ var ComRegister = class {
 				}
 				return {
 					code: relationGroupDetailData.code,
-					msg: relationGroupDetailData.message,
+					message: relationGroupDetailData.message,
 					data: void 0
 				};
 			}
 			return {
 				code: 0,
-				msg: "获取分组明细成功",
+				message: "获取分组明细成功",
 				data: relationGroupDetailData.data
 			};
 		};
-		const { code, msg, data } = await getGroupDetailData();
+		const { code, message, data } = await getGroupDetailData();
 		if (code !== 0) return {
 			code,
-			msg
+			message
 		};
 		for (const user of data) if (user.mid === mid) return {
 			code: 0,
-			msg: "订阅对象已存在于分组中"
+			message: "订阅对象已存在于分组中"
 		};
 		const subUserData = await this.ctx["bilibili-notify-api"].follow(mid);
 		const subUserMatchPattern = {
 			[-101]: () => {
 				return {
 					code: subUserData.code,
-					msg: "账号未登录，请使用指令bili login登录后再进行订阅操作"
+					message: "账号未登录，请使用指令bili login登录后再进行订阅操作"
 				};
 			},
 			[-102]: () => {
 				return {
 					code: subUserData.code,
-					msg: "账号被封停，无法进行订阅操作"
+					message: "账号被封停，无法进行订阅操作"
 				};
 			},
 			22002: () => {
 				return {
 					code: subUserData.code,
-					msg: "因对方隐私设置，无法进行订阅操作"
+					message: "因对方隐私设置，无法进行订阅操作"
 				};
 			},
 			22003: () => {
 				return {
 					code: subUserData.code,
-					msg: "你已将对方拉黑，无法进行订阅操作"
+					message: "你已将对方拉黑，无法进行订阅操作"
 				};
 			},
 			22013: () => {
 				return {
 					code: subUserData.code,
-					msg: "账号已注销，无法进行订阅操作"
+					message: "账号已注销，无法进行订阅操作"
 				};
 			},
 			40061: () => {
 				return {
 					code: subUserData.code,
-					msg: "账号不存在，请检查uid输入是否正确或用户是否存在"
+					message: "账号不存在，请检查uid输入是否正确或用户是否存在"
 				};
 			},
 			22001: () => {
 				return {
 					code: 0,
-					msg: "订阅对象为自己，无需添加到分组"
+					message: "订阅对象为自己，无需添加到分组"
 				};
 			},
 			22014: async () => {
 				const copyUserToGroupData = await this.ctx["bilibili-notify-api"].copyUserToGroup(mid, this.loginDBData.dynamic_group_id);
 				if (copyUserToGroupData.code !== 0) return {
 					code: copyUserToGroupData.code,
-					msg: "添加订阅对象到分组失败，请稍后重试"
+					message: "添加订阅对象到分组失败，请稍后重试"
 				};
 				return {
 					code: 0,
-					msg: "订阅对象添加成功"
+					message: "订阅对象添加成功"
+				};
+			},
+			22015: async () => {
+				return {
+					code: subUserData.code,
+					message: subUserData.message
 				};
 			},
 			0: async () => {
 				const copyUserToGroupData = await this.ctx["bilibili-notify-api"].copyUserToGroup(mid, this.loginDBData.dynamic_group_id);
 				if (copyUserToGroupData.code !== 0) return {
 					code: copyUserToGroupData.code,
-					msg: "添加订阅对象到分组失败，请稍后重试"
+					message: "添加订阅对象到分组失败，请稍后重试"
 				};
 				return {
 					code: 0,
-					msg: "订阅对象添加成功"
+					message: "订阅对象添加成功"
 				};
 			}
 		};
-		return await subUserMatchPattern[subUserData.code]();
+		const subUserExecute = subUserMatchPattern[subUserData.code] || (() => {
+			return {
+				code: subUserData.code,
+				message: subUserData.message
+			};
+		});
+		return await subUserExecute();
 	}
 	async loadSubFromConfig(subs) {
 		this.preInitConfig(subs);
@@ -1625,11 +1655,8 @@ var ComRegister = class {
 			this.logger.info(`加载订阅UID:${sub.uid}中...`);
 			const { code: userInfoCode, message: userInfoMsg, data: userInfoData } = await withRetry(async () => {
 				const data = await this.ctx["bilibili-notify-api"].getUserInfo(sub.uid);
-				return {
-					code: 0,
-					data
-				};
-			}).then((content) => content.data).catch((e) => {
+				return data;
+			}).catch((e) => {
 				this.logger.error(`loadSubFromConfig() getUserInfo() 发生了错误，错误为：${e.message}`);
 				return {
 					code: -1,
@@ -1641,12 +1668,12 @@ var ComRegister = class {
 				await this.sendPrivateMsg("账号被风控，请使用指令 bili cap 进行风控验证");
 				return {
 					code: userInfoCode,
-					msg: userInfoMsg
+					message: userInfoMsg
 				};
 			}
 			if (userInfoCode !== 0) return {
 				code: userInfoCode,
-				msg: userInfoMsg
+				message: userInfoMsg
 			};
 			if (this.config.liveDetectType === "WS" && sub.live) {
 				if (!userInfoData.live_room) {
@@ -1657,8 +1684,7 @@ var ComRegister = class {
 			}
 			const subInfo = await this.subUserInBili(sub.uid);
 			if (subInfo.code !== 0) return subInfo;
-			this.subManager.push({
-				uid: sub.uid,
+			this.subManager.set(sub.uid, {
 				uname: userInfoData.name,
 				roomId: sub.live ? userInfoData.live_room.roomid : "",
 				target: sub.target,
@@ -1677,7 +1703,7 @@ var ComRegister = class {
 		}
 		return {
 			code: 0,
-			msg: "订阅加载完毕！"
+			message: "订阅加载完毕！"
 		};
 	}
 	checkIfDynamicDetectIsNeeded() {
@@ -1685,7 +1711,7 @@ var ComRegister = class {
 	}
 	checkIfLiveDetectIsNeeded() {
 		if (this.config.liveDetectType === "API") {
-			if (this.liveStatusManager.size > 0) this.enableLiveDetect();
+			if (this.liveAPIManager.size > 0) this.enableLiveDetect();
 		}
 	}
 	enableDynamicDetect() {
@@ -1694,9 +1720,9 @@ var ComRegister = class {
 		this.dynamicJob.start();
 	}
 	async enableLiveDetect() {
-		this.liveJob = new cron.CronJob("*/30 * * * * *", await this.liveDetectWithAPI());
+		this.liveAPIJob = new cron.CronJob("*/30 * * * * *", await this.liveDetectWithAPI());
 		this.logger.info("直播监测已开启");
-		this.liveJob.start();
+		this.liveAPIJob.start();
 	}
 	async checkIfIsLogin() {
 		if ((await this.ctx.database.get("loginBili", 1)).length !== 0) {