@wrongstack/mcp 0.283.1 → 0.284.1

package/dist/index.d.ts

@@ -102,7 +102,9 @@ declare class MCPClient {
     private connectStdio;
     private connectSSE;
     private connectStreamableHTTP;
-    callTool(name: string, input: unknown): Promise<ToolCallResult>;
+    callTool(name: string, input: unknown, opts?: {
+        signal?: AbortSignal | undefined;
+    }): Promise<ToolCallResult>;
     close(): Promise<void>;
     private request;
     /**
@@ -633,7 +635,9 @@ declare class SSETransport extends BaseHTTPTransport {
     private readSSEBody;
     private buildSSEUrl;
     private httpPost;
-    callTool(name: string, input: unknown): Promise<ToolCallResult>;
+    callTool(name: string, input: unknown, opts?: {
+        signal?: AbortSignal | undefined;
+    }): Promise<ToolCallResult>;
     /** Generic JSON-RPC request — used by MCPClient.request() for SSE transports. */
     request(method: string, params: unknown, timeoutMs?: number): Promise<JsonRpcResponse>;
     close(): Promise<void>;
@@ -652,7 +656,9 @@ declare class StreamableHTTPTransport extends BaseHTTPTransport {
     private postRaw;
     /** Generic JSON-RPC request — used by MCPClient.request() for SSE/streamable-http transports. */
     request(method: string, params: unknown, timeoutMs?: number): Promise<JsonRpcResponse>;
-    callTool(name: string, input: unknown): Promise<ToolCallResult>;
+    callTool(name: string, input: unknown, opts?: {
+        signal?: AbortSignal | undefined;
+    }): Promise<ToolCallResult>;
     close(): Promise<void>;
 }
 

package/dist/index.js

@@ -305,6 +305,11 @@ function assertMatchingJsonRpcResult(data, expectedId, method) {
   }
   return data;
 }
+function makeAbortError(method) {
+  const err = new Error(`MCP request "${method}" aborted by client`);
+  err.name = "AbortError";
+  return err;
+}
 function createTimeoutSignal(parent, timeoutMs) {
   const ctrl = new AbortController();
   const onAbort = () => ctrl.abort(parent?.reason);
@@ -543,10 +548,12 @@ var SSETransport = class extends BaseHTTPTransport {
       return this.url;
     }
   }
-  async httpPost(method, params) {
+  async httpPost(method, params, opts) {
     const id = this.genId();
     const body = JSON.stringify({ jsonrpc: "2.0", id, method, params });
-    const timeoutSignal = createTimeoutSignal(this.abortController?.signal, this.requestTimeout);
+    const external = opts?.signal;
+    const parent = external && this.abortController ? AbortSignal.any([this.abortController.signal, external]) : external ?? this.abortController?.signal;
+    const timeoutSignal = createTimeoutSignal(parent, this.requestTimeout);
     const fetchOpts = {
       method: "POST",
       headers: {
@@ -557,8 +564,8 @@ var SSETransport = class extends BaseHTTPTransport {
       signal: timeoutSignal.signal
     };
     this.applyTlsAgent(fetchOpts);
-    const res = await fetch(this.url, fetchOpts);
     try {
+      const res = await fetch(this.url, fetchOpts);
       if (!res.ok) {
         const body2 = await res.text();
         const cap = MCP_CONSTANTS.REQUEST_LOG_CAP;
@@ -583,11 +590,21 @@ var SSETransport = class extends BaseHTTPTransport {
         });
       }
       return assertMatchingJsonRpcResult(data, id, method);
+    } catch (err) {
+      if (external?.aborted && !method.startsWith("notifications/")) {
+        void this.httpPost("notifications/cancelled", {
+          requestId: id,
+          reason: "client aborted"
+        }).catch(() => {
+        });
+        throw makeAbortError(method);
+      }
+      throw err;
     } finally {
       timeoutSignal.dispose();
     }
   }
-  async callTool(name, input) {
+  async callTool(name, input, opts) {
     if (this.state !== "connected") {
       throw new ToolError({
         message: `SSE transport not connected (state=${this.state})`,
@@ -596,7 +613,7 @@ var SSETransport = class extends BaseHTTPTransport {
         context: { transport: "sse", state: this.state }
       });
     }
-    const res = await this.httpPost("tools/call", { name, arguments: input });
+    const res = await this.httpPost("tools/call", { name, arguments: input }, opts);
     if (res.error) {
       return { content: res.error.message, isError: true };
     }
@@ -746,10 +763,12 @@ var StreamableHTTPTransport = class extends BaseHTTPTransport {
       throw err;
     }
   }
-  async postRaw(method, params) {
+  async postRaw(method, params, opts) {
     const id = this.genId();
     const body = JSON.stringify({ jsonrpc: "2.0", id, method, params });
-    const timeoutSignal = createTimeoutSignal(this.abortController?.signal, this.requestTimeout);
+    const external = opts?.signal;
+    const parent = external && this.abortController ? AbortSignal.any([this.abortController.signal, external]) : external ?? this.abortController?.signal;
+    const timeoutSignal = createTimeoutSignal(parent, this.requestTimeout);
     const fetchOpts = {
       method: "POST",
       headers: {
@@ -762,8 +781,8 @@ var StreamableHTTPTransport = class extends BaseHTTPTransport {
       signal: timeoutSignal.signal
     };
     this.applyTlsAgent(fetchOpts);
-    const res = await fetch(this.url, fetchOpts);
     try {
+      const res = await fetch(this.url, fetchOpts);
       if (!res.ok) {
         throw new Error(`HTTP ${res.status}: ${res.statusText}`);
       }
@@ -776,6 +795,16 @@ var StreamableHTTPTransport = class extends BaseHTTPTransport {
         return assertMatchingJsonRpcResult(match, id, method);
       }
       throw new Error("Could not parse response as JSON-RPC");
+    } catch (err) {
+      if (external?.aborted && !method.startsWith("notifications/")) {
+        void this.postRaw("notifications/cancelled", {
+          requestId: id,
+          reason: "client aborted"
+        }).catch(() => {
+        });
+        throw makeAbortError(method);
+      }
+      throw err;
     } finally {
       timeoutSignal.dispose();
     }
@@ -823,11 +852,11 @@ var StreamableHTTPTransport = class extends BaseHTTPTransport {
       timeoutSignal.dispose();
     }
   }
-  async callTool(name, input) {
+  async callTool(name, input, opts) {
     if (this.state !== "connected") {
       throw new Error(`streamable-http transport not connected (state=${this.state})`);
     }
-    const res = await this.postRaw("tools/call", { name, arguments: input });
+    const res = await this.postRaw("tools/call", { name, arguments: input }, opts);
     if (res.error) {
       return { content: res.error.message, isError: true };
     }
@@ -1087,17 +1116,17 @@ var MCPClient = class {
     this._toolsCache = this._tools;
     this.state = "connected";
   }
-  async callTool(name, input) {
+  async callTool(name, input, opts) {
     if (this.state !== "connected") {
       throw new Error(`MCP client "${this.opts.name}" not connected (state=${this.state})`);
     }
     if (this.sseTransport) {
-      return this.sseTransport.callTool(name, input);
+      return this.sseTransport.callTool(name, input, opts);
     }
     if (this.httpTransport) {
-      return this.httpTransport.callTool(name, input);
+      return this.httpTransport.callTool(name, input, opts);
     }
-    const res = await this.request("tools/call", { name, arguments: input });
+    const res = await this.request("tools/call", { name, arguments: input }, void 0, opts);
     if (res.error) {
       return { content: res.error.message, isError: true };
     }
@@ -1140,14 +1169,38 @@ var MCPClient = class {
     this.httpTransport?.close();
     this.state = "disconnected";
   }
-  request(method, params, timeoutMs = this.opts.requestTimeoutMs ?? 6e4) {
+  request(method, params, timeoutMs = this.opts.requestTimeoutMs ?? 6e4, opts) {
     if (this.sseTransport) return this.sseTransport.request(method, params, timeoutMs);
     if (this.httpTransport) return this.httpTransport.request(method, params, timeoutMs);
+    const signal = opts?.signal;
+    if (signal?.aborted) {
+      const err = new Error(`MCP "${this.opts.name}" request "${method}" aborted before send`);
+      err.name = "AbortError";
+      return Promise.reject(err);
+    }
     const id = this.nextId++;
     const req = { jsonrpc: "2.0", id, method, params };
     return new Promise((resolve, reject) => {
+      const onAbort = signal ? () => {
+        const pending = this.pending.get(id);
+        this.pending.delete(id);
+        if (pending) clearTimeout(pending.timer);
+        void this.notify("notifications/cancelled", {
+          requestId: id,
+          reason: "client aborted"
+        }).catch(() => {
+        });
+        const err = new Error(`MCP "${this.opts.name}" request "${method}" aborted by client`);
+        err.name = "AbortError";
+        reject(err);
+      } : void 0;
+      if (signal && onAbort) signal.addEventListener("abort", onAbort, { once: true });
+      const detach = () => {
+        if (signal && onAbort) signal.removeEventListener("abort", onAbort);
+      };
       const timer = setTimeout(() => {
         this.pending.delete(id);
+        detach();
         reject(
           new Error(`MCP "${this.opts.name}" request "${method}" timed out after ${timeoutMs}ms`)
         );
@@ -1155,10 +1208,12 @@ var MCPClient = class {
       this.pending.set(id, {
         resolve: (res) => {
           clearTimeout(timer);
+          detach();
           resolve(res);
         },
         reject: (err) => {
           clearTimeout(timer);
+          detach();
           reject(err);
         },
         timer
@@ -1168,6 +1223,7 @@ var MCPClient = class {
         const pending = this.pending.get(id);
         this.pending.delete(id);
         if (pending) clearTimeout(pending.timer);
+        detach();
         reject(new Error(`MCP "${this.opts.name}" request "${method}": stdin not writable`));
         return;
       }
@@ -1177,6 +1233,7 @@ var MCPClient = class {
         const pending = this.pending.get(id);
         this.pending.delete(id);
         if (pending) clearTimeout(pending.timer);
+        detach();
         reject(err);
       }
     });
@@ -1333,9 +1390,9 @@ function wrapMCPTool(serverName, mcpTool, client, permission = "confirm") {
     mutating: isMutatingTool(mcpTool),
     capabilities: [ToolCapabilities.MCP_PROXY],
     inputSchema: mcpTool.inputSchema ?? { type: "object", properties: {} },
-    async execute(input, _ctx, _opts) {
+    async execute(input, _ctx, opts) {
       const live = typeof client === "function" ? await client() : client;
-      const res = await live.callTool(mcpTool.name, input);
+      const res = await live.callTool(mcpTool.name, input, { signal: opts.signal });
       if (res.isError) {
         throw new Error(stringify(res.content));
       }