koishi-plugin-bilibili-notify 1.2.16 → 1.3.0-alpha.1

package/lib/comRegister.d.ts

@@ -50,7 +50,9 @@ declare namespace ComRegister {
             masterAccountGuildId: string;
         };
         unlockSubLimits: boolean;
+        changeMasterInfoApi: boolean;
         liveStartAtAll: boolean;
+        pushUrl: boolean;
         pushTime: number;
         liveLoopTime: number;
         customLiveStart: string;

package/lib/comRegister.js

@@ -619,7 +619,7 @@ class ComRegister {
                 }
                 return;
             }
-            const { pic, buffer } = await ctx.gi.generateLiveImg(data, userData, data.live_status !== 1 ?
+            const { pic, buffer } = await ctx.gi.generateLiveImg(data, userData.info.uname, userData.info.face, data.live_status !== 1 ?
                 LiveType.NotLiveBroadcast :
                 LiveType.LiveBroadcast);
             // pic 存在，使用的是render模式
@@ -1086,47 +1086,104 @@ class ComRegister {
         let timer = 0;
         let open = false;
         let liveTime;
-        let uData;
+        let username;
+        let userface;
         // 相当于锁的作用，防止上一个循环没处理完
         let flag = true;
-        const sendLiveNotifyCard = async (data, uData, liveType, liveStartMsg, atAll) => {
-            // 定义变量
-            let pic;
-            let buffer;
-            // 多次尝试生成图片
-            let attempts = 3;
-            for (let i = 0; i < attempts; i++) {
-                try {
-                    // 获取直播通知卡片
-                    const { pic: picv, buffer: bufferv } = await ctx.gi.generateLiveImg(data, uData, liveType);
-                    // 赋值
-                    pic = picv;
-                    buffer = bufferv;
-                    // 成功则跳出循环
-                    break;
+        // 定义发送直播通知卡片方法
+        let sendLiveNotifyCard;
+        // 判断直播是否需要@全体成员
+        if (this.config.pushUrl) {
+            sendLiveNotifyCard = async (data, liveType, liveStartMsg, atAll) => {
+                // 定义变量
+                let pic;
+                let buffer;
+                // 多次尝试生成图片
+                let attempts = 3;
+                for (let i = 0; i < attempts; i++) {
+                    try {
+                        // 获取直播通知卡片
+                        const { pic: picv, buffer: bufferv } = await ctx.gi.generateLiveImg(data, username, userface, liveType);
+                        // 赋值
+                        pic = picv;
+                        buffer = bufferv;
+                        // 成功则跳出循环
+                        break;
+                    }
+                    catch (e) {
+                        if (i === attempts - 1) { // 已尝试三次
+                            this.logger.error('liveDetect generateLiveImg() 推送卡片生成失败，原因：' + e.message);
+                            return await this.sendPrivateMsgAndRebootService(ctx, bot, '插件可能出现某些未知错误，请尝试重启插件，如果仍然发生该错误，请带着日志向作者反馈');
+                        }
+                    }
                 }
-                catch (e) {
-                    if (i === attempts - 1) { // 已尝试三次
-                        this.logger.error('liveDetect generateLiveImg() 推送卡片生成失败，原因：' + e.message);
-                        return await this.sendPrivateMsgAndRebootService(ctx, bot, '插件可能出现某些未知错误，请尝试重启插件，如果仍然发生该错误，请带着日志向作者反馈');
+                // 推送直播信息
+                // pic 存在，使用的是render模式
+                if (pic) {
+                    let msg = (0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [atAll && (0, jsx_runtime_1.jsx)("at", { type: "all" }), liveStartMsg && liveStartMsg, liveType !== LiveType.StartBroadcasting && `https://live.bilibili.com/${roomId}`] });
+                    return await this.sendMsg(ctx, guildId, bot, pic + msg);
+                }
+                // pic不存在，说明使用的是page模式
+                let msg = (0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [koishi_1.h.image(buffer, 'image/png'), atAll && (0, jsx_runtime_1.jsx)("at", { type: "all" }), liveStartMsg && liveStartMsg, liveType !== LiveType.StartBroadcasting && `https://live.bilibili.com/${roomId}`] });
+                await this.sendMsg(ctx, guildId, bot, msg);
+            };
+        }
+        else {
+            sendLiveNotifyCard = async (data, liveType, liveStartMsg, atAll) => {
+                // 定义变量
+                let pic;
+                let buffer;
+                // 多次尝试生成图片
+                let attempts = 3;
+                for (let i = 0; i < attempts; i++) {
+                    try {
+                        // 获取直播通知卡片
+                        const { pic: picv, buffer: bufferv } = await ctx.gi.generateLiveImg(data, username, userface, liveType);
+                        // 赋值
+                        pic = picv;
+                        buffer = bufferv;
+                        // 成功则跳出循环
+                        break;
+                    }
+                    catch (e) {
+                        if (i === attempts - 1) { // 已尝试三次
+                            this.logger.error('liveDetect generateLiveImg() 推送卡片生成失败，原因：' + e.message);
+                            return await this.sendPrivateMsgAndRebootService(ctx, bot, '插件可能出现某些未知错误，请尝试重启插件，如果仍然发生该错误，请带着日志向作者反馈');
+                        }
                     }
                 }
-            }
-            // 推送直播信息
-            // pic 存在，使用的是render模式
-            if (pic) {
-                let msg = (0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [atAll && (0, jsx_runtime_1.jsx)("at", { type: "all" }), liveStartMsg && liveStartMsg] });
-                return await this.sendMsg(ctx, guildId, bot, pic + msg);
-            }
-            // pic不存在，说明使用的是page模式
-            await this.sendMsg(ctx, guildId, bot, (0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [koishi_1.h.image(buffer, 'image/png'), atAll && (0, jsx_runtime_1.jsx)("at", { type: "all" }), liveStartMsg && liveStartMsg] }));
-        };
+                // 推送直播信息
+                // pic 存在，使用的是render模式
+                if (pic) {
+                    let msg = (0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [atAll && (0, jsx_runtime_1.jsx)("at", { type: "all" }), liveStartMsg && liveStartMsg] });
+                    return await this.sendMsg(ctx, guildId, bot, pic + msg);
+                }
+                // pic不存在，说明使用的是page模式
+                await this.sendMsg(ctx, guildId, bot, (0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [koishi_1.h.image(buffer, 'image/png'), atAll && (0, jsx_runtime_1.jsx)("at", { type: "all" }), liveStartMsg && liveStartMsg] }));
+            };
+        }
+        // 定义获取主播信息方法
+        let useMasterInfo;
+        if (this.config.changeMasterInfoApi) {
+            useMasterInfo = async (uid) => {
+                const { data } = await ctx.ba.getUserInfo(uid);
+                username = data.name;
+                userface = data.face;
+            };
+        }
+        else {
+            useMasterInfo = async (uid) => {
+                const { data: { info } } = await ctx.ba.getMasterInfo(uid);
+                username = info.uname;
+                userface = info.face;
+            };
+        }
         return async () => {
             try {
                 // 如果flag为false则说明前面的代码还未执行完，则直接返回
                 if (!flag)
                     return;
-                flag && (flag = false);
+                flag = false;
                 // 发送请求检测直播状态
                 let content;
                 let attempts = 3;
@@ -1149,13 +1206,11 @@ class ComRegister {
                 if (firstSubscription) {
                     firstSubscription = false;
                     // 获取主播信息
-                    let userData;
                     let attempts = 3;
                     for (let i = 0; i < attempts; i++) {
                         try {
                             // 发送请求获取主播信息
-                            const { data: userInfo } = await ctx.ba.getMasterInfo(data.uid);
-                            userData = userInfo;
+                            await useMasterInfo(data.uid);
                             // 成功则跳出循环
                             break;
                         }
@@ -1166,14 +1221,12 @@ class ComRegister {
                             }
                         }
                     }
-                    // 主播信息不会变，请求一次即可
-                    uData = userData;
                     // 判断直播状态
                     if (data.live_status === 1) { // 当前正在直播
                         // 设置开播时间
                         liveTime = data.live_time;
                         // 发送直播通知卡片
-                        sendLiveNotifyCard(data, uData, LiveType.LiveBroadcast);
+                        sendLiveNotifyCard(data, LiveType.LiveBroadcast);
                         // 改变开播状态
                         open = true;
                     } // 未开播，直接返回
@@ -1190,13 +1243,13 @@ class ComRegister {
                             timer = 0;
                             // 定义下播通知消息
                             let liveEndMsg = this.config.customLiveEnd
-                                .replace('-name', uData.info.uname)
+                                .replace('-name', username)
                                 .replace('-time', await ctx.gi.getTimeDifference(liveTime));
                             // 获取头像并缩放
                             let resizedImage;
                             // Jimp无法处理Webp格式，直接跳过
                             try {
-                                resizedImage = await jimp_1.default.read(uData.info.face).then(async (image) => {
+                                resizedImage = await jimp_1.default.read(userface).then(async (image) => {
                                     return await image.resize(100, 100).getBufferAsync(jimp_1.default.MIME_PNG);
                                 });
                             }
@@ -1219,13 +1272,12 @@ class ComRegister {
                             // 设置开播时间
                             liveTime = data.live_time;
                             // 获取主播信息
-                            let userData;
                             let attempts = 3;
                             for (let i = 0; i < attempts; i++) {
                                 try {
-                                    // 获取主播信息
-                                    const { data: userInfo } = await ctx.ba.getMasterInfo(data.uid);
-                                    userData = userInfo;
+                                    // 主播信息不会变，开播时刷新一次即可
+                                    // 发送请求获取主播信息
+                                    await useMasterInfo(data.uid);
                                     // 成功则跳出循环
                                     break;
                                 }
@@ -1236,21 +1288,19 @@ class ComRegister {
                                     }
                                 }
                             }
-                            // 主播信息不会变，开播时刷新一次即可
-                            uData = userData;
                             // 定义开播通知语
                             let liveStartMsg = this.config.customLiveStart
-                                .replace('-name', uData.info.uname)
+                                .replace('-name', username)
                                 .replace('-time', await ctx.gi.getTimeDifference(liveTime))
                                 .replace('-link', `https://live.bilibili.com/${data.short_id === 0 ? data.room_id : data.short_id}`);
                             // 判断是否需要@全体成员
                             if (this.config.liveStartAtAll) {
                                 // 发送@全体成员通知
-                                await sendLiveNotifyCard(data, uData, LiveType.StartBroadcasting, liveStartMsg, true);
+                                await sendLiveNotifyCard(data, LiveType.StartBroadcasting, liveStartMsg, true);
                             }
                             else {
                                 // 发送直播通知卡片
-                                await sendLiveNotifyCard(data, uData, LiveType.StartBroadcasting, liveStartMsg);
+                                await sendLiveNotifyCard(data, LiveType.StartBroadcasting, liveStartMsg);
                             }
                         }
                         else { // 还在直播
@@ -1261,7 +1311,7 @@ class ComRegister {
                                     // 到时间重新计时
                                     timer = 0;
                                     // 发送直播通知卡片
-                                    sendLiveNotifyCard(data, uData, LiveType.LiveBroadcast);
+                                    sendLiveNotifyCard(data, LiveType.LiveBroadcast);
                                 }
                             }
                             // 否则继续循环
@@ -1619,7 +1669,9 @@ class ComRegister {
             masterAccountGuildId: koishi_1.Schema.string()
         }),
         unlockSubLimits: koishi_1.Schema.boolean().required(),
+        changeMasterInfoApi: koishi_1.Schema.boolean().required(),
         liveStartAtAll: koishi_1.Schema.boolean().required(),
+        pushUrl: koishi_1.Schema.boolean().required(),
         pushTime: koishi_1.Schema.number().required(),
         liveLoopTime: koishi_1.Schema.number().default(10),
         customLiveStart: koishi_1.Schema.string().required(),

package/lib/database.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.apply = exports.name = void 0;
+exports.name = void 0;
+exports.apply = apply;
 exports.name = 'Database';
 function apply(ctx) {
     // 新增LoginBili表
@@ -22,4 +23,3 @@ function apply(ctx) {
         time: 'timestamp'
     }, { autoInc: true });
 }
-exports.apply = apply;

package/lib/generateImg.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 import { Context, Schema, Service } from "koishi";
 declare module 'koishi' {
     interface Context {
@@ -9,7 +8,7 @@ declare class GenerateImg extends Service {
     static inject: string[];
     giConfig: GenerateImg.Config;
     constructor(ctx: Context, config: GenerateImg.Config);
-    generateLiveImg(data: any, userData: any, liveStatus: number): Promise<{
+    generateLiveImg(data: any, username: string, userface: string, liveStatus: number): Promise<{
         buffer: Buffer;
         pic?: undefined;
     } | {

package/lib/generateImg.js

@@ -50,7 +50,7 @@ class GenerateImg extends koishi_1.Service {
     protected stop(): void | Promise<void> {
         this.logger.info('已停止工作')
     } */
-    async generateLiveImg(data, userData, liveStatus /*0未开播 1刚开播 2已开播 */) {
+    async generateLiveImg(data, username, userface, liveStatus /*0未开播 1刚开播 2已开播 */) {
         const [titleStatus, liveTime, cover] = await this.getLiveStatus(data.live_time, liveStatus);
         // 加载字体
         const fontURL = (0, url_1.pathToFileURL)((0, path_1.resolve)(__dirname, 'font/HYZhengYuan-75W.ttf'));
@@ -176,8 +176,8 @@ class GenerateImg extends koishi_1.Service {
                                     <div class="live-broadcast-info">
                                         <!-- 主播头像 -->
                                         <img style="border-radius: 10px; margin-left: 10px" class="anchor-avatar"
-                                            src="${userData.info.face}" alt="主播头像">
-                                        <span class="broadcast-message">${userData.info.uname}${titleStatus}</span>
+                                            src="${userface}" alt="主播头像">
+                                        <span class="broadcast-message">${username}${titleStatus}</span>
                                     </div>
                                 </div>
                                 ${this.giConfig.hideDesc ? '' : `<p class="card-text">${data.description ? data.description : '这个主播很懒，什么都简介都没写'}</p>`}

package/lib/index.d.ts

@@ -19,8 +19,10 @@ export interface Config {
     dynamicCheckNumber: number;
     dynamicLoopTime: '1分钟' | '2分钟' | '3分钟' | '5分钟';
     live: {};
-    pushTime: number;
+    changeMasterInfoApi: boolean;
     liveStartAtAll: boolean;
+    pushUrl: boolean;
+    pushTime: number;
     customLiveStart: string;
     customLiveEnd: string;
     hideDesc: boolean;

package/lib/index.js

@@ -26,7 +26,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.apply = exports.Config = exports.name = exports.inject = void 0;
+exports.Config = exports.name = exports.inject = void 0;
+exports.apply = apply;
 const koishi_1 = require("koishi");
 // import plugins
 // import Authority from './authority'
@@ -93,9 +94,17 @@ exports.Config = koishi_1.Schema.object({
         .default('2分钟')
         .description('设定多久检测一次动态。若需动态的时效性，可以设置为1分钟。若订阅的UP主经常在短时间内连着发多条动态应该将该值提高，否则会出现动态漏推送和晚推送的问题，默认值为2分钟'),
     live: koishi_1.Schema.object({}).description('直播推送设置'),
+    changeMasterInfoApi: koishi_1.Schema.boolean()
+        .default(false)
+        .description('是否切换获取主播信息API，在遇到错误getMasterInfo()时可以尝试切换')
+        .experimental(),
     liveStartAtAll: koishi_1.Schema.boolean()
         .default(false)
         .description('直播开始时艾特全体成员，默认关闭'),
+    pushUrl: koishi_1.Schema.boolean()
+        .default(false)
+        .description('推送直播状态时是否同时发送链接。注意：如果使用的是QQ官方机器人不能开启此项！')
+        .experimental(),
     pushTime: koishi_1.Schema.number()
         .min(0)
         .max(12)
@@ -257,7 +266,9 @@ class ServerManager extends koishi_1.Service {
             const cr = this.ctx.plugin(comRegister_1.default, {
                 master: globalConfig.master,
                 unlockSubLimits: globalConfig.unlockSubLimits,
+                changeMasterInfoApi: globalConfig.changeMasterInfoApi,
                 liveStartAtAll: globalConfig.liveStartAtAll,
+                pushUrl: globalConfig.pushUrl,
                 pushTime: globalConfig.pushTime,
                 customLiveStart: globalConfig.customLiveStart,
                 customLiveEnd: globalConfig.customLiveEnd,
@@ -347,4 +358,3 @@ function apply(ctx, config) {
         }
     });
 }
-exports.apply = apply;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-bilibili-notify",
   "description": "Koishi bilibili notify plugin",
-  "version": "1.2.16",
+  "version": "1.3.0-alpha.1",
   "contributors": [
     "Akokko <admin@akokko.com>"
   ],
@@ -24,17 +24,17 @@
     "bilibili"
   ],
   "peerDependencies": {
-    "koishi": "^4.17.4"
+    "koishi": "^4.17.5"
   },
   "dependencies": {
-    "axios": "^1.6.8",
-    "axios-cookiejar-support": "^5.0.1",
+    "axios": "^1.7.0-beta.1",
+    "axios-cookiejar-support": "^5.0.2",
     "jimp": "^0.22.12",
     "jsdom": "^24.0.0",
     "luxon": "^3.4.4",
     "md5": "^2.3.0",
     "qrcode": "^1.5.3",
-    "tough-cookie": "^4.1.3"
+    "tough-cookie": "^4.1.4"
   },
   "devDependencies": {
     "@types/luxon": "^3",

package/readme.md

@@ -160,6 +160,8 @@
 - ver 1.2.14 优化调试模式输出，直播推送卡片添加分区信息
 - ver 1.2.15 新增直播推送卡片简介隐藏选项
 - ver 1.2.16 当存储在数据库中的登录信息被篡改时，新增控制台提示
+- ver 1.3.0-alpha.0 对直播推送逻辑进行小型重构，优化了性能。新增功能：定时推送直播卡片可选是否发送直播链接；在遇到getMasterInfo()错误时，可切换获取主播信息Api
+- ver 1.3.0-alpha.1 修复bug：发送直播开播通知时，如果在开播语中加入链接，同时开启了推送直播卡片发送直播链接，则会发送两条链接
 
 ## 交流群