koishi-plugin-githubsth 1.0.3-alpha.1 → 1.0.4

package/lib/commands/index.js

@@ -37,17 +37,12 @@ exports.apply = apply;
 const repo = __importStar(require("./repo"));
 const admin = __importStar(require("./admin"));
 const subscribe = __importStar(require("./subscribe"));
+const render = __importStar(require("./render"));
 function apply(ctx, config) {
-    console.log('Applying githubsth commands...');
-    // Register parent command to show help
-    ctx.command('githubsth', 'GitHub 推送通知')
-        .action(({ session }) => {
-        session?.execute('help githubsth');
-    });
+    ctx.command('githubsth', 'GitHub 订阅通知')
+        .action(({ session }) => session?.execute('help githubsth'));
     ctx.plugin(repo, config);
-    console.log('githubsth.repo loaded');
     ctx.plugin(admin, config);
-    console.log('githubsth.admin loaded');
     ctx.plugin(subscribe, config);
-    console.log('githubsth.subscribe loaded');
+    ctx.plugin(render, config);
 }

package/lib/commands/render.d.ts

@@ -0,0 +1,3 @@
+import { Context } from 'koishi';
+import { Config } from '../config';
+export declare function apply(ctx: Context, config: Config): void;

package/lib/commands/render.js

@@ -0,0 +1,55 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.apply = apply;
+const modes = ['text', 'image', 'auto'];
+const themes = ['compact', 'card', 'terminal'];
+const events = ['push', 'issues', 'issue_comment', 'pull_request', 'pull_request_review', 'star', 'fork', 'release', 'discussion', 'workflow_run'];
+function apply(ctx, config) {
+    ctx.command('githubsth.render', '通知渲染设置（文本/图片）', { authority: 3 })
+        .alias('gh.render');
+    ctx.command('githubsth.render.status', '查看渲染状态', { authority: 3 })
+        .action(async () => {
+        const status = ctx.githubsthNotifier.getRenderStatus();
+        return [
+            `mode: ${status.mode} (configured: ${status.configuredMode})`,
+            `fallback: ${status.fallback}`,
+            `theme: ${status.theme}`,
+            `width: ${status.width}`,
+            `timeout: ${status.timeoutMs}ms`,
+            `puppeteer: ${status.hasPuppeteer ? 'ready' : 'missing'}`,
+        ].join('\n');
+    });
+    ctx.command('githubsth.render.mode <mode:string>', '切换渲染模式（text/image/auto）', { authority: 3 })
+        .action(async (_, mode) => {
+        if (!mode || !modes.includes(mode)) {
+            return `无效模式。可选：${modes.join(', ')}`;
+        }
+        ctx.githubsthNotifier.setRenderMode(mode);
+        return `已切换运行时渲染模式为 ${mode}（重启后恢复配置值 ${config.renderMode}）。`;
+    });
+    ctx.command('githubsth.render.theme <theme:string>', '切换图片主题（compact/card/terminal）', { authority: 3 })
+        .action(async (_, theme) => {
+        if (!theme || !themes.includes(theme)) {
+            return `无效主题。可选：${themes.join(', ')}`;
+        }
+        config.renderTheme = theme;
+        return `已切换图片主题为 ${theme}（当前进程生效）。`;
+    });
+    ctx.command('githubsth.render.width <width:number>', '设置图片宽度', { authority: 3 })
+        .action(async (_, width) => {
+        if (!width || Number.isNaN(width))
+            return '请提供有效的数字宽度。';
+        const normalized = Math.max(480, Math.min(1600, Math.floor(width)));
+        config.renderWidth = normalized;
+        return `已设置图片宽度为 ${normalized}px（当前进程生效）。`;
+    });
+    ctx.command('githubsth.render.preview [event:string]', '预览通知渲染', { authority: 3 })
+        .action(async ({ session }, event) => {
+        const selected = event && events.includes(event) ? event : 'issue_comment';
+        if (event && !events.includes(event)) {
+            await session?.send(`未知事件 ${event}，已改用默认事件 issue_comment。`);
+        }
+        const preview = await ctx.githubsthNotifier.renderPreview(selected);
+        return preview || '预览失败：请检查 puppeteer 或渲染配置。';
+    });
+}

package/lib/config.d.ts

@@ -5,12 +5,25 @@ export interface Rule {
     platform?: string;
     events: string[];
 }
+export type RenderMode = 'text' | 'image' | 'auto';
+export type RenderFallback = 'text' | 'drop';
+export type RenderTheme = 'compact' | 'card' | 'terminal';
 export interface Config {
     defaultOwner?: string;
     defaultRepo?: string;
     debug: boolean;
     logUnhandledEvents: boolean;
     defaultEvents: string[];
+    enableSessionFallback: boolean;
+    dedupRetentionHours: number;
+    sendRetryCount: number;
+    sendRetryBaseDelayMs: number;
+    formatterLocale: 'zh-CN' | 'en-US';
+    renderMode: RenderMode;
+    renderFallback: RenderFallback;
+    renderTheme: RenderTheme;
+    renderWidth: number;
+    renderTimeoutMs: number;
     rules?: Rule[];
 }
 export declare const Config: Schema<Config>;

package/lib/config.js

@@ -3,17 +3,41 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Config = void 0;
 const koishi_1 = require("koishi");
 exports.Config = koishi_1.Schema.object({
-    defaultOwner: koishi_1.Schema.string().description('默认仓库拥有者'),
-    defaultRepo: koishi_1.Schema.string().description('默认仓库名称'),
-    debug: koishi_1.Schema.boolean().default(false).description('启用调试模式，输出详细日志'),
-    logUnhandledEvents: koishi_1.Schema.boolean().default(false).description('是否记录未处理的 Webhook 事件 (Unknown events)'),
+    defaultOwner: koishi_1.Schema.string().description('默认仓库 Owner。'),
+    defaultRepo: koishi_1.Schema.string().description('默认仓库名称。'),
+    debug: koishi_1.Schema.boolean().default(false).description('启用调试日志。'),
+    logUnhandledEvents: koishi_1.Schema.boolean().default(false).description('记录未处理的 webhook 事件。'),
+    enableSessionFallback: koishi_1.Schema.boolean().default(true).description('启用 message-created 回退事件解析。'),
+    dedupRetentionHours: koishi_1.Schema.number().min(1).max(720).default(72).description('事件幂等记录保留小时数。'),
+    sendRetryCount: koishi_1.Schema.number().min(0).max(10).default(2).description('消息发送失败重试次数。'),
+    sendRetryBaseDelayMs: koishi_1.Schema.number().min(100).max(30000).default(800).description('重试基础延迟（毫秒，指数退避）。'),
+    formatterLocale: koishi_1.Schema.union([
+        koishi_1.Schema.const('zh-CN').description('中文'),
+        koishi_1.Schema.const('en-US').description('English'),
+    ]).default('zh-CN').description('通知文本语言。'),
+    renderMode: koishi_1.Schema.union([
+        koishi_1.Schema.const('auto').description('自动：优先图片，失败回退'),
+        koishi_1.Schema.const('image').description('仅图片'),
+        koishi_1.Schema.const('text').description('仅文本'),
+    ]).default('auto').description('通知渲染模式。'),
+    renderFallback: koishi_1.Schema.union([
+        koishi_1.Schema.const('text').description('图片失败回退文本'),
+        koishi_1.Schema.const('drop').description('图片失败则丢弃'),
+    ]).default('text').description('图片渲染失败时的回退策略。'),
+    renderTheme: koishi_1.Schema.union([
+        koishi_1.Schema.const('compact').description('紧凑样式'),
+        koishi_1.Schema.const('card').description('卡片样式'),
+        koishi_1.Schema.const('terminal').description('终端样式'),
+    ]).default('compact').description('图片通知主题。'),
+    renderWidth: koishi_1.Schema.number().min(480).max(1600).default(840).description('图片宽度（像素）。'),
+    renderTimeoutMs: koishi_1.Schema.number().min(1000).max(60000).default(12000).description('单次图片渲染超时（毫秒）。'),
     defaultEvents: koishi_1.Schema.array(koishi_1.Schema.string())
         .default(['push', 'issues', 'issue_comment', 'pull_request', 'pull_request_review', 'release', 'star', 'fork'])
-        .description('默认订阅事件列表 (当不指定事件时使用)'),
+        .description('未显式指定时使用的默认订阅事件列表。'),
     rules: koishi_1.Schema.array(koishi_1.Schema.object({
         repo: koishi_1.Schema.string().required(),
         channelId: koishi_1.Schema.string().required(),
         platform: koishi_1.Schema.string(),
         events: koishi_1.Schema.array(koishi_1.Schema.string()).default(['push', 'issues', 'pull_request', 'issue_comment', 'pull_request_review']),
-    })).hidden().description('已废弃，请使用数据库管理订阅'),
+    })).hidden().description('已废弃，仅保留兼容。建议改用数据库订阅管理。'),
 });

package/lib/database.d.ts

@@ -3,6 +3,7 @@ declare module 'koishi' {
     interface Tables {
         github_subscription: GithubSubscription;
         github_trusted_repo: GithubTrustedRepo;
+        github_event_dedup: GithubEventDedup;
     }
 }
 export interface GithubSubscription {
@@ -19,4 +20,11 @@ export interface GithubTrustedRepo {
     addedBy: string;
     addedAt: Date;
 }
+export interface GithubEventDedup {
+    id: number;
+    dedupKey: string;
+    event: string;
+    repo: string;
+    createdAt: Date;
+}
 export declare function apply(ctx: Context): void;

package/lib/database.js

@@ -10,6 +10,7 @@ function apply(ctx) {
         events: 'list',
     }, {
         autoInc: true,
+        unique: ['repo', 'channelId', 'platform'],
     });
     ctx.model.extend('github_trusted_repo', {
         id: 'unsigned',
@@ -21,4 +22,14 @@ function apply(ctx) {
         autoInc: true,
         unique: ['repo'],
     });
+    ctx.model.extend('github_event_dedup', {
+        id: 'unsigned',
+        dedupKey: 'string',
+        event: 'string',
+        repo: 'string',
+        createdAt: 'timestamp',
+    }, {
+        autoInc: true,
+        unique: ['dedupKey'],
+    });
 }

package/lib/index.js

@@ -44,31 +44,28 @@ exports.apply = apply;
 const commands_1 = require("./commands");
 const database = __importStar(require("./database"));
 const zh_CN_1 = __importDefault(require("./locales/zh-CN"));
+const en_US_1 = __importDefault(require("./locales/en-US"));
 const notifier_1 = require("./services/notifier");
 const formatter_1 = require("./services/formatter");
 exports.name = 'githubsth';
 exports.inject = {
     required: ['database'],
-    optional: ['github'],
+    optional: ['github', 'puppeteer'],
 };
 __exportStar(require("./config"), exports);
 function apply(ctx, config) {
     const logger = ctx.logger('githubsth');
     logger.info('Plugin loading...');
-    // 本地化
     ctx.i18n.define('zh-CN', zh_CN_1.default);
-    // 数据库
+    ctx.i18n.define('en-US', en_US_1.default);
     ctx.plugin(database);
-    // 注册服务
-    ctx.plugin(formatter_1.Formatter);
+    ctx.plugin(formatter_1.Formatter, config);
     ctx.plugin(notifier_1.Notifier, config);
-    // 注册命令
-    // admin and subscribe are already loaded in commands/index.ts, remove duplicate loading here
     try {
         ctx.plugin(commands_1.apply, config);
         logger.info('Plugin loaded successfully');
     }
-    catch (e) {
-        logger.error('Plugin failed to load:', e);
+    catch (error) {
+        logger.error('Plugin failed to load:', error);
     }
 }

package/lib/locales/en-US.d.ts

@@ -0,0 +1,17 @@
+declare const _default: {
+    commands: {
+        githubsth: {
+            description: string;
+        };
+        'githubsth.repo': {
+            description: string;
+            messages: {
+                repo_info: string;
+                error: string;
+                specify_repo: string;
+                not_found: string;
+            };
+        };
+    };
+};
+export default _default;

package/lib/locales/en-US.js

@@ -0,0 +1,18 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = {
+    commands: {
+        githubsth: {
+            description: 'GitHub subscription notifier',
+        },
+        'githubsth.repo': {
+            description: 'Get repository info',
+            messages: {
+                repo_info: 'Repository: {0}/{1}\nDescription: {2}\nStars: {3}',
+                error: 'Failed to fetch repository info: {0}',
+                specify_repo: 'Please specify repository as owner/repo.',
+                not_found: 'Repository not found or access denied.',
+            },
+        },
+    },
+};

package/lib/locales/zh-CN.js

@@ -3,16 +3,16 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = {
     commands: {
         githubsth: {
-            description: 'GitHub 交互插件'
+            description: 'GitHub 订阅通知插件',
         },
         'githubsth.repo': {
             description: '获取仓库信息',
             messages: {
                 repo_info: '仓库: {0}/{1}\n描述: {2}\nStars: {3}',
-                error: '获取信息失败: {0}',
-                specify_repo: '请指定仓库名称。',
-                not_found: '未找到仓库或无权限访问。'
-            }
-        }
-    }
+                error: '获取仓库信息失败: {0}',
+                specify_repo: '请指定仓库名称（owner/repo）。',
+                not_found: '未找到仓库或无权限访问。',
+            },
+        },
+    },
 };

package/lib/services/formatter.d.ts

@@ -1,19 +1,25 @@
-import { Context, Service, h } from 'koishi';
+import { Context, Service } from 'koishi';
+import type { Config } from '../config';
 declare module 'koishi' {
     interface Context {
         githubsthFormatter: Formatter;
     }
 }
 export declare class Formatter extends Service {
-    constructor(ctx: Context);
-    formatPush(payload: any): h | null;
-    formatIssue(payload: any): h;
-    formatPullRequest(payload: any): h;
-    formatStar(payload: any): h | null;
-    formatFork(payload: any): h;
-    formatRelease(payload: any): h | null;
-    formatDiscussion(payload: any): h;
-    formatWorkflowRun(payload: any): h | null;
-    formatIssueComment(payload: any): h | null;
-    formatPullRequestReview(payload: any): h | null;
+    private readonly locale;
+    constructor(ctx: Context, config?: Partial<Config>);
+    formatPush(payload: any): string | null;
+    formatIssue(payload: any): string;
+    formatPullRequest(payload: any): string;
+    formatStar(payload: any): string | null;
+    formatFork(payload: any): string;
+    formatRelease(payload: any): string | null;
+    formatDiscussion(payload: any): string;
+    formatWorkflowRun(payload: any): string | null;
+    formatIssueComment(payload: any): string | null;
+    formatPullRequestReview(payload: any): string | null;
+    private summarizeCommentBody;
+    private mapAction;
+    private t;
+    private render;
 }