koishi-plugin-group-analysis-mx 1.2.3 → 1.2.4

package/lib/service/renderer.js

@@ -29,6 +29,10 @@ class RendererService extends koishi_1.Service {
         return path_1.default.resolve(this.templateDir, skin, filename);
     }
     async imageToBase64(url) {
+        // 已内联的 data URI 直接返回，无需再下载
+        if (typeof url === 'string' && url.startsWith('data:')) {
+            return url;
+        }
         try {
             this.ctx.logger.debug(`转换图片为 Base64: ${url}`);
             const response = await fetch(url);
@@ -191,6 +195,15 @@ class RendererService extends koishi_1.Service {
         // 等待字体加载完成
         await page.evaluate(() => document.fonts.ready);
         this.ctx.logger.info('字体加载完成。');
+        // 等待页面内图片加载完成（避免截图像素缺失/头像空白），最多等待 8 秒
+        await Promise.race([
+            page.evaluate(() => Promise.all(Array.from(document.images)
+                .filter((img) => !img.complete)
+                .map((img) => new Promise((resolve) => {
+                    img.onload = img.onerror = resolve;
+                })))),
+            new Promise((resolve) => setTimeout(resolve, 8000))
+        ]).catch(() => { });
         // 设置 3 分钟后自动删除临时文件
         this.ctx.setTimeout(async () => {
             try {
@@ -259,12 +272,15 @@ class RendererService extends koishi_1.Service {
         catch (err) {
             this.ctx.logger.debug(`等待字体加载超时: ${err}`);
         }
-        // 等待图片加载完成（头像等）
-        await page.evaluate(() => Promise.all(Array.from(document.images)
-            .filter((img) => !img.complete)
-            .map((img) => new Promise((resolve) => {
-            img.onload = img.onerror = resolve;
-        })))).catch(() => { });
+        // 等待图片加载完成（头像等），最多等待 8 秒
+        await Promise.race([
+            page.evaluate(() => Promise.all(Array.from(document.images)
+                .filter((img) => !img.complete)
+                .map((img) => new Promise((resolve) => {
+                    img.onload = img.onerror = resolve;
+                })))),
+            new Promise((resolve) => setTimeout(resolve, 8000))
+        ]).catch(() => { });
         this.ctx.setTimeout(async () => {
             try {
                 await fs_1.promises.unlink(outTemplateHtmlPath);
@@ -298,20 +314,33 @@ class RendererService extends koishi_1.Service {
                 : (t.contributors || '')
         }));
         // 用户称号：原项目子模板使用 title.avatar_data / title.name / title.title / title.mbti / title.reason
-        const titles = (data.userTitles || []).map((t) => ({
+        // 头像统一转成 base64 内联，避免外网加载失败导致头像空白
+        const avatarBase64Cache = new Map();
+        const toBase64 = async (url) => {
+            if (!url)
+                return '';
+            if (url.startsWith('data:'))
+                return url;
+            if (avatarBase64Cache.has(url))
+                return avatarBase64Cache.get(url);
+            const b64 = await this.imageToBase64(url);
+            avatarBase64Cache.set(url, b64);
+            return b64;
+        };
+        const titles = await Promise.all((data.userTitles || []).map(async (t) => ({
             name: t.name || '',
             title: t.title || '',
             mbti: t.mbti || '',
             reason: t.reason || '',
-            avatar_data: t.avatar || ''
-        }));
+            avatar_data: t.avatar ? await toBase64(t.avatar) : ''
+        })));
         // 金句：原项目子模板使用 quote.avatar_url / quote.sender / quote.content / quote.reason
-        const quotes = (data.goldenQuotes || []).map((q) => ({
+        const quotes = await Promise.all((data.goldenQuotes || []).map(async (q) => ({
             sender: q.sender || '',
             content: q.content || '',
             reason: q.reason || '',
-            avatar_url: q.avatar || ''
-        }));
+            avatar_url: q.avatar ? await toBase64(q.avatar) : ''
+        })));
         // 渲染子模板为 HTML 字符串
         let topicsHtml = '';
         let titlesHtml = '';

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "koishi-plugin-group-analysis-mx",
     "description": "群聊分析插件 - 生成精美群聊统计报告，支持 AI 话题总结（独立版，不依赖 ChatLuna）",
-    "version": "1.2.3",
+    "version": "1.2.4",
     "main": "lib/index.js",
     "module": "lib/index.mjs",
     "typings": "lib/index.d.ts",