koishi-plugin-bilibili-notify 3.6.0-alpha.4 → 3.6.1

package/lib/index.cjs

@@ -478,7 +478,7 @@ var ComRegister = class ComRegister {
 			return this.subShow();
 		});
 		biliCom.subcommand(".private", "向主人账号发送一条测试消息", { hidden: true }).usage("向主人账号发送一条测试消息").example("bili private 向主人账号发送一条测试消息").action(async ({ session }) => {
-			await this.sendPrivateMsg(`主人～女仆向您问好啦！Ciallo～(∠・ω< )⌒★乖乖打招呼呀 (>ω<)♡`);
+			await this.sendPrivateMsg("主人～女仆向您问好啦！Ciallo～(∠・ω< )⌒★乖乖打招呼呀 (>ω<)♡");
 			await session.send("主人～女仆已经发送消息啦～如果主人没收到，可能是机器人不支持发送私聊消息，或者主人填写的信息有误哦 (>ω<)♡");
 		});
 		biliCom.subcommand(".ll").usage("展示当前正在直播的订阅对象").example("bili ll").action(async () => {
@@ -503,7 +503,16 @@ var ComRegister = class ComRegister {
 		});
 		biliCom.subcommand(".dyn <uid:string> [index:number]", "手动推送一条动态信息", { hidden: true }).usage("手动推送一条动态信息").example("bili dyn 233 1 手动推送UID为233用户空间的第一条动态信息").action(async ({ session }, uid, index) => {
 			const i = index && index - 1 || 0;
-			const item = (await this.ctx["bilibili-notify-api"].getUserSpaceDynamic(uid)).data.items[i];
+			const content = await this.ctx["bilibili-notify-api"].getUserSpaceDynamic(uid);
+			if (!content || !content.data) {
+				this.logger.error("主人呜呜 (；>_<) 女仆获取动态内容失败啦～请主人帮女仆看看呀 (>ω<)♡");
+				return;
+			}
+			if (content.code !== 0) {
+				this.logger.error(`主人呜呜 (；>_<) 女仆获取动态内容失败啦～请主人帮女仆看看呀 (>ω<)♡ 错误码: ${content.code}`);
+				return;
+			}
+			const item = content.data.items[i];
 			const buffer = await withRetry(async () => {
 				return await this.ctx["bilibili-notify-generate-img"].generateDynamicImg(item);
 			}, 1).catch(async (e) => {
@@ -1175,7 +1184,10 @@ var ComRegister = class ComRegister {
 			}, 1).catch((e) => {
 				this.logger.error(`主人呜呜 (；>_<) 女仆在执行 dynamicDetect getAllDynamic() 时发生了错误～错误信息：${e.message}，请主人帮女仆看看呀 (>ω<)♡`);
 			});
-			if (!content) return;
+			if (!content || !content.data) {
+				this.logger.error("主人呜呜 (；>_<) 女仆在执行 dynamicDetect 时获取动态内容失败啦～请主人帮女仆看看呀 (>ω<)♡");
+				return;
+			}
 			if (content.code !== 0) switch (content.code) {
 				case -101:
 					this.logger.error("主人…呜呜，女仆发现您还没登录账号呢 (；>_<)插件已经乖乖停止工作啦…请主人快点登录，让女仆可以继续努力为您服务～ (>ω<)♡");
@@ -1653,6 +1665,11 @@ var ComRegister = class ComRegister {
 					this.logger.warn(`主人～女仆发现 [${sub.roomid}] 已经是下播状态啦，所以忽略了重复的下播事件哦 (>ω<)♡`);
 					return;
 				}
+				if (pushAtTimeTimer) {
+					pushAtTimeTimer();
+					pushAtTimeTimer = null;
+					this.liveWSManager.delete(sub.roomid);
+				}
 				if (!await useLiveRoomInfo(LiveType.StopBroadcast) && !await useMasterInfo(LiveType.StopBroadcast)) {
 					liveStatus = false;
 					await this.sendPrivateMsg("主人呜呜 (；>_<) 女仆获取直播间信息失败啦，推送直播开播卡片也失败了，请主人帮女仆看看呀 (>ω<)♡");
@@ -1677,11 +1694,6 @@ var ComRegister = class ComRegister {
 					}, sub.uid, liveEndMsg);
 					await sendDanmakuWordCloudAndLiveSummary(sub.customLiveSummary.liveSummary);
 				}
-				if (pushAtTimeTimer) {
-					pushAtTimeTimer();
-					pushAtTimeTimer = null;
-					this.liveWSManager.delete(sub.roomid);
-				}
 			}
 		});
 		if (!await useLiveRoomInfo(LiveType.FirstLiveBroadcast) && !await useMasterInfo(LiveType.FirstLiveBroadcast)) return this.sendPrivateMsg("主人呜呜 (；>_<) 女仆获取直播间信息失败啦，所以启动直播间弹幕检测也失败了，请主人帮女仆看看呀 (>ω<)♡");
@@ -4537,6 +4549,10 @@ var BLive = class extends koishi.Service {
 		}
 		const cookiesStr = await this.ctx["bilibili-notify-api"].getCookiesForHeader();
 		const mySelfInfo = await this.ctx["bilibili-notify-api"].getMyselfInfo();
+		if (mySelfInfo.code !== 0) {
+			this.logger.warn(`主人～女仆获取个人信息失败啦～无法创建 [${roomId}] 直播间连接呢～请主人帮女仆看看呀 (>ω<)♡`);
+			return;
+		}
 		this.listenerRecord[roomId] = (0, blive_message_listener.startListen)(Number.parseInt(roomId, 10), handler, { ws: {
 			headers: { Cookie: cookiesStr },
 			uid: mySelfInfo.data.mid

package/lib/index.mjs

@@ -449,7 +449,7 @@ var ComRegister = class ComRegister {
 			return this.subShow();
 		});
 		biliCom.subcommand(".private", "向主人账号发送一条测试消息", { hidden: true }).usage("向主人账号发送一条测试消息").example("bili private 向主人账号发送一条测试消息").action(async ({ session }) => {
-			await this.sendPrivateMsg(`主人～女仆向您问好啦！Ciallo～(∠・ω< )⌒★乖乖打招呼呀 (>ω<)♡`);
+			await this.sendPrivateMsg("主人～女仆向您问好啦！Ciallo～(∠・ω< )⌒★乖乖打招呼呀 (>ω<)♡");
 			await session.send("主人～女仆已经发送消息啦～如果主人没收到，可能是机器人不支持发送私聊消息，或者主人填写的信息有误哦 (>ω<)♡");
 		});
 		biliCom.subcommand(".ll").usage("展示当前正在直播的订阅对象").example("bili ll").action(async () => {
@@ -474,7 +474,16 @@ var ComRegister = class ComRegister {
 		});
 		biliCom.subcommand(".dyn <uid:string> [index:number]", "手动推送一条动态信息", { hidden: true }).usage("手动推送一条动态信息").example("bili dyn 233 1 手动推送UID为233用户空间的第一条动态信息").action(async ({ session }, uid, index) => {
 			const i = index && index - 1 || 0;
-			const item = (await this.ctx["bilibili-notify-api"].getUserSpaceDynamic(uid)).data.items[i];
+			const content = await this.ctx["bilibili-notify-api"].getUserSpaceDynamic(uid);
+			if (!content || !content.data) {
+				this.logger.error("主人呜呜 (；>_<) 女仆获取动态内容失败啦～请主人帮女仆看看呀 (>ω<)♡");
+				return;
+			}
+			if (content.code !== 0) {
+				this.logger.error(`主人呜呜 (；>_<) 女仆获取动态内容失败啦～请主人帮女仆看看呀 (>ω<)♡ 错误码: ${content.code}`);
+				return;
+			}
+			const item = content.data.items[i];
 			const buffer = await withRetry(async () => {
 				return await this.ctx["bilibili-notify-generate-img"].generateDynamicImg(item);
 			}, 1).catch(async (e) => {
@@ -1146,7 +1155,10 @@ var ComRegister = class ComRegister {
 			}, 1).catch((e) => {
 				this.logger.error(`主人呜呜 (；>_<) 女仆在执行 dynamicDetect getAllDynamic() 时发生了错误～错误信息：${e.message}，请主人帮女仆看看呀 (>ω<)♡`);
 			});
-			if (!content) return;
+			if (!content || !content.data) {
+				this.logger.error("主人呜呜 (；>_<) 女仆在执行 dynamicDetect 时获取动态内容失败啦～请主人帮女仆看看呀 (>ω<)♡");
+				return;
+			}
 			if (content.code !== 0) switch (content.code) {
 				case -101:
 					this.logger.error("主人…呜呜，女仆发现您还没登录账号呢 (；>_<)插件已经乖乖停止工作啦…请主人快点登录，让女仆可以继续努力为您服务～ (>ω<)♡");
@@ -1624,6 +1636,11 @@ var ComRegister = class ComRegister {
 					this.logger.warn(`主人～女仆发现 [${sub.roomid}] 已经是下播状态啦，所以忽略了重复的下播事件哦 (>ω<)♡`);
 					return;
 				}
+				if (pushAtTimeTimer) {
+					pushAtTimeTimer();
+					pushAtTimeTimer = null;
+					this.liveWSManager.delete(sub.roomid);
+				}
 				if (!await useLiveRoomInfo(LiveType.StopBroadcast) && !await useMasterInfo(LiveType.StopBroadcast)) {
 					liveStatus = false;
 					await this.sendPrivateMsg("主人呜呜 (；>_<) 女仆获取直播间信息失败啦，推送直播开播卡片也失败了，请主人帮女仆看看呀 (>ω<)♡");
@@ -1648,11 +1665,6 @@ var ComRegister = class ComRegister {
 					}, sub.uid, liveEndMsg);
 					await sendDanmakuWordCloudAndLiveSummary(sub.customLiveSummary.liveSummary);
 				}
-				if (pushAtTimeTimer) {
-					pushAtTimeTimer();
-					pushAtTimeTimer = null;
-					this.liveWSManager.delete(sub.roomid);
-				}
 			}
 		});
 		if (!await useLiveRoomInfo(LiveType.FirstLiveBroadcast) && !await useMasterInfo(LiveType.FirstLiveBroadcast)) return this.sendPrivateMsg("主人呜呜 (；>_<) 女仆获取直播间信息失败啦，所以启动直播间弹幕检测也失败了，请主人帮女仆看看呀 (>ω<)♡");
@@ -4508,6 +4520,10 @@ var BLive = class extends Service {
 		}
 		const cookiesStr = await this.ctx["bilibili-notify-api"].getCookiesForHeader();
 		const mySelfInfo = await this.ctx["bilibili-notify-api"].getMyselfInfo();
+		if (mySelfInfo.code !== 0) {
+			this.logger.warn(`主人～女仆获取个人信息失败啦～无法创建 [${roomId}] 直播间连接呢～请主人帮女仆看看呀 (>ω<)♡`);
+			return;
+		}
 		this.listenerRecord[roomId] = startListen(Number.parseInt(roomId, 10), handler, { ws: {
 			headers: { Cookie: cookiesStr },
 			uid: mySelfInfo.data.mid

package/package.json

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