koishi-plugin-githubsth 1.0.4 → 1.0.5-alpha.0

package/lib/services/notifier.d.ts

@@ -30,6 +30,7 @@ export declare class Notifier extends Service {
     private formatByEvent;
     private prepareOutboundMessage;
     private renderTextAsImage;
+    private normalizeRenderedImage;
     private buildImageHtml;
     private escapeHtml;
     private extractRepoName;

package/lib/services/notifier.js

@@ -35,7 +35,8 @@ class Notifier extends koishi_1.Service {
     async renderPreview(event = 'issue_comment') {
         const payload = this.getPreviewPayload(event);
         const text = this.formatByEvent(event, payload) || this.formatByEvent('issue_comment', this.getPreviewPayload('issue_comment')) || 'Preview unavailable.';
-        return this.prepareOutboundMessage(text);
+        const preview = await this.prepareOutboundMessage(text);
+        return preview?.message || null;
     }
     registerListeners() {
         const bind = (name, event) => {
@@ -204,14 +205,16 @@ class Notifier extends koishi_1.Service {
     }
     async prepareOutboundMessage(textMessage) {
         const mode = this.getRenderMode();
-        if (mode === 'text')
-            return textMessage;
-        const image = await this.renderTextAsImage(textMessage);
-        if (image)
-            return image;
+        if (mode === 'text') {
+            return { message: textMessage, text: textMessage, isImage: false };
+        }
+        const imageMessage = await this.renderTextAsImage(textMessage);
+        if (imageMessage) {
+            return { message: imageMessage, text: textMessage, isImage: true };
+        }
         if (mode === 'image' && this.config.renderFallback === 'drop')
             return null;
-        return textMessage;
+        return { message: textMessage, text: textMessage, isImage: false };
     }
     async renderTextAsImage(textMessage) {
         const puppeteer = this.ctx.puppeteer;
@@ -221,19 +224,36 @@ class Notifier extends koishi_1.Service {
             const html = this.buildImageHtml(textMessage);
             const task = puppeteer.render(html);
             const timeout = this.config.renderTimeoutMs || 12000;
-            const buffer = await Promise.race([
+            const rendered = await Promise.race([
                 task,
                 new Promise((resolve) => setTimeout(() => resolve(null), timeout)),
             ]);
-            if (!buffer)
+            if (!rendered)
                 return null;
-            return koishi_1.h.image(buffer, 'image/png');
+            return this.normalizeRenderedImage(rendered);
         }
         catch (error) {
             this.ctx.logger('githubsth').warn('Image render failed:', error);
             return null;
         }
     }
+    normalizeRenderedImage(rendered) {
+        if (!rendered)
+            return null;
+        if (typeof rendered === 'string') {
+            const trimmed = rendered.trim();
+            if (trimmed.startsWith('<img'))
+                return trimmed;
+            if (trimmed.startsWith('data:image/'))
+                return koishi_1.h.image(trimmed);
+            return null;
+        }
+        if (Buffer.isBuffer(rendered))
+            return koishi_1.h.image(rendered, 'image/png');
+        if (rendered instanceof Uint8Array)
+            return koishi_1.h.image(Buffer.from(rendered), 'image/png');
+        return null;
+    }
     buildImageHtml(textMessage) {
         const escaped = this.escapeHtml(textMessage).replace(/\n/g, '<br/>');
         const width = this.config.renderWidth || 840;
@@ -482,22 +502,31 @@ class Notifier extends koishi_1.Service {
             }
         }
     }
-    async sendMessage(rule, message) {
+    async sendMessage(rule, outbound) {
         const bots = this.ctx.bots.filter((bot) => !rule.platform || bot.platform === rule.platform);
         if (!bots.length)
             return;
         for (const bot of bots) {
             try {
-                await this.sendWithRetry(bot, rule.channelId, message);
-                if (this.config.debug) {
+                await this.sendWithRetry(bot, rule.channelId, outbound.message);
+                if (this.config.debug)
                     this.ctx.logger('notifier').info(`Sent message to ${rule.channelId} via ${bot.platform}:${bot.selfId}`);
-                }
                 return;
             }
             catch (error) {
-                if (this.config.debug) {
-                    this.ctx.logger('notifier').warn(`Bot ${bot.sid} failed to send message with retries: ${error}`);
+                if (outbound.isImage && this.config.renderFallback === 'text') {
+                    try {
+                        await this.sendWithRetry(bot, rule.channelId, outbound.text);
+                        this.ctx.logger('notifier').warn(`Image failed on ${bot.platform}:${bot.selfId}, fallback to text succeeded.`);
+                        return;
+                    }
+                    catch (fallbackError) {
+                        if (this.config.debug)
+                            this.ctx.logger('notifier').warn(`Fallback text send failed: ${fallbackError}`);
+                    }
                 }
+                if (this.config.debug)
+                    this.ctx.logger('notifier').warn(`Bot ${bot.sid} failed to send message with retries: ${error}`);
             }
         }
         this.ctx.logger('notifier').warn(`Failed to send message to ${rule.channelId}`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "koishi-plugin-githubsth",
-  "version": "1.0.4",
+  "version": "1.0.5-alpha.0",
   "description": "Github Subscriptions Notifications, push notifications for GitHub subscriptions For koishi",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",