@ai-sdk/mcp 1.0.64 → 1.0.66

package/dist/index.mjs

@@ -1464,15 +1464,19 @@ var SseMCPTransport = class {
     (_b3 = this.abortController) == null ? void 0 : _b3.abort();
     (_c = this.onclose) == null ? void 0 : _c.call(this);
   }
-  async send(message) {
+  async send(message, options) {
+    var _a3, _b3;
+    (_a3 = options == null ? void 0 : options.signal) == null ? void 0 : _a3.throwIfAborted();
     if (!this.endpoint || !this.connected) {
       throw new MCPClientError({
         message: "MCP SSE Transport Error: Not connected"
       });
     }
     const endpoint = this.endpoint;
+    const transportSignal = (_b3 = this.abortController) == null ? void 0 : _b3.signal;
+    const requestSignal = (options == null ? void 0 : options.signal) == null ? transportSignal : transportSignal == null ? options.signal : AbortSignal.any([transportSignal, options.signal]);
     const attempt = async (triedAuth = false) => {
-      var _a3, _b3, _c, _d, _e;
+      var _a4, _b4, _c, _d, _e;
       try {
         const headers = await this.commonHeaders({
           "Content-Type": "application/json"
@@ -1481,7 +1485,7 @@ var SseMCPTransport = class {
           method: "POST",
           headers,
           body: JSON.stringify(message),
-          signal: (_a3 = this.abortController) == null ? void 0 : _a3.signal,
+          signal: requestSignal,
           redirect: this.redirectMode
         };
         const response = await this.fetchFn(endpoint.href, init);
@@ -1495,11 +1499,11 @@ var SseMCPTransport = class {
             });
             if (result !== "AUTHORIZED") {
               const error = new UnauthorizedError();
-              (_b3 = this.onerror) == null ? void 0 : _b3.call(this, error);
+              (_a4 = this.onerror) == null ? void 0 : _a4.call(this, error);
               return;
             }
           } catch (error) {
-            (_c = this.onerror) == null ? void 0 : _c.call(this, error);
+            (_b4 = this.onerror) == null ? void 0 : _b4.call(this, error);
             return;
           }
           return attempt(true);
@@ -1509,10 +1513,13 @@ var SseMCPTransport = class {
           const error = new MCPClientError({
             message: `MCP SSE Transport Error: POSTing to endpoint (HTTP ${response.status}): ${text}`
           });
-          (_d = this.onerror) == null ? void 0 : _d.call(this, error);
+          (_c = this.onerror) == null ? void 0 : _c.call(this, error);
           return;
         }
       } catch (error) {
+        if ((_d = options == null ? void 0 : options.signal) == null ? void 0 : _d.aborted) {
+          throw error;
+        }
         (_e = this.onerror) == null ? void 0 : _e.call(this, error);
         return;
       }
@@ -1603,27 +1610,33 @@ var HttpMCPTransport = class {
     this.abortController = new AbortController();
     this.startInboundSse();
   }
-  async close() {
-    var _a3, _b3, _c;
+  async close(options) {
+    var _a3, _b3, _c, _d, _e;
     (_a3 = this.inboundSseConnection) == null ? void 0 : _a3.close();
+    (_b3 = this.abortController) == null ? void 0 : _b3.abort();
     try {
-      if (this.sessionId && this.abortController && !this.abortController.signal.aborted) {
+      if (this.sessionId && this.abortController) {
+        (_c = options == null ? void 0 : options.signal) == null ? void 0 : _c.throwIfAborted();
         const headers = await this.commonHeaders({});
+        (_d = options == null ? void 0 : options.signal) == null ? void 0 : _d.throwIfAborted();
         await this.fetchFn(this.url.href, {
           method: "DELETE",
           headers,
-          signal: this.abortController.signal,
+          signal: options == null ? void 0 : options.signal,
           redirect: this.redirectMode
         }).catch(() => void 0);
       }
     } catch (e) {
     }
-    (_b3 = this.abortController) == null ? void 0 : _b3.abort();
-    (_c = this.onclose) == null ? void 0 : _c.call(this);
+    (_e = this.onclose) == null ? void 0 : _e.call(this);
   }
-  async send(message) {
+  async send(message, options) {
+    var _a3, _b3;
+    (_a3 = options == null ? void 0 : options.signal) == null ? void 0 : _a3.throwIfAborted();
+    const transportSignal = (_b3 = this.abortController) == null ? void 0 : _b3.signal;
+    const requestSignal = (options == null ? void 0 : options.signal) == null ? transportSignal : transportSignal == null ? options.signal : AbortSignal.any([transportSignal, options.signal]);
     const attempt = async (triedAuth = false) => {
-      var _a3, _b3, _c, _d, _e, _f, _g;
+      var _a4, _b4, _c, _d, _e, _f, _g;
       try {
         const headers = await this.commonHeaders({
           "Content-Type": "application/json",
@@ -1633,7 +1646,7 @@ var HttpMCPTransport = class {
           method: "POST",
           headers,
           body: JSON.stringify(message),
-          signal: (_a3 = this.abortController) == null ? void 0 : _a3.signal,
+          signal: requestSignal,
           redirect: this.redirectMode
         };
         const response = await this.fetchFn(this.url.href, init);
@@ -1650,7 +1663,7 @@ var HttpMCPTransport = class {
               throw error2;
             }
           } catch (error2) {
-            (_b3 = this.onerror) == null ? void 0 : _b3.call(this, error2);
+            (_a4 = this.onerror) == null ? void 0 : _a4.call(this, error2);
             throw error2;
           }
           return attempt(true);
@@ -1673,7 +1686,7 @@ var HttpMCPTransport = class {
             url: this.url.href,
             responseBody: text != null ? text : void 0
           });
-          (_c = this.onerror) == null ? void 0 : _c.call(this, error2);
+          (_b4 = this.onerror) == null ? void 0 : _b4.call(this, error2);
           throw error2;
         }
         const isNotification = !("id" in message);
@@ -1685,7 +1698,7 @@ var HttpMCPTransport = class {
           const data = await response.json();
           const messages = Array.isArray(data) ? data.map((message2) => validateJSONRPCMessage(message2)) : [validateJSONRPCMessage(data)];
           for (const jsonRpcMessage of messages) {
-            (_d = this.onmessage) == null ? void 0 : _d.call(this, jsonRpcMessage);
+            (_c = this.onmessage) == null ? void 0 : _c.call(this, jsonRpcMessage);
           }
           return;
         }
@@ -1696,13 +1709,13 @@ var HttpMCPTransport = class {
               statusCode: response.status,
               url: this.url.href
             });
-            (_e = this.onerror) == null ? void 0 : _e.call(this, error2);
+            (_d = this.onerror) == null ? void 0 : _d.call(this, error2);
             throw error2;
           }
           const stream = response.body.pipeThrough(new TextDecoderStream()).pipeThrough(new EventSourceParserStream2());
           const reader = stream.getReader();
           const processEvents = async () => {
-            var _a4, _b4, _c2;
+            var _a5, _b5, _c2, _d2;
             try {
               while (true) {
                 const { done, value } = await reader.read();
@@ -1711,29 +1724,29 @@ var HttpMCPTransport = class {
                 if (isMessageEvent2(event)) {
                   try {
                     const msg = await parseJSONRPCMessage(data);
-                    (_a4 = this.onmessage) == null ? void 0 : _a4.call(this, msg);
+                    (_a5 = this.onmessage) == null ? void 0 : _a5.call(this, msg);
                   } catch (error2) {
                     const e = new MCPClientError({
                       message: "MCP HTTP Transport Error: Failed to parse message",
                       cause: error2
                     });
-                    (_b4 = this.onerror) == null ? void 0 : _b4.call(this, e);
+                    (_b5 = this.onerror) == null ? void 0 : _b5.call(this, e);
                   }
                 }
               }
             } catch (error2) {
-              if (error2 instanceof Error && error2.name === "AbortError") {
+              if (((_c2 = options == null ? void 0 : options.signal) == null ? void 0 : _c2.aborted) || error2 instanceof Error && error2.name === "AbortError") {
                 return;
               }
-              (_c2 = this.onerror) == null ? void 0 : _c2.call(this, error2);
+              (_d2 = this.onerror) == null ? void 0 : _d2.call(this, error2);
             }
           };
           void processEvents().catch((error2) => {
-            var _a4;
-            if (error2 instanceof Error && error2.name === "AbortError") {
+            var _a5, _b5;
+            if (((_a5 = options == null ? void 0 : options.signal) == null ? void 0 : _a5.aborted) || error2 instanceof Error && error2.name === "AbortError") {
               return;
             }
-            (_a4 = this.onerror) == null ? void 0 : _a4.call(this, error2);
+            (_b5 = this.onerror) == null ? void 0 : _b5.call(this, error2);
           });
           return;
         }
@@ -1742,9 +1755,12 @@ var HttpMCPTransport = class {
           statusCode: response.status,
           url: this.url.href
         });
-        (_f = this.onerror) == null ? void 0 : _f.call(this, error);
+        (_e = this.onerror) == null ? void 0 : _e.call(this, error);
         throw error;
       } catch (error) {
+        if ((_f = options == null ? void 0 : options.signal) == null ? void 0 : _f.aborted) {
+          throw error;
+        }
         (_g = this.onerror) == null ? void 0 : _g.call(this, error);
         throw error;
       }
@@ -1975,6 +1991,44 @@ function prepareMaxRetries(maxRetries) {
   }
   return maxRetries;
 }
+function getEffectiveTimeout({
+  timeout,
+  maxTotalTimeout
+}) {
+  if (timeout == null) {
+    return maxTotalTimeout;
+  }
+  if (maxTotalTimeout == null) {
+    return timeout;
+  }
+  return Math.min(timeout, maxTotalTimeout);
+}
+function waitForAbort(promise, signal) {
+  if (signal == null) {
+    return promise;
+  }
+  return new Promise((resolve, reject) => {
+    const cleanup = () => {
+      signal.removeEventListener("abort", onAbort);
+    };
+    const onAbort = () => {
+      cleanup();
+      reject(signal.reason);
+    };
+    if (signal.aborted) {
+      onAbort();
+      return;
+    }
+    signal.addEventListener("abort", onAbort, { once: true });
+    promise.then((value) => {
+      cleanup();
+      resolve(value);
+    }).catch((error) => {
+      cleanup();
+      reject(error);
+    });
+  });
+}
 function mcpToModelOutput({
   output
 }) {
@@ -2012,7 +2066,8 @@ var DefaultMCPClient = class {
     version = CLIENT_VERSION,
     onUncaughtError,
     maxRetries,
-    capabilities
+    capabilities,
+    initializationOptions
   }) {
     this.requestMessageId = 0;
     this.responseHandlers = /* @__PURE__ */ new Map();
@@ -2022,6 +2077,7 @@ var DefaultMCPClient = class {
     this.onUncaughtError = onUncaughtError;
     this.maxRetries = prepareMaxRetries(maxRetries);
     this.clientCapabilities = capabilities != null ? capabilities : {};
+    this.initializationOptions = initializationOptions;
     if (isCustomMcpTransport(transportConfig)) {
       this.transport = transportConfig;
     } else {
@@ -2056,9 +2112,25 @@ var DefaultMCPClient = class {
     return this._serverInstructions;
   }
   async init() {
+    var _a3;
+    const externalSignal = (_a3 = this.initializationOptions) == null ? void 0 : _a3.signal;
+    const timeout = this.initializationOptions ? getEffectiveTimeout(this.initializationOptions) : void 0;
+    const timeoutController = timeout == null ? void 0 : new AbortController();
+    const signal = externalSignal == null ? timeoutController == null ? void 0 : timeoutController.signal : timeoutController == null ? externalSignal : AbortSignal.any([externalSignal, timeoutController.signal]);
+    let timeoutId;
+    let timeoutError;
+    if (timeout != null) {
+      timeoutId = setTimeout(() => {
+        timeoutError = new MCPClientError({
+          message: `MCP client initialization timed out after ${timeout}ms`
+        });
+        timeoutController == null ? void 0 : timeoutController.abort(timeoutError);
+      }, timeout);
+    }
     try {
-      await this.transport.start();
       this.isClosed = false;
+      signal == null ? void 0 : signal.throwIfAborted();
+      await waitForAbort(this.transport.start(), signal);
       const result = await this.request({
         request: {
           method: "initialize",
@@ -2068,7 +2140,8 @@ var DefaultMCPClient = class {
             clientInfo: this.clientInfo
           }
         },
-        resultSchema: InitializeResultSchema
+        resultSchema: InitializeResultSchema,
+        options: { signal }
       });
       if (result === void 0) {
         throw new MCPClientError({
@@ -2088,13 +2161,33 @@ var DefaultMCPClient = class {
         this.transport.protocolVersion = result.protocolVersion;
       }
       this._serverInstructions = result.instructions;
-      await this.notification({
-        method: "notifications/initialized"
-      });
+      await this.notification(
+        {
+          method: "notifications/initialized"
+        },
+        { signal }
+      );
       return this;
     } catch (error) {
-      await this.close();
+      try {
+        await waitForAbort(this.transport.close({ signal }), signal);
+      } catch (e) {
+      }
+      this.onClose();
+      if (timeoutError != null) {
+        throw timeoutError;
+      }
+      if (externalSignal == null ? void 0 : externalSignal.aborted) {
+        throw new MCPClientError({
+          message: "MCP client initialization was aborted",
+          cause: externalSignal.reason
+        });
+      }
       throw error;
+    } finally {
+      if (timeoutId != null) {
+        clearTimeout(timeoutId);
+      }
     }
   }
   async close() {
@@ -2103,6 +2196,12 @@ var DefaultMCPClient = class {
     await ((_a3 = this.transport) == null ? void 0 : _a3.close());
     this.onClose();
   }
+  send(message, signal) {
+    return this.transport.send(
+      message,
+      signal == null ? void 0 : { signal }
+    );
+  }
   assertCapability(method) {
     switch (method) {
       case "initialize":
@@ -2161,6 +2260,10 @@ var DefaultMCPClient = class {
       this.assertCapability(request.method);
       const signal = options == null ? void 0 : options.signal;
       signal == null ? void 0 : signal.throwIfAborted();
+      const timeout = options == null ? void 0 : getEffectiveTimeout(options);
+      const timeoutController = timeout == null ? void 0 : new AbortController();
+      const transportSignal = signal == null ? timeoutController == null ? void 0 : timeoutController.signal : timeoutController == null ? signal : AbortSignal.any([signal, timeoutController.signal]);
+      let timeoutId;
       const messageId = this.requestMessageId++;
       const jsonrpcRequest = {
         ...request,
@@ -2178,6 +2281,9 @@ var DefaultMCPClient = class {
       const cleanup = () => {
         this.responseHandlers.delete(messageId);
         signal == null ? void 0 : signal.removeEventListener("abort", onAbort);
+        if (timeoutId != null) {
+          clearTimeout(timeoutId);
+        }
       };
       const rejectAndCleanup = (error) => {
         cleanup();
@@ -2187,6 +2293,13 @@ var DefaultMCPClient = class {
         cleanup();
         rejectWithAbortError();
       };
+      const onTimeout = () => {
+        const error = new MCPClientError({
+          message: `Request timed out after ${timeout}ms`
+        });
+        timeoutController == null ? void 0 : timeoutController.abort(error);
+        rejectAndCleanup(error);
+      };
       this.responseHandlers.set(messageId, (response) => {
         if (signal == null ? void 0 : signal.aborted) {
           cleanup();
@@ -2208,7 +2321,11 @@ var DefaultMCPClient = class {
         }
       });
       signal == null ? void 0 : signal.addEventListener("abort", onAbort, { once: true });
-      this.transport.send(jsonrpcRequest).catch((error) => {
+      if (timeout != null) {
+        timeoutId = setTimeout(onTimeout, timeout);
+      }
+      const sendPromise = transportSignal == null ? this.transport.send(jsonrpcRequest) : this.send(jsonrpcRequest, transportSignal);
+      sendPromise.catch((error) => {
         rejectAndCleanup(error);
       });
     });
@@ -2343,12 +2460,15 @@ var DefaultMCPClient = class {
       options
     });
   }
-  async notification(notification) {
+  async notification(notification, options) {
     const jsonrpcNotification = {
       ...notification,
       jsonrpc: "2.0"
     };
-    await this.transport.send(jsonrpcNotification);
+    await waitForAbort(
+      this.send(jsonrpcNotification, options == null ? void 0 : options.signal),
+      options == null ? void 0 : options.signal
+    );
   }
   /**
    * Returns a set of AI SDK tools from the MCP server.