@mastra/mcp 1.0.0-beta.1 → 1.0.0-beta.3

package/dist/index.js

@@ -366,6 +366,7 @@ var ResourceClientActions = class {
 };
 
 // src/client/client.ts
+var DEFAULT_SERVER_CONNECT_TIMEOUT_MSEC = 3e3;
 function convertLogLevelToLoggerMethod(level) {
   switch (level) {
     case "debug":
@@ -393,6 +394,8 @@ var InternalMastraMCPClient = class extends MastraBase {
   serverConfig;
   transport;
   currentOperationContext = null;
+  exitHookUnsubscribe;
+  sigTermHandler;
   /** Provides access to resource operations (list, read, subscribe, etc.) */
   resources;
   /** Provides access to prompt operations (list, get, notifications) */
@@ -483,7 +486,7 @@ var InternalMastraMCPClient = class extends MastraBase {
     }
   }
   async connectHttp(url) {
-    const { requestInit, eventSourceInit, authProvider } = this.serverConfig;
+    const { requestInit, eventSourceInit, authProvider, connectTimeout } = this.serverConfig;
     this.log("debug", `Attempting to connect to URL: ${url}`);
     let shouldTrySSE = url.pathname.endsWith(`/sse`);
     if (!shouldTrySSE) {
@@ -495,10 +498,7 @@ var InternalMastraMCPClient = class extends MastraBase {
           authProvider
         });
         await this.client.connect(streamableTransport, {
-          timeout: (
-            // this is hardcoded to 3s because the long default timeout would be extremely slow for sse backwards compat (60s)
-            3e3
-          )
+          timeout: connectTimeout ?? DEFAULT_SERVER_CONNECT_TIMEOUT_MSEC
         });
         this.transport = streamableTransport;
         this.log("debug", "Successfully connected using Streamable HTTP transport.");
@@ -563,14 +563,19 @@ var InternalMastraMCPClient = class extends MastraBase {
         reject(e);
       }
     });
-    asyncExitHook(
-      async () => {
-        this.log("debug", `Disconnecting MCP server during exit`);
-        await this.disconnect();
-      },
-      { wait: 5e3 }
-    );
-    process.on("SIGTERM", () => gracefulExit());
+    if (!this.exitHookUnsubscribe) {
+      this.exitHookUnsubscribe = asyncExitHook(
+        async () => {
+          this.log("debug", `Disconnecting MCP server during exit`);
+          await this.disconnect();
+        },
+        { wait: 5e3 }
+      );
+    }
+    if (!this.sigTermHandler) {
+      this.sigTermHandler = () => gracefulExit();
+      process.on("SIGTERM", this.sigTermHandler);
+    }
     this.log("debug", `Successfully connected to MCP server`);
     return this.isConnected;
   }
@@ -606,6 +611,14 @@ var InternalMastraMCPClient = class extends MastraBase {
     } finally {
       this.transport = void 0;
       this.isConnected = Promise.resolve(false);
+      if (this.exitHookUnsubscribe) {
+        this.exitHookUnsubscribe();
+        this.exitHookUnsubscribe = void 0;
+      }
+      if (this.sigTermHandler) {
+        process.off("SIGTERM", this.sigTermHandler);
+        this.sigTermHandler = void 0;
+      }
     }
   }
   async listResources() {
@@ -793,6 +806,9 @@ var InternalMastraMCPClient = class extends MastraBase {
                 }
               );
               this.log("debug", `Tool executed successfully: ${tool.name}`);
+              if (res.structuredContent !== void 0) {
+                return res.structuredContent;
+              }
               return res;
             } catch (e) {
               this.log("error", `Error calling tool: ${tool.name}`, {
@@ -1580,7 +1596,7 @@ To fix this you have three different options:
   }
 };
 
-// ../../node_modules/.pnpm/hono@4.10.3/node_modules/hono/dist/utils/stream.js
+// ../../node_modules/.pnpm/hono@4.10.6/node_modules/hono/dist/utils/stream.js
 var StreamingApi = class {
   writer;
   encoder;
@@ -1647,7 +1663,7 @@ var StreamingApi = class {
   }
 };
 
-// ../../node_modules/.pnpm/hono@4.10.3/node_modules/hono/dist/helper/streaming/utils.js
+// ../../node_modules/.pnpm/hono@4.10.6/node_modules/hono/dist/helper/streaming/utils.js
 var isOldBunVersion = () => {
   const version = typeof Bun !== "undefined" ? Bun.version : void 0;
   if (version === void 0) {
@@ -1658,7 +1674,7 @@ var isOldBunVersion = () => {
   return result;
 };
 
-// ../../node_modules/.pnpm/hono@4.10.3/node_modules/hono/dist/utils/html.js
+// ../../node_modules/.pnpm/hono@4.10.6/node_modules/hono/dist/utils/html.js
 var HtmlEscapedCallbackPhase = {
   Stringify: 1};
 var resolveCallback = async (str, phase, preserveCallbacks, context, buffer) => {
@@ -1689,7 +1705,7 @@ var resolveCallback = async (str, phase, preserveCallbacks, context, buffer) =>
   }
 };
 
-// ../../node_modules/.pnpm/hono@4.10.3/node_modules/hono/dist/helper/streaming/sse.js
+// ../../node_modules/.pnpm/hono@4.10.6/node_modules/hono/dist/helper/streaming/sse.js
 var SSEStreamingApi = class extends StreamingApi {
   constructor(writable, readable) {
     super(writable, readable);
@@ -3001,7 +3017,7 @@ Provided arguments: ${JSON.stringify(request.params.arguments, null, 2)}`
     httpPath,
     req,
     res,
-    options = { sessionIdGenerator: () => randomUUID() }
+    options
   }) {
     this.logger.debug(`startHTTP: Received ${req.method} request to ${url.pathname}`);
     if (url.pathname !== httpPath) {
@@ -3010,11 +3026,18 @@ Provided arguments: ${JSON.stringify(request.params.arguments, null, 2)}`
       res.end();
       return;
     }
-    if (options?.serverless) {
-      this.logger.debug("startHTTP: Running in serverless (stateless) mode");
+    const isStatelessMode = options?.serverless || options && "sessionIdGenerator" in options && options.sessionIdGenerator === void 0;
+    if (isStatelessMode) {
+      this.logger.debug("startHTTP: Running in stateless mode (serverless or sessionIdGenerator: undefined)");
       await this.handleServerlessRequest(req, res);
       return;
     }
+    const mergedOptions = {
+      sessionIdGenerator: () => randomUUID(),
+      // default: enabled
+      ...options
+      // user-provided overrides default
+    };
     const sessionId = req.headers["mcp-session-id"];
     let transport;
     this.logger.debug(
@@ -3061,8 +3084,8 @@ Provided arguments: ${JSON.stringify(request.params.arguments, null, 2)}`
           if (isInitializeRequest(body)) {
             this.logger.debug("startHTTP: Received Streamable HTTP initialize request, creating new transport.");
             transport = new StreamableHTTPServerTransport({
-              ...options,
-              sessionIdGenerator: () => randomUUID(),
+              ...mergedOptions,
+              sessionIdGenerator: mergedOptions.sessionIdGenerator,
               onsessioninitialized: (id) => {
                 this.streamableHTTPTransports.set(id, transport);
               }