koishi-plugin-githubsth 1.0.2-beta1 → 1.0.2-test2

package/lib/commands/subscribe.d.ts

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

package/lib/commands/subscribe.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.apply = apply;
-function apply(ctx, config) {
+function apply(ctx) {
     const logger = ctx.logger('githubsth');
     const repoRegex = /^[\w-]+\/[\w-\.]+$/;
     const validEvents = [
@@ -9,12 +9,11 @@ function apply(ctx, config) {
         '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_comment, pull_request, pull_request_review, release, star, fork
 
 可选事件:
 - push: 代码推送
@@ -59,7 +58,7 @@ gh.sub koishijs/koishi push,issues,star
         }
         else {
             // Default events
-            events = [...defaultConfigEvents];
+            events = ['push', 'issues', 'issue_comment', 'pull_request', 'pull_request_review', 'release', 'star', 'fork'];
         }
         try {
             // Check if subscription exists

package/lib/config.d.ts

@@ -9,8 +9,6 @@ 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,10 +6,6 @@ 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/services/notifier.d.ts

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

package/lib/services/notifier.js

@@ -56,15 +56,9 @@ class Notifier extends koishi_1.Service {
                     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(', ')}`);
-                }
             }
         });
     }
@@ -86,58 +80,18 @@ 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) {
             if (this.config.debug) {
-                this.ctx.logger('githubsth').warn(`Missing repo info for event: ${event}. Keys: ${Object.keys(realPayload).join(', ')}`);
+                this.ctx.logger('githubsth').warn(`Missing repo info for event: ${event}`);
+                this.ctx.logger('notifier').warn(`Event ${event} missing repository info. Keys: ${Object.keys(realPayload).join(', ')}`);
             }
-            else if (this.config.logUnhandledEvents) {
-                // Log at warning level if repo info is missing and logUnhandledEvents is on
+            else {
+                // Log at warning level even in production if repo info is missing, as this is a critical failure
+                // But only log keys to avoid leaking sensitive data
                 this.ctx.logger('githubsth').warn(`Missing repo info for event: ${event}. Keys: ${Object.keys(realPayload).join(', ')}`);
             }
             return;
         }
-        // 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}`);
@@ -172,9 +126,6 @@ class Notifier extends koishi_1.Service {
                 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;
         }
         if (this.config.debug) {
@@ -187,160 +138,50 @@ 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':
-                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';
-                    });
-                }
+                message = this.ctx.githubsthFormatter.formatPush(realPayload);
                 break;
             case 'issues':
-                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;
+                message = this.ctx.githubsthFormatter.formatIssue(realPayload);
                 break;
             case 'pull_request':
-                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;
+                message = this.ctx.githubsthFormatter.formatPullRequest(realPayload);
                 break;
             case 'star':
-                if (!payload.action)
-                    payload.action = 'created';
-                if (payload.repository && payload.repository.stargazers_count === undefined) {
-                    payload.repository.stargazers_count = '?';
-                }
+                message = this.ctx.githubsthFormatter.formatStar(realPayload);
                 break;
             case 'fork':
-                if (!payload.forkee)
-                    payload.forkee = { full_name: 'unknown/fork' };
+                message = this.ctx.githubsthFormatter.formatFork(realPayload);
                 break;
             case 'release':
-                if (!payload.action)
-                    payload.action = 'published';
-                if (!payload.release)
-                    payload.release = { tag_name: 'unknown', name: 'Unknown Release', html_url: '' };
+                message = this.ctx.githubsthFormatter.formatRelease(realPayload);
                 break;
             case 'discussion':
-                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;
+                message = this.ctx.githubsthFormatter.formatDiscussion(realPayload);
                 break;
             case 'workflow_run':
-                if (!payload.action)
-                    payload.action = 'completed';
-                if (!payload.workflow_run)
-                    payload.workflow_run = { conclusion: 'unknown', name: 'Unknown Workflow', head_branch: 'unknown', html_url: '' };
+                message = this.ctx.githubsthFormatter.formatWorkflowRun(realPayload);
                 break;
             case 'issue_comment':
-                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;
+                message = this.ctx.githubsthFormatter.formatIssueComment(realPayload);
                 break;
             case 'pull_request_review':
-                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;
+                message = this.ctx.githubsthFormatter.formatPullRequestReview(realPayload);
                 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.2-beta1",
+  "version": "1.0.2-test2",
   "description": "Github Subscriptions Notifications, push notifications for GitHub subscriptions For koishi",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",