@wrongstack/mcp 0.277.2 → 0.280.1

package/dist/index.js

@@ -1,9 +1,9 @@
 import { spawn } from 'child_process';
 import { expectDefined, ToolCapabilities, buildChildEnv, ToolError, ConfigError } from '@wrongstack/core';
+import { toErrorMessage } from '@wrongstack/core/utils';
 import { createHash, randomBytes } from 'crypto';
 import * as https from 'https';
 import * as net from 'net';
-import { toErrorMessage } from '@wrongstack/core/utils';
 import * as fs from 'fs/promises';
 import * as path from 'path';
 import { createServer } from 'http';
@@ -836,6 +836,8 @@ var StreamableHTTPTransport = class extends BaseHTTPTransport {
     this.disconnectHandlers.splice(0, this.disconnectHandlers.length);
   }
 };
+
+// src/client.ts
 var MCPClient = class {
   constructor(opts) {
     this.opts = opts;
@@ -1010,6 +1012,10 @@ var MCPClient = class {
     try {
       await this.sseTransport.connect();
     } catch (err) {
+      const t = this.sseTransport;
+      this.sseTransport = void 0;
+      await t.close().catch(() => {
+      });
       this.state = "failed";
       throw err;
     }
@@ -1052,6 +1058,10 @@ var MCPClient = class {
     try {
       await this.httpTransport.connect();
     } catch (err) {
+      const t = this.httpTransport;
+      this.httpTransport = void 0;
+      await t.close().catch(() => {
+      });
       this.state = "failed";
       throw err;
     }
@@ -1202,9 +1212,7 @@ var MCPClient = class {
         });
       }
     } catch (err) {
-      throw new Error(
-        `[MCP] notify("${method}") failed: ${toErrorMessage(err)}`
-      );
+      throw new Error(`[MCP] notify("${method}") failed: ${toErrorMessage(err)}`);
     }
   }
   onData(s) {
@@ -1243,7 +1251,9 @@ var MCPClient = class {
   async handleToolsListChanged() {
     try {
       const toolsRes = await this.request("tools/list", {});
-      const tools = normalizeMCPTools(toolsRes.result?.tools);
+      const tools = normalizeMCPTools(
+        toolsRes.result?.tools
+      );
       this._tools = tools;
       this._toolsCache = tools;
       for (const listener of this.toolsChangedListeners) {
@@ -1376,6 +1386,11 @@ var MCPRegistry = class _MCPRegistry {
   }
   async start(cfg) {
     if (cfg.enabled === false) return;
+    if (this.servers.has(cfg.name)) {
+      throw new Error(
+        `MCP server "${cfg.name}" is already registered \u2014 use restart() to re-cycle a running server`
+      );
+    }
     const lazy = !!cfg.lazy && !!this.cacheDir;
     const slot = {
       cfg,
@@ -1503,6 +1518,10 @@ var MCPRegistry = class _MCPRegistry {
     const slot = this.servers.get(name);
     if (!slot) return;
     slot.reconnectPending = false;
+    if (slot.reconnectTimer) {
+      clearTimeout(slot.reconnectTimer);
+      slot.reconnectTimer = void 0;
+    }
     if (slot.client) {
       slot.client.removeExitListener(this.onChildExit);
       if (slot.onDisconnect) slot.client.removeDisconnectListener(slot.onDisconnect);
@@ -1600,6 +1619,10 @@ var MCPRegistry = class _MCPRegistry {
    */
   async sleepIdle(slot) {
     slot.reconnectPending = false;
+    if (slot.reconnectTimer) {
+      clearTimeout(slot.reconnectTimer);
+      slot.reconnectTimer = void 0;
+    }
     if (slot.client) {
       slot.client.removeExitListener(this.onChildExit);
       if (slot.onDisconnect) slot.client.removeDisconnectListener(slot.onDisconnect);
@@ -1751,13 +1774,20 @@ var MCPRegistry = class _MCPRegistry {
       return;
     }
     slot.reconnectPending = true;
+    if (slot.reconnectTimer) {
+      clearTimeout(slot.reconnectTimer);
+      slot.reconnectTimer = void 0;
+    }
     const base = Math.min(
       _MCPRegistry.BASE_RECONNECT_DELAY_MS * 2 ** slot.reconnectCycles,
       _MCPRegistry.MAX_RECONNECT_DELAY_MS
     );
     const jitter = base * MCP_CONSTANTS.RECONNECT.JITTER_FACTOR * (Math.random() * 2 - 1);
     const delay = Math.max(100, Math.round(base + jitter));
-    setTimeout(() => this.attemptReconnect(slot), delay);
+    slot.reconnectTimer = setTimeout(() => {
+      slot.reconnectTimer = void 0;
+      void this.attemptReconnect(slot);
+    }, delay);
   }
   async attemptReconnect(slot) {
     slot.reconnectPending = false;
@@ -1841,6 +1871,11 @@ var MCPRegistry = class _MCPRegistry {
           );
           slot.state = "failed";
           slot.client = void 0;
+          if (slot.reconnectTimer) {
+            clearTimeout(slot.reconnectTimer);
+            slot.reconnectTimer = void 0;
+          }
+          slot.reconnectPending = false;
           this.events.emit("mcp.server.disconnected", {
             name: slot.cfg.name,
             reason: err instanceof Error ? err.message : "unknown"
@@ -2125,7 +2160,11 @@ var MCPServer = class {
     try {
       const result = await this.dispatch(msg.method, msg.params);
       if (result === METHOD_NOT_FOUND_SENTINEL) {
-        return this.encodeError(expectDefined(msg.id), METHOD_NOT_FOUND, `Method not found: ${msg.method}`);
+        return this.encodeError(
+          expectDefined(msg.id),
+          METHOD_NOT_FOUND,
+          `Method not found: ${msg.method}`
+        );
       }
       return JSON.stringify({ jsonrpc: "2.0", id: msg.id, result });
     } catch (err) {
@@ -2191,6 +2230,7 @@ function serveStdio(server, opts = {}) {
   const stdout = opts.stdout ?? process.stdout;
   let buffer = "";
   let closed = false;
+  let bufferTooLarge = false;
   let writeChain = Promise.resolve();
   const writeLine = (s) => {
     writeChain = writeChain.then(
@@ -2200,16 +2240,38 @@ function serveStdio(server, opts = {}) {
       })
     ).catch((err) => {
       const msg = toErrorMessage(err);
-      console.error(JSON.stringify({
-        level: "error",
-        event: "mcp_server.stdout_write_failed",
-        message: msg,
-        timestamp: (/* @__PURE__ */ new Date()).toISOString()
-      }));
+      console.error(
+        JSON.stringify({
+          level: "error",
+          event: "mcp_server.stdout_write_failed",
+          message: msg,
+          timestamp: (/* @__PURE__ */ new Date()).toISOString()
+        })
+      );
     });
   };
   const onData = (chunk) => {
+    if (bufferTooLarge) return;
     buffer += typeof chunk === "string" ? chunk : chunk.toString("utf8");
+    if (buffer.length > HTTP_BODY_CAP) {
+      bufferTooLarge = true;
+      buffer = "";
+      console.error(
+        JSON.stringify({
+          level: "error",
+          event: "mcp_server.line_buffer_overflow",
+          message: `stdio line exceeded ${HTTP_BODY_CAP} bytes without newline \u2014 aborting stream`,
+          timestamp: (/* @__PURE__ */ new Date()).toISOString()
+        })
+      );
+      try {
+        stdin.pause?.();
+        stdin.destroy?.();
+      } catch {
+      }
+      onEnd();
+      return;
+    }
     let idx = buffer.indexOf("\n");
     while (idx !== -1) {
       const line = buffer.slice(0, idx);
@@ -2217,20 +2279,24 @@ function serveStdio(server, opts = {}) {
       idx = buffer.indexOf("\n");
       if (!line.trim()) continue;
       void server.handleMessage(line).then((res) => {
-        if (res !== null && !closed) writeLine(res);
+        if (res !== null) writeLine(res);
       }).catch((err) => {
-        console.error(JSON.stringify({
-          level: "error",
-          event: "mcp_server.handle_message_failed",
-          message: toErrorMessage(err),
-          timestamp: (/* @__PURE__ */ new Date()).toISOString()
-        }));
+        console.error(
+          JSON.stringify({
+            level: "error",
+            event: "mcp_server.handle_message_failed",
+            message: toErrorMessage(err),
+            timestamp: (/* @__PURE__ */ new Date()).toISOString()
+          })
+        );
       });
     }
   };
   let resolveDone;
   const done = new Promise((resolve) => {
-    resolveDone = resolve;
+    resolveDone = () => {
+      void writeChain.then(() => resolve());
+    };
   });
   const onEnd = () => {
     if (closed) return;