koishi-plugin-bilibili-notify 3.2.0-alpha.6 → 3.2.1-alpha.0

package/lib/biliAPI.d.ts

@@ -1,4 +1,6 @@
-import { type Context, Schema, Service } from "koishi";
+import { type Awaitable, type Context, Schema, Service } from "koishi";
+import CacheableLookup from "cacheable-lookup";
+import { type AxiosInstance } from "axios";
 import { CookieJar } from "tough-cookie";
 import type { Notifier } from "@koishijs/plugin-notifier";
 declare module "koishi" {
@@ -9,7 +11,8 @@ declare module "koishi" {
 declare class BiliAPI extends Service {
     static inject: string[];
     jar: CookieJar;
-    client: any;
+    client: AxiosInstance;
+    cacheable: CacheableLookup;
     apiConfig: BiliAPI.Config;
     loginData: any;
     loginNotifier: Notifier;
@@ -17,6 +20,7 @@ declare class BiliAPI extends Service {
     loginInfoIsLoaded: boolean;
     constructor(ctx: Context, config: BiliAPI.Config);
     protected start(): void | Promise<void>;
+    protected stop(): Awaitable<void>;
     getMixinKey: (orig: string) => string;
     encWbi(params: {
         [key: string]: string | number | object;

package/lib/biliAPI.js

@@ -12,6 +12,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const koishi_1 = require("koishi");
 const md5_1 = __importDefault(require("md5"));
 const node_crypto_1 = __importDefault(require("node:crypto"));
+const node_http_1 = __importDefault(require("node:http"));
+const node_https_1 = __importDefault(require("node:https"));
+const cacheable_lookup_1 = __importDefault(require("cacheable-lookup"));
 const axios_1 = __importDefault(require("axios"));
 const tough_cookie_1 = require("tough-cookie");
 const axios_cookiejar_support_1 = require("axios-cookiejar-support");
@@ -52,8 +55,8 @@ const GET_LIVE_ROOMS_INFO = "https://api.live.bilibili.com/room/v1/Room/get_stat
 class BiliAPI extends koishi_1.Service {
     static inject = ["database", "notifier"];
     jar;
-    // biome-ignore lint/suspicious/noExplicitAny: <explanation>
     client;
+    cacheable;
     apiConfig;
     // biome-ignore lint/suspicious/noExplicitAny: <explanation>
     loginData;
@@ -70,6 +73,11 @@ class BiliAPI extends koishi_1.Service {
         // 从数据库加载cookies
         this.loadCookiesFromDatabase();
     }
+    stop() {
+        // 将DNS缓存卸载
+        this.cacheable.uninstall(node_http_1.default.globalAgent);
+        this.cacheable.uninstall(node_https_1.default.globalAgent);
+    }
     // WBI签名
     // 对 imgKey 和 subKey 进行字符顺序打乱编码
     getMixinKey = (orig) => mixinKeyEncTab
@@ -287,7 +295,14 @@ class BiliAPI extends koishi_1.Service {
         return userAgents[index];
     }
     createNewClient() {
+        // 创建DNS缓存
+        this.cacheable = new cacheable_lookup_1.default();
+        // 安装到http和https
+        this.cacheable.install(node_http_1.default.globalAgent);
+        this.cacheable.install(node_https_1.default.globalAgent);
+        // 创建cookieJar
         this.jar = new tough_cookie_1.CookieJar();
+        // 包装cookieJar
         this.client = (0, axios_cookiejar_support_1.wrapper)(axios_1.default.create({
             jar: this.jar,
             headers: {

package/lib/blive.js

@@ -32,14 +32,11 @@ class BLive extends koishi_1.Service {
                 uid: mySelfInfo.data.mid,
             },
         });
-        // logger
-        this.logger.info(`${roomId}直播间监听已开启`);
     }
     closeListener(roomId) {
         // 判断直播间监听器是否关闭
         if (!this.listenerRecord ||
-            !this.listenerRecord[roomId] ||
-            !this.listenerRecord[roomId].closed) {
+            !this.listenerRecord[roomId]?.closed) {
             // 输出logger
             this.logger.info(`${roomId}直播间弹幕监听器无需关闭`);
         }

package/lib/comRegister.d.ts

@@ -23,7 +23,7 @@ declare class ComRegister {
     constructor(ctx: Context, config: ComRegister.Config);
     init(config: ComRegister.Config): Promise<void>;
     initManager(): void;
-    getBot(pf: string): Bot<Context, any>;
+    getBot(pf: string, selfId?: string): Bot<Context, any>;
     sendPrivateMsg(content: string): Promise<void>;
     sendPrivateMsgAndRebootService(): Promise<void>;
     sendPrivateMsgAndStopService(): Promise<void>;
@@ -65,6 +65,7 @@ declare namespace ComRegister {
                     live: boolean;
                     liveGuardBuy: boolean;
                     atAll: boolean;
+                    bot: string;
                 }>;
                 platform: string;
             }>;

package/lib/comRegister.js

@@ -6,7 +6,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const jsx_runtime_1 = require("@satorijs/element/jsx-runtime");
 // Koishi核心依赖
 const koishi_1 = require("koishi");
-// 外部依赖：qrcode
 const qrcode_1 = __importDefault(require("qrcode"));
 const cron_1 = require("cron");
 // Utils
@@ -380,8 +379,14 @@ class ComRegister {
         }
     }
     // biome-ignore lint/suspicious/noExplicitAny: <explanation>
-    getBot(pf) {
-        return this.ctx.bots.find((bot) => bot.platform === pf);
+    getBot(pf, selfId) {
+        // 判断是否存在selfId
+        if (!selfId || selfId === "") {
+            // 不存在则默认第一个bot
+            return this.ctx.bots.find((bot) => bot.platform === pf);
+        }
+        // 存在则返回对应bot
+        return this.ctx.bots.find((bot) => bot.platform === pf && bot.selfId === selfId);
     }
     async sendPrivateMsg(content) {
         if (this.config.master.enable) {
@@ -506,7 +511,16 @@ class ComRegister {
         // 获取目标
         const targetChannel = targets[0].channelArr[0];
         // 获取机器人实例
-        const bot = this.getBot(targets[0].platform);
+        const bot = this.getBot(targets[0].platform, targetChannel.bot);
+        // 判断bot是否存在
+        if (!bot) {
+            // 发送私聊消息
+            this.sendPrivateMsg("未找到对应bot实例，本次消息推送取消！");
+            // logger
+            this.logger.warn("未找到对应bot实例，本次消息推送取消！");
+            // 直接返回
+            return;
+        }
         // 模式匹配
         const pushTypePatternMatching = {
             [type_1.PushType.Live]: async () => {
@@ -672,12 +686,17 @@ class ComRegister {
                         await this.broadcastToTargets(sub.target, (0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [koishi_1.h.image(buffer, "image/jpeg"), dUrl] }), type_1.PushType.Dynamic);
                         // 判断是否需要发送动态中的图片
                         if (this.config.pushImgsInDynamic) {
-                            // 判断是否为图文动态，且存在draw
-                            if (item.type === "DYNAMIC_TYPE_DRAW" &&
-                                item.modules.module_dynamic.major?.draw) {
-                                for (const img of item.modules.module_dynamic.major.draw
-                                    .items) {
-                                    await this.broadcastToTargets(sub.target, (0, jsx_runtime_1.jsx)("img", { src: img.src, alt: "\u52A8\u6001\u56FE\u7247" }), type_1.PushType.Dynamic);
+                            // 判断是否为图文动态
+                            if (item.type === "DYNAMIC_TYPE_DRAW") {
+                                // 获取pics
+                                const pics = item.modules?.module_dynamic?.major?.opus?.pics;
+                                // 判断pics是否存在
+                                if (pics) {
+                                    for (const pic of pics) {
+                                        await this.broadcastToTargets(sub.target, (0, jsx_runtime_1.jsx)("img", { src: pic.url, alt: "\u52A8\u6001\u56FE\u7247" }), type_1.PushType.Dynamic);
+                                        // 随机睡眠1-3秒
+                                        await this.ctx.sleep(Math.floor(Math.random() * 2000) + 1000);
+                                    }
                                 }
                             }
                         }
@@ -858,12 +877,17 @@ class ComRegister {
                         if (this.config.pushImgsInDynamic) {
                             // logger
                             this.logger.info("需要发送动态中的图片，开始发送...");
-                            // 判断是否为图文动态，且存在draw
-                            if (item.type === "DYNAMIC_TYPE_DRAW" &&
-                                item.modules.module_dynamic.major?.draw) {
-                                for (const img of item.modules.module_dynamic.major.draw
-                                    .items) {
-                                    await this.broadcastToTargets(sub.target, (0, jsx_runtime_1.jsx)("img", { src: img.src, alt: "\u52A8\u6001\u56FE\u7247" }), type_1.PushType.Dynamic);
+                            // 判断是否为图文动态
+                            if (item.type === "DYNAMIC_TYPE_DRAW") {
+                                // 获取pics
+                                const pics = item.modules?.module_dynamic?.major?.opus?.pics;
+                                // 判断pics是否存在
+                                if (pics) {
+                                    for (const pic of pics) {
+                                        await this.broadcastToTargets(sub.target, (0, jsx_runtime_1.jsx)("img", { src: pic.url, alt: "\u52A8\u6001\u56FE\u7247" }), type_1.PushType.Dynamic);
+                                        // 随机睡眠1-3秒
+                                        await this.ctx.sleep(Math.floor(Math.random() * 2000) + 1000);
+                                    }
                                 }
                             }
                             // logger
@@ -973,9 +997,12 @@ class ComRegister {
         let pushAtTimeTimer;
         // 定义弹幕存放数组
         const currentLiveDanmakuArr = [];
+        // init flag
+        let initFlag = false;
+        // 连接中断flag
+        let connFlag = false;
         // 定义开播状态
         let liveStatus = false;
-        // 处理target
         // 定义channelIdArr总长度
         let channelArrLen = 0;
         // 定义数据
@@ -1006,13 +1033,15 @@ class ComRegister {
                 return await this.sendPrivateMsgAndStopService();
             }
             // 判断是否已经下播
-            if (liveRoomInfo.live_status === 0) {
+            if (liveRoomInfo.live_status === 0 || liveRoomInfo.live_status === 2) {
                 // 设置开播状态为false
                 liveStatus = false;
                 // 清除定时器
                 pushAtTimeTimer?.();
                 // 发送私聊消息
-                await this.sendPrivateMsg("直播间已下播，定时推送已停止！与直播间的连接可能已断开，请使用指令 sys restart 重启插件");
+                await this.sendPrivateMsg("直播间已下播！与直播间的连接可能已断开，请使用指令 sys restart 重启插件");
+                // 返回
+                return;
             }
             // 设置开播时间
             liveTime = liveRoomInfo.live_time;
@@ -1064,6 +1093,31 @@ class ComRegister {
         };
         // 构建消息处理函数
         const handler = {
+            onOpen: () => {
+                if (!initFlag) {
+                    // init flag设置为true
+                    initFlag = true;
+                    // connFlag设置为false
+                    connFlag = false;
+                    // logger
+                    this.logger.info(`${roomId}直播间连接已建立！`);
+                }
+            },
+            onClose: async () => {
+                if (!connFlag) {
+                    // 更直播状态
+                    liveStatus = false;
+                    // 关闭定时推送
+                    pushAtTimeTimer?.();
+                    // 停止服务
+                    this.ctx.bl.closeListener(roomId);
+                    // 更改connFlag
+                    connFlag = true;
+                    // 发送消息
+                    await this.sendPrivateMsg(`${roomId}直播间连接已中断！`);
+                    this.logger.error(`${roomId}直播间连接已中断！`);
+                }
+            },
             onIncomeDanmu: ({ body }) => {
                 // 保存消息到数组
                 currentLiveDanmakuArr.push(body.content);
@@ -1793,6 +1847,7 @@ class ComRegister {
                     live: koishi_1.Schema.boolean().description("该频道/群组是否推送直播通知"),
                     liveGuardBuy: koishi_1.Schema.boolean().description("该频道/群组是否推送弹幕消息"),
                     atAll: koishi_1.Schema.boolean().description("推送开播通知时是否艾特全体成员"),
+                    bot: koishi_1.Schema.string().description("若您有多个相同平台机器人，可在此填写当前群聊执行推送的机器人账号。不填则默认第一个"),
                 })).description("频道/群组信息"),
                 platform: koishi_1.Schema.string().description("推送平台"),
             })).description("订阅用户需要发送的频道/群组信息"),

package/lib/index.d.ts

@@ -35,6 +35,7 @@ export interface Config {
                 live: boolean;
                 liveGuardBuy: boolean;
                 atAll: boolean;
+                bot: string;
             }>;
             platform: string;
         }>;

package/lib/index.js

@@ -193,15 +193,10 @@ function apply(ctx, config) {
     // 设置config
     globalConfig = config;
     // 设置提示
-    ctx.notifier.create({
-        type: "danger",
-        content: "从3.1.0-alpha.0及以前版本升级到3.1.0-alpha.1及以后版本必定报错，请重新填写订阅配置中sub.target.channelArr的内容",
-    });
     ctx.notifier.create({
         type: "warning",
         content: "请使用Auth插件创建超级管理员账号，没有权限将无法使用该插件提供的指令",
     });
-    ctx.logger.warn("从3.1.0-alpha.0及以前版本升级到3.1.0-alpha.1版本必定报错，请重新填写订阅配置中sub.target.channelArr的内容");
     // load database
     ctx.plugin(Database);
     // Register ServerManager
@@ -280,6 +275,8 @@ exports.Config = koishi_1.Schema.object({
                 atAll: koishi_1.Schema.boolean()
                     .default(false)
                     .description("推送开播通知时是否艾特全体成员"),
+                bot: koishi_1.Schema.string()
+                    .description("若您有多个相同平台机器人，可在此填写当前群聊执行推送的机器人账号。不填则默认第一个")
             }))
                 .role("table")
                 .required()

package/lib/type/index.d.ts

@@ -11,6 +11,7 @@ export type Channel = {
     live: boolean;
     liveGuardBuy: boolean;
     atAll: boolean;
+    bot: string;
 };
 export type ChannelArr = Array<Channel>;
 export type TargetItem = {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-bilibili-notify",
   "description": "Koishi bilibili notify plugin",
-  "version": "3.2.0-alpha.6",
+  "version": "3.2.1-alpha.0",
   "contributors": [
     "Akokko <admin@akokko.com>"
   ],
@@ -30,6 +30,7 @@
     "axios": "^1.7.9",
     "axios-cookiejar-support": "^5.0.5",
     "blive-message-listener": "^0.5.0",
+    "cacheable-lookup": "^7.0.0",
     "cron": "^4.3.0",
     "jsdom": "^24.1.3",
     "luxon": "^3.5.0",

package/readme.md

@@ -255,6 +255,8 @@ uid为必填参数，为要推送的UP主的UID，index为可选参数，为要
 - ver 3.2.0-alpha.4 修复：直播卡片推送时间会是设置的 `pushTime` 的两倍；
 - ver 3.2.0-alpha.5 修复：直播检测 `WS` 模式下，直播中推送卡片 `累计观看人数` 位置错误显示为 `粉丝数变化` 、转发动态的留言文字不显示； 优化：直播检测 `API` 模式下，直播推送语 `-watched` 固定显示为 `API模式无法获取`； 
 - ver 3.2.0-alpha.6 优化：调整配置项；
+- ver 3.2.0-alpha.7 修复：自 `3.1.7` 版本 `pushImagesInDynamic` 功能失效；
+- ver 3.2.1-alpha.0 新增：多个相同平台bot可以选择某个群聊/频道指定机器人发送； 优化：直播检测 `WS` 模式下播后仍推送； 修复：打开 `pushImagesInDynamic` 功能时，如果发送的动态里没有图片则会报错 `TypeError: Cannot read properties of null (reading 'opus')` 
 
 ## 交流群