koishi-plugin-bilibili-notify 1.2.7 → 1.2.9-alpha.0

package/lib/comRegister.js

@@ -152,13 +152,19 @@ class ComRegister {
                 // logger
                 this.logger.info('调用test gimg指令')
                 // 获取主播信息
-                const { data } = await ctx.biliAPI.getMasterInfo('194484313')
-                const resizedImage = await Jimp.read(data.info.face).then(async image => {
-                    return await image.resize(100, 100).getBufferAsync(Jimp.MIME_PNG)
-                })
+                const { data } = await ctx.biliAPI.getMasterInfo('686127')
+                let resizedImage: Buffer
+                try {
+                    resizedImage = await Jimp.read(data.info.face).then(async image => {
+                        return await image.resize(100, 100).getBufferAsync(Jimp.MIME_PNG)
+                    })
+                } catch (e) {
+                    if (e.message === 'Unsupported MIME type: image/webp') console.log('主播使用的是webp格式头像，无法进行渲染');
+                    else console.log(e);
+                }
                 // 发送下播提示语
                 await session.send(
-                    <>{h.image(resizedImage, 'image/png')} 主播{data.info.uname}已下播</>
+                    <>{resizedImage && h.image(resizedImage, 'image/png')} 主播{data.info.uname}已下播</>
                 )
             })
 
@@ -844,12 +850,14 @@ class ComRegister {
                     const dUrl = this.config.dynamicUrl ? `${upName}发布了一条动态：https://t.bilibili.com/${dynamicId}` : '';
                     // 如果pic存在，则直接返回pic
                     if (pic) {
+                        console.log('render mode');
                         // pic存在，使用的是render模式
                         await this.sendMsg(ctx, guildId, bot, pic + (0, jsx_runtime_1.jsx)(jsx_runtime_1.Fragment, { children: dUrl }));
                     }
                     else {
+                        console.log('page mode');
                         // 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'), " ", dUrl] }));
+                        await this.sendMsg(ctx, guildId, bot, (0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [(0, jsx_runtime_1.jsx)("img", { src: 'data:image/png;base64,' + buffer.toString('base64') }), " ", dUrl] }));
                     }
                     // 更新时间点为最新发布动态的发布时间
                     switch (num) {
@@ -903,23 +911,7 @@ class ComRegister {
                 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] }));
-            /* if (!liveStartMsg) {
-                // pic 存在，使用的是render模式
-                if (pic) return await this.sendMsg(ctx, guildId, bot, pic)
-                // pic不存在，说明使用的是page模式
-                await this.sendMsg(ctx, guildId, bot, h.image(buffer, 'image/png'))
-            } else if (liveStartMsg && atAll) {
-                // pic 存在，使用的是render模式
-                if (pic) return await this.sendMsg(ctx, guildId, bot, pic + <><at type="all" /> {liveStartMsg} </>)
-                // pic不存在，说明使用的是page模式
-                await this.sendMsg(ctx, guildId, bot, <>{h.image(buffer, 'image/png')} <at type="all" /> {liveStartMsg}</>)
-            } else {
-                // pic 存在，使用的是render模式
-                if (pic) return await this.sendMsg(ctx, guildId, bot, pic + <>{liveStartMsg}</>)
-                // pic不存在，说明使用的是page模式
-                await this.sendMsg(ctx, guildId, bot, h.image(buffer, 'image/png' + liveStartMsg))
-            } */
+            await this.sendMsg(ctx, guildId, bot, (0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [(0, jsx_runtime_1.jsx)("img", { src: 'data:image/png;base64,' + buffer.toString('base64') }), " ", atAll && (0, jsx_runtime_1.jsx)("at", { type: "all" }), " ", liveStartMsg && liveStartMsg] }));
         };
         return async () => {
             try {
@@ -993,11 +985,21 @@ class ComRegister {
                                 .replace('-name', uData.info.uname)
                                 .replace('-time', await ctx.gimg.getTimeDifference(liveTime));
                             // 获取头像并缩放
-                            const resizedImage = await jimp_1.default.read(uData.info.face).then(async (image) => {
-                                return await image.resize(100, 100).getBufferAsync(jimp_1.default.MIME_PNG);
-                            });
+                            let resizedImage;
+                            // Jimp无法处理Webp格式，直接跳过
+                            try {
+                                resizedImage = await jimp_1.default.read(uData.info.face).then(async (image) => {
+                                    return await image.resize(100, 100).getBufferAsync(jimp_1.default.MIME_PNG);
+                                });
+                            }
+                            catch (e) {
+                                if (e.message === 'Unsupported MIME type: image/webp')
+                                    console.log('主播使用的是webp格式头像，无法进行渲染');
+                                else
+                                    console.log(e);
+                            }
                             // 发送下播通知
-                            await this.sendMsg(ctx, guildId, bot, (0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [koishi_1.h.image(resizedImage, 'image/png'), " ", liveEndMsg] }));
+                            await this.sendMsg(ctx, guildId, bot, (0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [resizedImage && koishi_1.h.image(resizedImage, 'image/png'), " ", liveEndMsg] }));
                         }
                         // 未进循环，还未开播，继续循环
                         break;

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 {

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'
@@ -263,4 +264,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.7",
+  "version": "1.2.9-alpha.0",
   "contributors": [
     "Akokko <admin@akokko.com>"
   ],
@@ -24,11 +24,11 @@
     "bilibili"
   ],
   "peerDependencies": {
-    "koishi": "^4.17.2"
+    "koishi": "^4.17.4"
   },
   "dependencies": {
-    "axios": "^1.6.7",
-    "axios-cookiejar-support": "^5.0.0",
+    "axios": "^1.6.8",
+    "axios-cookiejar-support": "^5.0.1",
     "jimp": "^0.22.12",
     "jsdom": "^24.0.0",
     "luxon": "^3.4.4",
@@ -41,7 +41,7 @@
     "@types/md5": "^2",
     "@types/qrcode": "^1",
     "@types/tough-cookie": "^4",
-    "koishi-plugin-puppeteer": "^3.8.2"
+    "koishi-plugin-puppeteer": "^3.8.4"
   },
   "koishi": {
     "service": {

package/readme.md

@@ -141,6 +141,8 @@
 - ver 1.2.5 修复了在多群订阅的情况下，其中一个群推送失败会导致其余的群全部重新推送的bug。更换图片处理依赖以解决在插件市场中被标记为不安全插件的问题
 - ver 1.2.6 现在可以随机生成UA，并更新了UA
 - ver 1.2.7 修复不论选择什么渲染模式都是render模式的bug，优化直播卡片推送逻辑
+- ver 1.2.8 修复例如像UP主籽岷使用webp格式的头像，下播通知无法发出的bug
+- ver 1.2.9-alpha.0 bug测试版本，请跳过
 
 ## 交流群