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

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`);
@@ -504,18 +506,44 @@ 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');
+            const defaultKeyPath = path.join(os.homedir(), '.wecom-aibot-mcp', 'key.pem');
+            console.log('\n  HTTPS 证书配置（留空跳过，保持 HTTP 模式）');
+            console.log('  默认证书位置（将证书文件放到此路径即可）:');
+            console.log(`    证书: ${defaultCertPath}`);
+            console.log(`    私钥: ${defaultKeyPath}`);
+            console.log('  如使用 Let\'s Encrypt，路径通常为:');
+            console.log('    /etc/letsencrypt/live/<域名>/fullchain.pem');
+            console.log('    /etc/letsencrypt/live/<域名>/privkey.pem\n');
+            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()); }));
+            const certPath = certInput || defaultCertPath;
+            if (fs.existsSync(certPath)) {
+                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()); }));
+                const keyPath = keyInput || defaultKeyPath;
+                setHttpsConfig(certPath, keyPath);
+                console.log(`[setup] HTTPS 已配置: ${certPath}`);
+            }
+            else if (certInput) {
+                console.log(`[setup] ⚠️  证书文件不存在: ${certPath}，跳过 HTTPS 配置`);
+            }
+            else {
+                console.log(`[setup] 将证书放到默认位置后重新运行 --setup --server 即可启用 HTTPS`);
+            }
             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 客户端

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))

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.3",
   "description": "企业微信智能机器人 MCP 服务 - Claude Code 审批通道",
   "type": "module",
   "main": "dist/index.js",