koishi-plugin-bilibili-notify 3.2.11-alpha.9 → 3.3.1-alpha.0

package/lib/index.mjs

@@ -17,7 +17,6 @@ import https from "node:https";
 import axios from "axios";
 import { Cookie, CookieJar } from "tough-cookie";
 import { JSDOM } from "jsdom";
-import _decorate from "@oxc-project/runtime/helpers/decorate";
 import { startListen } from "@akokko/blive-message-listener";
 
 //#region rolldown:runtime
@@ -62,6 +61,7 @@ const BAConfigSchema = Schema.object({
 		live: Schema.boolean().default(true).description("直播"),
 		liveAtAll: Schema.boolean().default(true).description("直播At全体"),
 		liveGuardBuy: Schema.boolean().default(false).description("上舰消息"),
+		wordcloud: Schema.boolean().default(true).description("弹幕词云"),
 		platform: Schema.string().required().description("平台名"),
 		target: Schema.string().required().description("群号/频道号")
 	})).role("table").description("输入订阅信息，自定义订阅内容； 群号/频道号格式：频道号,频道号 使用英文逗号分隔，例如 1234567,2345678"),
@@ -72,8 +72,19 @@ const BAConfigSchema = Schema.object({
 	pushImgsInDynamic: Schema.boolean().default(false).description("是否推送动态中的图片，默认不开启。开启后会单独推送动态中的图片，该功能容易导致QQ风控"),
 	live: Schema.object({}).description("直播推送设置"),
 	liveDetectType: Schema.union([Schema.const("WS").description("使用WebSocket连接到B站消息服务器进行直播检测，推荐使用"), Schema.const("API").description("通过轮询API发送请求监测直播状态，此模式理论可无限订阅，但容易产生其他问题，功能没有WS模式全面").experimental()]).role("radio").default("WS").description("直播检测方式，WS为连接到B站消息服务器，API为通过轮询发送请求监测，默认使用WS检测"),
-	wordcloud: Schema.boolean().default(false).description("直播结束后，是否生成本场直播弹幕词云").experimental(),
-	liveSummary: Schema.string().default("🔍【弹幕情报站】本场直播数据如下：\\n🧍‍♂️ 总共 -dmc 位-mdn上线\\n💬 共计 -dca 条弹幕飞驰而过\\n📊 热词云图已生成，快来看看你有没有上榜！\\n\\n👑 本场顶级输出选手：\\n🥇 -un1 - 弹幕输出 -dc1 条\\n🥈 -un2 - 弹幕 -dc2 条，萌力惊人\\n🥉 -un3 - -dc3 条精准狙击\\n\\n🎖️ 特别嘉奖：-un4 & -un5\\n你们的弹幕，我们都记录在案！🕵️‍♀️").description("自定义直播总结语，开启弹幕词云自动发送。变量解释：-dmc代表总弹幕发送人数，-mdn代表主播粉丝牌子名，-dca代表总弹幕数，-un1到-un5代表弹幕发送条数前五名用户的用户名，-dc1到-dc5代表弹幕发送条数前五名的弹幕发送数量"),
+	wordcloudStopWords: Schema.string().description("词云生成时的停用词，多个停用词请使用英文逗号分隔，例如：哔哩哔哩,弹幕,直播,词云").experimental(),
+	liveSummary: Schema.array(String).default([
+		"🔍【弹幕情报站】本场直播数据如下：",
+		"🧍‍♂️ 总共 -dmc 位-mdn上线",
+		"💬 共计 -dca 条弹幕飞驰而过",
+		"📊 热词云图已生成，快来看看你有没有上榜！",
+		"👑 本场顶级输出选手：",
+		"🥇 -un1 - 弹幕输出 -dc1 条",
+		"🥈 -un2 - 弹幕 -dc2 条，萌力惊人",
+		"🥉 -un3 - -dc3 条精准狙击",
+		"🎖️ 特别嘉奖：-un4 & -un5",
+		"你们的弹幕，我们都记录在案！🕵️‍♀️"
+	]).role("table").description("自定义直播总结语，开启弹幕词云自动发送。变量解释：-dmc代表总弹幕发送人数，-mdn代表主播粉丝牌子名，-dca代表总弹幕数，-un1到-un5代表弹幕发送条数前五名用户的用户名，-dc1到-dc5代表弹幕发送条数前五名的弹幕发送数量，数组每一行代表换行"),
 	restartPush: Schema.boolean().default(true).description("插件重启后，如果订阅的主播正在直播，是否进行一次推送，默认开启"),
 	pushTime: Schema.number().min(0).max(12).step(.5).default(1).description("设定间隔多长时间推送一次直播状态，单位为小时，默认为一小时"),
 	customLiveStart: Schema.string().default("-name开播啦，当前粉丝数：-follower\\n-link").description("自定义开播提示语，-name代表UP昵称，-follower代表当前粉丝数，-link代表直播间链接（如果使用的是QQ官方机器人，请不要使用），\\n为换行。例如-name开播啦，会发送为xxxUP开播啦"),
@@ -103,22 +114,6 @@ const BAConfigSchema = Schema.object({
 
 //#endregion
 //#region src/utils/index.ts
-function Retry(options = { attempts: 3 }) {
-	return (_target, _propertyKey, descriptor) => {
-		const originalMethod = descriptor.value;
-		descriptor.value = async function(...args) {
-			let lastError;
-			for (let i = 0; i < options.attempts; i++) try {
-				return await originalMethod.apply(this, args);
-			} catch (error) {
-				lastError = error;
-				if (options.onFailure) await options.onFailure.call(this, lastError, i + 1);
-			}
-			throw lastError;
-		};
-		return descriptor;
-	};
-}
 /**
 * 高阶函数：为函数添加锁机制
 * @param {Function} fn - 需要包装的原始函数
@@ -177,6 +172,7 @@ let PushType = /* @__PURE__ */ function(PushType$1) {
 	PushType$1[PushType$1["DynamicAtAll"] = 2] = "DynamicAtAll";
 	PushType$1[PushType$1["StartBroadcasting"] = 3] = "StartBroadcasting";
 	PushType$1[PushType$1["LiveGuardBuy"] = 4] = "LiveGuardBuy";
+	PushType$1[PushType$1["WordCloud"] = 5] = "WordCloud";
 	return PushType$1;
 }({});
 const PushTypeMsg = {
@@ -184,7 +180,8 @@ const PushTypeMsg = {
 	[PushType.Dynamic]: "动态推送",
 	[PushType.DynamicAtAll]: "动态推送+At全体",
 	[PushType.StartBroadcasting]: "开播推送",
-	[PushType.LiveGuardBuy]: "上舰推送"
+	[PushType.LiveGuardBuy]: "上舰推送",
+	[PushType.WordCloud]: "弹幕词云推送"
 };
 
 //#endregion
@@ -321,16 +318,17 @@ const stopwords = new Set([
 	"之前",
 	"某天"
 ]);
+var stop_words_default = stopwords;
 
 //#endregion
 //#region src/command_register.tsx
 var ComRegister = class {
 	static inject = [
-		"ba",
-		"gi",
-		"database",
-		"bl",
-		"sm"
+		"bilibili-notify",
+		"bilibili-notify-api",
+		"bilibili-notify-live",
+		"bilibili-notify-generate-img",
+		"database"
 	];
 	qqRelatedBotList = [
 		"qq",
@@ -356,6 +354,7 @@ var ComRegister = class {
 	dynamicJob;
 	liveJob;
 	_jieba = Jieba.withDict(dict);
+	stopwords;
 	constructor(ctx, config) {
 		this.ctx = ctx;
 		this.init(config);
@@ -386,7 +385,7 @@ var ComRegister = class {
 			this.logger.info("调用bili login指令");
 			let content;
 			try {
-				content = await ctx.ba.getLoginQRCode();
+				content = await ctx["bilibili-notify-api"].getLoginQRCode();
 			} catch (_) {
 				return "bili login getLoginQRCode() 本次网络请求失败";
 			}
@@ -411,7 +410,7 @@ var ComRegister = class {
 					flag = false;
 					let loginContent;
 					try {
-						loginContent = await ctx.ba.getLoginStatus(content.data.qrcode_key);
+						loginContent = await ctx["bilibili-notify-api"].getLoginStatus(content.data.qrcode_key);
 					} catch (e) {
 						this.logger.error(e);
 						return;
@@ -425,24 +424,19 @@ var ComRegister = class {
 						return await session.send("二维码已失效，请重新登录");
 					}
 					if (loginContent.data.code === 0) {
-						const encryptedCookies = ctx.ba.encrypt(ctx.ba.getCookies());
-						const encryptedRefreshToken = ctx.ba.encrypt(loginContent.data.refresh_token);
+						const encryptedCookies = ctx["bilibili-notify-api"].encrypt(ctx["bilibili-notify-api"].getCookies());
+						const encryptedRefreshToken = ctx["bilibili-notify-api"].encrypt(loginContent.data.refresh_token);
 						await ctx.database.upsert("loginBili", [{
 							id: 1,
 							bili_cookies: encryptedCookies,
 							bili_refresh_token: encryptedRefreshToken
 						}]);
 						this.loginDBData = (await this.ctx.database.get("loginBili", 1))[0];
-						await this.ctx.ba.loadCookiesFromDatabase();
+						await this.ctx["bilibili-notify-api"].loadCookiesFromDatabase();
 						await this.checkIfLoginInfoIsLoaded();
 						this.loginTimer();
-						const subs = this.configSubsToSubscription(config.subs);
-						const { code, msg } = await this.loadSubFromConfig(subs);
-						if (code !== 0) this.logger.error(msg);
-						ctx.ba.disposeNotifier();
-						await session.send("登录成功");
-						await session.execute("bili list");
-						ctx.ba.enableRefreshCookiesDetect();
+						ctx["bilibili-notify-api"].disposeNotifier();
+						await session.send("登录成功，请重启插件");
 					}
 				} finally {
 					flag = true;
@@ -458,7 +452,7 @@ var ComRegister = class {
 			await session.send("已发送消息，如未收到则说明您的机器人不支持发送私聊消息或您的信息填写有误");
 		});
 		biliCom.subcommand(".ll").usage("展示当前正在直播的订阅对象").example("bili ll").action(async () => {
-			const { data: { live_users } } = await ctx.ba.getTheUserWhoIsLiveStreaming();
+			const { data: { live_users } } = await ctx["bilibili-notify-api"].getTheUserWhoIsLiveStreaming();
 			const subLiveUsers = [];
 			for (const sub of this.subManager) {
 				let onLive = false;
@@ -480,10 +474,10 @@ var ComRegister = class {
 		});
 		biliCom.subcommand(".dyn <uid:string> [index:number]", "手动推送一条动态信息", { hidden: true }).usage("手动推送一条动态信息").example("bili dyn 233 1 手动推送UID为233用户空间的第一条动态信息").action(async ({ session }, uid, index) => {
 			const i = index && index - 1 || 0;
-			const content = await this.ctx.ba.getUserSpaceDynamic(uid);
+			const content = await this.ctx["bilibili-notify-api"].getUserSpaceDynamic(uid);
 			const item = content.data.items[i];
 			const buffer = await withRetry(async () => {
-				return await this.ctx.gi.generateDynamicImg(item);
+				return await this.ctx["bilibili-notify-generate-img"].generateDynamicImg(item);
 			}, 1).catch(async (e) => {
 				if (e.message === "直播开播动态，不做处理") {
 					await session.send("直播开播动态，不做处理");
@@ -598,7 +592,7 @@ var ComRegister = class {
 				["初中", 4],
 				["毕业", 4]
 			];
-			await session.send(/* @__PURE__ */ jsx("message", { children: h.image(await this.ctx.gi.generateWordCloudImg(words, "词云测试"), "image/jpg") }));
+			await session.send(/* @__PURE__ */ jsx("message", { children: h.image(await this.ctx["bilibili-notify-generate-img"].generateWordCloudImg(words, "词云测试"), "image/jpg") }));
 			const top5DanmakuMaker = [
 				["张三", 60],
 				["李四", 48],
@@ -606,46 +600,34 @@ var ComRegister = class {
 				["赵六", 27],
 				["田七", 25]
 			];
-			const danmakerRankMsg = this.config.liveSummary.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");
+			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);
 		});
 		biliCom.subcommand(".cap").action(async ({ session }) => {
 			const { code: userInfoCode, data: userInfoData } = await withRetry(async () => {
-				const data$1 = await this.ctx.ba.getUserInfo("114514");
+				const data$1 = await this.ctx["bilibili-notify-api"].getUserInfo("114514");
 				return {
 					code: 0,
 					data: data$1
 				};
 			}).then((content) => content.data);
 			if (userInfoCode !== -352 || !userInfoData.v_voucher) return "不满足验证条件，不需要执行该命令，如果提示风控可以尝试重启插件";
-			const { data } = await ctx.ba.v_voucherCaptcha(userInfoData.v_voucher);
+			const { data } = await ctx["bilibili-notify-api"].v_voucherCaptcha(userInfoData.v_voucher);
 			if (!data.geetest) return "当前风控无法通过该验证解除，或许考虑人工申诉？";
 			await session.send("请到该网站进行验证操作：https://kuresaru.github.io/geetest-validator/");
 			await session.send("请手动填入 gt 和 challenge 后点击生成进行验证，验证完成后点击结果，根据提示输入对应validate");
 			await session.send(`gt:${data.geetest.gt}`);
 			await session.send(`challenge:${data.geetest.challenge}`);
-			await session.send("请输入validate，格式为 val <validate>");
-			const validate = await (async () => {
-				while (true) {
-					const validate$1 = await session.prompt();
-					if (validate$1?.startsWith("val ")) return validate$1.slice(4);
-					else await session.send("请输入正确的validate，格式为 val <validate>");
-				}
-			})();
+			await session.send("请直接输入validate");
+			const validate = await session.prompt();
 			const seccode = `${validate}|jordan`;
-			const { data: validateCaptchaData } = await ctx.ba.validateCaptcha(data.geetest.challenge, data.token, validate, seccode);
+			const { data: validateCaptchaData } = await ctx["bilibili-notify-api"].validateCaptcha(data.geetest.challenge, data.token, validate, seccode);
 			if (validateCaptchaData?.is_valid !== 1) return "验证不成功！";
-			ctx.ba.addCookie(`x-bili-gaia-vtoken=${validateCaptchaData.grisk_id}`);
-			const encryptedCookies = ctx.ba.encrypt(ctx.ba.getCookies());
-			await ctx.database.upsert("loginBili", [{
-				id: 1,
-				bili_cookies: encryptedCookies
-			}]);
 			return "验证成功！请重启插件";
 		});
 	}
 	async init(config) {
-		this.logger = this.ctx.logger("cr");
+		this.logger = this.ctx.logger("bilibili-notify-core");
 		this.logger.info("初始化插件中...");
 		this.config = config;
 		this.privateBot = this.ctx.bots.find((bot) => bot.platform === config.master.platform);
@@ -656,6 +638,7 @@ var ComRegister = class {
 			this.logger.info("账号未登录，请登录");
 			return;
 		}
+		this.mergeStopWords(config.wordcloudStopWords);
 		if (config.advancedSub) {
 			this.ctx.on("bilibili-notify/advanced-sub", async (subs) => {
 				await this.initAsyncPart(subs);
@@ -685,6 +668,14 @@ var ComRegister = class {
 		this.updateSubNotifier();
 		this.logger.info("插件初始化完毕！");
 	}
+	mergeStopWords(stopWordsStr) {
+		if (!stopWordsStr || stopWordsStr.trim() === "") {
+			this.stopwords = new Set(stop_words_default);
+			return;
+		}
+		const additionalStopWords = stopWordsStr.split(",").map((word) => word.trim()).filter((word) => word !== "");
+		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(DateTime.now().toSeconds()));
@@ -710,6 +701,7 @@ var ComRegister = class {
 				live: s.live,
 				liveAtAll: s.liveAtAll,
 				liveGuardBuy: s.liveGuardBuy,
+				wordcloud: s.wordcloud,
 				bot: null
 			}));
 			const target = [{
@@ -720,9 +712,11 @@ var ComRegister = class {
 				uid: s.uid,
 				dynamic: s.dynamic,
 				live: s.live,
+				wordcloud: s.wordcloud,
 				target,
 				card: { enable: false },
-				liveMsg: { enable: false }
+				liveMsg: { enable: false },
+				liveSummary: { enable: false }
 			};
 		});
 		return subs;
@@ -739,23 +733,23 @@ var ComRegister = class {
 		if (this.rebootCount >= 3) {
 			this.logger.error("已重启插件三次，请检查机器人状态后使用指令 bn start 启动插件");
 			await this.sendPrivateMsg("已重启插件三次，请检查机器人状态后使用指令 bn start 启动插件");
-			await this.ctx.sm.disposePlugin();
+			await this.ctx["bilibili-notify"].disposePlugin();
 			return;
 		}
 		this.rebootCount++;
 		this.logger.info("插件出现未知错误，正在重启插件");
-		const flag = await this.ctx.sm.restartPlugin();
+		const flag = await this.ctx["bilibili-notify"].restartPlugin();
 		if (flag) this.logger.info("重启插件成功");
 		else {
 			this.logger.error("重启插件失败，请检查机器人状态后使用指令 bn start 启动插件");
 			await this.sendPrivateMsg("重启插件失败，请检查机器人状态后使用指令 bn start 启动插件");
-			await this.ctx.sm.disposePlugin();
+			await this.ctx["bilibili-notify"].disposePlugin();
 		}
 	}
 	async sendPrivateMsgAndStopService() {
 		await this.sendPrivateMsg("插件发生未知错误，请检查机器人状态后使用指令 bn start 启动插件");
 		this.logger.error("插件发生未知错误，请检查机器人状态后使用指令 bn start 启动插件");
-		await this.ctx.sm.disposePlugin();
+		await this.ctx["bilibili-notify"].disposePlugin();
 		return;
 	}
 	async sendMessageWithRetry(bot, channelId, content) {
@@ -775,19 +769,22 @@ var ComRegister = class {
 			const liveMsg = {
 				customLiveStart: this.config.customLiveStart || "",
 				customLive: this.config.customLive || "",
-				customLiveEnd: this.config.customLiveEnd || ""
+				customLiveEnd: this.config.customLiveEnd || "",
+				liveSummary: this.config.liveSummary.join("\n") || ""
 			};
 			if (sub.liveMsg.enable) {
 				liveMsg.customLiveStart = sub.liveMsg.customLiveStart || this.config.customLiveStart;
 				liveMsg.customLive = sub.liveMsg.customLive || this.config.customLive;
 				liveMsg.customLiveEnd = sub.liveMsg.customLiveEnd || this.config.customLiveEnd;
 			}
+			if (sub.liveSummary.enable) liveMsg.liveSummary = sub.liveSummary.liveSummary || this.config.liveSummary.join("\n");
 			this.liveMsgManager.set(sub.uid, liveMsg);
 			const dynamicArr = [];
 			const dynamicAtAllArr = [];
 			const liveArr = [];
 			const liveAtAllArr = [];
 			const liveGuardBuyArr = [];
+			const wordcloudArr = [];
 			for (const platform of sub.target) for (const channel of platform.channelArr) {
 				const target = `${platform.platform}:${channel.channelId}`;
 				if (channel.dynamic) dynamicArr.push(target);
@@ -795,13 +792,15 @@ var ComRegister = class {
 				if (channel.live) liveArr.push(target);
 				if (channel.liveAtAll) liveAtAllArr.push(target);
 				if (channel.liveGuardBuy) liveGuardBuyArr.push(target);
+				if (channel.wordcloud) wordcloudArr.push(target);
 			}
 			this.pushArrMap.set(sub.uid, {
 				dynamicArr,
 				dynamicAtAllArr,
 				liveArr,
 				liveAtAllArr,
-				liveGuardBuyArr
+				liveGuardBuyArr,
+				wordcloudArr
 			});
 		}
 		this.logger.info("初始化推送群组/频道信息：");
@@ -861,13 +860,21 @@ var ComRegister = class {
 			}, 1);
 			this.logger.info(`成功推送上舰消息：${success.length}条`);
 		}
+		if (type === PushType.WordCloud && record.wordcloudArr?.length >= 1) {
+			this.logger.info(record.wordcloudArr);
+			const wordcloudArr = structuredClone(record.wordcloudArr);
+			const success = await withRetry(async () => {
+				return await this.ctx.broadcast(wordcloudArr, /* @__PURE__ */ jsx("message", { children: content }));
+			}, 1);
+			this.logger.info(`成功推送词云消息：${success.length}条`);
+		}
 		return;
 	}
 	dynamicDetect() {
 		const handler = async () => {
 			const currentPushDyn = {};
 			const content = await withRetry(async () => {
-				return await this.ctx.ba.getAllDynamic();
+				return await this.ctx["bilibili-notify-api"].getAllDynamic();
 			}, 1).catch((e) => {
 				this.logger.error(`dynamicDetect getAllDynamic() 发生了错误，错误为：${e.message}`);
 			});
@@ -876,13 +883,13 @@ var ComRegister = class {
 				case -101: {
 					this.logger.error("账号未登录，插件已停止工作，请登录后，输入指令 bn start 启动插件");
 					await this.sendPrivateMsg("账号未登录，插件已停止工作，请登录后，输入指令 bn start 启动插件");
-					await this.ctx.sm.disposePlugin();
+					await this.ctx["bilibili-notify"].disposePlugin();
 					break;
 				}
 				case -352: {
 					this.logger.error("账号被风控，插件已停止工作，请确认风控解除后，输入指令 bn start 启动插件");
 					await this.sendPrivateMsg("账号被风控，插件已停止工作，请确认风控解除后，输入指令 bn start 启动插件");
-					await this.ctx.sm.disposePlugin();
+					await this.ctx["bilibili-notify"].disposePlugin();
 					break;
 				}
 				case 4101128:
@@ -907,7 +914,7 @@ var ComRegister = class {
 					if (timeline < postTime) {
 						const sub = this.subManager.find((sub$1) => sub$1.uid === uid);
 						const buffer = await withRetry(async () => {
-							return await this.ctx.gi.generateDynamicImg(item, sub.card.enable ? sub.card : void 0);
+							return await this.ctx["bilibili-notify-generate-img"].generateDynamicImg(item, sub.card.enable ? sub.card : void 0);
 						}, 1).catch(async (e) => {
 							if (e.message === "直播开播动态，不做处理") return;
 							if (e.message === "出现关键词，屏蔽该动态") {
@@ -966,7 +973,7 @@ var ComRegister = class {
 			const currentPushDyn = {};
 			this.logger.info("开始获取动态信息...");
 			const content = await withRetry(async () => {
-				return await this.ctx.ba.getAllDynamic();
+				return await this.ctx["bilibili-notify-api"].getAllDynamic();
 			}, 1).catch((e) => {
 				this.logger.error(`dynamicDetect getAllDynamic() 发生了错误，错误为：${e.message}`);
 			});
@@ -975,13 +982,13 @@ var ComRegister = class {
 				case -101: {
 					this.logger.error("账号未登录，插件已停止工作，请登录后，输入指令 bn start 启动插件");
 					await this.sendPrivateMsg("账号未登录，插件已停止工作，请登录后，输入指令 bn start 启动插件");
-					await this.ctx.sm.disposePlugin();
+					await this.ctx["bilibili-notify"].disposePlugin();
 					break;
 				}
 				case -352: {
 					this.logger.error("账号被风控，插件已停止工作，请确认风控解除后，输入指令 bn start 启动插件");
 					await this.sendPrivateMsg("账号被风控，插件已停止工作，请确认风控解除后，输入指令 bn start 启动插件");
-					await this.ctx.sm.disposePlugin();
+					await this.ctx["bilibili-notify"].disposePlugin();
 					break;
 				}
 				case 4101128:
@@ -1012,7 +1019,7 @@ var ComRegister = class {
 						const sub = this.subManager.find((sub$1) => sub$1.uid === uid);
 						this.logger.info("开始渲染推送卡片...");
 						const buffer = await withRetry(async () => {
-							return await this.ctx.gi.generateDynamicImg(item, sub.card.enable ? sub.card : void 0);
+							return await this.ctx["bilibili-notify-generate-img"].generateDynamicImg(item, sub.card.enable ? sub.card : void 0);
 						}, 1).catch(async (e) => {
 							if (e.message === "直播开播动态，不做处理") return;
 							if (e.message === "出现关键词，屏蔽该动态") {
@@ -1077,7 +1084,7 @@ var ComRegister = class {
 		return withLock(handler);
 	}
 	async useMasterInfo(uid, masterInfo, liveType) {
-		const { data } = await this.ctx.ba.getMasterInfo(uid);
+		const { data } = await this.ctx["bilibili-notify-api"].getMasterInfo(uid);
 		let liveOpenFollowerNum;
 		let liveEndFollowerNum;
 		let liveFollowerChange;
@@ -1102,7 +1109,7 @@ var ComRegister = class {
 		};
 	}
 	async useLiveRoomInfo(roomId) {
-		const data = await withRetry(async () => await this.ctx.ba.getLiveRoomInfo(roomId)).then((content) => content.data).catch((e) => {
+		const data = await withRetry(async () => await this.ctx["bilibili-notify-api"].getLiveRoomInfo(roomId)).then((content) => content.data).catch((e) => {
 			this.logger.error(`liveDetect getLiveRoomInfo 发生了错误，错误为：${e.message}`);
 			return false;
 		});
@@ -1111,7 +1118,7 @@ var ComRegister = class {
 	}
 	async sendLiveNotifyCard(liveType, followerDisplay, liveInfo, uid, liveNotifyMsg) {
 		const buffer = await withRetry(async () => {
-			return await this.ctx.gi.generateLiveImg(liveInfo.liveRoomInfo, liveInfo.masterInfo.username, liveInfo.masterInfo.userface, followerDisplay, liveType, liveInfo.cardStyle.enable ? liveInfo.cardStyle : void 0);
+			return await this.ctx["bilibili-notify-generate-img"].generateLiveImg(liveInfo.liveRoomInfo, liveInfo.masterInfo.username, liveInfo.masterInfo.userface, followerDisplay, liveType, liveInfo.cardStyle.enable ? liveInfo.cardStyle : void 0);
 		}, 1).catch((e) => {
 			this.logger.error(`liveDetect generateLiveImg() 推送卡片生成失败，原因：${e.message}`);
 		});
@@ -1120,14 +1127,14 @@ var ComRegister = class {
 		return await this.broadcastToTargets(uid, msg, liveType === LiveType.StartBroadcasting ? PushType.StartBroadcasting : PushType.Live);
 	}
 	async segmentDanmaku(danmaku, danmakuWeightRecord) {
-		this._jieba.cut(danmaku, true).filter((word) => word.length >= 2 && !stopwords.has(word)).map((w) => {
+		this._jieba.cut(danmaku, true).filter((word) => word.length >= 2 && !this.stopwords.has(word)).map((w) => {
 			danmakuWeightRecord[w] = (danmakuWeightRecord[w] || 0) + 1;
 		});
 	}
 	addUserToDanmakuMaker(username, danmakuMakerRecord) {
 		danmakuMakerRecord[username] = (danmakuMakerRecord[username] || 0) + 1;
 	}
-	async liveDetectWithListener(roomId, uid, cardStyle) {
+	async liveDetectWithListener(roomId, sub) {
 		let liveTime;
 		let pushAtTimeTimer;
 		const danmakuWeightRecord = {};
@@ -1136,24 +1143,24 @@ var ComRegister = class {
 		let liveRoomInfo;
 		let masterInfo;
 		let watchedNum;
-		const liveMsgObj = this.liveMsgManager.get(uid);
-		const sendDanmakuWordCloud = async () => {
+		const liveMsgObj = this.liveMsgManager.get(sub.uid);
+		const sendDanmakuWordCloud = async (liveSummary) => {
 			this.logger.info("开始制作弹幕词云");
 			this.logger.info("正在获取前90热词");
 			const top90Words = Object.entries(danmakuWeightRecord).sort((a, b) => b[1] - a[1]).slice(0, 90);
 			this.logger.info("弹幕词云前90词及权重：");
 			this.logger.info(top90Words);
 			this.logger.info("正在准备生成弹幕词云");
-			const buffer = await this.ctx.gi.generateWordCloudImg(top90Words, masterInfo.username);
+			const buffer = await this.ctx["bilibili-notify-generate-img"].generateWordCloudImg(top90Words, masterInfo.username);
 			this.logger.info("弹幕词云生成完成，正在准备发送词云图片");
-			await this.broadcastToTargets(uid, h.image(buffer, "image/jpeg"), PushType.Live);
+			await this.broadcastToTargets(sub.uid, h.image(buffer, "image/jpeg"), PushType.Live);
 			this.logger.info("词云图片发送完毕！");
 			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 = this.config.liveSummary.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(uid, danmakuMakerMsg, PushType.Live);
+			const danmakuMakerMsg = liveSummary.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, danmakuMakerMsg, PushType.WordCloud);
 			Object.keys(danmakuWeightRecord).forEach((key) => delete danmakuWeightRecord[key]);
 			Object.keys(danmakuMakerRecord).forEach((key) => delete danmakuMakerRecord[key]);
 		};
@@ -1170,12 +1177,12 @@ var ComRegister = class {
 			}
 			liveTime = liveRoomInfo.live_time;
 			const watched = watchedNum || "暂未获取到";
-			const liveMsg = liveMsgObj?.customLive.replace("-name", masterInfo.username).replace("-time", await this.ctx.gi.getTimeDifference(liveTime)).replace("-watched", watched).replaceAll("\\n", "\n").replace("-link", `https://live.bilibili.com/${liveRoomInfo.short_id === 0 ? liveRoomInfo.room_id : liveRoomInfo.short_id}`);
+			const liveMsg = liveMsgObj.customLive.replace("-name", masterInfo.username).replace("-time", await this.ctx["bilibili-notify-generate-img"].getTimeDifference(liveTime)).replace("-watched", watched).replaceAll("\\n", "\n").replace("-link", `https://live.bilibili.com/${liveRoomInfo.short_id === 0 ? liveRoomInfo.room_id : liveRoomInfo.short_id}`);
 			await this.sendLiveNotifyCard(LiveType.LiveBroadcast, watched, {
 				liveRoomInfo,
 				masterInfo,
-				cardStyle
-			}, uid, liveMsg);
+				cardStyle: sub.card
+			}, sub.uid, liveMsg);
 		};
 		const useMasterAndLiveRoomInfo = async (liveType) => {
 			let flag = true;
@@ -1197,7 +1204,7 @@ var ComRegister = class {
 			onError: async () => {
 				liveStatus = false;
 				pushAtTimeTimer?.();
-				this.ctx.bl.closeListener(roomId);
+				this.ctx["bilibili-notify-live"].closeListener(roomId);
 				await this.sendPrivateMsg(`[${roomId}]直播间连接发生错误！`);
 				this.logger.error(`[${roomId}]直播间连接发生错误！`);
 			},
@@ -1222,7 +1229,7 @@ var ComRegister = class {
 					body.gift_name,
 					"）"
 				] });
-				this.broadcastToTargets(uid, content, PushType.LiveGuardBuy);
+				this.broadcastToTargets(sub.uid, content, PushType.LiveGuardBuy);
 			},
 			onLiveStart: async () => {
 				if (liveStatus) return;
@@ -1234,12 +1241,12 @@ var ComRegister = class {
 				}
 				liveTime = liveRoomInfo.live_time;
 				const follower = masterInfo.liveOpenFollowerNum >= 1e4 ? `${(masterInfo.liveOpenFollowerNum / 1e4).toFixed(1)}万` : masterInfo.liveOpenFollowerNum.toString();
-				const liveStartMsg = liveMsgObj?.customLiveStart.replace("-name", masterInfo.username).replace("-time", await this.ctx.gi.getTimeDifference(liveTime)).replace("-follower", follower).replaceAll("\\n", "\n").replace("-link", `https://live.bilibili.com/${liveRoomInfo.short_id === 0 ? liveRoomInfo.room_id : liveRoomInfo.short_id}`);
+				const liveStartMsg = liveMsgObj.customLiveStart.replace("-name", masterInfo.username).replace("-time", await this.ctx["bilibili-notify-generate-img"].getTimeDifference(liveTime)).replace("-follower", follower).replaceAll("\\n", "\n").replace("-link", `https://live.bilibili.com/${liveRoomInfo.short_id === 0 ? liveRoomInfo.room_id : liveRoomInfo.short_id}`);
 				await this.sendLiveNotifyCard(LiveType.StartBroadcasting, follower, {
 					liveRoomInfo,
 					masterInfo,
-					cardStyle
-				}, uid, liveStartMsg);
+					cardStyle: sub.card
+				}, sub.uid, liveStartMsg);
 				if (this.config.pushTime !== 0 && !pushAtTimeTimer) pushAtTimeTimer = this.ctx.setInterval(pushAtTimeFunc, this.config.pushTime * 1e3 * 60 * 60);
 			},
 			onLiveEnd: async () => {
@@ -1254,28 +1261,28 @@ var ComRegister = class {
 					if (liveFollowerChangeNum > 0) return liveFollowerChangeNum >= 1e4 ? `+${liveFollowerChangeNum.toFixed(1)}万` : `+${liveFollowerChangeNum}`;
 					return liveFollowerChangeNum <= -1e4 ? `${liveFollowerChangeNum.toFixed(1)}万` : liveFollowerChangeNum.toString();
 				})();
-				const liveEndMsg = liveMsgObj?.customLiveEnd.replace("-name", masterInfo.username).replace("-time", await this.ctx.gi.getTimeDifference(liveTime)).replace("-follower_change", followerChange).replaceAll("\\n", "\n");
+				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, {
 					liveRoomInfo,
 					masterInfo,
-					cardStyle
-				}, uid, liveEndMsg);
+					cardStyle: sub.card
+				}, sub.uid, liveEndMsg);
 				pushAtTimeTimer();
 				pushAtTimeTimer = null;
-				if (this.config.wordcloud) await sendDanmakuWordCloud();
+				if (sub.wordcloud) await sendDanmakuWordCloud(liveMsgObj.liveSummary);
 			}
 		};
-		await this.ctx.bl.startLiveRoomListener(roomId, handler);
+		await this.ctx["bilibili-notify-live"].startLiveRoomListener(roomId, handler);
 		if (!await useMasterAndLiveRoomInfo(LiveType.FirstLiveBroadcast)) return this.sendPrivateMsg("获取直播间信息失败，启动直播间弹幕检测失败！");
 		if (liveRoomInfo.live_status === 1) {
 			liveTime = liveRoomInfo.live_time;
 			const watched = watchedNum || "暂未获取到";
-			const liveMsg = liveMsgObj?.customLive.replace("-name", masterInfo.username).replace("-time", await this.ctx.gi.getTimeDifference(liveTime)).replace("-watched", watched).replaceAll("\\n", "\n").replace("-link", `https://live.bilibili.com/${liveRoomInfo.short_id === 0 ? liveRoomInfo.room_id : liveRoomInfo.short_id}`);
+			const liveMsg = liveMsgObj.customLive.replace("-name", masterInfo.username).replace("-time", await this.ctx["bilibili-notify-generate-img"].getTimeDifference(liveTime)).replace("-watched", watched).replaceAll("\\n", "\n").replace("-link", `https://live.bilibili.com/${liveRoomInfo.short_id === 0 ? liveRoomInfo.room_id : liveRoomInfo.short_id}`);
 			if (this.config.restartPush) await this.sendLiveNotifyCard(LiveType.LiveBroadcast, watched, {
 				liveRoomInfo,
 				masterInfo,
-				cardStyle
-			}, uid, liveMsg);
+				cardStyle: sub.card
+			}, sub.uid, liveMsg);
 			if (this.config.pushTime !== 0 && !pushAtTimeTimer) pushAtTimeTimer = this.ctx.setInterval(pushAtTimeFunc, this.config.pushTime * 1e3 * 60 * 60);
 			liveStatus = true;
 		}
@@ -1300,7 +1307,7 @@ var ComRegister = class {
 		const uids = [];
 		for (const [uid] of this.liveStatusManager.entries()) uids.push(uid);
 		const useLiveInfo = async () => {
-			const { data: data$1 } = await withRetry(async () => await this.ctx.ba.getLiveRoomInfoByUids(uids), 3).catch(async () => {
+			const { data: data$1 } = await withRetry(async () => await this.ctx["bilibili-notify-api"].getLiveRoomInfoByUids(uids), 3).catch(async () => {
 				return void 0;
 			});
 			if (!data$1) {
@@ -1322,7 +1329,7 @@ var ComRegister = class {
 					liveStatus.liveStartTime = liveStatus.liveRoomInfo.live_time;
 					liveStatus.liveStartTimeInit = true;
 				}
-				const liveMsg = liveMsgObj?.customLive.replace("-name", liveStatus.masterInfo.username).replace("-time", await this.ctx.gi.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", 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}`);
 				await this.sendLiveNotifyCard(LiveType.LiveBroadcast, "API", {
 					liveRoomInfo: liveStatus.liveRoomInfo,
 					masterInfo: liveStatus.masterInfo,
@@ -1355,7 +1362,7 @@ var ComRegister = class {
 								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.gi.getTimeDifference(liveStatus.liveStartTime)).replace("-follower_change", followerChange).replaceAll("\\n", "\n");
+							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");
 							await this.sendLiveNotifyCard(LiveType.StopBroadcast, followerChange, {
 								liveRoomInfo: liveStatus.liveRoomInfo,
 								masterInfo: liveStatus.masterInfo,
@@ -1374,7 +1381,7 @@ var ComRegister = class {
 							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.gi.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}`);
+							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}`);
 							await this.sendLiveNotifyCard(LiveType.StartBroadcasting, follower, {
 								liveRoomInfo: liveStatus.liveRoomInfo,
 								masterInfo: liveStatus.masterInfo,
@@ -1395,7 +1402,7 @@ var ComRegister = class {
 								liveStatus.liveStartTime = liveStatus.liveRoomInfo.live_time;
 								liveStatus.liveStartTimeInit = true;
 							}
-							const liveMsg = liveMsgObj?.customLive.replace("-name", liveStatus.masterInfo.username).replace("-time", await this.ctx.gi.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", 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}`);
 							await this.sendLiveNotifyCard(LiveType.LiveBroadcast, "API", {
 								liveRoomInfo: liveStatus.liveRoomInfo,
 								masterInfo: liveStatus.masterInfo,
@@ -1431,7 +1438,7 @@ var ComRegister = class {
 	async checkIfLoginInfoIsLoaded() {
 		return new Promise((resolve$1) => {
 			const check = () => {
-				if (!this.ctx.ba.getLoginInfoIsLoaded()) this.ctx.setTimeout(check, 500);
+				if (!this.ctx["bilibili-notify-api"].getLoginInfoIsLoaded()) this.ctx.setTimeout(check, 500);
 				else resolve$1("success");
 			};
 			check();
@@ -1440,9 +1447,9 @@ var ComRegister = class {
 	async subUserInBili(mid) {
 		const checkGroupIsReady = async () => {
 			if (!this.loginDBData?.dynamic_group_id) {
-				const createGroupData = await this.ctx.ba.createGroup("订阅");
+				const createGroupData = await this.ctx["bilibili-notify-api"].createGroup("订阅");
 				if (createGroupData.code === 22106) {
-					const allGroupData = await this.ctx.ba.getAllGroup();
+					const allGroupData = await this.ctx["bilibili-notify-api"].getAllGroup();
 					for (const group of allGroupData.data) if (group.name === "订阅") {
 						this.loginDBData.dynamic_group_id = group.tagid.toString();
 						this.ctx.database.set("loginBili", 1, { dynamic_group_id: this.loginDBData.dynamic_group_id });
@@ -1469,7 +1476,7 @@ var ComRegister = class {
 		const resp = await checkGroupIsReady();
 		if (resp.code !== 0) return resp;
 		const getGroupDetailData = async () => {
-			const relationGroupDetailData = await this.ctx.ba.getRelationGroupDetail(this.loginDBData.dynamic_group_id);
+			const relationGroupDetailData = await this.ctx["bilibili-notify-api"].getRelationGroupDetail(this.loginDBData.dynamic_group_id);
 			if (relationGroupDetailData.code !== 0) {
 				if (relationGroupDetailData.code === 22104) {
 					this.loginDBData.dynamic_group_id = null;
@@ -1498,7 +1505,7 @@ var ComRegister = class {
 			code: 0,
 			msg: "订阅对象已存在于分组中"
 		};
-		const subUserData = await this.ctx.ba.follow(mid);
+		const subUserData = await this.ctx["bilibili-notify-api"].follow(mid);
 		const subUserMatchPattern = {
 			[-101]: () => {
 				return {
@@ -1543,7 +1550,7 @@ var ComRegister = class {
 				};
 			},
 			22014: async () => {
-				const copyUserToGroupData = await this.ctx.ba.copyUserToGroup(mid, this.loginDBData.dynamic_group_id);
+				const copyUserToGroupData = await this.ctx["bilibili-notify-api"].copyUserToGroup(mid, this.loginDBData.dynamic_group_id);
 				if (copyUserToGroupData.code !== 0) return {
 					code: copyUserToGroupData.code,
 					msg: "添加订阅对象到分组失败，请稍后重试"
@@ -1554,7 +1561,7 @@ var ComRegister = class {
 				};
 			},
 			0: async () => {
-				const copyUserToGroupData = await this.ctx.ba.copyUserToGroup(mid, this.loginDBData.dynamic_group_id);
+				const copyUserToGroupData = await this.ctx["bilibili-notify-api"].copyUserToGroup(mid, this.loginDBData.dynamic_group_id);
 				if (copyUserToGroupData.code !== 0) return {
 					code: copyUserToGroupData.code,
 					msg: "添加订阅对象到分组失败，请稍后重试"
@@ -1572,7 +1579,7 @@ var ComRegister = class {
 		for (const sub of Object.values(subs)) {
 			this.logger.info(`加载订阅UID:${sub.uid}中...`);
 			const { code: userInfoCode, message: userInfoMsg, data: userInfoData } = await withRetry(async () => {
-				const data = await this.ctx.ba.getUserInfo(sub.uid);
+				const data = await this.ctx["bilibili-notify-api"].getUserInfo(sub.uid);
 				return {
 					code: 0,
 					data
@@ -1601,7 +1608,7 @@ var ComRegister = class {
 					sub.live = false;
 					this.logger.warn(`UID:${sub.uid} 用户没有开通直播间，无法订阅直播！`);
 				}
-				if (sub.live) await this.liveDetectWithListener(userInfoData.live_room.roomid, sub.uid, sub.card);
+				if (sub.live) await this.liveDetectWithListener(userInfoData.live_room.roomid, sub);
 			}
 			const subInfo = await this.subUserInBili(sub.uid);
 			if (subInfo.code !== 0) return subInfo;
@@ -1649,7 +1656,7 @@ var ComRegister = class {
 	}
 	async checkIfIsLogin() {
 		if ((await this.ctx.database.get("loginBili", 1)).length !== 0) {
-			if (this.ctx.ba.getCookies() !== "[]") return true;
+			if (this.ctx["bilibili-notify-api"].getCookies() !== "[]") return true;
 		}
 		return false;
 	}
@@ -1665,6 +1672,7 @@ var ComRegister = class {
 			live: Schema.boolean().default(true).description("直播"),
 			liveAtAll: Schema.boolean().default(true).description("直播At全体"),
 			liveGuardBuy: Schema.boolean().default(false).description("上舰消息"),
+			wordcloud: Schema.boolean().default(true).description("弹幕词云"),
 			platform: Schema.string().required().description("平台名"),
 			target: Schema.string().required().description("群号/频道号")
 		})).role("table").description("输入订阅信息，自定义订阅内容； 群号/频道号格式：频道号,频道号 使用英文逗号分隔，例如 1234567,2345678"),
@@ -1675,8 +1683,8 @@ var ComRegister = class {
 			masterAccountGuildId: Schema.string()
 		}),
 		liveDetectType: Schema.string(),
-		wordcloud: Schema.boolean(),
-		liveSummary: Schema.string(),
+		wordcloudStopWords: Schema.string(),
+		liveSummary: Schema.array(String),
 		restartPush: Schema.boolean().required(),
 		pushTime: Schema.number().required(),
 		pushImgsInDynamic: Schema.boolean().required(),
@@ -1733,10 +1741,10 @@ const DYNAMIC_TYPE_LIVE_RCMD = "DYNAMIC_TYPE_LIVE_RCMD";
 const DYNAMIC_TYPE_UGC_SEASON = "DYNAMIC_TYPE_UGC_SEASON";
 const ADDITIONAL_TYPE_RESERVE = "ADDITIONAL_TYPE_RESERVE";
 var GenerateImg = class extends Service {
-	static inject = ["puppeteer", "ba"];
+	static inject = ["puppeteer"];
 	giConfig;
 	constructor(ctx, config) {
-		super(ctx, "gi");
+		super(ctx, "bilibili-notify-generate-img");
 		this.giConfig = config;
 	}
 	async imgHandler(html) {
@@ -3313,11 +3321,15 @@ var BiliAPI = class extends Service {
 		sub_key: ""
 	};
 	updateJob;
+	pRetry;
+	AbortError;
 	constructor(ctx, config) {
-		super(ctx, "ba");
+		super(ctx, "bilibili-notify-api");
 		this.apiConfig = config;
 	}
 	async start() {
+		this.pRetry = (await import("p-retry")).default;
+		this.AbortError = (await import("p-retry")).AbortError;
 		const CacheableLookup = (await import("cacheable-lookup")).default;
 		this.cacheable = new CacheableLookup();
 		this.cacheable.install(http.globalAgent);
@@ -3382,129 +3394,305 @@ var BiliAPI = class extends Service {
 		return decrypted.toString();
 	}
 	async getTheUserWhoIsLiveStreaming() {
-		const { data } = await this.client.get(GET_LATEST_UPDATED_UPS);
-		return data;
+		const run = async () => {
+			const { data } = await this.client.get(GET_LATEST_UPDATED_UPS);
+			return data;
+		};
+		return await this.pRetry(run, {
+			onFailedAttempt: (error) => {
+				this.logger.error(`getTheUserWhoIsLiveStreaming() 第${error.attemptNumber}次失败: ${error.message}`);
+			},
+			retries: 3
+		});
 	}
 	async getLiveRoomInfoStreamKey(roomId) {
-		const { data } = await this.client.get(`${GET_LIVE_ROOM_INFO_STREAM_KEY}?id=${roomId}`);
-		return data;
+		const run = async () => {
+			const { data } = await this.client.get(`${GET_LIVE_ROOM_INFO_STREAM_KEY}?id=${roomId}`);
+			return data;
+		};
+		return await this.pRetry(run, {
+			onFailedAttempt: (error) => {
+				this.logger.error(`getLiveRoomInfoStreamKey() 第${error.attemptNumber}次失败: ${error.message}`);
+			},
+			retries: 3
+		});
 	}
 	async getLiveRoomInfoByUids(uids) {
-		const params = uids.map((uid) => `uids[]=${uid}`).join("&");
-		const { data } = await this.client.get(`${GET_LIVE_ROOMS_INFO}?${params}`);
-		return data;
+		const run = async () => {
+			const params = uids.map((uid) => `uids[]=${uid}`).join("&");
+			const { data } = await this.client.get(`${GET_LIVE_ROOMS_INFO}?${params}`);
+			return data;
+		};
+		return await this.pRetry(run, {
+			onFailedAttempt: (error) => {
+				this.logger.error(`getLiveRoomInfoByUids() 第${error.attemptNumber}次失败: ${error.message}`);
+			},
+			retries: 3
+		});
 	}
 	async getServerUTCTime() {
-		const { data } = await this.client.get(GET_SERVER_UTC_TIME);
-		const regex = /Date\.UTC\((.*?)\)/;
-		const match = data.match(regex);
-		if (match) {
-			const timestamp = new Function(`return Date.UTC(${match[1]})`)();
-			return timestamp / 1e3;
-		}
-		throw new Error("解析服务器时间失败！");
+		const run = async () => {
+			const { data } = await this.client.get(GET_SERVER_UTC_TIME);
+			const regex = /Date\.UTC\((.*?)\)/;
+			const match = data.match(regex);
+			if (match) {
+				const timestamp = new Function(`return Date.UTC(${match[1]})`)();
+				return timestamp / 1e3;
+			}
+			throw new this.AbortError("解析服务器时间失败！");
+		};
+		return await this.pRetry(run, {
+			onFailedAttempt: (error) => {
+				this.logger.error(`getServerUTCTime() 第${error.attemptNumber}次失败: ${error.message}`);
+			},
+			retries: 3
+		});
 	}
 	async getTimeNow() {
-		const { data } = await this.client.get(GET_TIME_NOW);
-		return data;
+		const run = async () => {
+			const { data } = await this.client.get(GET_TIME_NOW);
+			return data;
+		};
+		return await this.pRetry(run, {
+			onFailedAttempt: (error) => {
+				this.logger.error(`getTimeNow() 第${error.attemptNumber}次失败: ${error.message}`);
+			},
+			retries: 3
+		});
 	}
 	async getAllGroup() {
-		const { data } = await this.client.get(GET_ALL_GROUP);
-		return data;
+		const run = async () => {
+			const { data } = await this.client.get(GET_ALL_GROUP);
+			return data;
+		};
+		return await this.pRetry(run, {
+			onFailedAttempt: (error) => {
+				this.logger.error(`getAllGroup() 第${error.attemptNumber}次失败: ${error.message}`);
+			},
+			retries: 3
+		});
 	}
 	async removeUserFromGroup(mid) {
-		const csrf = this.getCSRF();
-		const { data } = await this.client.post(MODIFY_GROUP_MEMBER, {
-			fids: mid,
-			tagids: 0,
-			csrf
-		}, { headers: { "Content-Type": "application/x-www-form-urlencoded" } });
-		return data;
+		const run = async () => {
+			const csrf = this.getCSRF();
+			const { data } = await this.client.post(MODIFY_GROUP_MEMBER, {
+				fids: mid,
+				tagids: 0,
+				csrf
+			}, { headers: { "Content-Type": "application/x-www-form-urlencoded" } });
+			return data;
+		};
+		return await this.pRetry(run, {
+			onFailedAttempt: (error) => {
+				this.logger.error(`removeUserFromGroup() 第${error.attemptNumber}次失败: ${error.message}`);
+			},
+			retries: 3
+		});
 	}
 	async copyUserToGroup(mid, groupId) {
-		const csrf = this.getCSRF();
-		const { data } = await this.client.post(COPY_USER_TO_GROUP, {
-			fids: mid,
-			tagids: groupId,
-			csrf
-		}, { headers: { "Content-Type": "application/x-www-form-urlencoded" } });
-		return data;
+		const run = async () => {
+			const csrf = this.getCSRF();
+			const { data } = await this.client.post(COPY_USER_TO_GROUP, {
+				fids: mid,
+				tagids: groupId,
+				csrf
+			}, { headers: { "Content-Type": "application/x-www-form-urlencoded" } });
+			return data;
+		};
+		return await this.pRetry(run, {
+			onFailedAttempt: (error) => {
+				this.logger.error(`copyUserToGroup() 第${error.attemptNumber}次失败: ${error.message}`);
+			},
+			retries: 3
+		});
 	}
 	async getUserSpaceDynamic(mid) {
-		const { data } = await this.client.get(`${GET_USER_SPACE_DYNAMIC_LIST}&host_mid=${mid}`);
-		return data;
+		const run = async () => {
+			const { data } = await this.client.get(`${GET_USER_SPACE_DYNAMIC_LIST}&host_mid=${mid}`);
+			return data;
+		};
+		return await this.pRetry(run, {
+			onFailedAttempt: (error) => {
+				this.logger.error(`getUserSpaceDynamic() 第${error.attemptNumber}次失败: ${error.message}`);
+			},
+			retries: 3
+		});
 	}
 	async createGroup(tag) {
-		const { data } = await this.client.post(CREATE_GROUP, {
-			tag,
-			csrf: this.getCSRF()
-		}, { headers: { "Content-Type": "application/x-www-form-urlencoded" } });
-		return data;
+		const run = async () => {
+			const { data } = await this.client.post(CREATE_GROUP, {
+				tag,
+				csrf: this.getCSRF()
+			}, { headers: { "Content-Type": "application/x-www-form-urlencoded" } });
+			return data;
+		};
+		return await this.pRetry(run, {
+			onFailedAttempt: (error) => {
+				this.logger.error(`createGroup() 第${error.attemptNumber}次失败: ${error.message}`);
+			},
+			retries: 3
+		});
 	}
 	async getAllDynamic() {
-		const { data } = await this.client.get(GET_ALL_DYNAMIC_LIST);
-		return data;
+		const run = async () => {
+			const { data } = await this.client.get(GET_ALL_DYNAMIC_LIST);
+			return data;
+		};
+		return await this.pRetry(run, {
+			onFailedAttempt: (error) => {
+				this.logger.error(`getAllDynamic() 第${error.attemptNumber}次失败: ${error.message}`);
+			},
+			retries: 3
+		});
 	}
 	async hasNewDynamic(updateBaseline) {
-		const { data } = await this.client.get(`${HAS_NEW_DYNAMIC}?update_baseline=${updateBaseline}`);
-		return data;
+		const run = async () => {
+			const { data } = await this.client.get(`${HAS_NEW_DYNAMIC}?update_baseline=${updateBaseline}`);
+			return data;
+		};
+		return await this.pRetry(run, {
+			onFailedAttempt: (error) => {
+				this.logger.error(`hasNewDynamic() 第${error.attemptNumber}次失败: ${error.message}`);
+			},
+			retries: 3
+		});
 	}
 	async follow(fid) {
-		const { data } = await this.client.post(MODIFY_RELATION, {
-			fid,
-			act: 1,
-			re_src: 11,
-			csrf: this.getCSRF()
-		}, { headers: { "Content-Type": "application/x-www-form-urlencoded" } });
-		return data;
+		const run = async () => {
+			const { data } = await this.client.post(MODIFY_RELATION, {
+				fid,
+				act: 1,
+				re_src: 11,
+				csrf: this.getCSRF()
+			}, { headers: { "Content-Type": "application/x-www-form-urlencoded" } });
+			return data;
+		};
+		return await this.pRetry(run, {
+			onFailedAttempt: (error) => {
+				this.logger.error(`follow() 第${error.attemptNumber}次失败: ${error.message}`);
+			},
+			retries: 3
+		});
 	}
 	async getRelationGroupDetail(tagid) {
-		const { data } = await this.client.get(`${GET_RELATION_GROUP_DETAIL}?tagid=${tagid}`);
-		return data;
+		const run = async () => {
+			const { data } = await this.client.get(`${GET_RELATION_GROUP_DETAIL}?tagid=${tagid}`);
+			return data;
+		};
+		return await this.pRetry(run, {
+			onFailedAttempt: (error) => {
+				this.logger.error(`getRelationGroupDetail() 第${error.attemptNumber}次失败: ${error.message}`);
+			},
+			retries: 3
+		});
 	}
 	async getCookieInfo(refreshToken) {
-		const { data } = await this.client.get(`${GET_COOKIES_INFO}?csrf=${refreshToken}`).catch((e) => {
-			this.logger.info(e.message);
-			return null;
+		const run = async () => {
+			const { data } = await this.client.get(`${GET_COOKIES_INFO}?csrf=${refreshToken}`).catch((e) => {
+				this.logger.info(e.message);
+				return null;
+			});
+			return data;
+		};
+		return await this.pRetry(run, {
+			onFailedAttempt: (error) => {
+				this.logger.error(`getCookieInfo() 第${error.attemptNumber}次失败: ${error.message}`);
+			},
+			retries: 3
 		});
-		return data;
 	}
 	async getUserInfo(mid) {
-		if (mid === "11783021") {
-			console.log("检测到番剧出差UID，跳过远程用户接口访问");
-			return bangumiTripData;
-		}
-		const wbi = await this.getWbi({ mid });
-		const { data } = await this.client.get(`${GET_USER_INFO}?${wbi}`);
-		return data;
+		const run = async () => {
+			if (mid === "11783021") {
+				console.log("检测到番剧出差UID，跳过远程用户接口访问");
+				return bangumiTripData;
+			}
+			const wbi = await this.getWbi({ mid });
+			const { data } = await this.client.get(`${GET_USER_INFO}?${wbi}`);
+			return data;
+		};
+		return await this.pRetry(run, {
+			onFailedAttempt: (error) => {
+				this.logger.error(`getUserInfo() 第${error.attemptNumber}次失败: ${error.message}`);
+			},
+			retries: 3
+		});
 	}
 	async getWbiKeys() {
-		const { data } = await this.client.get("https://api.bilibili.com/x/web-interface/nav");
-		const { data: { wbi_img: { img_url, sub_url } } } = data;
-		return {
-			img_key: img_url.slice(img_url.lastIndexOf("/") + 1, img_url.lastIndexOf(".")),
-			sub_key: sub_url.slice(sub_url.lastIndexOf("/") + 1, sub_url.lastIndexOf("."))
+		const run = async () => {
+			const { data } = await this.client.get("https://api.bilibili.com/x/web-interface/nav");
+			const { data: { wbi_img: { img_url, sub_url } } } = data;
+			return {
+				img_key: img_url.slice(img_url.lastIndexOf("/") + 1, img_url.lastIndexOf(".")),
+				sub_key: sub_url.slice(sub_url.lastIndexOf("/") + 1, sub_url.lastIndexOf("."))
+			};
 		};
+		return await this.pRetry(run, {
+			onFailedAttempt: (error) => {
+				this.logger.error(`getWbiKeys() 第${error.attemptNumber}次失败: ${error.message}`);
+			},
+			retries: 3
+		});
 	}
 	async getMyselfInfo() {
-		const { data } = await this.client.get(GET_MYSELF_INFO);
-		return data;
+		const run = async () => {
+			const { data } = await this.client.get(GET_MYSELF_INFO);
+			return data;
+		};
+		return await this.pRetry(run, {
+			onFailedAttempt: (error) => {
+				this.logger.error(`getMyselfInfo() 第${error.attemptNumber}次失败: ${error.message}`);
+			},
+			retries: 3
+		});
 	}
 	async getLoginQRCode() {
-		const { data } = await this.client.get(GET_LOGIN_QRCODE);
-		return data;
+		const run = async () => {
+			const { data } = await this.client.get(GET_LOGIN_QRCODE);
+			return data;
+		};
+		return await this.pRetry(run, {
+			onFailedAttempt: (error) => {
+				this.logger.error(`getLoginQRCode() 第${error.attemptNumber}次失败: ${error.message}`);
+			},
+			retries: 3
+		});
 	}
 	async getLoginStatus(qrcodeKey) {
-		const { data } = await this.client.get(`${GET_LOGIN_STATUS}?qrcode_key=${qrcodeKey}`);
-		return data;
+		const run = async () => {
+			const { data } = await this.client.get(`${GET_LOGIN_STATUS}?qrcode_key=${qrcodeKey}`);
+			return data;
+		};
+		return await this.pRetry(run, {
+			onFailedAttempt: (error) => {
+				this.logger.error(`getLoginStatus() 第${error.attemptNumber}次失败: ${error.message}`);
+			},
+			retries: 3
+		});
 	}
 	async getLiveRoomInfo(roomId) {
-		const { data } = await this.client.get(`${GET_LIVE_ROOM_INFO}?room_id=${roomId}`);
-		return data;
+		const run = async () => {
+			const { data } = await this.client.get(`${GET_LIVE_ROOM_INFO}?room_id=${roomId}`);
+			return data;
+		};
+		return await this.pRetry(run, {
+			onFailedAttempt: (error) => {
+				this.logger.error(`getLiveRoomInfo() 第${error.attemptNumber}次失败: ${error.message}`);
+			},
+			retries: 3
+		});
 	}
 	async getMasterInfo(mid) {
-		const { data } = await this.client.get(`${GET_MASTER_INFO}?uid=${mid}`);
-		return data;
+		const run = async () => {
+			const { data } = await this.client.get(`${GET_MASTER_INFO}?uid=${mid}`);
+			return data;
+		};
+		return await this.pRetry(run, {
+			onFailedAttempt: (error) => {
+				this.logger.error(`getMasterInfo() 第${error.attemptNumber}次失败: ${error.message}`);
+			},
+			retries: 3
+		});
 	}
 	disposeNotifier() {
 		if (this.loginNotifier) this.loginNotifier.dispose();
@@ -3788,138 +3976,6 @@ var BiliAPI = class extends Service {
 		return { data: data.data };
 	}
 };
-_decorate([Retry({
-	attempts: 3,
-	onFailure(error, attempts) {
-		this.logger.error(`getTheUserWhoIsLiveStreaming() 第${attempts}次失败: ${error.message}`);
-	}
-})], BiliAPI.prototype, "getTheUserWhoIsLiveStreaming", null);
-_decorate([Retry({
-	attempts: 3,
-	onFailure(error, attempts) {
-		this.logger.error(`getLiveRoomInfoStreamKey() 第${attempts}次失败: ${error.message}`);
-	}
-})], BiliAPI.prototype, "getLiveRoomInfoStreamKey", null);
-_decorate([Retry({
-	attempts: 3,
-	onFailure(error, attempts) {
-		this.logger.error(`getLiveRoomInfoByUids() 第${attempts}次失败: ${error.message}`);
-	}
-})], BiliAPI.prototype, "getLiveRoomInfoByUids", null);
-_decorate([Retry({
-	attempts: 3,
-	onFailure(error, attempts) {
-		this.logger.error(`getServerUTCTime() 第${attempts}次失败: ${error.message}`);
-	}
-})], BiliAPI.prototype, "getServerUTCTime", null);
-_decorate([Retry({
-	attempts: 3,
-	onFailure(error, attempts) {
-		this.logger.error(`getTimeNow() 第${attempts}次失败: ${error.message}`);
-	}
-})], BiliAPI.prototype, "getTimeNow", null);
-_decorate([Retry({
-	attempts: 3,
-	onFailure(error, attempts) {
-		this.logger.error(`getAllGroup() 第${attempts}次失败: ${error.message}`);
-	}
-})], BiliAPI.prototype, "getAllGroup", null);
-_decorate([Retry({
-	attempts: 3,
-	onFailure(error, attempts) {
-		this.logger.error(`removeUserFromGroup() 第${attempts}次失败: ${error.message}`);
-	}
-})], BiliAPI.prototype, "removeUserFromGroup", null);
-_decorate([Retry({
-	attempts: 3,
-	onFailure(error, attempts) {
-		this.logger.error(`copyUserToGroup() 第${attempts}次失败: ${error.message}`);
-	}
-})], BiliAPI.prototype, "copyUserToGroup", null);
-_decorate([Retry({
-	attempts: 3,
-	onFailure(error, attempts) {
-		this.logger.error(`getUserSpaceDynamic() 第${attempts}次失败: ${error.message}`);
-	}
-})], BiliAPI.prototype, "getUserSpaceDynamic", null);
-_decorate([Retry({
-	attempts: 3,
-	onFailure(error, attempts) {
-		this.logger.error(`createGroup() 第${attempts}次失败: ${error.message}`);
-	}
-})], BiliAPI.prototype, "createGroup", null);
-_decorate([Retry({
-	attempts: 3,
-	onFailure(error, attempts) {
-		this.logger.error(`getAllDynamic() 第${attempts}次失败: ${error.message}`);
-	}
-})], BiliAPI.prototype, "getAllDynamic", null);
-_decorate([Retry({
-	attempts: 3,
-	onFailure(error, attempts) {
-		this.logger.error(`hasNewDynamic() 第${attempts}次失败: ${error.message}`);
-	}
-})], BiliAPI.prototype, "hasNewDynamic", null);
-_decorate([Retry({
-	attempts: 3,
-	onFailure(error, attempts) {
-		this.logger.error(`follow() 第${attempts}次失败: ${error.message}`);
-	}
-})], BiliAPI.prototype, "follow", null);
-_decorate([Retry({
-	attempts: 3,
-	onFailure(error, attempts) {
-		this.logger.error(`getRelationGroupDetail() 第${attempts}次失败: ${error.message}`);
-	}
-})], BiliAPI.prototype, "getRelationGroupDetail", null);
-_decorate([Retry({
-	attempts: 3,
-	onFailure(error, attempts) {
-		this.logger.error(`getCookieInfo() 第${attempts}次失败: ${error.message}`);
-	}
-})], BiliAPI.prototype, "getCookieInfo", null);
-_decorate([Retry({
-	attempts: 3,
-	onFailure(error, attempts) {
-		this.logger.error(`getUserInfo() 第${attempts}次失败: ${error.message}`);
-	}
-})], BiliAPI.prototype, "getUserInfo", null);
-_decorate([Retry({
-	attempts: 3,
-	onFailure(error, attempts) {
-		this.logger.error(`getWbiKeys() 第${attempts}次失败: ${error.message}`);
-	}
-})], BiliAPI.prototype, "getWbiKeys", null);
-_decorate([Retry({
-	attempts: 3,
-	onFailure(error, attempts) {
-		this.logger.error(`getMyselfInfo() 第${attempts}次失败: ${error.message}`);
-	}
-})], BiliAPI.prototype, "getMyselfInfo", null);
-_decorate([Retry({
-	attempts: 3,
-	onFailure(error, attempts) {
-		this.logger.error(`getLoginQRCode() 第${attempts}次失败: ${error.message}`);
-	}
-})], BiliAPI.prototype, "getLoginQRCode", null);
-_decorate([Retry({
-	attempts: 3,
-	onFailure(error, attempts) {
-		this.logger.error(`getLoginStatus() 第${attempts}次失败: ${error.message}`);
-	}
-})], BiliAPI.prototype, "getLoginStatus", null);
-_decorate([Retry({
-	attempts: 3,
-	onFailure(error, attempts) {
-		this.logger.error(`getLiveRoomInfo() 第${attempts}次失败: ${error.message}`);
-	}
-})], BiliAPI.prototype, "getLiveRoomInfo", null);
-_decorate([Retry({
-	attempts: 3,
-	onFailure(error, attempts) {
-		this.logger.error(`getMasterInfo() 第${attempts}次失败: ${error.message}`);
-	}
-})], BiliAPI.prototype, "getMasterInfo", null);
 (function(_BiliAPI) {
 	const Config$1 = _BiliAPI.Config = Schema.object({
 		userAgent: Schema.string(),
@@ -3931,17 +3987,17 @@ var bili_api_default = BiliAPI;
 //#endregion
 //#region src/bili_live.ts
 var BLive = class extends Service {
-	static inject = ["ba"];
+	static inject = ["bilibili-notify-api"];
 	listenerRecord = {};
 	constructor(ctx) {
-		super(ctx, "bl");
+		super(ctx, "bilibili-notify-live");
 	}
 	stop() {
 		for (const key of Object.keys(this.listenerRecord)) this.closeListener(key);
 	}
 	async startLiveRoomListener(roomId, handler) {
-		const cookiesStr = await this.ctx.ba.getCookiesForHeader();
-		const mySelfInfo = await this.ctx.ba.getMyselfInfo();
+		const cookiesStr = await this.ctx["bilibili-notify-api"].getCookiesForHeader();
+		const mySelfInfo = await this.ctx["bilibili-notify-api"].getMyselfInfo();
 		this.listenerRecord[roomId] = startListen(Number.parseInt(roomId), handler, { ws: {
 			headers: { Cookie: cookiesStr },
 			uid: mySelfInfo.data.mid
@@ -3977,8 +4033,8 @@ let globalConfig;
 var ServerManager = class extends Service {
 	servers = [];
 	constructor(ctx) {
-		super(ctx, "sm");
-		const sysCom = ctx.command("bn", "bili-notify插件运行相关指令", { permissions: ["authority:5"] });
+		super(ctx, "bilibili-notify");
+		const sysCom = ctx.command("bn", "bilibili-notify 插件运行相关指令", { permissions: ["authority:5"] });
 		sysCom.subcommand(".restart", "重启插件").usage("重启插件").example("bn restart").action(async () => {
 			this.logger.info("调用 bn restart 指令");
 			if (await this.restartPlugin()) return "插件重启成功";
@@ -4021,7 +4077,7 @@ var ServerManager = class extends Service {
 				advancedSub: globalConfig.advancedSub,
 				subs: globalConfig.subs,
 				master: globalConfig.master,
-				wordcloud: globalConfig.wordcloud,
+				wordcloudStopWords: globalConfig.wordcloudStopWords,
 				liveSummary: globalConfig.liveSummary,
 				liveDetectType: globalConfig.liveDetectType,
 				restartPush: globalConfig.restartPush,