koishi-plugin-bilibili-notify 3.0.5-alpha.0 → 3.0.5-alpha.1

package/lib/comRegister.js

@@ -132,7 +132,7 @@ class ComRegister {
             }, async (err, buffer) => {
                 if (err)
                     return await session.send("二维码生成出错，请重新尝试");
-                await session.send(koishi_1.h.image(buffer, "image/png"));
+                await session.send(koishi_1.h.image(buffer, "image/jpeg"));
             });
             // 检查之前是否存在登录定时器
             if (this.loginTimer)
@@ -269,7 +269,7 @@ class ComRegister {
             // 生成图片
             const buffer = await this.ctx.gi.generateDynamicImg(item);
             // 发送图片
-            await session.send(koishi_1.h.image(buffer, "image/png"));
+            await session.send(koishi_1.h.image(buffer, "image/jpeg"));
         });
     }
     async init(config) {
@@ -649,7 +649,7 @@ class ComRegister {
                             // logger
                             this.logger.info("推送动态中...");
                             // 发送推送卡片
-                            await this.sendMsg(sub.target, (0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [koishi_1.h.image(buffer, "image/png"), dUrl] }));
+                            await this.sendMsg(sub.target, (0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [koishi_1.h.image(buffer, "image/jpeg"), dUrl] }));
                             // 判断是否需要发送动态中的图片
                             if (this.config.pushImgsInDynamic) {
                                 // 判断是否为图文动态，且存在draw
@@ -876,7 +876,7 @@ class ComRegister {
                             // logger
                             this.logger.info("推送动态中...");
                             // 发送推送卡片
-                            await this.sendMsg(sub.target, (0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [koishi_1.h.image(buffer, "image/png"), dUrl] }));
+                            await this.sendMsg(sub.target, (0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [koishi_1.h.image(buffer, "image/jpeg"), dUrl] }));
                             // logger
                             this.logger.info("动态推送完毕！");
                             // 判断是否需要发送动态中的图片
@@ -995,7 +995,7 @@ class ComRegister {
             if (!buffer)
                 return await this.sendPrivateMsgAndStopService();
             // 推送直播信息
-            const msg = ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [koishi_1.h.image(buffer, "image/png"), liveNotifyMsg || ""] }));
+            const msg = ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [koishi_1.h.image(buffer, "image/jpeg"), liveNotifyMsg || ""] }));
             // 只有在开播时才艾特全体成员
             return await this.sendMsg(target, msg, liveType === type_1.LiveType.StartBroadcasting);
         };

package/lib/generateImg.d.ts

@@ -8,7 +8,6 @@ declare class GenerateImg extends Service {
     static inject: string[];
     giConfig: GenerateImg.Config;
     constructor(ctx: Context, config: GenerateImg.Config);
-    compressImage(buffer: Buffer): Promise<Buffer>;
     imgHandler(html: string): Promise<Buffer<ArrayBufferLike>>;
     generateLiveImg(data: any, username: string, userface: string, followerDisplay: string, liveStatus: number, { cardColorStart, cardColorEnd, cardBasePlateColor, cardBasePlateBorder, }: {
         cardColorStart?: string;

package/lib/generateImg.js

@@ -1,12 +1,7 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 const koishi_1 = require("koishi");
 const luxon_1 = require("luxon");
-const imagemin_1 = __importDefault(require("imagemin"));
-const imagemin_pngquant_1 = __importDefault(require("imagemin-pngquant"));
 const node_path_1 = require("node:path");
 const node_url_1 = require("node:url");
 const utils_1 = require("./utils");
@@ -34,25 +29,6 @@ class GenerateImg extends koishi_1.Service {
         super(ctx, "gi");
         this.giConfig = config;
     }
-    async compressImage(buffer) {
-        return await (0, utils_1.withRetry)(async () => {
-            const compressedBuffer = await imagemin_1.default.buffer(buffer, {
-                plugins: [
-                    (0, imagemin_pngquant_1.default)({
-                        quality: [0.6, 0.8],
-                        speed: 4,
-                    }),
-                ],
-            });
-            if (compressedBuffer.length >= buffer.length) {
-                return buffer;
-            }
-            return Buffer.from(compressedBuffer);
-        }, 1).catch((e) => {
-            this.ctx.logger.error(`压缩图片失败: ${e.message}`);
-            return buffer;
-        });
-    }
     async imgHandler(html) {
         const htmlPath = `file://${__dirname.replaceAll("\\", "/")}/page/0.html`;
         const page = await this.ctx.puppeteer.page();
@@ -61,7 +37,7 @@ class GenerateImg extends koishi_1.Service {
         const elementHandle = await page.$("html");
         const boundingBox = await elementHandle.boundingBox();
         const buffer = await page.screenshot({
-            type: "png",
+            type: "jpeg",
             clip: {
                 x: boundingBox.x,
                 y: boundingBox.y,
@@ -71,7 +47,7 @@ class GenerateImg extends koishi_1.Service {
         });
         await elementHandle.dispose();
         await page.close();
-        return this.compressImage(buffer);
+        return buffer;
     }
     async generateLiveImg(
     // biome-ignore lint/suspicious/noExplicitAny: <explanation>

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-bilibili-notify",
   "description": "Koishi bilibili notify plugin",
-  "version": "3.0.5-alpha.0",
+  "version": "3.0.5-alpha.1",
   "contributors": [
     "Akokko <admin@akokko.com>"
   ],
@@ -27,11 +27,10 @@
     "koishi": "^4.18.7"
   },
   "dependencies": {
+    "@napi-rs/canvas": "^0.1.69",
     "axios": "^1.7.9",
     "axios-cookiejar-support": "^5.0.5",
     "blive-message-listener": "^0.5.0",
-    "imagemin": "^9.0.1",
-    "imagemin-pngquant": "^10.0.0",
     "jsdom": "^24.1.3",
     "luxon": "^3.5.0",
     "md5": "^2.3.0",
@@ -41,7 +40,6 @@
   },
   "devDependencies": {
     "@biomejs/biome": "1.9.4",
-    "@types/imagemin": "^9",
     "@types/luxon": "^3.4.2",
     "@types/md5": "^2.3.5",
     "@types/qrcode": "^1.5.5",

package/readme.md

@@ -228,6 +228,7 @@ uid为必填参数，为要推送的UP主的UID，index为可选参数，为要
 - ver 3.0.3 移除：配置项 `dynamicLoopTime` ，动态循环时间将不再可选，默认为两分钟
 - ver 3.0.4 优化：动态监测，增加时间判断，防止出现重复推送问题； 由于 `3.0.2` 动态监测定时器更换为cron定时任务，如果需要测试动态监测功能是否正常，可以通过控制台日志输出观察，打印 `动态监测初始化完毕！` 后，可进行测试
 - ver 3.0.5-alpha.0 优化：推送卡片渲染，压缩图片； 新增：指令 `bili dyn` 可用于推送指定UP主指定动态
+- ver 3.0.5-alpha.1 优化：推送卡片渲染，调整渲染图片格式为 `jpeg`
 
 ## 交流群