@mastra/mcp 1.0.0-beta.4 → 1.0.0-beta.6

package/dist/index.js

@@ -384,6 +384,7 @@ var ResourceClientActions = class {
 
 // src/client/client.ts
 var DEFAULT_SERVER_CONNECT_TIMEOUT_MSEC = 3e3;
+var SSE_FALLBACK_STATUS_CODES = [400, 404, 405];
 function convertLogLevelToLoggerMethod(level) {
   switch (level) {
     case "debug":
@@ -576,7 +577,7 @@ var InternalMastraMCPClient = class extends MastraBase {
     }
   }
   async connectHttp(url) {
-    const { requestInit, eventSourceInit, authProvider, connectTimeout } = this.serverConfig;
+    const { requestInit, eventSourceInit, authProvider, connectTimeout, fetch } = this.serverConfig;
     this.log("debug", `Attempting to connect to URL: ${url}`);
     let shouldTrySSE = url.pathname.endsWith(`/sse`);
     if (!shouldTrySSE) {
@@ -585,7 +586,8 @@ var InternalMastraMCPClient = class extends MastraBase {
         const streamableTransport = new StreamableHTTPClientTransport(url, {
           requestInit,
           reconnectionOptions: this.serverConfig.reconnectionOptions,
-          authProvider
+          authProvider,
+          fetch
         });
         await this.client.connect(streamableTransport, {
           timeout: connectTimeout ?? DEFAULT_SERVER_CONNECT_TIMEOUT_MSEC
@@ -594,13 +596,23 @@ var InternalMastraMCPClient = class extends MastraBase {
         this.log("debug", "Successfully connected using Streamable HTTP transport.");
       } catch (error) {
         this.log("debug", `Streamable HTTP transport failed: ${error}`);
+        const status = error?.code;
+        if (status !== void 0 && !SSE_FALLBACK_STATUS_CODES.includes(status)) {
+          throw error;
+        }
         shouldTrySSE = true;
       }
     }
     if (shouldTrySSE) {
       this.log("debug", "Falling back to deprecated HTTP+SSE transport...");
       try {
-        const sseTransport = new SSEClientTransport(url, { requestInit, eventSourceInit, authProvider });
+        const sseEventSourceInit = fetch ? { ...eventSourceInit, fetch } : eventSourceInit;
+        const sseTransport = new SSEClientTransport(url, {
+          requestInit,
+          eventSourceInit: sseEventSourceInit,
+          authProvider,
+          fetch
+        });
         await this.client.connect(sseTransport, { timeout: this.serverConfig.timeout ?? this.timeout });
         this.transport = sseTransport;
         this.log("debug", "Successfully connected using deprecated HTTP+SSE transport.");
@@ -717,6 +729,7 @@ var InternalMastraMCPClient = class extends MastraBase {
    * Common session-related errors include:
    * - "No valid session ID provided" (HTTP 400)
    * - "Server not initialized" (HTTP 400)
+   * - "Not connected" (protocol state error)
    * - Connection refused errors
    * 
    * @param error - The error to check
@@ -729,7 +742,7 @@ var InternalMastraMCPClient = class extends MastraBase {
       return false;
     }
     const errorMessage = error.message.toLowerCase();
-    return errorMessage.includes("no valid session") || errorMessage.includes("session") || errorMessage.includes("server not initialized") || errorMessage.includes("http 400") || errorMessage.includes("http 401") || errorMessage.includes("http 403") || errorMessage.includes("econnrefused") || errorMessage.includes("fetch failed") || errorMessage.includes("connection refused");
+    return errorMessage.includes("no valid session") || errorMessage.includes("session") || errorMessage.includes("server not initialized") || errorMessage.includes("not connected") || errorMessage.includes("http 400") || errorMessage.includes("http 401") || errorMessage.includes("http 403") || errorMessage.includes("econnrefused") || errorMessage.includes("fetch failed") || errorMessage.includes("connection refused");
   }
   /**
    * Forces a reconnection to the MCP server by disconnecting and reconnecting.
@@ -2383,8 +2396,8 @@ var MCPServer = class extends MCPServerBase {
       }
     });
     this.elicitation = {
-      sendRequest: async (request) => {
-        return this.handleElicitationRequest(request);
+      sendRequest: async (request, options) => {
+        return this.handleElicitationRequest(request, void 0, options);
       }
     };
   }
@@ -2394,12 +2407,13 @@ var MCPServer = class extends MCPServerBase {
    *
    * @param request - The elicitation request containing message and schema
    * @param serverInstance - Optional server instance to use; defaults to main server for backward compatibility
+   * @param options - Optional request options (timeout, signal, etc.)
    * @returns Promise that resolves to the client's response
    */
-  async handleElicitationRequest(request, serverInstance) {
+  async handleElicitationRequest(request, serverInstance, options) {
     this.logger.debug(`Sending elicitation request: ${request.message}`);
     const server = serverInstance || this.server;
-    const response = await server.elicitInput(request);
+    const response = await server.elicitInput(request, options);
     this.logger.debug(`Received elicitation response: ${JSON.stringify(response)}`);
     return response;
   }
@@ -2523,8 +2537,8 @@ Provided arguments: ${JSON.stringify(request.params.arguments, null, 2)}`
           };
         }
         const sessionElicitation = {
-          sendRequest: async (request2) => {
-            return this.handleElicitationRequest(request2, serverInstance);
+          sendRequest: async (request2, options) => {
+            return this.handleElicitationRequest(request2, serverInstance, options);
           }
         };
         const mcpOptions = {