koishi-plugin-githubsth 1.0.0 → 1.0.1-test1

package/lib/commands/admin.js

@@ -3,13 +3,26 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.apply = apply;
 function apply(ctx) {
     const logger = ctx.logger('githubsth');
+    // Allow . in repo name (e.g. koishi.js) but disallow / inside parts.
+    // owner: [\w-]+ (alphanumeric, underscore, dash)
+    // repo: [\w-\.]+ (alphanumeric, underscore, dash, dot)
+    const repoRegex = /^[\w-]+\/[\w-\.]+$/;
     ctx.command('githubsth.trust', '管理信任仓库', { authority: 3 })
         .alias('gh.trust');
     ctx.command('githubsth.trust.add <repo>', '添加信任仓库')
         .action(async ({ session }, repo) => {
         if (!repo)
             return '请指定仓库名称 (owner/repo)。';
+        if (!repoRegex.test(repo)) {
+            return '仓库名称格式不正确 (应为 owner/repo)。';
+        }
         try {
+            logger.debug(`Adding trusted repo: ${repo}`);
+            // Check existence first to avoid UNIQUE constraint error log from driver
+            const existing = await ctx.database.get('github_trusted_repo', { repo });
+            if (existing.length > 0) {
+                return '该仓库已在信任列表中。';
+            }
             await ctx.database.create('github_trusted_repo', {
                 repo,
                 enabled: true,
@@ -19,11 +32,11 @@ function apply(ctx) {
             return `已添加信任仓库: ${repo}`;
         }
         catch (e) {
-            if (e.code === 'SQLITE_CONSTRAINT') { // Or handle duplicate error generically
+            logger.warn('Failed to add trusted repo:', e);
+            if (e.code === 'SQLITE_CONSTRAINT') {
                 return '该仓库已在信任列表中。';
             }
-            logger.warn(e);
-            return '添加失败，请查看日志。';
+            return `添加失败: ${e.message}`;
         }
     });
     ctx.command('githubsth.trust.remove <repo>', '移除信任仓库')

package/lib/commands/index.js

@@ -35,6 +35,19 @@ var __importStar = (this && this.__importStar) || (function () {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.apply = apply;
 const repo = __importStar(require("./repo"));
+const admin = __importStar(require("./admin"));
+const subscribe = __importStar(require("./subscribe"));
 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.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');
 }

package/lib/commands/repo.d.ts

@@ -1,3 +1,8 @@
 import { Context } from 'koishi';
 import { Config } from '../config';
+declare module 'koishi' {
+    interface Context {
+        github?: any;
+    }
+}
 export declare function apply(ctx: Context, config: Config): void;

package/lib/commands/repo.js

@@ -10,10 +10,28 @@ function apply(ctx, config) {
         const fullRepo = name || (config.defaultOwner ? `${config.defaultOwner}/${config.defaultRepo}` : name);
         if (!fullRepo)
             return session?.text('.specify_repo');
-        // 在实际实现中，我们将在此处使用 GitHub API。
-        // 由于我们没有 API 客户端的具体设置细节（例如 Octokit 或适配器内部实现），
-        // 我们将返回一个占位符，以确认命令结构正常工作。
-        // TODO: 使用 session.bot 或专用服务实现实际的 GitHub API 调用。
-        return session?.text('.repo_info', [fullRepo.split('/')[0], fullRepo.split('/')[1] || '?', 'Demo Description', '100']);
+        try {
+            let data;
+            if (ctx.github && typeof ctx.github.request === 'function') {
+                // If adapter provides a request method (hypothetical, based on common adapter patterns)
+                data = await ctx.github.request('GET /repos/:owner/:repo', {
+                    owner: fullRepo.split('/')[0],
+                    repo: fullRepo.split('/')[1]
+                });
+            }
+            else {
+                const headers = {
+                    'User-Agent': 'Koishi-Plugin-GithubSth'
+                };
+                data = await ctx.http.get(`https://api.github.com/repos/${fullRepo}`, { headers });
+            }
+            return session?.text('.repo_info', [data.owner.login, data.name, data.description || '无描述', data.stargazers_count]);
+        }
+        catch (e) {
+            if (e.response?.status === 404) {
+                return session?.text('.not_found');
+            }
+            return session?.text('.error', [e.message]);
+        }
     });
 }

package/lib/commands/subscribe.js

@@ -3,11 +3,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.apply = apply;
 function apply(ctx) {
     const logger = ctx.logger('githubsth');
+    const repoRegex = /^[\w-]+\/[\w-\.]+$/;
     ctx.command('githubsth.subscribe <repo> [events:text]', '订阅 GitHub 仓库')
         .alias('gh.sub')
         .action(async ({ session }, repo, eventsStr) => {
         if (!repo)
             return '请指定仓库名称 (owner/repo)。';
+        if (!repoRegex.test(repo))
+            return '仓库名称格式不正确 (应为 owner/repo)。';
         if (!session?.channelId)
             return '请在群组中使用此命令。';
         // Check trusted repo

package/lib/config.js

@@ -10,6 +10,6 @@ exports.Config = 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']),
+        events: koishi_1.Schema.array(koishi_1.Schema.string()).default(['push', 'issues', 'pull_request', 'issue_comment', 'pull_request_review']),
     })).hidden().description('已废弃，请使用数据库管理订阅'),
 });

package/lib/index.js

@@ -42,8 +42,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.inject = exports.name = void 0;
 exports.apply = apply;
 const commands = __importStar(require("./commands"));
-const admin = __importStar(require("./commands/admin"));
-const subscribe = __importStar(require("./commands/subscribe"));
 const database = __importStar(require("./database"));
 const zh_CN_1 = __importDefault(require("./locales/zh-CN"));
 const notifier_1 = require("./services/notifier");
@@ -51,7 +49,7 @@ const formatter_1 = require("./services/formatter");
 exports.name = 'githubsth';
 exports.inject = {
     required: ['database'],
-    optional: ['github']
+    optional: ['github'],
 };
 __exportStar(require("./config"), exports);
 function apply(ctx, config) {
@@ -63,7 +61,13 @@ function apply(ctx, config) {
     ctx.plugin(formatter_1.Formatter);
     ctx.plugin(notifier_1.Notifier, config);
     // 注册命令
-    ctx.plugin(commands, config);
-    ctx.plugin(admin);
-    ctx.plugin(subscribe);
+    // admin and subscribe are already loaded in commands/index.ts, remove duplicate loading here
+    try {
+        ctx.plugin(commands, config);
+        // 加载成功日志
+        console.log('githubsth plugin loaded');
+    }
+    catch (e) {
+        console.error('githubsth plugin failed to load:', e);
+    }
 }

package/lib/locales/zh-CN.d.ts

@@ -2,6 +2,9 @@ declare const _default: {
     commands: {
         githubsth: {
             description: string;
+        };
+        'githubsth.repo': {
+            description: string;
             messages: {
                 repo_info: string;
                 error: string;
@@ -9,9 +12,6 @@ declare const _default: {
                 not_found: string;
             };
         };
-        'githubsth.repo': {
-            description: string;
-        };
     };
 };
 export default _default;

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: '未找到仓库或无权限访问。'
             }
-        },
-        'githubsth.repo': {
-            description: '获取仓库信息'
         }
     }
 };

package/lib/services/formatter.d.ts

@@ -14,4 +14,6 @@ export declare class Formatter extends Service {
     formatRelease(payload: any): h | null;
     formatDiscussion(payload: any): h;
     formatWorkflowRun(payload: any): h | null;
+    formatIssueComment(payload: any): h | null;
+    formatPullRequestReview(payload: any): h | null;
 }

package/lib/services/formatter.js

@@ -90,5 +90,29 @@ class Formatter extends koishi_1.Service {
             (0, koishi_1.h)('text', { content: `链接: ${workflow_run.html_url}` })
         ]);
     }
+    formatIssueComment(payload) {
+        const { action, issue, comment, repository, sender } = payload;
+        if (action !== 'created')
+            return null;
+        return (0, koishi_1.h)('message', [
+            (0, koishi_1.h)('text', { content: `[GitHub] ${repository.full_name} Issue 收到新评论\n` }),
+            (0, koishi_1.h)('text', { content: `标题: #${issue.number} ${issue.title}\n` }),
+            (0, koishi_1.h)('text', { content: `评论人: ${sender.login}\n` }),
+            (0, koishi_1.h)('text', { content: `内容: ${comment.body.substring(0, 100)}${comment.body.length > 100 ? '...' : ''}\n` }),
+            (0, koishi_1.h)('text', { content: `链接: ${comment.html_url}` })
+        ]);
+    }
+    formatPullRequestReview(payload) {
+        const { action, pull_request, review, repository, sender } = payload;
+        if (action !== 'submitted')
+            return null;
+        return (0, koishi_1.h)('message', [
+            (0, koishi_1.h)('text', { content: `[GitHub] ${repository.full_name} PR 收到 Review\n` }),
+            (0, koishi_1.h)('text', { content: `标题: #${pull_request.number} ${pull_request.title}\n` }),
+            (0, koishi_1.h)('text', { content: `Reviewer: ${sender.login}\n` }),
+            (0, koishi_1.h)('text', { content: `状态: ${review.state}\n` }),
+            (0, koishi_1.h)('text', { content: `链接: ${review.html_url}` })
+        ]);
+    }
 }
 exports.Formatter = Formatter;

package/lib/services/notifier.js

@@ -18,6 +18,8 @@ class Notifier extends koishi_1.Service {
         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/pull_request_review', (payload) => this.handleEvent('pull_request_review', payload));
     }
     async handleEvent(event, payload) {
         const repoName = payload.repository?.full_name;
@@ -43,8 +45,15 @@ class Notifier extends koishi_1.Service {
                 return false;
             return true;
         });
-        if (matchedRules.length === 0)
+        if (matchedRules.length === 0) {
+            if (this.config.debug) {
+                this.ctx.logger('notifier').debug(`No matching rules for ${repoName} (event: ${event})`);
+            }
             return;
+        }
+        if (this.config.debug) {
+            this.ctx.logger('notifier').debug(`Found ${matchedRules.length} matching rules for ${repoName}`);
+        }
         let message = null;
         // Ensure formatter is loaded
         if (!this.ctx.formatter) {
@@ -76,10 +85,23 @@ class Notifier extends koishi_1.Service {
             case 'workflow_run':
                 message = this.ctx.formatter.formatWorkflowRun(payload);
                 break;
+            case 'issue_comment':
+                message = this.ctx.formatter.formatIssueComment(payload);
+                break;
+            case 'pull_request_review':
+                message = this.ctx.formatter.formatPullRequestReview(payload);
+                break;
         }
-        if (!message)
+        if (!message) {
+            if (this.config.debug) {
+                this.ctx.logger('notifier').debug(`Formatter returned null for event ${event}`);
+            }
             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);
         }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "koishi-plugin-githubsth",
-  "version": "1.0.0",
+  "version": "1.0.1-test1",
   "description": "Github Subscriptions Notifications, push notifications for GitHub subscriptions For koishi",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
@@ -39,11 +39,10 @@
     },
     "service": {
       "required": [
-        "database"
-      ],
-      "optional": [
+        "database",
         "github"
-      ]
+      ],
+      "optional": []
     }
   }
 }