koishi-plugin-bilibili-notify 3.5.0-alpha.1 → 3.6.0-alpha.0

package/lib/index.cjs

@@ -40,6 +40,8 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 //#endregion
 let koishi = require("koishi");
 require("@koishijs/plugin-notifier");
+let __koishijs_plugin_console = require("@koishijs/plugin-console");
+let node_path = require("node:path");
 require("@koishijs/plugin-help");
 let blive_message_listener = require("blive-message-listener");
 let qrcode = require("qrcode");
@@ -49,7 +51,6 @@ let luxon = require("luxon");
 let __node_rs_jieba = require("@node-rs/jieba");
 let __node_rs_jieba_dict = require("@node-rs/jieba/dict");
 require("koishi-plugin-puppeteer");
-let node_path = require("node:path");
 let node_url = require("node:url");
 let md5 = require("md5");
 md5 = __toESM(md5);
@@ -70,7 +71,7 @@ openai = __toESM(openai);
 const BAConfigSchema = koishi.Schema.object({
 	require: koishi.Schema.object({}).description("必填设置"),
 	key: koishi.Schema.string().pattern(/^[0-9a-f]{32}$/).role("secret").required().description("请输入一个32位小写字母的十六进制密钥（例如：9b8db7ae562b9864efefe06289cc5530），使用此密钥将你的B站登录信息存储在数据库中，请一定保存好此密钥。如果你忘记了此密钥，必须重新登录。你可以自行生成，或到这个网站生成：https://www.sexauth.com/"),
-	master: koishi.Schema.intersect([koishi.Schema.object({ enable: koishi.Schema.boolean().default(false).description("是否开启主人账号功能，如果您的机器人没有私聊权限请不要开启此功能。开启后如果机器人运行错误会向您进行报告") }).description("主人账号"), koishi.Schema.union([koishi.Schema.object({
+	master: koishi.Schema.intersect([koishi.Schema.object({ enable: koishi.Schema.boolean().default(false).description("是否开启主人账号功能，开启后如果机器人运行错误会向您进行报告。如果您的机器人没有私聊权限请不要开启此功能") }).description("主人账号"), koishi.Schema.union([koishi.Schema.object({
 		enable: koishi.Schema.const(true).required(),
 		platform: koishi.Schema.union([
 			"qq",
@@ -98,19 +99,19 @@ const BAConfigSchema = koishi.Schema.object({
 	subTitle: koishi.Schema.object({}).description("订阅配置"),
 	advancedSub: koishi.Schema.boolean().default(false).description("是否开启高级订阅，高级订阅是独立于本插件的一个专门用于订阅配置的插件，用于高度自定义订阅消息。若开启高级订阅，请打开该选项并下载插件 bilibili-notify-advanced-subscription"),
 	subs: koishi.Schema.array(koishi.Schema.object({
-		name: koishi.Schema.string().required().description("备注"),
+		name: koishi.Schema.string().required().description("UP昵称"),
 		uid: koishi.Schema.string().required().description("UID和roomid"),
 		dynamic: koishi.Schema.boolean().default(true).description("动态"),
-		dynamicAtAll: koishi.Schema.boolean().default(false).description("动态At全体"),
+		dynamicAtAll: koishi.Schema.boolean().default(false).description("动态@全体"),
 		live: koishi.Schema.boolean().default(true).description("直播"),
-		liveAtAll: koishi.Schema.boolean().default(true).description("直播At全体"),
+		liveAtAll: koishi.Schema.boolean().default(true).description("直播@全体"),
 		liveGuardBuy: koishi.Schema.boolean().default(false).description("上舰消息"),
 		superchat: koishi.Schema.boolean().default(false).description("SC消息"),
 		wordcloud: koishi.Schema.boolean().default(true).description("弹幕词云"),
 		liveSummary: koishi.Schema.boolean().default(true).description("直播总结"),
 		platform: koishi.Schema.string().required().description("平台名"),
 		target: koishi.Schema.string().required().description("群号/频道号")
-	})).role("table").description("输入订阅信息，自定义订阅内容； UID和roomid，如果经常在初始化插件遇到风控问题，请补充直播间房间号，使用英文逗号分隔例如,1234567,114514 群号/频道号格式：频道号,频道号 使用英文逗号分隔，例如 1234567,2345678"),
+	})).role("table").description("请在这里填写订阅信息；UP昵称是必填项，影响通知时显示的UP主昵称；UID和roomid，请填写订阅用户的UID，如果经常在初始化插件遇到风控问题，请补充直播间房间号，使用英文逗号分隔例如：1234567,114514；平台名，请填写adapter-xxxx中的xxxx，例如你的机器人使用的是adapter-onebot就填写onebot；群号/频道号，直接填写即可，如果有多个群聊或频道请使用英文逗号分隔，例如：1234567,2345678"),
 	dynamic: koishi.Schema.object({}).description("动态推送设置"),
 	dynamicUrl: koishi.Schema.boolean().default(false).description("发送动态时是否同时发送链接。注意：如果使用的是QQ官方机器人不能开启此项！"),
 	dynamicCron: koishi.Schema.string().default("*/2 * * * *").description("动态监测时间，请填入cron表达式，请勿填入过短时间"),
@@ -164,6 +165,67 @@ const BAConfigSchema = koishi.Schema.object({
 	dynamicDebugMode: koishi.Schema.boolean().default(false).description("动态调试模式，开启后会在控制台输出动态推送的详细信息，用于调试")
 });
 
+//#endregion
+//#region src/type/index.ts
+let LiveType = /* @__PURE__ */ function(LiveType$1) {
+	LiveType$1[LiveType$1["NotLiveBroadcast"] = 0] = "NotLiveBroadcast";
+	LiveType$1[LiveType$1["StartBroadcasting"] = 1] = "StartBroadcasting";
+	LiveType$1[LiveType$1["LiveBroadcast"] = 2] = "LiveBroadcast";
+	LiveType$1[LiveType$1["StopBroadcast"] = 3] = "StopBroadcast";
+	LiveType$1[LiveType$1["FirstLiveBroadcast"] = 4] = "FirstLiveBroadcast";
+	return LiveType$1;
+}({});
+let PushType = /* @__PURE__ */ function(PushType$1) {
+	PushType$1[PushType$1["Live"] = 0] = "Live";
+	PushType$1[PushType$1["Dynamic"] = 1] = "Dynamic";
+	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["WordCloudAndLiveSummary"] = 5] = "WordCloudAndLiveSummary";
+	PushType$1[PushType$1["Superchat"] = 6] = "Superchat";
+	return PushType$1;
+}({});
+const PushTypeMsg = {
+	[PushType.Live]: "直播推送",
+	[PushType.Dynamic]: "动态推送",
+	[PushType.DynamicAtAll]: "动态推送+At全体",
+	[PushType.StartBroadcasting]: "开播推送",
+	[PushType.LiveGuardBuy]: "上舰推送",
+	[PushType.WordCloudAndLiveSummary]: "弹幕词云和直播总结推送",
+	[PushType.Superchat]: "SC推送"
+};
+let BiliLoginStatus = /* @__PURE__ */ function(BiliLoginStatus$1) {
+	BiliLoginStatus$1[BiliLoginStatus$1["NOT_LOGIN"] = 0] = "NOT_LOGIN";
+	BiliLoginStatus$1[BiliLoginStatus$1["LOADING_LOGIN_INFO"] = 1] = "LOADING_LOGIN_INFO";
+	BiliLoginStatus$1[BiliLoginStatus$1["LOGIN_QR"] = 2] = "LOGIN_QR";
+	BiliLoginStatus$1[BiliLoginStatus$1["LOGGING_QR"] = 3] = "LOGGING_QR";
+	BiliLoginStatus$1[BiliLoginStatus$1["LOGGING_IN"] = 4] = "LOGGING_IN";
+	BiliLoginStatus$1[BiliLoginStatus$1["LOGGED_IN"] = 5] = "LOGGED_IN";
+	BiliLoginStatus$1[BiliLoginStatus$1["LOGIN_SUCCESS"] = 6] = "LOGIN_SUCCESS";
+	BiliLoginStatus$1[BiliLoginStatus$1["LOGIN_FAILED"] = 7] = "LOGIN_FAILED";
+	return BiliLoginStatus$1;
+}({});
+
+//#endregion
+//#region src/data_server.ts
+/** biome-ignore-all assist/source/organizeImports: <import> */
+var BilibiliNotifyDataServer = class extends __koishijs_plugin_console.DataService {
+	biliData = {
+		status: BiliLoginStatus.LOADING_LOGIN_INFO,
+		msg: "正在加载登录信息..."
+	};
+	constructor(ctx) {
+		super(ctx, "bilibili-notify");
+		ctx.on("bilibili-notify/login-status-report", (data) => {
+			this.biliData = data;
+			this.refresh();
+		});
+	}
+	async get() {
+		return this.biliData;
+	}
+};
+
 //#endregion
 //#region src/utils/index.ts
 /**
@@ -204,7 +266,7 @@ async function withRetry(fn, maxAttempts = 3, delayMs = 1e3) {
 	} catch (error) {
 		attempt++;
 		if (attempt >= maxAttempts) throw error;
-		await new Promise((resolve$1) => setTimeout(resolve$1, delayMs * attempt));
+		await new Promise((resolve$2) => setTimeout(resolve$2, delayMs * attempt));
 	}
 }
 function replaceButKeep(oldObj, newObj, keepKeys) {
@@ -213,36 +275,6 @@ function replaceButKeep(oldObj, newObj, keepKeys) {
 	return result;
 }
 
-//#endregion
-//#region src/type/index.ts
-let LiveType = /* @__PURE__ */ function(LiveType$1) {
-	LiveType$1[LiveType$1["NotLiveBroadcast"] = 0] = "NotLiveBroadcast";
-	LiveType$1[LiveType$1["StartBroadcasting"] = 1] = "StartBroadcasting";
-	LiveType$1[LiveType$1["LiveBroadcast"] = 2] = "LiveBroadcast";
-	LiveType$1[LiveType$1["StopBroadcast"] = 3] = "StopBroadcast";
-	LiveType$1[LiveType$1["FirstLiveBroadcast"] = 4] = "FirstLiveBroadcast";
-	return LiveType$1;
-}({});
-let PushType = /* @__PURE__ */ function(PushType$1) {
-	PushType$1[PushType$1["Live"] = 0] = "Live";
-	PushType$1[PushType$1["Dynamic"] = 1] = "Dynamic";
-	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["WordCloudAndLiveSummary"] = 5] = "WordCloudAndLiveSummary";
-	PushType$1[PushType$1["Superchat"] = 6] = "Superchat";
-	return PushType$1;
-}({});
-const PushTypeMsg = {
-	[PushType.Live]: "直播推送",
-	[PushType.Dynamic]: "动态推送",
-	[PushType.DynamicAtAll]: "动态推送+At全体",
-	[PushType.StartBroadcasting]: "开播推送",
-	[PushType.LiveGuardBuy]: "上舰推送",
-	[PushType.WordCloudAndLiveSummary]: "弹幕词云和直播总结推送",
-	[PushType.Superchat]: "SC推送"
-};
-
 //#endregion
 //#region src/stop_words.ts
 const stopwords = new Set([
@@ -442,68 +474,6 @@ var ComRegister = class ComRegister {
 			await session.send(`Channel ID: ${session.event.channel.id}`);
 		});
 		const biliCom = ctx.command("bili", "bili-notify插件相关指令", { permissions: ["authority:3"] });
-		biliCom.subcommand(".login", "登录B站之后才可以进行之后的操作").usage("使用二维码登录，登录B站之后才可以进行之后的操作").example("bili login").action(async ({ session }) => {
-			this.logger.info("调用bili login指令");
-			let content;
-			try {
-				content = await ctx["bilibili-notify-api"].getLoginQRCode();
-			} catch (_) {
-				return "bili login getLoginQRCode() 本次网络请求失败";
-			}
-			if (content.code !== 0) return await session.send("出问题咯！");
-			qrcode.default.toBuffer(content.data.url, {
-				errorCorrectionLevel: "H",
-				type: "png",
-				margin: 1,
-				color: {
-					dark: "#000000",
-					light: "#FFFFFF"
-				}
-			}, async (err, buffer) => {
-				if (err) return await session.send("二维码生成出错，请重新尝试");
-				await session.send(koishi.h.image(buffer, "image/jpeg"));
-			});
-			if (this.loginTimer) this.loginTimer();
-			let flag = true;
-			this.loginTimer = ctx.setInterval(async () => {
-				try {
-					if (!flag) return;
-					flag = false;
-					let loginContent;
-					try {
-						loginContent = await ctx["bilibili-notify-api"].getLoginStatus(content.data.qrcode_key);
-					} catch (e) {
-						this.logger.error(e);
-						return;
-					}
-					if (loginContent.code !== 0) {
-						this.loginTimer();
-						return await session.send("登录失败请重试");
-					}
-					if (loginContent.data.code === 86038) {
-						this.loginTimer();
-						return await session.send("二维码已失效，请重新登录");
-					}
-					if (loginContent.data.code === 0) {
-						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["bilibili-notify-api"].loadCookiesFromDatabase();
-						await this.checkIfLoginInfoIsLoaded();
-						this.loginTimer();
-						ctx["bilibili-notify-api"].disposeNotifier();
-						await session.send("登录成功，请重启插件");
-					}
-				} finally {
-					flag = true;
-				}
-			}, 1e3);
-		});
 		biliCom.subcommand(".list", "展示订阅对象").usage("展示订阅对象").example("bili list").action(() => {
 			return this.subShow();
 		});
@@ -521,7 +491,7 @@ var ComRegister = class ComRegister {
 					break;
 				}
 				subLiveUsers.push({
-					uid: Number.parseInt(uid),
+					uid: Number.parseInt(uid, 10),
 					uname: sub.uname,
 					onLive
 				});
@@ -746,6 +716,7 @@ var ComRegister = class ComRegister {
 		this.logger = this.ctx.logger("bilibili-notify-core");
 		this.logger.info("初始化插件中...");
 		this.config = config;
+		this.registeringForEvents();
 		this.privateBot = this.ctx.bots.find((bot) => bot.platform === config.master.platform);
 		if (!this.privateBot) this.ctx.notifier.create({ content: "您未配置私人机器人，将无法向您推送机器人状态！" });
 		this.loginDBData = (await this.ctx.database.get("loginBili", 1, ["dynamic_group_id"]))[0];
@@ -754,9 +725,19 @@ var ComRegister = class ComRegister {
 			this.logger.info("账号未登录，请登录");
 			return;
 		}
+		const personalInfo = await this.ctx["bilibili-notify-api"].getMyselfInfo();
+		if (personalInfo.code !== 0) this.ctx.emit("bilibili-notify/login-status-report", {
+			status: BiliLoginStatus.LOGGED_IN,
+			msg: "已登录，但获取个人信息失败"
+		});
+		const myCardInfo = await this.ctx["bilibili-notify-api"].getUserCardInfo(personalInfo.data.mid.toString(), true);
+		this.ctx.emit("bilibili-notify/login-status-report", {
+			status: BiliLoginStatus.LOGGED_IN,
+			msg: "已登录",
+			data: myCardInfo.data
+		});
 		this.mergeStopWords(config.wordcloudStopWords);
 		this.initAllManager();
-		this.registeringForEvents();
 		if (config.advancedSub) {
 			this.logger.info("开启高级订阅，等待加载订阅...");
 			this.ctx.emit("bilibili-notify/ready-to-recive");
@@ -766,6 +747,107 @@ var ComRegister = class ComRegister {
 		} else this.logger.info("初始化完毕，未添加任何订阅！");
 	}
 	registeringForEvents() {
+		this.ctx.console.addListener("bilibili-notify/start-login", async () => {
+			this.logger.info("调用bili login指令");
+			let content;
+			try {
+				content = await this.ctx["bilibili-notify-api"].getLoginQRCode();
+			} catch (_) {
+				return "bili login getLoginQRCode() 本次网络请求失败";
+			}
+			if (content.code !== 0) return this.ctx.emit("bilibili-notify/login-status-report", {
+				status: BiliLoginStatus.LOGIN_FAILED,
+				msg: "获取二维码失败"
+			});
+			qrcode.default.toBuffer(content.data.url, {
+				errorCorrectionLevel: "H",
+				type: "png",
+				margin: 1,
+				color: {
+					dark: "#000000",
+					light: "#FFFFFF"
+				}
+			}, async (err, buffer) => {
+				if (err) {
+					this.logger.error("生成二维码失败", err);
+					return this.ctx.emit("bilibili-notify/login-status-report", {
+						status: BiliLoginStatus.LOGIN_FAILED,
+						msg: "生成二维码失败"
+					});
+				}
+				const url = "data:image/png;base64," + Buffer.from(buffer).toString("base64");
+				this.ctx.emit("bilibili-notify/login-status-report", {
+					status: BiliLoginStatus.LOGIN_QR,
+					msg: "请使用Bilibili App扫码登录",
+					data: url
+				});
+			});
+			if (this.loginTimer) this.loginTimer();
+			let flag = true;
+			this.loginTimer = this.ctx.setInterval(async () => {
+				try {
+					if (!flag) return;
+					flag = false;
+					let loginContent;
+					try {
+						loginContent = await this.ctx["bilibili-notify-api"].getLoginStatus(content.data.qrcode_key);
+					} catch (e) {
+						this.logger.error(e);
+						return;
+					}
+					if (loginContent.data.code === 86101) return this.ctx.emit("bilibili-notify/login-status-report", {
+						status: BiliLoginStatus.LOGGING_QR,
+						msg: "未扫码"
+					});
+					if (loginContent.data.code === 86090) return this.ctx.emit("bilibili-notify/login-status-report", {
+						status: BiliLoginStatus.LOGGING_QR,
+						msg: "二维码已扫码未确认"
+					});
+					if (loginContent.data.code === 86038) {
+						this.loginTimer();
+						return this.ctx.emit("bilibili-notify/login-status-report", {
+							status: BiliLoginStatus.LOGIN_FAILED,
+							msg: "二维码已失效，请重新登录"
+						});
+					}
+					if (loginContent.data.code === 0) {
+						const encryptedCookies = this.ctx["bilibili-notify-api"].encrypt(this.ctx["bilibili-notify-api"].getCookies());
+						const encryptedRefreshToken = this.ctx["bilibili-notify-api"].encrypt(loginContent.data.refresh_token);
+						await this.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["bilibili-notify-api"].loadCookiesFromDatabase();
+						await this.checkIfLoginInfoIsLoaded();
+						this.loginTimer();
+						this.ctx["bilibili-notify-api"].disposeNotifier();
+						this.ctx.emit("bilibili-notify/login-status-report", {
+							status: BiliLoginStatus.LOGIN_SUCCESS,
+							msg: "已登录，请点击按钮重启插件(5s后自动重启)"
+						});
+						await this.ctx["bilibili-notify"].restartPlugin();
+					}
+					if (loginContent.code !== 0) {
+						this.loginTimer();
+						return this.ctx.emit("bilibili-notify/login-status-report", {
+							status: BiliLoginStatus.LOGIN_FAILED,
+							msg: "登录失败，请重试"
+						});
+					}
+				} finally {
+					flag = true;
+				}
+			}, 1e3);
+		});
+		this.ctx.console.addListener("bilibili-notify/restart-plugin", async () => {
+			await this.ctx["bilibili-notify"].restartPlugin();
+		});
+		this.ctx.console.addListener("bilibili-notify/request-cors", async (url) => {
+			const buffer = await (await fetch(url)).arrayBuffer();
+			return "data:image/png;base64," + Buffer.from(buffer).toString("base64");
+		});
 		this.ctx.on("dispose", () => {
 			if (this.loginTimer) this.loginTimer();
 			if (this.dynamicJob) this.dynamicJob.stop();
@@ -1336,7 +1418,7 @@ var ComRegister = class ComRegister {
 		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 && !this.stopwords.has(word)).map((w) => {
+		this._jieba.cut(danmaku, true).filter((word) => word.length >= 2 && !this.stopwords.has(word)).forEach((w) => {
 			danmakuWeightRecord[w] = (danmakuWeightRecord[w] || 0) + 1;
 		});
 	}
@@ -1416,8 +1498,12 @@ var ComRegister = class ComRegister {
 				return customLiveSummary.replace("-dmc", `${danmakuSenderCount}`).replace("-mdn", masterInfo.medalName).replace("-dca", `${danmakuCount}`).replace("-un1", top5DanmakuSender[0][0]).replace("-dc1", `${top5DanmakuSender[0][1]}`).replace("-un2", top5DanmakuSender[1][0]).replace("-dc2", `${top5DanmakuSender[1][1]}`).replace("-un3", top5DanmakuSender[2][0]).replace("-dc3", `${top5DanmakuSender[2][1]}`).replace("-un4", top5DanmakuSender[3][0]).replace("-dc4", `${top5DanmakuSender[3][1]}`).replace("-un5", top5DanmakuSender[4][0]).replace("-dc5", `${top5DanmakuSender[4][1]}`).replaceAll("\\n", "\n");
 			})();
 			await this.broadcastToTargets(sub.uid, [img, summary], PushType.WordCloudAndLiveSummary);
-			Object.keys(danmakuWeightRecord).forEach((key) => delete danmakuWeightRecord[key]);
-			Object.keys(danmakuSenderRecord).forEach((key) => delete danmakuSenderRecord[key]);
+			Object.keys(danmakuWeightRecord).forEach((key) => {
+				delete danmakuWeightRecord[key];
+			});
+			Object.keys(danmakuSenderRecord).forEach((key) => {
+				delete danmakuSenderRecord[key];
+			});
 		};
 		const pushAtTimeFunc = async () => {
 			if (!await useLiveRoomInfo(LiveType.LiveBroadcast) && !await useMasterInfo(LiveType.LiveBroadcast)) {
@@ -1635,10 +1721,10 @@ var ComRegister = class ComRegister {
 		this.subNotifier = this.ctx.notifier.create(table);
 	}
 	async checkIfLoginInfoIsLoaded() {
-		return new Promise((resolve$1) => {
+		return new Promise((resolve$2) => {
 			const check = () => {
 				if (!this.ctx["bilibili-notify-api"].getLoginInfoIsLoaded()) this.ctx.setTimeout(check, 500);
-				else resolve$1("success");
+				else resolve$2("success");
 			};
 			check();
 		});
@@ -1998,7 +2084,7 @@ var GenerateImg = class GenerateImg extends koishi.Service {
                         margin: 0;
                         padding: 0;
                         box-sizing: border-box;
-                        font-family: \"${this.giConfig.font}\", "Microsoft YaHei", "Source Han Sans", "Noto Sans CJK", sans-serif;
+                        font-family: "${this.giConfig.font}", "Microsoft YaHei", "Source Han Sans", "Noto Sans CJK", sans-serif;
                     }
         
                     html {
@@ -2161,7 +2247,7 @@ var GenerateImg = class GenerateImg extends koishi.Service {
                         margin: 0;
                         padding: 0;
                         box-sizing: border-box;
-                        font-family: \"${this.giConfig.font}\", "Microsoft YaHei", "Source Han Sans", "Noto Sans CJK", sans-serif;
+                        font-family: "${this.giConfig.font}", "Microsoft YaHei", "Source Han Sans", "Noto Sans CJK", sans-serif;
                     }
 
                     html {
@@ -2597,7 +2683,7 @@ var GenerateImg = class GenerateImg extends koishi.Service {
                 margin: 0;
                 padding: 0;
                 box-sizing: border-box;
-                font-family: \"${this.giConfig.font}\", "Microsoft YaHei", "Source Han Sans", "Noto Sans CJK", sans-serif;
+                font-family: "${this.giConfig.font}", "Microsoft YaHei", "Source Han Sans", "Noto Sans CJK", sans-serif;
             }
 
             html {
@@ -2960,7 +3046,7 @@ var GenerateImg = class GenerateImg extends koishi.Service {
                 margin: 0;
                 padding: 0;
                 box-sizing: border-box;
-                font-family: \"${this.giConfig.font}\", "Microsoft YaHei", "Source Han Sans", "Noto Sans CJK", sans-serif;
+                font-family: "${this.giConfig.font}", "Microsoft YaHei", "Source Han Sans", "Noto Sans CJK", sans-serif;
             }
     
             html {
@@ -3419,7 +3505,7 @@ var GenerateImg = class GenerateImg extends koishi.Service {
                     margin: 0;
                     padding: 0;
                     box-sizing: border-box;
-                    font-family: \"${this.giConfig.font}\", "Microsoft YaHei", "Source Han Sans", "Noto Sans CJK", sans-serif;
+                    font-family: "${this.giConfig.font}", "Microsoft YaHei", "Source Han Sans", "Noto Sans CJK", sans-serif;
                 }
 
                 html {
@@ -3672,6 +3758,7 @@ const GET_LIVE_ROOM_INFO = "https://api.live.bilibili.com/room/v1/Room/get_info"
 const GET_MASTER_INFO = "https://api.live.bilibili.com/live_user/v1/Master/info";
 const GET_TIME_NOW = "https://api.bilibili.com/x/report/click/now";
 const GET_SERVER_UTC_TIME = "https://interface.bilibili.com/serverdate.js";
+const GET_USER_CARD_INFO = "https://api.bilibili.com/x/web-interface/card";
 const GET_LATEST_UPDATED_UPS = "https://api.bilibili.com/x/polymer/web-dynamic/v1/portal";
 const GET_ONLINE_GOLD_RANK = "https://api.live.bilibili.com//xlive/general-interface/v1/rank/getOnlineGoldRank";
 const GET_USER_INFO_IN_LIVE = "https://api.live.bilibili.com/xlive/app-ucenter/v2/card/user";
@@ -4092,6 +4179,32 @@ var BiliAPI = class extends koishi.Service {
 			retries: 3
 		});
 	}
+	async getUserCardInfo(mid, photo) {
+		const run = async () => {
+			let url = `${GET_USER_CARD_INFO}?mid=${mid}`;
+			if (photo) url += "&photo=true";
+			const { data } = await this.client.get(url);
+			return data;
+		};
+		return await this.pRetry(run, {
+			onFailedAttempt: (error) => {
+				this.logger.error(`getUserInfoInLive() 第${error.attemptNumber}次失败: ${error.message}`);
+			},
+			retries: 3
+		});
+	}
+	async getCORSContent(url) {
+		const run = async () => {
+			const { data } = await this.client.get(url);
+			return data;
+		};
+		return await this.pRetry(run, {
+			onFailedAttempt: (error) => {
+				this.logger.error(`getUserInfoInLive() 第${error.attemptNumber}次失败: ${error.message}`);
+			},
+			retries: 3
+		});
+	}
 	async chatWithAI(content) {
 		return await this.aiClient.chat.completions.create({
 			model: this.apiConfig.ai.model,
@@ -4195,9 +4308,9 @@ var BiliAPI = class extends koishi.Service {
 	async getLoginInfoFromDB() {
 		const data = (await this.ctx.database.get("loginBili", 1))[0];
 		if (data === void 0) {
-			this.loginNotifier = this.ctx.notifier.create({
-				type: "warning",
-				content: "您尚未登录，将无法使用插件提供的指令"
+			this.ctx.emit("bilibili-notify/login-status-report", {
+				status: BiliLoginStatus.NOT_LOGIN,
+				msg: "您尚未登录，请登录后使用插件"
 			});
 			return {
 				cookies: null,
@@ -4212,9 +4325,9 @@ var BiliAPI = class extends koishi.Service {
 				refresh_token: decryptedRefreshToken
 			};
 		} catch (_) {
-			this.loginNotifier = this.ctx.notifier.create({
-				type: "warning",
-				content: "数据库被篡改，请重新登录"
+			this.ctx.emit("bilibili-notify/login-status-report", {
+				status: BiliLoginStatus.NOT_LOGIN,
+				msg: "数据库被篡改，请重新登录"
 			});
 			await this.ctx.database.remove("loginBili", [1]);
 			return {
@@ -4288,16 +4401,13 @@ var BiliAPI = class extends koishi.Service {
 			if (!cookies || !refresh_token) return;
 			const csrf = cookies.find((cookie) => {
 				if (cookie.key === "bili_jct") return true;
+				return false;
 			}).value;
 			this.checkIfTokenNeedRefresh(refresh_token, csrf);
 		}, 36e5);
 	}
 	async checkIfTokenNeedRefresh(refreshToken, csrf, times = 3) {
 		const notifyAndError = async (info) => {
-			this.loginNotifier = this.ctx.notifier.create({
-				type: "warning",
-				content: info
-			});
 			await this.createNewClient();
 			this.refreshCookieTimer();
 			throw new Error(info);
@@ -4352,6 +4462,7 @@ var BiliAPI = class extends koishi.Service {
 		}]);
 		const newCsrf = this.jar.serializeSync().cookies.find((cookie) => {
 			if (cookie.key === "bili_jct") return true;
+			return false;
 		}).value;
 		const { data: aceeptData } = await this.client.post("https://passport.bilibili.com/x/passport-login/web/confirm/refresh", {
 			csrf: newCsrf,
@@ -4456,12 +4567,26 @@ var bili_live_default = BLive;
 const inject = [
 	"puppeteer",
 	"database",
-	"notifier"
+	"notifier",
+	"console"
 ];
 const name = "bilibili-notify";
 const usage = `
-	Bilibili-Notify
-	如遇到使用问题或bug，请加群咨询 801338523
+<h1>Bilibili-Notify</h1>
+<p>使用问题请加群咨询 801338523</p>
+
+---
+
+使用说明：
+- 请仔细阅读subs的配置说明，并在订阅配置中填写正确的 UID 和订阅类型
+- 订阅类型包括：动态、直播等
+
+注意事项：
+- 如果你使用的是 onebot 机器人，平台名请填写 onebot 而不是 qq
+- 如果你使用的是 onebot 机器人，平台名请填写 onebot 而不是 qq
+- 如果你使用的是 onebot 机器人，平台名请填写 onebot 而不是 qq
+
+---
 `;
 let globalConfig;
 var ServerManager = class extends koishi.Service {
@@ -4541,10 +4666,10 @@ var ServerManager = class extends koishi.Service {
 	};
 	disposePlugin = async () => {
 		if (this.servers.length === 0) return false;
-		await new Promise((resolve$1) => {
+		await new Promise((resolve$2) => {
 			for (const fork of this.servers) fork.dispose();
 			this.servers = [];
-			resolve$1("ok");
+			resolve$2("ok");
 		});
 		return true;
 	};
@@ -4554,15 +4679,15 @@ var ServerManager = class extends koishi.Service {
 			return false;
 		}
 		await this.disposePlugin();
-		return new Promise((resolve$1) => {
+		return new Promise((resolve$2) => {
 			this.ctx.setTimeout(() => {
 				try {
 					this.registerPlugin();
 				} catch (e) {
 					this.logger.error("重启插件失败", e);
-					resolve$1(false);
+					resolve$2(false);
 				}
-				resolve$1(true);
+				resolve$2(true);
 			}, 1e3);
 		});
 	};
@@ -4571,6 +4696,11 @@ function apply(ctx, config) {
 	globalConfig = config;
 	ctx.plugin(database_exports);
 	ctx.plugin(ServerManager);
+	ctx.plugin(BilibiliNotifyDataServer);
+	ctx.console.addEntry({
+		dev: (0, node_path.resolve)(__dirname, "../client/index.ts"),
+		prod: (0, node_path.resolve)(__dirname, "../dist")
+	});
 	ctx.middleware((session, next) => {
 		if (session.content === "恶魔兔，启动！") return session.send("启动不了一点");
 		return next();

package/lib/index.d.cts

@@ -1,4 +1,5 @@
 import { Context, ForkScope, Schema, Service } from "koishi";
+import { DataService } from "@koishijs/plugin-console";
 
 //#region src/config.d.ts
 interface BAConfig {
@@ -121,11 +122,33 @@ type Subscription = {
   customGuardBuy: CustomGuardBuy;
 };
 type Subscriptions = Record<string, Subscription>;
+declare enum BiliLoginStatus {
+  NOT_LOGIN = 0,
+  LOADING_LOGIN_INFO = 1,
+  LOGIN_QR = 2,
+  LOGGING_QR = 3,
+  LOGGING_IN = 4,
+  LOGGED_IN = 5,
+  LOGIN_SUCCESS = 6,
+  LOGIN_FAILED = 7,
+}
+type BiliDataServer = {
+  status: BiliLoginStatus;
+  msg: string;
+  data?: any;
+};
+//#endregion
+//#region src/data_server.d.ts
+declare class BilibiliNotifyDataServer extends DataService<BiliDataServer> {
+  private biliData;
+  constructor(ctx: Context);
+  get(): Promise<BiliDataServer>;
+}
 //#endregion
 //#region src/index.d.ts
 declare const inject: string[];
 declare const name = "bilibili-notify";
-declare const usage = "\n\tBilibili-Notify\n\t\u5982\u9047\u5230\u4F7F\u7528\u95EE\u9898\u6216bug\uFF0C\u8BF7\u52A0\u7FA4\u54A8\u8BE2 801338523\n";
+declare const usage = "\n<h1>Bilibili-Notify</h1>\n<p>\u4F7F\u7528\u95EE\u9898\u8BF7\u52A0\u7FA4\u54A8\u8BE2 801338523</p>\n\n---\n\n\u4F7F\u7528\u8BF4\u660E\uFF1A\n- \u8BF7\u4ED4\u7EC6\u9605\u8BFBsubs\u7684\u914D\u7F6E\u8BF4\u660E\uFF0C\u5E76\u5728\u8BA2\u9605\u914D\u7F6E\u4E2D\u586B\u5199\u6B63\u786E\u7684 UID \u548C\u8BA2\u9605\u7C7B\u578B\n- \u8BA2\u9605\u7C7B\u578B\u5305\u62EC\uFF1A\u52A8\u6001\u3001\u76F4\u64AD\u7B49\n\n\u6CE8\u610F\u4E8B\u9879\uFF1A\n- \u5982\u679C\u4F60\u4F7F\u7528\u7684\u662F onebot \u673A\u5668\u4EBA\uFF0C\u5E73\u53F0\u540D\u8BF7\u586B\u5199 onebot \u800C\u4E0D\u662F qq\n- \u5982\u679C\u4F60\u4F7F\u7528\u7684\u662F onebot \u673A\u5668\u4EBA\uFF0C\u5E73\u53F0\u540D\u8BF7\u586B\u5199 onebot \u800C\u4E0D\u662F qq\n- \u5982\u679C\u4F60\u4F7F\u7528\u7684\u662F onebot \u673A\u5668\u4EBA\uFF0C\u5E73\u53F0\u540D\u8BF7\u586B\u5199 onebot \u800C\u4E0D\u662F qq\n\n---\n";
 declare module "koishi" {
   interface Context {
     "bilibili-notify": ServerManager;
@@ -133,6 +156,19 @@ declare module "koishi" {
   interface Events {
     "bilibili-notify/advanced-sub"(subs: Subscriptions): void;
     "bilibili-notify/ready-to-recive"(): void;
+    "bilibili-notify/login-status-report"(data: BiliDataServer): void;
+  }
+}
+declare module "@koishijs/plugin-console" {
+  namespace Console {
+    interface Services {
+      "bilibili-notify": BilibiliNotifyDataServer;
+    }
+  }
+  interface Events {
+    "bilibili-notify/start-login"(): void;
+    "bilibili-notify/restart-plugin"(): void;
+    "bilibili-notify/request-cors"(url: string): any;
   }
 }
 declare class ServerManager extends Service {

package/lib/index.d.mts

@@ -1,4 +1,5 @@
 import { Context, ForkScope, Schema, Service } from "koishi";
+import { DataService } from "@koishijs/plugin-console";
 
 //#region src/config.d.ts
 interface BAConfig {
@@ -121,11 +122,33 @@ type Subscription = {
   customGuardBuy: CustomGuardBuy;
 };
 type Subscriptions = Record<string, Subscription>;
+declare enum BiliLoginStatus {
+  NOT_LOGIN = 0,
+  LOADING_LOGIN_INFO = 1,
+  LOGIN_QR = 2,
+  LOGGING_QR = 3,
+  LOGGING_IN = 4,
+  LOGGED_IN = 5,
+  LOGIN_SUCCESS = 6,
+  LOGIN_FAILED = 7,
+}
+type BiliDataServer = {
+  status: BiliLoginStatus;
+  msg: string;
+  data?: any;
+};
+//#endregion
+//#region src/data_server.d.ts
+declare class BilibiliNotifyDataServer extends DataService<BiliDataServer> {
+  private biliData;
+  constructor(ctx: Context);
+  get(): Promise<BiliDataServer>;
+}
 //#endregion
 //#region src/index.d.ts
 declare const inject: string[];
 declare const name = "bilibili-notify";
-declare const usage = "\n\tBilibili-Notify\n\t\u5982\u9047\u5230\u4F7F\u7528\u95EE\u9898\u6216bug\uFF0C\u8BF7\u52A0\u7FA4\u54A8\u8BE2 801338523\n";
+declare const usage = "\n<h1>Bilibili-Notify</h1>\n<p>\u4F7F\u7528\u95EE\u9898\u8BF7\u52A0\u7FA4\u54A8\u8BE2 801338523</p>\n\n---\n\n\u4F7F\u7528\u8BF4\u660E\uFF1A\n- \u8BF7\u4ED4\u7EC6\u9605\u8BFBsubs\u7684\u914D\u7F6E\u8BF4\u660E\uFF0C\u5E76\u5728\u8BA2\u9605\u914D\u7F6E\u4E2D\u586B\u5199\u6B63\u786E\u7684 UID \u548C\u8BA2\u9605\u7C7B\u578B\n- \u8BA2\u9605\u7C7B\u578B\u5305\u62EC\uFF1A\u52A8\u6001\u3001\u76F4\u64AD\u7B49\n\n\u6CE8\u610F\u4E8B\u9879\uFF1A\n- \u5982\u679C\u4F60\u4F7F\u7528\u7684\u662F onebot \u673A\u5668\u4EBA\uFF0C\u5E73\u53F0\u540D\u8BF7\u586B\u5199 onebot \u800C\u4E0D\u662F qq\n- \u5982\u679C\u4F60\u4F7F\u7528\u7684\u662F onebot \u673A\u5668\u4EBA\uFF0C\u5E73\u53F0\u540D\u8BF7\u586B\u5199 onebot \u800C\u4E0D\u662F qq\n- \u5982\u679C\u4F60\u4F7F\u7528\u7684\u662F onebot \u673A\u5668\u4EBA\uFF0C\u5E73\u53F0\u540D\u8BF7\u586B\u5199 onebot \u800C\u4E0D\u662F qq\n\n---\n";
 declare module "koishi" {
   interface Context {
     "bilibili-notify": ServerManager;
@@ -133,6 +156,19 @@ declare module "koishi" {
   interface Events {
     "bilibili-notify/advanced-sub"(subs: Subscriptions): void;
     "bilibili-notify/ready-to-recive"(): void;
+    "bilibili-notify/login-status-report"(data: BiliDataServer): void;
+  }
+}
+declare module "@koishijs/plugin-console" {
+  namespace Console {
+    interface Services {
+      "bilibili-notify": BilibiliNotifyDataServer;
+    }
+  }
+  interface Events {
+    "bilibili-notify/start-login"(): void;
+    "bilibili-notify/restart-plugin"(): void;
+    "bilibili-notify/request-cors"(url: string): any;
   }
 }
 declare class ServerManager extends Service {

package/lib/index.mjs

@@ -1,6 +1,8 @@
 import "node:module";
 import { Schema, Service, Universal, h } from "koishi";
 import "@koishijs/plugin-notifier";
+import { DataService } from "@koishijs/plugin-console";
+import { resolve } from "node:path";
 import "@koishijs/plugin-help";
 import { GuardLevel, startListen } from "blive-message-listener";
 import QRCode from "qrcode";
@@ -9,7 +11,6 @@ import { DateTime } from "luxon";
 import { Jieba } from "@node-rs/jieba";
 import { dict } from "@node-rs/jieba/dict";
 import "koishi-plugin-puppeteer";
-import { resolve } from "node:path";
 import { pathToFileURL } from "node:url";
 import md5 from "md5";
 import crypto from "node:crypto";
@@ -41,7 +42,7 @@ var __export = (all, symbols) => {
 const BAConfigSchema = Schema.object({
 	require: Schema.object({}).description("必填设置"),
 	key: Schema.string().pattern(/^[0-9a-f]{32}$/).role("secret").required().description("请输入一个32位小写字母的十六进制密钥（例如：9b8db7ae562b9864efefe06289cc5530），使用此密钥将你的B站登录信息存储在数据库中，请一定保存好此密钥。如果你忘记了此密钥，必须重新登录。你可以自行生成，或到这个网站生成：https://www.sexauth.com/"),
-	master: Schema.intersect([Schema.object({ enable: Schema.boolean().default(false).description("是否开启主人账号功能，如果您的机器人没有私聊权限请不要开启此功能。开启后如果机器人运行错误会向您进行报告") }).description("主人账号"), Schema.union([Schema.object({
+	master: Schema.intersect([Schema.object({ enable: Schema.boolean().default(false).description("是否开启主人账号功能，开启后如果机器人运行错误会向您进行报告。如果您的机器人没有私聊权限请不要开启此功能") }).description("主人账号"), Schema.union([Schema.object({
 		enable: Schema.const(true).required(),
 		platform: Schema.union([
 			"qq",
@@ -69,19 +70,19 @@ const BAConfigSchema = Schema.object({
 	subTitle: Schema.object({}).description("订阅配置"),
 	advancedSub: Schema.boolean().default(false).description("是否开启高级订阅，高级订阅是独立于本插件的一个专门用于订阅配置的插件，用于高度自定义订阅消息。若开启高级订阅，请打开该选项并下载插件 bilibili-notify-advanced-subscription"),
 	subs: Schema.array(Schema.object({
-		name: Schema.string().required().description("备注"),
+		name: Schema.string().required().description("UP昵称"),
 		uid: Schema.string().required().description("UID和roomid"),
 		dynamic: Schema.boolean().default(true).description("动态"),
-		dynamicAtAll: Schema.boolean().default(false).description("动态At全体"),
+		dynamicAtAll: Schema.boolean().default(false).description("动态@全体"),
 		live: Schema.boolean().default(true).description("直播"),
-		liveAtAll: Schema.boolean().default(true).description("直播At全体"),
+		liveAtAll: Schema.boolean().default(true).description("直播@全体"),
 		liveGuardBuy: Schema.boolean().default(false).description("上舰消息"),
 		superchat: Schema.boolean().default(false).description("SC消息"),
 		wordcloud: Schema.boolean().default(true).description("弹幕词云"),
 		liveSummary: Schema.boolean().default(true).description("直播总结"),
 		platform: Schema.string().required().description("平台名"),
 		target: Schema.string().required().description("群号/频道号")
-	})).role("table").description("输入订阅信息，自定义订阅内容； UID和roomid，如果经常在初始化插件遇到风控问题，请补充直播间房间号，使用英文逗号分隔例如,1234567,114514 群号/频道号格式：频道号,频道号 使用英文逗号分隔，例如 1234567,2345678"),
+	})).role("table").description("请在这里填写订阅信息；UP昵称是必填项，影响通知时显示的UP主昵称；UID和roomid，请填写订阅用户的UID，如果经常在初始化插件遇到风控问题，请补充直播间房间号，使用英文逗号分隔例如：1234567,114514；平台名，请填写adapter-xxxx中的xxxx，例如你的机器人使用的是adapter-onebot就填写onebot；群号/频道号，直接填写即可，如果有多个群聊或频道请使用英文逗号分隔，例如：1234567,2345678"),
 	dynamic: Schema.object({}).description("动态推送设置"),
 	dynamicUrl: Schema.boolean().default(false).description("发送动态时是否同时发送链接。注意：如果使用的是QQ官方机器人不能开启此项！"),
 	dynamicCron: Schema.string().default("*/2 * * * *").description("动态监测时间，请填入cron表达式，请勿填入过短时间"),
@@ -135,6 +136,67 @@ const BAConfigSchema = Schema.object({
 	dynamicDebugMode: Schema.boolean().default(false).description("动态调试模式，开启后会在控制台输出动态推送的详细信息，用于调试")
 });
 
+//#endregion
+//#region src/type/index.ts
+let LiveType = /* @__PURE__ */ function(LiveType$1) {
+	LiveType$1[LiveType$1["NotLiveBroadcast"] = 0] = "NotLiveBroadcast";
+	LiveType$1[LiveType$1["StartBroadcasting"] = 1] = "StartBroadcasting";
+	LiveType$1[LiveType$1["LiveBroadcast"] = 2] = "LiveBroadcast";
+	LiveType$1[LiveType$1["StopBroadcast"] = 3] = "StopBroadcast";
+	LiveType$1[LiveType$1["FirstLiveBroadcast"] = 4] = "FirstLiveBroadcast";
+	return LiveType$1;
+}({});
+let PushType = /* @__PURE__ */ function(PushType$1) {
+	PushType$1[PushType$1["Live"] = 0] = "Live";
+	PushType$1[PushType$1["Dynamic"] = 1] = "Dynamic";
+	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["WordCloudAndLiveSummary"] = 5] = "WordCloudAndLiveSummary";
+	PushType$1[PushType$1["Superchat"] = 6] = "Superchat";
+	return PushType$1;
+}({});
+const PushTypeMsg = {
+	[PushType.Live]: "直播推送",
+	[PushType.Dynamic]: "动态推送",
+	[PushType.DynamicAtAll]: "动态推送+At全体",
+	[PushType.StartBroadcasting]: "开播推送",
+	[PushType.LiveGuardBuy]: "上舰推送",
+	[PushType.WordCloudAndLiveSummary]: "弹幕词云和直播总结推送",
+	[PushType.Superchat]: "SC推送"
+};
+let BiliLoginStatus = /* @__PURE__ */ function(BiliLoginStatus$1) {
+	BiliLoginStatus$1[BiliLoginStatus$1["NOT_LOGIN"] = 0] = "NOT_LOGIN";
+	BiliLoginStatus$1[BiliLoginStatus$1["LOADING_LOGIN_INFO"] = 1] = "LOADING_LOGIN_INFO";
+	BiliLoginStatus$1[BiliLoginStatus$1["LOGIN_QR"] = 2] = "LOGIN_QR";
+	BiliLoginStatus$1[BiliLoginStatus$1["LOGGING_QR"] = 3] = "LOGGING_QR";
+	BiliLoginStatus$1[BiliLoginStatus$1["LOGGING_IN"] = 4] = "LOGGING_IN";
+	BiliLoginStatus$1[BiliLoginStatus$1["LOGGED_IN"] = 5] = "LOGGED_IN";
+	BiliLoginStatus$1[BiliLoginStatus$1["LOGIN_SUCCESS"] = 6] = "LOGIN_SUCCESS";
+	BiliLoginStatus$1[BiliLoginStatus$1["LOGIN_FAILED"] = 7] = "LOGIN_FAILED";
+	return BiliLoginStatus$1;
+}({});
+
+//#endregion
+//#region src/data_server.ts
+/** biome-ignore-all assist/source/organizeImports: <import> */
+var BilibiliNotifyDataServer = class extends DataService {
+	biliData = {
+		status: BiliLoginStatus.LOADING_LOGIN_INFO,
+		msg: "正在加载登录信息..."
+	};
+	constructor(ctx) {
+		super(ctx, "bilibili-notify");
+		ctx.on("bilibili-notify/login-status-report", (data) => {
+			this.biliData = data;
+			this.refresh();
+		});
+	}
+	async get() {
+		return this.biliData;
+	}
+};
+
 //#endregion
 //#region src/utils/index.ts
 /**
@@ -184,36 +246,6 @@ function replaceButKeep(oldObj, newObj, keepKeys) {
 	return result;
 }
 
-//#endregion
-//#region src/type/index.ts
-let LiveType = /* @__PURE__ */ function(LiveType$1) {
-	LiveType$1[LiveType$1["NotLiveBroadcast"] = 0] = "NotLiveBroadcast";
-	LiveType$1[LiveType$1["StartBroadcasting"] = 1] = "StartBroadcasting";
-	LiveType$1[LiveType$1["LiveBroadcast"] = 2] = "LiveBroadcast";
-	LiveType$1[LiveType$1["StopBroadcast"] = 3] = "StopBroadcast";
-	LiveType$1[LiveType$1["FirstLiveBroadcast"] = 4] = "FirstLiveBroadcast";
-	return LiveType$1;
-}({});
-let PushType = /* @__PURE__ */ function(PushType$1) {
-	PushType$1[PushType$1["Live"] = 0] = "Live";
-	PushType$1[PushType$1["Dynamic"] = 1] = "Dynamic";
-	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["WordCloudAndLiveSummary"] = 5] = "WordCloudAndLiveSummary";
-	PushType$1[PushType$1["Superchat"] = 6] = "Superchat";
-	return PushType$1;
-}({});
-const PushTypeMsg = {
-	[PushType.Live]: "直播推送",
-	[PushType.Dynamic]: "动态推送",
-	[PushType.DynamicAtAll]: "动态推送+At全体",
-	[PushType.StartBroadcasting]: "开播推送",
-	[PushType.LiveGuardBuy]: "上舰推送",
-	[PushType.WordCloudAndLiveSummary]: "弹幕词云和直播总结推送",
-	[PushType.Superchat]: "SC推送"
-};
-
 //#endregion
 //#region src/stop_words.ts
 const stopwords = new Set([
@@ -413,68 +445,6 @@ var ComRegister = class ComRegister {
 			await session.send(`Channel ID: ${session.event.channel.id}`);
 		});
 		const biliCom = ctx.command("bili", "bili-notify插件相关指令", { permissions: ["authority:3"] });
-		biliCom.subcommand(".login", "登录B站之后才可以进行之后的操作").usage("使用二维码登录，登录B站之后才可以进行之后的操作").example("bili login").action(async ({ session }) => {
-			this.logger.info("调用bili login指令");
-			let content;
-			try {
-				content = await ctx["bilibili-notify-api"].getLoginQRCode();
-			} catch (_) {
-				return "bili login getLoginQRCode() 本次网络请求失败";
-			}
-			if (content.code !== 0) return await session.send("出问题咯！");
-			QRCode.toBuffer(content.data.url, {
-				errorCorrectionLevel: "H",
-				type: "png",
-				margin: 1,
-				color: {
-					dark: "#000000",
-					light: "#FFFFFF"
-				}
-			}, async (err, buffer) => {
-				if (err) return await session.send("二维码生成出错，请重新尝试");
-				await session.send(h.image(buffer, "image/jpeg"));
-			});
-			if (this.loginTimer) this.loginTimer();
-			let flag = true;
-			this.loginTimer = ctx.setInterval(async () => {
-				try {
-					if (!flag) return;
-					flag = false;
-					let loginContent;
-					try {
-						loginContent = await ctx["bilibili-notify-api"].getLoginStatus(content.data.qrcode_key);
-					} catch (e) {
-						this.logger.error(e);
-						return;
-					}
-					if (loginContent.code !== 0) {
-						this.loginTimer();
-						return await session.send("登录失败请重试");
-					}
-					if (loginContent.data.code === 86038) {
-						this.loginTimer();
-						return await session.send("二维码已失效，请重新登录");
-					}
-					if (loginContent.data.code === 0) {
-						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["bilibili-notify-api"].loadCookiesFromDatabase();
-						await this.checkIfLoginInfoIsLoaded();
-						this.loginTimer();
-						ctx["bilibili-notify-api"].disposeNotifier();
-						await session.send("登录成功，请重启插件");
-					}
-				} finally {
-					flag = true;
-				}
-			}, 1e3);
-		});
 		biliCom.subcommand(".list", "展示订阅对象").usage("展示订阅对象").example("bili list").action(() => {
 			return this.subShow();
 		});
@@ -492,7 +462,7 @@ var ComRegister = class ComRegister {
 					break;
 				}
 				subLiveUsers.push({
-					uid: Number.parseInt(uid),
+					uid: Number.parseInt(uid, 10),
 					uname: sub.uname,
 					onLive
 				});
@@ -717,6 +687,7 @@ var ComRegister = class ComRegister {
 		this.logger = this.ctx.logger("bilibili-notify-core");
 		this.logger.info("初始化插件中...");
 		this.config = config;
+		this.registeringForEvents();
 		this.privateBot = this.ctx.bots.find((bot) => bot.platform === config.master.platform);
 		if (!this.privateBot) this.ctx.notifier.create({ content: "您未配置私人机器人，将无法向您推送机器人状态！" });
 		this.loginDBData = (await this.ctx.database.get("loginBili", 1, ["dynamic_group_id"]))[0];
@@ -725,9 +696,19 @@ var ComRegister = class ComRegister {
 			this.logger.info("账号未登录，请登录");
 			return;
 		}
+		const personalInfo = await this.ctx["bilibili-notify-api"].getMyselfInfo();
+		if (personalInfo.code !== 0) this.ctx.emit("bilibili-notify/login-status-report", {
+			status: BiliLoginStatus.LOGGED_IN,
+			msg: "已登录，但获取个人信息失败"
+		});
+		const myCardInfo = await this.ctx["bilibili-notify-api"].getUserCardInfo(personalInfo.data.mid.toString(), true);
+		this.ctx.emit("bilibili-notify/login-status-report", {
+			status: BiliLoginStatus.LOGGED_IN,
+			msg: "已登录",
+			data: myCardInfo.data
+		});
 		this.mergeStopWords(config.wordcloudStopWords);
 		this.initAllManager();
-		this.registeringForEvents();
 		if (config.advancedSub) {
 			this.logger.info("开启高级订阅，等待加载订阅...");
 			this.ctx.emit("bilibili-notify/ready-to-recive");
@@ -737,6 +718,107 @@ var ComRegister = class ComRegister {
 		} else this.logger.info("初始化完毕，未添加任何订阅！");
 	}
 	registeringForEvents() {
+		this.ctx.console.addListener("bilibili-notify/start-login", async () => {
+			this.logger.info("调用bili login指令");
+			let content;
+			try {
+				content = await this.ctx["bilibili-notify-api"].getLoginQRCode();
+			} catch (_) {
+				return "bili login getLoginQRCode() 本次网络请求失败";
+			}
+			if (content.code !== 0) return this.ctx.emit("bilibili-notify/login-status-report", {
+				status: BiliLoginStatus.LOGIN_FAILED,
+				msg: "获取二维码失败"
+			});
+			QRCode.toBuffer(content.data.url, {
+				errorCorrectionLevel: "H",
+				type: "png",
+				margin: 1,
+				color: {
+					dark: "#000000",
+					light: "#FFFFFF"
+				}
+			}, async (err, buffer) => {
+				if (err) {
+					this.logger.error("生成二维码失败", err);
+					return this.ctx.emit("bilibili-notify/login-status-report", {
+						status: BiliLoginStatus.LOGIN_FAILED,
+						msg: "生成二维码失败"
+					});
+				}
+				const url = "data:image/png;base64," + Buffer.from(buffer).toString("base64");
+				this.ctx.emit("bilibili-notify/login-status-report", {
+					status: BiliLoginStatus.LOGIN_QR,
+					msg: "请使用Bilibili App扫码登录",
+					data: url
+				});
+			});
+			if (this.loginTimer) this.loginTimer();
+			let flag = true;
+			this.loginTimer = this.ctx.setInterval(async () => {
+				try {
+					if (!flag) return;
+					flag = false;
+					let loginContent;
+					try {
+						loginContent = await this.ctx["bilibili-notify-api"].getLoginStatus(content.data.qrcode_key);
+					} catch (e) {
+						this.logger.error(e);
+						return;
+					}
+					if (loginContent.data.code === 86101) return this.ctx.emit("bilibili-notify/login-status-report", {
+						status: BiliLoginStatus.LOGGING_QR,
+						msg: "未扫码"
+					});
+					if (loginContent.data.code === 86090) return this.ctx.emit("bilibili-notify/login-status-report", {
+						status: BiliLoginStatus.LOGGING_QR,
+						msg: "二维码已扫码未确认"
+					});
+					if (loginContent.data.code === 86038) {
+						this.loginTimer();
+						return this.ctx.emit("bilibili-notify/login-status-report", {
+							status: BiliLoginStatus.LOGIN_FAILED,
+							msg: "二维码已失效，请重新登录"
+						});
+					}
+					if (loginContent.data.code === 0) {
+						const encryptedCookies = this.ctx["bilibili-notify-api"].encrypt(this.ctx["bilibili-notify-api"].getCookies());
+						const encryptedRefreshToken = this.ctx["bilibili-notify-api"].encrypt(loginContent.data.refresh_token);
+						await this.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["bilibili-notify-api"].loadCookiesFromDatabase();
+						await this.checkIfLoginInfoIsLoaded();
+						this.loginTimer();
+						this.ctx["bilibili-notify-api"].disposeNotifier();
+						this.ctx.emit("bilibili-notify/login-status-report", {
+							status: BiliLoginStatus.LOGIN_SUCCESS,
+							msg: "已登录，请点击按钮重启插件(5s后自动重启)"
+						});
+						await this.ctx["bilibili-notify"].restartPlugin();
+					}
+					if (loginContent.code !== 0) {
+						this.loginTimer();
+						return this.ctx.emit("bilibili-notify/login-status-report", {
+							status: BiliLoginStatus.LOGIN_FAILED,
+							msg: "登录失败，请重试"
+						});
+					}
+				} finally {
+					flag = true;
+				}
+			}, 1e3);
+		});
+		this.ctx.console.addListener("bilibili-notify/restart-plugin", async () => {
+			await this.ctx["bilibili-notify"].restartPlugin();
+		});
+		this.ctx.console.addListener("bilibili-notify/request-cors", async (url) => {
+			const buffer = await (await fetch(url)).arrayBuffer();
+			return "data:image/png;base64," + Buffer.from(buffer).toString("base64");
+		});
 		this.ctx.on("dispose", () => {
 			if (this.loginTimer) this.loginTimer();
 			if (this.dynamicJob) this.dynamicJob.stop();
@@ -1307,7 +1389,7 @@ var ComRegister = class ComRegister {
 		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 && !this.stopwords.has(word)).map((w) => {
+		this._jieba.cut(danmaku, true).filter((word) => word.length >= 2 && !this.stopwords.has(word)).forEach((w) => {
 			danmakuWeightRecord[w] = (danmakuWeightRecord[w] || 0) + 1;
 		});
 	}
@@ -1387,8 +1469,12 @@ var ComRegister = class ComRegister {
 				return customLiveSummary.replace("-dmc", `${danmakuSenderCount}`).replace("-mdn", masterInfo.medalName).replace("-dca", `${danmakuCount}`).replace("-un1", top5DanmakuSender[0][0]).replace("-dc1", `${top5DanmakuSender[0][1]}`).replace("-un2", top5DanmakuSender[1][0]).replace("-dc2", `${top5DanmakuSender[1][1]}`).replace("-un3", top5DanmakuSender[2][0]).replace("-dc3", `${top5DanmakuSender[2][1]}`).replace("-un4", top5DanmakuSender[3][0]).replace("-dc4", `${top5DanmakuSender[3][1]}`).replace("-un5", top5DanmakuSender[4][0]).replace("-dc5", `${top5DanmakuSender[4][1]}`).replaceAll("\\n", "\n");
 			})();
 			await this.broadcastToTargets(sub.uid, [img, summary], PushType.WordCloudAndLiveSummary);
-			Object.keys(danmakuWeightRecord).forEach((key) => delete danmakuWeightRecord[key]);
-			Object.keys(danmakuSenderRecord).forEach((key) => delete danmakuSenderRecord[key]);
+			Object.keys(danmakuWeightRecord).forEach((key) => {
+				delete danmakuWeightRecord[key];
+			});
+			Object.keys(danmakuSenderRecord).forEach((key) => {
+				delete danmakuSenderRecord[key];
+			});
 		};
 		const pushAtTimeFunc = async () => {
 			if (!await useLiveRoomInfo(LiveType.LiveBroadcast) && !await useMasterInfo(LiveType.LiveBroadcast)) {
@@ -1969,7 +2055,7 @@ var GenerateImg = class GenerateImg extends Service {
                         margin: 0;
                         padding: 0;
                         box-sizing: border-box;
-                        font-family: \"${this.giConfig.font}\", "Microsoft YaHei", "Source Han Sans", "Noto Sans CJK", sans-serif;
+                        font-family: "${this.giConfig.font}", "Microsoft YaHei", "Source Han Sans", "Noto Sans CJK", sans-serif;
                     }
         
                     html {
@@ -2132,7 +2218,7 @@ var GenerateImg = class GenerateImg extends Service {
                         margin: 0;
                         padding: 0;
                         box-sizing: border-box;
-                        font-family: \"${this.giConfig.font}\", "Microsoft YaHei", "Source Han Sans", "Noto Sans CJK", sans-serif;
+                        font-family: "${this.giConfig.font}", "Microsoft YaHei", "Source Han Sans", "Noto Sans CJK", sans-serif;
                     }
 
                     html {
@@ -2568,7 +2654,7 @@ var GenerateImg = class GenerateImg extends Service {
                 margin: 0;
                 padding: 0;
                 box-sizing: border-box;
-                font-family: \"${this.giConfig.font}\", "Microsoft YaHei", "Source Han Sans", "Noto Sans CJK", sans-serif;
+                font-family: "${this.giConfig.font}", "Microsoft YaHei", "Source Han Sans", "Noto Sans CJK", sans-serif;
             }
 
             html {
@@ -2931,7 +3017,7 @@ var GenerateImg = class GenerateImg extends Service {
                 margin: 0;
                 padding: 0;
                 box-sizing: border-box;
-                font-family: \"${this.giConfig.font}\", "Microsoft YaHei", "Source Han Sans", "Noto Sans CJK", sans-serif;
+                font-family: "${this.giConfig.font}", "Microsoft YaHei", "Source Han Sans", "Noto Sans CJK", sans-serif;
             }
     
             html {
@@ -3390,7 +3476,7 @@ var GenerateImg = class GenerateImg extends Service {
                     margin: 0;
                     padding: 0;
                     box-sizing: border-box;
-                    font-family: \"${this.giConfig.font}\", "Microsoft YaHei", "Source Han Sans", "Noto Sans CJK", sans-serif;
+                    font-family: "${this.giConfig.font}", "Microsoft YaHei", "Source Han Sans", "Noto Sans CJK", sans-serif;
                 }
 
                 html {
@@ -3643,6 +3729,7 @@ const GET_LIVE_ROOM_INFO = "https://api.live.bilibili.com/room/v1/Room/get_info"
 const GET_MASTER_INFO = "https://api.live.bilibili.com/live_user/v1/Master/info";
 const GET_TIME_NOW = "https://api.bilibili.com/x/report/click/now";
 const GET_SERVER_UTC_TIME = "https://interface.bilibili.com/serverdate.js";
+const GET_USER_CARD_INFO = "https://api.bilibili.com/x/web-interface/card";
 const GET_LATEST_UPDATED_UPS = "https://api.bilibili.com/x/polymer/web-dynamic/v1/portal";
 const GET_ONLINE_GOLD_RANK = "https://api.live.bilibili.com//xlive/general-interface/v1/rank/getOnlineGoldRank";
 const GET_USER_INFO_IN_LIVE = "https://api.live.bilibili.com/xlive/app-ucenter/v2/card/user";
@@ -4063,6 +4150,32 @@ var BiliAPI = class extends Service {
 			retries: 3
 		});
 	}
+	async getUserCardInfo(mid, photo) {
+		const run = async () => {
+			let url = `${GET_USER_CARD_INFO}?mid=${mid}`;
+			if (photo) url += "&photo=true";
+			const { data } = await this.client.get(url);
+			return data;
+		};
+		return await this.pRetry(run, {
+			onFailedAttempt: (error) => {
+				this.logger.error(`getUserInfoInLive() 第${error.attemptNumber}次失败: ${error.message}`);
+			},
+			retries: 3
+		});
+	}
+	async getCORSContent(url) {
+		const run = async () => {
+			const { data } = await this.client.get(url);
+			return data;
+		};
+		return await this.pRetry(run, {
+			onFailedAttempt: (error) => {
+				this.logger.error(`getUserInfoInLive() 第${error.attemptNumber}次失败: ${error.message}`);
+			},
+			retries: 3
+		});
+	}
 	async chatWithAI(content) {
 		return await this.aiClient.chat.completions.create({
 			model: this.apiConfig.ai.model,
@@ -4166,9 +4279,9 @@ var BiliAPI = class extends Service {
 	async getLoginInfoFromDB() {
 		const data = (await this.ctx.database.get("loginBili", 1))[0];
 		if (data === void 0) {
-			this.loginNotifier = this.ctx.notifier.create({
-				type: "warning",
-				content: "您尚未登录，将无法使用插件提供的指令"
+			this.ctx.emit("bilibili-notify/login-status-report", {
+				status: BiliLoginStatus.NOT_LOGIN,
+				msg: "您尚未登录，请登录后使用插件"
 			});
 			return {
 				cookies: null,
@@ -4183,9 +4296,9 @@ var BiliAPI = class extends Service {
 				refresh_token: decryptedRefreshToken
 			};
 		} catch (_) {
-			this.loginNotifier = this.ctx.notifier.create({
-				type: "warning",
-				content: "数据库被篡改，请重新登录"
+			this.ctx.emit("bilibili-notify/login-status-report", {
+				status: BiliLoginStatus.NOT_LOGIN,
+				msg: "数据库被篡改，请重新登录"
 			});
 			await this.ctx.database.remove("loginBili", [1]);
 			return {
@@ -4259,16 +4372,13 @@ var BiliAPI = class extends Service {
 			if (!cookies || !refresh_token) return;
 			const csrf = cookies.find((cookie) => {
 				if (cookie.key === "bili_jct") return true;
+				return false;
 			}).value;
 			this.checkIfTokenNeedRefresh(refresh_token, csrf);
 		}, 36e5);
 	}
 	async checkIfTokenNeedRefresh(refreshToken, csrf, times = 3) {
 		const notifyAndError = async (info) => {
-			this.loginNotifier = this.ctx.notifier.create({
-				type: "warning",
-				content: info
-			});
 			await this.createNewClient();
 			this.refreshCookieTimer();
 			throw new Error(info);
@@ -4323,6 +4433,7 @@ var BiliAPI = class extends Service {
 		}]);
 		const newCsrf = this.jar.serializeSync().cookies.find((cookie) => {
 			if (cookie.key === "bili_jct") return true;
+			return false;
 		}).value;
 		const { data: aceeptData } = await this.client.post("https://passport.bilibili.com/x/passport-login/web/confirm/refresh", {
 			csrf: newCsrf,
@@ -4427,12 +4538,26 @@ var bili_live_default = BLive;
 const inject = [
 	"puppeteer",
 	"database",
-	"notifier"
+	"notifier",
+	"console"
 ];
 const name = "bilibili-notify";
 const usage = `
-	Bilibili-Notify
-	如遇到使用问题或bug，请加群咨询 801338523
+<h1>Bilibili-Notify</h1>
+<p>使用问题请加群咨询 801338523</p>
+
+---
+
+使用说明：
+- 请仔细阅读subs的配置说明，并在订阅配置中填写正确的 UID 和订阅类型
+- 订阅类型包括：动态、直播等
+
+注意事项：
+- 如果你使用的是 onebot 机器人，平台名请填写 onebot 而不是 qq
+- 如果你使用的是 onebot 机器人，平台名请填写 onebot 而不是 qq
+- 如果你使用的是 onebot 机器人，平台名请填写 onebot 而不是 qq
+
+---
 `;
 let globalConfig;
 var ServerManager = class extends Service {
@@ -4542,6 +4667,11 @@ function apply(ctx, config) {
 	globalConfig = config;
 	ctx.plugin(database_exports);
 	ctx.plugin(ServerManager);
+	ctx.plugin(BilibiliNotifyDataServer);
+	ctx.console.addEntry({
+		dev: resolve(__dirname, "../client/index.ts"),
+		prod: resolve(__dirname, "../dist")
+	});
 	ctx.middleware((session, next) => {
 		if (session.content === "恶魔兔，启动！") return session.send("启动不了一点");
 		return next();

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-bilibili-notify",
   "description": "Koishi bilibili notify plugin",
-  "version": "3.5.0-alpha.1",
+  "version": "3.6.0-alpha.0",
   "main": "./lib/index.cjs",
   "typings": "lib/index.d.ts",
   "files": [
@@ -43,6 +43,7 @@
     "tough-cookie": "^6.0.0"
   },
   "devDependencies": {
+    "@koishijs/client": "^5.30.11",
     "@types/jsdom": "^27.0.0",
     "@types/luxon": "^3.7.1",
     "@types/md5": "^2.3.6",
@@ -52,6 +53,7 @@
     "tsdown": "^0.16.6"
   },
   "peerDependencies": {
+    "@koishijs/plugin-console": "^5.30.11",
     "koishi": "^4.18.9"
   },
   "engines": {