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

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.js

@@ -23,12 +23,49 @@ 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';
+                if (eventType !== 'unknown') {
+                    this.handleEvent(eventType, payload);
+                }
+            }
+        });
     }
     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;
@@ -44,23 +81,36 @@ class Notifier extends koishi_1.Service {
             repoName = realPayload.pull_request.base.repo.full_name;
         }
         if (!repoName) {
-            this.ctx.logger('githubsth').warn(`Missing repo info for event: ${event}`);
             if (this.config.debug) {
+                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 {
+                // 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;
         }
-        this.ctx.logger('githubsth').info(`Processing event ${event} for ${repoName}`);
         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 +122,14 @@ 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})`);
             }
             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;

package/package.json

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