@zhin.js/adapter-github 0.1.34 → 0.1.36

package/lib/index.js

@@ -3,9 +3,11 @@
  */
 import { usePlugin } from 'zhin.js';
 import { GitHubAdapter } from './adapter.js';
+import { GhClient } from './gh-client.js';
 export * from './types.js';
 export { GitHubBot, parseMarkdown, toMarkdown } from './bot.js';
 export { GitHubAdapter } from './adapter.js';
+export { GhClient } from './gh-client.js';
 const plugin = usePlugin();
 const { provide, defineModel, useContext, logger } = plugin;
 defineModel('github_subscriptions', {
@@ -28,15 +30,12 @@ defineModel('github_oauth_users', {
     platform: { type: 'text', nullable: false },
     platform_uid: { type: 'text', nullable: false },
     github_login: { type: 'text', nullable: false },
-    github_id: { type: 'integer', nullable: false },
     access_token: { type: 'text', nullable: false },
-    scope: { type: 'text', default: '' },
-    created_at: { type: 'date', nullable: false },
-    updated_at: { type: 'date', nullable: false },
+    created_at: { type: 'integer', default: 0 },
 });
 provide({
     name: 'github',
-    description: 'GitHub Adapter — Issues/PRs as chat channels, full repo management via GitHub App',
+    description: 'GitHub Adapter — Issues/PRs as chat channels, full repo management via gh CLI',
     mounted: async (p) => {
         const adapter = new GitHubAdapter(p);
         await adapter.start();
@@ -46,9 +45,29 @@ provide({
         await adapter.stop();
     },
 });
-useContext('router', 'github', (router, adapter) => {
-    adapter.setupWebhook(router);
-    adapter.setupOAuth(router);
+// 混合模式：有 router + webhook_secret → Webhook 实时；否则 → 轮询降级
+useContext('github', (adapter) => {
+    if (adapter.hasWebhookConfig) {
+        // 尝试注册 Webhook（需要 router Context）
+        const router = plugin.inject('router');
+        if (router) {
+            adapter.setupWebhook(router);
+            logger.info('GitHub 事件源: Webhook (实时)');
+        }
+        else {
+            // router 还没就绪，等它挂载后再注册
+            plugin.useContext('router', (r) => {
+                adapter.setupWebhook(r);
+                logger.info('GitHub 事件源: Webhook (实时, 延迟注册)');
+            });
+        }
+    }
+    // Webhook 未配置或未激活时，总是启动轮询作为兜底
+    if (!adapter.webhookActive) {
+        adapter.startPolling();
+        logger.info('GitHub 事件源: 轮询');
+    }
+    return () => adapter.stopPolling();
 });
 // ── Tool 工具注册 ─────────────────────────────────────────────────────────
 useContext('tool', 'github', (toolService, adapter) => {
@@ -75,8 +94,8 @@ useContext('tool', 'github', (toolService, adapter) => {
             },
             platforms: ['github'],
             tags: ['github'],
-            execute: async (args) => {
-                const api = adapter.getAPI();
+            execute: async (args, context) => {
+                const api = await adapter.getUserOrDefaultAPI(context?.platform, context?.senderId);
                 if (!api)
                     return '❌ 没有可用的 GitHub bot';
                 const { action, repo, number: num, title, body, head, base, state, approve, method } = args;
@@ -163,8 +182,8 @@ useContext('tool', 'github', (toolService, adapter) => {
             },
             platforms: ['github'],
             tags: ['github'],
-            execute: async (args) => {
-                const api = adapter.getAPI();
+            execute: async (args, context) => {
+                const api = await adapter.getUserOrDefaultAPI(context?.platform, context?.senderId);
                 if (!api)
                     return '❌ 没有可用的 GitHub bot';
                 const { action, repo, number: num, title, body, labels, state } = args;
@@ -236,8 +255,8 @@ useContext('tool', 'github', (toolService, adapter) => {
             },
             platforms: ['github'],
             tags: ['github'],
-            execute: async (args) => {
-                const api = adapter.getAPI();
+            execute: async (args, context) => {
+                const api = await adapter.getUserOrDefaultAPI(context?.platform, context?.senderId);
                 if (!api)
                     return '❌ 没有可用的 GitHub bot';
                 const { action, repo, limit: lim } = args;
@@ -311,8 +330,8 @@ useContext('tool', 'github', (toolService, adapter) => {
             },
             platforms: ['github'],
             tags: ['github'],
-            execute: async (args) => {
-                const api = adapter.getAPI();
+            execute: async (args, context) => {
+                const api = await adapter.getUserOrDefaultAPI(context?.platform, context?.senderId);
                 if (!api)
                     return '❌ 没有可用的 GitHub bot';
                 const { action, query: q, limit: lim } = args;
@@ -365,8 +384,8 @@ useContext('tool', 'github', (toolService, adapter) => {
             },
             platforms: ['github'],
             tags: ['github'],
-            execute: async (args) => {
-                const api = adapter.getAPI();
+            execute: async (args, context) => {
+                const api = await adapter.getUserOrDefaultAPI(context?.platform, context?.senderId);
                 if (!api)
                     return '❌ 没有可用的 GitHub bot';
                 const { action, repo, number: num, labels } = args;
@@ -422,8 +441,8 @@ useContext('tool', 'github', (toolService, adapter) => {
             },
             platforms: ['github'],
             tags: ['github'],
-            execute: async (args) => {
-                const api = adapter.getAPI();
+            execute: async (args, context) => {
+                const api = await adapter.getUserOrDefaultAPI(context?.platform, context?.senderId);
                 if (!api)
                     return '❌ 没有可用的 GitHub bot';
                 const { action, repo, number: num, assignees } = args;
@@ -453,8 +472,8 @@ useContext('tool', 'github', (toolService, adapter) => {
             },
             platforms: ['github'],
             tags: ['github'],
-            execute: async (args) => {
-                const api = adapter.getAPI();
+            execute: async (args, context) => {
+                const api = await adapter.getUserOrDefaultAPI(context?.platform, context?.senderId);
                 if (!api)
                     return '❌ 没有可用的 GitHub bot';
                 const r = await api.getFileContent(args.repo, args.path, args.ref);
@@ -492,8 +511,8 @@ useContext('tool', 'github', (toolService, adapter) => {
             },
             platforms: ['github'],
             tags: ['github'],
-            execute: async (args) => {
-                const api = adapter.getAPI();
+            execute: async (args, context) => {
+                const api = await adapter.getUserOrDefaultAPI(context?.platform, context?.senderId);
                 if (!api)
                     return '❌ 没有可用的 GitHub bot';
                 const { action, repo, sha, path, base, head, limit: lim } = args;
@@ -539,8 +558,8 @@ useContext('tool', 'github', (toolService, adapter) => {
             },
             platforms: ['github'],
             tags: ['github'],
-            execute: async (args) => {
-                const api = adapter.getAPI();
+            execute: async (args, context) => {
+                const api = await adapter.getUserOrDefaultAPI(context?.platform, context?.senderId);
                 if (!api)
                     return '❌ 没有可用的 GitHub bot';
                 const { type: itemType, repo, number: num, title, body, state } = args;
@@ -564,7 +583,7 @@ useContext('tool', 'github', (toolService, adapter) => {
         // --- Star ---
         {
             name: 'github_star',
-            description: 'Star 或取消 Star 一个 GitHub 仓库（需要先 github_bind 绑定账号）',
+            description: 'Star 或取消 Star 一个 GitHub 仓库（使用你绑定的 GitHub 账号，未绑定则用 Bot 默认账号）',
             parameters: {
                 type: 'object',
                 properties: {
@@ -576,24 +595,22 @@ useContext('tool', 'github', (toolService, adapter) => {
             platforms: ['github'],
             tags: ['github'],
             execute: async (args, context) => {
-                if (!context?.platform || !context?.senderId)
-                    return '❌ 无法获取用户信息';
-                const client = await adapter.getOAuthClient(context.platform, context.senderId);
-                if (!client)
-                    return '❌ 你还没有绑定 GitHub 账号，请先使用 github_bind';
+                const gh = await adapter.getUserOrDefaultAPI(context?.platform, context?.senderId);
+                if (!gh)
+                    return '❌ 没有可用的 GitHub bot';
                 const { action, repo } = args;
                 switch (action) {
                     case 'star': {
-                        const r = await client.starRepo(repo);
-                        return r.ok || r.status === 204 ? `⭐ 已 Star ${repo}` : `❌ ${r.data?.message || JSON.stringify(r.data)}`;
+                        const r = await gh.starRepo(repo);
+                        return r.ok ? `⭐ 已 Star ${repo}` : `❌ ${r.data?.message || JSON.stringify(r.data)}`;
                     }
                     case 'unstar': {
-                        const r = await client.unstarRepo(repo);
-                        return r.ok || r.status === 204 ? `💔 已取消 Star ${repo}` : `❌ ${r.data?.message || JSON.stringify(r.data)}`;
+                        const r = await gh.unstarRepo(repo);
+                        return r.ok ? `💔 已取消 Star ${repo}` : `❌ ${r.data?.message || JSON.stringify(r.data)}`;
                     }
                     case 'check': {
-                        const starred = await client.isStarred(repo);
-                        return starred ? `⭐ 你已 Star ${repo}` : `☆ 你尚未 Star ${repo}`;
+                        const starred = await gh.isStarred(repo);
+                        return starred ? `⭐ 已 Star ${repo}` : `☆ 尚未 Star ${repo}`;
                     }
                     default: return `❌ 未知操作: ${action}`;
                 }
@@ -602,7 +619,7 @@ useContext('tool', 'github', (toolService, adapter) => {
         // --- Fork ---
         {
             name: 'github_fork',
-            description: 'Fork 一个 GitHub 仓库到自己的账号下（需要先 github_bind 绑定账号）',
+            description: 'Fork 一个 GitHub 仓库（使用你绑定的 GitHub 账号，未绑定则用 Bot 默认账号）',
             parameters: {
                 type: 'object',
                 properties: {
@@ -613,17 +630,166 @@ useContext('tool', 'github', (toolService, adapter) => {
             platforms: ['github'],
             tags: ['github'],
             execute: async (args, context) => {
-                if (!context?.platform || !context?.senderId)
-                    return '❌ 无法获取用户信息';
-                const client = await adapter.getOAuthClient(context.platform, context.senderId);
-                if (!client)
-                    return '❌ 你还没有绑定 GitHub 账号，请先使用 github_bind';
-                const r = await client.forkRepo(args.repo);
+                const gh = await adapter.getUserOrDefaultAPI(context?.platform, context?.senderId);
+                if (!gh)
+                    return '❌ 没有可用的 GitHub bot';
+                const r = await gh.forkRepo(args.repo);
                 if (!r.ok)
                     return `❌ ${r.data?.message || JSON.stringify(r.data)}`;
                 return `🍴 已 Fork ${args.repo} → ${r.data.full_name}\n🔗 ${r.data.html_url}`;
             },
         },
+        // --- Bind (Device Flow) ---
+        {
+            name: 'github_bind',
+            description: '绑定你的 GitHub 账号 — 使用 Device Flow 授权，无需输入密码',
+            parameters: {
+                type: 'object',
+                properties: {},
+            },
+            tags: ['github'],
+            execute: async (_args, context) => {
+                if (!context?.platform || !context?.senderId) {
+                    return '❌ 无法获取当前用户信息';
+                }
+                const clientId = adapter.getClientId();
+                if (!clientId)
+                    return '❌ Bot 未配置 GitHub App 或 App 无 client_id，无法进行账号绑定';
+                const db = plugin.root?.inject('database');
+                const model = db?.models?.get('github_oauth_users');
+                if (!model)
+                    return '❌ 数据库未就绪';
+                // 检查是否已绑定
+                const [existing] = await model.select().where({ platform: context.platform, platform_uid: context.senderId });
+                if (existing) {
+                    return `⚠️ 你已绑定 GitHub 账号: ${existing.github_login}\n如需重新绑定，请先执行 github_unbind`;
+                }
+                try {
+                    const host = adapter.getHost();
+                    const codeResp = await GhClient.deviceFlowRequestCode(clientId, host);
+                    // 异步轮询 token（最多等 codeResp.expires_in 秒）
+                    const tokenPromise = GhClient.deviceFlowPollToken(clientId, codeResp.device_code, codeResp.interval, codeResp.expires_in, host);
+                    // 先回复用户授权链接
+                    const replyMsg = [
+                        `🔗 请在浏览器中打开以下链接进行授权：`,
+                        `   ${codeResp.verification_uri}`,
+                        ``,
+                        `📋 输入验证码: **${codeResp.user_code}**`,
+                        ``,
+                        `⏳ 等待授权中…（${Math.floor(codeResp.expires_in / 60)} 分钟内有效）`,
+                    ].join('\n');
+                    // 在后台等待用户授权完成
+                    tokenPromise.then(async (tokenData) => {
+                        if (!tokenData) {
+                            // 授权超时或被拒绝 — 由于 execute 已经返回了，这里只能通过日志记录
+                            logger.warn(`GitHub Device Flow 超时/拒绝: ${context.platform}:${context.senderId}`);
+                            return;
+                        }
+                        // 使用 token 获取 GitHub 用户名
+                        const userGh = new GhClient({ host, token: tokenData.access_token });
+                        const authResult = await userGh.verifyAuth();
+                        const login = authResult.ok ? authResult.user : 'unknown';
+                        await model.insert({
+                            id: Date.now(),
+                            platform: context.platform,
+                            platform_uid: context.senderId,
+                            github_login: login,
+                            access_token: tokenData.access_token,
+                            created_at: Date.now(),
+                        });
+                        logger.info(`GitHub 账号绑定成功: ${context.platform}:${context.senderId} → ${login}`);
+                        // 尝试回复绑定成功消息
+                        if (context.message?.$reply) {
+                            await context.message.$reply(`✅ GitHub 账号绑定成功！\n👤 ${login}`);
+                        }
+                    }).catch(err => {
+                        logger.error('GitHub Device Flow 错误:', err);
+                    });
+                    return replyMsg;
+                }
+                catch (e) {
+                    return `❌ Device Flow 启动失败: ${e.message}`;
+                }
+            },
+        },
+        // --- Unbind ---
+        {
+            name: 'github_unbind',
+            description: '解除你绑定的 GitHub 账号',
+            parameters: {
+                type: 'object',
+                properties: {},
+            },
+            tags: ['github'],
+            execute: async (_args, context) => {
+                if (!context?.platform || !context?.senderId) {
+                    return '❌ 无法获取当前用户信息';
+                }
+                const db = plugin.root?.inject('database');
+                const model = db?.models?.get('github_oauth_users');
+                if (!model)
+                    return '❌ 数据库未就绪';
+                const [existing] = await model.select().where({ platform: context.platform, platform_uid: context.senderId });
+                if (!existing)
+                    return '📭 你尚未绑定 GitHub 账号';
+                await model.delete().where({ id: existing.id });
+                return `✅ 已解除 GitHub 账号绑定: ${existing.github_login}`;
+            },
+        },
+        // --- Whoami ---
+        {
+            name: 'github_whoami',
+            description: '查看你绑定的 GitHub 账号信息',
+            parameters: {
+                type: 'object',
+                properties: {},
+            },
+            tags: ['github'],
+            execute: async (_args, context) => {
+                if (!context?.platform || !context?.senderId) {
+                    return '❌ 无法获取当前用户信息';
+                }
+                const db = plugin.root?.inject('database');
+                const model = db?.models?.get('github_oauth_users');
+                if (!model)
+                    return '❌ 数据库未就绪';
+                const [existing] = await model.select().where({ platform: context.platform, platform_uid: context.senderId });
+                if (!existing)
+                    return '📭 你尚未绑定 GitHub 账号\n🔗 使用 github_bind 绑定你的账号';
+                // 验证 token 是否仍然有效
+                const userGh = new GhClient({ host: adapter.getHost(), token: existing.access_token });
+                const auth = await userGh.verifyAuth();
+                if (auth.ok) {
+                    return `👤 已绑定 GitHub 账号: ${auth.user}\n📅 绑定时间: ${new Date(existing.created_at).toLocaleString('zh-CN')}`;
+                }
+                return `⚠️ 已绑定账号 ${existing.github_login}，但 Token 已失效\n🔗 请执行 github_unbind 后重新 github_bind`;
+            },
+        },
+        // --- Install App ---
+        {
+            name: 'github_install',
+            description: '获取安装 GitHub App 的链接 — 安装后 Bot 可以访问你的仓库，你也可以使用更多功能',
+            parameters: {
+                type: 'object',
+                properties: {},
+            },
+            tags: ['github'],
+            execute: async () => {
+                const slug = adapter.getAppSlug();
+                if (!slug)
+                    return '❌ Bot 未配置 GitHub App';
+                const host = adapter.getHost() || 'github.com';
+                const installations = adapter.getInstallations();
+                let msg = `🔗 请点击以下链接安装 GitHub App 到你的仓库：\n   https://${host}/apps/${slug}/installations/new`;
+                if (installations.length) {
+                    msg += `\n\n📋 当前已安装 (${installations.length}):`;
+                    for (const inst of installations) {
+                        msg += `\n  • ${inst.account.login} (${inst.account.type})`;
+                    }
+                }
+                return msg;
+            },
+        },
         // --- Subscribe ---
         {
             name: 'github_subscribe',
@@ -739,90 +905,10 @@ useContext('tool', 'github', (toolService, adapter) => {
                     }).join('\n\n');
             },
         },
-        // --- Bind ---
-        {
-            name: 'github_bind',
-            description: '绑定 GitHub 账号，生成 OAuth 授权链接',
-            parameters: {
-                type: 'object',
-                properties: {},
-            },
-            platforms: ['github'],
-            tags: ['github'],
-            execute: async (_args, context) => {
-                if (!context?.platform || !context?.senderId)
-                    return '❌ 无法获取用户信息';
-                // 检查是否已绑定
-                const db = plugin.root?.inject('database');
-                const model = db?.models?.get('github_oauth_users');
-                if (model) {
-                    const [existing] = await model.select().where({ platform: context.platform, platform_uid: context.senderId });
-                    if (existing)
-                        return `✅ 你已绑定 GitHub 账号: ${existing.github_login}\n如需重新绑定，请先使用 github_unbind 解绑`;
-                }
-                const url = adapter.createOAuthState(context.platform, context.senderId);
-                if (!url)
-                    return '❌ GitHub App 未配置 OAuth (缺少 client_id)';
-                return `🔗 请点击以下链接绑定你的 GitHub 账号:\n${url}\n\n链接有效期 5 分钟`;
-            },
-        },
-        // --- Unbind ---
-        {
-            name: 'github_unbind',
-            description: '解绑 GitHub 账号',
-            parameters: {
-                type: 'object',
-                properties: {},
-            },
-            platforms: ['github'],
-            tags: ['github'],
-            execute: async (_args, context) => {
-                if (!context?.platform || !context?.senderId)
-                    return '❌ 无法获取用户信息';
-                const db = plugin.root?.inject('database');
-                const model = db?.models?.get('github_oauth_users');
-                if (!model)
-                    return '❌ 数据库未就绪';
-                const [existing] = await model.select().where({ platform: context.platform, platform_uid: context.senderId });
-                if (!existing)
-                    return '📭 你还没有绑定 GitHub 账号';
-                await model.delete().where({ id: existing.id });
-                return `✅ 已解绑 GitHub 账号: ${existing.github_login}`;
-            },
-        },
-        // --- Whoami ---
-        {
-            name: 'github_whoami',
-            description: '查看当前绑定的 GitHub 账号信息',
-            parameters: {
-                type: 'object',
-                properties: {},
-            },
-            platforms: ['github'],
-            tags: ['github'],
-            execute: async (_args, context) => {
-                if (!context?.platform || !context?.senderId)
-                    return '❌ 无法获取用户信息';
-                const db = plugin.root?.inject('database');
-                const model = db?.models?.get('github_oauth_users');
-                if (!model)
-                    return '❌ 数据库未就绪';
-                const [row] = await model.select().where({ platform: context.platform, platform_uid: context.senderId });
-                if (!row)
-                    return '📭 你还没有绑定 GitHub 账号，使用 github_bind 进行绑定';
-                return [
-                    `🐙 GitHub 账号信息`,
-                    `👤 用户名: ${row.github_login}`,
-                    `🆔 GitHub ID: ${row.github_id}`,
-                    `📅 绑定时间: ${row.created_at instanceof Date ? row.created_at.toLocaleDateString() : String(row.created_at).split('T')[0]}`,
-                    `🔑 权限: ${row.scope || '(默认)'}`,
-                ].join('\n');
-            },
-        },
     ];
-    const disposers = tools.map(t => toolService.addTool(t, 'github'));
+    const disposers = tools.map(t => toolService.addTool(t, plugin.name));
     logger.debug(`GitHub 工具已注册: ${tools.map(t => t.name).join(', ')}`);
     return () => disposers.forEach(d => d());
 });
-logger.debug('GitHub 适配器已加载 (GitHub App 认证)');
+logger.debug('GitHub 适配器已加载 (gh CLI 认证)');
 //# sourceMappingURL=index.js.map