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

package/lib/config.d.ts

@@ -11,6 +11,11 @@ export interface Config {
     debug: boolean;
     logUnhandledEvents: boolean;
     defaultEvents: string[];
+    enableSessionFallback: boolean;
+    dedupRetentionHours: number;
+    sendRetryCount: number;
+    sendRetryBaseDelayMs: number;
+    formatterLocale: 'zh-CN' | 'en-US';
     rules?: Rule[];
 }
 export declare const Config: Schema<Config>;

package/lib/config.js

@@ -3,17 +3,25 @@ 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('通知文本语言。'),
     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

@@ -21,4 +21,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,6 +44,7 @@ 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';
@@ -55,20 +56,16 @@ __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,11 +1,13 @@
 import { Context, Service, h } from 'koishi';
+import type { Config } from '../config';
 declare module 'koishi' {
     interface Context {
         githubsthFormatter: Formatter;
     }
 }
 export declare class Formatter extends Service {
-    constructor(ctx: Context);
+    private readonly locale;
+    constructor(ctx: Context, config?: Partial<Config>);
     formatPush(payload: any): h | null;
     formatIssue(payload: any): h;
     formatPullRequest(payload: any): h;
@@ -16,4 +18,8 @@ export declare class Formatter extends Service {
     formatWorkflowRun(payload: any): h | null;
     formatIssueComment(payload: any): h | null;
     formatPullRequestReview(payload: any): h | null;
+    private summarizeCommentBody;
+    private mapAction;
+    private t;
+    private render;
 }

package/lib/services/formatter.js

@@ -2,121 +2,306 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Formatter = void 0;
 const koishi_1 = require("koishi");
+const I18N = {
+    'zh-CN': {
+        unknownRepo: '未知仓库',
+        unknownUser: '未知用户',
+        unknownTitle: '无标题',
+        unknownState: '未知状态',
+        unknownBranch: '未知分支',
+        unknownResult: '未知结果',
+        noDescription: '无描述',
+        emptyComment: '（空评论）',
+        hiddenMachinePayload: '检测到自动化系统签名/编码载荷，已省略原始内容。',
+        pushTitle: '🚀 [代码推送]',
+        pushBy: '推送者',
+        pushBranch: '分支',
+        pushCommits: '提交',
+        pushMore: '其余 {0} 条提交已省略',
+        pushCompare: '比较链接',
+        issueTitle: '🐞 [Issue 变更]',
+        issueCommentTitle: '💬 [Issue 评论]',
+        prCommentTitle: '💬 [PR 评论]',
+        issueLabel: '议题',
+        prTitle: '🔀 [PR 变更]',
+        prLabel: '拉取请求',
+        byUser: '发起人',
+        reviewer: '审查者',
+        commenter: '评论人',
+        content: '内容摘要',
+        status: '状态',
+        action: '动作',
+        link: '链接',
+        starTitle: '⭐ [收到 Star]',
+        starText: '{0} 为仓库点了 Star',
+        starCount: '当前 Star',
+        forkTitle: '🍴 [仓库 Fork]',
+        forkText: '{0} Fork 了仓库',
+        forkNewRepo: '新仓库',
+        releaseTitle: '📦 [版本发布]',
+        releaseTag: '版本号',
+        releaseName: '版本标题',
+        discussionTitle: '🧵 [Discussion 变更]',
+        workflowTitle: '⚙️ [工作流完成]',
+        workflowName: '工作流',
+        workflowResult: '结果',
+        workflowBranch: '分支',
+        reviewTitle: '✅ [PR Review]',
+        actionMap: {
+            opened: '已创建',
+            closed: '已关闭',
+            reopened: '已重新打开',
+            edited: '已编辑',
+            deleted: '已删除',
+            pinned: '已置顶',
+            unpinned: '已取消置顶',
+            submitted: '已提交',
+            created: '已创建',
+            synchronize: '已同步',
+            ready_for_review: '可审查',
+            published: '已发布',
+            completed: '已完成',
+            started: '已开始',
+        },
+    },
+    'en-US': {
+        unknownRepo: 'Unknown repository',
+        unknownUser: 'Unknown user',
+        unknownTitle: 'Untitled',
+        unknownState: 'Unknown state',
+        unknownBranch: 'Unknown branch',
+        unknownResult: 'Unknown result',
+        noDescription: 'No description',
+        emptyComment: '(empty comment)',
+        hiddenMachinePayload: 'Detected automated signature/encoded payload. Raw content hidden.',
+        pushTitle: '🚀 [Push Event]',
+        pushBy: 'Pusher',
+        pushBranch: 'Branch',
+        pushCommits: 'Commits',
+        pushMore: '{0} more commits omitted',
+        pushCompare: 'Compare',
+        issueTitle: '🐞 [Issue Update]',
+        issueCommentTitle: '💬 [Issue Comment]',
+        prCommentTitle: '💬 [PR Comment]',
+        issueLabel: 'Issue',
+        prTitle: '🔀 [PR Update]',
+        prLabel: 'Pull Request',
+        byUser: 'By',
+        reviewer: 'Reviewer',
+        commenter: 'Commenter',
+        content: 'Summary',
+        status: 'Status',
+        action: 'Action',
+        link: 'Link',
+        starTitle: '⭐ [New Star]',
+        starText: '{0} starred the repository',
+        starCount: 'Stars',
+        forkTitle: '🍴 [Repository Forked]',
+        forkText: '{0} forked the repository',
+        forkNewRepo: 'New repository',
+        releaseTitle: '📦 [Release Published]',
+        releaseTag: 'Tag',
+        releaseName: 'Release name',
+        discussionTitle: '🧵 [Discussion Update]',
+        workflowTitle: '⚙️ [Workflow Completed]',
+        workflowName: 'Workflow',
+        workflowResult: 'Result',
+        workflowBranch: 'Branch',
+        reviewTitle: '✅ [PR Review]',
+        actionMap: {
+            opened: 'opened',
+            closed: 'closed',
+            reopened: 'reopened',
+            edited: 'edited',
+            deleted: 'deleted',
+            pinned: 'pinned',
+            unpinned: 'unpinned',
+            submitted: 'submitted',
+            created: 'created',
+            synchronize: 'synchronized',
+            ready_for_review: 'ready for review',
+            published: 'published',
+            completed: 'completed',
+            started: 'started',
+        },
+    },
+};
 class Formatter extends koishi_1.Service {
-    constructor(ctx) {
+    // @ts-ignore
+    constructor(ctx, config) {
         super(ctx, 'githubsthFormatter');
-        ctx.logger('githubsth').info('Formatter service initialized');
+        this.locale = config?.formatterLocale === 'en-US' ? 'en-US' : 'zh-CN';
+        ctx.logger('githubsth').info(`Formatter service initialized (${this.locale})`);
     }
     formatPush(payload) {
-        const { repository, pusher, commits, compare, ref } = payload;
-        if (!commits || commits.length === 0)
+        const repository = payload.repository?.full_name || this.t('unknownRepo');
+        const pusher = payload.pusher?.name || payload.sender?.login || this.t('unknownUser');
+        const branch = payload.ref ? String(payload.ref).replace('refs/heads/', '') : this.t('unknownBranch');
+        const commits = Array.isArray(payload.commits) ? payload.commits : [];
+        if (commits.length === 0)
             return null;
-        const commitLines = commits.map((c) => {
-            const shortHash = c.id?.substring(0, 7) || '???????';
-            const message = c.message?.split('\n')[0] || 'No message';
-            const author = c.author?.name || 'Unknown';
-            return `[${shortHash}] ${message} - ${author}`;
+        const preview = commits.slice(0, 5).map((commit) => {
+            const hash = commit.id?.slice(0, 7) || '0000000';
+            const message = (commit.message || 'No message').split('\n')[0];
+            const author = commit.author?.name || this.t('unknownUser');
+            return `- [${hash}] ${message} — ${author}`;
         }).join('\n');
-        return (0, koishi_1.h)('message', [
-            (0, koishi_1.h)('text', { content: `[GitHub] ${repository?.full_name || 'Unknown Repo'} 收到新的推送\n` }),
-            (0, koishi_1.h)('text', { content: `提交者: ${pusher?.name || 'Unknown'}\n` }),
-            (0, koishi_1.h)('text', { content: `分支: ${ref ? ref.replace('refs/heads/', '') : 'unknown'}\n` }),
-            (0, koishi_1.h)('text', { content: `详情: ${compare || ''}\n` }),
-            (0, koishi_1.h)('text', { content: commitLines })
+        const restCount = commits.length - 5;
+        const restLine = restCount > 0 ? `\n${this.t('pushMore', [restCount])}` : '';
+        const compareLine = payload.compare ? `\n${this.t('pushCompare')}: ${payload.compare}` : '';
+        return this.render([
+            `${this.t('pushTitle')} ${repository}`,
+            `${this.t('pushBy')}: ${pusher}`,
+            `${this.t('pushBranch')}: ${branch}`,
+            `${this.t('pushCommits')}:\n${preview}${restLine}${compareLine}`,
         ]);
     }
     formatIssue(payload) {
-        const { action, issue, repository, sender } = payload;
-        return (0, koishi_1.h)('message', [
-            (0, koishi_1.h)('text', { content: `[GitHub] ${repository?.full_name || 'Unknown Repo'} Issue ${action || 'updated'}\n` }),
-            (0, koishi_1.h)('text', { content: `标题: #${issue?.number || '?'} ${issue?.title || 'No Title'}\n` }),
-            (0, koishi_1.h)('text', { content: `发起人: ${sender?.login || 'Unknown'}\n` }),
-            (0, koishi_1.h)('text', { content: `链接: ${issue?.html_url || ''}` })
+        const issue = payload.issue || {};
+        const repository = payload.repository?.full_name || this.t('unknownRepo');
+        const actor = payload.sender?.login || issue.user?.login || this.t('unknownUser');
+        const action = this.mapAction(payload.action);
+        return this.render([
+            `${this.t('issueTitle')} ${repository}`,
+            `${this.t('action')}: ${action}`,
+            `${this.t('issueLabel')}: #${issue.number ?? '?'} ${issue.title || this.t('unknownTitle')}`,
+            `${this.t('byUser')}: ${actor}`,
+            `${this.t('link')}: ${issue.html_url || ''}`,
         ]);
     }
     formatPullRequest(payload) {
-        const { action, pull_request, repository, sender } = payload;
-        return (0, koishi_1.h)('message', [
-            (0, koishi_1.h)('text', { content: `[GitHub] ${repository?.full_name || 'Unknown Repo'} PR ${action || 'updated'}\n` }),
-            (0, koishi_1.h)('text', { content: `标题: #${pull_request?.number || '?'} ${pull_request?.title || 'No Title'}\n` }),
-            (0, koishi_1.h)('text', { content: `发起人: ${sender?.login || 'Unknown'}\n` }),
-            (0, koishi_1.h)('text', { content: `状态: ${pull_request?.state || 'unknown'}\n` }),
-            (0, koishi_1.h)('text', { content: `链接: ${pull_request?.html_url || ''}` })
+        const pr = payload.pull_request || {};
+        const repository = payload.repository?.full_name || this.t('unknownRepo');
+        const actor = payload.sender?.login || pr.user?.login || this.t('unknownUser');
+        const action = this.mapAction(payload.action);
+        return this.render([
+            `${this.t('prTitle')} ${repository}`,
+            `${this.t('action')}: ${action}`,
+            `${this.t('prLabel')}: #${pr.number ?? '?'} ${pr.title || this.t('unknownTitle')}`,
+            `${this.t('byUser')}: ${actor}`,
+            `${this.t('status')}: ${pr.state || this.t('unknownState')}`,
+            `${this.t('link')}: ${pr.html_url || ''}`,
         ]);
     }
     formatStar(payload) {
-        const { action, repository, sender } = payload;
-        if (action !== 'created')
+        if (payload.action !== 'created')
             return null;
-        return (0, koishi_1.h)('message', [
-            (0, koishi_1.h)('text', { content: `[GitHub] ${sender?.login || 'Unknown'} Star 了仓库 ${repository?.full_name || 'Unknown Repo'} 🌟\n` }),
-            (0, koishi_1.h)('text', { content: `当前 Star 数: ${repository?.stargazers_count !== undefined ? repository.stargazers_count : '?'}` })
+        const repository = payload.repository?.full_name || this.t('unknownRepo');
+        const actor = payload.sender?.login || this.t('unknownUser');
+        const starCount = payload.repository?.stargazers_count ?? '?';
+        return this.render([
+            `${this.t('starTitle')} ${repository}`,
+            this.t('starText', [actor]),
+            `${this.t('starCount')}: ${starCount}`,
         ]);
     }
     formatFork(payload) {
-        const { forkee, repository, sender } = payload;
-        return (0, koishi_1.h)('message', [
-            (0, koishi_1.h)('text', { content: `[GitHub] ${sender?.login || 'Unknown'} Fork 了仓库 ${repository?.full_name || 'Unknown Repo'}\n` }),
-            (0, koishi_1.h)('text', { content: `新仓库: ${forkee?.full_name || 'Unknown'}` })
+        const repository = payload.repository?.full_name || this.t('unknownRepo');
+        const actor = payload.sender?.login || this.t('unknownUser');
+        const forkee = payload.forkee?.full_name || this.t('unknownRepo');
+        return this.render([
+            `${this.t('forkTitle')} ${repository}`,
+            this.t('forkText', [actor]),
+            `${this.t('forkNewRepo')}: ${forkee}`,
         ]);
     }
     formatRelease(payload) {
-        const { action, release, repository } = payload;
-        if (action !== 'published')
+        if (payload.action !== 'published')
             return null;
-        return (0, koishi_1.h)('message', [
-            (0, koishi_1.h)('text', { content: `[GitHub] ${repository?.full_name || 'Unknown Repo'} 发布了新版本 ${release?.tag_name || 'unknown'} 🎉\n` }),
-            (0, koishi_1.h)('text', { content: `标题: ${release?.name || 'No Title'}\n` }),
-            (0, koishi_1.h)('text', { content: `链接: ${release?.html_url || ''}` })
+        const repository = payload.repository?.full_name || this.t('unknownRepo');
+        const release = payload.release || {};
+        return this.render([
+            `${this.t('releaseTitle')} ${repository}`,
+            `${this.t('releaseTag')}: ${release.tag_name || 'unknown'}`,
+            `${this.t('releaseName')}: ${release.name || this.t('unknownTitle')}`,
+            `${this.t('link')}: ${release.html_url || ''}`,
         ]);
     }
     formatDiscussion(payload) {
-        const { action, discussion, repository, sender } = payload;
-        return (0, koishi_1.h)('message', [
-            (0, koishi_1.h)('text', { content: `[GitHub] ${repository?.full_name || 'Unknown Repo'} Discussion ${action || 'updated'}\n` }),
-            (0, koishi_1.h)('text', { content: `标题: #${discussion?.number || '?'} ${discussion?.title || 'No Title'}\n` }),
-            (0, koishi_1.h)('text', { content: `发起人: ${sender?.login || 'Unknown'}\n` }),
-            (0, koishi_1.h)('text', { content: `链接: ${discussion?.html_url || ''}` })
+        const discussion = payload.discussion || {};
+        const repository = payload.repository?.full_name || this.t('unknownRepo');
+        const actor = payload.sender?.login || discussion.user?.login || this.t('unknownUser');
+        const action = this.mapAction(payload.action);
+        return this.render([
+            `${this.t('discussionTitle')} ${repository}`,
+            `${this.t('action')}: ${action}`,
+            `Discussion: #${discussion.number ?? '?'} ${discussion.title || this.t('unknownTitle')}`,
+            `${this.t('byUser')}: ${actor}`,
+            `${this.t('link')}: ${discussion.html_url || ''}`,
         ]);
     }
     formatWorkflowRun(payload) {
-        const { action, workflow_run, repository } = payload;
-        if (action !== 'completed')
+        if (payload.action !== 'completed')
             return null;
-        const statusIcon = workflow_run?.conclusion === 'success' ? '✅' : '❌';
-        return (0, koishi_1.h)('message', [
-            (0, koishi_1.h)('text', { content: `[GitHub] ${repository?.full_name || 'Unknown Repo'} 工作流运行完成 ${statusIcon}\n` }),
-            (0, koishi_1.h)('text', { content: `工作流: ${workflow_run?.name || 'Unknown'}\n` }),
-            (0, koishi_1.h)('text', { content: `结果: ${workflow_run?.conclusion || 'unknown'}\n` }),
-            (0, koishi_1.h)('text', { content: `分支: ${workflow_run?.head_branch || 'unknown'}\n` }),
-            (0, koishi_1.h)('text', { content: `链接: ${workflow_run?.html_url || ''}` })
+        const repository = payload.repository?.full_name || this.t('unknownRepo');
+        const workflow = payload.workflow_run || {};
+        const result = workflow.conclusion || this.t('unknownResult');
+        const icon = result === 'success' ? '✅' : (result === 'failure' ? '❌' : '⚠️');
+        return this.render([
+            `${this.t('workflowTitle')} ${repository}`,
+            `${this.t('workflowName')}: ${workflow.name || 'Unknown'}`,
+            `${this.t('workflowResult')}: ${icon} ${result}`,
+            `${this.t('workflowBranch')}: ${workflow.head_branch || this.t('unknownBranch')}`,
+            `${this.t('link')}: ${workflow.html_url || ''}`,
         ]);
     }
     formatIssueComment(payload) {
-        const { action, issue, comment, repository, sender } = payload;
-        if (action !== 'created')
+        if (payload.action !== 'created')
             return null;
-        const body = comment?.body || '';
-        const shortBody = body.length > 100 ? body.substring(0, 100) + '...' : body;
-        return (0, koishi_1.h)('message', [
-            (0, koishi_1.h)('text', { content: `[GitHub] ${repository?.full_name || 'Unknown Repo'} Issue 收到新评论\n` }),
-            (0, koishi_1.h)('text', { content: `标题: #${issue?.number || '?'} ${issue?.title || 'No Title'}\n` }),
-            (0, koishi_1.h)('text', { content: `评论人: ${sender?.login || 'Unknown'}\n` }),
-            (0, koishi_1.h)('text', { content: `内容: ${shortBody}\n` }),
-            (0, koishi_1.h)('text', { content: `链接: ${comment?.html_url || ''}` })
+        const issue = payload.issue || {};
+        const comment = payload.comment || {};
+        const repository = payload.repository?.full_name || this.t('unknownRepo');
+        const actor = payload.sender?.login || comment.user?.login || this.t('unknownUser');
+        const isPrComment = Boolean(issue.pull_request);
+        return this.render([
+            `${isPrComment ? this.t('prCommentTitle') : this.t('issueCommentTitle')} ${repository}`,
+            `${isPrComment ? this.t('prLabel') : this.t('issueLabel')}: #${issue.number ?? '?'} ${issue.title || this.t('unknownTitle')}`,
+            `${this.t('commenter')}: ${actor}`,
+            `${this.t('content')}: ${this.summarizeCommentBody(comment.body || '')}`,
+            `${this.t('link')}: ${comment.html_url || issue.html_url || ''}`,
         ]);
     }
     formatPullRequestReview(payload) {
-        const { action, pull_request, review, repository, sender } = payload;
-        if (action !== 'submitted')
+        if (payload.action !== 'submitted')
             return null;
-        return (0, koishi_1.h)('message', [
-            (0, koishi_1.h)('text', { content: `[GitHub] ${repository?.full_name || 'Unknown Repo'} PR 收到 Review\n` }),
-            (0, koishi_1.h)('text', { content: `标题: #${pull_request?.number || '?'} ${pull_request?.title || 'No Title'}\n` }),
-            (0, koishi_1.h)('text', { content: `Reviewer: ${sender?.login || 'Unknown'}\n` }),
-            (0, koishi_1.h)('text', { content: `状态: ${review?.state || 'unknown'}\n` }),
-            (0, koishi_1.h)('text', { content: `链接: ${review?.html_url || ''}` })
+        const pr = payload.pull_request || {};
+        const review = payload.review || {};
+        const repository = payload.repository?.full_name || this.t('unknownRepo');
+        const actor = payload.sender?.login || review.user?.login || this.t('unknownUser');
+        return this.render([
+            `${this.t('reviewTitle')} ${repository}`,
+            `${this.t('prLabel')}: #${pr.number ?? '?'} ${pr.title || this.t('unknownTitle')}`,
+            `${this.t('reviewer')}: ${actor}`,
+            `${this.t('status')}: ${review.state || this.t('unknownState')}`,
+            `${this.t('link')}: ${review.html_url || pr.html_url || ''}`,
         ]);
     }
+    summarizeCommentBody(raw) {
+        const content = String(raw || '').replace(/\r/g, '').trim();
+        if (!content)
+            return this.t('emptyComment');
+        // Typical Vercel/GitHub app machine signature payload: [vc]: #<token>:<payload>
+        if (/^\[vc\]:\s*#[A-Za-z0-9+/=_:-]+/i.test(content)) {
+            return this.t('hiddenMachinePayload');
+        }
+        // Very long high-entropy lines are usually bot payloads/signatures.
+        const oneLine = content.replace(/\n+/g, ' ');
+        const looksEncoded = oneLine.length > 120 && !/\s/.test(oneLine.slice(0, 80));
+        if (looksEncoded)
+            return this.t('hiddenMachinePayload');
+        return oneLine.length > 180 ? `${oneLine.slice(0, 180)}...` : oneLine;
+    }
+    mapAction(action) {
+        const normalized = action || 'updated';
+        const mapped = I18N[this.locale].actionMap[normalized];
+        return mapped || normalized;
+    }
+    t(key, params = []) {
+        const template = I18N[this.locale][key];
+        return template.replace(/\{(\d+)\}/g, (_, idx) => String(params[Number(idx)] ?? ''));
+    }
+    render(lines) {
+        return (0, koishi_1.h)('message', [(0, koishi_1.h)('text', { content: `${lines.join('\n')}\n` })]);
+    }
 }
 exports.Formatter = Formatter;

package/lib/services/notifier.d.ts

@@ -8,9 +8,18 @@ declare module 'koishi' {
 export declare class Notifier extends Service {
     config: Config;
     static inject: string[];
+    private readonly recentEventKeys;
+    private readonly memoryDedupWindowMs;
+    private dedupWriteCounter;
     constructor(ctx: Context, config: Config);
     private registerListeners;
     private handleEvent;
+    private extractRepoName;
     private patchPayloadForEvent;
+    private buildEventDedupKey;
+    private shouldProcessEvent;
+    private cleanupDedupTable;
     private sendMessage;
+    private sendWithRetry;
+    private sleep;
 }

package/lib/services/notifier.js

@@ -7,42 +7,43 @@ class Notifier extends koishi_1.Service {
     constructor(ctx, config) {
         super(ctx, 'githubsthNotifier', true);
         this.config = config;
+        this.recentEventKeys = new Map();
+        this.memoryDedupWindowMs = 5000;
+        this.dedupWriteCounter = 0;
         this.ctx.logger('githubsth').info('Notifier service initialized');
         this.registerListeners();
     }
     registerListeners() {
-        // adapter-github canonical event names
-        this.ctx.on('github/issue', (payload) => this.handleEvent('issues', payload));
-        this.ctx.on('github/issue-comment', (payload) => this.handleEvent('issue_comment', payload));
-        this.ctx.on('github/pull-request', (payload) => this.handleEvent('pull_request', payload));
-        this.ctx.on('github/workflow-run', (payload) => this.handleEvent('workflow_run', payload));
-        // Backward compatibility aliases
-        this.ctx.on('github/push', (payload) => this.handleEvent('push', payload));
-        this.ctx.on('github/issues', (payload) => this.handleEvent('issues', payload));
-        this.ctx.on('github/pull_request', (payload) => this.handleEvent('pull_request', payload));
-        this.ctx.on('github/star', (payload) => this.handleEvent('star', payload));
-        this.ctx.on('github/fork', (payload) => this.handleEvent('fork', payload));
-        this.ctx.on('github/release', (payload) => this.handleEvent('release', payload));
-        this.ctx.on('github/discussion', (payload) => this.handleEvent('discussion', payload));
-        this.ctx.on('github/workflow_run', (payload) => this.handleEvent('workflow_run', payload));
-        this.ctx.on('github/issue_comment', (payload) => this.handleEvent('issue_comment', payload));
-        this.ctx.on('github/issue-comment', (payload) => this.handleEvent('issue_comment', payload));
-        this.ctx.on('github/pull-request-review', (payload) => this.handleEvent('pull_request_review', payload));
-        // Fallback: Listen to message-created for adapters that map webhooks to messages
-        this.ctx.on('message-created', (session) => {
-            if (session.platform !== 'github')
-                return;
-            // Try to find payload
-            const payload = session.payload || session.extra || session.data;
-            if (payload) {
+        const bind = (name, event) => {
+            this.ctx.on(name, (payload) => this.handleEvent(event, payload));
+        };
+        bind('github/issue', 'issues');
+        bind('github/issue-comment', 'issue_comment');
+        bind('github/pull-request', 'pull_request');
+        bind('github/pull-request-review', 'pull_request_review');
+        bind('github/workflow-run', 'workflow_run');
+        bind('github/push', 'push');
+        bind('github/star', 'star');
+        bind('github/fork', 'fork');
+        bind('github/release', 'release');
+        bind('github/discussion', 'discussion');
+        // legacy aliases
+        bind('github/issues', 'issues');
+        bind('github/pull_request', 'pull_request');
+        bind('github/workflow_run', 'workflow_run');
+        bind('github/issue_comment', 'issue_comment');
+        if (this.config.enableSessionFallback !== false) {
+            this.ctx.on('message-created', (session) => {
+                if (session.platform !== 'github')
+                    return;
+                const payload = session.payload || session.extra || session.data;
+                if (!payload)
+                    return;
                 if (this.config.debug) {
                     this.ctx.logger('githubsth').info('Found payload in session, attempting to handle');
                 }
-                // Check if payload is wrapped (adapter-github structure)
                 const realPayload = payload.payload || payload;
-                // Infer event type
                 let eventType = 'unknown';
-                // Check inner payload first if it exists
                 if (realPayload.issue && realPayload.comment)
                     eventType = 'issue_comment';
                 else if (realPayload.issue)
@@ -53,7 +54,7 @@ class Notifier extends koishi_1.Service {
                     eventType = 'pull_request';
                 else if (realPayload.commits)
                     eventType = 'push';
-                else if (realPayload.starred_at !== undefined || (realPayload.action === 'started'))
+                else if (realPayload.starred_at !== undefined || realPayload.action === 'started')
                     eventType = 'star';
                 else if (realPayload.forkee)
                     eventType = 'fork';
@@ -66,13 +67,13 @@ class Notifier extends koishi_1.Service {
                 else if (realPayload.repository && (realPayload.action === 'created' || realPayload.action === 'started'))
                     eventType = 'star';
                 if (eventType !== 'unknown') {
-                    this.handleEvent(eventType, payload);
+                    void this.handleEvent(eventType, payload);
                 }
                 else if (this.config.logUnhandledEvents) {
                     this.ctx.logger('githubsth').info(`Unhandled payload structure. Keys: ${Object.keys(realPayload).join(', ')}`);
                 }
-            }
-        });
+            });
+        }
     }
     async handleEvent(event, payload) {
         if (this.config.debug) {
@@ -86,42 +87,7 @@ class Notifier extends koishi_1.Service {
         if (payload.repository && !realPayload.repository) {
             realPayload.repository = payload.repository;
         }
-        let repoName = realPayload.repository?.full_name;
-        if (!repoName && realPayload.issue?.repository_url) {
-            const parts = realPayload.issue.repository_url.split('/');
-            if (parts.length >= 2) {
-                repoName = `${parts[parts.length - 2]}/${parts[parts.length - 1]}`;
-            }
-        }
-        if (!repoName && realPayload.pull_request?.base?.repo?.full_name) {
-            repoName = realPayload.pull_request.base.repo.full_name;
-        }
-        // adapter-github eventData fields
-        if (!repoName && typeof payload.repoKey === 'string' && payload.repoKey.includes('/')) {
-            repoName = payload.repoKey;
-        }
-        if (!repoName && typeof payload.owner === 'string' && typeof payload.repo === 'string') {
-            repoName = `${payload.owner}/${payload.repo}`;
-        }
-        if (!repoName && typeof payload.repo === 'string' && payload.repo.includes('/')) {
-            repoName = payload.repo;
-        }
-        if (!repoName && event === 'star') {
-            if (payload.repository?.full_name) {
-                repoName = payload.repository.full_name;
-            }
-        }
-        if (!repoName && payload.repository?.full_name) {
-            repoName = payload.repository.full_name;
-        }
-        if (!repoName) {
-            if (this.config.debug) {
-                this.ctx.logger('githubsth').warn(`Missing repo info for event: ${event}. Keys: ${Object.keys(realPayload).join(', ')}`);
-            }
-            else if (this.config.logUnhandledEvents) {
-                this.ctx.logger('githubsth').warn(`Missing repo info for event: ${event}. Keys: ${Object.keys(realPayload).join(', ')}`);
-            }
-        }
+        let repoName = this.extractRepoName(payload, realPayload, event);
         if (!realPayload.repository) {
             realPayload.repository = { full_name: repoName || 'Unknown/Repo' };
         }
@@ -145,59 +111,40 @@ class Notifier extends koishi_1.Service {
                 realPayload.sender = { login: 'GitHub' };
             }
         }
+        if (!(await this.shouldProcessEvent(event, payload, realPayload, repoName))) {
+            if (this.config.debug) {
+                this.ctx.logger('githubsth').info(`Skip duplicated event: ${event} (${repoName || 'unknown'})`);
+            }
+            return;
+        }
         try {
             this.patchPayloadForEvent(event, realPayload, repoName || 'Unknown/Repo');
+            repoName = repoName || realPayload.repository?.full_name;
         }
-        catch (e) {
-            this.ctx.logger('githubsth').warn(`Failed to patch payload for ${event}:`, e);
-        }
-        if (this.config.debug) {
-            this.ctx.logger('githubsth').info(`Processing event ${event} for ${repoName}`);
-            this.ctx.logger('notifier').info(`Received event ${event} for ${repoName}`);
-            this.ctx.logger('notifier').debug(JSON.stringify(realPayload, null, 2));
+        catch (error) {
+            this.ctx.logger('githubsth').warn(`Failed to patch payload for ${event}:`, error);
         }
         if (!repoName) {
             this.ctx.logger('githubsth').warn('Cannot query rules: repoName is missing');
             return;
         }
+        if (this.config.debug) {
+            this.ctx.logger('githubsth').info(`Processing event ${event} for ${repoName}`);
+            this.ctx.logger('notifier').debug(JSON.stringify(realPayload, null, 2));
+        }
         const repoNames = [repoName];
-        if (repoName !== repoName.toLowerCase()) {
+        if (repoName !== repoName.toLowerCase())
             repoNames.push(repoName.toLowerCase());
-        }
-        const dbRules = await this.ctx.database.get('github_subscription', {
-            repo: repoNames
-        });
-        const configRules = (this.config.rules || []).filter((r) => r.repo === repoName ||
-            r.repo === repoName.toLowerCase() ||
-            r.repo === '*');
+        const dbRules = await this.ctx.database.get('github_subscription', { repo: repoNames });
+        const configRules = (this.config.rules || []).filter((rule) => rule.repo === repoName || rule.repo === repoName.toLowerCase() || rule.repo === '*');
         const allRules = [
-            ...dbRules.map(r => ({ ...r, platform: r.platform })),
-            ...configRules
+            ...dbRules.map((rule) => ({ ...rule, platform: rule.platform })),
+            ...configRules,
         ];
-        const matchedRules = allRules.filter(rule => {
-            if (!rule.events.includes('*') && !rule.events.includes(event))
-                return false;
-            return true;
-        });
-        if (matchedRules.length === 0) {
-            if (this.config.debug) {
-                this.ctx.logger('githubsth').info(`No matching rules for ${repoName} (event: ${event})`);
-                this.ctx.logger('notifier').debug(`No matching rules for ${repoName} (event: ${event})`);
-            }
-            else if (this.config.logUnhandledEvents) {
-                this.ctx.logger('githubsth').warn(`No matching rules for ${repoName} (event: ${event})`);
-            }
+        const matchedRules = allRules.filter((rule) => rule.events.includes('*') || rule.events.includes(event));
+        if (!matchedRules.length)
             return;
-        }
-        if (this.config.debug) {
-            this.ctx.logger('githubsth').info(`Found ${matchedRules.length} matching rules for ${repoName}`);
-            this.ctx.logger('notifier').debug(`Found ${matchedRules.length} matching rules for ${repoName}`);
-        }
         let message = null;
-        if (!this.ctx.githubsthFormatter) {
-            this.ctx.logger('notifier').warn('Formatter service not available');
-            return;
-        }
         try {
             switch (event) {
                 case 'push':
@@ -232,26 +179,39 @@ class Notifier extends koishi_1.Service {
                     break;
             }
         }
-        catch (e) {
-            this.ctx.logger('githubsth').error(`Error formatting event ${event}:`, e);
-            if (this.config.debug) {
-                this.ctx.logger('notifier').error(`Error formatting event ${event}:`, e);
-            }
+        catch (error) {
+            this.ctx.logger('githubsth').error(`Error formatting event ${event}:`, error);
             return;
         }
-        if (!message) {
-            if (this.config.debug) {
-                this.ctx.logger('notifier').debug(`Formatter returned null for event ${event}`);
-            }
+        if (!message)
             return;
-        }
         for (const rule of matchedRules) {
-            if (this.config.debug) {
-                this.ctx.logger('notifier').debug(`Sending message to channel ${rule.channelId} (platform: ${rule.platform || 'any'})`);
-            }
             await this.sendMessage(rule, message);
         }
     }
+    extractRepoName(payload, realPayload, event) {
+        let repoName = realPayload.repository?.full_name;
+        if (!repoName && realPayload.issue?.repository_url) {
+            const parts = String(realPayload.issue.repository_url).split('/');
+            if (parts.length >= 2)
+                repoName = `${parts[parts.length - 2]}/${parts[parts.length - 1]}`;
+        }
+        if (!repoName && realPayload.pull_request?.base?.repo?.full_name) {
+            repoName = realPayload.pull_request.base.repo.full_name;
+        }
+        if (!repoName && typeof payload.repoKey === 'string' && payload.repoKey.includes('/'))
+            repoName = payload.repoKey;
+        if (!repoName && typeof payload.owner === 'string' && typeof payload.repo === 'string')
+            repoName = `${payload.owner}/${payload.repo}`;
+        if (!repoName && typeof payload.repo === 'string' && payload.repo.includes('/'))
+            repoName = payload.repo;
+        if (!repoName && payload.repository?.full_name)
+            repoName = payload.repository.full_name;
+        if (!repoName && this.config.logUnhandledEvents) {
+            this.ctx.logger('githubsth').warn(`Missing repo info for event: ${event}. Keys: ${Object.keys(realPayload).join(', ')}`);
+        }
+        return repoName;
+    }
     patchPayloadForEvent(event, payload, repoName) {
         const defaultUser = { login: 'GitHub', id: 0, avatar_url: '' };
         if (!payload.sender)
@@ -269,15 +229,13 @@ class Notifier extends koishi_1.Service {
                     payload.ref = 'refs/heads/unknown';
                 if (!payload.compare)
                     payload.compare = '';
-                if (payload.commits.length > 0) {
-                    payload.commits.forEach((c) => {
-                        if (!c.author)
-                            c.author = { name: 'Unknown' };
-                        if (!c.id)
-                            c.id = '0000000';
-                        if (!c.message)
-                            c.message = 'No message';
-                    });
+                for (const commit of payload.commits) {
+                    if (!commit.author)
+                        commit.author = { name: 'Unknown' };
+                    if (!commit.id)
+                        commit.id = '0000000';
+                    if (!commit.message)
+                        commit.message = 'No message';
                 }
                 break;
             case 'issues':
@@ -297,13 +255,10 @@ class Notifier extends koishi_1.Service {
                     payload.pull_request.user = payload.sender;
                 break;
             case 'star':
-                if (!payload.action)
+                if (!payload.action || payload.action === 'started')
                     payload.action = 'created';
-                if (payload.action === 'started')
-                    payload.action = 'created';
-                if (payload.repository && payload.repository.stargazers_count === undefined) {
+                if (payload.repository?.stargazers_count === undefined)
                     payload.repository.stargazers_count = '?';
-                }
                 break;
             case 'fork':
                 if (!payload.forkee)
@@ -351,38 +306,107 @@ class Notifier extends koishi_1.Service {
                 break;
         }
     }
-    async sendMessage(rule, message) {
-        const bots = this.ctx.bots.filter(bot => {
-            if (rule.platform)
-                return bot.platform === rule.platform;
-            return true;
-        });
-        if (bots.length === 0) {
+    buildEventDedupKey(event, payload, realPayload, repoName) {
+        const keyRepo = repoName || payload.repoKey || `${payload.owner || ''}/${payload.repo || ''}` || realPayload.repository?.full_name || 'unknown/repo';
+        const action = realPayload.action || payload.action || '';
+        const commentId = realPayload.comment?.id || '';
+        const issueId = realPayload.issue?.id || realPayload.issue?.number || '';
+        const prId = realPayload.pull_request?.id || realPayload.pull_request?.number || '';
+        const releaseId = realPayload.release?.id || realPayload.release?.tag_name || '';
+        const workflowId = realPayload.workflow_run?.id || realPayload.workflow_run?.run_id || '';
+        const headCommit = realPayload.head_commit?.id || realPayload.after || realPayload.commits?.[0]?.id || '';
+        const explicitId = payload.id || realPayload.id || payload.timestamp || '';
+        return [event, keyRepo, action, commentId, issueId, prId, releaseId, workflowId, headCommit, explicitId].join('|');
+    }
+    async shouldProcessEvent(event, payload, realPayload, repoName) {
+        const now = Date.now();
+        for (const [key, timestamp] of this.recentEventKeys) {
+            if (now - timestamp > this.memoryDedupWindowMs)
+                this.recentEventKeys.delete(key);
+        }
+        const dedupKey = this.buildEventDedupKey(event, payload, realPayload, repoName);
+        const recent = this.recentEventKeys.get(dedupKey);
+        if (recent && now - recent <= this.memoryDedupWindowMs)
+            return false;
+        this.recentEventKeys.set(dedupKey, now);
+        // durable dedup
+        const exists = await this.ctx.database.get('github_event_dedup', { dedupKey });
+        if (exists.length > 0)
+            return false;
+        try {
+            await this.ctx.database.create('github_event_dedup', {
+                dedupKey,
+                event,
+                repo: repoName || realPayload.repository?.full_name || 'unknown/repo',
+                createdAt: new Date(),
+            });
+            this.dedupWriteCounter += 1;
+            if (this.dedupWriteCounter % 200 === 0) {
+                void this.cleanupDedupTable();
+            }
+        }
+        catch (error) {
+            if (error?.code === 'SQLITE_CONSTRAINT')
+                return false;
+            this.ctx.logger('githubsth').warn('Failed to write dedup record, fallback to in-memory dedup only:', error);
+        }
+        return true;
+    }
+    async cleanupDedupTable() {
+        const cutoff = new Date(Date.now() - this.config.dedupRetentionHours * 60 * 60 * 1000);
+        try {
+            await this.ctx.database.remove('github_event_dedup', {
+                createdAt: { $lt: cutoff },
+            });
+        }
+        catch (error) {
             if (this.config.debug) {
-                this.ctx.logger('notifier').debug(`No bot found for channel ${rule.channelId} (platform: ${rule.platform})`);
+                this.ctx.logger('githubsth').warn('Failed to cleanup dedup table:', error);
             }
-            return;
         }
-        let sent = false;
+    }
+    async sendMessage(rule, message) {
+        const bots = this.ctx.bots.filter((bot) => !rule.platform || bot.platform === rule.platform);
+        if (!bots.length)
+            return;
         for (const bot of bots) {
             try {
-                await bot.sendMessage(rule.channelId, message);
-                sent = true;
+                await this.sendWithRetry(bot, rule.channelId, message);
                 if (this.config.debug) {
                     this.ctx.logger('notifier').info(`Sent message to ${rule.channelId} via ${bot.platform}:${bot.selfId}`);
                 }
-                break;
+                return;
             }
-            catch (e) {
+            catch (error) {
                 if (this.config.debug) {
-                    this.ctx.logger('notifier').warn(`Bot ${bot.sid} failed to send message: ${e}`);
+                    this.ctx.logger('notifier').warn(`Bot ${bot.sid} failed to send message with retries: ${error}`);
                 }
             }
         }
-        if (!sent) {
-            this.ctx.logger('notifier').warn(`Failed to send message to ${rule.channelId}`);
+        this.ctx.logger('notifier').warn(`Failed to send message to ${rule.channelId}`);
+    }
+    async sendWithRetry(bot, channelId, message) {
+        const retryCount = Math.max(0, this.config.sendRetryCount ?? 0);
+        const baseDelay = Math.max(100, this.config.sendRetryBaseDelayMs ?? 800);
+        let lastError;
+        for (let attempt = 0; attempt <= retryCount; attempt++) {
+            try {
+                await bot.sendMessage(channelId, message);
+                return;
+            }
+            catch (error) {
+                lastError = error;
+                if (attempt >= retryCount)
+                    break;
+                const delay = baseDelay * Math.pow(2, attempt);
+                await this.sleep(delay);
+            }
         }
+        throw lastError;
+    }
+    sleep(ms) {
+        return new Promise((resolve) => setTimeout(resolve, ms));
     }
 }
 exports.Notifier = Notifier;
-Notifier.inject = ['githubsthFormatter'];
+Notifier.inject = ['githubsthFormatter', 'database'];

package/package.json

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