koishi-plugin-bilibili-notify 3.3.7 → 3.3.8-alpha.1

package/lib/index.js

@@ -337,11 +337,10 @@ const stopwords = new Set([
 	"之前",
 	"某天"
 ]);
-var stop_words_default = stopwords;
 
 //#endregion
 //#region src/command_register.ts
-var ComRegister = class {
+var ComRegister$1 = class {
 	static inject = [
 		"bilibili-notify",
 		"bilibili-notify-api",
@@ -711,11 +710,11 @@ var ComRegister = class {
 	}
 	mergeStopWords(stopWordsStr) {
 		if (!stopWordsStr || stopWordsStr.trim() === "") {
-			this.stopwords = new Set(stop_words_default);
+			this.stopwords = new Set(stopwords);
 			return;
 		}
 		const additionalStopWords = stopWordsStr.split(",").map((word) => word.trim()).filter((word) => word !== "");
-		this.stopwords = new Set([...stop_words_default, ...additionalStopWords]);
+		this.stopwords = new Set([...stopwords, ...additionalStopWords]);
 	}
 	initManagerAfterLoadSub() {
 		for (const [uid, sub] of this.subManager) {
@@ -885,10 +884,14 @@ var ComRegister = class {
 					return;
 				}
 				if (bots[botIndex].status !== koishi.Universal.Status.ONLINE) {
+					if (retry >= 3e3 * 2 * 2 * 2 * 2 * 2) {
+						this.logger.error(`${platform} 机器人未初始化完毕，无法进行推送，已重试5次，放弃推送`);
+						await this.sendPrivateMsg(`${platform} 机器人未初始化完毕，无法进行推送，已重试5次，放弃推送`);
+						return;
+					}
 					this.logger.error(`${platform} 机器人未初始化完毕，无法进行推送，${retry / 1e3}秒后重试`);
-					this.ctx.setTimeout(async () => {
-						await this.pushMessage(targets, content, retry * 2);
-					}, retry);
+					await this.ctx.sleep(retry);
+					await this.pushMessage(targets, content, retry * 2);
 					return;
 				}
 				try {
@@ -1170,9 +1173,11 @@ var ComRegister = class {
 	async useLiveRoomInfo(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}`);
-			return false;
 		});
-		if (!data) return await this.sendPrivateMsgAndStopService();
+		if (!data) {
+			await this.sendPrivateMsgAndStopService();
+			return;
+		}
 		return data;
 	}
 	async sendLiveNotifyCard(liveType, followerDisplay, liveInfo, uid, liveNotifyMsg) {
@@ -1261,7 +1266,7 @@ var ComRegister = class {
 				flag = false;
 				return flag;
 			}
-			masterInfo = await this.useMasterInfo(liveRoomInfo.uid, masterInfo, liveType).catch(() => {
+			masterInfo = await this.useMasterInfo(liveRoomInfo.uid.toString(), masterInfo, liveType).catch(() => {
 				flag = false;
 				return null;
 			});
@@ -1298,10 +1303,6 @@ var ComRegister = class {
 				const now = Date.now();
 				if (now - lastLiveStart < LIVE_EVENT_COOLDOWN) {
 					this.logger.warn(`[${sub.roomid}] 开播事件冷却期内被忽略`);
-					if (!liveTime) {
-						await useMasterAndLiveRoomInfo(LiveType.StartBroadcasting);
-						liveTime = liveRoomInfo?.live_time || Date.now();
-					}
 					return;
 				}
 				lastLiveStart = now;
@@ -1315,7 +1316,7 @@ var ComRegister = class {
 					await this.sendPrivateMsg("获取直播间信息失败，推送直播开播卡片失败！");
 					return await this.sendPrivateMsgAndStopService();
 				}
-				liveTime = liveRoomInfo?.live_time || Date.now();
+				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();
 				const liveStartMsg = liveMsgObj.customLiveStart.replace("-name", masterInfo.username).replace("-time", diffTime).replace("-follower", follower).replaceAll("\\n", "\n").replace("-link", `https://live.bilibili.com/${liveRoomInfo.short_id === 0 ? liveRoomInfo.room_id : liveRoomInfo.short_id}`);
@@ -1335,7 +1336,7 @@ var ComRegister = class {
 					this.logger.warn(`[${sub.roomid}] 下播事件冷却期内被忽略`);
 					if (!liveTime) {
 						await useMasterAndLiveRoomInfo(LiveType.StopBroadcast);
-						liveTime = liveRoomInfo?.live_time || Date.now();
+						liveTime = liveRoomInfo?.live_time || luxon.DateTime.now().toFormat("yyyy-MM-dd HH:mm:ss");
 					}
 					return;
 				}
@@ -1345,11 +1346,7 @@ var ComRegister = class {
 					return;
 				}
 				liveStatus = false;
-				if (!await useMasterAndLiveRoomInfo(LiveType.StopBroadcast)) {
-					await this.sendPrivateMsg("获取直播间信息失败，推送直播下播卡片失败！");
-					return await this.sendPrivateMsgAndStopService();
-				}
-				liveTime = liveTime || liveRoomInfo?.live_time || Date.now();
+				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 = (() => {
 					const liveFollowerChangeNum = masterInfo.liveFollowerChange;
@@ -1811,8 +1808,8 @@ var ComRegister = class {
 		}),
 		dynamicDebugMode: koishi.Schema.boolean().required()
 	});
-})(ComRegister || (ComRegister = {}));
-var command_register_default = ComRegister;
+})(ComRegister$1 || (ComRegister$1 = {}));
+var ComRegister = ComRegister$1;
 
 //#endregion
 //#region src/database.ts
@@ -1848,7 +1845,7 @@ const DYNAMIC_TYPE_COURSES_SEASON = "DYNAMIC_TYPE_COURSES_SEASON";
 const DYNAMIC_TYPE_LIVE_RCMD = "DYNAMIC_TYPE_LIVE_RCMD";
 const DYNAMIC_TYPE_UGC_SEASON = "DYNAMIC_TYPE_UGC_SEASON";
 const ADDITIONAL_TYPE_RESERVE = "ADDITIONAL_TYPE_RESERVE";
-var GenerateImg = class extends koishi.Service {
+var GenerateImg$1 = class extends koishi.Service {
 	static inject = ["puppeteer"];
 	giConfig;
 	constructor(ctx, config) {
@@ -3312,8 +3309,8 @@ var GenerateImg = class extends koishi.Service {
 		hideDesc: koishi.Schema.boolean(),
 		followerDisplay: koishi.Schema.boolean()
 	});
-})(GenerateImg || (GenerateImg = {}));
-var generate_img_default = GenerateImg;
+})(GenerateImg$1 || (GenerateImg$1 = {}));
+var GenerateImg = GenerateImg$1;
 
 //#endregion
 //#region src/bili_api.ts
@@ -3408,7 +3405,7 @@ const COPY_USER_TO_GROUP = "https://api.bilibili.com/x/relation/tags/copyUsers";
 const GET_RELATION_GROUP_DETAIL = "https://api.bilibili.com/x/relation/tag";
 const GET_LIVE_ROOM_INFO_STREAM_KEY = "https://api.live.bilibili.com/xlive/web-room/v1/index/getDanmuInfo";
 const GET_LIVE_ROOMS_INFO = "https://api.live.bilibili.com/room/v1/Room/get_status_info_by_uids";
-var BiliAPI = class extends koishi.Service {
+var BiliAPI$1 = class extends koishi.Service {
 	static inject = ["database", "notifier"];
 	jar;
 	client;
@@ -4083,8 +4080,8 @@ var BiliAPI = class extends koishi.Service {
 		userAgent: koishi.Schema.string(),
 		key: koishi.Schema.string().pattern(/^[0-9a-f]{32}$/).required()
 	});
-})(BiliAPI || (BiliAPI = {}));
-var bili_api_default = BiliAPI;
+})(BiliAPI$1 || (BiliAPI$1 = {}));
+var BiliAPI = BiliAPI$1;
 
 //#endregion
 //#region src/bili_live.ts
@@ -4117,7 +4114,6 @@ var BLive = class extends koishi.Service {
 		this.logger.warn(`${roomId}直播间连接未成功关闭`);
 	}
 };
-var bili_live_default = BLive;
 
 //#endregion
 //#region src/index.ts
@@ -4159,11 +4155,11 @@ var ServerManager = class extends koishi.Service {
 	registerPlugin = () => {
 		if (this.servers.length !== 0) return false;
 		try {
-			const ba = this.ctx.plugin(bili_api_default, {
+			const ba = this.ctx.plugin(BiliAPI, {
 				userAgent: globalConfig.userAgent,
 				key: globalConfig.key
 			});
-			const gi = this.ctx.plugin(generate_img_default, {
+			const gi = this.ctx.plugin(GenerateImg, {
 				filter: globalConfig.filter,
 				removeBorder: globalConfig.removeBorder,
 				cardColorStart: globalConfig.cardColorStart,
@@ -4175,7 +4171,7 @@ var ServerManager = class extends koishi.Service {
 				font: globalConfig.font,
 				followerDisplay: globalConfig.followerDisplay
 			});
-			const cr = this.ctx.plugin(command_register_default, {
+			const cr = this.ctx.plugin(ComRegister, {
 				advancedSub: globalConfig.advancedSub,
 				subs: globalConfig.subs,
 				master: globalConfig.master,
@@ -4194,7 +4190,7 @@ var ServerManager = class extends koishi.Service {
 				filter: globalConfig.filter,
 				dynamicDebugMode: globalConfig.dynamicDebugMode
 			});
-			const bl = this.ctx.plugin(bili_live_default);
+			const bl = this.ctx.plugin(BLive);
 			this.servers.push(ba);
 			this.servers.push(bl);
 			this.servers.push(gi);

package/lib/index.mjs

@@ -319,11 +319,10 @@ const stopwords = new Set([
 	"之前",
 	"某天"
 ]);
-var stop_words_default = stopwords;
 
 //#endregion
 //#region src/command_register.ts
-var ComRegister = class {
+var ComRegister$1 = class {
 	static inject = [
 		"bilibili-notify",
 		"bilibili-notify-api",
@@ -693,11 +692,11 @@ var ComRegister = class {
 	}
 	mergeStopWords(stopWordsStr) {
 		if (!stopWordsStr || stopWordsStr.trim() === "") {
-			this.stopwords = new Set(stop_words_default);
+			this.stopwords = new Set(stopwords);
 			return;
 		}
 		const additionalStopWords = stopWordsStr.split(",").map((word) => word.trim()).filter((word) => word !== "");
-		this.stopwords = new Set([...stop_words_default, ...additionalStopWords]);
+		this.stopwords = new Set([...stopwords, ...additionalStopWords]);
 	}
 	initManagerAfterLoadSub() {
 		for (const [uid, sub] of this.subManager) {
@@ -867,10 +866,14 @@ var ComRegister = class {
 					return;
 				}
 				if (bots[botIndex].status !== Universal.Status.ONLINE) {
+					if (retry >= 3e3 * 2 * 2 * 2 * 2 * 2) {
+						this.logger.error(`${platform} 机器人未初始化完毕，无法进行推送，已重试5次，放弃推送`);
+						await this.sendPrivateMsg(`${platform} 机器人未初始化完毕，无法进行推送，已重试5次，放弃推送`);
+						return;
+					}
 					this.logger.error(`${platform} 机器人未初始化完毕，无法进行推送，${retry / 1e3}秒后重试`);
-					this.ctx.setTimeout(async () => {
-						await this.pushMessage(targets, content, retry * 2);
-					}, retry);
+					await this.ctx.sleep(retry);
+					await this.pushMessage(targets, content, retry * 2);
 					return;
 				}
 				try {
@@ -1152,9 +1155,11 @@ var ComRegister = class {
 	async useLiveRoomInfo(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}`);
-			return false;
 		});
-		if (!data) return await this.sendPrivateMsgAndStopService();
+		if (!data) {
+			await this.sendPrivateMsgAndStopService();
+			return;
+		}
 		return data;
 	}
 	async sendLiveNotifyCard(liveType, followerDisplay, liveInfo, uid, liveNotifyMsg) {
@@ -1243,7 +1248,7 @@ var ComRegister = class {
 				flag = false;
 				return flag;
 			}
-			masterInfo = await this.useMasterInfo(liveRoomInfo.uid, masterInfo, liveType).catch(() => {
+			masterInfo = await this.useMasterInfo(liveRoomInfo.uid.toString(), masterInfo, liveType).catch(() => {
 				flag = false;
 				return null;
 			});
@@ -1280,10 +1285,6 @@ var ComRegister = class {
 				const now = Date.now();
 				if (now - lastLiveStart < LIVE_EVENT_COOLDOWN) {
 					this.logger.warn(`[${sub.roomid}] 开播事件冷却期内被忽略`);
-					if (!liveTime) {
-						await useMasterAndLiveRoomInfo(LiveType.StartBroadcasting);
-						liveTime = liveRoomInfo?.live_time || Date.now();
-					}
 					return;
 				}
 				lastLiveStart = now;
@@ -1297,7 +1298,7 @@ var ComRegister = class {
 					await this.sendPrivateMsg("获取直播间信息失败，推送直播开播卡片失败！");
 					return await this.sendPrivateMsgAndStopService();
 				}
-				liveTime = liveRoomInfo?.live_time || Date.now();
+				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();
 				const liveStartMsg = liveMsgObj.customLiveStart.replace("-name", masterInfo.username).replace("-time", diffTime).replace("-follower", follower).replaceAll("\\n", "\n").replace("-link", `https://live.bilibili.com/${liveRoomInfo.short_id === 0 ? liveRoomInfo.room_id : liveRoomInfo.short_id}`);
@@ -1317,7 +1318,7 @@ var ComRegister = class {
 					this.logger.warn(`[${sub.roomid}] 下播事件冷却期内被忽略`);
 					if (!liveTime) {
 						await useMasterAndLiveRoomInfo(LiveType.StopBroadcast);
-						liveTime = liveRoomInfo?.live_time || Date.now();
+						liveTime = liveRoomInfo?.live_time || DateTime.now().toFormat("yyyy-MM-dd HH:mm:ss");
 					}
 					return;
 				}
@@ -1327,11 +1328,7 @@ var ComRegister = class {
 					return;
 				}
 				liveStatus = false;
-				if (!await useMasterAndLiveRoomInfo(LiveType.StopBroadcast)) {
-					await this.sendPrivateMsg("获取直播间信息失败，推送直播下播卡片失败！");
-					return await this.sendPrivateMsgAndStopService();
-				}
-				liveTime = liveTime || liveRoomInfo?.live_time || Date.now();
+				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 = (() => {
 					const liveFollowerChangeNum = masterInfo.liveFollowerChange;
@@ -1793,8 +1790,8 @@ var ComRegister = class {
 		}),
 		dynamicDebugMode: Schema.boolean().required()
 	});
-})(ComRegister || (ComRegister = {}));
-var command_register_default = ComRegister;
+})(ComRegister$1 || (ComRegister$1 = {}));
+var ComRegister = ComRegister$1;
 
 //#endregion
 //#region src/database.ts
@@ -1830,7 +1827,7 @@ const DYNAMIC_TYPE_COURSES_SEASON = "DYNAMIC_TYPE_COURSES_SEASON";
 const DYNAMIC_TYPE_LIVE_RCMD = "DYNAMIC_TYPE_LIVE_RCMD";
 const DYNAMIC_TYPE_UGC_SEASON = "DYNAMIC_TYPE_UGC_SEASON";
 const ADDITIONAL_TYPE_RESERVE = "ADDITIONAL_TYPE_RESERVE";
-var GenerateImg = class extends Service {
+var GenerateImg$1 = class extends Service {
 	static inject = ["puppeteer"];
 	giConfig;
 	constructor(ctx, config) {
@@ -3294,8 +3291,8 @@ var GenerateImg = class extends Service {
 		hideDesc: Schema.boolean(),
 		followerDisplay: Schema.boolean()
 	});
-})(GenerateImg || (GenerateImg = {}));
-var generate_img_default = GenerateImg;
+})(GenerateImg$1 || (GenerateImg$1 = {}));
+var GenerateImg = GenerateImg$1;
 
 //#endregion
 //#region src/bili_api.ts
@@ -3390,7 +3387,7 @@ const COPY_USER_TO_GROUP = "https://api.bilibili.com/x/relation/tags/copyUsers";
 const GET_RELATION_GROUP_DETAIL = "https://api.bilibili.com/x/relation/tag";
 const GET_LIVE_ROOM_INFO_STREAM_KEY = "https://api.live.bilibili.com/xlive/web-room/v1/index/getDanmuInfo";
 const GET_LIVE_ROOMS_INFO = "https://api.live.bilibili.com/room/v1/Room/get_status_info_by_uids";
-var BiliAPI = class extends Service {
+var BiliAPI$1 = class extends Service {
 	static inject = ["database", "notifier"];
 	jar;
 	client;
@@ -4065,8 +4062,8 @@ var BiliAPI = class extends Service {
 		userAgent: Schema.string(),
 		key: Schema.string().pattern(/^[0-9a-f]{32}$/).required()
 	});
-})(BiliAPI || (BiliAPI = {}));
-var bili_api_default = BiliAPI;
+})(BiliAPI$1 || (BiliAPI$1 = {}));
+var BiliAPI = BiliAPI$1;
 
 //#endregion
 //#region src/bili_live.ts
@@ -4099,7 +4096,6 @@ var BLive = class extends Service {
 		this.logger.warn(`${roomId}直播间连接未成功关闭`);
 	}
 };
-var bili_live_default = BLive;
 
 //#endregion
 //#region src/index.ts
@@ -4141,11 +4137,11 @@ var ServerManager = class extends Service {
 	registerPlugin = () => {
 		if (this.servers.length !== 0) return false;
 		try {
-			const ba = this.ctx.plugin(bili_api_default, {
+			const ba = this.ctx.plugin(BiliAPI, {
 				userAgent: globalConfig.userAgent,
 				key: globalConfig.key
 			});
-			const gi = this.ctx.plugin(generate_img_default, {
+			const gi = this.ctx.plugin(GenerateImg, {
 				filter: globalConfig.filter,
 				removeBorder: globalConfig.removeBorder,
 				cardColorStart: globalConfig.cardColorStart,
@@ -4157,7 +4153,7 @@ var ServerManager = class extends Service {
 				font: globalConfig.font,
 				followerDisplay: globalConfig.followerDisplay
 			});
-			const cr = this.ctx.plugin(command_register_default, {
+			const cr = this.ctx.plugin(ComRegister, {
 				advancedSub: globalConfig.advancedSub,
 				subs: globalConfig.subs,
 				master: globalConfig.master,
@@ -4176,7 +4172,7 @@ var ServerManager = class extends Service {
 				filter: globalConfig.filter,
 				dynamicDebugMode: globalConfig.dynamicDebugMode
 			});
-			const bl = this.ctx.plugin(bili_live_default);
+			const bl = this.ctx.plugin(BLive);
 			this.servers.push(ba);
 			this.servers.push(bl);
 			this.servers.push(gi);

package/package.json

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