From f1091d25a67d5cbb97bbcdb3b86121ca8a88c1fe Mon Sep 17 00:00:00 2001 From: zhangzikuan Date: Sun, 1 Feb 2026 21:14:12 +0800 Subject: [PATCH 1/4] =?UTF-8?q?fix:=20=E5=9C=A8=20restart=20=E6=97=A5?= =?UTF-8?q?=E5=BF=97=E4=B8=AD=E6=98=BE=E7=A4=BA=E6=9C=8D=E5=8A=A1=E5=90=8D?= =?UTF-8?q?=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 修复 restart 命令的日志显示问题,现在会显示每个服务器的连接状态, 包括服务器名称(例如:- alibaba-cloud-observability... Connected ✓)。 Co-Authored-By: Claude Sonnet 4.5 --- src/commands/daemon.ts | 286 ++++++++++++++++++++++++++++++++++------- 1 file changed, 238 insertions(+), 48 deletions(-) diff --git a/src/commands/daemon.ts b/src/commands/daemon.ts index 6e521db..345d5b2 100644 --- a/src/commands/daemon.ts +++ b/src/commands/daemon.ts @@ -10,6 +10,44 @@ import { DAEMON_PORT } from '../core/constants.js'; const require = createRequire(import.meta.url); const pkg = require('../../package.json'); +// Helper function to make HTTP requests to daemon (bypassing proxy) +function daemonRequest(method: string, path: string, body?: string): Promise<{ status: number; ok: boolean; data: any }> { + return new Promise((resolve, reject) => { + const port = parseInt(process.env.MCPS_PORT || String(DAEMON_PORT)); + const options = { + method, + hostname: '127.0.0.1', + port, + path, + headers: { + 'Content-Type': 'application/json', + }, + }; + + const req = http.request(options, (res) => { + let data = ''; + res.on('data', chunk => { data += chunk; }); + res.on('end', () => { + try { + resolve({ + status: res.statusCode || 500, + ok: (res.statusCode || 500) >= 200 && (res.statusCode || 500) < 300, + data: data ? JSON.parse(data) : {}, + }); + } catch (e) { + reject(e); + } + }); + }); + + req.on('error', reject); + if (body) { + req.write(body); + } + req.end(); + }); +} + // Check if a port is in use function isPortInUse(port: number): Promise { return new Promise((resolve) => { @@ -47,8 +85,8 @@ const startAction = async (options: any) => { if (portInUse) { // Try to check if it's our daemon via HTTP try { - const res = await fetch(`http://localhost:${port}/status`); - if (res.ok) { + const { ok } = await daemonRequest('GET', '/status'); + if (ok) { console.log(chalk.yellow(`Daemon is already running on port ${port}.`)); process.exit(0); return; @@ -70,10 +108,34 @@ const startAction = async (options: any) => { // Otherwise, spawn a detached process console.log(chalk.cyan('Starting daemon in background...')); let childFailed = false; + + // Create log file paths + const logDir = '/tmp/mcps-daemon'; + const stdoutLog = `${logDir}/stdout.log`; + const stderrLog = `${logDir}/stderr.log`; + + // Ensure log directory exists + const fs = await import('fs'); + if (!fs.existsSync(logDir)) { + fs.mkdirSync(logDir, { recursive: true }); + } + + // Clear old log files for fresh start + if (fs.existsSync(stdoutLog)) { + fs.truncateSync(stdoutLog, 0); + } + if (fs.existsSync(stderrLog)) { + fs.truncateSync(stderrLog, 0); + } + + // Open file descriptors for stdout and stderr + const stdoutFd = fs.openSync(stdoutLog, 'a'); + const stderrFd = fs.openSync(stderrLog, 'a'); + const subprocess = spawn(process.execPath, [process.argv[1], 'daemon', 'start'], { detached: true, - // Pipe stdout/stderr so we can see initialization logs - stdio: ['ignore', 'pipe', 'pipe'], + // Pipe stdout/stderr to log files + stdio: ['ignore', stdoutFd, stderrFd], env: { ...process.env, MCPS_DAEMON_DETACHED: 'true', @@ -81,32 +143,14 @@ const startAction = async (options: any) => { } }); - // Stream logs to current console while waiting for ready - if (subprocess.stdout) { - subprocess.stdout.on('data', (data) => { - process.stdout.write(`${data}`); - }); - } - if (subprocess.stderr) { - subprocess.stderr.on('data', (data) => { - const msg = data.toString(); - // Detect port conflict in child process - if (msg.includes('Port') && msg.includes('is already in use')) { - childFailed = true; - } - // Only show error output if it contains critical errors - if (msg.includes('Error') || msg.includes('EADDRINUSE')) { - process.stderr.write(chalk.red(`[Daemon] ${msg}`)); - } - }); - } - subprocess.unref(); // Wait briefly to ensure it started (optional but good UX) // We can poll status for a second const start = Date.now(); // Use timeout from option/env (convert to ms) + let lastLogSize = 0; // Track last read position to avoid duplicate logs + while (Date.now() - start < timeout * 1000) { // If child reported port conflict, check if daemon is actually running if (childFailed) { @@ -119,26 +163,47 @@ const startAction = async (options: any) => { } } + // Show only new logs (avoid duplicates) try { - const res = await fetch(`http://localhost:${port}/status`); - if (res.ok) { - const data = await res.json(); - if (data.initialized) { - console.log(chalk.green(`Daemon started successfully on port ${port}.`)); - process.exit(0); + if (fs.existsSync(stdoutLog)) { + const { size } = fs.statSync(stdoutLog); + if (size > lastLogSize) { + // Read new logs only + const buffer = Buffer.alloc(size - lastLogSize); + const fd = fs.openSync(stdoutLog, 'r'); + fs.readSync(fd, buffer, 0, size - lastLogSize, lastLogSize); + fs.closeSync(fd); + + const newLogs = buffer.toString('utf-8'); + newLogs.split('\n').forEach(line => { + if (line.trim()) process.stdout.write(line + '\n'); + }); + + lastLogSize = size; } } + } catch (e) { + // Ignore log read errors + } + + try { + const { ok, data } = await daemonRequest('GET', '/status'); + if (ok && data.initialized) { + console.log(chalk.green(`Daemon started successfully on port ${port}.`)); + console.log(chalk.gray(`Logs: ${stdoutLog}`)); + process.exit(0); + } } catch {} await new Promise(r => setTimeout(r, 200)); } console.log(chalk.yellow('Daemon started (async check timeout, but likely running).')); + console.log(chalk.gray(`Logs: ${stdoutLog}`)); process.exit(0); }; const stopAction = async (options?: any) => { try { - const port = parseInt(options?.port || process.env.MCPS_PORT || DAEMON_PORT); - await fetch(`http://localhost:${port}/stop`, { method: 'POST' }); + await daemonRequest('POST', '/stop'); console.log(chalk.green('Daemon stopped successfully.')); } catch (e) { console.error(chalk.red('Failed to stop daemon. Is it running?')); @@ -147,9 +212,7 @@ const stopAction = async (options?: any) => { const statusAction = async (options?: any) => { try { - const port = parseInt(options?.port || process.env.MCPS_PORT || DAEMON_PORT); - const res = await fetch(`http://localhost:${port}/status`); - const data = await res.json(); + const { data } = await daemonRequest('GET', '/status'); console.log(''); console.log(chalk.green(`Daemon is running (v${data.version})`)); @@ -216,15 +279,104 @@ const statusAction = async (options?: any) => { const restartAction = async (serverName: string | undefined, options?: any) => { try { - const port = parseInt(options?.port || process.env.MCPS_PORT || DAEMON_PORT); - const res = await fetch(`http://localhost:${port}/restart`, { - method: 'POST', - body: JSON.stringify({ server: serverName }) - }); - const data = await res.json(); - console.log(chalk.green(data.message)); - } catch (e) { - console.error(chalk.red('Failed to restart. Is the daemon running?')); + const body = serverName ? JSON.stringify({ server: serverName }) : JSON.stringify({}); + + // 启动日志显示(在后台读取守护进程日志) + const logPath = '/tmp/mcps-daemon/stdout.log'; + const fs = await import('fs'); + + // 发送 restart 请求 + const requestPromise = daemonRequest('POST', '/restart', body); + + // 在后台显示日志 + const showLogs = async () => { + try { + if (!fs.existsSync(logPath)) { + return; + } + + // 获取当前日志文件大小 + let lastSize = fs.statSync(logPath).size; + + // 等待请求完成,同时显示新日志 + const startTime = Date.now(); + const timeout = 30000; // 30秒超时 + + while (Date.now() - startTime < timeout) { + await new Promise(r => setTimeout(r, 200)); // 每200ms检查一次 + + try { + const { size: currentSize } = fs.statSync(logPath); + if (currentSize > lastSize) { + // 读取新增的日志内容 + const buffer = Buffer.alloc(currentSize - lastSize); + const fd = fs.openSync(logPath, 'r'); + fs.readSync(fd, buffer, 0, currentSize - lastSize, lastSize); + fs.closeSync(fd); + + const newLogs = buffer.toString('utf-8'); + // 只显示关闭和重启相关的日志 + const relevantLogs = newLogs.split('\n').filter(line => { + return line.includes('Closing connection to') || + line.includes('Connected ✓') || + line.includes('Connecting to') || + line.includes('Connected: ') || + line.trim().startsWith('- '); // 包含服务名行 + }); + + if (relevantLogs.length > 0) { + // 检查是否已经完成 + const hasCompletion = newLogs.includes('All servers reinitialized successfully'); + + relevantLogs.forEach(log => { + if (log.trim()) { + if (log.includes('Closing')) { + console.log(chalk.yellow(log)); + } else if (log.includes('Connected ✓')) { + console.log(chalk.green(log)); + } else if (log.includes('Connected:')) { + // 最终连接统计 + console.log(chalk.green(log)); + } else { + console.log(log); + } + } + }); + + if (hasCompletion) { + break; // 完成后退出 + } + + // 更新起始位置 + lastSize = currentSize; + } + } + } catch (e) { + // 忽略读取错误 + } + } + } catch (e) { + // 忽略日志显示错误 + } + }; + + // 同时执行请求和日志显示 + const [{ status, ok, data }] = await Promise.all([ + requestPromise, + showLogs() + ]); + + if (ok) { + console.log(chalk.green(data.message)); + } else if (status === 404) { + console.error(chalk.yellow(data.error || 'Server not found')); + } else { + console.error(chalk.red(data.error || 'Failed to restart')); + } + } catch (e: any) { + console.error(chalk.red('Failed to restart.')); + console.error(chalk.red(`Error: ${e.message}`)); + console.error(chalk.gray(`Stack: ${e.stack}`)); } }; @@ -315,17 +467,55 @@ const startDaemon = (port: number) => { req.on('end', async () => { try { const { server: serverName } = JSON.parse(body || '{}'); - + const verbose = process.env.MCPS_VERBOSE === 'true'; + + if (verbose) { + console.log(`[Daemon] Received restart request for: ${serverName || 'all servers'}`); + } + if (serverName) { + // Restart specific server connection + if (verbose) { + console.log(`[Daemon] Closing server: ${serverName}`); + } const closed = await connectionPool.closeClient(serverName); - res.writeHead(200, { 'Content-Type': 'application/json' }); - res.end(JSON.stringify({ message: `Server "${serverName}" connection closed. It will be reconnected on next call.`, closed })); + if (closed) { + // Reconnect to the specific server + try { + if (verbose) { + console.log(`[Daemon] Reconnecting to: ${serverName}`); + } + await connectionPool.getClient(serverName); + if (verbose) { + console.log(`[Daemon] Successfully restarted: ${serverName}`); + } + res.writeHead(200, { 'Content-Type': 'application/json' }); + res.end(JSON.stringify({ message: `Server "${serverName}" restarted successfully.` })); + } catch (error: any) { + console.error(`[Daemon] Failed to reconnect to ${serverName}:`, error); + res.writeHead(500, { 'Content-Type': 'application/json' }); + res.end(JSON.stringify({ error: `Failed to reconnect to "${serverName}": ${error.message}` })); + } + } else { + if (verbose) { + console.log(`[Daemon] Server not found: ${serverName}`); + } + res.writeHead(404, { 'Content-Type': 'application/json' }); + res.end(JSON.stringify({ error: `Server "${serverName}" not found or not connected.` })); + } } else { + // Restart all connections + console.log('Closing all connections...'); await connectionPool.closeAll(); + console.log('All connections closed. Reinitializing...'); + // Reinitialize all servers + await connectionPool.initializeAll(); + console.log('All servers reinitialized successfully'); res.writeHead(200, { 'Content-Type': 'application/json' }); - res.end(JSON.stringify({ message: 'All connections closed.' })); + res.end(JSON.stringify({ message: 'All servers restarted successfully.' })); } } catch (error: any) { + console.error('[Daemon] Error during restart:', error); res.writeHead(500, { 'Content-Type': 'application/json' }); res.end(JSON.stringify({ error: error.message })); } From 0184042de4f6fea9640ddca37f6f8121026f9fbf Mon Sep 17 00:00:00 2001 From: zhangzikuan Date: Sun, 1 Feb 2026 21:14:23 +0800 Subject: [PATCH 2/4] chore: bump version to 1.1.4 Co-Authored-By: Claude Sonnet 4.5 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index e231f64..737b74e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@maplezzk/mcps", - "version": "1.1.3", + "version": "1.1.4", "description": "A CLI to manage and use MCP servers", "publishConfig": { "access": "public" From c0ba2e49b5982f46b538024a681822fffce46173 Mon Sep 17 00:00:00 2001 From: zhangzikuan Date: Sun, 1 Feb 2026 21:14:48 +0800 Subject: [PATCH 3/4] =?UTF-8?q?chore:=20=E5=90=8C=E6=AD=A5=20package-lock.?= =?UTF-8?q?json=20=E7=89=88=E6=9C=AC=E5=8F=B7=E5=88=B0=201.1.4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-Authored-By: Claude Sonnet 4.5 --- package-lock.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index 907e354..0557ff5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@maplezzk/mcps", - "version": "1.1.3", + "version": "1.1.4", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@maplezzk/mcps", - "version": "1.1.3", + "version": "1.1.4", "license": "ISC", "dependencies": { "@modelcontextprotocol/sdk": "^1.25.3", From c17d21a300c568dc853b05a7c6828cbd5ed295f1 Mon Sep 17 00:00:00 2001 From: zhangzikuan Date: Sun, 1 Feb 2026 21:20:17 +0800 Subject: [PATCH 4/4] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=20restart=20?= =?UTF-8?q?=E5=91=BD=E4=BB=A4=E7=9A=84=E5=AE=8C=E6=95=B4=E5=AE=9E=E7=8E=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1. 修复子进程追踪:将 `config.type === 'stdio'` 改为 `'command' in config` - 修复了 childPids 始终为空的问题 - 确保 restart 时能正确终止旧进程 2. 统一日志格式:移除所有 `[Daemon]` 前缀 - pool.ts 和 client.ts 中的日志不再带前缀 - 与 daemon.ts 保持一致 3. 添加 verbose 日志控制 - debug 日志仅在 MCPS_VERBOSE=true 时显示 - 常规日志保持简洁 4. server.ts: 使用 daemonRequest() 绕过代理 - 修复 http_proxy 环境变量导致的连接问题 Co-Authored-By: Claude Sonnet 4.5 --- src/commands/server.ts | 57 +++++++++++++++++++++++++++++++++--------- src/core/client.ts | 47 ++++++++++++++++++++++++++++------ src/core/pool.ts | 27 ++++++++++++-------- 3 files changed, 101 insertions(+), 30 deletions(-) diff --git a/src/commands/server.ts b/src/commands/server.ts index d74b8b9..9afc926 100644 --- a/src/commands/server.ts +++ b/src/commands/server.ts @@ -1,8 +1,48 @@ import { Command } from 'commander'; import chalk from 'chalk'; +import http from 'http'; import { configManager } from '../core/config.js'; import { DaemonClient } from '../core/daemon-client.js'; import { detectServerType } from '../types/config.js'; +import { DAEMON_PORT } from '../core/constants.js'; + +// Helper function to make HTTP requests to daemon (bypassing proxy) +function daemonRequest(method: string, path: string, body?: string): Promise<{ status: number; ok: boolean; data: any }> { + return new Promise((resolve, reject) => { + const port = parseInt(process.env.MCPS_PORT || String(DAEMON_PORT)); + const options = { + method, + hostname: '127.0.0.1', + port, + path, + headers: { + 'Content-Type': 'application/json', + }, + }; + + const req = http.request(options, (res) => { + let data = ''; + res.on('data', chunk => { data += chunk; }); + res.on('end', () => { + try { + resolve({ + status: res.statusCode || 500, + ok: (res.statusCode || 500) >= 200 && (res.statusCode || 500) < 300, + data: data ? JSON.parse(data) : {}, + }); + } catch (e) { + reject(e); + } + }); + }); + + req.on('error', reject); + if (body) { + req.write(body); + } + req.end(); + }); +} export const registerServerCommands = (program: Command) => { const listServersAction = () => { @@ -125,23 +165,16 @@ export const registerServerCommands = (program: Command) => { try { await DaemonClient.ensureDaemon(); - // Call daemon restart API to refresh all connections - const port = parseInt(process.env.MCPS_PORT || '4100'); - const res = await fetch(`http://localhost:${port}/restart`, { - method: 'POST', - headers: { 'Content-Type': 'application/json' }, - body: JSON.stringify({}) - }); + // Call daemon restart API to restart all connections + const { ok, data } = await daemonRequest('POST', '/restart', JSON.stringify({})); - if (res.ok) { - const data = await res.json(); + if (ok) { console.log(chalk.green(data.message)); - console.log(chalk.gray('All servers will be reconnected on next use.')); } else { - throw new Error('Failed to refresh connections'); + throw new Error(data.error || 'Failed to restart connections'); } } catch (error: any) { - console.error(chalk.red(`Failed to refresh all servers: ${error.message}`)); + console.error(chalk.red(`Failed to restart all servers: ${error.message}`)); console.error(chalk.yellow('Make sure the daemon is running (use: mcps start)')); } return; diff --git a/src/core/client.ts b/src/core/client.ts index 140cd3e..6e0ff0e 100644 --- a/src/core/client.ts +++ b/src/core/client.ts @@ -125,7 +125,7 @@ export class McpClientService { await this.client.connect(this.transport); // 连接成功后,立即查找并保存子进程 PID - if (config.type === 'stdio') { + if ('command' in config) { await this.recordChildPids(); } } catch (error) { @@ -179,6 +179,11 @@ export class McpClientService { // 过滤出匹配我们命令的进程 const commandBaseName = this.serverCommand.split('/').pop() || this.serverCommand; + const verbose = process.env.MCPS_VERBOSE === 'true'; + if (verbose) { + log(`[Daemon] ${this.serverName}: Found ${newPids.size} new PIDs: [${Array.from(newPids).join(', ')}]`); + } + for (const pid of newPids) { try { const { stdout: cmdOutput } = await execAsync(`ps -p ${pid} -o command=`); @@ -195,12 +200,18 @@ export class McpClientService { if (isMatch) { this.childPids.add(pid); - // 调试日志已移除 + if (verbose) { + log(`[Daemon] ${this.serverName}: Added PID ${pid} to childPids (cmd: ${cmdLine.substring(0, 50)}...)`); + } } } catch { // 进程可能已经不存在了 } } + + if (verbose) { + log(`[Daemon] ${this.serverName}: Total childPids after collection: ${this.childPids.size}`); + } } catch (e) { // 记录失败,不影响主流程 console.error(`[Daemon] Failed to record child PIDs: ${e}`); @@ -221,25 +232,45 @@ export class McpClientService { } close() { + const verbose = process.env.MCPS_VERBOSE === 'true'; + // 对于 stdio 类型的服务器,先杀掉子进程(在关闭 transport 之前) if (this.serverType === 'stdio' && this.childPids.size > 0) { - log(`[Daemon] Closing ${this.serverName}, killing ${this.childPids.size} child process(es)...`); + const pidList = Array.from(this.childPids).join(', '); + if (verbose) { + log(`[Daemon] Closing ${this.serverName}, killing PIDs: [${pidList}]`); + } else { + // 简短版本,始终显示 + log(`[Daemon] Closing ${this.serverName} (${this.childPids.size} process(es))`); + } // 直接使用 SIGKILL,确保进程被终止 for (const pid of this.childPids) { try { process.kill(pid, 'SIGKILL'); - log(`[Daemon] SIGKILLED child process ${pid} (${this.serverName})`); - } catch (e) { - log(`[Daemon] Failed to kill ${pid}: ${e}`); + if (verbose) { + log(`[Daemon] SIGKILLED child process ${pid} (${this.serverName})`); + } + } catch (e: any) { + if (verbose) { + log(`[Daemon] Failed to kill ${pid}: ${e.message}`); + } } } this.childPids.clear(); - log(`[Daemon] All child processes cleared for ${this.serverName}`); + if (verbose) { + log(`[Daemon] All child processes cleared for ${this.serverName}`); + } + } else { + if (verbose) { + log(`[Daemon] No child PIDs to kill for ${this.serverName} (childPids.size: ${this.childPids.size})`); + } } // 暂时不关闭 transport,避免卡住 - log(`[Daemon] ${this.serverName} close() completed`); + if (verbose) { + log(`[Daemon] ${this.serverName} close() completed`); + } } } diff --git a/src/core/pool.ts b/src/core/pool.ts index 69d292f..4ade523 100644 --- a/src/core/pool.ts +++ b/src/core/pool.ts @@ -62,16 +62,23 @@ export class ConnectionPool { } async closeAll() { + const verbose = process.env.MCPS_VERBOSE === 'true'; + if (verbose) { + console.log('closeAll() called'); + } for (const [name, client] of this.clients) { - console.log(`[Daemon] Closing connection to ${name}...`); + console.log(`Closing connection to ${name}...`); try { - client.close(); // 同步调用,不使用 await + client.close(); } catch (e) { - console.error(`[Daemon] Error closing ${name}:`, e); + console.error(`Error closing ${name}:`, e); } } this.clients.clear(); this.toolsCache.clear(); + if (verbose) { + console.log('Connection pools cleared'); + } } async initializeAll() { @@ -85,23 +92,23 @@ export class ConnectionPool { const enabledServers = servers.filter(server => { const disabled = (server as any).disabled === true; if (verbose && disabled) { - console.log(`[Daemon] Skipping disabled server: ${server.name}`); + console.log(`Skipping disabled server: ${server.name}`); } return !disabled; }); if (enabledServers.length === 0) { - console.log('[Daemon] No enabled servers to initialize.'); + console.log('No enabled servers to initialize.'); this.initializing = false; this.initialized = true; return; } - console.log(`[Daemon] Connecting to ${enabledServers.length} server(s)...`); + console.log(`Connecting to ${enabledServers.length} server(s)...`); const results: { name: string; success: boolean; error?: string }[] = []; for (const server of enabledServers) { - process.stdout.write(`[Daemon] - ${server.name}... `); + process.stdout.write(`- ${server.name}... `); try { await this.getClient(server.name, { timeoutMs: 8000 }); results.push({ name: server.name, success: true }); @@ -121,7 +128,7 @@ export class ConnectionPool { results.push({ name: server.name, success: false, error: errorMsg }); console.log('Failed ✗'); if (verbose) { - console.error(`[Daemon] Error: ${errorMsg}`); + console.error(`Error: ${errorMsg}`); } } } @@ -129,10 +136,10 @@ export class ConnectionPool { // Print summary const successCount = results.filter(r => r.success).length; const failed = results.filter(r => !r.success); - console.log(`[Daemon] Connected: ${successCount}/${enabledServers.length}`); + console.log(`Connected: ${successCount}/${enabledServers.length}`); if (failed.length > 0) { - console.log('[Daemon] Failed connections:'); + console.log('Failed connections:'); failed.forEach(f => { console.log(` ✗ ${f.name}: ${f.error}`); });