koishi-plugin-bilibili-notify 3.2.11-alpha.10 → 3.2.11-alpha.12

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 p_retry = __toESM(require("p-retry"));
 const __akokko_blive_message_listener = __toESM(require("@akokko/blive-message-listener"));
 
 //#region src/config.ts
@@ -3316,11 +3315,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);
@@ -3389,7 +3392,7 @@ var BiliAPI = class extends koishi.Service {
 			const { data } = await this.client.get(GET_LATEST_UPDATED_UPS);
 			return data;
 		};
-		return await (0, p_retry.default)(run, {
+		return await this.pRetry(run, {
 			onFailedAttempt: (error) => {
 				this.logger.error(`getTheUserWhoIsLiveStreaming() 第${error.attemptNumber}次失败: ${error.message}`);
 			},
@@ -3401,7 +3404,7 @@ var BiliAPI = class extends koishi.Service {
 			const { data } = await this.client.get(`${GET_LIVE_ROOM_INFO_STREAM_KEY}?id=${roomId}`);
 			return data;
 		};
-		return await (0, p_retry.default)(run, {
+		return await this.pRetry(run, {
 			onFailedAttempt: (error) => {
 				this.logger.error(`getLiveRoomInfoStreamKey() 第${error.attemptNumber}次失败: ${error.message}`);
 			},
@@ -3414,7 +3417,7 @@ var BiliAPI = class extends koishi.Service {
 			const { data } = await this.client.get(`${GET_LIVE_ROOMS_INFO}?${params}`);
 			return data;
 		};
-		return await (0, p_retry.default)(run, {
+		return await this.pRetry(run, {
 			onFailedAttempt: (error) => {
 				this.logger.error(`getLiveRoomInfoByUids() 第${error.attemptNumber}次失败: ${error.message}`);
 			},
@@ -3430,9 +3433,9 @@ var BiliAPI = class extends koishi.Service {
 				const timestamp = new Function(`return Date.UTC(${match[1]})`)();
 				return timestamp / 1e3;
 			}
-			throw new p_retry.AbortError("解析服务器时间失败！");
+			throw new this.AbortError("解析服务器时间失败！");
 		};
-		return await (0, p_retry.default)(run, {
+		return await this.pRetry(run, {
 			onFailedAttempt: (error) => {
 				this.logger.error(`getServerUTCTime() 第${error.attemptNumber}次失败: ${error.message}`);
 			},
@@ -3444,7 +3447,7 @@ var BiliAPI = class extends koishi.Service {
 			const { data } = await this.client.get(GET_TIME_NOW);
 			return data;
 		};
-		return await (0, p_retry.default)(run, {
+		return await this.pRetry(run, {
 			onFailedAttempt: (error) => {
 				this.logger.error(`getTimeNow() 第${error.attemptNumber}次失败: ${error.message}`);
 			},
@@ -3456,7 +3459,7 @@ var BiliAPI = class extends koishi.Service {
 			const { data } = await this.client.get(GET_ALL_GROUP);
 			return data;
 		};
-		return await (0, p_retry.default)(run, {
+		return await this.pRetry(run, {
 			onFailedAttempt: (error) => {
 				this.logger.error(`getAllGroup() 第${error.attemptNumber}次失败: ${error.message}`);
 			},
@@ -3473,7 +3476,7 @@ var BiliAPI = class extends koishi.Service {
 			}, { headers: { "Content-Type": "application/x-www-form-urlencoded" } });
 			return data;
 		};
-		return await (0, p_retry.default)(run, {
+		return await this.pRetry(run, {
 			onFailedAttempt: (error) => {
 				this.logger.error(`removeUserFromGroup() 第${error.attemptNumber}次失败: ${error.message}`);
 			},
@@ -3490,7 +3493,7 @@ var BiliAPI = class extends koishi.Service {
 			}, { headers: { "Content-Type": "application/x-www-form-urlencoded" } });
 			return data;
 		};
-		return await (0, p_retry.default)(run, {
+		return await this.pRetry(run, {
 			onFailedAttempt: (error) => {
 				this.logger.error(`copyUserToGroup() 第${error.attemptNumber}次失败: ${error.message}`);
 			},
@@ -3502,7 +3505,7 @@ var BiliAPI = class extends koishi.Service {
 			const { data } = await this.client.get(`${GET_USER_SPACE_DYNAMIC_LIST}&host_mid=${mid}`);
 			return data;
 		};
-		return await (0, p_retry.default)(run, {
+		return await this.pRetry(run, {
 			onFailedAttempt: (error) => {
 				this.logger.error(`getUserSpaceDynamic() 第${error.attemptNumber}次失败: ${error.message}`);
 			},
@@ -3517,7 +3520,7 @@ var BiliAPI = class extends koishi.Service {
 			}, { headers: { "Content-Type": "application/x-www-form-urlencoded" } });
 			return data;
 		};
-		return await (0, p_retry.default)(run, {
+		return await this.pRetry(run, {
 			onFailedAttempt: (error) => {
 				this.logger.error(`createGroup() 第${error.attemptNumber}次失败: ${error.message}`);
 			},
@@ -3529,7 +3532,7 @@ var BiliAPI = class extends koishi.Service {
 			const { data } = await this.client.get(GET_ALL_DYNAMIC_LIST);
 			return data;
 		};
-		return await (0, p_retry.default)(run, {
+		return await this.pRetry(run, {
 			onFailedAttempt: (error) => {
 				this.logger.error(`getAllDynamic() 第${error.attemptNumber}次失败: ${error.message}`);
 			},
@@ -3541,7 +3544,7 @@ var BiliAPI = class extends koishi.Service {
 			const { data } = await this.client.get(`${HAS_NEW_DYNAMIC}?update_baseline=${updateBaseline}`);
 			return data;
 		};
-		return await (0, p_retry.default)(run, {
+		return await this.pRetry(run, {
 			onFailedAttempt: (error) => {
 				this.logger.error(`hasNewDynamic() 第${error.attemptNumber}次失败: ${error.message}`);
 			},
@@ -3558,7 +3561,7 @@ var BiliAPI = class extends koishi.Service {
 			}, { headers: { "Content-Type": "application/x-www-form-urlencoded" } });
 			return data;
 		};
-		return await (0, p_retry.default)(run, {
+		return await this.pRetry(run, {
 			onFailedAttempt: (error) => {
 				this.logger.error(`follow() 第${error.attemptNumber}次失败: ${error.message}`);
 			},
@@ -3570,7 +3573,7 @@ var BiliAPI = class extends koishi.Service {
 			const { data } = await this.client.get(`${GET_RELATION_GROUP_DETAIL}?tagid=${tagid}`);
 			return data;
 		};
-		return await (0, p_retry.default)(run, {
+		return await this.pRetry(run, {
 			onFailedAttempt: (error) => {
 				this.logger.error(`getRelationGroupDetail() 第${error.attemptNumber}次失败: ${error.message}`);
 			},
@@ -3585,7 +3588,7 @@ var BiliAPI = class extends koishi.Service {
 			});
 			return data;
 		};
-		return await (0, p_retry.default)(run, {
+		return await this.pRetry(run, {
 			onFailedAttempt: (error) => {
 				this.logger.error(`getCookieInfo() 第${error.attemptNumber}次失败: ${error.message}`);
 			},
@@ -3602,7 +3605,7 @@ var BiliAPI = class extends koishi.Service {
 			const { data } = await this.client.get(`${GET_USER_INFO}?${wbi}`);
 			return data;
 		};
-		return await (0, p_retry.default)(run, {
+		return await this.pRetry(run, {
 			onFailedAttempt: (error) => {
 				this.logger.error(`getUserInfo() 第${error.attemptNumber}次失败: ${error.message}`);
 			},
@@ -3618,7 +3621,7 @@ var BiliAPI = class extends koishi.Service {
 				sub_key: sub_url.slice(sub_url.lastIndexOf("/") + 1, sub_url.lastIndexOf("."))
 			};
 		};
-		return await (0, p_retry.default)(run, {
+		return await this.pRetry(run, {
 			onFailedAttempt: (error) => {
 				this.logger.error(`getWbiKeys() 第${error.attemptNumber}次失败: ${error.message}`);
 			},
@@ -3630,7 +3633,7 @@ var BiliAPI = class extends koishi.Service {
 			const { data } = await this.client.get(GET_MYSELF_INFO);
 			return data;
 		};
-		return await (0, p_retry.default)(run, {
+		return await this.pRetry(run, {
 			onFailedAttempt: (error) => {
 				this.logger.error(`getMyselfInfo() 第${error.attemptNumber}次失败: ${error.message}`);
 			},
@@ -3642,7 +3645,7 @@ var BiliAPI = class extends koishi.Service {
 			const { data } = await this.client.get(GET_LOGIN_QRCODE);
 			return data;
 		};
-		return await (0, p_retry.default)(run, {
+		return await this.pRetry(run, {
 			onFailedAttempt: (error) => {
 				this.logger.error(`getLoginQRCode() 第${error.attemptNumber}次失败: ${error.message}`);
 			},
@@ -3654,7 +3657,7 @@ var BiliAPI = class extends koishi.Service {
 			const { data } = await this.client.get(`${GET_LOGIN_STATUS}?qrcode_key=${qrcodeKey}`);
 			return data;
 		};
-		return await (0, p_retry.default)(run, {
+		return await this.pRetry(run, {
 			onFailedAttempt: (error) => {
 				this.logger.error(`getLoginStatus() 第${error.attemptNumber}次失败: ${error.message}`);
 			},
@@ -3666,7 +3669,7 @@ var BiliAPI = class extends koishi.Service {
 			const { data } = await this.client.get(`${GET_LIVE_ROOM_INFO}?room_id=${roomId}`);
 			return data;
 		};
-		return await (0, p_retry.default)(run, {
+		return await this.pRetry(run, {
 			onFailedAttempt: (error) => {
 				this.logger.error(`getLiveRoomInfo() 第${error.attemptNumber}次失败: ${error.message}`);
 			},
@@ -3678,7 +3681,7 @@ var BiliAPI = class extends koishi.Service {
 			const { data } = await this.client.get(`${GET_MASTER_INFO}?uid=${mid}`);
 			return data;
 		};
-		return await (0, p_retry.default)(run, {
+		return await this.pRetry(run, {
 			onFailedAttempt: (error) => {
 				this.logger.error(`getMasterInfo() 第${error.attemptNumber}次失败: ${error.message}`);
 			},

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 pRetry, { AbortError } from "p-retry";
 import { startListen } from "@akokko/blive-message-listener";
 
 //#region rolldown:runtime
@@ -3297,11 +3296,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);
@@ -3370,7 +3373,7 @@ var BiliAPI = class extends Service {
 			const { data } = await this.client.get(GET_LATEST_UPDATED_UPS);
 			return data;
 		};
-		return await pRetry(run, {
+		return await this.pRetry(run, {
 			onFailedAttempt: (error) => {
 				this.logger.error(`getTheUserWhoIsLiveStreaming() 第${error.attemptNumber}次失败: ${error.message}`);
 			},
@@ -3382,7 +3385,7 @@ var BiliAPI = class extends Service {
 			const { data } = await this.client.get(`${GET_LIVE_ROOM_INFO_STREAM_KEY}?id=${roomId}`);
 			return data;
 		};
-		return await pRetry(run, {
+		return await this.pRetry(run, {
 			onFailedAttempt: (error) => {
 				this.logger.error(`getLiveRoomInfoStreamKey() 第${error.attemptNumber}次失败: ${error.message}`);
 			},
@@ -3395,7 +3398,7 @@ var BiliAPI = class extends Service {
 			const { data } = await this.client.get(`${GET_LIVE_ROOMS_INFO}?${params}`);
 			return data;
 		};
-		return await pRetry(run, {
+		return await this.pRetry(run, {
 			onFailedAttempt: (error) => {
 				this.logger.error(`getLiveRoomInfoByUids() 第${error.attemptNumber}次失败: ${error.message}`);
 			},
@@ -3411,9 +3414,9 @@ var BiliAPI = class extends Service {
 				const timestamp = new Function(`return Date.UTC(${match[1]})`)();
 				return timestamp / 1e3;
 			}
-			throw new AbortError("解析服务器时间失败！");
+			throw new this.AbortError("解析服务器时间失败！");
 		};
-		return await pRetry(run, {
+		return await this.pRetry(run, {
 			onFailedAttempt: (error) => {
 				this.logger.error(`getServerUTCTime() 第${error.attemptNumber}次失败: ${error.message}`);
 			},
@@ -3425,7 +3428,7 @@ var BiliAPI = class extends Service {
 			const { data } = await this.client.get(GET_TIME_NOW);
 			return data;
 		};
-		return await pRetry(run, {
+		return await this.pRetry(run, {
 			onFailedAttempt: (error) => {
 				this.logger.error(`getTimeNow() 第${error.attemptNumber}次失败: ${error.message}`);
 			},
@@ -3437,7 +3440,7 @@ var BiliAPI = class extends Service {
 			const { data } = await this.client.get(GET_ALL_GROUP);
 			return data;
 		};
-		return await pRetry(run, {
+		return await this.pRetry(run, {
 			onFailedAttempt: (error) => {
 				this.logger.error(`getAllGroup() 第${error.attemptNumber}次失败: ${error.message}`);
 			},
@@ -3454,7 +3457,7 @@ var BiliAPI = class extends Service {
 			}, { headers: { "Content-Type": "application/x-www-form-urlencoded" } });
 			return data;
 		};
-		return await pRetry(run, {
+		return await this.pRetry(run, {
 			onFailedAttempt: (error) => {
 				this.logger.error(`removeUserFromGroup() 第${error.attemptNumber}次失败: ${error.message}`);
 			},
@@ -3471,7 +3474,7 @@ var BiliAPI = class extends Service {
 			}, { headers: { "Content-Type": "application/x-www-form-urlencoded" } });
 			return data;
 		};
-		return await pRetry(run, {
+		return await this.pRetry(run, {
 			onFailedAttempt: (error) => {
 				this.logger.error(`copyUserToGroup() 第${error.attemptNumber}次失败: ${error.message}`);
 			},
@@ -3483,7 +3486,7 @@ var BiliAPI = class extends Service {
 			const { data } = await this.client.get(`${GET_USER_SPACE_DYNAMIC_LIST}&host_mid=${mid}`);
 			return data;
 		};
-		return await pRetry(run, {
+		return await this.pRetry(run, {
 			onFailedAttempt: (error) => {
 				this.logger.error(`getUserSpaceDynamic() 第${error.attemptNumber}次失败: ${error.message}`);
 			},
@@ -3498,7 +3501,7 @@ var BiliAPI = class extends Service {
 			}, { headers: { "Content-Type": "application/x-www-form-urlencoded" } });
 			return data;
 		};
-		return await pRetry(run, {
+		return await this.pRetry(run, {
 			onFailedAttempt: (error) => {
 				this.logger.error(`createGroup() 第${error.attemptNumber}次失败: ${error.message}`);
 			},
@@ -3510,7 +3513,7 @@ var BiliAPI = class extends Service {
 			const { data } = await this.client.get(GET_ALL_DYNAMIC_LIST);
 			return data;
 		};
-		return await pRetry(run, {
+		return await this.pRetry(run, {
 			onFailedAttempt: (error) => {
 				this.logger.error(`getAllDynamic() 第${error.attemptNumber}次失败: ${error.message}`);
 			},
@@ -3522,7 +3525,7 @@ var BiliAPI = class extends Service {
 			const { data } = await this.client.get(`${HAS_NEW_DYNAMIC}?update_baseline=${updateBaseline}`);
 			return data;
 		};
-		return await pRetry(run, {
+		return await this.pRetry(run, {
 			onFailedAttempt: (error) => {
 				this.logger.error(`hasNewDynamic() 第${error.attemptNumber}次失败: ${error.message}`);
 			},
@@ -3539,7 +3542,7 @@ var BiliAPI = class extends Service {
 			}, { headers: { "Content-Type": "application/x-www-form-urlencoded" } });
 			return data;
 		};
-		return await pRetry(run, {
+		return await this.pRetry(run, {
 			onFailedAttempt: (error) => {
 				this.logger.error(`follow() 第${error.attemptNumber}次失败: ${error.message}`);
 			},
@@ -3551,7 +3554,7 @@ var BiliAPI = class extends Service {
 			const { data } = await this.client.get(`${GET_RELATION_GROUP_DETAIL}?tagid=${tagid}`);
 			return data;
 		};
-		return await pRetry(run, {
+		return await this.pRetry(run, {
 			onFailedAttempt: (error) => {
 				this.logger.error(`getRelationGroupDetail() 第${error.attemptNumber}次失败: ${error.message}`);
 			},
@@ -3566,7 +3569,7 @@ var BiliAPI = class extends Service {
 			});
 			return data;
 		};
-		return await pRetry(run, {
+		return await this.pRetry(run, {
 			onFailedAttempt: (error) => {
 				this.logger.error(`getCookieInfo() 第${error.attemptNumber}次失败: ${error.message}`);
 			},
@@ -3583,7 +3586,7 @@ var BiliAPI = class extends Service {
 			const { data } = await this.client.get(`${GET_USER_INFO}?${wbi}`);
 			return data;
 		};
-		return await pRetry(run, {
+		return await this.pRetry(run, {
 			onFailedAttempt: (error) => {
 				this.logger.error(`getUserInfo() 第${error.attemptNumber}次失败: ${error.message}`);
 			},
@@ -3599,7 +3602,7 @@ var BiliAPI = class extends Service {
 				sub_key: sub_url.slice(sub_url.lastIndexOf("/") + 1, sub_url.lastIndexOf("."))
 			};
 		};
-		return await pRetry(run, {
+		return await this.pRetry(run, {
 			onFailedAttempt: (error) => {
 				this.logger.error(`getWbiKeys() 第${error.attemptNumber}次失败: ${error.message}`);
 			},
@@ -3611,7 +3614,7 @@ var BiliAPI = class extends Service {
 			const { data } = await this.client.get(GET_MYSELF_INFO);
 			return data;
 		};
-		return await pRetry(run, {
+		return await this.pRetry(run, {
 			onFailedAttempt: (error) => {
 				this.logger.error(`getMyselfInfo() 第${error.attemptNumber}次失败: ${error.message}`);
 			},
@@ -3623,7 +3626,7 @@ var BiliAPI = class extends Service {
 			const { data } = await this.client.get(GET_LOGIN_QRCODE);
 			return data;
 		};
-		return await pRetry(run, {
+		return await this.pRetry(run, {
 			onFailedAttempt: (error) => {
 				this.logger.error(`getLoginQRCode() 第${error.attemptNumber}次失败: ${error.message}`);
 			},
@@ -3635,7 +3638,7 @@ var BiliAPI = class extends Service {
 			const { data } = await this.client.get(`${GET_LOGIN_STATUS}?qrcode_key=${qrcodeKey}`);
 			return data;
 		};
-		return await pRetry(run, {
+		return await this.pRetry(run, {
 			onFailedAttempt: (error) => {
 				this.logger.error(`getLoginStatus() 第${error.attemptNumber}次失败: ${error.message}`);
 			},
@@ -3647,7 +3650,7 @@ var BiliAPI = class extends Service {
 			const { data } = await this.client.get(`${GET_LIVE_ROOM_INFO}?room_id=${roomId}`);
 			return data;
 		};
-		return await pRetry(run, {
+		return await this.pRetry(run, {
 			onFailedAttempt: (error) => {
 				this.logger.error(`getLiveRoomInfo() 第${error.attemptNumber}次失败: ${error.message}`);
 			},
@@ -3659,7 +3662,7 @@ var BiliAPI = class extends Service {
 			const { data } = await this.client.get(`${GET_MASTER_INFO}?uid=${mid}`);
 			return data;
 		};
-		return await pRetry(run, {
+		return await this.pRetry(run, {
 			onFailedAttempt: (error) => {
 				this.logger.error(`getMasterInfo() 第${error.attemptNumber}次失败: ${error.message}`);
 			},

package/package.json

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

package/readme.md

@@ -320,6 +320,8 @@ uid为必填参数，为要推送的UP主的UID，index为可选参数，为要
 > - 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 测试版本
 
 ## 交流群