fastmcp 4.15.0 → 4.15.2

package/dist/{chunk-6I3JC3FN.cjs → chunk-N6ZZF5YB.cjs}

@@ -23,7 +23,6 @@ var _fusejs = require('fuse.js'); var _fusejs2 = _interopRequireDefault(_fusejs)
 var _hono = require('hono');
 var _mcpproxy = require('mcp-proxy');
 var _promises3 = require('timers/promises');
-var _undici = require('undici');
 var _uritemplates = require('uri-templates'); var _uritemplates2 = _interopRequireDefault(_uritemplates);
 var _xsschema = require('xsschema');
 var _zod = require('zod');
@@ -204,7 +203,7 @@ var imageContent = async (input) => {
     if ("url" in input) {
       const timeoutMs = _nullishCoalesce(input.timeoutMs, () => ( MEDIA_FETCH_TIMEOUT_MS));
       try {
-        const response = await _undici.fetch.call(void 0, input.url, {
+        const response = await fetch(input.url, {
           signal: AbortSignal.timeout(timeoutMs)
         });
         if (!response.ok) {
@@ -265,7 +264,7 @@ var audioContent = async (input) => {
     if ("url" in input) {
       const timeoutMs = _nullishCoalesce(input.timeoutMs, () => ( MEDIA_FETCH_TIMEOUT_MS));
       try {
-        const response = await _undici.fetch.call(void 0, input.url, {
+        const response = await fetch(input.url, {
           signal: AbortSignal.timeout(timeoutMs)
         });
         if (!response.ok) {
@@ -465,8 +464,20 @@ var FastMCPSession = class extends FastMCPSessionEventEmitter {
   get server() {
     return this.#server;
   }
+  /**
+   * The HTTP session ID, or `undefined` for transports that do not have one.
+   *
+   * Resolved from the transport on every read rather than captured when the
+   * session connects: `StreamableHTTPServerTransport` assigns its `sessionId`
+   * while it handles `initialize`, which happens after `connect()` resolves.
+   * A value read at connect time is therefore still `undefined`.
+   */
   get sessionId() {
-    return this.#sessionId;
+    if (this.#sessionId !== void 0) {
+      return this.#sessionId;
+    }
+    const transport = this.#server.transport;
+    return typeof _optionalChain([transport, 'optionalAccess', _9 => _9.sessionId]) === "string" ? transport.sessionId : void 0;
   }
   set sessionId(value) {
     this.#sessionId = value;
@@ -605,12 +616,6 @@ var FastMCPSession = class extends FastMCPSessionEventEmitter {
     this.#connectionState = "connecting";
     try {
       await this.#server.connect(transport);
-      if ("sessionId" in transport) {
-        const transportWithSessionId = transport;
-        if (typeof transportWithSessionId.sessionId === "string") {
-          this.#sessionId = transportWithSessionId.sessionId;
-        }
-      }
       if (!this.#stateless) {
         let attempt = 0;
         const maxAttempts = 10;
@@ -629,10 +634,10 @@ var FastMCPSession = class extends FastMCPSessionEventEmitter {
           );
         }
       }
-      if (_optionalChain([this, 'access', _9 => _9.#rootsConfig, 'optionalAccess', _10 => _10.enabled]) !== false && _optionalChain([this, 'access', _11 => _11.#clientCapabilities, 'optionalAccess', _12 => _12.roots, 'optionalAccess', _13 => _13.listChanged]) && typeof this.#server.listRoots === "function") {
+      if (_optionalChain([this, 'access', _10 => _10.#rootsConfig, 'optionalAccess', _11 => _11.enabled]) !== false && _optionalChain([this, 'access', _12 => _12.#clientCapabilities, 'optionalAccess', _13 => _13.roots, 'optionalAccess', _14 => _14.listChanged]) && typeof this.#server.listRoots === "function") {
         try {
           const roots = await this.#server.listRoots();
-          this.#roots = _optionalChain([roots, 'optionalAccess', _14 => _14.roots]) || [];
+          this.#roots = _optionalChain([roots, 'optionalAccess', _15 => _15.roots]) || [];
         } catch (e) {
           if (e instanceof _typesjs.McpError && e.code === _typesjs.ErrorCode.MethodNotFound) {
             this.#logger.debug(
@@ -805,9 +810,9 @@ ${error instanceof Error ? error.stack : JSON.stringify(error)}`
       },
       elicit: (params, options) => this.#server.elicitInput(params, options),
       log: this.#createLog(),
-      requestId: typeof _optionalChain([meta, 'optionalAccess', _15 => _15.requestId]) === "string" ? meta.requestId : void 0,
+      requestId: typeof _optionalChain([meta, 'optionalAccess', _16 => _16.requestId]) === "string" ? meta.requestId : void 0,
       session: this.#auth,
-      sessionId: this.#sessionId
+      sessionId: this.sessionId
     };
   }
   #createLog() {
@@ -851,8 +856,8 @@ ${error instanceof Error ? error.stack : JSON.stringify(error)}`
     };
   }
   #formatSchemaIssues(issues) {
-    return _optionalChain([this, 'access', _16 => _16.#utils, 'optionalAccess', _17 => _17.formatInvalidParamsErrorMessage]) ? this.#utils.formatInvalidParamsErrorMessage(issues) : issues.map((issue) => {
-      const path = _optionalChain([issue, 'access', _18 => _18.path, 'optionalAccess', _19 => _19.join, 'call', _20 => _20(".")]) || "root";
+    return _optionalChain([this, 'access', _17 => _17.#utils, 'optionalAccess', _18 => _18.formatInvalidParamsErrorMessage]) ? this.#utils.formatInvalidParamsErrorMessage(issues) : issues.map((issue) => {
+      const path = _optionalChain([issue, 'access', _19 => _19.path, 'optionalAccess', _20 => _20.join, 'call', _21 => _21(".")]) || "root";
       return `${path}: ${issue.message}`;
     }).join(", ");
   }
@@ -883,7 +888,7 @@ ${error instanceof Error ? error.stack : JSON.stringify(error)}`
    */
   #startStreamKeepalive(extra, toolName) {
     const config = this.#streamKeepaliveConfig;
-    if (!_optionalChain([config, 'optionalAccess', _21 => _21.enabled])) {
+    if (!_optionalChain([config, 'optionalAccess', _22 => _22.enabled])) {
       return () => {
       };
     }
@@ -903,9 +908,9 @@ ${error instanceof Error ? error.stack : JSON.stringify(error)}`
         );
       });
     }, intervalMs);
-    _optionalChain([timer, 'access', _22 => _22.unref, 'optionalCall', _23 => _23()]);
+    _optionalChain([timer, 'access', _23 => _23.unref, 'optionalCall', _24 => _24()]);
     const stop = () => clearInterval(timer);
-    _optionalChain([extra, 'access', _24 => _24.signal, 'optionalAccess', _25 => _25.addEventListener, 'call', _26 => _26("abort", stop, { once: true })]);
+    _optionalChain([extra, 'access', _25 => _25.signal, 'optionalAccess', _26 => _26.addEventListener, 'call', _27 => _27("abort", stop, { once: true })]);
     return stop;
   }
   async #validateStructuredContent(tool, value, toolName) {
@@ -1106,7 +1111,7 @@ ${error instanceof Error ? error.stack : JSON.stringify(error)}`
         result = await prompt.load(
           args,
           this.#auth,
-          this.#createLoadContext(_optionalChain([request, 'access', _27 => _27.params, 'optionalAccess', _28 => _28._meta]))
+          this.#createLoadContext(_optionalChain([request, 'access', _28 => _28.params, 'optionalAccess', _29 => _29._meta]))
         );
       } catch (error) {
         const errorMessage = error instanceof Error ? error.message : String(error);
@@ -1171,7 +1176,7 @@ ${error instanceof Error ? error.stack : JSON.stringify(error)}`
               const result = await resourceTemplate.load(
                 match,
                 this.#auth,
-                this.#createLoadContext(_optionalChain([request, 'access', _29 => _29.params, 'optionalAccess', _30 => _30._meta]))
+                this.#createLoadContext(_optionalChain([request, 'access', _30 => _30.params, 'optionalAccess', _31 => _31._meta]))
               );
               const resources = Array.isArray(result) ? result : [result];
               return {
@@ -1196,7 +1201,7 @@ ${error instanceof Error ? error.stack : JSON.stringify(error)}`
           try {
             maybeArrayResult = await resource.load(
               this.#auth,
-              this.#createLoadContext(_optionalChain([request, 'access', _31 => _31.params, 'optionalAccess', _32 => _32._meta]))
+              this.#createLoadContext(_optionalChain([request, 'access', _32 => _32.params, 'optionalAccess', _33 => _33._meta]))
             );
           } catch (error) {
             const errorMessage = error instanceof Error ? error.message : String(error);
@@ -1259,7 +1264,7 @@ ${error instanceof Error ? error.stack : JSON.stringify(error)}`
     );
   }
   setupRootsHandlers() {
-    if (_optionalChain([this, 'access', _33 => _33.#rootsConfig, 'optionalAccess', _34 => _34.enabled]) === false) {
+    if (_optionalChain([this, 'access', _34 => _34.#rootsConfig, 'optionalAccess', _35 => _35.enabled]) === false) {
       this.#logger.debug(
         "[FastMCP debug] roots capability explicitly disabled via config"
       );
@@ -1353,7 +1358,7 @@ ${error instanceof Error ? error.stack : JSON.stringify(error)}`
           }
           args = parsed.value;
         }
-        const progressToken = _optionalChain([request, 'access', _35 => _35.params, 'optionalAccess', _36 => _36._meta, 'optionalAccess', _37 => _37.progressToken]);
+        const progressToken = _optionalChain([request, 'access', _36 => _36.params, 'optionalAccess', _37 => _37._meta, 'optionalAccess', _38 => _38.progressToken]);
         let result;
         try {
           const reportProgress = async (progress) => {
@@ -1413,9 +1418,9 @@ ${error instanceof Error ? error.stack : JSON.stringify(error)}`
               elicit: (params, options) => this.#server.elicitInput(params, options),
               log,
               reportProgress,
-              requestId: typeof _optionalChain([request, 'access', _38 => _38.params, 'optionalAccess', _39 => _39._meta, 'optionalAccess', _40 => _40.requestId]) === "string" ? request.params._meta.requestId : void 0,
+              requestId: typeof _optionalChain([request, 'access', _39 => _39.params, 'optionalAccess', _40 => _40._meta, 'optionalAccess', _41 => _41.requestId]) === "string" ? request.params._meta.requestId : void 0,
               session: this.#auth,
-              sessionId: this.#sessionId,
+              sessionId: this.sessionId,
               streamContent
             })
           );
@@ -1529,7 +1534,7 @@ function normalizePath(path) {
   return path.startsWith("/") ? path : `/${path}`;
 }
 function parseBasicAuthHeader(authHeader) {
-  const basicMatch = _optionalChain([authHeader, 'optionalAccess', _41 => _41.match, 'call', _42 => _42(/^Basic\s+(.+)$/)]);
+  const basicMatch = _optionalChain([authHeader, 'optionalAccess', _42 => _42.match, 'call', _43 => _43(/^Basic\s+(.+)$/)]);
   if (!basicMatch) return null;
   try {
     const credentials = Buffer.from(basicMatch[1], "base64").toString("utf-8");
@@ -2014,7 +2019,7 @@ var FastMCP = class extends FastMCPEventEmitter {
           enableJsonResponse: httpConfig.enableJsonResponse,
           eventStore: httpConfig.eventStore,
           host: httpConfig.host,
-          ..._optionalChain([this, 'access', _43 => _43.#options, 'access', _44 => _44.oauth, 'optionalAccess', _45 => _45.enabled]) && _optionalChain([this, 'access', _46 => _46.#options, 'access', _47 => _47.oauth, 'access', _48 => _48.protectedResource, 'optionalAccess', _49 => _49.resource]) ? {
+          ..._optionalChain([this, 'access', _44 => _44.#options, 'access', _45 => _45.oauth, 'optionalAccess', _46 => _46.enabled]) && _optionalChain([this, 'access', _47 => _47.#options, 'access', _48 => _48.oauth, 'access', _49 => _49.protectedResource, 'optionalAccess', _50 => _50.resource]) ? {
             oauth: {
               protectedResource: {
                 resource: this.#options.oauth.protectedResource.resource
@@ -2063,7 +2068,7 @@ var FastMCP = class extends FastMCPEventEmitter {
           enableJsonResponse: httpConfig.enableJsonResponse,
           eventStore: httpConfig.eventStore,
           host: httpConfig.host,
-          ..._optionalChain([this, 'access', _50 => _50.#options, 'access', _51 => _51.oauth, 'optionalAccess', _52 => _52.enabled]) && _optionalChain([this, 'access', _53 => _53.#options, 'access', _54 => _54.oauth, 'access', _55 => _55.protectedResource, 'optionalAccess', _56 => _56.resource]) ? {
+          ..._optionalChain([this, 'access', _51 => _51.#options, 'access', _52 => _52.oauth, 'optionalAccess', _53 => _53.enabled]) && _optionalChain([this, 'access', _54 => _54.#options, 'access', _55 => _55.oauth, 'access', _56 => _56.protectedResource, 'optionalAccess', _57 => _57.resource]) ? {
             oauth: {
               protectedResource: {
                 resource: this.#options.oauth.protectedResource.resource
@@ -2169,7 +2174,7 @@ var FastMCP = class extends FastMCPEventEmitter {
    */
   #createUnauthorizedResponse(message) {
     const oauth = this.#options.oauth;
-    const resource = _optionalChain([oauth, 'optionalAccess', _57 => _57.enabled]) ? _optionalChain([oauth, 'access', _58 => _58.protectedResource, 'optionalAccess', _59 => _59.resource]) : void 0;
+    const resource = _optionalChain([oauth, 'optionalAccess', _58 => _58.enabled]) ? _optionalChain([oauth, 'access', _59 => _59.protectedResource, 'optionalAccess', _60 => _60.resource]) : void 0;
     const wwwAuthenticateParts = [
       'error="invalid_token"',
       `error_description="${message.replace(/"/g, '\\"')}"`
@@ -2281,7 +2286,7 @@ var FastMCP = class extends FastMCPEventEmitter {
       }
     }
     const oauthConfig = this.#options.oauth;
-    if (_optionalChain([oauthConfig, 'optionalAccess', _60 => _60.enabled]) && req.method === "GET") {
+    if (_optionalChain([oauthConfig, 'optionalAccess', _61 => _61.enabled]) && req.method === "GET") {
       const url2 = new URL(req.url || "", `http://${host}`);
       const authorizationServerMetadataPath = joinPaths(
         "",
@@ -2315,8 +2320,8 @@ var FastMCP = class extends FastMCPEventEmitter {
         }
       }
     }
-    const oauthProxy = _optionalChain([oauthConfig, 'optionalAccess', _61 => _61.proxy]);
-    if (oauthProxy && _optionalChain([oauthConfig, 'optionalAccess', _62 => _62.enabled])) {
+    const oauthProxy = _optionalChain([oauthConfig, 'optionalAccess', _62 => _62.proxy]);
+    if (oauthProxy && _optionalChain([oauthConfig, 'optionalAccess', _63 => _63.enabled])) {
       const url2 = new URL(req.url || "", `http://${host}`);
       const oauthPath = basePathRelativePath;
       try {
@@ -2369,7 +2374,7 @@ var FastMCP = class extends FastMCPEventEmitter {
                 const statusCode = error.statusCode || 400;
                 res.writeHead(statusCode, { "Content-Type": "application/json" }).end(
                   JSON.stringify(
-                    _optionalChain([error, 'access', _63 => _63.toJSON, 'optionalCall', _64 => _64()]) || {
+                    _optionalChain([error, 'access', _64 => _64.toJSON, 'optionalCall', _65 => _65()]) || {
                       error: "invalid_request"
                     }
                   )
@@ -2396,7 +2401,7 @@ var FastMCP = class extends FastMCPEventEmitter {
           } catch (error) {
             res.writeHead(400, { "Content-Type": "application/json" }).end(
               JSON.stringify(
-                _optionalChain([error, 'access', _65 => _65.toJSON, 'optionalCall', _66 => _66()]) || {
+                _optionalChain([error, 'access', _66 => _66.toJSON, 'optionalCall', _67 => _67()]) || {
                   error: "invalid_request"
                 }
               )
@@ -2418,7 +2423,7 @@ var FastMCP = class extends FastMCPEventEmitter {
           } catch (error) {
             res.writeHead(400, { "Content-Type": "application/json" }).end(
               JSON.stringify(
-                _optionalChain([error, 'access', _67 => _67.toJSON, 'optionalCall', _68 => _68()]) || {
+                _optionalChain([error, 'access', _68 => _68.toJSON, 'optionalCall', _69 => _69()]) || {
                   error: "server_error"
                 }
               )
@@ -2487,7 +2492,7 @@ var FastMCP = class extends FastMCPEventEmitter {
               } catch (error) {
                 res.writeHead(400, { "Content-Type": "application/json" }).end(
                   JSON.stringify(
-                    _optionalChain([error, 'access', _69 => _69.toJSON, 'optionalCall', _70 => _70()]) || {
+                    _optionalChain([error, 'access', _70 => _70.toJSON, 'optionalCall', _71 => _71()]) || {
                       error: "server_error"
                     }
                   )
@@ -2545,8 +2550,8 @@ var FastMCP = class extends FastMCPEventEmitter {
                 const basicAuth = parseBasicAuthHeader(
                   req.headers.authorization
                 );
-                const clientId = _optionalChain([basicAuth, 'optionalAccess', _71 => _71.clientId]) || params.get("client_id") || "";
-                const clientSecret = _nullishCoalesce(_nullishCoalesce(_optionalChain([basicAuth, 'optionalAccess', _72 => _72.clientSecret]), () => ( params.get("client_secret"))), () => ( void 0));
+                const clientId = _optionalChain([basicAuth, 'optionalAccess', _72 => _72.clientId]) || params.get("client_id") || "";
+                const clientSecret = _nullishCoalesce(_nullishCoalesce(_optionalChain([basicAuth, 'optionalAccess', _73 => _73.clientSecret]), () => ( params.get("client_secret"))), () => ( void 0));
                 let response;
                 if (grantType === "authorization_code") {
                   response = await oauthProxy.exchangeAuthorizationCode({
@@ -2576,7 +2581,7 @@ var FastMCP = class extends FastMCPEventEmitter {
                 const statusCode = error.statusCode || 400;
                 res.writeHead(statusCode, { "Content-Type": "application/json" }).end(
                   JSON.stringify(
-                    _optionalChain([error, 'access', _73 => _73.toJSON, 'optionalCall', _74 => _74()]) || {
+                    _optionalChain([error, 'access', _74 => _74.toJSON, 'optionalCall', _75 => _75()]) || {
                       error: "invalid_request"
                     }
                   )
@@ -2647,23 +2652,23 @@ var FastMCP = class extends FastMCPEventEmitter {
     const envBasePath = process.env.FASTMCP_BASE_PATH;
     const envStateless = process.env.FASTMCP_STATELESS;
     const envHost = process.env.FASTMCP_HOST;
-    const transportType = _optionalChain([overrides, 'optionalAccess', _75 => _75.transportType]) || (transportArg === "http-stream" ? "httpStream" : transportArg) || envTransport || "stdio";
+    const transportType = _optionalChain([overrides, 'optionalAccess', _76 => _76.transportType]) || (transportArg === "http-stream" ? "httpStream" : transportArg) || envTransport || "stdio";
     if (transportType === "httpStream") {
       const port = parseInt(
-        _optionalChain([overrides, 'optionalAccess', _76 => _76.httpStream, 'optionalAccess', _77 => _77.port, 'optionalAccess', _78 => _78.toString, 'call', _79 => _79()]) || portArg || envPort || "8080"
+        _optionalChain([overrides, 'optionalAccess', _77 => _77.httpStream, 'optionalAccess', _78 => _78.port, 'optionalAccess', _79 => _79.toString, 'call', _80 => _80()]) || portArg || envPort || "8080"
       );
-      const host = _optionalChain([overrides, 'optionalAccess', _80 => _80.httpStream, 'optionalAccess', _81 => _81.host]) || hostArg || envHost || "localhost";
-      const endpoint = _optionalChain([overrides, 'optionalAccess', _82 => _82.httpStream, 'optionalAccess', _83 => _83.endpoint]) || endpointArg || envEndpoint || "/mcp";
+      const host = _optionalChain([overrides, 'optionalAccess', _81 => _81.httpStream, 'optionalAccess', _82 => _82.host]) || hostArg || envHost || "localhost";
+      const endpoint = _optionalChain([overrides, 'optionalAccess', _83 => _83.httpStream, 'optionalAccess', _84 => _84.endpoint]) || endpointArg || envEndpoint || "/mcp";
       const basePath = normalizeBasePath(
-        _optionalChain([overrides, 'optionalAccess', _84 => _84.httpStream, 'optionalAccess', _85 => _85.basePath]) || basePathArg || envBasePath
+        _optionalChain([overrides, 'optionalAccess', _85 => _85.httpStream, 'optionalAccess', _86 => _86.basePath]) || basePathArg || envBasePath
       );
-      const enableJsonResponse = _optionalChain([overrides, 'optionalAccess', _86 => _86.httpStream, 'optionalAccess', _87 => _87.enableJsonResponse]) || false;
-      const stateless = _optionalChain([overrides, 'optionalAccess', _88 => _88.httpStream, 'optionalAccess', _89 => _89.stateless]) || statelessArg === "true" || envStateless === "true" || false;
-      const cors = _optionalChain([overrides, 'optionalAccess', _90 => _90.httpStream, 'optionalAccess', _91 => _91.cors]);
-      const eventStore = _optionalChain([overrides, 'optionalAccess', _92 => _92.httpStream, 'optionalAccess', _93 => _93.eventStore]);
-      const sslCa = _optionalChain([overrides, 'optionalAccess', _94 => _94.httpStream, 'optionalAccess', _95 => _95.sslCa]);
-      const sslCert = _optionalChain([overrides, 'optionalAccess', _96 => _96.httpStream, 'optionalAccess', _97 => _97.sslCert]);
-      const sslKey = _optionalChain([overrides, 'optionalAccess', _98 => _98.httpStream, 'optionalAccess', _99 => _99.sslKey]);
+      const enableJsonResponse = _optionalChain([overrides, 'optionalAccess', _87 => _87.httpStream, 'optionalAccess', _88 => _88.enableJsonResponse]) || false;
+      const stateless = _optionalChain([overrides, 'optionalAccess', _89 => _89.httpStream, 'optionalAccess', _90 => _90.stateless]) || statelessArg === "true" || envStateless === "true" || false;
+      const cors = _optionalChain([overrides, 'optionalAccess', _91 => _91.httpStream, 'optionalAccess', _92 => _92.cors]);
+      const eventStore = _optionalChain([overrides, 'optionalAccess', _93 => _93.httpStream, 'optionalAccess', _94 => _94.eventStore]);
+      const sslCa = _optionalChain([overrides, 'optionalAccess', _95 => _95.httpStream, 'optionalAccess', _96 => _96.sslCa]);
+      const sslCert = _optionalChain([overrides, 'optionalAccess', _97 => _97.httpStream, 'optionalAccess', _98 => _98.sslCert]);
+      const sslKey = _optionalChain([overrides, 'optionalAccess', _99 => _99.httpStream, 'optionalAccess', _100 => _100.sslKey]);
       return {
         httpStream: {
           basePath,
@@ -2762,4 +2767,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-6I3JC3FN.cjs.map
+//# sourceMappingURL=chunk-N6ZZF5YB.cjs.map