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

package/lib/blive.d.ts

@@ -1,4 +1,4 @@
-import { Awaitable, Context, Schema, Service } from "koishi";
+import { Awaitable, Context, Service } from "koishi";
 import { type MsgHandler } from 'blive-message-listener';
 declare module 'koishi' {
     interface Context {
@@ -7,18 +7,10 @@ declare module 'koishi' {
 }
 declare class BLive extends Service {
     static inject: string[];
-    private blConfig;
     private listenerRecord;
-    private timerRecord;
-    constructor(ctx: Context, config: BLive.Config);
+    constructor(ctx: Context);
     protected stop(): Awaitable<void>;
-    startLiveRoomListener(roomId: string, handler: MsgHandler, danmakuPushTime: () => void): Promise<void>;
+    startLiveRoomListener(roomId: string, handler: MsgHandler): Promise<void>;
     closeListener(roomId: string): void;
 }
-declare namespace BLive {
-    interface Config {
-        danmakuPushTime: number;
-    }
-    const Config: Schema<Config>;
-}
 export default BLive;

package/lib/blive.js

@@ -5,16 +5,11 @@ const blive_message_listener_1 = require("blive-message-listener");
 class BLive extends koishi_1.Service {
     // 必要服务
     static inject = ['ba'];
-    // 配置
-    blConfig;
     // 定义类属性
     listenerRecord = {};
-    timerRecord = {};
-    constructor(ctx, config) {
+    constructor(ctx) {
         // Extends super
         super(ctx, 'bl');
-        // 将config赋值给类属性
-        this.blConfig = config;
     }
     // 注册插件dispose逻辑
     stop() {
@@ -23,7 +18,7 @@ class BLive extends koishi_1.Service {
             this.closeListener(key);
         }
     }
-    async startLiveRoomListener(roomId, handler, danmakuPushTime) {
+    async startLiveRoomListener(roomId, handler) {
         // 获取cookieStr
         const cookiesStr = await this.ctx.ba.getCookiesForHeader();
         // 获取自身信息
@@ -37,8 +32,6 @@ class BLive extends koishi_1.Service {
                 uid: mySelfInfo.data.mid
             }
         });
-        // 默认30s推送一次弹幕消息到群组并将dispose函数保存到Record中
-        this.timerRecord[roomId] = this.ctx.setInterval(danmakuPushTime, this.blConfig.danmakuPushTime * 1000 * 60);
         // logger
         this.logger.info(`${roomId}直播间弹幕监听已开启`);
     }
@@ -48,21 +41,12 @@ class BLive extends koishi_1.Service {
             // 输出logger
             this.logger.info(`${roomId}直播间弹幕监听器无需关闭`);
         }
-        // 判断消息发送定时器是否关闭
-        if (!this.timerRecord || !this.timerRecord[roomId]) {
-            // 输出logger
-            this.logger.info(`${roomId}直播间消息发送定时器无需关闭`);
-        }
         // 关闭直播间监听器
         this.listenerRecord[roomId].close();
-        // 关闭消息发送定时器
-        this.timerRecord[roomId]();
         // 判断是否关闭成功
         if (this.listenerRecord[roomId].closed) {
             // 删除直播间监听器
             delete this.listenerRecord[roomId];
-            // 删除消息发送定时器
-            delete this.timerRecord[roomId];
             // 输出logger
             this.logger.info(`${roomId}直播间弹幕监听已关闭`);
             // 直接返回 
@@ -72,10 +56,4 @@ class BLive extends koishi_1.Service {
         this.logger.warn(`${roomId}直播间弹幕监听未成功关闭`);
     }
 }
-// eslint-disable-next-line @typescript-eslint/no-namespace
-(function (BLive) {
-    BLive.Config = koishi_1.Schema.object({
-        danmakuPushTime: koishi_1.Schema.number().required()
-    });
-})(BLive || (BLive = {}));
 exports.default = BLive;

package/lib/comRegister.d.ts

@@ -11,7 +11,7 @@ type ChannelIdArr = Array<{
     channelId: string;
     dynamic: boolean;
     live: boolean;
-    liveDanmaku: boolean;
+    liveGuardBuy: boolean;
     atAll: boolean;
 }>;
 type TargetItem = {
@@ -97,7 +97,7 @@ declare namespace ComRegister {
                     channelId: string;
                     dynamic: boolean;
                     live: boolean;
-                    liveDanmaku: boolean;
+                    liveGuardBuy: boolean;
                     atAll: boolean;
                 }>;
                 platform: string;
@@ -120,7 +120,6 @@ declare namespace ComRegister {
         customLiveEnd: string;
         dynamicUrl: boolean;
         dynamicLoopTime: number;
-        dynamicCheckNumber: number;
         filter: {
             enable: boolean;
             notify: boolean;

package/lib/comRegister.js

@@ -10,6 +10,9 @@ const jsx_runtime_1 = require("@satorijs/element/jsx-runtime");
 const koishi_1 = require("koishi");
 // 导入qrcode
 const qrcode_1 = __importDefault(require("qrcode"));
+// 弹幕词云
+const segmentit_1 = require("segmentit");
+const d3_cloud_1 = __importDefault(require("d3-cloud"));
 var LiveType;
 (function (LiveType) {
     LiveType[LiveType["NotLiveBroadcast"] = 0] = "NotLiveBroadcast";
@@ -291,7 +294,7 @@ class ComRegister {
                         channelId: group,
                         dynamic: true,
                         live: true,
-                        liveDanmaku: false,
+                        liveGuardBuy: false,
                         atAll: options.atAll
                     });
                 });
@@ -351,7 +354,7 @@ class ComRegister {
                                 // 判断targetArr是否为空
                                 if (target.length === 0) {
                                     // 为空则默认为当前环境
-                                    target = [{ channelIdArr: [{ channelId: session.event.channel.id, dynamic: true, live: true, liveDanmaku: false, atAll: options.atAll ? options.atAll : false }], platform: session.event.platform }];
+                                    target = [{ channelIdArr: [{ channelId: session.event.channel.id, dynamic: true, live: true, liveGuardBuy: false, atAll: options.atAll ? options.atAll : false }], platform: session.event.platform }];
                                     // 没有满足条件的群组或频道
                                     await session.send('没有满足条件的群组或频道，默认订阅到当前聊天环境');
                                 }
@@ -362,7 +365,7 @@ class ComRegister {
                         }
                         else {
                             // 未填写群号或频道号，默认为当前环境
-                            target = [{ channelIdArr: [{ channelId: session.event.channel.id, dynamic: true, live: true, liveDanmaku: false, atAll: options.atAll ? options.atAll : false }], platform: session.event.platform }];
+                            target = [{ channelIdArr: [{ channelId: session.event.channel.id, dynamic: true, live: true, liveGuardBuy: false, atAll: options.atAll ? options.atAll : false }], platform: session.event.platform }];
                             // 发送提示消息
                             await session.send('没有填写群号或频道号，默认订阅到当前聊天环境');
                         }
@@ -370,7 +373,7 @@ class ComRegister {
                 }
                 else {
                     // 用户直接订阅，将当前环境赋值给target
-                    target = [{ channelIdArr: [{ channelId: session.event.channel.id, dynamic: true, live: true, liveDanmaku: false, atAll: options.atAll ? options.atAll : false }], platform: session.event.platform }];
+                    target = [{ channelIdArr: [{ channelId: session.event.channel.id, dynamic: true, live: true, liveGuardBuy: false, atAll: options.atAll ? options.atAll : false }], platform: session.event.platform }];
                 }
             }
             // 定义外围变量                
@@ -622,7 +625,7 @@ class ComRegister {
             const channelIdArr = idStr.split(',').map(id => {
                 const atAll = /@$/.test(id); // 使用正则表达式检查 id 是否以 @ 结尾
                 const channelId = atAll ? id.slice(0, -1) : id; // 去除末尾的 @
-                return { channelId, dynamic: true, live: true, liveDanmaku: false, atAll };
+                return { channelId, dynamic: true, live: true, liveGuardBuy: false, atAll };
             });
             return { channelIdArr, platform };
         });
@@ -697,7 +700,7 @@ class ComRegister {
                         channelId: guild.id,
                         dynamic: target.channelIdArr[0].dynamic,
                         live: target.channelIdArr[0].live,
-                        liveDanmaku: target.channelIdArr[0].liveDanmaku,
+                        liveGuardBuy: target.channelIdArr[0].liveGuardBuy,
                         atAll: target.channelIdArr[0].atAll
                     });
                 }
@@ -1392,7 +1395,6 @@ class ComRegister {
         let pushAtTimeTimer;
         // 定义弹幕存放数组
         const currentLiveDanmakuArr = [];
-        const temporaryLiveDanmakuArr = [];
         // 定义开播状态
         let liveStatus = false;
         // 处理target
@@ -1402,14 +1404,14 @@ class ComRegister {
         let liveRoomInfo;
         let masterInfo;
         // 找到频道/群组对应的
-        const danmakuPushTargetArr = target.map(channel => {
+        const liveGuardBuyPushTargetArr = target.map(channel => {
             // 获取符合条件的target
-            const liveDanmakuArr = channel.channelIdArr.filter(channelId => channelId.liveDanmaku);
+            const liveGuardBuyArr = channel.channelIdArr.filter(channelId => channelId.liveGuardBuy);
             // 将当前liveDanmakuArr的长度+到channelIdArrLen中
-            channelIdArrLen += liveDanmakuArr.length;
+            channelIdArrLen += liveGuardBuyArr.length;
             // 返回符合的target
             return {
-                channelIdArr: liveDanmakuArr,
+                channelIdArr: liveGuardBuyArr,
                 platform: channel.platform
             };
         });
@@ -1435,25 +1437,62 @@ class ComRegister {
                 data: liveRoomInfo
             }, LiveType.LiveBroadcast, liveMsg);
         };
-        // 定义弹幕推送函数
-        const danmakuPushFunc = () => {
-            // 判断数组是否有内容
-            if (channelIdArrLen > 0 && temporaryLiveDanmakuArr.length > 0) {
-                // 发送消息
-                this.sendMsg(danmakuPushTargetArr, temporaryLiveDanmakuArr.join('\n'));
-                // 将临时消息数组清空
-                temporaryLiveDanmakuArr.length = 0;
+        // 定义获取弹幕权重Record函数
+        const getDanmakuWeightRecord = () => {
+            // 创建segmentit
+            const segmentit = (0, segmentit_1.useDefault)(new segmentit_1.Segment());
+            // 创建Record
+            const danmakuWeightRecord = {};
+            // 循环遍历currentLiveDanmakuArr
+            for (const danmaku of currentLiveDanmakuArr) {
+                // 遍历结果
+                segmentit.doSegment(danmaku).map((word) => {
+                    // 定义权重
+                    danmakuWeightRecord[word.w] = (danmakuWeightRecord[word.w] || 0) + 1;
+                });
             }
+            // 返回Record
+            return danmakuWeightRecord;
+        };
+        // 定义获取弹幕词云函数
+        const sendDanmakuWordCloud = (danmakuWeightRecord) => {
+            // 准备词云数据
+            const wordList = Object.keys(danmakuWeightRecord).map(word => ({ text: word, value: danmakuWeightRecord[word] }));
+            // 创建画布
+            const width = 800;
+            const height = 600;
+            // 定义绘制函数
+            const generateSVG = async (words) => {
+                // 定义svg头部
+                const svgHeader = `<svg xmlns="http://www.w3.org/2000/svg" width="${width}" height="${height}">`;
+                // 定义svg尾部
+                const svgFooter = '</svg>';
+                // 定义svg身体
+                const svgBody = words.map(d => {
+                    return `<text x="${d.x}" y="${d.y}" font-family="Arial" font-size="${d.size}" fill="black">${d.text}</text>`;
+                }).join('\n');
+                // 拼接svg
+                const svgContent = svgHeader + svgBody + svgFooter;
+                // 渲染svg
+                const pic = await this.ctx.gi.generateWordCloudImg(svgContent);
+                // 发送消息
+                this.sendMsg(target, pic);
+            };
+            // 配置词云
+            const layout = (0, d3_cloud_1.default)()
+                .size([width, height])
+                .words(wordList.map(d => ({ text: d.text, size: d.value })))
+                .padding(5)
+                .font('Arial')
+                .fontSize(d => d.size)
+                .on('end', generateSVG);
+            // 生成词云
+            layout.start();
         };
         // 定义直播间信息获取函数
         const useMasterAndLiveRoomInfo = async () => {
-            // 定义flag
+            // 定义函数是否执行成功flag
             let flag = true;
-            // 判断是否已存在值
-            if (liveRoomInfo && masterInfo && liveTime) {
-                // 所有值均已存在，不需要再获取信息
-                return flag;
-            }
             // 获取直播间信息
             liveRoomInfo = await this.useLiveRoomInfo(roomId).catch(() => {
                 // 设置flag为false
@@ -1492,24 +1531,18 @@ class ComRegister {
                 this.logger.info('直播间连接已断开');
             },
             onIncomeDanmu: ({ body }) => {
-                // 处理消息，只需要UP主名字和消息内容
-                const content = `【${masterInfo.username}的直播间】${body.user.uname}：${body.content}`;
                 // 保存消息到数组
                 currentLiveDanmakuArr.push(body.content);
-                temporaryLiveDanmakuArr.push(content);
             },
             onIncomeSuperChat: ({ body }) => {
-                // 处理SC消息
-                const content = `【${masterInfo.username}的直播间】${body.user.uname}发送了一条SC：${body.content}`;
                 // 保存消息到数组
                 currentLiveDanmakuArr.push(body.content);
-                temporaryLiveDanmakuArr.push(content);
             },
             onGuardBuy: ({ body }) => {
-                const content = `【${masterInfo.username}的直播间】${body.user.uname}加入了大航海（${body.gift_name}）`;
-                // 保存消息到数组
-                currentLiveDanmakuArr.push(content);
-                temporaryLiveDanmakuArr.push(content);
+                // 定义消息
+                const content = `${body.user.uname}加入了大航海（${body.gift_name}）`;
+                // 直接发送消息
+                channelIdArrLen > 0 && this.sendMsg(liveGuardBuyPushTargetArr, content);
             },
             onLiveStart: async () => {
                 // 判断是否已经开播
@@ -1567,12 +1600,14 @@ class ComRegister {
                 pushAtTimeTimer();
                 // 将推送定时器变量置空
                 pushAtTimeTimer = null;
+                // 发送弹幕词云
+                sendDanmakuWordCloud(getDanmakuWeightRecord());
                 // 将直播状态设置为false
                 liveStatus = false;
             }
         };
         // 启动直播间弹幕监测
-        await this.ctx.bl.startLiveRoomListener(roomId, handler, danmakuPushFunc);
+        await this.ctx.bl.startLiveRoomListener(roomId, handler);
         // 判断直播状态
         if (liveRoomInfo.live_status === 1) {
             // 设置开播时间
@@ -2127,7 +2162,7 @@ class ComRegister {
                     channelId: koishi_1.Schema.string().description('频道/群组号'),
                     dynamic: koishi_1.Schema.boolean().description('该频道/群组是否推送动态信息'),
                     live: koishi_1.Schema.boolean().description('该频道/群组是否推送直播通知'),
-                    liveDanmaku: koishi_1.Schema.boolean().description('该频道/群组是否推送弹幕消息'),
+                    liveGuardBuy: koishi_1.Schema.boolean().description('该频道/群组是否推送弹幕消息'),
                     atAll: koishi_1.Schema.boolean().description('推送开播通知时是否艾特全体成员')
                 })).description('频道/群组信息'),
                 platform: koishi_1.Schema.string().description('推送平台')
@@ -2153,7 +2188,6 @@ class ComRegister {
         customLiveEnd: koishi_1.Schema.string().required(),
         dynamicUrl: koishi_1.Schema.boolean().required(),
         dynamicLoopTime: koishi_1.Schema.number().default(60),
-        dynamicCheckNumber: koishi_1.Schema.number().required(),
         filter: koishi_1.Schema.object({
             enable: koishi_1.Schema.boolean(),
             notify: koishi_1.Schema.boolean(),

package/lib/generateImg.d.ts

@@ -24,6 +24,7 @@ declare class GenerateImg extends Service {
         link: string;
         buffer?: undefined;
     }>;
+    generateWordCloudImg(svgContent: string): Promise<string>;
     getLiveStatus(time: string, liveStatus: number): Promise<[string, string, boolean]>;
     getTimeDifference(dateString: string): Promise<string>;
     unixTimestampToString(timestamp: number): string;

package/lib/generateImg.js

@@ -1407,6 +1407,12 @@ class GenerateImg extends koishi_1.Service {
             }
         }
     }
+    async generateWordCloudImg(svgContent) {
+        // 渲染图片
+        const pic = await this.ctx.puppeteer.render(svgContent);
+        // 返回图片
+        return pic;
+    }
     async getLiveStatus(time, liveStatus) {
         let titleStatus;
         let liveTime;

package/lib/index.d.ts

@@ -36,7 +36,7 @@ export interface Config {
                 channelId: string;
                 dynamic: boolean;
                 live: boolean;
-                liveDanmaku: boolean;
+                liveGuardBuy: boolean;
                 atAll: boolean;
             }>;
             platform: string;
@@ -44,13 +44,11 @@ export interface Config {
     }>;
     dynamic: {};
     dynamicUrl: boolean;
-    dynamicCheckNumber: number;
     dynamicLoopTime: '1分钟' | '2分钟' | '3分钟' | '5分钟' | '10分钟' | '20分钟';
     live: {};
     liveDetectMode: 'API' | 'WS';
     restartPush: boolean;
     pushTime: number;
-    danmakuPushTime: number;
     customLiveStart: string;
     customLive: string;
     customLiveEnd: string;

package/lib/index.js

@@ -170,16 +170,13 @@ class ServerManager extends koishi_1.Service {
                 customLiveStart: globalConfig.customLiveStart,
                 customLive: globalConfig.customLive,
                 customLiveEnd: globalConfig.customLiveEnd,
-                dynamicCheckNumber: globalConfig.dynamicCheckNumber,
                 dynamicLoopTime: this.dynamicLoopTime,
                 dynamicUrl: globalConfig.dynamicUrl,
                 filter: globalConfig.filter,
                 dynamicDebugMode: globalConfig.dynamicDebugMode
             });
             // BL = BLive
-            const bl = this.ctx.plugin(blive_1.default, {
-                danmakuPushTime: globalConfig.danmakuPushTime
-            });
+            const bl = this.ctx.plugin(blive_1.default);
             // 添加服务
             this.servers.push(ba);
             this.servers.push(bl);
@@ -235,7 +232,7 @@ function apply(ctx, config) {
     globalConfig = config;
     // 设置提示
     ctx.notifier.create({
-        content: '从2.0.0-alpha.9以前版本更新需重新订阅'
+        content: '从3.0.0-alpha.10以前版本更新需重新订阅'
     });
     ctx.notifier.create({
         content: '请使用Auth插件创建超级管理员账号，没有权限将无法使用该插件提供的指令。'
@@ -314,7 +311,7 @@ exports.Config = koishi_1.Schema.object({
                 channelId: koishi_1.Schema.string().description('频道/群组号'),
                 dynamic: koishi_1.Schema.boolean().description('该频道/群组是否推送动态信息'),
                 live: koishi_1.Schema.boolean().description('该频道/群组是否推送直播通知'),
-                liveDanmaku: koishi_1.Schema.boolean().description('该频道/群组是否推送弹幕消息'),
+                liveGuardBuy: koishi_1.Schema.boolean().description('该频道/群组是否推送上舰消息'),
                 atAll: koishi_1.Schema.boolean().description('推送开播通知时是否艾特全体成员')
             })).description('频道/群组信息'),
             platform: koishi_1.Schema.string().description('推送平台')
@@ -324,13 +321,6 @@ exports.Config = koishi_1.Schema.object({
     dynamicUrl: koishi_1.Schema.boolean()
         .default(false)
         .description('发送动态时是否同时发送链接。注意：如果使用的是QQ官方机器人不能开启此项！'),
-    dynamicCheckNumber: koishi_1.Schema.number()
-        .min(2)
-        .max(10)
-        .role('slider')
-        .step(1)
-        .default(5)
-        .description('设定每次检查动态的数量。若订阅的UP主经常在短时间内连着发多条动态可以将该值提高，若订阅的UP主有置顶动态，在计算该值时应+1。默认值为5条'),
     dynamicLoopTime: koishi_1.Schema.union(['1分钟', '2分钟', '3分钟', '5分钟', '10分钟', '20分钟'])
         .role('')
         .default('2分钟')
@@ -352,12 +342,6 @@ exports.Config = koishi_1.Schema.object({
         .step(0.5)
         .default(1)
         .description('设定间隔多长时间推送一次直播状态，单位为小时，默认为一小时'),
-    danmakuPushTime: koishi_1.Schema.number()
-        .min(0)
-        .max(10)
-        .step(0.5)
-        .default(0.5)
-        .description('设定间隔多长时间推送一次弹幕消息，单位为分钟，默认为半分钟'),
     customLiveStart: koishi_1.Schema.string()
         .default('-name开播啦 -link')
         .description('自定义开播提示语，-name代表UP昵称，-link代表直播间链接（如果使用的是QQ官方机器人，请不要使用）。例如-name开播啦，会发送为xxxUP开播啦'),

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-bilibili-notify",
   "description": "Koishi bilibili notify plugin",
-  "version": "3.0.0-alpha.10",
+  "version": "3.0.0-alpha.12",
   "contributors": [
     "Akokko <admin@akokko.com>"
   ],
@@ -30,14 +30,17 @@
     "axios": "^1.7.9",
     "axios-cookiejar-support": "^5.0.5",
     "blive-message-listener": "^0.5.0",
+    "d3-cloud": "^1.2.7",
     "jsdom": "^24.1.3",
     "luxon": "^3.5.0",
     "md5": "^2.3.0",
     "qrcode": "^1.5.4",
+    "segmentit": "^2.0.3",
     "tough-cookie": "^4.1.4"
   },
   "devDependencies": {
     "@eslint/js": "^9.20.0",
+    "@types/d3-cloud": "^1",
     "@types/luxon": "^3.4.2",
     "@types/md5": "^2.3.5",
     "@types/qrcode": "^1.5.5",

package/readme.md

@@ -222,6 +222,8 @@
 - ver 3.0.0-alpha.8 修复：开播通知连续发送两次，登录后不会加载手动订阅中的订阅； 优化：网络请求报错
 - ver 3.0.0-alpha.9 优化：加强直播推送对获取直播信息的错误处理
 - ver 3.0.0-alpha.10 修复：连续推送两次开播通知
+- ver 3.0.0-alpha.11 新增：直播结束后推送弹幕词云，直播推送上舰消息； 修复：直播推送都是同一张画面； 移除：直播推送弹幕消息
+- ver 3.0.0-alpha.12 修复：上一版本无法安装
 
 ## 交流群