fastmcp 4.22.5 → 4.22.7

package/dist/{chunk-PAWIMJ72.cjs → chunk-QICOIGCH.cjs}

@@ -1,6 +1,6 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { newObj[key] = obj[key]; } } } newObj.default = obj; return newObj; } } function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } function _nullishCoalesce(lhs, rhsFn) { if (lhs != null) { return lhs; } else { return rhsFn(); } } async function _asyncNullishCoalesce(lhs, rhsFn) { if (lhs != null) { return lhs; } else { return await rhsFn(); } } function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]; let i = 1; while (i < ops.length) { const op = ops[i]; const fn = ops[i + 1]; i += 2; if ((op === 'optionalAccess' || op === 'optionalCall') && value == null) { return undefined; } if (op === 'access' || op === 'optionalAccess') { lastAccessLHS = value; value = fn(value); } else if (op === 'call' || op === 'optionalCall') { value = fn((...args) => value.call(lastAccessLHS, ...args)); lastAccessLHS = undefined; } } return value; }
 
-var _chunkYOBCXNFPcjs = require('./chunk-YOBCXNFP.cjs');
+var _chunkYLLBANV4cjs = require('./chunk-YLLBANV4.cjs');
 
 
 var _chunkO22SYZMCcjs = require('./chunk-O22SYZMC.cjs');
@@ -134,7 +134,7 @@ var DiscoveryDocumentCache = class {
       throw error;
     }
     if (!res.ok) {
-      await _chunkYOBCXNFPcjs.cancelResponseBody.call(void 0, res);
+      await _chunkYLLBANV4cjs.cancelResponseBody.call(void 0, res);
       throw new Error(
         `Failed to fetch discovery document from ${url}: ${res.status} ${res.statusText}`
       );
@@ -230,7 +230,7 @@ var imageContent = async (input) => {
           signal: AbortSignal.timeout(timeoutMs)
         });
         if (!response.ok) {
-          await _chunkYOBCXNFPcjs.cancelResponseBody.call(void 0, response);
+          await _chunkYLLBANV4cjs.cancelResponseBody.call(void 0, response);
           throw new Error(
             `Server responded with status: ${response.status} - ${response.statusText}`
           );
@@ -292,7 +292,7 @@ var audioContent = async (input) => {
           signal: AbortSignal.timeout(timeoutMs)
         });
         if (!response.ok) {
-          await _chunkYOBCXNFPcjs.cancelResponseBody.call(void 0, response);
+          await _chunkYLLBANV4cjs.cancelResponseBody.call(void 0, response);
           throw new Error(
             `Server responded with status: ${response.status} - ${response.statusText}`
           );
@@ -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,67 @@ ${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.#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
@@ -1306,7 +1360,7 @@ ${error instanceof Error ? error.stack : JSON.stringify(error)}`
               const uriTemplate = _uritemplates2.default.call(void 0, 
                 resourceTemplate.uriTemplate
               );
-              const match = uriTemplate.fromUri(request.params.uri);
+              const match = matchUriTemplate(uriTemplate, request.params.uri);
               if (!match) {
                 continue;
               }
@@ -1667,9 +1721,26 @@ 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);
+  if (!match) {
+    return void 0;
+  }
+  const checksQuery = !/\{[?&]/.test(template.template);
+  const checksFragment = !template.template.includes("{#");
+  const shape = (value) => [
+    value.split(/[?#]/, 1)[0].split("/").length,
+    checksQuery && value.includes("?"),
+    checksFragment && value.includes("#")
+  ].join();
+  return shape(template.fill(match)) === shape(uri) ? match : void 0;
+}
 function normalizeBasePath(path) {
   if (!path || path === "/") {
     return "";
@@ -1950,7 +2021,7 @@ var FastMCP = class extends FastMCPEventEmitter {
     }
     for (const template of this.#resourcesTemplates) {
       const parsedTemplate = _uritemplates2.default.call(void 0, template.uriTemplate);
-      const params = parsedTemplate.fromUri(uri);
+      const params = matchUriTemplate(parsedTemplate, uri);
       if (!params) {
         continue;
       }
@@ -3052,4 +3123,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-PAWIMJ72.cjs.map
+//# sourceMappingURL=chunk-QICOIGCH.cjs.map