@vrs-soft/wecom-aibot-mcp 2.4.2 → 2.4.4

package/dist/bin.js

@@ -13,7 +13,7 @@ import { spawn } from 'child_process';
 import * as fs from 'fs';
 import * as path from 'path';
 import * as os from 'os';
-import { runConfigWizard, loadConfig, saveConfig, deleteRobotConfigInteractive, uninstall, addMcpConfig, detectUserIdFromMessage, ensureHookInstalled, listAllRobots, ensureGlobalConfigs, getAuthToken, setAuthToken, updateMcpAuthHeaders, runRemoteInstallWizard, VERSION, } from './config-wizard.js';
+import { runConfigWizard, loadConfig, saveConfig, deleteRobotConfigInteractive, uninstall, addMcpConfig, detectUserIdFromMessage, ensureHookInstalled, listAllRobots, ensureGlobalConfigs, getAuthToken, setAuthToken, getHttpsConfig, setHttpsConfig, updateMcpAuthHeaders, runRemoteInstallWizard, VERSION, } from './config-wizard.js';
 import { initClient } from './client.js';
 import { registerTools } from './tools/index.js';
 import { startHttpServer, stopHttpServer, HTTP_PORT } from './http-server.js';
@@ -251,8 +251,10 @@ async function startMcpServerForeground(isDebug = false) {
     logger.log('  ║   Claude Code 审批通道                                 ║');
     logger.log('  ╚════════════════════════════════════════════════════════╝');
     logger.log('');
-    logger.log(`[mcp] 启动 MCP HTTP Server (端口: ${HTTP_PORT})...`);
-    await startHttpServer(server);
+    const httpsConfig = getHttpsConfig() ?? undefined;
+    const protocol = httpsConfig ? 'HTTPS' : 'HTTP';
+    logger.log(`[mcp] 启动 MCP ${protocol} Server (端口: ${HTTP_PORT})...`);
+    await startHttpServer(server, HTTP_PORT, httpsConfig);
     startKeepaliveMonitor();
     logger.log(`[mcp] MCP Server 已就绪`);
     logger.log(`[mcp] HTTP endpoint: http://127.0.0.1:${HTTP_PORT}/mcp`);
@@ -311,9 +313,15 @@ async function main() {
     // 确定安装模式
     const installMode = args.includes('--http-only') ? 'http-only' :
         args.includes('--channel-only') ? 'channel-only' : 'full';
-    // --reinstall / --http-only / --setup 命令跳过顶部 ensureGlobalConfigs
-    // （--setup 自己在向导完成后调用）
-    if (!args.includes('--reinstall') && !args.includes('--http-only') && !args.includes('--setup')) {
+    // 以下命令跳过顶部 ensureGlobalConfigs，避免覆盖配置
+    // --setup: 向导完成后自己调用
+    // --channel: 作为 Channel MCP 代理运行，不应改写全局配置
+    // --reinstall / --http-only: 有自己的处理逻辑
+    // --version / -v: 只查版本，不写配置
+    const skipEnsure = args.includes('--reinstall') || args.includes('--http-only') ||
+        args.includes('--setup') || args.includes('--channel') ||
+        args.includes('--version') || args.includes('-v');
+    if (!skipEnsure) {
         // 强制覆盖所有全局配置（不依赖智能体）
         ensureGlobalConfigs(installMode);
     }
@@ -504,39 +512,89 @@ async function main() {
             console.log('[setup] 安装完成！请重启 Claude Code 以加载配置');
         }
         else if (wantServer) {
-            // 服务器端
-            console.log('\n[setup] Server 安装模式\n');
-            const savedConfig = loadConfig();
-            if (!savedConfig?.botId)
-                await runConfigWizard();
+            // 服务器端：分两步——先完成 Server 安装，再配置机器人
+            console.log('\n[setup] ─── 步骤 1/2：Server 安装 ───\n');
+            console.log('  Server 负责运行 HTTP MCP 服务，Bot 配置在下一步单独完成\n');
             const readline = await import('readline');
             const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
-            const token = await new Promise(resolve => rl.question('Auth Token（Client 端需填写相同 Token，留空跳过）: ', a => { rl.close(); resolve(a.trim()); }));
+            const token = await new Promise(resolve => rl.question('Auth Token（Client 端连接时需填写相同 Token，留空跳过）: ', a => { rl.close(); resolve(a.trim()); }));
             if (token)
                 setAuthToken(token);
+            // HTTPS 证书配置
+            const defaultCertPath = path.join(os.homedir(), '.wecom-aibot-mcp', 'cert.pem');
+            console.log('\n  HTTPS 证书配置（留空跳过，保持 HTTP 模式）');
+            console.log('  请输入完整路径含文件名（.pem / .crt / .key 均可），例如:');
+            console.log(`    ${defaultCertPath}`);
+            console.log('    /etc/letsencrypt/live/example.com/fullchain.pem');
+            console.log('    /etc/gitlab/ssl/gitlab.example.com.crt\n');
+            const checkFile = (p, label) => {
+                if (!fs.existsSync(p)) {
+                    console.log(`[setup] ⚠️  ${label}文件不存在: ${p}`);
+                    return false;
+                }
+                if (fs.statSync(p).isDirectory()) {
+                    console.log(`[setup] ⚠️  ${label}路径是目录而非文件: ${p}`);
+                    return false;
+                }
+                return true;
+            };
+            const rl2 = readline.createInterface({ input: process.stdin, output: process.stdout });
+            const certInput = await new Promise(resolve => rl2.question(`SSL 证书文件完整路径（留空跳过）: `, a => { rl2.close(); resolve(a.trim()); }));
+            if (certInput) {
+                if (!checkFile(certInput, '证书')) {
+                    console.log('[setup] 跳过 HTTPS 配置');
+                }
+                else {
+                    const rl3 = readline.createInterface({ input: process.stdin, output: process.stdout });
+                    const keyInput = await new Promise(resolve => rl3.question(`SSL 私钥文件完整路径: `, a => { rl3.close(); resolve(a.trim()); }));
+                    if (keyInput && checkFile(keyInput, '私钥')) {
+                        setHttpsConfig(certInput, keyInput);
+                        console.log(`[setup] HTTPS 已配置`);
+                        console.log(`  证书: ${certInput}`);
+                        console.log(`  私钥: ${keyInput}`);
+                    }
+                    else if (!keyInput) {
+                        console.log('[setup] 私钥路径不能为空，跳过 HTTPS 配置');
+                    }
+                }
+            }
+            else {
+                console.log(`[setup] 跳过 HTTPS，使用 HTTP 模式`);
+                console.log(`[setup] 如需启用 HTTPS，配置证书后重新运行 --setup --server`);
+            }
             console.log('\n[setup] Server 配置完成！');
             console.log('  启动: npx @vrs-soft/wecom-aibot-mcp --http-only --start');
+            console.log('\n[setup] ─── 步骤 2/2：配置企业微信机器人 ───\n');
+            await addMcpConfig();
         }
         else if (wantChannel) {
             // Channel 客户端
             console.log('\n[setup] Channel Client 安装模式\n');
-            let mcpUrl = process.env.MCP_URL;
+            // 交互式安装必须每次都提示，不能直接用已有的环境变量（可能是旧值）
+            const readline = await import('readline');
+            const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
+            const existingUrl = process.env.MCP_URL || '';
+            const urlPrompt = existingUrl
+                ? `远程服务器地址（当前: ${existingUrl}，直接回车保持不变）: `
+                : `远程服务器地址（如 https://your-server:18963）: `;
+            const urlInput = await new Promise(resolve => rl.question(urlPrompt, a => { rl.close(); resolve(a.trim()); }));
+            const mcpUrl = urlInput || existingUrl;
             if (!mcpUrl) {
-                const readline = await import('readline');
-                const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
-                mcpUrl = await new Promise(resolve => rl.question('远程服务器地址（如 https://your-server:18963）: ', a => { rl.close(); resolve(a.trim()); }));
-                if (!mcpUrl) {
-                    console.log('[setup] ❌ 地址不能为空');
-                    process.exit(1);
-                }
-                process.env.MCP_URL = mcpUrl;
+                console.log('[setup] ❌ 地址不能为空');
+                process.exit(1);
             }
-            if (!getAuthToken()) {
-                const readline = await import('readline');
-                const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
-                const token = await new Promise(resolve => rl.question('Auth Token: ', a => { rl.close(); resolve(a.trim()); }));
-                if (token)
-                    setAuthToken(token);
+            process.env.MCP_URL = mcpUrl;
+            {
+                const existingToken = getAuthToken();
+                const tokenPrompt = existingToken
+                    ? `Auth Token（当前: ${existingToken.slice(0, 8)}...${existingToken.slice(-4)}，直接回车保持不变）: `
+                    : 'Auth Token（留空跳过）: ';
+                const readline2 = await import('readline');
+                const rl2 = readline2.createInterface({ input: process.stdin, output: process.stdout });
+                const tokenInput = await new Promise(resolve => rl2.question(tokenPrompt, a => { rl2.close(); resolve(a.trim()); }));
+                const finalToken = tokenInput || existingToken || '';
+                if (finalToken)
+                    setAuthToken(finalToken);
             }
             ensureGlobalConfigs('channel-only');
             console.log('[setup] Channel MCP 配置完成！请重启 Claude Code 以加载配置');

package/dist/config-wizard.d.ts

@@ -10,6 +10,11 @@ export declare const VERSION: string;
 export declare function loadConfig(): WecomConfig | null;
 export declare function getAuthToken(): string | undefined;
 export declare function setAuthToken(token: string | undefined): boolean;
+export declare function getHttpsConfig(): {
+    certPath: string;
+    keyPath: string;
+} | null;
+export declare function setHttpsConfig(certPath: string, keyPath: string): boolean;
 export declare function updateMcpAuthHeaders(token?: string): void;
 export declare function listAllMcpInstances(): Array<{
     name: string;

package/dist/config-wizard.js

@@ -104,6 +104,38 @@ export function setAuthToken(token) {
     fs.writeFileSync(SERVER_CONFIG_FILE, JSON.stringify(config, null, 2));
     return true;
 }
+// 获取 HTTPS 证书配置（从 server.json 读取）
+export function getHttpsConfig() {
+    if (!fs.existsSync(SERVER_CONFIG_FILE))
+        return null;
+    try {
+        const config = JSON.parse(fs.readFileSync(SERVER_CONFIG_FILE, 'utf-8'));
+        if (config.certPath && config.keyPath) {
+            return { certPath: config.certPath, keyPath: config.keyPath };
+        }
+        return null;
+    }
+    catch {
+        return null;
+    }
+}
+// 设置 HTTPS 证书配置（写入 server.json）
+export function setHttpsConfig(certPath, keyPath) {
+    ensureConfigDir();
+    let config = {};
+    if (fs.existsSync(SERVER_CONFIG_FILE)) {
+        try {
+            config = JSON.parse(fs.readFileSync(SERVER_CONFIG_FILE, 'utf-8'));
+        }
+        catch {
+            // ignore
+        }
+    }
+    config.certPath = certPath;
+    config.keyPath = keyPath;
+    fs.writeFileSync(SERVER_CONFIG_FILE, JSON.stringify(config, null, 2));
+    return true;
+}
 // 更新 ~/.claude.json 中 wecom-aibot MCP 配置的 auth headers
 export function updateMcpAuthHeaders(token) {
     if (!fs.existsSync(CLAUDE_CONFIG_FILE))
@@ -1000,9 +1032,10 @@ export function ensureGlobalConfigs(mode = 'full', remoteOptions) {
         }
         if (!claudeConfig.mcpServers)
             claudeConfig.mcpServers = {};
+        const mcpEndpointUrl = remoteOptions.url.replace(/\/+$/, '') + '/mcp';
         claudeConfig.mcpServers['wecom-aibot'] = {
             type: 'http',
-            url: remoteOptions.url,
+            url: mcpEndpointUrl,
             headers: { Authorization: `Bearer ${remoteOptions.token}` },
         };
         fs.writeFileSync(CLAUDE_CONFIG_FILE, JSON.stringify(claudeConfig, null, 2));
@@ -1012,8 +1045,8 @@ export function ensureGlobalConfigs(mode = 'full', remoteOptions) {
     }
     // remote-channel 模式：写入远程 HTTP MCP（带 token）+ Channel MCP
     if (mode === 'remote-channel') {
-        if (!remoteOptions?.url || !remoteOptions?.token) {
-            console.log('[config] ❌ 远程模式需要提供 URL 和 Token');
+        if (!remoteOptions?.url) {
+            console.log('[config] ❌ 远程模式需要提供 URL');
             return { upgraded: false, previousVersion };
         }
         let claudeConfig = {};
@@ -1022,21 +1055,20 @@ export function ensureGlobalConfigs(mode = 'full', remoteOptions) {
         }
         if (!claudeConfig.mcpServers)
             claudeConfig.mcpServers = {};
-        // HTTP MCP 配置（带 token）
-        claudeConfig.mcpServers['wecom-aibot'] = {
-            type: 'http',
-            url: remoteOptions.url,
-            headers: { Authorization: `Bearer ${remoteOptions.token}` },
-        };
+        // HTTP MCP 配置（带 token，可选）
+        const mcpEndpointUrl = remoteOptions.url.replace(/\/+$/, '') + '/mcp';
+        const httpMcpConfig = { type: 'http', url: mcpEndpointUrl };
+        if (remoteOptions.token)
+            httpMcpConfig.headers = { Authorization: `Bearer ${remoteOptions.token}` };
+        claudeConfig.mcpServers['wecom-aibot'] = httpMcpConfig;
         // Channel MCP 配置（带 MCP_URL + MCP_AUTH_TOKEN）
-        const binPath = path.join(__dirname, 'bin.js');
+        const channelEnvRemote = { MCP_URL: remoteOptions.url.replace(/\/+$/, '') };
+        if (remoteOptions.token)
+            channelEnvRemote.MCP_AUTH_TOKEN = remoteOptions.token;
         claudeConfig.mcpServers['wecom-aibot-channel'] = {
-            command: 'node',
-            args: [binPath, '--channel'],
-            env: {
-                MCP_URL: remoteOptions.url,
-                MCP_AUTH_TOKEN: remoteOptions.token,
-            },
+            command: 'npx',
+            args: ['-y', '@vrs-soft/wecom-aibot-mcp', '--channel'],
+            env: channelEnvRemote,
         };
         fs.writeFileSync(CLAUDE_CONFIG_FILE, JSON.stringify(claudeConfig, null, 2));
         console.log('[config] remote-channel 模式：已写入 HTTP MCP + Channel MCP 配置（带 Token）');
@@ -1054,6 +1086,11 @@ export function ensureGlobalConfigs(mode = 'full', remoteOptions) {
     }
     if (!claudeConfig.mcpServers)
         claudeConfig.mcpServers = {};
+    // 从 node_modules 运行（npm/npx 安装）时用 npx，本地开发时用绝对路径
+    const isPackageInstall = __dirname.includes('node_modules');
+    const channelCmd = isPackageInstall
+        ? { command: 'npx', args: ['-y', '@vrs-soft/wecom-aibot-mcp', '--channel'] }
+        : { command: 'node', args: [path.join(__dirname, 'bin.js'), '--channel'] };
     if (mode === 'channel-only') {
         // Channel-only 模式：必须通过 MCP_URL 指定远程地址
         const mcpUrl = process.env.MCP_URL;
@@ -1062,19 +1099,17 @@ export function ensureGlobalConfigs(mode = 'full', remoteOptions) {
             console.log('[config] 请设置环境变量: MCP_URL=http://远程IP:18963');
             return { upgraded: false, previousVersion };
         }
-        // Channel MCP 配置：使用当前模块路径
-        const binPath = path.join(__dirname, 'bin.js');
-        const channelEnv = { MCP_URL: mcpUrl };
+        const channelEnv = { MCP_URL: mcpUrl.replace(/\/+$/, '') };
         const authToken = getAuthToken();
         if (authToken) {
             channelEnv.MCP_AUTH_TOKEN = authToken;
         }
         claudeConfig.mcpServers['wecom-aibot-channel'] = {
-            command: 'node',
-            args: [binPath, '--channel'],
+            command: channelCmd.command,
+            args: channelCmd.args,
             env: channelEnv,
         };
-        console.log(`[config] Channel-only 模式：Channel MCP 使用本地路径`);
+        console.log(`[config] Channel-only 模式：Channel MCP 已配置`);
     }
     else {
         // full 模式：同时写入 HTTP MCP 和 Channel MCP 配置
@@ -1082,12 +1117,23 @@ export function ensureGlobalConfigs(mode = 'full', remoteOptions) {
             type: 'http',
             url: 'http://127.0.0.1:18963/mcp',
         };
-        // Channel MCP 配置：使用当前模块路径
-        const binPath = path.join(__dirname, 'bin.js');
+        // Channel MCP 配置：保留已有的自定义 MCP_URL（如 channel-only 安装时写入的远程地址）
+        const existingChannel = claudeConfig.mcpServers['wecom-aibot-channel'];
+        const existingMcpUrl = existingChannel?.env?.MCP_URL;
+        const isRemote = existingMcpUrl && !existingMcpUrl.startsWith('http://127.0.0.1');
+        const channelMcpUrl = isRemote ? existingMcpUrl : 'http://127.0.0.1:18963';
+        const channelEnvFull = { MCP_URL: channelMcpUrl };
+        // 保留已有的 MCP_AUTH_TOKEN（远程安装时写入），或从 server.json 读取
+        const existingToken = existingChannel?.env?.MCP_AUTH_TOKEN;
+        if (isRemote) {
+            const token = existingToken || getAuthToken();
+            if (token)
+                channelEnvFull.MCP_AUTH_TOKEN = token;
+        }
         claudeConfig.mcpServers['wecom-aibot-channel'] = {
-            command: 'node',
-            args: [binPath, '--channel'],
-            env: { MCP_URL: 'http://127.0.0.1:18963' },
+            command: channelCmd.command,
+            args: channelCmd.args,
+            env: channelEnvFull,
         };
         console.log(`[config] full 模式：Channel MCP 使用本地路径`);
     }

package/dist/http-server.d.ts

@@ -62,7 +62,10 @@ export declare function getCCRegistryEntry(ccId: string): CCRegistryEntry | null
 export declare function getCCCount(): number;
 export declare function getCCCountByRobot(robotName: string): number;
 export declare function getOnlineCcIds(): string[];
-export declare function startHttpServer(_server: McpServer, port?: number): Promise<void>;
+export declare function startHttpServer(_server: McpServer, port?: number, httpsConfig?: {
+    certPath: string;
+    keyPath: string;
+}): Promise<void>;
 export declare function stopHttpServer(): void;
 export declare function cleanupPortFile(): void;
 export {};

package/dist/http-server.js

@@ -13,6 +13,7 @@
  * - Session → robotName → WebSocket Connection
  */
 import * as http from 'http';
+import * as https from 'https';
 import * as path from 'path';
 import * as os from 'os';
 import * as fs from 'fs';
@@ -461,12 +462,12 @@ ${onlineList.map(id => `• 【${id}】`).join('\n')}
 示例：引用【${onlineList[0]}】的消息后回复`;
     await client.sendText(reply);
 }
-export async function startHttpServer(_server, port = HTTP_PORT) {
+export async function startHttpServer(_server, port = HTTP_PORT, httpsConfig) {
     startTime = Date.now();
     // 初始化 MCP Server
     initMcpServer();
     return new Promise((resolve, reject) => {
-        httpServer = http.createServer(async (req, res) => {
+        const requestHandler = async (req, res) => {
             res.setHeader('Access-Control-Allow-Origin', '*');
             res.setHeader('Access-Control-Allow-Methods', 'GET, POST, DELETE, OPTIONS');
             res.setHeader('Access-Control-Allow-Headers', 'Content-Type, Authorization, Mcp-Session-Id');
@@ -758,7 +759,16 @@ export async function startHttpServer(_server, port = HTTP_PORT) {
             }
             res.writeHead(404, { 'Content-Type': 'application/json' });
             res.end(JSON.stringify({ error: 'Not Found' }));
-        });
+        };
+        // 根据是否有 HTTPS 配置创建对应的 server
+        if (httpsConfig) {
+            const cert = fs.readFileSync(httpsConfig.certPath, 'utf-8');
+            const key = fs.readFileSync(httpsConfig.keyPath, 'utf-8');
+            httpServer = https.createServer({ cert, key }, requestHandler);
+        }
+        else {
+            httpServer = http.createServer(requestHandler);
+        }
         httpServer.on('error', (err) => {
             if (err.code === 'EADDRINUSE') {
                 reject(new Error(`端口 ${port} 已被占用`));
@@ -767,9 +777,12 @@ export async function startHttpServer(_server, port = HTTP_PORT) {
                 reject(err);
             }
         });
-        httpServer.listen(port, '127.0.0.1', async () => {
-            logger.log(`[http] MCP Server 已启动: http://127.0.0.1:${port}`);
-            logger.log(`[http] MCP endpoint: http://127.0.0.1:${port}/mcp (stateless mode)`);
+        // HTTPS 模式绑定所有网卡（供远程客户端访问），HTTP 模式只绑本地
+        const host = httpsConfig ? '0.0.0.0' : '127.0.0.1';
+        const protocol = httpsConfig ? 'https' : 'http';
+        httpServer.listen(port, host, async () => {
+            logger.log(`[http] MCP Server 已启动: ${protocol}://${host}:${port}`);
+            logger.log(`[http] MCP endpoint: ${protocol}://${host}:${port}/mcp (stateless mode)`);
             // 自动连接所有配置的机器人
             await connectAllRobots();
             resolve();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vrs-soft/wecom-aibot-mcp",
-  "version": "2.4.2",
+  "version": "2.4.4",
   "description": "企业微信智能机器人 MCP 服务 - Claude Code 审批通道",
   "type": "module",
   "main": "dist/index.js",