npm - @vrs-soft/wecom-aibot-mcp - Versions diffs - 2.4.3 → 2.4.4 - Mend

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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (3) hide show

package/dist/bin.js CHANGED Viewed

@@ -313,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);
     }
@@ -516,29 +522,45 @@ async function main() {
                 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');
+            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()); }));
-            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 配置`);
+            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] 将证书放到默认位置后重新运行 --setup --server 即可启用 HTTPS`);
+                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');
@@ -548,23 +570,31 @@ async function main() {
         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.js CHANGED Viewed

@@ -1032,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));
@@ -1044,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 = {};
@@ -1054,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）');
@@ -1086,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;
@@ -1094,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 配置
@@ -1114,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/package.json CHANGED Viewed

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