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

package/lib/index.d.mts

@@ -87,7 +87,9 @@ type CustomLiveSummary = {
   liveSummary?: string;
 };
 type Subscription = {
+  uname: string;
   uid: string;
+  roomid: string;
   dynamic: boolean;
   live: boolean;
   target: Target;

package/lib/index.d.ts

@@ -87,7 +87,9 @@ type CustomLiveSummary = {
   liveSummary?: string;
 };
 type Subscription = {
+  uname: string;
   uid: string;
+  roomid: string;
   dynamic: boolean;
   live: boolean;
   target: Target;

package/lib/index.js

@@ -74,7 +74,7 @@ const BAConfigSchema = koishi.Schema.object({
 	advancedSub: koishi.Schema.boolean().default(false).description("是否开启高级订阅，若开启高级订阅，请打开该选项并下载插件 bilibili-notify-advanced-subscription"),
 	subs: koishi.Schema.array(koishi.Schema.object({
 		name: koishi.Schema.string().required().description("备注"),
-		uid: koishi.Schema.string().required().description("UID"),
+		uid: koishi.Schema.string().required().description("UID和roomid"),
 		dynamic: koishi.Schema.boolean().default(true).description("动态"),
 		dynamicAtAll: koishi.Schema.boolean().default(false).description("动态At全体"),
 		live: koishi.Schema.boolean().default(true).description("直播"),
@@ -84,7 +84,7 @@ const BAConfigSchema = koishi.Schema.object({
 		liveSummary: koishi.Schema.boolean().default(true).description("直播总结"),
 		platform: koishi.Schema.string().required().description("平台名"),
 		target: koishi.Schema.string().required().description("群号/频道号")
-	})).role("table").description("输入订阅信息，自定义订阅内容； 群号/频道号格式：频道号,频道号 使用英文逗号分隔，例如 1234567,2345678"),
+	})).role("table").description("输入订阅信息，自定义订阅内容； UID和roomid，如果经常在初始化插件遇到风控问题，请补充直播间房间号，使用英文逗号分隔例如,1234567,114514 群号/频道号格式：频道号,频道号 使用英文逗号分隔，例如 1234567,2345678"),
 	dynamic: koishi.Schema.object({}).description("动态推送设置"),
 	dynamicUrl: koishi.Schema.boolean().default(false).description("发送动态时是否同时发送链接。注意：如果使用的是QQ官方机器人不能开启此项！"),
 	dynamicCron: koishi.Schema.string().default("*/2 * * * *").description("动态监测时间，请填入cron表达式，请勿填入过短时间"),
@@ -751,8 +751,11 @@ var ComRegister = class {
 				channelArr,
 				platform: s.platform
 			}];
+			const [uid, roomid] = s.uid.split(",");
 			subs[s.name] = {
-				uid: s.uid,
+				uname: s.name,
+				uid,
+				roomid,
 				dynamic: s.dynamic,
 				live: s.live,
 				target,
@@ -1193,7 +1196,7 @@ var ComRegister = class {
 	addUserToDanmakuMaker(username, danmakuMakerRecord) {
 		danmakuMakerRecord[username] = (danmakuMakerRecord[username] || 0) + 1;
 	}
-	async liveDetectWithListener(roomId, sub) {
+	async liveDetectWithListener(sub) {
 		let liveTime;
 		let pushAtTimeTimer;
 		const danmakuWeightRecord = {};
@@ -1206,7 +1209,17 @@ var ComRegister = class {
 		const sendDanmakuWordCloudAndLiveSummary = async (customLiveSummary) => {
 			this.logger.info("开始制作弹幕词云");
 			this.logger.info("正在获取前90热词");
-			const top90Words = Object.entries(danmakuWeightRecord).sort((a, b) => b[1] - a[1]).slice(0, 90);
+			const words = Object.entries(danmakuWeightRecord);
+			const danmaker = Object.entries(danmakuMakerRecord);
+			if (words.length < 50) {
+				this.logger.info("热词不足50个，本次弹幕词云放弃");
+				return;
+			}
+			if (danmaker.length < 5) {
+				this.logger.info("发言人数不足5位，本次弹幕词云放弃");
+				return;
+			}
+			const top90Words = words.sort((a, b) => b[1] - a[1]).slice(0, 90);
 			this.logger.info("弹幕词云前90词及权重：");
 			this.logger.info(top90Words);
 			this.logger.info("正在准备生成弹幕词云");
@@ -1243,7 +1256,7 @@ var ComRegister = class {
 		};
 		const useMasterAndLiveRoomInfo = async (liveType) => {
 			let flag = true;
-			liveRoomInfo = await this.useLiveRoomInfo(roomId).catch(() => {
+			liveRoomInfo = await this.useLiveRoomInfo(sub.roomid).catch(() => {
 				flag = false;
 				return null;
 			});
@@ -1261,9 +1274,9 @@ var ComRegister = class {
 			onError: async () => {
 				liveStatus = false;
 				pushAtTimeTimer?.();
-				this.ctx["bilibili-notify-live"].closeListener(roomId);
-				await this.sendPrivateMsg(`[${roomId}]直播间连接发生错误！`);
-				this.logger.error(`[${roomId}]直播间连接发生错误！`);
+				this.ctx["bilibili-notify-live"].closeListener(sub.roomid);
+				await this.sendPrivateMsg(`[${sub.roomid}]直播间连接发生错误！`);
+				this.logger.error(`[${sub.roomid}]直播间连接发生错误！`);
 			},
 			onIncomeDanmu: ({ body }) => {
 				this.segmentDanmaku(body.content, danmakuWeightRecord);
@@ -1306,7 +1319,7 @@ var ComRegister = class {
 				}, sub.uid, liveStartMsg);
 				if (this.config.pushTime !== 0 && !pushAtTimeTimer) {
 					pushAtTimeTimer = this.ctx.setInterval(pushAtTimeFunc, this.config.pushTime * 1e3 * 60 * 60);
-					this.liveWSManager.set(roomId, pushAtTimeTimer);
+					this.liveWSManager.set(sub.roomid, pushAtTimeTimer);
 				}
 			},
 			onLiveEnd: async () => {
@@ -1332,7 +1345,7 @@ var ComRegister = class {
 				await sendDanmakuWordCloudAndLiveSummary(liveMsgObj.liveSummary);
 			}
 		};
-		await this.ctx["bilibili-notify-live"].startLiveRoomListener(roomId, handler);
+		await this.ctx["bilibili-notify-live"].startLiveRoomListener(sub.roomid, handler);
 		if (!await useMasterAndLiveRoomInfo(LiveType.FirstLiveBroadcast)) return this.sendPrivateMsg("获取直播间信息失败，启动直播间弹幕检测失败！");
 		if (liveRoomInfo.live_status === 1) {
 			liveTime = liveRoomInfo.live_time;
@@ -1345,7 +1358,7 @@ var ComRegister = class {
 			}, sub.uid, liveMsg);
 			if (this.config.pushTime !== 0 && !pushAtTimeTimer) {
 				pushAtTimeTimer = this.ctx.setInterval(pushAtTimeFunc, this.config.pushTime * 1e3 * 60 * 60);
-				this.liveWSManager.set(roomId, pushAtTimeTimer);
+				this.liveWSManager.set(sub.roomid, pushAtTimeTimer);
 			}
 			liveStatus = true;
 		}
@@ -1653,40 +1666,42 @@ var ComRegister = class {
 		this.preInitConfig(subs);
 		for (const sub of Object.values(subs)) {
 			this.logger.info(`加载订阅UID:${sub.uid}中...`);
-			const { code: userInfoCode, message: userInfoMsg, data: userInfoData } = await withRetry(async () => {
-				const data = await this.ctx["bilibili-notify-api"].getUserInfo(sub.uid);
-				return data;
-			}).catch((e) => {
-				this.logger.error(`loadSubFromConfig() getUserInfo() 发生了错误，错误为：${e.message}`);
-				return {
-					code: -1,
-					message: `加载订阅UID:${sub.uid}失败！`
-				};
-			});
-			if (userInfoCode === -352 && userInfoData.v_voucher) {
-				this.logger.info("账号被风控，请使用指令 bili cap 进行风控验证");
-				await this.sendPrivateMsg("账号被风控，请使用指令 bili cap 进行风控验证");
-				return {
+			if (!sub.roomid) {
+				this.logger.info(`UID:${sub.uid} 请求了用户接口~`);
+				const { code: userInfoCode, message: userInfoMsg, data: userInfoData } = await withRetry(async () => {
+					const data = await this.ctx["bilibili-notify-api"].getUserInfo(sub.uid);
+					return data;
+				}).catch((e) => {
+					this.logger.error(`loadSubFromConfig() getUserInfo() 发生了错误，错误为：${e.message}`);
+					return {
+						code: -1,
+						message: `加载订阅UID:${sub.uid}失败！`
+					};
+				});
+				if (userInfoCode === -352 && userInfoData.v_voucher) {
+					this.logger.info("账号被风控，请使用指令 bili cap 进行风控验证");
+					await this.sendPrivateMsg("账号被风控，请使用指令 bili cap 进行风控验证");
+					return {
+						code: userInfoCode,
+						message: userInfoMsg
+					};
+				}
+				if (userInfoCode !== 0) return {
 					code: userInfoCode,
 					message: userInfoMsg
 				};
-			}
-			if (userInfoCode !== 0) return {
-				code: userInfoCode,
-				message: userInfoMsg
-			};
-			if (this.config.liveDetectType === "WS" && sub.live) {
-				if (!userInfoData.live_room) {
+				if (sub.live && !userInfoData.live_room) {
 					sub.live = false;
 					this.logger.warn(`UID:${sub.uid} 用户没有开通直播间，无法订阅直播！`);
 				}
-				if (sub.live) await this.liveDetectWithListener(userInfoData.live_room.roomid, sub);
+				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: userInfoData.name,
-				roomId: sub.live ? userInfoData.live_room.roomid : "",
+				uname: sub.uname,
+				roomId: sub.roomid,
 				target: sub.target,
 				live: sub.live,
 				dynamic: sub.dynamic,
@@ -1694,7 +1709,7 @@ var ComRegister = class {
 				customLiveMsg: sub.customLiveMsg,
 				customLiveSummary: sub.customLiveSummary
 			});
-			this.logger.info(`UID:${sub.uid}订阅加载完毕！`);
+			this.logger.info(`UID:${sub.uid} 订阅加载完毕！`);
 			if (sub !== Object.values(subs).pop()) {
 				const randomDelay = Math.floor(Math.random() * 3) + 1;
 				this.logger.info(`随机延迟:${randomDelay}秒`);

package/lib/index.mjs

@@ -55,7 +55,7 @@ const BAConfigSchema = Schema.object({
 	advancedSub: Schema.boolean().default(false).description("是否开启高级订阅，若开启高级订阅，请打开该选项并下载插件 bilibili-notify-advanced-subscription"),
 	subs: Schema.array(Schema.object({
 		name: Schema.string().required().description("备注"),
-		uid: Schema.string().required().description("UID"),
+		uid: Schema.string().required().description("UID和roomid"),
 		dynamic: Schema.boolean().default(true).description("动态"),
 		dynamicAtAll: Schema.boolean().default(false).description("动态At全体"),
 		live: Schema.boolean().default(true).description("直播"),
@@ -65,7 +65,7 @@ const BAConfigSchema = Schema.object({
 		liveSummary: Schema.boolean().default(true).description("直播总结"),
 		platform: Schema.string().required().description("平台名"),
 		target: Schema.string().required().description("群号/频道号")
-	})).role("table").description("输入订阅信息，自定义订阅内容； 群号/频道号格式：频道号,频道号 使用英文逗号分隔，例如 1234567,2345678"),
+	})).role("table").description("输入订阅信息，自定义订阅内容； UID和roomid，如果经常在初始化插件遇到风控问题，请补充直播间房间号，使用英文逗号分隔例如,1234567,114514 群号/频道号格式：频道号,频道号 使用英文逗号分隔，例如 1234567,2345678"),
 	dynamic: Schema.object({}).description("动态推送设置"),
 	dynamicUrl: Schema.boolean().default(false).description("发送动态时是否同时发送链接。注意：如果使用的是QQ官方机器人不能开启此项！"),
 	dynamicCron: Schema.string().default("*/2 * * * *").description("动态监测时间，请填入cron表达式，请勿填入过短时间"),
@@ -732,8 +732,11 @@ var ComRegister = class {
 				channelArr,
 				platform: s.platform
 			}];
+			const [uid, roomid] = s.uid.split(",");
 			subs[s.name] = {
-				uid: s.uid,
+				uname: s.name,
+				uid,
+				roomid,
 				dynamic: s.dynamic,
 				live: s.live,
 				target,
@@ -1174,7 +1177,7 @@ var ComRegister = class {
 	addUserToDanmakuMaker(username, danmakuMakerRecord) {
 		danmakuMakerRecord[username] = (danmakuMakerRecord[username] || 0) + 1;
 	}
-	async liveDetectWithListener(roomId, sub) {
+	async liveDetectWithListener(sub) {
 		let liveTime;
 		let pushAtTimeTimer;
 		const danmakuWeightRecord = {};
@@ -1187,7 +1190,17 @@ var ComRegister = class {
 		const sendDanmakuWordCloudAndLiveSummary = async (customLiveSummary) => {
 			this.logger.info("开始制作弹幕词云");
 			this.logger.info("正在获取前90热词");
-			const top90Words = Object.entries(danmakuWeightRecord).sort((a, b) => b[1] - a[1]).slice(0, 90);
+			const words = Object.entries(danmakuWeightRecord);
+			const danmaker = Object.entries(danmakuMakerRecord);
+			if (words.length < 50) {
+				this.logger.info("热词不足50个，本次弹幕词云放弃");
+				return;
+			}
+			if (danmaker.length < 5) {
+				this.logger.info("发言人数不足5位，本次弹幕词云放弃");
+				return;
+			}
+			const top90Words = words.sort((a, b) => b[1] - a[1]).slice(0, 90);
 			this.logger.info("弹幕词云前90词及权重：");
 			this.logger.info(top90Words);
 			this.logger.info("正在准备生成弹幕词云");
@@ -1224,7 +1237,7 @@ var ComRegister = class {
 		};
 		const useMasterAndLiveRoomInfo = async (liveType) => {
 			let flag = true;
-			liveRoomInfo = await this.useLiveRoomInfo(roomId).catch(() => {
+			liveRoomInfo = await this.useLiveRoomInfo(sub.roomid).catch(() => {
 				flag = false;
 				return null;
 			});
@@ -1242,9 +1255,9 @@ var ComRegister = class {
 			onError: async () => {
 				liveStatus = false;
 				pushAtTimeTimer?.();
-				this.ctx["bilibili-notify-live"].closeListener(roomId);
-				await this.sendPrivateMsg(`[${roomId}]直播间连接发生错误！`);
-				this.logger.error(`[${roomId}]直播间连接发生错误！`);
+				this.ctx["bilibili-notify-live"].closeListener(sub.roomid);
+				await this.sendPrivateMsg(`[${sub.roomid}]直播间连接发生错误！`);
+				this.logger.error(`[${sub.roomid}]直播间连接发生错误！`);
 			},
 			onIncomeDanmu: ({ body }) => {
 				this.segmentDanmaku(body.content, danmakuWeightRecord);
@@ -1287,7 +1300,7 @@ var ComRegister = class {
 				}, sub.uid, liveStartMsg);
 				if (this.config.pushTime !== 0 && !pushAtTimeTimer) {
 					pushAtTimeTimer = this.ctx.setInterval(pushAtTimeFunc, this.config.pushTime * 1e3 * 60 * 60);
-					this.liveWSManager.set(roomId, pushAtTimeTimer);
+					this.liveWSManager.set(sub.roomid, pushAtTimeTimer);
 				}
 			},
 			onLiveEnd: async () => {
@@ -1313,7 +1326,7 @@ var ComRegister = class {
 				await sendDanmakuWordCloudAndLiveSummary(liveMsgObj.liveSummary);
 			}
 		};
-		await this.ctx["bilibili-notify-live"].startLiveRoomListener(roomId, handler);
+		await this.ctx["bilibili-notify-live"].startLiveRoomListener(sub.roomid, handler);
 		if (!await useMasterAndLiveRoomInfo(LiveType.FirstLiveBroadcast)) return this.sendPrivateMsg("获取直播间信息失败，启动直播间弹幕检测失败！");
 		if (liveRoomInfo.live_status === 1) {
 			liveTime = liveRoomInfo.live_time;
@@ -1326,7 +1339,7 @@ var ComRegister = class {
 			}, sub.uid, liveMsg);
 			if (this.config.pushTime !== 0 && !pushAtTimeTimer) {
 				pushAtTimeTimer = this.ctx.setInterval(pushAtTimeFunc, this.config.pushTime * 1e3 * 60 * 60);
-				this.liveWSManager.set(roomId, pushAtTimeTimer);
+				this.liveWSManager.set(sub.roomid, pushAtTimeTimer);
 			}
 			liveStatus = true;
 		}
@@ -1634,40 +1647,42 @@ var ComRegister = class {
 		this.preInitConfig(subs);
 		for (const sub of Object.values(subs)) {
 			this.logger.info(`加载订阅UID:${sub.uid}中...`);
-			const { code: userInfoCode, message: userInfoMsg, data: userInfoData } = await withRetry(async () => {
-				const data = await this.ctx["bilibili-notify-api"].getUserInfo(sub.uid);
-				return data;
-			}).catch((e) => {
-				this.logger.error(`loadSubFromConfig() getUserInfo() 发生了错误，错误为：${e.message}`);
-				return {
-					code: -1,
-					message: `加载订阅UID:${sub.uid}失败！`
-				};
-			});
-			if (userInfoCode === -352 && userInfoData.v_voucher) {
-				this.logger.info("账号被风控，请使用指令 bili cap 进行风控验证");
-				await this.sendPrivateMsg("账号被风控，请使用指令 bili cap 进行风控验证");
-				return {
+			if (!sub.roomid) {
+				this.logger.info(`UID:${sub.uid} 请求了用户接口~`);
+				const { code: userInfoCode, message: userInfoMsg, data: userInfoData } = await withRetry(async () => {
+					const data = await this.ctx["bilibili-notify-api"].getUserInfo(sub.uid);
+					return data;
+				}).catch((e) => {
+					this.logger.error(`loadSubFromConfig() getUserInfo() 发生了错误，错误为：${e.message}`);
+					return {
+						code: -1,
+						message: `加载订阅UID:${sub.uid}失败！`
+					};
+				});
+				if (userInfoCode === -352 && userInfoData.v_voucher) {
+					this.logger.info("账号被风控，请使用指令 bili cap 进行风控验证");
+					await this.sendPrivateMsg("账号被风控，请使用指令 bili cap 进行风控验证");
+					return {
+						code: userInfoCode,
+						message: userInfoMsg
+					};
+				}
+				if (userInfoCode !== 0) return {
 					code: userInfoCode,
 					message: userInfoMsg
 				};
-			}
-			if (userInfoCode !== 0) return {
-				code: userInfoCode,
-				message: userInfoMsg
-			};
-			if (this.config.liveDetectType === "WS" && sub.live) {
-				if (!userInfoData.live_room) {
+				if (sub.live && !userInfoData.live_room) {
 					sub.live = false;
 					this.logger.warn(`UID:${sub.uid} 用户没有开通直播间，无法订阅直播！`);
 				}
-				if (sub.live) await this.liveDetectWithListener(userInfoData.live_room.roomid, sub);
+				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: userInfoData.name,
-				roomId: sub.live ? userInfoData.live_room.roomid : "",
+				uname: sub.uname,
+				roomId: sub.roomid,
 				target: sub.target,
 				live: sub.live,
 				dynamic: sub.dynamic,
@@ -1675,7 +1690,7 @@ var ComRegister = class {
 				customLiveMsg: sub.customLiveMsg,
 				customLiveSummary: sub.customLiveSummary
 			});
-			this.logger.info(`UID:${sub.uid}订阅加载完毕！`);
+			this.logger.info(`UID:${sub.uid} 订阅加载完毕！`);
 			if (sub !== Object.values(subs).pop()) {
 				const randomDelay = Math.floor(Math.random() * 3) + 1;
 				this.logger.info(`随机延迟:${randomDelay}秒`);

package/package.json

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

package/readme.md

@@ -329,6 +329,8 @@ uid为必填参数，为要推送的UP主的UID，index为可选参数，为要
 > - ver 3.3.1-alpha.1 优化：拆分 `wordcloud` 和 `liveSummary`，优化指令 `bili cap` 风控验证；
 > - ver 3.3.1-rc.0 优化：代码结构，部分设置； 修复：启用高级订阅时，多次重载高级订阅插件会产生多个重复订阅；
 > - ver 3.3.1-rc.1 优化：动态错误处理
+> - ver 3.3.1-rc.2 新增：订阅UID项可填写roomid，在目前版本可以极大降低风控概率；
+> - ver 3.3.1-rc.3 修复：当订阅用户没有直播且勾选订阅直播间报错；
 
 ## 交流群