koishi-plugin-bilibili-notify 3.2.5-alpha.9 → 3.2.6-alpha.0

package/lib/index.d.mts

@@ -45,6 +45,7 @@ interface Config {
   }>;
   dynamic: {};
   dynamicUrl: boolean;
+  dynamicCron: string;
   dynamicVideoUrlToBV: boolean;
   pushImgsInDynamic: boolean;
   live: {};

package/lib/index.d.ts

@@ -45,6 +45,7 @@ interface Config {
   }>;
   dynamic: {};
   dynamicUrl: boolean;
+  dynamicCron: string;
   dynamicVideoUrlToBV: boolean;
   pushImgsInDynamic: boolean;
   live: {};

package/lib/index.js

@@ -443,7 +443,7 @@ var require_lib$3 = __commonJS$1({ "node_modules/@koishijs/plugin-help/lib/index
 //#endregion
 //#region src/utils/index.ts
 function Retry(options = { attempts: 3 }) {
-	return (target, propertyKey, descriptor) => {
+	return (_target, _propertyKey, descriptor) => {
 		const originalMethod = descriptor.value;
 		descriptor.value = async function(...args) {
 			let lastError;
@@ -552,7 +552,7 @@ var ComRegister = class {
 	subManager = [];
 	dynamicTimelineManager = /* @__PURE__ */ new Map();
 	liveStatusManager = /* @__PURE__ */ new Map();
-	pushRecord = {};
+	pushArrMap = /* @__PURE__ */ new Map();
 	loginDBData;
 	privateBot;
 	dynamicJob;
@@ -588,7 +588,7 @@ var ComRegister = class {
 			let content;
 			try {
 				content = await ctx.ba.getLoginQRCode();
-			} catch (e$1) {
+			} catch (_$2) {
 				return "bili login getLoginQRCode() 本次网络请求失败";
 			}
 			if (content.code !== 0) return await session.send("出问题咯，请联系管理员解决");
@@ -797,7 +797,6 @@ var ComRegister = class {
 		});
 	}
 	initPushRecord(subs) {
-		const pushRecord = {};
 		for (const sub of subs) {
 			const atAllArr = [];
 			const dynamicArr = [];
@@ -809,16 +808,15 @@ var ComRegister = class {
 				if (channel.live) liveArr.push(`${platform.platform}:${channel.channelId}`);
 				if (channel.liveGuardBuy) liveGuardBuyArr.push(`${platform.platform}:${channel.channelId}`);
 			}
-			pushRecord[sub.uid] = {
+			this.pushArrMap.set(sub.uid, {
 				atAllArr,
 				dynamicArr,
 				liveArr,
 				liveGuardBuyArr
-			};
+			});
 		}
-		this.pushRecord = pushRecord;
 		this.logger.info("初始化推送群组/频道信息：");
-		this.logger.info(this.pushRecord);
+		this.logger.info(this.pushArrMap);
 	}
 	checkAllBotsAreReady() {
 		return !this.ctx.bots.some((bot) => bot.status !== koishi.Universal.Status.ONLINE);
@@ -832,33 +830,37 @@ var ComRegister = class {
 			return;
 		}
 		this.logger.info(`本次推送对象：${uid}，推送类型：${PushTypeMsg[type]}`);
-		const record = this.pushRecord[uid];
+		const record = this.pushArrMap.get(uid);
 		this.logger.info("本次推送目标：");
 		if (type === PushType.StartBroadcasting && record.atAllArr?.length >= 1) {
 			this.logger.info(record.atAllArr);
+			const atAllArr = structuredClone(record.atAllArr);
 			const success = await withRetry(async () => {
-				return await this.ctx.broadcast(record.atAllArr, /* @__PURE__ */ (0, __satorijs_element_jsx_runtime.jsxs)("message", { children: [/* @__PURE__ */ (0, __satorijs_element_jsx_runtime.jsx)("at", { type: "all" }), /* @__PURE__ */ (0, __satorijs_element_jsx_runtime.jsx)("message", { children: content })] }));
+				return await this.ctx.broadcast(atAllArr, /* @__PURE__ */ (0, __satorijs_element_jsx_runtime.jsx)("message", { children: /* @__PURE__ */ (0, __satorijs_element_jsx_runtime.jsx)("at", { type: "all" }) }));
 			}, 1);
 			this.logger.info(`成功推送全体成员消息群组/频道：${success}`);
 		}
 		if (type === PushType.Dynamic && record.dynamicArr?.length >= 1) {
 			this.logger.info(record.dynamicArr);
+			const dynamicArr = structuredClone(record.dynamicArr);
 			const success = await withRetry(async () => {
-				return await this.ctx.broadcast(record.dynamicArr, /* @__PURE__ */ (0, __satorijs_element_jsx_runtime.jsx)("message", { children: content }));
+				return await this.ctx.broadcast(dynamicArr, /* @__PURE__ */ (0, __satorijs_element_jsx_runtime.jsx)("message", { children: content }));
 			}, 1);
 			this.logger.info(`成功推送动态消息群组/频道：${success}`);
 		}
 		if ((type === PushType.Live || type === PushType.StartBroadcasting) && record.liveArr?.length >= 1) {
 			this.logger.info(record.liveArr);
+			const liveArr = structuredClone(record.liveArr);
 			const success = await withRetry(async () => {
-				return await this.ctx.broadcast(record.liveArr, /* @__PURE__ */ (0, __satorijs_element_jsx_runtime.jsx)("message", { children: content }));
+				return await this.ctx.broadcast(liveArr, /* @__PURE__ */ (0, __satorijs_element_jsx_runtime.jsx)("message", { children: content }));
 			}, 1);
 			this.logger.info(`成功推送直播消息群组/频道：${success}`);
 		}
 		if (type === PushType.LiveGuardBuy && record.liveGuardBuyArr?.length >= 1) {
 			this.logger.info(record.liveGuardBuyArr);
+			const liveGuardBuyArr = structuredClone(record.liveGuardBuyArr);
 			const success = await withRetry(async () => {
-				return await this.ctx.broadcast(record.liveGuardBuyArr, /* @__PURE__ */ (0, __satorijs_element_jsx_runtime.jsx)("message", { children: content }));
+				return await this.ctx.broadcast(liveGuardBuyArr, /* @__PURE__ */ (0, __satorijs_element_jsx_runtime.jsx)("message", { children: content }));
 			}, 1);
 			this.logger.info(`成功推送上舰消息群组/频道：${success}`);
 		}
@@ -912,15 +914,15 @@ var ComRegister = class {
 						}, 1).catch(async (e$1) => {
 							if (e$1.message === "直播开播动态，不做处理") return;
 							if (e$1.message === "出现关键词，屏蔽该动态") {
-								if (this.config.filter.notify) await this.broadcastToTargets(sub.uid, `${name$3}发布了一条含有屏蔽关键字的动态`, PushType.Dynamic);
+								if (this.config.filter.notify) await this.broadcastToTargets(sub.uid, /* @__PURE__ */ (0, __satorijs_element_jsx_runtime.jsxs)("message", { children: [name$3, "发布了一条含有屏蔽关键字的动态"] }), PushType.Dynamic);
 								return;
 							}
 							if (e$1.message === "已屏蔽转发动态") {
-								if (this.config.filter.notify) await this.broadcastToTargets(sub.uid, `${name$3}转发了一条动态，已屏蔽`, PushType.Dynamic);
+								if (this.config.filter.notify) await this.broadcastToTargets(sub.uid, /* @__PURE__ */ (0, __satorijs_element_jsx_runtime.jsxs)("message", { children: [name$3, "转发了一条动态，已屏蔽"] }), PushType.Dynamic);
 								return;
 							}
 							if (e$1.message === "已屏蔽专栏动态") {
-								if (this.config.filter.notify) await this.broadcastToTargets(sub.uid, `${name$3}投稿了一条专栏，已屏蔽`, PushType.Dynamic);
+								if (this.config.filter.notify) await this.broadcastToTargets(sub.uid, /* @__PURE__ */ (0, __satorijs_element_jsx_runtime.jsxs)("message", { children: [name$3, "投稿了一条专栏，已屏蔽"] }), PushType.Dynamic);
 								return;
 							}
 							this.logger.error(`dynamicDetect generateDynamicImg() 推送卡片发送失败，原因：${e$1.message}`);
@@ -934,7 +936,7 @@ var ComRegister = class {
 						} else dUrl = `${name$3}发布了新视频：https:${item.modules.module_dynamic.major.archive.jump_url}`;
 						else dUrl = `${name$3}发布了一条动态：https://t.bilibili.com/${item.id_str}`;
 						this.logger.info("推送动态中...");
-						await this.broadcastToTargets(sub.uid, /* @__PURE__ */ (0, __satorijs_element_jsx_runtime.jsxs)(__satorijs_element_jsx_runtime.Fragment, { children: [koishi.h.image(buffer, "image/jpeg"), dUrl] }), PushType.Dynamic);
+						await this.broadcastToTargets(sub.uid, /* @__PURE__ */ (0, __satorijs_element_jsx_runtime.jsxs)("message", { children: [koishi.h.image(buffer, "image/jpeg"), dUrl] }), PushType.Dynamic);
 						if (this.config.pushImgsInDynamic) {
 							if (item.type === "DYNAMIC_TYPE_DRAW") {
 								const pics = item.modules?.module_dynamic?.major?.opus?.pics;
@@ -1017,15 +1019,15 @@ var ComRegister = class {
 						}, 1).catch(async (e$1) => {
 							if (e$1.message === "直播开播动态，不做处理") return;
 							if (e$1.message === "出现关键词，屏蔽该动态") {
-								if (this.config.filter.notify) await this.broadcastToTargets(sub.uid, `${name$3}发布了一条含有屏蔽关键字的动态`, PushType.Dynamic);
+								if (this.config.filter.notify) await this.broadcastToTargets(sub.uid, /* @__PURE__ */ (0, __satorijs_element_jsx_runtime.jsxs)("message", { children: [name$3, "发布了一条含有屏蔽关键字的动态"] }), PushType.Dynamic);
 								return;
 							}
 							if (e$1.message === "已屏蔽转发动态") {
-								if (this.config.filter.notify) await this.broadcastToTargets(sub.uid, `${name$3}转发了一条动态，已屏蔽`, PushType.Dynamic);
+								if (this.config.filter.notify) await this.broadcastToTargets(sub.uid, /* @__PURE__ */ (0, __satorijs_element_jsx_runtime.jsxs)("message", { children: [name$3, "转发了一条动态，已屏蔽"] }), PushType.Dynamic);
 								return;
 							}
 							if (e$1.message === "已屏蔽专栏动态") {
-								if (this.config.filter.notify) await this.broadcastToTargets(sub.uid, `${name$3}投稿了一条专栏，已屏蔽`, PushType.Dynamic);
+								if (this.config.filter.notify) await this.broadcastToTargets(sub.uid, /* @__PURE__ */ (0, __satorijs_element_jsx_runtime.jsxs)("message", { children: [name$3, "投稿了一条专栏，已屏蔽"] }), PushType.Dynamic);
 								return;
 							}
 							this.logger.error(`dynamicDetect generateDynamicImg() 推送卡片发送失败，原因：${e$1.message}`);
@@ -1044,7 +1046,7 @@ var ComRegister = class {
 							this.logger.info("动态链接生成成功！");
 						}
 						this.logger.info("推送动态中...");
-						await this.broadcastToTargets(sub.uid, /* @__PURE__ */ (0, __satorijs_element_jsx_runtime.jsxs)(__satorijs_element_jsx_runtime.Fragment, { children: [koishi.h.image(buffer, "image/jpeg"), dUrl] }), PushType.Dynamic);
+						await this.broadcastToTargets(sub.uid, /* @__PURE__ */ (0, __satorijs_element_jsx_runtime.jsxs)("message", { children: [koishi.h.image(buffer, "image/jpeg"), dUrl] }), PushType.Dynamic);
 						if (this.config.pushImgsInDynamic) {
 							this.logger.info("需要发送动态中的图片，开始发送...");
 							if (item.type === "DYNAMIC_TYPE_DRAW") {
@@ -1116,7 +1118,7 @@ var ComRegister = class {
 			this.logger.error(`liveDetect generateLiveImg() 推送卡片生成失败，原因：${e$1.message}`);
 		});
 		if (!buffer) return await this.sendPrivateMsgAndStopService();
-		const msg = /* @__PURE__ */ (0, __satorijs_element_jsx_runtime.jsxs)(__satorijs_element_jsx_runtime.Fragment, { children: [koishi.h.image(buffer, "image/jpeg"), liveNotifyMsg || ""] });
+		const msg = /* @__PURE__ */ (0, __satorijs_element_jsx_runtime.jsxs)("message", { children: [koishi.h.image(buffer, "image/jpeg"), liveNotifyMsg || ""] });
 		return await this.broadcastToTargets(uid, msg, liveType === LiveType.StartBroadcasting ? PushType.StartBroadcasting : PushType.Live);
 	}
 	async liveDetectWithListener(roomId, uid, cardStyle) {
@@ -1181,7 +1183,15 @@ var ComRegister = class {
 				watchedNum = body.text_small;
 			},
 			onGuardBuy: ({ body }) => {
-				const content = `[${masterInfo.username}的直播间]「${body.user.uname}」加入了大航海（${body.gift_name}）`;
+				const content = /* @__PURE__ */ (0, __satorijs_element_jsx_runtime.jsxs)("message", { children: [
+					"【",
+					masterInfo.username,
+					"的直播间】",
+					body.user.uname,
+					"加入了大航海（",
+					body.gift_name,
+					"）"
+				] });
 				this.broadcastToTargets(uid, content, PushType.LiveGuardBuy);
 			},
 			onLiveStart: async () => {
@@ -1469,37 +1479,37 @@ var ComRegister = class {
 					msg: "账号被封停，无法进行订阅操作"
 				};
 			},
-			[22002]: () => {
+			22002: () => {
 				return {
 					code: subUserData.code,
 					msg: "因对方隐私设置，无法进行订阅操作"
 				};
 			},
-			[22003]: () => {
+			22003: () => {
 				return {
 					code: subUserData.code,
 					msg: "你已将对方拉黑，无法进行订阅操作"
 				};
 			},
-			[22013]: () => {
+			22013: () => {
 				return {
 					code: subUserData.code,
 					msg: "账号已注销，无法进行订阅操作"
 				};
 			},
-			[40061]: () => {
+			40061: () => {
 				return {
 					code: subUserData.code,
 					msg: "账号不存在，请检查uid输入是否正确或用户是否存在"
 				};
 			},
-			[22001]: () => {
+			22001: () => {
 				return {
 					code: 0,
 					msg: "订阅对象为自己，无需添加到分组"
 				};
 			},
-			[22014]: async () => {
+			22014: async () => {
 				const copyUserToGroupData = await this.ctx.ba.copyUserToGroup(mid, this.loginDBData.dynamic_group_id);
 				if (copyUserToGroupData.code !== 0) return {
 					code: copyUserToGroupData.code,
@@ -1510,7 +1520,7 @@ var ComRegister = class {
 					msg: "订阅对象添加成功"
 				};
 			},
-			[0]: async () => {
+			0: async () => {
 				const copyUserToGroupData = await this.ctx.ba.copyUserToGroup(mid, this.loginDBData.dynamic_group_id);
 				if (copyUserToGroupData.code !== 0) return {
 					code: copyUserToGroupData.code,
@@ -1584,7 +1594,7 @@ var ComRegister = class {
 		}
 	}
 	enableDynamicDetect() {
-		this.dynamicJob = new cron.CronJob("*/2 * * * *", this.config.dynamicDebugMode ? this.debug_dynamicDetect() : this.dynamicDetect());
+		this.dynamicJob = new cron.CronJob(this.config.dynamicCron, this.config.dynamicDebugMode ? this.debug_dynamicDetect() : this.dynamicDetect());
 		this.logger.info("动态监测已开启");
 		this.dynamicJob.start();
 	}
@@ -1640,6 +1650,7 @@ var ComRegister = class {
 		customLive: koishi.Schema.string(),
 		customLiveEnd: koishi.Schema.string().required(),
 		dynamicUrl: koishi.Schema.boolean().required(),
+		dynamicCron: koishi.Schema.string().required(),
 		dynamicVideoUrlToBV: koishi.Schema.boolean().required(),
 		filter: koishi.Schema.object({
 			enable: koishi.Schema.boolean(),
@@ -58056,7 +58067,7 @@ var require_helpers$1 = __commonJS$1({ "node_modules/socks/build/common/helpers.
 	}
 	function ipv4ToInt32(ip) {
 		const address = new ip_address_1$1.Address4(ip);
-		return address.toArray().reduce((acc, part) => (acc << 8) + part, 0);
+		return address.toArray().reduce((acc, part) => (acc << 8) + part, 0) >>> 0;
 	}
 	exports.ipv4ToInt32 = ipv4ToInt32;
 	function int32ToIpv4(int32) {
@@ -80276,6 +80287,7 @@ var require_once = __commonJS$1({ "node_modules/once/once.js"(exports, module) {
 var require_end_of_stream = __commonJS$1({ "node_modules/end-of-stream/index.js"(exports, module) {
 	var once$1 = require_once();
 	var noop$5 = function() {};
+	var qnt = global.Bare ? queueMicrotask : process.nextTick.bind(process);
 	var isRequest$1 = function(stream$3) {
 		return stream$3.setHeader && typeof stream$3.abort === "function";
 	};
@@ -80309,7 +80321,7 @@ var require_end_of_stream = __commonJS$1({ "node_modules/end-of-stream/index.js"
 			callback.call(stream$3, err);
 		};
 		var onclose = function() {
-			process.nextTick(onclosenexttick);
+			qnt(onclosenexttick);
 		};
 		var onclosenexttick = function() {
 			if (cancelled) return;
@@ -80361,7 +80373,7 @@ var require_pump = __commonJS$1({ "node_modules/pump/index.js"(exports, module)
 		fs$7 = require("fs");
 	} catch (e$1) {}
 	var noop$4 = function() {};
-	var ancient = /^v?\.0/.test(process.version);
+	var ancient = typeof process === "undefined" ? false : /^v?\.0/.test(process.version);
 	var isFn = function(fn) {
 		return typeof fn === "function";
 	};
@@ -83943,7 +83955,7 @@ var require_tar_fs = __commonJS$1({ "node_modules/tar-fs/index.js"(exports) {
 	const pump = require_pump();
 	const fs$3 = require("fs");
 	const path$4 = require("path");
-	const win32$1 = (global.Bare?.platform || process.platform) === "win32";
+	const win32$1 = (global.Bare ? global.Bare.platform : process.platform) === "win32";
 	exports.pack = function pack(cwd, opts) {
 		if (!cwd) cwd = ".";
 		if (!opts) opts = {};
@@ -84029,10 +84041,10 @@ var require_tar_fs = __commonJS$1({ "node_modules/tar-fs/index.js"(exports) {
 		return list.length ? list[list.length - 1] : null;
 	}
 	function processGetuid() {
-		return process.getuid ? process.getuid() : -1;
+		return !global.Bare && process.getuid ? process.getuid() : -1;
 	}
 	function processUmask() {
-		return process.umask ? process.umask() : 0;
+		return !global.Bare && process.umask ? process.umask() : 0;
 	}
 	exports.extract = function extract(cwd, opts) {
 		if (!cwd) cwd = ".";
@@ -94636,7 +94648,7 @@ var BiliAPI = class extends koishi.Service {
 				cookies,
 				refresh_token: decryptedRefreshToken
 			};
-		} catch (e$1) {
+		} catch (_$2) {
 			this.loginNotifier = this.ctx.notifier.create({
 				type: "warning",
 				content: "数据库被篡改，请重新登录"
@@ -94725,7 +94737,7 @@ var BiliAPI = class extends koishi.Service {
 		try {
 			const { data: data$1 } = await this.getCookieInfo(refreshToken);
 			if (!data$1.refresh) return;
-		} catch (e$1) {
+		} catch (_$2) {
 			if (times$1 >= 1) this.ctx.setTimeout(() => {
 				this.checkIfTokenNeedRefresh(refreshToken, csrf, times$1 - 1);
 			}, 3e3);
@@ -95031,6 +95043,7 @@ var ServerManager = class extends koishi.Service {
 				customLive: globalConfig.customLive,
 				customLiveEnd: globalConfig.customLiveEnd,
 				dynamicUrl: globalConfig.dynamicUrl,
+				dynamicCron: globalConfig.dynamicCron,
 				dynamicVideoUrlToBV: globalConfig.dynamicVideoUrlToBV,
 				filter: globalConfig.filter,
 				dynamicDebugMode: globalConfig.dynamicDebugMode
@@ -95128,6 +95141,7 @@ const Config = koishi.Schema.object({
 	}).collapse()).collapse().description("输入订阅信息，自定义订阅内容； uid: 订阅用户UID，dynamic: 是否需要订阅动态，live: 是否需要订阅直播"),
 	dynamic: koishi.Schema.object({}).description("动态推送设置"),
 	dynamicUrl: koishi.Schema.boolean().default(false).description("发送动态时是否同时发送链接。注意：如果使用的是QQ官方机器人不能开启此项！"),
+	dynamicCron: koishi.Schema.string().default("*/2 * * * *").description("动态监测时间，请填入cron表达式，请勿填入过短时间"),
 	dynamicVideoUrlToBV: koishi.Schema.boolean().default(false).description("如果推送的动态是视频动态，且开启了发送链接选项，开启此选项则会将链接转换为BV号以便其他用途"),
 	pushImgsInDynamic: koishi.Schema.boolean().default(false).description("是否推送动态中的图片，默认不开启。开启后会单独推送动态中的图片，该功能容易导致QQ风控"),
 	live: koishi.Schema.object({}).description("直播推送设置"),