koishi-plugin-bilibili-notify 3.3.1 → 3.3.3

package/lib/index.js

@@ -665,11 +665,13 @@ var ComRegister = class {
 		}
 		this.mergeStopWords(config.wordcloudStopWords);
 		this.registeringForEvents();
-		if (config.advancedSub) this.ctx.emit("bilibili-notify/ready-to-recive");
-		else if (config.subs && config.subs.length > 0) {
+		if (config.advancedSub) {
+			this.logger.info("开启高级订阅，等待加载订阅...");
+			this.ctx.emit("bilibili-notify/ready-to-recive");
+		} else if (config.subs && config.subs.length > 0) {
 			const subs = this.configSubsToSubscription(config.subs);
 			await this.initAsyncPart(subs);
-		}
+		} else this.logger.info("初始化完毕，未添加任何订阅！");
 	}
 	registeringForEvents() {
 		this.ctx.on("dispose", () => {
@@ -682,6 +684,10 @@ var ComRegister = class {
 			}
 		});
 		this.ctx.on("bilibili-notify/advanced-sub", async (subs) => {
+			if (Object.keys(subs).length === 0) {
+				this.logger.info("初始化完毕，未添加任何订阅！");
+				return;
+			}
 			if (this.reciveSubTimes >= 1) await this.ctx["bilibili-notify"].restartPlugin();
 			else await this.initAsyncPart(subs);
 			this.reciveSubTimes++;
@@ -689,6 +695,7 @@ var ComRegister = class {
 	}
 	async initAsyncPart(subs) {
 		this.initAllManager();
+		this.logger.info("获取到订阅信息，开始加载订阅...");
 		const { code, message } = await this.loadSubFromConfig(subs);
 		if (code !== 0) {
 			this.logger.error(message);
@@ -963,8 +970,8 @@ var ComRegister = class {
 					break;
 				}
 				default: {
-					this.logger.error(`获取动态信息错误，错误码为：${content.code}，错误为：${content.message}，请排除错误后输入指令 bn restart 重启插件`);
-					await this.sendPrivateMsg(`获取动态信息错误，错误码为：${content.code}，错误为：${content.message}，请排除错误后输入指令 bn restart 重启插件`);
+					this.logger.error(`获取动态信息错误，错误码为：${content.code}，错误为：${content.message}，请排除错误后输入指令 bn start 重启插件`);
+					await this.sendPrivateMsg(`获取动态信息错误，错误码为：${content.code}，错误为：${content.message}，请排除错误后输入指令 bn start 重启插件`);
 					await this.ctx["bilibili-notify"].disposePlugin();
 					break;
 				}
@@ -1058,8 +1065,8 @@ var ComRegister = class {
 					break;
 				}
 				default: {
-					this.logger.error(`获取动态信息错误，错误码为：${content.code}，错误为：${content.message}，请排除错误后输入指令 bn restart 重启插件`);
-					await this.sendPrivateMsg(`获取动态信息错误，错误码为：${content.code}，错误为：${content.message}，请排除错误后输入指令 bn restart 重启插件`);
+					this.logger.error(`获取动态信息错误，错误码为：${content.code}，错误为：${content.message}，请排除错误后输入指令 bn start 重启插件`);
+					await this.sendPrivateMsg(`获取动态信息错误，错误码为：${content.code}，错误为：${content.message}，请排除错误后输入指令 bn start 重启插件`);
 					await this.ctx["bilibili-notify"].disposePlugin();
 					break;
 				}
@@ -1522,19 +1529,18 @@ var ComRegister = class {
 	}
 	async subUserInBili(mid) {
 		const checkGroupIsReady = async () => {
-			if (!this.loginDBData?.dynamic_group_id) {
+			const allGroupData = await this.ctx["bilibili-notify-api"].getAllGroup();
+			let existFlag = false;
+			for (const group of allGroupData.data) if (group.name === "订阅") {
+				if (this.loginDBData.dynamic_group_id !== group.tagid.toString()) {
+					this.loginDBData.dynamic_group_id = group.tagid.toString();
+					this.ctx.database.set("loginBili", 1, { dynamic_group_id: this.loginDBData.dynamic_group_id });
+				}
+				existFlag = true;
+			}
+			if (!existFlag) {
 				const createGroupData = await this.ctx["bilibili-notify-api"].createGroup("订阅");
-				if (createGroupData.code === 22106) {
-					const allGroupData = await this.ctx["bilibili-notify-api"].getAllGroup();
-					for (const group of allGroupData.data) if (group.name === "订阅") {
-						this.loginDBData.dynamic_group_id = group.tagid.toString();
-						this.ctx.database.set("loginBili", 1, { dynamic_group_id: this.loginDBData.dynamic_group_id });
-						return {
-							code: 0,
-							message: "分组已存在"
-						};
-					}
-				} else if (createGroupData.code !== 0) return {
+				if (createGroupData.code !== 0) return {
 					code: createGroupData.code,
 					message: createGroupData.message
 				};
@@ -4202,7 +4208,10 @@ var ServerManager = class extends koishi.Service {
 		return true;
 	};
 	restartPlugin = async () => {
-		if (this.servers.length === 0) return false;
+		if (this.servers.length === 0) {
+			this.logger.warn("目前插件未运行，请使用 bn start 启动插件");
+			return false;
+		}
 		await this.disposePlugin();
 		return new Promise((resolve$1) => {
 			this.ctx.setTimeout(() => {

package/lib/index.mjs

@@ -646,11 +646,13 @@ var ComRegister = class {
 		}
 		this.mergeStopWords(config.wordcloudStopWords);
 		this.registeringForEvents();
-		if (config.advancedSub) this.ctx.emit("bilibili-notify/ready-to-recive");
-		else if (config.subs && config.subs.length > 0) {
+		if (config.advancedSub) {
+			this.logger.info("开启高级订阅，等待加载订阅...");
+			this.ctx.emit("bilibili-notify/ready-to-recive");
+		} else if (config.subs && config.subs.length > 0) {
 			const subs = this.configSubsToSubscription(config.subs);
 			await this.initAsyncPart(subs);
-		}
+		} else this.logger.info("初始化完毕，未添加任何订阅！");
 	}
 	registeringForEvents() {
 		this.ctx.on("dispose", () => {
@@ -663,6 +665,10 @@ var ComRegister = class {
 			}
 		});
 		this.ctx.on("bilibili-notify/advanced-sub", async (subs) => {
+			if (Object.keys(subs).length === 0) {
+				this.logger.info("初始化完毕，未添加任何订阅！");
+				return;
+			}
 			if (this.reciveSubTimes >= 1) await this.ctx["bilibili-notify"].restartPlugin();
 			else await this.initAsyncPart(subs);
 			this.reciveSubTimes++;
@@ -670,6 +676,7 @@ var ComRegister = class {
 	}
 	async initAsyncPart(subs) {
 		this.initAllManager();
+		this.logger.info("获取到订阅信息，开始加载订阅...");
 		const { code, message } = await this.loadSubFromConfig(subs);
 		if (code !== 0) {
 			this.logger.error(message);
@@ -944,8 +951,8 @@ var ComRegister = class {
 					break;
 				}
 				default: {
-					this.logger.error(`获取动态信息错误，错误码为：${content.code}，错误为：${content.message}，请排除错误后输入指令 bn restart 重启插件`);
-					await this.sendPrivateMsg(`获取动态信息错误，错误码为：${content.code}，错误为：${content.message}，请排除错误后输入指令 bn restart 重启插件`);
+					this.logger.error(`获取动态信息错误，错误码为：${content.code}，错误为：${content.message}，请排除错误后输入指令 bn start 重启插件`);
+					await this.sendPrivateMsg(`获取动态信息错误，错误码为：${content.code}，错误为：${content.message}，请排除错误后输入指令 bn start 重启插件`);
 					await this.ctx["bilibili-notify"].disposePlugin();
 					break;
 				}
@@ -1039,8 +1046,8 @@ var ComRegister = class {
 					break;
 				}
 				default: {
-					this.logger.error(`获取动态信息错误，错误码为：${content.code}，错误为：${content.message}，请排除错误后输入指令 bn restart 重启插件`);
-					await this.sendPrivateMsg(`获取动态信息错误，错误码为：${content.code}，错误为：${content.message}，请排除错误后输入指令 bn restart 重启插件`);
+					this.logger.error(`获取动态信息错误，错误码为：${content.code}，错误为：${content.message}，请排除错误后输入指令 bn start 重启插件`);
+					await this.sendPrivateMsg(`获取动态信息错误，错误码为：${content.code}，错误为：${content.message}，请排除错误后输入指令 bn start 重启插件`);
 					await this.ctx["bilibili-notify"].disposePlugin();
 					break;
 				}
@@ -1503,19 +1510,18 @@ var ComRegister = class {
 	}
 	async subUserInBili(mid) {
 		const checkGroupIsReady = async () => {
-			if (!this.loginDBData?.dynamic_group_id) {
+			const allGroupData = await this.ctx["bilibili-notify-api"].getAllGroup();
+			let existFlag = false;
+			for (const group of allGroupData.data) if (group.name === "订阅") {
+				if (this.loginDBData.dynamic_group_id !== group.tagid.toString()) {
+					this.loginDBData.dynamic_group_id = group.tagid.toString();
+					this.ctx.database.set("loginBili", 1, { dynamic_group_id: this.loginDBData.dynamic_group_id });
+				}
+				existFlag = true;
+			}
+			if (!existFlag) {
 				const createGroupData = await this.ctx["bilibili-notify-api"].createGroup("订阅");
-				if (createGroupData.code === 22106) {
-					const allGroupData = await this.ctx["bilibili-notify-api"].getAllGroup();
-					for (const group of allGroupData.data) if (group.name === "订阅") {
-						this.loginDBData.dynamic_group_id = group.tagid.toString();
-						this.ctx.database.set("loginBili", 1, { dynamic_group_id: this.loginDBData.dynamic_group_id });
-						return {
-							code: 0,
-							message: "分组已存在"
-						};
-					}
-				} else if (createGroupData.code !== 0) return {
+				if (createGroupData.code !== 0) return {
 					code: createGroupData.code,
 					message: createGroupData.message
 				};
@@ -4183,7 +4189,10 @@ var ServerManager = class extends Service {
 		return true;
 	};
 	restartPlugin = async () => {
-		if (this.servers.length === 0) return false;
+		if (this.servers.length === 0) {
+			this.logger.warn("目前插件未运行，请使用 bn start 启动插件");
+			return false;
+		}
 		await this.disposePlugin();
 		return new Promise((resolve$1) => {
 			this.ctx.setTimeout(() => {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-bilibili-notify",
   "description": "Koishi bilibili notify plugin",
-  "version": "3.3.1",
+  "version": "3.3.3",
   "main": "./lib/index.js",
   "typings": "lib/index.d.ts",
   "files": [
@@ -30,10 +30,10 @@
   "dependencies": {
     "@akokko/blive-message-listener": "^0.5.1",
     "@node-rs/jieba": "^2.0.1",
-    "axios": "^1.10.0",
-    "axios-cookiejar-support": "^6.0.3",
+    "axios": "^1.11.0",
+    "axios-cookiejar-support": "^6.0.4",
     "cacheable-lookup": "^7.0.0",
-    "cron": "^4.3.1",
+    "cron": "^4.3.2",
     "jsdom": "^26.1.0",
     "luxon": "^3.7.1",
     "md5": "^2.3.0",
@@ -48,7 +48,7 @@
     "@types/qrcode": "^1.5.5",
     "@types/tough-cookie": "^4.0.5",
     "koishi-plugin-puppeteer": "^3.9.0",
-    "tsdown": "^0.12.9"
+    "tsdown": "^0.13.0"
   },
   "peerDependencies": {
     "koishi": "^4.18.8"

package/readme.md

@@ -332,6 +332,8 @@ uid为必填参数，为要推送的UP主的UID，index为可选参数，为要
 > - ver 3.3.1-rc.2 新增：订阅UID项可填写roomid，在目前版本可以极大降低风控概率；
 > - ver 3.3.1-rc.3 修复：当订阅用户没有直播且勾选订阅直播间报错；
 > - ver 3.3.1 优化：如果不订阅UP主直播且未填写房间号不再请求用户接口；
+> - ver 3.3.2 修复：当插件因动态报错停止后，应使用指令 `bn start` 启动插件，而不是 `bn restart`；
+> - ver 3.3.3 优化：初始化logger输出； 修复：B站订阅操作bug；
 
 ## 交流群