@ai-sdk/mcp 1.0.58 → 1.0.60

package/dist/index.mjs

@@ -1601,7 +1601,7 @@ var HttpMCPTransport = class {
       });
     }
     this.abortController = new AbortController();
-    void this.openInboundSse();
+    this.startInboundSse();
   }
   async close() {
     var _a3, _b3, _c;
@@ -1657,7 +1657,7 @@ var HttpMCPTransport = class {
         }
         if (response.status === 202) {
           if (!this.inboundSseConnection) {
-            void this.openInboundSse();
+            this.startInboundSse();
           }
           return;
         }
@@ -1728,7 +1728,13 @@ var HttpMCPTransport = class {
               (_c2 = this.onerror) == null ? void 0 : _c2.call(this, error2);
             }
           };
-          processEvents();
+          void processEvents().catch((error2) => {
+            var _a4;
+            if (error2 instanceof Error && error2.name === "AbortError") {
+              return;
+            }
+            (_a4 = this.onerror) == null ? void 0 : _a4.call(this, error2);
+          });
           return;
         }
         const error = new MCPClientError({
@@ -1770,12 +1776,21 @@ var HttpMCPTransport = class {
     }
     const delay = this.getNextReconnectionDelay(this.inboundReconnectAttempts);
     this.inboundReconnectAttempts += 1;
-    setTimeout(async () => {
+    setTimeout(() => {
       var _a4;
       if ((_a4 = this.abortController) == null ? void 0 : _a4.signal.aborted) return;
-      await this.openInboundSse(false, this.lastInboundEventId);
+      this.startInboundSse(false, this.lastInboundEventId);
     }, delay);
   }
+  startInboundSse(triedAuth = false, resumeToken) {
+    void this.openInboundSse(triedAuth, resumeToken).catch((error) => {
+      var _a3;
+      if (error instanceof Error && error.name === "AbortError") {
+        return;
+      }
+      (_a3 = this.onerror) == null ? void 0 : _a3.call(this, error);
+    });
+  }
   // Open optional inbound SSE stream; best-effort and resumable
   async openInboundSse(triedAuth = false, resumeToken) {
     var _a3, _b3, _c, _d, _e, _f;
@@ -1859,10 +1874,27 @@ var HttpMCPTransport = class {
         }
       };
       this.inboundSseConnection = {
-        close: () => reader.cancel()
+        close: () => {
+          void reader.cancel().catch((error) => {
+            var _a4;
+            if (error instanceof Error && error.name === "AbortError") {
+              return;
+            }
+            (_a4 = this.onerror) == null ? void 0 : _a4.call(this, error);
+          });
+        }
       };
       this.inboundReconnectAttempts = 0;
-      processEvents();
+      void processEvents().catch((error) => {
+        var _a4, _b4;
+        if (error instanceof Error && error.name === "AbortError") {
+          return;
+        }
+        (_a4 = this.onerror) == null ? void 0 : _a4.call(this, error);
+        if (!((_b4 = this.abortController) == null ? void 0 : _b4.signal.aborted)) {
+          this.scheduleInboundSseReconnection();
+        }
+      });
     } catch (error) {
       if (error instanceof Error && error.name === "AbortError") {
         return;
@@ -2135,35 +2167,49 @@ var DefaultMCPClient = class {
         jsonrpc: "2.0",
         id: messageId
       };
+      const rejectWithAbortError = () => {
+        reject(
+          new MCPClientError({
+            message: "Request was aborted",
+            cause: signal == null ? void 0 : signal.reason
+          })
+        );
+      };
       const cleanup = () => {
         this.responseHandlers.delete(messageId);
+        signal == null ? void 0 : signal.removeEventListener("abort", onAbort);
+      };
+      const rejectAndCleanup = (error) => {
+        cleanup();
+        reject(error);
+      };
+      const onAbort = () => {
+        cleanup();
+        rejectWithAbortError();
       };
       this.responseHandlers.set(messageId, (response) => {
         if (signal == null ? void 0 : signal.aborted) {
-          return reject(
-            new MCPClientError({
-              message: "Request was aborted",
-              cause: signal.reason
-            })
-          );
+          cleanup();
+          return rejectWithAbortError();
         }
         if (response instanceof Error) {
-          return reject(response);
+          return rejectAndCleanup(response);
         }
         try {
           const result = resultSchema.parse(response.result);
+          cleanup();
           resolve(result);
         } catch (error) {
           const parseError = new MCPClientError({
             message: "Failed to parse server response",
             cause: error
           });
-          reject(parseError);
+          rejectAndCleanup(parseError);
         }
       });
+      signal == null ? void 0 : signal.addEventListener("abort", onAbort, { once: true });
       this.transport.send(jsonrpcRequest).catch((error) => {
-        cleanup();
-        reject(error);
+        rejectAndCleanup(error);
       });
     });
   }