koishi-plugin-githubsth 1.0.1-test8 → 1.0.2-beta1

package/lib/commands/subscribe.d.ts

@@ -1,2 +1,2 @@
 import { Context } from 'koishi';
-export declare function apply(ctx: Context): void;
+export declare function apply(ctx: Context, config: any): void;

package/lib/commands/subscribe.js

@@ -1,11 +1,37 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.apply = apply;
-function apply(ctx) {
+function apply(ctx, config) {
     const logger = ctx.logger('githubsth');
     const repoRegex = /^[\w-]+\/[\w-\.]+$/;
+    const validEvents = [
+        'push', 'issues', 'issue_comment', 'pull_request',
+        'pull_request_review', 'star', 'fork', 'release',
+        'discussion', 'workflow_run'
+    ];
+    const defaultConfigEvents = config.defaultEvents || ['push', 'issues', 'issue_comment', 'pull_request', 'pull_request_review', 'release', 'star', 'fork'];
     ctx.command('githubsth.subscribe <repo> [events:text]', '订阅 GitHub 仓库')
         .alias('gh.sub')
+        .usage(`
+订阅 GitHub 仓库通知。
+如果不指定事件，默认订阅: ${defaultConfigEvents.join(', ')}
+
+可选事件:
+- push: 代码推送
+- issues: Issue 创建/关闭/重开
+- issue_comment: Issue 评论
+- pull_request: PR 创建/关闭/重开
+- pull_request_review: PR 审查
+- star: 标星
+- fork: 仓库 Fork
+- release: 发布新版本
+- discussion: 讨论区更新
+- workflow_run: Workflow 运行
+
+示例:
+gh.sub koishijs/koishi
+gh.sub koishijs/koishi push,issues,star
+`)
         .action(async ({ session }, repo, eventsStr) => {
         if (!repo)
             return '请指定仓库名称 (owner/repo)。';
@@ -19,15 +45,46 @@ function apply(ctx) {
             return '该仓库不在信任列表中，无法订阅。请联系管理员添加。';
         }
         // Parse events
-        const events = eventsStr ? eventsStr.split(',').map(e => e.trim()) : ['push', 'issues', 'pull_request']; // Default events
+        let events;
+        if (eventsStr) {
+            // Split by comma, Chinese comma, or whitespace
+            events = eventsStr.split(/[,，\s]+/).map(e => e.trim()).filter(Boolean);
+            // Normalize events (kebab-case to snake_case)
+            events = events.map(e => e.replace(/-/g, '_'));
+            // Validate events
+            const invalidEvents = events.filter(e => !validEvents.includes(e) && e !== '*');
+            if (invalidEvents.length > 0) {
+                return `无效的事件类型: ${invalidEvents.join(', ')}。\n可选事件: ${validEvents.join(', ')}`;
+            }
+        }
+        else {
+            // Default events
+            events = [...defaultConfigEvents];
+        }
         try {
-            await ctx.database.create('github_subscription', {
+            // Check if subscription exists
+            const existing = await ctx.database.get('github_subscription', {
                 repo,
                 channelId: session.channelId,
                 platform: session.platform || 'unknown',
-                events,
             });
-            return `已订阅 ${repo} 的 ${events.join(', ')} 事件。`;
+            if (existing.length > 0) {
+                // Update existing subscription
+                await ctx.database.set('github_subscription', { id: existing[0].id }, {
+                    events,
+                });
+                return `已更新 ${repo} 的订阅，当前监听事件: ${events.join(', ')}。`;
+            }
+            else {
+                // Create new subscription
+                await ctx.database.create('github_subscription', {
+                    repo,
+                    channelId: session.channelId,
+                    platform: session.platform || 'unknown',
+                    events,
+                });
+                return `已订阅 ${repo} 的 ${events.join(', ')} 事件。`;
+            }
         }
         catch (e) {
             logger.warn(e);

package/lib/config.d.ts

@@ -9,6 +9,8 @@ export interface Config {
     defaultOwner?: string;
     defaultRepo?: string;
     debug: boolean;
+    logUnhandledEvents: boolean;
+    defaultEvents: string[];
     rules?: Rule[];
 }
 export declare const Config: Schema<Config>;

package/lib/config.js

@@ -6,6 +6,10 @@ 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)'),
+    defaultEvents: koishi_1.Schema.array(koishi_1.Schema.string())
+        .default(['push', 'issues', 'issue_comment', 'pull_request', 'pull_request_review', 'release', 'star', 'fork'])
+        .description('默认订阅事件列表 (当不指定事件时使用)'),
     rules: koishi_1.Schema.array(koishi_1.Schema.object({
         repo: koishi_1.Schema.string().required(),
         channelId: koishi_1.Schema.string().required(),

package/lib/index.js

@@ -41,7 +41,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.inject = exports.name = void 0;
 exports.apply = apply;
-const commands = __importStar(require("./commands"));
+const commands_1 = require("./commands");
 const database = __importStar(require("./database"));
 const zh_CN_1 = __importDefault(require("./locales/zh-CN"));
 const notifier_1 = require("./services/notifier");
@@ -60,33 +60,12 @@ function apply(ctx, config) {
     // 数据库
     ctx.plugin(database);
     // 注册服务
-    logger.info('Registering Formatter...');
     ctx.plugin(formatter_1.Formatter);
-    logger.info('Registering Notifier...');
     ctx.plugin(notifier_1.Notifier, config);
-    // Debug listener for raw events
-    ctx.on('github/issues', (payload) => {
-        logger.info('[DEBUG] Global listener caught github/issues');
-    });
-    ctx.on('github/opened', (payload) => {
-        logger.info('[DEBUG] Global listener caught github/opened');
-    });
-    // Comprehensive debug listeners
-    ctx.on('github/webhook', (payload) => {
-        logger.info('[DEBUG] Global listener caught github/webhook');
-    });
-    // Middleware to log all sessions
-    ctx.middleware((session, next) => {
-        // Log any session event from github
-        if (session.platform === 'github') {
-            logger.info(`[DEBUG] Middleware saw session.type: ${session.type}, subtype: ${session.subtype}`);
-        }
-        return next();
-    });
     // 注册命令
     // admin and subscribe are already loaded in commands/index.ts, remove duplicate loading here
     try {
-        ctx.plugin(commands, config);
+        ctx.plugin(commands_1.apply, config);
         logger.info('Plugin loaded successfully');
     }
     catch (e) {

package/lib/services/notifier.d.ts

@@ -10,5 +10,6 @@ export declare class Notifier extends Service {
     constructor(ctx: Context, config: Config);
     private registerListeners;
     private handleEvent;
+    private patchPayloadForEvent;
     private sendMessage;
 }

package/lib/services/notifier.js

@@ -23,12 +23,55 @@ class Notifier extends koishi_1.Service {
         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));
         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) {
+                if (this.config.debug) {
+                    this.ctx.logger('githubsth').info('Found payload in session, attempting to handle');
+                }
+                // Infer event type
+                let eventType = 'unknown';
+                if (payload.issue && payload.comment)
+                    eventType = 'issue_comment';
+                else if (payload.issue)
+                    eventType = 'issues';
+                else if (payload.pull_request && payload.review)
+                    eventType = 'pull_request_review';
+                else if (payload.pull_request)
+                    eventType = 'pull_request';
+                else if (payload.commits)
+                    eventType = 'push';
+                else if (payload.starred_at !== undefined || (payload.action === 'started'))
+                    eventType = 'star'; // star event usually has action 'created' but check payload structure
+                else if (payload.forkee)
+                    eventType = 'fork';
+                else if (payload.release)
+                    eventType = 'release';
+                else if (payload.discussion)
+                    eventType = 'discussion';
+                else if (payload.workflow_run)
+                    eventType = 'workflow_run';
+                // Handle raw star event if it has repository info directly
+                else if (payload.repository && (payload.action === 'created' || payload.action === 'started'))
+                    eventType = 'star';
+                if (eventType !== 'unknown') {
+                    this.handleEvent(eventType, payload);
+                }
+                else if (this.config.logUnhandledEvents) {
+                    this.ctx.logger('githubsth').info(`Unhandled payload structure. Keys: ${Object.keys(payload).join(', ')}`);
+                }
+            }
+        });
     }
     async handleEvent(event, payload) {
-        // FORCE LOG for debugging
-        this.ctx.logger('githubsth').info(`Received event: ${event}`);
+        if (this.config.debug) {
+            this.ctx.logger('githubsth').info(`Received event: ${event}`);
+        }
         // Check if payload is nested in an 'event' object (common in some adapter versions)
         // or if the event data is directly in payload
         const realPayload = payload.payload || payload;
@@ -43,24 +86,77 @@ class Notifier extends koishi_1.Service {
         if (!repoName && realPayload.pull_request?.base?.repo?.full_name) {
             repoName = realPayload.pull_request.base.repo.full_name;
         }
+        // Special handling for 'star' event (which might be 'watch' event with action 'started')
+        // The payload might be missing repository info in the main object but have it in the original session payload
+        if (!repoName && event === 'star') {
+            // Sometimes the repository info is at the root of the payload, not inside 'payload' property
+            if (payload.repository?.full_name) {
+                repoName = payload.repository.full_name;
+            }
+        }
         if (!repoName) {
-            this.ctx.logger('githubsth').warn(`Missing repo info for event: ${event}`);
             if (this.config.debug) {
-                this.ctx.logger('notifier').warn(`Event ${event} missing repository info. Keys: ${Object.keys(realPayload).join(', ')}`);
+                this.ctx.logger('githubsth').warn(`Missing repo info for event: ${event}. Keys: ${Object.keys(realPayload).join(', ')}`);
+            }
+            else if (this.config.logUnhandledEvents) {
+                // Log at warning level if repo info is missing and logUnhandledEvents is on
+                this.ctx.logger('githubsth').warn(`Missing repo info for event: ${event}. Keys: ${Object.keys(realPayload).join(', ')}`);
             }
             return;
         }
-        this.ctx.logger('githubsth').info(`Processing event ${event} for ${repoName}`);
+        // Patch realPayload with extracted repo info if missing
+        // This is crucial for formatter to work correctly as it expects repository object
+        if (!realPayload.repository) {
+            realPayload.repository = { full_name: repoName };
+        }
+        else if (!realPayload.repository.full_name) {
+            realPayload.repository.full_name = repoName;
+        }
+        // Patch realPayload with sender info if missing (e.g. issues event)
+        if (!realPayload.sender) {
+            if (realPayload.issue?.user) {
+                realPayload.sender = realPayload.issue.user;
+            }
+            else if (realPayload.pull_request?.user) {
+                realPayload.sender = realPayload.pull_request.user;
+            }
+            else if (realPayload.discussion?.user) {
+                realPayload.sender = realPayload.discussion.user;
+            }
+            else if (realPayload.pusher) {
+                realPayload.sender = { login: realPayload.pusher.name || 'Pusher' };
+            }
+            else {
+                // Fallback sender
+                realPayload.sender = { login: 'GitHub' };
+            }
+        }
+        // Comprehensive patching for specific events to prevent formatter crashes
+        try {
+            this.patchPayloadForEvent(event, realPayload, repoName);
+        }
+        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));
         }
         // Get rules from database
+        // Try to match both exact name and lowercase name to handle case sensitivity
+        const repoNames = [repoName];
+        if (repoName !== repoName.toLowerCase()) {
+            repoNames.push(repoName.toLowerCase());
+        }
         const dbRules = await this.ctx.database.get('github_subscription', {
-            repo: repoName
+            repo: repoNames
         });
         // Combine with config rules (if any, for backward compatibility or static rules)
-        const configRules = (this.config.rules || []).filter((r) => r.repo === repoName || r.repo === '*');
+        // Also match config rules case-insensitively if needed
+        const configRules = (this.config.rules || []).filter((r) => r.repo === repoName ||
+            r.repo === repoName.toLowerCase() ||
+            r.repo === '*');
         const allRules = [
             ...dbRules.map(r => ({ ...r, platform: r.platform })),
             ...configRules
@@ -72,14 +168,17 @@ class Notifier extends koishi_1.Service {
             return true;
         });
         if (matchedRules.length === 0) {
-            this.ctx.logger('githubsth').info(`No matching rules for ${repoName} (event: ${event})`);
             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})`);
+            }
             return;
         }
-        this.ctx.logger('githubsth').info(`Found ${matchedRules.length} matching rules for ${repoName}`);
         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;
@@ -88,50 +187,160 @@ class Notifier extends koishi_1.Service {
             this.ctx.logger('notifier').warn('Formatter service not available');
             return;
         }
+        try {
+            switch (event) {
+                case 'push':
+                    message = this.ctx.githubsthFormatter.formatPush(realPayload);
+                    break;
+                case 'issues':
+                    message = this.ctx.githubsthFormatter.formatIssue(realPayload);
+                    break;
+                case 'pull_request':
+                    message = this.ctx.githubsthFormatter.formatPullRequest(realPayload);
+                    break;
+                case 'star':
+                    message = this.ctx.githubsthFormatter.formatStar(realPayload);
+                    break;
+                case 'fork':
+                    message = this.ctx.githubsthFormatter.formatFork(realPayload);
+                    break;
+                case 'release':
+                    message = this.ctx.githubsthFormatter.formatRelease(realPayload);
+                    break;
+                case 'discussion':
+                    message = this.ctx.githubsthFormatter.formatDiscussion(realPayload);
+                    break;
+                case 'workflow_run':
+                    message = this.ctx.githubsthFormatter.formatWorkflowRun(realPayload);
+                    break;
+                case 'issue_comment':
+                    message = this.ctx.githubsthFormatter.formatIssueComment(realPayload);
+                    break;
+                case 'pull_request_review':
+                    message = this.ctx.githubsthFormatter.formatPullRequestReview(realPayload);
+                    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);
+            }
+            return;
+        }
+        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);
+        }
+    }
+    patchPayloadForEvent(event, payload, repoName) {
+        // Ensure sender exists (handled before, but good for type safety)
+        const defaultUser = { login: 'GitHub', id: 0, avatar_url: '' };
+        if (!payload.sender)
+            payload.sender = defaultUser;
+        // Ensure repository exists (handled before, but good for type safety)
+        const defaultRepo = { full_name: repoName, stargazers_count: 0, html_url: `https://github.com/${repoName}` };
+        if (!payload.repository)
+            payload.repository = defaultRepo;
         switch (event) {
             case 'push':
-                message = this.ctx.githubsthFormatter.formatPush(realPayload);
+                if (!payload.pusher)
+                    payload.pusher = { name: payload.sender.login };
+                if (!payload.commits)
+                    payload.commits = [];
+                if (!payload.ref)
+                    payload.ref = 'refs/heads/unknown';
+                if (!payload.compare)
+                    payload.compare = '';
+                // Ensure author exists in commits
+                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';
+                    });
+                }
                 break;
             case 'issues':
-                message = this.ctx.githubsthFormatter.formatIssue(realPayload);
+                if (!payload.action)
+                    payload.action = 'updated';
+                if (!payload.issue)
+                    payload.issue = { number: 0, title: 'Unknown Issue', html_url: '', user: payload.sender };
+                // Ensure user exists in issue
+                if (!payload.issue.user)
+                    payload.issue.user = payload.sender;
                 break;
             case 'pull_request':
-                message = this.ctx.githubsthFormatter.formatPullRequest(realPayload);
+                if (!payload.action)
+                    payload.action = 'updated';
+                if (!payload.pull_request)
+                    payload.pull_request = { number: 0, title: 'Unknown PR', state: 'unknown', html_url: '', user: payload.sender };
+                if (!payload.pull_request.user)
+                    payload.pull_request.user = payload.sender;
                 break;
             case 'star':
-                message = this.ctx.githubsthFormatter.formatStar(realPayload);
+                if (!payload.action)
+                    payload.action = 'created';
+                if (payload.repository && payload.repository.stargazers_count === undefined) {
+                    payload.repository.stargazers_count = '?';
+                }
                 break;
             case 'fork':
-                message = this.ctx.githubsthFormatter.formatFork(realPayload);
+                if (!payload.forkee)
+                    payload.forkee = { full_name: 'unknown/fork' };
                 break;
             case 'release':
-                message = this.ctx.githubsthFormatter.formatRelease(realPayload);
+                if (!payload.action)
+                    payload.action = 'published';
+                if (!payload.release)
+                    payload.release = { tag_name: 'unknown', name: 'Unknown Release', html_url: '' };
                 break;
             case 'discussion':
-                message = this.ctx.githubsthFormatter.formatDiscussion(realPayload);
+                if (!payload.action)
+                    payload.action = 'updated';
+                if (!payload.discussion)
+                    payload.discussion = { number: 0, title: 'Unknown Discussion', html_url: '', user: payload.sender };
+                if (!payload.discussion.user)
+                    payload.discussion.user = payload.sender;
                 break;
             case 'workflow_run':
-                message = this.ctx.githubsthFormatter.formatWorkflowRun(realPayload);
+                if (!payload.action)
+                    payload.action = 'completed';
+                if (!payload.workflow_run)
+                    payload.workflow_run = { conclusion: 'unknown', name: 'Unknown Workflow', head_branch: 'unknown', html_url: '' };
                 break;
             case 'issue_comment':
-                message = this.ctx.githubsthFormatter.formatIssueComment(realPayload);
+                if (!payload.action)
+                    payload.action = 'created';
+                if (!payload.issue)
+                    payload.issue = { number: 0, title: 'Unknown Issue', html_url: '', user: payload.sender };
+                if (!payload.comment)
+                    payload.comment = { body: '', html_url: '' };
+                if (!payload.issue.user)
+                    payload.issue.user = payload.sender;
                 break;
             case 'pull_request_review':
-                message = this.ctx.githubsthFormatter.formatPullRequestReview(realPayload);
+                if (!payload.action)
+                    payload.action = 'submitted';
+                if (!payload.pull_request)
+                    payload.pull_request = { number: 0, title: 'Unknown PR', html_url: '', user: payload.sender };
+                if (!payload.review)
+                    payload.review = { state: 'unknown', html_url: '' };
+                if (!payload.pull_request.user)
+                    payload.pull_request.user = payload.sender;
                 break;
         }
-        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);
-        }
     }
     async sendMessage(rule, message) {
         // Find suitable bots

package/package.json

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