koishi-plugin-bilibili-notify 3.3.4-alpha.2 → 3.3.4-alpha.4

package/lib/index.d.mts

@@ -61,7 +61,6 @@ type Channel = {
   liveGuardBuy: boolean;
   wordcloud: boolean;
   liveSummary: boolean;
-  bot: string;
 };
 type ChannelArr = Array<Channel>;
 type TargetItem = {

package/lib/index.d.ts

@@ -61,7 +61,6 @@ type Channel = {
   liveGuardBuy: boolean;
   wordcloud: boolean;
   liveSummary: boolean;
-  bot: string;
 };
 type ChannelArr = Array<Channel>;
 type TargetItem = {

package/lib/index.js

@@ -46,7 +46,7 @@ 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 __akokko_blive_message_listener = __toESM(require("@akokko/blive-message-listener"));
+const blive_message_listener = __toESM(require("blive-message-listener"));
 
 //#region src/config.ts
 const BAConfigSchema = koishi.Schema.object({
@@ -751,8 +751,7 @@ var ComRegister = class {
 				liveAtAll: s.liveAtAll,
 				liveGuardBuy: s.liveGuardBuy,
 				wordcloud: s.wordcloud,
-				liveSummary: s.liveSummary,
-				bot: null
+				liveSummary: s.liveSummary
 			}));
 			const target = [{
 				channelArr,
@@ -779,7 +778,7 @@ var ComRegister = class {
 	}
 	async sendPrivateMsg(content) {
 		if (this.config.master.enable) {
-			if (this.privateBot.status !== koishi.Universal.Status.ONLINE) {
+			if (this.privateBot?.status !== koishi.Universal.Status.ONLINE) {
 				this.logger.error(`${this.privateBot.platform} 机器人未初始化完毕，无法进行推送`);
 				return;
 			}
@@ -846,13 +845,16 @@ var ComRegister = class {
 			const liveSummaryArr = [];
 			for (const platform of sub.target) for (const channel of platform.channelArr) {
 				const target = `${platform.platform}:${channel.channelId}`;
-				if (channel.dynamic) dynamicArr.push(target);
-				if (channel.dynamicAtAll) dynamicAtAllArr.push(target);
-				if (channel.live) liveArr.push(target);
-				if (channel.liveAtAll) liveAtAllArr.push(target);
-				if (channel.liveGuardBuy) liveGuardBuyArr.push(target);
-				if (channel.wordcloud) wordcloudArr.push(target);
-				if (channel.liveSummary) liveSummaryArr.push(target);
+				const conditions = [
+					["dynamic", dynamicArr],
+					["dynamicAtAll", dynamicAtAllArr],
+					["live", liveArr],
+					["liveAtAll", liveAtAllArr],
+					["liveGuardBuy", liveGuardBuyArr],
+					["wordcloud", wordcloudArr],
+					["liveSummary", liveSummaryArr]
+				];
+				for (const [key, arr] of conditions) if (channel[key]) arr.push(target);
 			}
 			this.pushArrMap.set(sub.uid, {
 				dynamicArr,
@@ -877,24 +879,26 @@ var ComRegister = class {
 		for (const platform of Object.keys(t)) {
 			const bots = [];
 			for (const bot of this.ctx.bots) if (bot.platform === platform) bots.push(bot);
-			botloop: for (const bot of bots) {
-				if (bot.status !== koishi.Universal.Status.ONLINE) {
+			let num = 0;
+			const sendMessageByBot = async (channelId, botIndex = 0) => {
+				if (bots[botIndex].status !== koishi.Universal.Status.ONLINE) {
 					this.logger.error(`${platform} 机器人未初始化完毕，无法进行推送，${retry / 1e3}秒后重试`);
 					this.ctx.setTimeout(async () => {
 						await this.pushMessage(targets, content, retry * 2);
 					}, retry);
 					return;
 				}
-				let num = 0;
-				for (const channelId of t[platform]) try {
-					await bot.sendMessage(channelId, content);
+				try {
+					await bots[botIndex].sendMessage(channelId, content);
 					num++;
+					await this.ctx.sleep(500);
 				} catch (e) {
 					this.logger.error(e);
-					if (bots.length > 1) continue botloop;
+					if (bots.length > 1) await sendMessageByBot(channelId, botIndex++);
 				}
-				this.logger.info(`成功推送消息 ${num} 条`);
-			}
+			};
+			for (const channelId of t[platform]) await sendMessageByBot(channelId);
+			this.logger.info(`成功推送消息 ${num} 条`);
 		}
 	}
 	async broadcastToTargets(uid, content, type) {
@@ -4111,7 +4115,7 @@ var BLive = class extends koishi.Service {
 	async startLiveRoomListener(roomId, handler) {
 		const cookiesStr = await this.ctx["bilibili-notify-api"].getCookiesForHeader();
 		const mySelfInfo = await this.ctx["bilibili-notify-api"].getMyselfInfo();
-		this.listenerRecord[roomId] = (0, __akokko_blive_message_listener.startListen)(Number.parseInt(roomId), handler, { ws: {
+		this.listenerRecord[roomId] = (0, blive_message_listener.startListen)(Number.parseInt(roomId), handler, { ws: {
 			headers: { Cookie: cookiesStr },
 			uid: mySelfInfo.data.mid
 		} });

package/lib/index.mjs

@@ -17,7 +17,7 @@ import https from "node:https";
 import axios from "axios";
 import { Cookie, CookieJar } from "tough-cookie";
 import { JSDOM } from "jsdom";
-import { startListen } from "@akokko/blive-message-listener";
+import { startListen } from "blive-message-listener";
 
 //#region rolldown:runtime
 var __defProp = Object.defineProperty;
@@ -732,8 +732,7 @@ var ComRegister = class {
 				liveAtAll: s.liveAtAll,
 				liveGuardBuy: s.liveGuardBuy,
 				wordcloud: s.wordcloud,
-				liveSummary: s.liveSummary,
-				bot: null
+				liveSummary: s.liveSummary
 			}));
 			const target = [{
 				channelArr,
@@ -760,7 +759,7 @@ var ComRegister = class {
 	}
 	async sendPrivateMsg(content) {
 		if (this.config.master.enable) {
-			if (this.privateBot.status !== Universal.Status.ONLINE) {
+			if (this.privateBot?.status !== Universal.Status.ONLINE) {
 				this.logger.error(`${this.privateBot.platform} 机器人未初始化完毕，无法进行推送`);
 				return;
 			}
@@ -827,13 +826,16 @@ var ComRegister = class {
 			const liveSummaryArr = [];
 			for (const platform of sub.target) for (const channel of platform.channelArr) {
 				const target = `${platform.platform}:${channel.channelId}`;
-				if (channel.dynamic) dynamicArr.push(target);
-				if (channel.dynamicAtAll) dynamicAtAllArr.push(target);
-				if (channel.live) liveArr.push(target);
-				if (channel.liveAtAll) liveAtAllArr.push(target);
-				if (channel.liveGuardBuy) liveGuardBuyArr.push(target);
-				if (channel.wordcloud) wordcloudArr.push(target);
-				if (channel.liveSummary) liveSummaryArr.push(target);
+				const conditions = [
+					["dynamic", dynamicArr],
+					["dynamicAtAll", dynamicAtAllArr],
+					["live", liveArr],
+					["liveAtAll", liveAtAllArr],
+					["liveGuardBuy", liveGuardBuyArr],
+					["wordcloud", wordcloudArr],
+					["liveSummary", liveSummaryArr]
+				];
+				for (const [key, arr] of conditions) if (channel[key]) arr.push(target);
 			}
 			this.pushArrMap.set(sub.uid, {
 				dynamicArr,
@@ -858,24 +860,26 @@ var ComRegister = class {
 		for (const platform of Object.keys(t)) {
 			const bots = [];
 			for (const bot of this.ctx.bots) if (bot.platform === platform) bots.push(bot);
-			botloop: for (const bot of bots) {
-				if (bot.status !== Universal.Status.ONLINE) {
+			let num = 0;
+			const sendMessageByBot = async (channelId, botIndex = 0) => {
+				if (bots[botIndex].status !== Universal.Status.ONLINE) {
 					this.logger.error(`${platform} 机器人未初始化完毕，无法进行推送，${retry / 1e3}秒后重试`);
 					this.ctx.setTimeout(async () => {
 						await this.pushMessage(targets, content, retry * 2);
 					}, retry);
 					return;
 				}
-				let num = 0;
-				for (const channelId of t[platform]) try {
-					await bot.sendMessage(channelId, content);
+				try {
+					await bots[botIndex].sendMessage(channelId, content);
 					num++;
+					await this.ctx.sleep(500);
 				} catch (e) {
 					this.logger.error(e);
-					if (bots.length > 1) continue botloop;
+					if (bots.length > 1) await sendMessageByBot(channelId, botIndex++);
 				}
-				this.logger.info(`成功推送消息 ${num} 条`);
-			}
+			};
+			for (const channelId of t[platform]) await sendMessageByBot(channelId);
+			this.logger.info(`成功推送消息 ${num} 条`);
 		}
 	}
 	async broadcastToTargets(uid, content, type) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-bilibili-notify",
   "description": "Koishi bilibili notify plugin",
-  "version": "3.3.4-alpha.2",
+  "version": "3.3.4-alpha.4",
   "main": "./lib/index.js",
   "typings": "lib/index.d.ts",
   "files": [
@@ -28,12 +28,12 @@
     "build": "tsdown"
   },
   "dependencies": {
-    "@akokko/blive-message-listener": "^0.5.1",
     "@node-rs/jieba": "^2.0.1",
     "axios": "^1.11.0",
     "axios-cookiejar-support": "^6.0.4",
+    "blive-message-listener": "^0.5.1",
     "cacheable-lookup": "^7.0.0",
-    "cron": "^4.3.2",
+    "cron": "^4.3.3",
     "jsdom": "^26.1.0",
     "luxon": "^3.7.1",
     "md5": "^2.3.0",
@@ -43,12 +43,12 @@
   },
   "devDependencies": {
     "@types/jsdom": "^21.1.7",
-    "@types/luxon": "^3.6.2",
+    "@types/luxon": "^3.7.1",
     "@types/md5": "^2.3.5",
     "@types/qrcode": "^1.5.5",
     "@types/tough-cookie": "^4.0.5",
     "koishi-plugin-puppeteer": "^3.9.0",
-    "tsdown": "^0.13.0"
+    "tsdown": "^0.13.3"
   },
   "peerDependencies": {
     "koishi": "^4.18.8"

package/readme.md

@@ -337,6 +337,8 @@ uid为必填参数，为要推送的UP主的UID，index为可选参数，为要
 > - ver 3.3.4-alpha.0 优化：在错误消息向主人帐号推送前会先进行机器人状态判断； 重构：部分重构消息发送逻辑；
 > - ver 3.3.4-alpha.1 修复: CI错误；
 > - ver 3.3.4-alpha.2 修复: 推送消息时发送6000的bug；
+> - ver 3.3.4-alpha.3 修复: 相同平台多个机器人可能造成消息重复推送、错误信息推送机器人未初始化完毕推送时会报错；
+> - ver 3.3.4-alpha.4 优化：切换依赖 `blive-message-listener` 回官方版本；
 
 ## 交流群