koishi-plugin-bilibili-notify 3.2.11-alpha.8 → 3.3.0-rc.0

package/lib/index.js

@@ -46,7 +46,6 @@ const node_https = __toESM(require("node:https"));
 const axios = __toESM(require("axios"));
 const tough_cookie = __toESM(require("tough-cookie"));
 const jsdom = __toESM(require("jsdom"));
-const __oxc_project_runtime_helpers_decorate = __toESM(require("@oxc-project/runtime/helpers/decorate"));
 const __akokko_blive_message_listener = __toESM(require("@akokko/blive-message-listener"));
 
 //#region src/config.ts
@@ -122,22 +121,6 @@ const BAConfigSchema = koishi.Schema.object({
 
 //#endregion
 //#region src/utils/index.ts
-function Retry(options = { attempts: 3 }) {
-	return (_target, _propertyKey, descriptor) => {
-		const originalMethod = descriptor.value;
-		descriptor.value = async function(...args) {
-			let lastError;
-			for (let i = 0; i < options.attempts; i++) try {
-				return await originalMethod.apply(this, args);
-			} catch (error) {
-				lastError = error;
-				if (options.onFailure) await options.onFailure.call(this, lastError, i + 1);
-			}
-			throw lastError;
-		};
-		return descriptor;
-	};
-}
 /**
 * 高阶函数：为函数添加锁机制
 * @param {Function} fn - 需要包装的原始函数
@@ -643,14 +626,8 @@ var ComRegister = class {
 			await session.send("请手动填入 gt 和 challenge 后点击生成进行验证，验证完成后点击结果，根据提示输入对应validate");
 			await session.send(`gt:${data.geetest.gt}`);
 			await session.send(`challenge:${data.geetest.challenge}`);
-			await session.send("请输入validate，格式为 val <validate>");
-			const validate = await (async () => {
-				while (true) {
-					const validate$1 = await session.prompt();
-					if (validate$1?.startsWith("val ")) return validate$1.slice(4);
-					else await session.send("请输入正确的validate，格式为 val <validate>");
-				}
-			})();
+			await session.send("请直接输入validate");
+			const validate = await session.prompt();
 			const seccode = `${validate}|jordan`;
 			const { data: validateCaptchaData } = await ctx.ba.validateCaptcha(data.geetest.challenge, data.token, validate, seccode);
 			if (validateCaptchaData?.is_valid !== 1) return "验证不成功！";
@@ -3332,11 +3309,15 @@ var BiliAPI = class extends koishi.Service {
 		sub_key: ""
 	};
 	updateJob;
+	pRetry;
+	AbortError;
 	constructor(ctx, config) {
 		super(ctx, "ba");
 		this.apiConfig = config;
 	}
 	async start() {
+		this.pRetry = (await import("p-retry")).default;
+		this.AbortError = (await import("p-retry")).AbortError;
 		const CacheableLookup = (await import("cacheable-lookup")).default;
 		this.cacheable = new CacheableLookup();
 		this.cacheable.install(node_http.default.globalAgent);
@@ -3401,129 +3382,305 @@ var BiliAPI = class extends koishi.Service {
 		return decrypted.toString();
 	}
 	async getTheUserWhoIsLiveStreaming() {
-		const { data } = await this.client.get(GET_LATEST_UPDATED_UPS);
-		return data;
+		const run = async () => {
+			const { data } = await this.client.get(GET_LATEST_UPDATED_UPS);
+			return data;
+		};
+		return await this.pRetry(run, {
+			onFailedAttempt: (error) => {
+				this.logger.error(`getTheUserWhoIsLiveStreaming() 第${error.attemptNumber}次失败: ${error.message}`);
+			},
+			retries: 3
+		});
 	}
 	async getLiveRoomInfoStreamKey(roomId) {
-		const { data } = await this.client.get(`${GET_LIVE_ROOM_INFO_STREAM_KEY}?id=${roomId}`);
-		return data;
+		const run = async () => {
+			const { data } = await this.client.get(`${GET_LIVE_ROOM_INFO_STREAM_KEY}?id=${roomId}`);
+			return data;
+		};
+		return await this.pRetry(run, {
+			onFailedAttempt: (error) => {
+				this.logger.error(`getLiveRoomInfoStreamKey() 第${error.attemptNumber}次失败: ${error.message}`);
+			},
+			retries: 3
+		});
 	}
 	async getLiveRoomInfoByUids(uids) {
-		const params = uids.map((uid) => `uids[]=${uid}`).join("&");
-		const { data } = await this.client.get(`${GET_LIVE_ROOMS_INFO}?${params}`);
-		return data;
+		const run = async () => {
+			const params = uids.map((uid) => `uids[]=${uid}`).join("&");
+			const { data } = await this.client.get(`${GET_LIVE_ROOMS_INFO}?${params}`);
+			return data;
+		};
+		return await this.pRetry(run, {
+			onFailedAttempt: (error) => {
+				this.logger.error(`getLiveRoomInfoByUids() 第${error.attemptNumber}次失败: ${error.message}`);
+			},
+			retries: 3
+		});
 	}
 	async getServerUTCTime() {
-		const { data } = await this.client.get(GET_SERVER_UTC_TIME);
-		const regex = /Date\.UTC\((.*?)\)/;
-		const match = data.match(regex);
-		if (match) {
-			const timestamp = new Function(`return Date.UTC(${match[1]})`)();
-			return timestamp / 1e3;
-		}
-		throw new Error("解析服务器时间失败！");
+		const run = async () => {
+			const { data } = await this.client.get(GET_SERVER_UTC_TIME);
+			const regex = /Date\.UTC\((.*?)\)/;
+			const match = data.match(regex);
+			if (match) {
+				const timestamp = new Function(`return Date.UTC(${match[1]})`)();
+				return timestamp / 1e3;
+			}
+			throw new this.AbortError("解析服务器时间失败！");
+		};
+		return await this.pRetry(run, {
+			onFailedAttempt: (error) => {
+				this.logger.error(`getServerUTCTime() 第${error.attemptNumber}次失败: ${error.message}`);
+			},
+			retries: 3
+		});
 	}
 	async getTimeNow() {
-		const { data } = await this.client.get(GET_TIME_NOW);
-		return data;
+		const run = async () => {
+			const { data } = await this.client.get(GET_TIME_NOW);
+			return data;
+		};
+		return await this.pRetry(run, {
+			onFailedAttempt: (error) => {
+				this.logger.error(`getTimeNow() 第${error.attemptNumber}次失败: ${error.message}`);
+			},
+			retries: 3
+		});
 	}
 	async getAllGroup() {
-		const { data } = await this.client.get(GET_ALL_GROUP);
-		return data;
+		const run = async () => {
+			const { data } = await this.client.get(GET_ALL_GROUP);
+			return data;
+		};
+		return await this.pRetry(run, {
+			onFailedAttempt: (error) => {
+				this.logger.error(`getAllGroup() 第${error.attemptNumber}次失败: ${error.message}`);
+			},
+			retries: 3
+		});
 	}
 	async removeUserFromGroup(mid) {
-		const csrf = this.getCSRF();
-		const { data } = await this.client.post(MODIFY_GROUP_MEMBER, {
-			fids: mid,
-			tagids: 0,
-			csrf
-		}, { headers: { "Content-Type": "application/x-www-form-urlencoded" } });
-		return data;
+		const run = async () => {
+			const csrf = this.getCSRF();
+			const { data } = await this.client.post(MODIFY_GROUP_MEMBER, {
+				fids: mid,
+				tagids: 0,
+				csrf
+			}, { headers: { "Content-Type": "application/x-www-form-urlencoded" } });
+			return data;
+		};
+		return await this.pRetry(run, {
+			onFailedAttempt: (error) => {
+				this.logger.error(`removeUserFromGroup() 第${error.attemptNumber}次失败: ${error.message}`);
+			},
+			retries: 3
+		});
 	}
 	async copyUserToGroup(mid, groupId) {
-		const csrf = this.getCSRF();
-		const { data } = await this.client.post(COPY_USER_TO_GROUP, {
-			fids: mid,
-			tagids: groupId,
-			csrf
-		}, { headers: { "Content-Type": "application/x-www-form-urlencoded" } });
-		return data;
+		const run = async () => {
+			const csrf = this.getCSRF();
+			const { data } = await this.client.post(COPY_USER_TO_GROUP, {
+				fids: mid,
+				tagids: groupId,
+				csrf
+			}, { headers: { "Content-Type": "application/x-www-form-urlencoded" } });
+			return data;
+		};
+		return await this.pRetry(run, {
+			onFailedAttempt: (error) => {
+				this.logger.error(`copyUserToGroup() 第${error.attemptNumber}次失败: ${error.message}`);
+			},
+			retries: 3
+		});
 	}
 	async getUserSpaceDynamic(mid) {
-		const { data } = await this.client.get(`${GET_USER_SPACE_DYNAMIC_LIST}&host_mid=${mid}`);
-		return data;
+		const run = async () => {
+			const { data } = await this.client.get(`${GET_USER_SPACE_DYNAMIC_LIST}&host_mid=${mid}`);
+			return data;
+		};
+		return await this.pRetry(run, {
+			onFailedAttempt: (error) => {
+				this.logger.error(`getUserSpaceDynamic() 第${error.attemptNumber}次失败: ${error.message}`);
+			},
+			retries: 3
+		});
 	}
 	async createGroup(tag) {
-		const { data } = await this.client.post(CREATE_GROUP, {
-			tag,
-			csrf: this.getCSRF()
-		}, { headers: { "Content-Type": "application/x-www-form-urlencoded" } });
-		return data;
+		const run = async () => {
+			const { data } = await this.client.post(CREATE_GROUP, {
+				tag,
+				csrf: this.getCSRF()
+			}, { headers: { "Content-Type": "application/x-www-form-urlencoded" } });
+			return data;
+		};
+		return await this.pRetry(run, {
+			onFailedAttempt: (error) => {
+				this.logger.error(`createGroup() 第${error.attemptNumber}次失败: ${error.message}`);
+			},
+			retries: 3
+		});
 	}
 	async getAllDynamic() {
-		const { data } = await this.client.get(GET_ALL_DYNAMIC_LIST);
-		return data;
+		const run = async () => {
+			const { data } = await this.client.get(GET_ALL_DYNAMIC_LIST);
+			return data;
+		};
+		return await this.pRetry(run, {
+			onFailedAttempt: (error) => {
+				this.logger.error(`getAllDynamic() 第${error.attemptNumber}次失败: ${error.message}`);
+			},
+			retries: 3
+		});
 	}
 	async hasNewDynamic(updateBaseline) {
-		const { data } = await this.client.get(`${HAS_NEW_DYNAMIC}?update_baseline=${updateBaseline}`);
-		return data;
+		const run = async () => {
+			const { data } = await this.client.get(`${HAS_NEW_DYNAMIC}?update_baseline=${updateBaseline}`);
+			return data;
+		};
+		return await this.pRetry(run, {
+			onFailedAttempt: (error) => {
+				this.logger.error(`hasNewDynamic() 第${error.attemptNumber}次失败: ${error.message}`);
+			},
+			retries: 3
+		});
 	}
 	async follow(fid) {
-		const { data } = await this.client.post(MODIFY_RELATION, {
-			fid,
-			act: 1,
-			re_src: 11,
-			csrf: this.getCSRF()
-		}, { headers: { "Content-Type": "application/x-www-form-urlencoded" } });
-		return data;
+		const run = async () => {
+			const { data } = await this.client.post(MODIFY_RELATION, {
+				fid,
+				act: 1,
+				re_src: 11,
+				csrf: this.getCSRF()
+			}, { headers: { "Content-Type": "application/x-www-form-urlencoded" } });
+			return data;
+		};
+		return await this.pRetry(run, {
+			onFailedAttempt: (error) => {
+				this.logger.error(`follow() 第${error.attemptNumber}次失败: ${error.message}`);
+			},
+			retries: 3
+		});
 	}
 	async getRelationGroupDetail(tagid) {
-		const { data } = await this.client.get(`${GET_RELATION_GROUP_DETAIL}?tagid=${tagid}`);
-		return data;
+		const run = async () => {
+			const { data } = await this.client.get(`${GET_RELATION_GROUP_DETAIL}?tagid=${tagid}`);
+			return data;
+		};
+		return await this.pRetry(run, {
+			onFailedAttempt: (error) => {
+				this.logger.error(`getRelationGroupDetail() 第${error.attemptNumber}次失败: ${error.message}`);
+			},
+			retries: 3
+		});
 	}
 	async getCookieInfo(refreshToken) {
-		const { data } = await this.client.get(`${GET_COOKIES_INFO}?csrf=${refreshToken}`).catch((e) => {
-			this.logger.info(e.message);
-			return null;
+		const run = async () => {
+			const { data } = await this.client.get(`${GET_COOKIES_INFO}?csrf=${refreshToken}`).catch((e) => {
+				this.logger.info(e.message);
+				return null;
+			});
+			return data;
+		};
+		return await this.pRetry(run, {
+			onFailedAttempt: (error) => {
+				this.logger.error(`getCookieInfo() 第${error.attemptNumber}次失败: ${error.message}`);
+			},
+			retries: 3
 		});
-		return data;
 	}
 	async getUserInfo(mid) {
-		if (mid === "11783021") {
-			console.log("检测到番剧出差UID，跳过远程用户接口访问");
-			return bangumiTripData;
-		}
-		const wbi = await this.getWbi({ mid });
-		const { data } = await this.client.get(`${GET_USER_INFO}?${wbi}`);
-		return data;
+		const run = async () => {
+			if (mid === "11783021") {
+				console.log("检测到番剧出差UID，跳过远程用户接口访问");
+				return bangumiTripData;
+			}
+			const wbi = await this.getWbi({ mid });
+			const { data } = await this.client.get(`${GET_USER_INFO}?${wbi}`);
+			return data;
+		};
+		return await this.pRetry(run, {
+			onFailedAttempt: (error) => {
+				this.logger.error(`getUserInfo() 第${error.attemptNumber}次失败: ${error.message}`);
+			},
+			retries: 3
+		});
 	}
 	async getWbiKeys() {
-		const { data } = await this.client.get("https://api.bilibili.com/x/web-interface/nav");
-		const { data: { wbi_img: { img_url, sub_url } } } = data;
-		return {
-			img_key: img_url.slice(img_url.lastIndexOf("/") + 1, img_url.lastIndexOf(".")),
-			sub_key: sub_url.slice(sub_url.lastIndexOf("/") + 1, sub_url.lastIndexOf("."))
+		const run = async () => {
+			const { data } = await this.client.get("https://api.bilibili.com/x/web-interface/nav");
+			const { data: { wbi_img: { img_url, sub_url } } } = data;
+			return {
+				img_key: img_url.slice(img_url.lastIndexOf("/") + 1, img_url.lastIndexOf(".")),
+				sub_key: sub_url.slice(sub_url.lastIndexOf("/") + 1, sub_url.lastIndexOf("."))
+			};
 		};
+		return await this.pRetry(run, {
+			onFailedAttempt: (error) => {
+				this.logger.error(`getWbiKeys() 第${error.attemptNumber}次失败: ${error.message}`);
+			},
+			retries: 3
+		});
 	}
 	async getMyselfInfo() {
-		const { data } = await this.client.get(GET_MYSELF_INFO);
-		return data;
+		const run = async () => {
+			const { data } = await this.client.get(GET_MYSELF_INFO);
+			return data;
+		};
+		return await this.pRetry(run, {
+			onFailedAttempt: (error) => {
+				this.logger.error(`getMyselfInfo() 第${error.attemptNumber}次失败: ${error.message}`);
+			},
+			retries: 3
+		});
 	}
 	async getLoginQRCode() {
-		const { data } = await this.client.get(GET_LOGIN_QRCODE);
-		return data;
+		const run = async () => {
+			const { data } = await this.client.get(GET_LOGIN_QRCODE);
+			return data;
+		};
+		return await this.pRetry(run, {
+			onFailedAttempt: (error) => {
+				this.logger.error(`getLoginQRCode() 第${error.attemptNumber}次失败: ${error.message}`);
+			},
+			retries: 3
+		});
 	}
 	async getLoginStatus(qrcodeKey) {
-		const { data } = await this.client.get(`${GET_LOGIN_STATUS}?qrcode_key=${qrcodeKey}`);
-		return data;
+		const run = async () => {
+			const { data } = await this.client.get(`${GET_LOGIN_STATUS}?qrcode_key=${qrcodeKey}`);
+			return data;
+		};
+		return await this.pRetry(run, {
+			onFailedAttempt: (error) => {
+				this.logger.error(`getLoginStatus() 第${error.attemptNumber}次失败: ${error.message}`);
+			},
+			retries: 3
+		});
 	}
 	async getLiveRoomInfo(roomId) {
-		const { data } = await this.client.get(`${GET_LIVE_ROOM_INFO}?room_id=${roomId}`);
-		return data;
+		const run = async () => {
+			const { data } = await this.client.get(`${GET_LIVE_ROOM_INFO}?room_id=${roomId}`);
+			return data;
+		};
+		return await this.pRetry(run, {
+			onFailedAttempt: (error) => {
+				this.logger.error(`getLiveRoomInfo() 第${error.attemptNumber}次失败: ${error.message}`);
+			},
+			retries: 3
+		});
 	}
 	async getMasterInfo(mid) {
-		const { data } = await this.client.get(`${GET_MASTER_INFO}?uid=${mid}`);
-		return data;
+		const run = async () => {
+			const { data } = await this.client.get(`${GET_MASTER_INFO}?uid=${mid}`);
+			return data;
+		};
+		return await this.pRetry(run, {
+			onFailedAttempt: (error) => {
+				this.logger.error(`getMasterInfo() 第${error.attemptNumber}次失败: ${error.message}`);
+			},
+			retries: 3
+		});
 	}
 	disposeNotifier() {
 		if (this.loginNotifier) this.loginNotifier.dispose();
@@ -3807,138 +3964,6 @@ var BiliAPI = class extends koishi.Service {
 		return { data: data.data };
 	}
 };
-(0, __oxc_project_runtime_helpers_decorate.default)([Retry({
-	attempts: 3,
-	onFailure(error, attempts) {
-		this.logger.error(`getTheUserWhoIsLiveStreaming() 第${attempts}次失败: ${error.message}`);
-	}
-})], BiliAPI.prototype, "getTheUserWhoIsLiveStreaming", null);
-(0, __oxc_project_runtime_helpers_decorate.default)([Retry({
-	attempts: 3,
-	onFailure(error, attempts) {
-		this.logger.error(`getLiveRoomInfoStreamKey() 第${attempts}次失败: ${error.message}`);
-	}
-})], BiliAPI.prototype, "getLiveRoomInfoStreamKey", null);
-(0, __oxc_project_runtime_helpers_decorate.default)([Retry({
-	attempts: 3,
-	onFailure(error, attempts) {
-		this.logger.error(`getLiveRoomInfoByUids() 第${attempts}次失败: ${error.message}`);
-	}
-})], BiliAPI.prototype, "getLiveRoomInfoByUids", null);
-(0, __oxc_project_runtime_helpers_decorate.default)([Retry({
-	attempts: 3,
-	onFailure(error, attempts) {
-		this.logger.error(`getServerUTCTime() 第${attempts}次失败: ${error.message}`);
-	}
-})], BiliAPI.prototype, "getServerUTCTime", null);
-(0, __oxc_project_runtime_helpers_decorate.default)([Retry({
-	attempts: 3,
-	onFailure(error, attempts) {
-		this.logger.error(`getTimeNow() 第${attempts}次失败: ${error.message}`);
-	}
-})], BiliAPI.prototype, "getTimeNow", null);
-(0, __oxc_project_runtime_helpers_decorate.default)([Retry({
-	attempts: 3,
-	onFailure(error, attempts) {
-		this.logger.error(`getAllGroup() 第${attempts}次失败: ${error.message}`);
-	}
-})], BiliAPI.prototype, "getAllGroup", null);
-(0, __oxc_project_runtime_helpers_decorate.default)([Retry({
-	attempts: 3,
-	onFailure(error, attempts) {
-		this.logger.error(`removeUserFromGroup() 第${attempts}次失败: ${error.message}`);
-	}
-})], BiliAPI.prototype, "removeUserFromGroup", null);
-(0, __oxc_project_runtime_helpers_decorate.default)([Retry({
-	attempts: 3,
-	onFailure(error, attempts) {
-		this.logger.error(`copyUserToGroup() 第${attempts}次失败: ${error.message}`);
-	}
-})], BiliAPI.prototype, "copyUserToGroup", null);
-(0, __oxc_project_runtime_helpers_decorate.default)([Retry({
-	attempts: 3,
-	onFailure(error, attempts) {
-		this.logger.error(`getUserSpaceDynamic() 第${attempts}次失败: ${error.message}`);
-	}
-})], BiliAPI.prototype, "getUserSpaceDynamic", null);
-(0, __oxc_project_runtime_helpers_decorate.default)([Retry({
-	attempts: 3,
-	onFailure(error, attempts) {
-		this.logger.error(`createGroup() 第${attempts}次失败: ${error.message}`);
-	}
-})], BiliAPI.prototype, "createGroup", null);
-(0, __oxc_project_runtime_helpers_decorate.default)([Retry({
-	attempts: 3,
-	onFailure(error, attempts) {
-		this.logger.error(`getAllDynamic() 第${attempts}次失败: ${error.message}`);
-	}
-})], BiliAPI.prototype, "getAllDynamic", null);
-(0, __oxc_project_runtime_helpers_decorate.default)([Retry({
-	attempts: 3,
-	onFailure(error, attempts) {
-		this.logger.error(`hasNewDynamic() 第${attempts}次失败: ${error.message}`);
-	}
-})], BiliAPI.prototype, "hasNewDynamic", null);
-(0, __oxc_project_runtime_helpers_decorate.default)([Retry({
-	attempts: 3,
-	onFailure(error, attempts) {
-		this.logger.error(`follow() 第${attempts}次失败: ${error.message}`);
-	}
-})], BiliAPI.prototype, "follow", null);
-(0, __oxc_project_runtime_helpers_decorate.default)([Retry({
-	attempts: 3,
-	onFailure(error, attempts) {
-		this.logger.error(`getRelationGroupDetail() 第${attempts}次失败: ${error.message}`);
-	}
-})], BiliAPI.prototype, "getRelationGroupDetail", null);
-(0, __oxc_project_runtime_helpers_decorate.default)([Retry({
-	attempts: 3,
-	onFailure(error, attempts) {
-		this.logger.error(`getCookieInfo() 第${attempts}次失败: ${error.message}`);
-	}
-})], BiliAPI.prototype, "getCookieInfo", null);
-(0, __oxc_project_runtime_helpers_decorate.default)([Retry({
-	attempts: 3,
-	onFailure(error, attempts) {
-		this.logger.error(`getUserInfo() 第${attempts}次失败: ${error.message}`);
-	}
-})], BiliAPI.prototype, "getUserInfo", null);
-(0, __oxc_project_runtime_helpers_decorate.default)([Retry({
-	attempts: 3,
-	onFailure(error, attempts) {
-		this.logger.error(`getWbiKeys() 第${attempts}次失败: ${error.message}`);
-	}
-})], BiliAPI.prototype, "getWbiKeys", null);
-(0, __oxc_project_runtime_helpers_decorate.default)([Retry({
-	attempts: 3,
-	onFailure(error, attempts) {
-		this.logger.error(`getMyselfInfo() 第${attempts}次失败: ${error.message}`);
-	}
-})], BiliAPI.prototype, "getMyselfInfo", null);
-(0, __oxc_project_runtime_helpers_decorate.default)([Retry({
-	attempts: 3,
-	onFailure(error, attempts) {
-		this.logger.error(`getLoginQRCode() 第${attempts}次失败: ${error.message}`);
-	}
-})], BiliAPI.prototype, "getLoginQRCode", null);
-(0, __oxc_project_runtime_helpers_decorate.default)([Retry({
-	attempts: 3,
-	onFailure(error, attempts) {
-		this.logger.error(`getLoginStatus() 第${attempts}次失败: ${error.message}`);
-	}
-})], BiliAPI.prototype, "getLoginStatus", null);
-(0, __oxc_project_runtime_helpers_decorate.default)([Retry({
-	attempts: 3,
-	onFailure(error, attempts) {
-		this.logger.error(`getLiveRoomInfo() 第${attempts}次失败: ${error.message}`);
-	}
-})], BiliAPI.prototype, "getLiveRoomInfo", null);
-(0, __oxc_project_runtime_helpers_decorate.default)([Retry({
-	attempts: 3,
-	onFailure(error, attempts) {
-		this.logger.error(`getMasterInfo() 第${attempts}次失败: ${error.message}`);
-	}
-})], BiliAPI.prototype, "getMasterInfo", null);
 (function(_BiliAPI) {
 	const Config$1 = _BiliAPI.Config = koishi.Schema.object({
 		userAgent: koishi.Schema.string(),

package/lib/index.mjs

@@ -17,7 +17,6 @@ import https from "node:https";
 import axios from "axios";
 import { Cookie, CookieJar } from "tough-cookie";
 import { JSDOM } from "jsdom";
-import _decorate from "@oxc-project/runtime/helpers/decorate";
 import { startListen } from "@akokko/blive-message-listener";
 
 //#region rolldown:runtime
@@ -103,22 +102,6 @@ const BAConfigSchema = Schema.object({
 
 //#endregion
 //#region src/utils/index.ts
-function Retry(options = { attempts: 3 }) {
-	return (_target, _propertyKey, descriptor) => {
-		const originalMethod = descriptor.value;
-		descriptor.value = async function(...args) {
-			let lastError;
-			for (let i = 0; i < options.attempts; i++) try {
-				return await originalMethod.apply(this, args);
-			} catch (error) {
-				lastError = error;
-				if (options.onFailure) await options.onFailure.call(this, lastError, i + 1);
-			}
-			throw lastError;
-		};
-		return descriptor;
-	};
-}
 /**
 * 高阶函数：为函数添加锁机制
 * @param {Function} fn - 需要包装的原始函数
@@ -624,14 +607,8 @@ var ComRegister = class {
 			await session.send("请手动填入 gt 和 challenge 后点击生成进行验证，验证完成后点击结果，根据提示输入对应validate");
 			await session.send(`gt:${data.geetest.gt}`);
 			await session.send(`challenge:${data.geetest.challenge}`);
-			await session.send("请输入validate，格式为 val <validate>");
-			const validate = await (async () => {
-				while (true) {
-					const validate$1 = await session.prompt();
-					if (validate$1?.startsWith("val ")) return validate$1.slice(4);
-					else await session.send("请输入正确的validate，格式为 val <validate>");
-				}
-			})();
+			await session.send("请直接输入validate");
+			const validate = await session.prompt();
 			const seccode = `${validate}|jordan`;
 			const { data: validateCaptchaData } = await ctx.ba.validateCaptcha(data.geetest.challenge, data.token, validate, seccode);
 			if (validateCaptchaData?.is_valid !== 1) return "验证不成功！";
@@ -3313,11 +3290,15 @@ var BiliAPI = class extends Service {
 		sub_key: ""
 	};
 	updateJob;
+	pRetry;
+	AbortError;
 	constructor(ctx, config) {
 		super(ctx, "ba");
 		this.apiConfig = config;
 	}
 	async start() {
+		this.pRetry = (await import("p-retry")).default;
+		this.AbortError = (await import("p-retry")).AbortError;
 		const CacheableLookup = (await import("cacheable-lookup")).default;
 		this.cacheable = new CacheableLookup();
 		this.cacheable.install(http.globalAgent);
@@ -3382,129 +3363,305 @@ var BiliAPI = class extends Service {
 		return decrypted.toString();
 	}
 	async getTheUserWhoIsLiveStreaming() {
-		const { data } = await this.client.get(GET_LATEST_UPDATED_UPS);
-		return data;
+		const run = async () => {
+			const { data } = await this.client.get(GET_LATEST_UPDATED_UPS);
+			return data;
+		};
+		return await this.pRetry(run, {
+			onFailedAttempt: (error) => {
+				this.logger.error(`getTheUserWhoIsLiveStreaming() 第${error.attemptNumber}次失败: ${error.message}`);
+			},
+			retries: 3
+		});
 	}
 	async getLiveRoomInfoStreamKey(roomId) {
-		const { data } = await this.client.get(`${GET_LIVE_ROOM_INFO_STREAM_KEY}?id=${roomId}`);
-		return data;
+		const run = async () => {
+			const { data } = await this.client.get(`${GET_LIVE_ROOM_INFO_STREAM_KEY}?id=${roomId}`);
+			return data;
+		};
+		return await this.pRetry(run, {
+			onFailedAttempt: (error) => {
+				this.logger.error(`getLiveRoomInfoStreamKey() 第${error.attemptNumber}次失败: ${error.message}`);
+			},
+			retries: 3
+		});
 	}
 	async getLiveRoomInfoByUids(uids) {
-		const params = uids.map((uid) => `uids[]=${uid}`).join("&");
-		const { data } = await this.client.get(`${GET_LIVE_ROOMS_INFO}?${params}`);
-		return data;
+		const run = async () => {
+			const params = uids.map((uid) => `uids[]=${uid}`).join("&");
+			const { data } = await this.client.get(`${GET_LIVE_ROOMS_INFO}?${params}`);
+			return data;
+		};
+		return await this.pRetry(run, {
+			onFailedAttempt: (error) => {
+				this.logger.error(`getLiveRoomInfoByUids() 第${error.attemptNumber}次失败: ${error.message}`);
+			},
+			retries: 3
+		});
 	}
 	async getServerUTCTime() {
-		const { data } = await this.client.get(GET_SERVER_UTC_TIME);
-		const regex = /Date\.UTC\((.*?)\)/;
-		const match = data.match(regex);
-		if (match) {
-			const timestamp = new Function(`return Date.UTC(${match[1]})`)();
-			return timestamp / 1e3;
-		}
-		throw new Error("解析服务器时间失败！");
+		const run = async () => {
+			const { data } = await this.client.get(GET_SERVER_UTC_TIME);
+			const regex = /Date\.UTC\((.*?)\)/;
+			const match = data.match(regex);
+			if (match) {
+				const timestamp = new Function(`return Date.UTC(${match[1]})`)();
+				return timestamp / 1e3;
+			}
+			throw new this.AbortError("解析服务器时间失败！");
+		};
+		return await this.pRetry(run, {
+			onFailedAttempt: (error) => {
+				this.logger.error(`getServerUTCTime() 第${error.attemptNumber}次失败: ${error.message}`);
+			},
+			retries: 3
+		});
 	}
 	async getTimeNow() {
-		const { data } = await this.client.get(GET_TIME_NOW);
-		return data;
+		const run = async () => {
+			const { data } = await this.client.get(GET_TIME_NOW);
+			return data;
+		};
+		return await this.pRetry(run, {
+			onFailedAttempt: (error) => {
+				this.logger.error(`getTimeNow() 第${error.attemptNumber}次失败: ${error.message}`);
+			},
+			retries: 3
+		});
 	}
 	async getAllGroup() {
-		const { data } = await this.client.get(GET_ALL_GROUP);
-		return data;
+		const run = async () => {
+			const { data } = await this.client.get(GET_ALL_GROUP);
+			return data;
+		};
+		return await this.pRetry(run, {
+			onFailedAttempt: (error) => {
+				this.logger.error(`getAllGroup() 第${error.attemptNumber}次失败: ${error.message}`);
+			},
+			retries: 3
+		});
 	}
 	async removeUserFromGroup(mid) {
-		const csrf = this.getCSRF();
-		const { data } = await this.client.post(MODIFY_GROUP_MEMBER, {
-			fids: mid,
-			tagids: 0,
-			csrf
-		}, { headers: { "Content-Type": "application/x-www-form-urlencoded" } });
-		return data;
+		const run = async () => {
+			const csrf = this.getCSRF();
+			const { data } = await this.client.post(MODIFY_GROUP_MEMBER, {
+				fids: mid,
+				tagids: 0,
+				csrf
+			}, { headers: { "Content-Type": "application/x-www-form-urlencoded" } });
+			return data;
+		};
+		return await this.pRetry(run, {
+			onFailedAttempt: (error) => {
+				this.logger.error(`removeUserFromGroup() 第${error.attemptNumber}次失败: ${error.message}`);
+			},
+			retries: 3
+		});
 	}
 	async copyUserToGroup(mid, groupId) {
-		const csrf = this.getCSRF();
-		const { data } = await this.client.post(COPY_USER_TO_GROUP, {
-			fids: mid,
-			tagids: groupId,
-			csrf
-		}, { headers: { "Content-Type": "application/x-www-form-urlencoded" } });
-		return data;
+		const run = async () => {
+			const csrf = this.getCSRF();
+			const { data } = await this.client.post(COPY_USER_TO_GROUP, {
+				fids: mid,
+				tagids: groupId,
+				csrf
+			}, { headers: { "Content-Type": "application/x-www-form-urlencoded" } });
+			return data;
+		};
+		return await this.pRetry(run, {
+			onFailedAttempt: (error) => {
+				this.logger.error(`copyUserToGroup() 第${error.attemptNumber}次失败: ${error.message}`);
+			},
+			retries: 3
+		});
 	}
 	async getUserSpaceDynamic(mid) {
-		const { data } = await this.client.get(`${GET_USER_SPACE_DYNAMIC_LIST}&host_mid=${mid}`);
-		return data;
+		const run = async () => {
+			const { data } = await this.client.get(`${GET_USER_SPACE_DYNAMIC_LIST}&host_mid=${mid}`);
+			return data;
+		};
+		return await this.pRetry(run, {
+			onFailedAttempt: (error) => {
+				this.logger.error(`getUserSpaceDynamic() 第${error.attemptNumber}次失败: ${error.message}`);
+			},
+			retries: 3
+		});
 	}
 	async createGroup(tag) {
-		const { data } = await this.client.post(CREATE_GROUP, {
-			tag,
-			csrf: this.getCSRF()
-		}, { headers: { "Content-Type": "application/x-www-form-urlencoded" } });
-		return data;
+		const run = async () => {
+			const { data } = await this.client.post(CREATE_GROUP, {
+				tag,
+				csrf: this.getCSRF()
+			}, { headers: { "Content-Type": "application/x-www-form-urlencoded" } });
+			return data;
+		};
+		return await this.pRetry(run, {
+			onFailedAttempt: (error) => {
+				this.logger.error(`createGroup() 第${error.attemptNumber}次失败: ${error.message}`);
+			},
+			retries: 3
+		});
 	}
 	async getAllDynamic() {
-		const { data } = await this.client.get(GET_ALL_DYNAMIC_LIST);
-		return data;
+		const run = async () => {
+			const { data } = await this.client.get(GET_ALL_DYNAMIC_LIST);
+			return data;
+		};
+		return await this.pRetry(run, {
+			onFailedAttempt: (error) => {
+				this.logger.error(`getAllDynamic() 第${error.attemptNumber}次失败: ${error.message}`);
+			},
+			retries: 3
+		});
 	}
 	async hasNewDynamic(updateBaseline) {
-		const { data } = await this.client.get(`${HAS_NEW_DYNAMIC}?update_baseline=${updateBaseline}`);
-		return data;
+		const run = async () => {
+			const { data } = await this.client.get(`${HAS_NEW_DYNAMIC}?update_baseline=${updateBaseline}`);
+			return data;
+		};
+		return await this.pRetry(run, {
+			onFailedAttempt: (error) => {
+				this.logger.error(`hasNewDynamic() 第${error.attemptNumber}次失败: ${error.message}`);
+			},
+			retries: 3
+		});
 	}
 	async follow(fid) {
-		const { data } = await this.client.post(MODIFY_RELATION, {
-			fid,
-			act: 1,
-			re_src: 11,
-			csrf: this.getCSRF()
-		}, { headers: { "Content-Type": "application/x-www-form-urlencoded" } });
-		return data;
+		const run = async () => {
+			const { data } = await this.client.post(MODIFY_RELATION, {
+				fid,
+				act: 1,
+				re_src: 11,
+				csrf: this.getCSRF()
+			}, { headers: { "Content-Type": "application/x-www-form-urlencoded" } });
+			return data;
+		};
+		return await this.pRetry(run, {
+			onFailedAttempt: (error) => {
+				this.logger.error(`follow() 第${error.attemptNumber}次失败: ${error.message}`);
+			},
+			retries: 3
+		});
 	}
 	async getRelationGroupDetail(tagid) {
-		const { data } = await this.client.get(`${GET_RELATION_GROUP_DETAIL}?tagid=${tagid}`);
-		return data;
+		const run = async () => {
+			const { data } = await this.client.get(`${GET_RELATION_GROUP_DETAIL}?tagid=${tagid}`);
+			return data;
+		};
+		return await this.pRetry(run, {
+			onFailedAttempt: (error) => {
+				this.logger.error(`getRelationGroupDetail() 第${error.attemptNumber}次失败: ${error.message}`);
+			},
+			retries: 3
+		});
 	}
 	async getCookieInfo(refreshToken) {
-		const { data } = await this.client.get(`${GET_COOKIES_INFO}?csrf=${refreshToken}`).catch((e) => {
-			this.logger.info(e.message);
-			return null;
+		const run = async () => {
+			const { data } = await this.client.get(`${GET_COOKIES_INFO}?csrf=${refreshToken}`).catch((e) => {
+				this.logger.info(e.message);
+				return null;
+			});
+			return data;
+		};
+		return await this.pRetry(run, {
+			onFailedAttempt: (error) => {
+				this.logger.error(`getCookieInfo() 第${error.attemptNumber}次失败: ${error.message}`);
+			},
+			retries: 3
 		});
-		return data;
 	}
 	async getUserInfo(mid) {
-		if (mid === "11783021") {
-			console.log("检测到番剧出差UID，跳过远程用户接口访问");
-			return bangumiTripData;
-		}
-		const wbi = await this.getWbi({ mid });
-		const { data } = await this.client.get(`${GET_USER_INFO}?${wbi}`);
-		return data;
+		const run = async () => {
+			if (mid === "11783021") {
+				console.log("检测到番剧出差UID，跳过远程用户接口访问");
+				return bangumiTripData;
+			}
+			const wbi = await this.getWbi({ mid });
+			const { data } = await this.client.get(`${GET_USER_INFO}?${wbi}`);
+			return data;
+		};
+		return await this.pRetry(run, {
+			onFailedAttempt: (error) => {
+				this.logger.error(`getUserInfo() 第${error.attemptNumber}次失败: ${error.message}`);
+			},
+			retries: 3
+		});
 	}
 	async getWbiKeys() {
-		const { data } = await this.client.get("https://api.bilibili.com/x/web-interface/nav");
-		const { data: { wbi_img: { img_url, sub_url } } } = data;
-		return {
-			img_key: img_url.slice(img_url.lastIndexOf("/") + 1, img_url.lastIndexOf(".")),
-			sub_key: sub_url.slice(sub_url.lastIndexOf("/") + 1, sub_url.lastIndexOf("."))
+		const run = async () => {
+			const { data } = await this.client.get("https://api.bilibili.com/x/web-interface/nav");
+			const { data: { wbi_img: { img_url, sub_url } } } = data;
+			return {
+				img_key: img_url.slice(img_url.lastIndexOf("/") + 1, img_url.lastIndexOf(".")),
+				sub_key: sub_url.slice(sub_url.lastIndexOf("/") + 1, sub_url.lastIndexOf("."))
+			};
 		};
+		return await this.pRetry(run, {
+			onFailedAttempt: (error) => {
+				this.logger.error(`getWbiKeys() 第${error.attemptNumber}次失败: ${error.message}`);
+			},
+			retries: 3
+		});
 	}
 	async getMyselfInfo() {
-		const { data } = await this.client.get(GET_MYSELF_INFO);
-		return data;
+		const run = async () => {
+			const { data } = await this.client.get(GET_MYSELF_INFO);
+			return data;
+		};
+		return await this.pRetry(run, {
+			onFailedAttempt: (error) => {
+				this.logger.error(`getMyselfInfo() 第${error.attemptNumber}次失败: ${error.message}`);
+			},
+			retries: 3
+		});
 	}
 	async getLoginQRCode() {
-		const { data } = await this.client.get(GET_LOGIN_QRCODE);
-		return data;
+		const run = async () => {
+			const { data } = await this.client.get(GET_LOGIN_QRCODE);
+			return data;
+		};
+		return await this.pRetry(run, {
+			onFailedAttempt: (error) => {
+				this.logger.error(`getLoginQRCode() 第${error.attemptNumber}次失败: ${error.message}`);
+			},
+			retries: 3
+		});
 	}
 	async getLoginStatus(qrcodeKey) {
-		const { data } = await this.client.get(`${GET_LOGIN_STATUS}?qrcode_key=${qrcodeKey}`);
-		return data;
+		const run = async () => {
+			const { data } = await this.client.get(`${GET_LOGIN_STATUS}?qrcode_key=${qrcodeKey}`);
+			return data;
+		};
+		return await this.pRetry(run, {
+			onFailedAttempt: (error) => {
+				this.logger.error(`getLoginStatus() 第${error.attemptNumber}次失败: ${error.message}`);
+			},
+			retries: 3
+		});
 	}
 	async getLiveRoomInfo(roomId) {
-		const { data } = await this.client.get(`${GET_LIVE_ROOM_INFO}?room_id=${roomId}`);
-		return data;
+		const run = async () => {
+			const { data } = await this.client.get(`${GET_LIVE_ROOM_INFO}?room_id=${roomId}`);
+			return data;
+		};
+		return await this.pRetry(run, {
+			onFailedAttempt: (error) => {
+				this.logger.error(`getLiveRoomInfo() 第${error.attemptNumber}次失败: ${error.message}`);
+			},
+			retries: 3
+		});
 	}
 	async getMasterInfo(mid) {
-		const { data } = await this.client.get(`${GET_MASTER_INFO}?uid=${mid}`);
-		return data;
+		const run = async () => {
+			const { data } = await this.client.get(`${GET_MASTER_INFO}?uid=${mid}`);
+			return data;
+		};
+		return await this.pRetry(run, {
+			onFailedAttempt: (error) => {
+				this.logger.error(`getMasterInfo() 第${error.attemptNumber}次失败: ${error.message}`);
+			},
+			retries: 3
+		});
 	}
 	disposeNotifier() {
 		if (this.loginNotifier) this.loginNotifier.dispose();
@@ -3788,138 +3945,6 @@ var BiliAPI = class extends Service {
 		return { data: data.data };
 	}
 };
-_decorate([Retry({
-	attempts: 3,
-	onFailure(error, attempts) {
-		this.logger.error(`getTheUserWhoIsLiveStreaming() 第${attempts}次失败: ${error.message}`);
-	}
-})], BiliAPI.prototype, "getTheUserWhoIsLiveStreaming", null);
-_decorate([Retry({
-	attempts: 3,
-	onFailure(error, attempts) {
-		this.logger.error(`getLiveRoomInfoStreamKey() 第${attempts}次失败: ${error.message}`);
-	}
-})], BiliAPI.prototype, "getLiveRoomInfoStreamKey", null);
-_decorate([Retry({
-	attempts: 3,
-	onFailure(error, attempts) {
-		this.logger.error(`getLiveRoomInfoByUids() 第${attempts}次失败: ${error.message}`);
-	}
-})], BiliAPI.prototype, "getLiveRoomInfoByUids", null);
-_decorate([Retry({
-	attempts: 3,
-	onFailure(error, attempts) {
-		this.logger.error(`getServerUTCTime() 第${attempts}次失败: ${error.message}`);
-	}
-})], BiliAPI.prototype, "getServerUTCTime", null);
-_decorate([Retry({
-	attempts: 3,
-	onFailure(error, attempts) {
-		this.logger.error(`getTimeNow() 第${attempts}次失败: ${error.message}`);
-	}
-})], BiliAPI.prototype, "getTimeNow", null);
-_decorate([Retry({
-	attempts: 3,
-	onFailure(error, attempts) {
-		this.logger.error(`getAllGroup() 第${attempts}次失败: ${error.message}`);
-	}
-})], BiliAPI.prototype, "getAllGroup", null);
-_decorate([Retry({
-	attempts: 3,
-	onFailure(error, attempts) {
-		this.logger.error(`removeUserFromGroup() 第${attempts}次失败: ${error.message}`);
-	}
-})], BiliAPI.prototype, "removeUserFromGroup", null);
-_decorate([Retry({
-	attempts: 3,
-	onFailure(error, attempts) {
-		this.logger.error(`copyUserToGroup() 第${attempts}次失败: ${error.message}`);
-	}
-})], BiliAPI.prototype, "copyUserToGroup", null);
-_decorate([Retry({
-	attempts: 3,
-	onFailure(error, attempts) {
-		this.logger.error(`getUserSpaceDynamic() 第${attempts}次失败: ${error.message}`);
-	}
-})], BiliAPI.prototype, "getUserSpaceDynamic", null);
-_decorate([Retry({
-	attempts: 3,
-	onFailure(error, attempts) {
-		this.logger.error(`createGroup() 第${attempts}次失败: ${error.message}`);
-	}
-})], BiliAPI.prototype, "createGroup", null);
-_decorate([Retry({
-	attempts: 3,
-	onFailure(error, attempts) {
-		this.logger.error(`getAllDynamic() 第${attempts}次失败: ${error.message}`);
-	}
-})], BiliAPI.prototype, "getAllDynamic", null);
-_decorate([Retry({
-	attempts: 3,
-	onFailure(error, attempts) {
-		this.logger.error(`hasNewDynamic() 第${attempts}次失败: ${error.message}`);
-	}
-})], BiliAPI.prototype, "hasNewDynamic", null);
-_decorate([Retry({
-	attempts: 3,
-	onFailure(error, attempts) {
-		this.logger.error(`follow() 第${attempts}次失败: ${error.message}`);
-	}
-})], BiliAPI.prototype, "follow", null);
-_decorate([Retry({
-	attempts: 3,
-	onFailure(error, attempts) {
-		this.logger.error(`getRelationGroupDetail() 第${attempts}次失败: ${error.message}`);
-	}
-})], BiliAPI.prototype, "getRelationGroupDetail", null);
-_decorate([Retry({
-	attempts: 3,
-	onFailure(error, attempts) {
-		this.logger.error(`getCookieInfo() 第${attempts}次失败: ${error.message}`);
-	}
-})], BiliAPI.prototype, "getCookieInfo", null);
-_decorate([Retry({
-	attempts: 3,
-	onFailure(error, attempts) {
-		this.logger.error(`getUserInfo() 第${attempts}次失败: ${error.message}`);
-	}
-})], BiliAPI.prototype, "getUserInfo", null);
-_decorate([Retry({
-	attempts: 3,
-	onFailure(error, attempts) {
-		this.logger.error(`getWbiKeys() 第${attempts}次失败: ${error.message}`);
-	}
-})], BiliAPI.prototype, "getWbiKeys", null);
-_decorate([Retry({
-	attempts: 3,
-	onFailure(error, attempts) {
-		this.logger.error(`getMyselfInfo() 第${attempts}次失败: ${error.message}`);
-	}
-})], BiliAPI.prototype, "getMyselfInfo", null);
-_decorate([Retry({
-	attempts: 3,
-	onFailure(error, attempts) {
-		this.logger.error(`getLoginQRCode() 第${attempts}次失败: ${error.message}`);
-	}
-})], BiliAPI.prototype, "getLoginQRCode", null);
-_decorate([Retry({
-	attempts: 3,
-	onFailure(error, attempts) {
-		this.logger.error(`getLoginStatus() 第${attempts}次失败: ${error.message}`);
-	}
-})], BiliAPI.prototype, "getLoginStatus", null);
-_decorate([Retry({
-	attempts: 3,
-	onFailure(error, attempts) {
-		this.logger.error(`getLiveRoomInfo() 第${attempts}次失败: ${error.message}`);
-	}
-})], BiliAPI.prototype, "getLiveRoomInfo", null);
-_decorate([Retry({
-	attempts: 3,
-	onFailure(error, attempts) {
-		this.logger.error(`getMasterInfo() 第${attempts}次失败: ${error.message}`);
-	}
-})], BiliAPI.prototype, "getMasterInfo", null);
 (function(_BiliAPI) {
 	const Config$1 = _BiliAPI.Config = Schema.object({
 		userAgent: Schema.string(),

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-bilibili-notify",
   "description": "Koishi bilibili notify plugin",
-  "version": "3.2.11-alpha.8",
+  "version": "3.3.0-rc.0",
   "main": "./lib/index.js",
   "typings": "lib/index.d.ts",
   "files": [
@@ -30,14 +30,14 @@
   "dependencies": {
     "@akokko/blive-message-listener": "^0.5.1",
     "@node-rs/jieba": "^2.0.1",
-    "@oxc-project/runtime": "^0.76.0",
     "axios": "^1.10.0",
-    "axios-cookiejar-support": "^6.0.2",
+    "axios-cookiejar-support": "^6.0.3",
     "cacheable-lookup": "^7.0.0",
     "cron": "^4.3.1",
     "jsdom": "^26.1.0",
-    "luxon": "^3.6.1",
+    "luxon": "^3.7.1",
     "md5": "^2.3.0",
+    "p-retry": "^6.2.1",
     "qrcode": "^1.5.4",
     "tough-cookie": "^5.1.2"
   },

package/readme.md

@@ -318,6 +318,13 @@ uid为必填参数，为要推送的UP主的UID，index为可选参数，为要
 > - ver 3.2.11-alpha.6 测试版本
 > - ver 3.2.11-alpha.7 测试版本
 > - ver 3.2.11-alpha.8 测试版本
+> - ver 3.2.11-alpha.9 测试版本
+> - ver 3.2.11-alpha.10 测试版本
+> - ver 3.2.11-alpha.11 测试版本
+> - ver 3.2.11-alpha.12 测试版本
+
+> [!NOTE]
+> - ver 3.3.0-rc.0 优化：将当前版本的订阅配置移到了新插件：`bilibili-notify-advanced-subscription` ，简化当前版本订阅配置； 新增：配置项 `advancedSub` ，开启后可通过下载插件 `bilibili-notify-advanced-subscription` 配置更自定义化的订阅配置、新增动态@全体成员功能
 
 ## 交流群