nuwax-mcp-stdio-proxy 1.4.4 → 1.4.6

package/dist/bridge.js

@@ -49,17 +49,36 @@ export class PersistentMcpBridge {
             this.log.warn(`${LOG_TAG} Already running, stopping first`);
             await this.stop();
         }
-        this.log.info(`${LOG_TAG} Starting with ${Object.keys(servers).length} persistent servers`);
-        // 1. Spawn each persistent server + create MCP Client
-        for (const [id, config] of Object.entries(servers)) {
-            await this.startServer(id, config);
+        const serverCount = Object.keys(servers).length;
+        this.log.info(`${LOG_TAG} Starting with ${serverCount} persistent servers (parallel)`);
+        // 1. 并行启动 HTTP server 和所有 MCP server 子进程。
+        //    两者完全独立：HTTP server 在请求时才查询 this.servers，
+        //    startServer 会在异步 spawnAndConnect 前先同步写入 this.servers，
+        //    所以 HTTP server 收到第一个请求时所有 entry 都已注册。
+        //
+        //    提前保存 serverPromises 引用：若 startHttpServer 抛出，在 catch 中先
+        //    await Promise.allSettled(serverPromises) 等所有 spawnAndConnect 跑完
+        //    （保证 entry.client / entry.transport 已赋值），再调用 stopServer，
+        //    才能可靠关闭子进程，防止孤儿进程残留。
+        const serverPromises = Object.entries(servers).map(([id, config]) => this.startServer(id, config));
+        try {
+            await Promise.all([
+                this.startHttpServer(options?.port),
+                ...serverPromises,
+            ]);
+        }
+        catch (e) {
+            this.log.error(`${LOG_TAG} 启动失败，清理已 spawn 的子进程:`, e);
+            // 等待所有 spawnAndConnect 完成，确保 entry.client/transport 已赋值后再清理
+            await Promise.allSettled(serverPromises);
+            await Promise.all(Array.from(this.servers.keys()).map((id) => this.stopServer(id)));
+            this.servers.clear();
+            throw e;
         }
-        // 2. Start HTTP server
-        await this.startHttpServer(options?.port);
         this.running = true;
-        // 3. Start periodic session cleanup
+        // 2. Start periodic session cleanup
         this.sessionCleanupTimer = setInterval(() => this.cleanupStaleSessions(), SESSION_CLEANUP_INTERVAL_MS);
-        this.log.info(`${LOG_TAG} Bridge ready on port ${this.port}`);
+        this.log.info(`${LOG_TAG} Bridge ready on port ${this.port} (${serverCount} servers)`);
     }
     /**
      * Stop bridge: close HTTP, kill all child processes
@@ -72,15 +91,16 @@ export class PersistentMcpBridge {
             clearInterval(this.sessionCleanupTimer);
             this.sessionCleanupTimer = null;
         }
-        // Close all HTTP sessions
-        for (const [key, session] of this.httpSessions) {
+        // 并行关闭所有 HTTP sessions（各 session transport 独立，无顺序依赖）。
+        // 内层 async 函数自行 catch 错误后不再 throw，Promise.all 足够，不需要 allSettled。
+        await Promise.all(Array.from(this.httpSessions.entries()).map(async ([key, session]) => {
             try {
                 await session.transport.close();
             }
             catch (e) {
                 this.log.warn(`${LOG_TAG} Error closing HTTP session ${key}:`, e);
             }
-        }
+        }));
         this.httpSessions.clear();
         // Close HTTP server
         if (this.httpServer) {
@@ -90,10 +110,8 @@ export class PersistentMcpBridge {
             this.httpServer = null;
             this.port = 0;
         }
-        // Stop all persistent servers
-        for (const [id] of this.servers) {
-            await this.stopServer(id);
-        }
+        // 并行关闭所有 MCP server 子进程（各自独立，无顺序依赖）
+        await Promise.all(Array.from(this.servers.keys()).map((id) => this.stopServer(id)));
         this.servers.clear();
         this.log.info(`${LOG_TAG} Stopped`);
     }

package/dist/index.js

@@ -6785,12 +6785,12 @@ var require_dist = __commonJS({
         throw new Error(`Unknown format "${name}"`);
       return f;
     };
-    function addFormats(ajv, list, fs2, exportName) {
+    function addFormats(ajv, list, fs3, exportName) {
       var _a2;
       var _b;
       (_a2 = (_b = ajv.opts.code).formats) !== null && _a2 !== void 0 ? _a2 : _b.formats = (0, codegen_1._)`require("ajv-formats/dist/formats").${exportName}`;
       for (const f of list)
-        ajv.addFormat(f, fs2[f]);
+        ajv.addFormat(f, fs3[f]);
     }
     module.exports = exports = formatsPlugin;
     Object.defineProperty(exports, "__esModule", { value: true });
@@ -6798,6 +6798,9 @@ var require_dist = __commonJS({
   }
 });
 
+// src/index.ts
+import * as fs2 from "fs";
+
 // src/logger.ts
 function log(level, msg) {
   process.stderr.write(`[nuwax-mcp-proxy] ${level}: ${msg}
@@ -23764,7 +23767,7 @@ var StdioServerTransport = class {
 
 // src/constants.ts
 var PKG_NAME = "nuwax-mcp-stdio-proxy";
-var PKG_VERSION = "1.4.4";
+var PKG_VERSION = "1.4.6";
 
 // src/shared.ts
 async function discoverTools(client) {
@@ -25379,14 +25382,24 @@ var PersistentMcpBridge = class {
       this.log.warn(`${LOG_TAG} Already running, stopping first`);
       await this.stop();
     }
-    this.log.info(`${LOG_TAG} Starting with ${Object.keys(servers).length} persistent servers`);
-    for (const [id, config2] of Object.entries(servers)) {
-      await this.startServer(id, config2);
+    const serverCount = Object.keys(servers).length;
+    this.log.info(`${LOG_TAG} Starting with ${serverCount} persistent servers (parallel)`);
+    const serverPromises = Object.entries(servers).map(([id, config2]) => this.startServer(id, config2));
+    try {
+      await Promise.all([
+        this.startHttpServer(options?.port),
+        ...serverPromises
+      ]);
+    } catch (e) {
+      this.log.error(`${LOG_TAG} \u542F\u52A8\u5931\u8D25\uFF0C\u6E05\u7406\u5DF2 spawn \u7684\u5B50\u8FDB\u7A0B:`, e);
+      await Promise.allSettled(serverPromises);
+      await Promise.all(Array.from(this.servers.keys()).map((id) => this.stopServer(id)));
+      this.servers.clear();
+      throw e;
     }
-    await this.startHttpServer(options?.port);
     this.running = true;
     this.sessionCleanupTimer = setInterval(() => this.cleanupStaleSessions(), SESSION_CLEANUP_INTERVAL_MS);
-    this.log.info(`${LOG_TAG} Bridge ready on port ${this.port}`);
+    this.log.info(`${LOG_TAG} Bridge ready on port ${this.port} (${serverCount} servers)`);
   }
   /**
    * Stop bridge: close HTTP, kill all child processes
@@ -25398,13 +25411,15 @@ var PersistentMcpBridge = class {
       clearInterval(this.sessionCleanupTimer);
       this.sessionCleanupTimer = null;
     }
-    for (const [key, session] of this.httpSessions) {
-      try {
-        await session.transport.close();
-      } catch (e) {
-        this.log.warn(`${LOG_TAG} Error closing HTTP session ${key}:`, e);
-      }
-    }
+    await Promise.all(
+      Array.from(this.httpSessions.entries()).map(async ([key, session]) => {
+        try {
+          await session.transport.close();
+        } catch (e) {
+          this.log.warn(`${LOG_TAG} Error closing HTTP session ${key}:`, e);
+        }
+      })
+    );
     this.httpSessions.clear();
     if (this.httpServer) {
       await new Promise((resolve) => {
@@ -25413,9 +25428,9 @@ var PersistentMcpBridge = class {
       this.httpServer = null;
       this.port = 0;
     }
-    for (const [id] of this.servers) {
-      await this.stopServer(id);
-    }
+    await Promise.all(
+      Array.from(this.servers.keys()).map((id) => this.stopServer(id))
+    );
     this.servers.clear();
     this.log.info(`${LOG_TAG} Stopped`);
   }
@@ -25782,6 +25797,7 @@ function parseCliArgs() {
 }
 function parseStdioArgs(args) {
   let configJson;
+  let configFile;
   let allowTools;
   let denyTools;
   for (let i = 0; i < args.length; i++) {
@@ -25789,6 +25805,9 @@ function parseStdioArgs(args) {
     if (arg === "--config" && i + 1 < args.length) {
       i++;
       configJson = args[i];
+    } else if (arg === "--config-file" && i + 1 < args.length) {
+      i++;
+      configFile = args[i];
     } else if (arg === "--allow-tools" && i + 1 < args.length) {
       i++;
       allowTools = args[i].split(",").map((s) => s.trim()).filter(Boolean);
@@ -25797,16 +25816,21 @@ function parseStdioArgs(args) {
       denyTools = args[i].split(",").map((s) => s.trim()).filter(Boolean);
     }
   }
-  if (!configJson) {
-    logError("Missing --config argument");
+  if (!configJson && !configFile) {
+    logError("Missing --config or --config-file argument");
     logError(`Usage: nuwax-mcp-stdio-proxy --config '{"mcpServers":{...}}'`);
+    logError("   or: nuwax-mcp-stdio-proxy --config-file /path/to/config.json");
+    process.exit(1);
+  }
+  if (configJson && configFile) {
+    logError("Cannot use both --config and --config-file");
     process.exit(1);
   }
   if (allowTools && denyTools) {
     logError("Cannot use both --allow-tools and --deny-tools");
     process.exit(1);
   }
-  const config2 = parseConfigJson(configJson);
+  const config2 = configFile ? parseConfigFile(configFile) : parseConfigJson(configJson);
   return { mode: "stdio", config: config2, allowTools, denyTools };
 }
 function parseConvertArgs(args) {
@@ -25860,6 +25884,7 @@ function parseConvertArgs(args) {
 function parseProxyArgs(args) {
   let port;
   let config2;
+  let configFile;
   for (let i = 0; i < args.length; i++) {
     const arg = args[i];
     if (arg === "--port" && i + 1 < args.length) {
@@ -25873,6 +25898,9 @@ function parseProxyArgs(args) {
     } else if (arg === "--config" && i + 1 < args.length) {
       i++;
       config2 = parseConfigJson(args[i]);
+    } else if (arg === "--config-file" && i + 1 < args.length) {
+      i++;
+      configFile = args[i];
     } else {
       logError(`Unknown argument: "${arg}"`);
       printProxyUsage();
@@ -25884,8 +25912,11 @@ function parseProxyArgs(args) {
     printProxyUsage();
     process.exit(1);
   }
+  if (configFile) {
+    config2 = parseConfigFile(configFile);
+  }
   if (!config2) {
-    logError("--config is required for proxy mode");
+    logError("--config or --config-file is required for proxy mode");
     printProxyUsage();
     process.exit(1);
   }
@@ -25903,13 +25934,29 @@ function parseConfigJson(json2) {
     process.exit(1);
   }
 }
+function parseConfigFile(filePath) {
+  try {
+    const content = fs2.readFileSync(filePath, "utf-8");
+    const config2 = JSON.parse(content);
+    if (!config2.mcpServers || typeof config2.mcpServers !== "object") {
+      throw new Error('config must contain a "mcpServers" object');
+    }
+    return config2;
+  } catch (e) {
+    logError(`Failed to read or parse config file "${filePath}": ${e}`);
+    process.exit(1);
+  }
+}
 function printUsage() {
   logError("Usage:");
   logError(`  nuwax-mcp-stdio-proxy --config '{"mcpServers":{...}}' [OPTIONS]  (stdio aggregation)`);
+  logError("  nuwax-mcp-stdio-proxy --config-file <FILE> [OPTIONS]             (stdio aggregation from file)");
   logError("  nuwax-mcp-stdio-proxy convert [URL] [OPTIONS]                    (remote \u2192 stdio)");
   logError("  nuwax-mcp-stdio-proxy proxy --port <PORT> --config '...'         (HTTP server)");
   logError("");
   logError("Options (stdio / convert):");
+  logError("  --config <JSON>                MCP config JSON string");
+  logError("  --config-file <FILE>           MCP config JSON file path");
   logError("  --allow-tools <TOOLS>          Tool whitelist (comma-separated)");
   logError("  --deny-tools <TOOLS>           Tool blacklist (comma-separated)");
 }
@@ -25928,6 +25975,7 @@ function printConvertUsage() {
 }
 function printProxyUsage() {
   logError(`Usage: nuwax-mcp-stdio-proxy proxy --port <PORT> --config '{"mcpServers":{...}}'`);
+  logError("   or: nuwax-mcp-stdio-proxy proxy --port <PORT> --config-file <FILE>");
 }
 async function main() {
   const args = parseCliArgs();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nuwax-mcp-stdio-proxy",
-  "version": "1.4.4",
+  "version": "1.4.6",
   "description": "TypeScript MCP proxy — aggregates multiple MCP servers (stdio + streamable-http + SSE) with convert & proxy modes",
   "type": "module",
   "bin": {