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

package/lib/comRegister.js

@@ -12,7 +12,6 @@ const koishi_1 = require("koishi");
 const qrcode_1 = __importDefault(require("qrcode"));
 // 弹幕词云
 const segmentit_1 = require("segmentit");
-const canvas_1 = require("canvas");
 const d3_cloud_1 = __importDefault(require("d3-cloud"));
 var LiveType;
 (function (LiveType) {
@@ -1462,22 +1461,22 @@ class ComRegister {
             // 创建画布
             const width = 800;
             const height = 600;
-            const canvas = (0, canvas_1.createCanvas)(width, height);
-            const context = canvas.getContext('2d');
             // 定义绘制函数
-            const draw = (words) => {
-                context.clearRect(0, 0, width, height);
-                context.fillStyle = '#fff';
-                context.fillRect(0, 0, width, height);
-                words.forEach(function (d) {
-                    context.font = `${d.size}px Arial`;
-                    context.fillStyle = '#000';
-                    context.fillText(d.text, d.x, d.y);
-                });
-                // 保存画布为buffer
-                const buffer = canvas.toBuffer('image/png');
+            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, koishi_1.h.image(buffer, 'image/png'));
+                this.sendMsg(target, pic);
             };
             // 配置词云
             const layout = (0, d3_cloud_1.default)()
@@ -1486,7 +1485,7 @@ class ComRegister {
                 .padding(5)
                 .font('Arial')
                 .fontSize(d => d.size)
-                .on('end', draw);
+                .on('end', generateSVG);
             // 生成词云
             layout.start();
         };

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/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-bilibili-notify",
   "description": "Koishi bilibili notify plugin",
-  "version": "3.0.0-alpha.11",
+  "version": "3.0.0-alpha.12",
   "contributors": [
     "Akokko <admin@akokko.com>"
   ],
@@ -30,7 +30,6 @@
     "axios": "^1.7.9",
     "axios-cookiejar-support": "^5.0.5",
     "blive-message-listener": "^0.5.0",
-    "canvas": "^3.1.0",
     "d3-cloud": "^1.2.7",
     "jsdom": "^24.1.3",
     "luxon": "^3.5.0",

package/readme.md

@@ -223,6 +223,7 @@
 - ver 3.0.0-alpha.9 优化：加强直播推送对获取直播信息的错误处理
 - ver 3.0.0-alpha.10 修复：连续推送两次开播通知
 - ver 3.0.0-alpha.11 新增：直播结束后推送弹幕词云，直播推送上舰消息； 修复：直播推送都是同一张画面； 移除：直播推送弹幕消息
+- ver 3.0.0-alpha.12 修复：上一版本无法安装
 
 ## 交流群