fastmcp 4.22.6 → 4.22.8

package/dist/FastMCP.cjs

@@ -11,7 +11,7 @@
 
 
 
-var _chunkQJIFKZYZcjs = require('./chunk-QJIFKZYZ.cjs');
+var _chunk44X25GBUcjs = require('./chunk-44X25GBU.cjs');
 
 
 
@@ -50,5 +50,5 @@ require('./chunk-O22SYZMC.cjs');
 
 
 
-exports.AuthProvider = _chunkYLLBANV4cjs.AuthProvider; exports.AzureProvider = _chunkYLLBANV4cjs.AzureProvider; exports.DiscoveryDocumentCache = _chunkQJIFKZYZcjs.DiscoveryDocumentCache; exports.FastMCP = _chunkQJIFKZYZcjs.FastMCP; exports.FastMCPError = _chunkQJIFKZYZcjs.FastMCPError; exports.FastMCPSession = _chunkQJIFKZYZcjs.FastMCPSession; exports.GitHubProvider = _chunkYLLBANV4cjs.GitHubProvider; exports.GoogleProvider = _chunkYLLBANV4cjs.GoogleProvider; exports.MEDIA_FETCH_TIMEOUT_MS = _chunkQJIFKZYZcjs.MEDIA_FETCH_TIMEOUT_MS; exports.OAuthProvider = _chunkYLLBANV4cjs.OAuthProvider; exports.ServerState = _chunkQJIFKZYZcjs.ServerState; exports.SessionError = _chunkQJIFKZYZcjs.SessionError; exports.UnexpectedStateError = _chunkQJIFKZYZcjs.UnexpectedStateError; exports.UserError = _chunkQJIFKZYZcjs.UserError; exports.audioContent = _chunkQJIFKZYZcjs.audioContent; exports.getAuthSession = _chunkYLLBANV4cjs.getAuthSession; exports.imageContent = _chunkQJIFKZYZcjs.imageContent; exports.jsonSchemaAdapter = _chunkQJIFKZYZcjs.jsonSchemaAdapter; exports.requireAll = _chunkYLLBANV4cjs.requireAll; exports.requireAny = _chunkYLLBANV4cjs.requireAny; exports.requireAuth = _chunkYLLBANV4cjs.requireAuth; exports.requireRole = _chunkYLLBANV4cjs.requireRole; exports.requireScopes = _chunkYLLBANV4cjs.requireScopes;
+exports.AuthProvider = _chunkYLLBANV4cjs.AuthProvider; exports.AzureProvider = _chunkYLLBANV4cjs.AzureProvider; exports.DiscoveryDocumentCache = _chunk44X25GBUcjs.DiscoveryDocumentCache; exports.FastMCP = _chunk44X25GBUcjs.FastMCP; exports.FastMCPError = _chunk44X25GBUcjs.FastMCPError; exports.FastMCPSession = _chunk44X25GBUcjs.FastMCPSession; exports.GitHubProvider = _chunkYLLBANV4cjs.GitHubProvider; exports.GoogleProvider = _chunkYLLBANV4cjs.GoogleProvider; exports.MEDIA_FETCH_TIMEOUT_MS = _chunk44X25GBUcjs.MEDIA_FETCH_TIMEOUT_MS; exports.OAuthProvider = _chunkYLLBANV4cjs.OAuthProvider; exports.ServerState = _chunk44X25GBUcjs.ServerState; exports.SessionError = _chunk44X25GBUcjs.SessionError; exports.UnexpectedStateError = _chunk44X25GBUcjs.UnexpectedStateError; exports.UserError = _chunk44X25GBUcjs.UserError; exports.audioContent = _chunk44X25GBUcjs.audioContent; exports.getAuthSession = _chunkYLLBANV4cjs.getAuthSession; exports.imageContent = _chunk44X25GBUcjs.imageContent; exports.jsonSchemaAdapter = _chunk44X25GBUcjs.jsonSchemaAdapter; exports.requireAll = _chunkYLLBANV4cjs.requireAll; exports.requireAny = _chunkYLLBANV4cjs.requireAny; exports.requireAuth = _chunkYLLBANV4cjs.requireAuth; exports.requireRole = _chunkYLLBANV4cjs.requireRole; exports.requireScopes = _chunkYLLBANV4cjs.requireScopes;
 //# sourceMappingURL=FastMCP.cjs.map

package/dist/FastMCP.js

@@ -11,7 +11,7 @@ import {
   audioContent,
   imageContent,
   jsonSchemaAdapter
-} from "./chunk-OAM6AYJY.js";
+} from "./chunk-76QWMCYJ.js";
 import {
   AuthProvider,
   AzureProvider,

package/dist/{chunk-QJIFKZYZ.cjs → chunk-44X25GBU.cjs}

@@ -684,77 +684,12 @@ var FastMCPSession = class extends FastMCPSessionEventEmitter {
       throw new UnexpectedStateError("Server is already connected");
     }
     this.#connectionState = "connecting";
+    const streamableHttp = !this.#stateless && isStreamableHttpTransport(transport);
     try {
       await this.#server.connect(transport);
-      if (!this.#stateless) {
-        let attempt = 0;
-        const maxAttempts = 10;
-        const retryDelay = 100;
-        while (attempt++ < maxAttempts) {
-          const capabilities = this.#server.getClientCapabilities();
-          if (capabilities) {
-            this.#clientCapabilities = capabilities;
-            break;
-          }
-          await _promises3.setTimeout.call(void 0, retryDelay);
-        }
-        if (!this.#clientCapabilities) {
-          this.#logger.warn(
-            `[FastMCP warning] could not infer client capabilities after ${maxAttempts} attempts. Connection may be unstable.`
-          );
-        }
-      }
-      if (_optionalChain([this, 'access', _12 => _12.#rootsConfig, 'optionalAccess', _13 => _13.enabled]) !== false && _optionalChain([this, 'access', _14 => _14.#clientCapabilities, 'optionalAccess', _15 => _15.roots, 'optionalAccess', _16 => _16.listChanged]) && typeof this.#server.listRoots === "function") {
-        try {
-          const roots = await this.#server.listRoots();
-          this.#roots = _optionalChain([roots, 'optionalAccess', _17 => _17.roots]) || [];
-        } catch (e) {
-          if (e instanceof _typesjs.McpError && e.code === _typesjs.ErrorCode.MethodNotFound) {
-            this.#logger.debug(
-              "[FastMCP debug] listRoots method not supported by client"
-            );
-          } else {
-            this.#logger.error(
-              `[FastMCP error] received error listing roots.
-
-${e instanceof Error ? e.stack : JSON.stringify(e)}`
-            );
-          }
-        }
-      }
-      if (this.#clientCapabilities) {
-        const pingConfig = this.#getPingConfig();
-        if (pingConfig.enabled) {
-          this.#pingInterval = setInterval(async () => {
-            if (this.#pingInFlight) {
-              return;
-            }
-            this.#pingInFlight = true;
-            try {
-              await this.#server.ping();
-            } catch (e4) {
-              const logLevel = pingConfig.logLevel;
-              if (logLevel === "debug") {
-                this.#logger.debug("[FastMCP debug] server ping failed");
-              } else if (logLevel === "warning") {
-                this.#logger.warn(
-                  "[FastMCP warning] server is not responding to ping"
-                );
-              } else if (logLevel === "error") {
-                this.#logger.error(
-                  "[FastMCP error] server is not responding to ping"
-                );
-              } else {
-                this.#logger.info("[FastMCP info] server ping failed");
-              }
-            } finally {
-              this.#pingInFlight = false;
-            }
-          }, pingConfig.intervalMs);
-        }
+      if (!streamableHttp) {
+        await this.#setUpSession(false);
       }
-      this.#connectionState = "ready";
-      this.emit("ready");
     } catch (error) {
       this.#connectionState = "error";
       const errorEvent = {
@@ -763,6 +698,18 @@ ${e instanceof Error ? e.stack : JSON.stringify(e)}`
       this.emit("error", errorEvent);
       throw error;
     }
+    if (streamableHttp) {
+      this.#setUpSession(true).catch((error) => {
+        this.#connectionState = "error";
+        if (this.listenerCount("error") > 0) {
+          this.emit("error", {
+            error: error instanceof Error ? error : new Error(String(error))
+          });
+        } else {
+          this.#logger.error("[FastMCP error] session setup failed", error);
+        }
+      });
+    }
   }
   promptsListChanged(prompts) {
     if (!this.#canRefresh("prompts")) {
@@ -931,7 +878,7 @@ ${error instanceof Error ? error.stack : JSON.stringify(error)}`
       },
       elicit: (params, options) => this.#server.elicitInput(params, options),
       log: this.#createLog(),
-      requestId: typeof _optionalChain([meta, 'optionalAccess', _18 => _18.requestId]) === "string" ? meta.requestId : void 0,
+      requestId: typeof _optionalChain([meta, 'optionalAccess', _12 => _12.requestId]) === "string" ? meta.requestId : void 0,
       session: this.#auth,
       sessionId: this.sessionId
     };
@@ -953,8 +900,8 @@ ${error instanceof Error ? error.stack : JSON.stringify(error)}`
     };
   }
   #formatSchemaIssues(issues) {
-    return _optionalChain([this, 'access', _19 => _19.#utils, 'optionalAccess', _20 => _20.formatInvalidParamsErrorMessage]) ? this.#utils.formatInvalidParamsErrorMessage(issues) : issues.map((issue) => {
-      const path = _optionalChain([issue, 'access', _21 => _21.path, 'optionalAccess', _22 => _22.join, 'call', _23 => _23(".")]) || "root";
+    return _optionalChain([this, 'access', _13 => _13.#utils, 'optionalAccess', _14 => _14.formatInvalidParamsErrorMessage]) ? this.#utils.formatInvalidParamsErrorMessage(issues) : issues.map((issue) => {
+      const path = _optionalChain([issue, 'access', _15 => _15.path, 'optionalAccess', _16 => _16.join, 'call', _17 => _17(".")]) || "root";
       return `${path}: ${issue.message}`;
     }).join(", ");
   }
@@ -967,6 +914,52 @@ ${error instanceof Error ? error.stack : JSON.stringify(error)}`
       logLevel: pingConfig.logLevel || "debug"
     };
   }
+  /**
+   * Fetches the client's roots if it advertised `roots.listChanged`.
+   *
+   * Over Streamable HTTP a server-initiated request travels on the client's
+   * standalone GET stream, which the client opens only after initialization,
+   * and the transport drops a request sent before that. So there each attempt
+   * is bounded and retried, and the result is announced with `rootsChanged`.
+   */
+  async #loadRoots(streamableHttp) {
+    if (_optionalChain([this, 'access', _18 => _18.#rootsConfig, 'optionalAccess', _19 => _19.enabled]) === false || !_optionalChain([this, 'access', _20 => _20.#clientCapabilities, 'optionalAccess', _21 => _21.roots, 'optionalAccess', _22 => _22.listChanged]) || typeof this.#server.listRoots !== "function") {
+      return;
+    }
+    const maxAttempts = streamableHttp ? 5 : 1;
+    for (let attempt = 1; ; attempt++) {
+      try {
+        const roots = await this.#server.listRoots(
+          void 0,
+          streamableHttp ? { timeout: 1e3 } : void 0
+        );
+        this.#roots = _optionalChain([roots, 'optionalAccess', _23 => _23.roots]) || [];
+        if (streamableHttp) {
+          this.emit("rootsChanged", { roots: this.#roots });
+        }
+        return;
+      } catch (e) {
+        if (this.#connectionState === "closed") {
+          return;
+        }
+        if (attempt < maxAttempts && e instanceof _typesjs.McpError && e.code === _typesjs.ErrorCode.RequestTimeout) {
+          continue;
+        }
+        if (e instanceof _typesjs.McpError && e.code === _typesjs.ErrorCode.MethodNotFound) {
+          this.#logger.debug(
+            "[FastMCP debug] listRoots method not supported by client"
+          );
+        } else {
+          this.#logger.error(
+            `[FastMCP error] received error listing roots.
+
+${e instanceof Error ? e.stack : JSON.stringify(e)}`
+          );
+        }
+        return;
+      }
+    }
+  }
   /**
    * `sendLoggingMessage` rejects once the client has hung up, and these four
    * callers are synchronous, so the rejection has nowhere to go. Swallow it the
@@ -991,6 +984,70 @@ ${error instanceof Error ? error.stack : JSON.stringify(error)}`
       );
     });
   }
+  async #setUpSession(streamableHttp) {
+    if (!this.#stateless) {
+      let attempt = 0;
+      const maxAttempts = 10;
+      const retryDelay = 100;
+      while (attempt++ < maxAttempts) {
+        const capabilities = this.#server.getClientCapabilities();
+        if (capabilities) {
+          this.#clientCapabilities = capabilities;
+          break;
+        }
+        await _promises3.setTimeout.call(void 0, retryDelay);
+        if (this.#connectionState === "closed") {
+          return;
+        }
+      }
+      if (!this.#clientCapabilities) {
+        this.#logger.warn(
+          `[FastMCP warning] could not infer client capabilities after ${maxAttempts} attempts. Connection may be unstable.`
+        );
+      }
+    }
+    if (this.#connectionState === "closed") {
+      return;
+    }
+    if (streamableHttp) {
+      void this.#loadRoots(true);
+    } else {
+      await this.#loadRoots(false);
+    }
+    if (this.#clientCapabilities) {
+      const pingConfig = this.#getPingConfig();
+      if (pingConfig.enabled) {
+        this.#pingInterval = setInterval(async () => {
+          if (this.#pingInFlight) {
+            return;
+          }
+          this.#pingInFlight = true;
+          try {
+            await this.#server.ping();
+          } catch (e4) {
+            const logLevel = pingConfig.logLevel;
+            if (logLevel === "debug") {
+              this.#logger.debug("[FastMCP debug] server ping failed");
+            } else if (logLevel === "warning") {
+              this.#logger.warn(
+                "[FastMCP warning] server is not responding to ping"
+              );
+            } else if (logLevel === "error") {
+              this.#logger.error(
+                "[FastMCP error] server is not responding to ping"
+              );
+            } else {
+              this.#logger.info("[FastMCP info] server ping failed");
+            }
+          } finally {
+            this.#pingInFlight = false;
+          }
+        }, pingConfig.intervalMs);
+      }
+    }
+    this.#connectionState = "ready";
+    this.emit("ready");
+  }
   /**
    * Periodically writes to the response stream of an in-flight tool call, so an
    * idle-connection timeout (proxy, load balancer) does not close it while a
@@ -1667,11 +1724,22 @@ function convertObjectToSnakeCase(obj) {
   }
   return result;
 }
+function isStreamableHttpTransport(transport) {
+  return "handleRequest" in transport && typeof transport.handleRequest === "function";
+}
 function joinPaths(basePath, path) {
   return `${basePath}${normalizePath(path)}`;
 }
 function matchUriTemplate(template, uri) {
-  const match = template.fromUri(uri);
+  let match;
+  try {
+    match = template.fromUri(uri);
+  } catch (error) {
+    if (error instanceof URIError) {
+      return void 0;
+    }
+    throw error;
+  }
   if (!match) {
     return void 0;
   }
@@ -3066,4 +3134,4 @@ var FastMCP = class extends FastMCPEventEmitter {
 
 
 exports.DiscoveryDocumentCache = DiscoveryDocumentCache; exports.jsonSchemaAdapter = jsonSchemaAdapter; exports.MEDIA_FETCH_TIMEOUT_MS = MEDIA_FETCH_TIMEOUT_MS; exports.imageContent = imageContent; exports.audioContent = audioContent; exports.FastMCPError = FastMCPError; exports.SessionError = SessionError; exports.UnexpectedStateError = UnexpectedStateError; exports.UserError = UserError; exports.ServerState = ServerState; exports.FastMCPSession = FastMCPSession; exports.FastMCP = FastMCP;
-//# sourceMappingURL=chunk-QJIFKZYZ.cjs.map
+//# sourceMappingURL=chunk-44X25GBU.cjs.map