koishi-plugin-bilibili-notify 3.3.8 → 3.3.10

package/lib/index.js

@@ -375,6 +375,7 @@ var ComRegister$1 = class {
 	_jieba = __node_rs_jieba.Jieba.withDict(__node_rs_jieba_dict.dict);
 	stopwords;
 	reciveSubTimes = 0;
+	groupInfo = null;
 	constructor(ctx, config) {
 		this.ctx = ctx;
 		this.init(config);
@@ -695,6 +696,12 @@ var ComRegister$1 = class {
 	}
 	async initAsyncPart(subs) {
 		this.logger.info("获取到订阅信息，开始加载订阅...");
+		const groupInfoResult = await this.getGroupInfo();
+		if (groupInfoResult.code !== 0) {
+			this.logger.error("获取分组信息失败，插件初始化失败！");
+			return;
+		}
+		this.groupInfo = groupInfoResult.data;
 		const { code, message } = await this.loadSubFromConfig(subs);
 		if (code !== 0) {
 			this.logger.error(message);
@@ -936,7 +943,7 @@ var ComRegister$1 = class {
 		if (type === PushType.LiveGuardBuy && record.liveGuardBuyArr?.length > 0) {
 			this.logger.info("推送直播守护购买：", record.liveGuardBuyArr);
 			const liveGuardBuyArr = structuredClone(record.liveGuardBuyArr);
-			await withRetry(() => this.pushMessage(liveGuardBuyArr, (0, koishi.h)(koishi.h.Fragment, (0, koishi.h)(content))), 1);
+			await withRetry(() => this.pushMessage(liveGuardBuyArr, (0, koishi.h)("message", content)), 1);
 		}
 		if (type === PushType.WordCloudAndLiveSummary) {
 			const wordcloudArr = structuredClone(record.wordcloudArr);
@@ -1540,7 +1547,7 @@ var ComRegister$1 = class {
 			check();
 		});
 	}
-	async subUserInBili(mid) {
+	async getGroupInfo() {
 		const checkGroupIsReady = async () => {
 			const allGroupData = await this.ctx["bilibili-notify-api"].getAllGroup();
 			let existFlag = false;
@@ -1596,7 +1603,14 @@ var ComRegister$1 = class {
 			code,
 			message
 		};
-		for (const user of data) if (user.mid === mid) return {
+		return {
+			code: 0,
+			message: "获取分组明细成功",
+			data
+		};
+	}
+	async subUserInBili(mid) {
+		for (const user of this.groupInfo) if (user.mid.toString() === mid) return {
 			code: 0,
 			message: "订阅对象已存在于分组中"
 		};
@@ -1685,6 +1699,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 () => {
@@ -1716,18 +1743,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;
@@ -3840,7 +3855,14 @@ var BiliAPI$1 = class extends koishi.Service {
 				"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://www.bilibili.com",
-				Referer: "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",
+				"sec-ch-ua-platform": "\"Linux\"",
+				"sec-fetch-dest": "empty",
+				"sec-fetch-mode": "cors",
+				"sec-fetch-site": "same-site"
 			}
 		}));
 	}

package/lib/index.mjs

@@ -357,6 +357,7 @@ var ComRegister$1 = class {
 	_jieba = Jieba.withDict(dict);
 	stopwords;
 	reciveSubTimes = 0;
+	groupInfo = null;
 	constructor(ctx, config) {
 		this.ctx = ctx;
 		this.init(config);
@@ -677,6 +678,12 @@ var ComRegister$1 = class {
 	}
 	async initAsyncPart(subs) {
 		this.logger.info("获取到订阅信息，开始加载订阅...");
+		const groupInfoResult = await this.getGroupInfo();
+		if (groupInfoResult.code !== 0) {
+			this.logger.error("获取分组信息失败，插件初始化失败！");
+			return;
+		}
+		this.groupInfo = groupInfoResult.data;
 		const { code, message } = await this.loadSubFromConfig(subs);
 		if (code !== 0) {
 			this.logger.error(message);
@@ -918,7 +925,7 @@ var ComRegister$1 = class {
 		if (type === PushType.LiveGuardBuy && record.liveGuardBuyArr?.length > 0) {
 			this.logger.info("推送直播守护购买：", record.liveGuardBuyArr);
 			const liveGuardBuyArr = structuredClone(record.liveGuardBuyArr);
-			await withRetry(() => this.pushMessage(liveGuardBuyArr, h(h.Fragment, h(content))), 1);
+			await withRetry(() => this.pushMessage(liveGuardBuyArr, h("message", content)), 1);
 		}
 		if (type === PushType.WordCloudAndLiveSummary) {
 			const wordcloudArr = structuredClone(record.wordcloudArr);
@@ -1522,7 +1529,7 @@ var ComRegister$1 = class {
 			check();
 		});
 	}
-	async subUserInBili(mid) {
+	async getGroupInfo() {
 		const checkGroupIsReady = async () => {
 			const allGroupData = await this.ctx["bilibili-notify-api"].getAllGroup();
 			let existFlag = false;
@@ -1578,7 +1585,14 @@ var ComRegister$1 = class {
 			code,
 			message
 		};
-		for (const user of data) if (user.mid === mid) return {
+		return {
+			code: 0,
+			message: "获取分组明细成功",
+			data
+		};
+	}
+	async subUserInBili(mid) {
+		for (const user of this.groupInfo) if (user.mid.toString() === mid) return {
 			code: 0,
 			message: "订阅对象已存在于分组中"
 		};
@@ -1667,6 +1681,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 () => {
@@ -1698,18 +1725,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;
@@ -3822,7 +3837,14 @@ var BiliAPI$1 = class extends Service {
 				"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://www.bilibili.com",
-				Referer: "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",
+				"sec-ch-ua-platform": "\"Linux\"",
+				"sec-fetch-dest": "empty",
+				"sec-fetch-mode": "cors",
+				"sec-fetch-site": "same-site"
 			}
 		}));
 	}

package/package.json

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