koishi-plugin-bilibili-notify 3.3.9 → 3.3.11-alpha.0

package/lib/index.d.mts

@@ -17,6 +17,7 @@ interface BAConfig {
     live: boolean;
     liveAtAll: boolean;
     liveGuardBuy: boolean;
+    superchat: boolean;
     wordcloud: boolean;
     liveSummary: boolean;
     platform: string;
@@ -59,6 +60,7 @@ type Channel = {
   live: boolean;
   liveAtAll: boolean;
   liveGuardBuy: boolean;
+  superchat: boolean;
   wordcloud: boolean;
   liveSummary: boolean;
 };

package/lib/index.d.ts

@@ -17,6 +17,7 @@ interface BAConfig {
     live: boolean;
     liveAtAll: boolean;
     liveGuardBuy: boolean;
+    superchat: boolean;
     wordcloud: boolean;
     liveSummary: boolean;
     platform: string;
@@ -59,6 +60,7 @@ type Channel = {
   live: boolean;
   liveAtAll: boolean;
   liveGuardBuy: boolean;
+  superchat: boolean;
   wordcloud: boolean;
   liveSummary: boolean;
 };

package/lib/index.js

@@ -79,6 +79,7 @@ const BAConfigSchema = koishi.Schema.object({
 		live: koishi.Schema.boolean().default(true).description("直播"),
 		liveAtAll: koishi.Schema.boolean().default(true).description("直播At全体"),
 		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("平台名"),
@@ -192,6 +193,7 @@ let PushType = /* @__PURE__ */ function(PushType$1) {
 	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 = {
@@ -200,7 +202,8 @@ const PushTypeMsg = {
 	[PushType.DynamicAtAll]: "动态推送+At全体",
 	[PushType.StartBroadcasting]: "开播推送",
 	[PushType.LiveGuardBuy]: "上舰推送",
-	[PushType.WordCloudAndLiveSummary]: "弹幕词云和直播总结推送"
+	[PushType.WordCloudAndLiveSummary]: "弹幕词云和直播总结推送",
+	[PushType.Superchat]: "SC推送"
 };
 
 //#endregion
@@ -684,7 +687,7 @@ var ComRegister$1 = class {
 				if (timer) timer();
 			}
 		});
-		this.ctx.on("bilibili-notify/advanced-sub", async (subs) => {
+		if (this.config.advancedSub) this.ctx.on("bilibili-notify/advanced-sub", async (subs) => {
 			if (Object.keys(subs).length === 0) {
 				this.logger.info("初始化完毕，未添加任何订阅！");
 				return;
@@ -756,6 +759,7 @@ var ComRegister$1 = class {
 				live: s.live,
 				liveAtAll: s.liveAtAll,
 				liveGuardBuy: s.liveGuardBuy,
+				superchat: s.superchat,
 				wordcloud: s.wordcloud,
 				liveSummary: s.liveSummary
 			}));
@@ -846,6 +850,7 @@ var ComRegister$1 = class {
 			const liveArr = [];
 			const liveAtAllArr = [];
 			const liveGuardBuyArr = [];
+			const superchatArr = [];
 			const wordcloudArr = [];
 			const liveSummaryArr = [];
 			for (const platform of sub.target) for (const channel of platform.channelArr) {
@@ -856,6 +861,7 @@ var ComRegister$1 = class {
 					["live", liveArr],
 					["liveAtAll", liveAtAllArr],
 					["liveGuardBuy", liveGuardBuyArr],
+					["superchat", superchatArr],
 					["wordcloud", wordcloudArr],
 					["liveSummary", liveSummaryArr]
 				];
@@ -868,6 +874,7 @@ var ComRegister$1 = class {
 				liveAtAllArr,
 				liveSummaryArr,
 				liveGuardBuyArr,
+				superchatArr,
 				wordcloudArr
 			});
 		}
@@ -917,7 +924,7 @@ var ComRegister$1 = class {
 	async broadcastToTargets(uid, content, type) {
 		const record = this.pushArrMap.get(uid);
 		if (!record) return;
-		const hasTargets = type === PushType.StartBroadcasting && record.liveAtAllArr?.length > 0 || type === PushType.Dynamic && (record.dynamicArr?.length > 0 || record.dynamicAtAllArr?.length > 0) || (type === PushType.Live || type === PushType.StartBroadcasting) && record.liveArr?.length > 0 || type === PushType.LiveGuardBuy && record.liveGuardBuyArr?.length > 0 || type === PushType.WordCloudAndLiveSummary && (record.wordcloudArr?.length > 0 || record.liveSummaryArr?.length > 0);
+		const hasTargets = type === PushType.StartBroadcasting && record.liveAtAllArr?.length > 0 || type === PushType.Dynamic && (record.dynamicArr?.length > 0 || record.dynamicAtAllArr?.length > 0) || (type === PushType.Live || type === PushType.StartBroadcasting) && record.liveArr?.length > 0 || type === PushType.LiveGuardBuy && record.liveGuardBuyArr?.length > 0 || type === PushType.Superchat && record.superchatArr?.length > 0 || type === PushType.WordCloudAndLiveSummary && (record.wordcloudArr?.length > 0 || record.liveSummaryArr?.length > 0);
 		if (!hasTargets) return;
 		this.logger.info(`本次推送对象：${uid}，推送类型：${PushTypeMsg[type]}`);
 		if (type === PushType.StartBroadcasting && record.liveAtAllArr?.length > 0) {
@@ -945,6 +952,11 @@ var ComRegister$1 = class {
 			const liveGuardBuyArr = structuredClone(record.liveGuardBuyArr);
 			await withRetry(() => this.pushMessage(liveGuardBuyArr, (0, koishi.h)("message", content)), 1);
 		}
+		if (type === PushType.Superchat && record.superchatArr?.length > 0) {
+			this.logger.info("推送SC：", record.superchatArr);
+			const superchatArr = structuredClone(record.superchatArr);
+			await withRetry(() => this.pushMessage(superchatArr, (0, koishi.h)("message", content)), 1);
+		}
 		if (type === PushType.WordCloudAndLiveSummary) {
 			const wordcloudArr = structuredClone(record.wordcloudArr);
 			const liveSummaryArr = structuredClone(record.liveSummaryArr);
@@ -1152,7 +1164,7 @@ var ComRegister$1 = class {
 		};
 		return withLock(handler);
 	}
-	async useMasterInfo(uid, masterInfo, liveType) {
+	async getMasterInfo(uid, masterInfo, liveType) {
 		const { data } = await this.ctx["bilibili-notify-api"].getMasterInfo(uid);
 		let liveOpenFollowerNum;
 		let liveEndFollowerNum;
@@ -1177,7 +1189,7 @@ var ComRegister$1 = class {
 			medalName: data.medal_name
 		};
 	}
-	async useLiveRoomInfo(roomId) {
+	async getLiveRoomInfo(roomId) {
 		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}`);
 		});
@@ -1211,7 +1223,7 @@ var ComRegister$1 = class {
 		const danmakuWeightRecord = {};
 		const danmakuMakerRecord = {};
 		let liveStatus = false;
-		let liveRoomInfo;
+		const liveRoomInfo = {};
 		let masterInfo;
 		let watchedNum;
 		const liveMsgObj = this.liveMsgManager.get(sub.uid);
@@ -1244,7 +1256,7 @@ var ComRegister$1 = class {
 			Object.keys(danmakuMakerRecord).forEach((key) => delete danmakuMakerRecord[key]);
 		};
 		const pushAtTimeFunc = async () => {
-			if (!await useMasterAndLiveRoomInfo(LiveType.LiveBroadcast)) {
+			if (!await useLiveRoomInfo(LiveType.LiveBroadcast) && !await useMasterInfo(LiveType.LiveBroadcast)) {
 				await this.sendPrivateMsg("获取直播间信息失败，推送直播卡片失败！");
 				return await this.sendPrivateMsgAndStopService();
 			}
@@ -1263,21 +1275,34 @@ var ComRegister$1 = class {
 				cardStyle: sub.customCardStyle
 			}, sub.uid, liveMsg);
 		};
-		const useMasterAndLiveRoomInfo = async (liveType) => {
+		const useMasterInfo = async (liveType) => {
 			let flag = true;
-			liveRoomInfo = await this.useLiveRoomInfo(sub.roomid).catch(() => {
+			masterInfo = await this.getMasterInfo(liveRoomInfo.uid.toString(), masterInfo, liveType).catch(() => {
 				flag = false;
 				return null;
 			});
-			if (!flag || !liveRoomInfo || !liveRoomInfo.uid) {
-				flag = false;
-				return flag;
-			}
-			masterInfo = await this.useMasterInfo(liveRoomInfo.uid.toString(), masterInfo, liveType).catch(() => {
+			return flag;
+		};
+		const useLiveRoomInfo = async (liveType) => {
+			let flag = true;
+			const liveRoomInfoData = await this.getLiveRoomInfo(sub.roomid).catch(() => {
 				flag = false;
 				return null;
 			});
-			return flag;
+			if (!flag || !liveRoomInfoData || !liveRoomInfoData.uid) {
+				flag = false;
+				return flag;
+			}
+			if (liveType === LiveType.StartBroadcasting || liveType === LiveType.FirstLiveBroadcast) {
+				liveRoomInfo.uid = liveRoomInfoData.uid;
+				liveRoomInfo.live_time = liveRoomInfoData.live_time;
+				liveRoomInfo.short_id = liveRoomInfoData.short_id;
+				liveRoomInfo.room_id = liveRoomInfoData.room_id;
+				liveRoomInfo.online_max = 0;
+			}
+			liveRoomInfo.live_status = liveRoomInfoData.live_status;
+			liveRoomInfo.online = liveRoomInfoData.online;
+			if (liveRoomInfo.online > liveRoomInfo.online_max) liveRoomInfo.online_max = liveRoomInfo.online;
 		};
 		const LIVE_EVENT_COOLDOWN = 10 * 1e3;
 		let lastLiveStart = 0;
@@ -1298,6 +1323,8 @@ var ComRegister$1 = class {
 			onIncomeSuperChat: ({ body }) => {
 				this.segmentDanmaku(body.content, danmakuWeightRecord);
 				this.addUserToDanmakuMaker(body.user.uname, danmakuMakerRecord);
+				const content = (0, koishi.h)("message", [koishi.h.text(`【${masterInfo.username}的直播间】${body.user.uname}的SC：${body.content}（${body.price}元）`)]);
+				this.broadcastToTargets(sub.uid, content, PushType.Superchat);
 			},
 			onWatchedChange: ({ body }) => {
 				watchedNum = body.text_small;
@@ -1318,11 +1345,12 @@ var ComRegister$1 = class {
 					return;
 				}
 				liveStatus = true;
-				if (!await useMasterAndLiveRoomInfo(LiveType.StartBroadcasting)) {
+				if (!await useLiveRoomInfo(LiveType.StartBroadcasting) && !await useMasterInfo(LiveType.StartBroadcasting)) {
 					liveStatus = false;
 					await this.sendPrivateMsg("获取直播间信息失败，推送直播开播卡片失败！");
 					return await this.sendPrivateMsgAndStopService();
 				}
+				this.logger.info(`开播粉丝数：${masterInfo.liveOpenFollowerNum}`);
 				liveTime = liveRoomInfo?.live_time || luxon.DateTime.now().toFormat("yyyy-MM-dd HH:mm:ss");
 				const diffTime = await this.ctx["bilibili-notify-generate-img"].getTimeDifference(liveTime);
 				const follower = masterInfo.liveOpenFollowerNum >= 1e4 ? `${(masterInfo.liveOpenFollowerNum / 1e4).toFixed(1)}万` : masterInfo.liveOpenFollowerNum.toString();
@@ -1341,10 +1369,6 @@ var ComRegister$1 = class {
 				const now = Date.now();
 				if (now - lastLiveEnd < LIVE_EVENT_COOLDOWN) {
 					this.logger.warn(`[${sub.roomid}] 下播事件冷却期内被忽略`);
-					if (!liveTime) {
-						await useMasterAndLiveRoomInfo(LiveType.StopBroadcast);
-						liveTime = liveRoomInfo?.live_time || luxon.DateTime.now().toFormat("yyyy-MM-dd HH:mm:ss");
-					}
 					return;
 				}
 				lastLiveEnd = now;
@@ -1352,7 +1376,13 @@ var ComRegister$1 = class {
 					this.logger.warn(`[${sub.roomid}] 已是下播状态，忽略重复下播事件`);
 					return;
 				}
+				if (!await useLiveRoomInfo(LiveType.StopBroadcast) && !await useMasterInfo(LiveType.StopBroadcast)) {
+					liveStatus = false;
+					await this.sendPrivateMsg("获取直播间信息失败，推送直播开播卡片失败！");
+					return await this.sendPrivateMsgAndStopService();
+				}
 				liveStatus = false;
+				this.logger.info(`开播时粉丝数：${masterInfo.liveOpenFollowerNum}，下播时粉丝数：${masterInfo.liveEndFollowerNum}，粉丝数变化：${masterInfo.liveFollowerChange}`);
 				liveTime = liveRoomInfo?.live_time || luxon.DateTime.now().toFormat("yyyy-MM-dd HH:mm:ss");
 				const diffTime = await this.ctx["bilibili-notify-generate-img"].getTimeDifference(liveTime);
 				const followerChange = (() => {
@@ -1375,7 +1405,8 @@ var ComRegister$1 = class {
 			}
 		};
 		await this.ctx["bilibili-notify-live"].startLiveRoomListener(sub.roomid, handler);
-		if (!await useMasterAndLiveRoomInfo(LiveType.FirstLiveBroadcast)) return this.sendPrivateMsg("获取直播间信息失败，启动直播间弹幕检测失败！");
+		if (!await useLiveRoomInfo(LiveType.FirstLiveBroadcast) && !await useMasterInfo(LiveType.FirstLiveBroadcast)) return this.sendPrivateMsg("获取直播间信息失败，启动直播间弹幕检测失败！");
+		this.logger.info(`当前粉丝数：${masterInfo.liveOpenFollowerNum}`);
 		if (liveRoomInfo.live_status === 1) {
 			liveTime = liveRoomInfo.live_time;
 			const watched = watchedNum || "暂未获取到";
@@ -1395,7 +1426,7 @@ var ComRegister$1 = class {
 	async liveDetectWithAPI() {
 		const useMasterAndLiveRoomInfo = async (liveType, LiveAPIStatus) => {
 			let flag = true;
-			LiveAPIStatus.liveRoomInfo = await this.useLiveRoomInfo(LiveAPIStatus.roomId).catch(() => {
+			LiveAPIStatus.liveRoomInfo = await this.getLiveRoomInfo(LiveAPIStatus.roomId).catch(() => {
 				flag = false;
 				return null;
 			});
@@ -1403,7 +1434,7 @@ var ComRegister$1 = class {
 				flag = false;
 				return flag;
 			}
-			LiveAPIStatus.masterInfo = await this.useMasterInfo(LiveAPIStatus.liveRoomInfo.uid, LiveAPIStatus.masterInfo, liveType).catch(() => {
+			LiveAPIStatus.masterInfo = await this.getMasterInfo(LiveAPIStatus.liveRoomInfo.uid, LiveAPIStatus.masterInfo, liveType).catch(() => {
 				flag = false;
 				return null;
 			});
@@ -1610,7 +1641,7 @@ var ComRegister$1 = class {
 		};
 	}
 	async subUserInBili(mid) {
-		for (const user of this.groupInfo) if (user.mid === mid) return {
+		for (const user of this.groupInfo) if (user.mid.toString() === mid) return {
 			code: 0,
 			message: "订阅对象已存在于分组中"
 		};
@@ -1699,6 +1730,19 @@ var ComRegister$1 = class {
 		this.preInitConfig(subs);
 		for (const sub of Object.values(subs)) {
 			this.logger.info(`加载订阅UID:${sub.uid}中...`);
+			const subInfo = await this.subUserInBili(sub.uid);
+			if (subInfo.code !== 0 && subInfo.code !== 22015) return subInfo;
+			if (subInfo.code === 22015) this.logger.warn(`账号异常，无法进行订阅操作，请手动订阅 UID:${sub.uid} 备注:${sub.uname}`);
+			this.subManager.set(sub.uid, {
+				uname: sub.uname,
+				roomId: sub.roomid,
+				target: sub.target,
+				live: sub.live,
+				dynamic: sub.dynamic,
+				customCardStyle: sub.customCardStyle,
+				customLiveMsg: sub.customLiveMsg,
+				customLiveSummary: sub.customLiveSummary
+			});
 			if (sub.live && !sub.roomid) {
 				this.logger.info(`UID:${sub.uid} 请求了用户接口~`);
 				const { code: userInfoCode, message: userInfoMsg, data: userInfoData } = await withRetry(async () => {
@@ -1730,18 +1774,6 @@ var ComRegister$1 = class {
 				sub.roomid = userInfoData.live_room?.roomid;
 			}
 			if (sub.live && sub.roomid && this.config.liveDetectType === "WS") await this.liveDetectWithListener(sub);
-			const subInfo = await this.subUserInBili(sub.uid);
-			if (subInfo.code !== 0) return subInfo;
-			this.subManager.set(sub.uid, {
-				uname: sub.uname,
-				roomId: sub.roomid,
-				target: sub.target,
-				live: sub.live,
-				dynamic: sub.dynamic,
-				customCardStyle: sub.customCardStyle,
-				customLiveMsg: sub.customLiveMsg,
-				customLiveSummary: sub.customLiveSummary
-			});
 			this.logger.info(`UID:${sub.uid} 订阅加载完毕！`);
 			if (sub !== Object.values(subs).pop()) {
 				const randomDelay = Math.floor(Math.random() * 3) + 1;
@@ -1790,6 +1822,7 @@ var ComRegister$1 = class {
 			live: koishi.Schema.boolean().default(true).description("直播"),
 			liveAtAll: koishi.Schema.boolean().default(true).description("直播At全体"),
 			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("平台名"),
@@ -2016,7 +2049,7 @@ var GenerateImg$1 = class extends koishi.Service {
                                 </div>
                                 ${this.giConfig.hideDesc ? "" : `<p class="card-text">${data.description ? data.description : "这个主播很懒，什么简介都没写"}</p>`}
                                 <p class="card-link">
-                                    <span>人气：${data.online > 1e4 ? `${(data.online / 1e4).toFixed(1)}万` : data.online}</span>
+                                    <span>${liveStatus === 3 ? "本场直播最高人气：" : "人气："}${data.online > 1e4 ? `${(data.online / 1e4).toFixed(1)}万` : data.online}</span>
                                     <span>分区名称：${data.area_name}</span>
                                 </p>
                                 <p class="card-link">
@@ -3853,8 +3886,8 @@ var BiliAPI$1 = class extends koishi.Service {
 			headers: {
 				"Content-Type": "application/json",
 				"User-Agent": this.apiConfig.userAgent || "Mozilla/5.0 (X11; Linux x86_64; rv:109.0) Gecko/20100101 Firefox/115.0",
-				Origin: "https://space.bilibili.com",
-				Referer: "https://space.bilibili.com/",
+				Origin: "https://www.bilibili.com",
+				Referer: "https://www.bilibili.com/",
 				priority: "u=1, i",
 				"sec-ch-ua": "\"Not;A=Brand\";v=\"99\", \"Google Chrome\";v=\"139\", \"Chromium\";v=\"139\"",
 				"sec-ch-ua-mobile": "?0",

package/lib/index.mjs

@@ -61,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("上舰消息"),
+		superchat: Schema.boolean().default(false).description("SC消息"),
 		wordcloud: Schema.boolean().default(true).description("弹幕词云"),
 		liveSummary: Schema.boolean().default(true).description("直播总结"),
 		platform: Schema.string().required().description("平台名"),
@@ -174,6 +175,7 @@ let PushType = /* @__PURE__ */ function(PushType$1) {
 	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 = {
@@ -182,7 +184,8 @@ const PushTypeMsg = {
 	[PushType.DynamicAtAll]: "动态推送+At全体",
 	[PushType.StartBroadcasting]: "开播推送",
 	[PushType.LiveGuardBuy]: "上舰推送",
-	[PushType.WordCloudAndLiveSummary]: "弹幕词云和直播总结推送"
+	[PushType.WordCloudAndLiveSummary]: "弹幕词云和直播总结推送",
+	[PushType.Superchat]: "SC推送"
 };
 
 //#endregion
@@ -666,7 +669,7 @@ var ComRegister$1 = class {
 				if (timer) timer();
 			}
 		});
-		this.ctx.on("bilibili-notify/advanced-sub", async (subs) => {
+		if (this.config.advancedSub) this.ctx.on("bilibili-notify/advanced-sub", async (subs) => {
 			if (Object.keys(subs).length === 0) {
 				this.logger.info("初始化完毕，未添加任何订阅！");
 				return;
@@ -738,6 +741,7 @@ var ComRegister$1 = class {
 				live: s.live,
 				liveAtAll: s.liveAtAll,
 				liveGuardBuy: s.liveGuardBuy,
+				superchat: s.superchat,
 				wordcloud: s.wordcloud,
 				liveSummary: s.liveSummary
 			}));
@@ -828,6 +832,7 @@ var ComRegister$1 = class {
 			const liveArr = [];
 			const liveAtAllArr = [];
 			const liveGuardBuyArr = [];
+			const superchatArr = [];
 			const wordcloudArr = [];
 			const liveSummaryArr = [];
 			for (const platform of sub.target) for (const channel of platform.channelArr) {
@@ -838,6 +843,7 @@ var ComRegister$1 = class {
 					["live", liveArr],
 					["liveAtAll", liveAtAllArr],
 					["liveGuardBuy", liveGuardBuyArr],
+					["superchat", superchatArr],
 					["wordcloud", wordcloudArr],
 					["liveSummary", liveSummaryArr]
 				];
@@ -850,6 +856,7 @@ var ComRegister$1 = class {
 				liveAtAllArr,
 				liveSummaryArr,
 				liveGuardBuyArr,
+				superchatArr,
 				wordcloudArr
 			});
 		}
@@ -899,7 +906,7 @@ var ComRegister$1 = class {
 	async broadcastToTargets(uid, content, type) {
 		const record = this.pushArrMap.get(uid);
 		if (!record) return;
-		const hasTargets = type === PushType.StartBroadcasting && record.liveAtAllArr?.length > 0 || type === PushType.Dynamic && (record.dynamicArr?.length > 0 || record.dynamicAtAllArr?.length > 0) || (type === PushType.Live || type === PushType.StartBroadcasting) && record.liveArr?.length > 0 || type === PushType.LiveGuardBuy && record.liveGuardBuyArr?.length > 0 || type === PushType.WordCloudAndLiveSummary && (record.wordcloudArr?.length > 0 || record.liveSummaryArr?.length > 0);
+		const hasTargets = type === PushType.StartBroadcasting && record.liveAtAllArr?.length > 0 || type === PushType.Dynamic && (record.dynamicArr?.length > 0 || record.dynamicAtAllArr?.length > 0) || (type === PushType.Live || type === PushType.StartBroadcasting) && record.liveArr?.length > 0 || type === PushType.LiveGuardBuy && record.liveGuardBuyArr?.length > 0 || type === PushType.Superchat && record.superchatArr?.length > 0 || type === PushType.WordCloudAndLiveSummary && (record.wordcloudArr?.length > 0 || record.liveSummaryArr?.length > 0);
 		if (!hasTargets) return;
 		this.logger.info(`本次推送对象：${uid}，推送类型：${PushTypeMsg[type]}`);
 		if (type === PushType.StartBroadcasting && record.liveAtAllArr?.length > 0) {
@@ -927,6 +934,11 @@ var ComRegister$1 = class {
 			const liveGuardBuyArr = structuredClone(record.liveGuardBuyArr);
 			await withRetry(() => this.pushMessage(liveGuardBuyArr, h("message", content)), 1);
 		}
+		if (type === PushType.Superchat && record.superchatArr?.length > 0) {
+			this.logger.info("推送SC：", record.superchatArr);
+			const superchatArr = structuredClone(record.superchatArr);
+			await withRetry(() => this.pushMessage(superchatArr, h("message", content)), 1);
+		}
 		if (type === PushType.WordCloudAndLiveSummary) {
 			const wordcloudArr = structuredClone(record.wordcloudArr);
 			const liveSummaryArr = structuredClone(record.liveSummaryArr);
@@ -1134,7 +1146,7 @@ var ComRegister$1 = class {
 		};
 		return withLock(handler);
 	}
-	async useMasterInfo(uid, masterInfo, liveType) {
+	async getMasterInfo(uid, masterInfo, liveType) {
 		const { data } = await this.ctx["bilibili-notify-api"].getMasterInfo(uid);
 		let liveOpenFollowerNum;
 		let liveEndFollowerNum;
@@ -1159,7 +1171,7 @@ var ComRegister$1 = class {
 			medalName: data.medal_name
 		};
 	}
-	async useLiveRoomInfo(roomId) {
+	async getLiveRoomInfo(roomId) {
 		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}`);
 		});
@@ -1193,7 +1205,7 @@ var ComRegister$1 = class {
 		const danmakuWeightRecord = {};
 		const danmakuMakerRecord = {};
 		let liveStatus = false;
-		let liveRoomInfo;
+		const liveRoomInfo = {};
 		let masterInfo;
 		let watchedNum;
 		const liveMsgObj = this.liveMsgManager.get(sub.uid);
@@ -1226,7 +1238,7 @@ var ComRegister$1 = class {
 			Object.keys(danmakuMakerRecord).forEach((key) => delete danmakuMakerRecord[key]);
 		};
 		const pushAtTimeFunc = async () => {
-			if (!await useMasterAndLiveRoomInfo(LiveType.LiveBroadcast)) {
+			if (!await useLiveRoomInfo(LiveType.LiveBroadcast) && !await useMasterInfo(LiveType.LiveBroadcast)) {
 				await this.sendPrivateMsg("获取直播间信息失败，推送直播卡片失败！");
 				return await this.sendPrivateMsgAndStopService();
 			}
@@ -1245,21 +1257,34 @@ var ComRegister$1 = class {
 				cardStyle: sub.customCardStyle
 			}, sub.uid, liveMsg);
 		};
-		const useMasterAndLiveRoomInfo = async (liveType) => {
+		const useMasterInfo = async (liveType) => {
 			let flag = true;
-			liveRoomInfo = await this.useLiveRoomInfo(sub.roomid).catch(() => {
+			masterInfo = await this.getMasterInfo(liveRoomInfo.uid.toString(), masterInfo, liveType).catch(() => {
 				flag = false;
 				return null;
 			});
-			if (!flag || !liveRoomInfo || !liveRoomInfo.uid) {
-				flag = false;
-				return flag;
-			}
-			masterInfo = await this.useMasterInfo(liveRoomInfo.uid.toString(), masterInfo, liveType).catch(() => {
+			return flag;
+		};
+		const useLiveRoomInfo = async (liveType) => {
+			let flag = true;
+			const liveRoomInfoData = await this.getLiveRoomInfo(sub.roomid).catch(() => {
 				flag = false;
 				return null;
 			});
-			return flag;
+			if (!flag || !liveRoomInfoData || !liveRoomInfoData.uid) {
+				flag = false;
+				return flag;
+			}
+			if (liveType === LiveType.StartBroadcasting || liveType === LiveType.FirstLiveBroadcast) {
+				liveRoomInfo.uid = liveRoomInfoData.uid;
+				liveRoomInfo.live_time = liveRoomInfoData.live_time;
+				liveRoomInfo.short_id = liveRoomInfoData.short_id;
+				liveRoomInfo.room_id = liveRoomInfoData.room_id;
+				liveRoomInfo.online_max = 0;
+			}
+			liveRoomInfo.live_status = liveRoomInfoData.live_status;
+			liveRoomInfo.online = liveRoomInfoData.online;
+			if (liveRoomInfo.online > liveRoomInfo.online_max) liveRoomInfo.online_max = liveRoomInfo.online;
 		};
 		const LIVE_EVENT_COOLDOWN = 10 * 1e3;
 		let lastLiveStart = 0;
@@ -1280,6 +1305,8 @@ var ComRegister$1 = class {
 			onIncomeSuperChat: ({ body }) => {
 				this.segmentDanmaku(body.content, danmakuWeightRecord);
 				this.addUserToDanmakuMaker(body.user.uname, danmakuMakerRecord);
+				const content = h("message", [h.text(`【${masterInfo.username}的直播间】${body.user.uname}的SC：${body.content}（${body.price}元）`)]);
+				this.broadcastToTargets(sub.uid, content, PushType.Superchat);
 			},
 			onWatchedChange: ({ body }) => {
 				watchedNum = body.text_small;
@@ -1300,11 +1327,12 @@ var ComRegister$1 = class {
 					return;
 				}
 				liveStatus = true;
-				if (!await useMasterAndLiveRoomInfo(LiveType.StartBroadcasting)) {
+				if (!await useLiveRoomInfo(LiveType.StartBroadcasting) && !await useMasterInfo(LiveType.StartBroadcasting)) {
 					liveStatus = false;
 					await this.sendPrivateMsg("获取直播间信息失败，推送直播开播卡片失败！");
 					return await this.sendPrivateMsgAndStopService();
 				}
+				this.logger.info(`开播粉丝数：${masterInfo.liveOpenFollowerNum}`);
 				liveTime = liveRoomInfo?.live_time || DateTime.now().toFormat("yyyy-MM-dd HH:mm:ss");
 				const diffTime = await this.ctx["bilibili-notify-generate-img"].getTimeDifference(liveTime);
 				const follower = masterInfo.liveOpenFollowerNum >= 1e4 ? `${(masterInfo.liveOpenFollowerNum / 1e4).toFixed(1)}万` : masterInfo.liveOpenFollowerNum.toString();
@@ -1323,10 +1351,6 @@ var ComRegister$1 = class {
 				const now = Date.now();
 				if (now - lastLiveEnd < LIVE_EVENT_COOLDOWN) {
 					this.logger.warn(`[${sub.roomid}] 下播事件冷却期内被忽略`);
-					if (!liveTime) {
-						await useMasterAndLiveRoomInfo(LiveType.StopBroadcast);
-						liveTime = liveRoomInfo?.live_time || DateTime.now().toFormat("yyyy-MM-dd HH:mm:ss");
-					}
 					return;
 				}
 				lastLiveEnd = now;
@@ -1334,7 +1358,13 @@ var ComRegister$1 = class {
 					this.logger.warn(`[${sub.roomid}] 已是下播状态，忽略重复下播事件`);
 					return;
 				}
+				if (!await useLiveRoomInfo(LiveType.StopBroadcast) && !await useMasterInfo(LiveType.StopBroadcast)) {
+					liveStatus = false;
+					await this.sendPrivateMsg("获取直播间信息失败，推送直播开播卡片失败！");
+					return await this.sendPrivateMsgAndStopService();
+				}
 				liveStatus = false;
+				this.logger.info(`开播时粉丝数：${masterInfo.liveOpenFollowerNum}，下播时粉丝数：${masterInfo.liveEndFollowerNum}，粉丝数变化：${masterInfo.liveFollowerChange}`);
 				liveTime = liveRoomInfo?.live_time || DateTime.now().toFormat("yyyy-MM-dd HH:mm:ss");
 				const diffTime = await this.ctx["bilibili-notify-generate-img"].getTimeDifference(liveTime);
 				const followerChange = (() => {
@@ -1357,7 +1387,8 @@ var ComRegister$1 = class {
 			}
 		};
 		await this.ctx["bilibili-notify-live"].startLiveRoomListener(sub.roomid, handler);
-		if (!await useMasterAndLiveRoomInfo(LiveType.FirstLiveBroadcast)) return this.sendPrivateMsg("获取直播间信息失败，启动直播间弹幕检测失败！");
+		if (!await useLiveRoomInfo(LiveType.FirstLiveBroadcast) && !await useMasterInfo(LiveType.FirstLiveBroadcast)) return this.sendPrivateMsg("获取直播间信息失败，启动直播间弹幕检测失败！");
+		this.logger.info(`当前粉丝数：${masterInfo.liveOpenFollowerNum}`);
 		if (liveRoomInfo.live_status === 1) {
 			liveTime = liveRoomInfo.live_time;
 			const watched = watchedNum || "暂未获取到";
@@ -1377,7 +1408,7 @@ var ComRegister$1 = class {
 	async liveDetectWithAPI() {
 		const useMasterAndLiveRoomInfo = async (liveType, LiveAPIStatus) => {
 			let flag = true;
-			LiveAPIStatus.liveRoomInfo = await this.useLiveRoomInfo(LiveAPIStatus.roomId).catch(() => {
+			LiveAPIStatus.liveRoomInfo = await this.getLiveRoomInfo(LiveAPIStatus.roomId).catch(() => {
 				flag = false;
 				return null;
 			});
@@ -1385,7 +1416,7 @@ var ComRegister$1 = class {
 				flag = false;
 				return flag;
 			}
-			LiveAPIStatus.masterInfo = await this.useMasterInfo(LiveAPIStatus.liveRoomInfo.uid, LiveAPIStatus.masterInfo, liveType).catch(() => {
+			LiveAPIStatus.masterInfo = await this.getMasterInfo(LiveAPIStatus.liveRoomInfo.uid, LiveAPIStatus.masterInfo, liveType).catch(() => {
 				flag = false;
 				return null;
 			});
@@ -1592,7 +1623,7 @@ var ComRegister$1 = class {
 		};
 	}
 	async subUserInBili(mid) {
-		for (const user of this.groupInfo) if (user.mid === mid) return {
+		for (const user of this.groupInfo) if (user.mid.toString() === mid) return {
 			code: 0,
 			message: "订阅对象已存在于分组中"
 		};
@@ -1681,6 +1712,19 @@ var ComRegister$1 = class {
 		this.preInitConfig(subs);
 		for (const sub of Object.values(subs)) {
 			this.logger.info(`加载订阅UID:${sub.uid}中...`);
+			const subInfo = await this.subUserInBili(sub.uid);
+			if (subInfo.code !== 0 && subInfo.code !== 22015) return subInfo;
+			if (subInfo.code === 22015) this.logger.warn(`账号异常，无法进行订阅操作，请手动订阅 UID:${sub.uid} 备注:${sub.uname}`);
+			this.subManager.set(sub.uid, {
+				uname: sub.uname,
+				roomId: sub.roomid,
+				target: sub.target,
+				live: sub.live,
+				dynamic: sub.dynamic,
+				customCardStyle: sub.customCardStyle,
+				customLiveMsg: sub.customLiveMsg,
+				customLiveSummary: sub.customLiveSummary
+			});
 			if (sub.live && !sub.roomid) {
 				this.logger.info(`UID:${sub.uid} 请求了用户接口~`);
 				const { code: userInfoCode, message: userInfoMsg, data: userInfoData } = await withRetry(async () => {
@@ -1712,18 +1756,6 @@ var ComRegister$1 = class {
 				sub.roomid = userInfoData.live_room?.roomid;
 			}
 			if (sub.live && sub.roomid && this.config.liveDetectType === "WS") await this.liveDetectWithListener(sub);
-			const subInfo = await this.subUserInBili(sub.uid);
-			if (subInfo.code !== 0) return subInfo;
-			this.subManager.set(sub.uid, {
-				uname: sub.uname,
-				roomId: sub.roomid,
-				target: sub.target,
-				live: sub.live,
-				dynamic: sub.dynamic,
-				customCardStyle: sub.customCardStyle,
-				customLiveMsg: sub.customLiveMsg,
-				customLiveSummary: sub.customLiveSummary
-			});
 			this.logger.info(`UID:${sub.uid} 订阅加载完毕！`);
 			if (sub !== Object.values(subs).pop()) {
 				const randomDelay = Math.floor(Math.random() * 3) + 1;
@@ -1772,6 +1804,7 @@ var ComRegister$1 = class {
 			live: Schema.boolean().default(true).description("直播"),
 			liveAtAll: Schema.boolean().default(true).description("直播At全体"),
 			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("平台名"),
@@ -1998,7 +2031,7 @@ var GenerateImg$1 = class extends Service {
                                 </div>
                                 ${this.giConfig.hideDesc ? "" : `<p class="card-text">${data.description ? data.description : "这个主播很懒，什么简介都没写"}</p>`}
                                 <p class="card-link">
-                                    <span>人气：${data.online > 1e4 ? `${(data.online / 1e4).toFixed(1)}万` : data.online}</span>
+                                    <span>${liveStatus === 3 ? "本场直播最高人气：" : "人气："}${data.online > 1e4 ? `${(data.online / 1e4).toFixed(1)}万` : data.online}</span>
                                     <span>分区名称：${data.area_name}</span>
                                 </p>
                                 <p class="card-link">
@@ -3835,8 +3868,8 @@ var BiliAPI$1 = class extends Service {
 			headers: {
 				"Content-Type": "application/json",
 				"User-Agent": this.apiConfig.userAgent || "Mozilla/5.0 (X11; Linux x86_64; rv:109.0) Gecko/20100101 Firefox/115.0",
-				Origin: "https://space.bilibili.com",
-				Referer: "https://space.bilibili.com/",
+				Origin: "https://www.bilibili.com",
+				Referer: "https://www.bilibili.com/",
 				priority: "u=1, i",
 				"sec-ch-ua": "\"Not;A=Brand\";v=\"99\", \"Google Chrome\";v=\"139\", \"Chromium\";v=\"139\"",
 				"sec-ch-ua-mobile": "?0",

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-bilibili-notify",
   "description": "Koishi bilibili notify plugin",
-  "version": "3.3.9",
+  "version": "3.3.11-alpha.0",
   "main": "./lib/index.js",
   "typings": "lib/index.d.ts",
   "files": [