koishi-plugin-githubsth 1.0.1-test1 → 1.0.1-test10

package/lib/index.js

@@ -53,21 +53,43 @@ exports.inject = {
 };
 __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.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);
-        // 加载成功日志
-        console.log('githubsth plugin loaded');
+        logger.info('Plugin loaded successfully');
     }
     catch (e) {
-        console.error('githubsth plugin failed to load:', e);
+        logger.error('Plugin failed to load:', e);
     }
 }

package/lib/services/formatter.d.ts

@@ -1,7 +1,7 @@
 import { Context, Service, h } from 'koishi';
 declare module 'koishi' {
     interface Context {
-        formatter: Formatter;
+        githubsthFormatter: Formatter;
     }
 }
 export declare class Formatter extends Service {

package/lib/services/formatter.js

@@ -4,7 +4,8 @@ exports.Formatter = void 0;
 const koishi_1 = require("koishi");
 class Formatter extends koishi_1.Service {
     constructor(ctx) {
-        super(ctx, 'formatter');
+        super(ctx, 'githubsthFormatter');
+        ctx.logger('githubsth').info('Formatter service initialized');
     }
     formatPush(payload) {
         const { repository, pusher, commits, compare } = payload;

package/lib/services/notifier.d.ts

@@ -2,7 +2,7 @@ import { Context, Service } from 'koishi';
 import { Config } from '../config';
 declare module 'koishi' {
     interface Context {
-        notifier: Notifier;
+        githubsthNotifier: Notifier;
     }
 }
 export declare class Notifier extends Service {

package/lib/services/notifier.js

@@ -5,29 +5,100 @@ const koishi_1 = require("koishi");
 class Notifier extends koishi_1.Service {
     // @ts-ignore
     constructor(ctx, config) {
-        super(ctx, 'notifier', true);
+        super(ctx, 'githubsthNotifier', true);
         this.config = config;
+        this.ctx.logger('githubsth').info('Notifier service initialized');
         this.registerListeners();
     }
     registerListeners() {
         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/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/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));
+        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;
+            this.ctx.logger('githubsth').info(`[Debug] Message session keys: ${Object.keys(session).join(', ')}`);
+            this.ctx.logger('githubsth').info(`[Debug] Message session content: ${session.content}`);
+            // Try to find payload
+            const possiblePayload = session.payload || session.extra || session.data;
+            if (possiblePayload) {
+                this.ctx.logger('githubsth').info(`[Debug] Found payload in property: ${!!session.payload ? 'payload' : !!session.extra ? 'extra' : 'data'}`);
+            }
+            else {
+                this.ctx.logger('githubsth').warn('[Debug] No payload found in session');
+            }
+            // If we can't find the payload easily, we might need to rely on the adapter emitting proper events.
+            // But since we are here, let's try to see if 'payload' or 'extra' exists.
+            const payload = possiblePayload;
+            if (payload) {
+                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) {
-        const repoName = payload.repository?.full_name;
-        if (!repoName)
+        // FORCE LOG for debugging
+        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;
+        let repoName = realPayload.repository?.full_name;
+        // Try to fallback if repoName is missing
+        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;
+        }
+        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(', ')}`);
+            }
             return;
+        }
+        this.ctx.logger('githubsth').info(`Processing event ${event} for ${repoName}`);
         if (this.config.debug) {
             this.ctx.logger('notifier').info(`Received event ${event} for ${repoName}`);
-            this.ctx.logger('notifier').debug(JSON.stringify(payload, null, 2));
+            this.ctx.logger('notifier').debug(JSON.stringify(realPayload, null, 2));
         }
         // Get rules from database
         const dbRules = await this.ctx.database.get('github_subscription', {
@@ -46,50 +117,52 @@ 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('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('notifier').debug(`Found ${matchedRules.length} matching rules for ${repoName}`);
         }
         let message = null;
         // Ensure formatter is loaded
-        if (!this.ctx.formatter) {
+        if (!this.ctx.githubsthFormatter) {
             this.ctx.logger('notifier').warn('Formatter service not available');
             return;
         }
         switch (event) {
             case 'push':
-                message = this.ctx.formatter.formatPush(payload);
+                message = this.ctx.githubsthFormatter.formatPush(realPayload);
                 break;
             case 'issues':
-                message = this.ctx.formatter.formatIssue(payload);
+                message = this.ctx.githubsthFormatter.formatIssue(realPayload);
                 break;
             case 'pull_request':
-                message = this.ctx.formatter.formatPullRequest(payload);
+                message = this.ctx.githubsthFormatter.formatPullRequest(realPayload);
                 break;
             case 'star':
-                message = this.ctx.formatter.formatStar(payload);
+                message = this.ctx.githubsthFormatter.formatStar(realPayload);
                 break;
             case 'fork':
-                message = this.ctx.formatter.formatFork(payload);
+                message = this.ctx.githubsthFormatter.formatFork(realPayload);
                 break;
             case 'release':
-                message = this.ctx.formatter.formatRelease(payload);
+                message = this.ctx.githubsthFormatter.formatRelease(realPayload);
                 break;
             case 'discussion':
-                message = this.ctx.formatter.formatDiscussion(payload);
+                message = this.ctx.githubsthFormatter.formatDiscussion(realPayload);
                 break;
             case 'workflow_run':
-                message = this.ctx.formatter.formatWorkflowRun(payload);
+                message = this.ctx.githubsthFormatter.formatWorkflowRun(realPayload);
                 break;
             case 'issue_comment':
-                message = this.ctx.formatter.formatIssueComment(payload);
+                message = this.ctx.githubsthFormatter.formatIssueComment(realPayload);
                 break;
             case 'pull_request_review':
-                message = this.ctx.formatter.formatPullRequestReview(payload);
+                message = this.ctx.githubsthFormatter.formatPullRequestReview(realPayload);
                 break;
         }
         if (!message) {

package/package.json

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