fastmcp 4.20.8 → 4.20.10

package/dist/FastMCP.cjs

@@ -11,7 +11,7 @@
 
 
 
-var _chunkHTMIU2GUcjs = require('./chunk-HTMIU2GU.cjs');
+var _chunk27HK2PAJcjs = require('./chunk-27HK2PAJ.cjs');
 
 
 
@@ -24,7 +24,7 @@ var _chunkHTMIU2GUcjs = require('./chunk-HTMIU2GU.cjs');
 
 
 
-var _chunkYO76IUZ6cjs = require('./chunk-YO76IUZ6.cjs');
+var _chunkBTXI2HQScjs = require('./chunk-BTXI2HQS.cjs');
 
 
 
@@ -49,5 +49,5 @@ var _chunkYO76IUZ6cjs = require('./chunk-YO76IUZ6.cjs');
 
 
 
-exports.AuthProvider = _chunkYO76IUZ6cjs.AuthProvider; exports.AzureProvider = _chunkYO76IUZ6cjs.AzureProvider; exports.DiscoveryDocumentCache = _chunkHTMIU2GUcjs.DiscoveryDocumentCache; exports.FastMCP = _chunkHTMIU2GUcjs.FastMCP; exports.FastMCPError = _chunkHTMIU2GUcjs.FastMCPError; exports.FastMCPSession = _chunkHTMIU2GUcjs.FastMCPSession; exports.GitHubProvider = _chunkYO76IUZ6cjs.GitHubProvider; exports.GoogleProvider = _chunkYO76IUZ6cjs.GoogleProvider; exports.MEDIA_FETCH_TIMEOUT_MS = _chunkHTMIU2GUcjs.MEDIA_FETCH_TIMEOUT_MS; exports.OAuthProvider = _chunkYO76IUZ6cjs.OAuthProvider; exports.ServerState = _chunkHTMIU2GUcjs.ServerState; exports.SessionError = _chunkHTMIU2GUcjs.SessionError; exports.UnexpectedStateError = _chunkHTMIU2GUcjs.UnexpectedStateError; exports.UserError = _chunkHTMIU2GUcjs.UserError; exports.audioContent = _chunkHTMIU2GUcjs.audioContent; exports.getAuthSession = _chunkYO76IUZ6cjs.getAuthSession; exports.imageContent = _chunkHTMIU2GUcjs.imageContent; exports.jsonSchemaAdapter = _chunkHTMIU2GUcjs.jsonSchemaAdapter; exports.requireAll = _chunkYO76IUZ6cjs.requireAll; exports.requireAny = _chunkYO76IUZ6cjs.requireAny; exports.requireAuth = _chunkYO76IUZ6cjs.requireAuth; exports.requireRole = _chunkYO76IUZ6cjs.requireRole; exports.requireScopes = _chunkYO76IUZ6cjs.requireScopes;
+exports.AuthProvider = _chunkBTXI2HQScjs.AuthProvider; exports.AzureProvider = _chunkBTXI2HQScjs.AzureProvider; exports.DiscoveryDocumentCache = _chunk27HK2PAJcjs.DiscoveryDocumentCache; exports.FastMCP = _chunk27HK2PAJcjs.FastMCP; exports.FastMCPError = _chunk27HK2PAJcjs.FastMCPError; exports.FastMCPSession = _chunk27HK2PAJcjs.FastMCPSession; exports.GitHubProvider = _chunkBTXI2HQScjs.GitHubProvider; exports.GoogleProvider = _chunkBTXI2HQScjs.GoogleProvider; exports.MEDIA_FETCH_TIMEOUT_MS = _chunk27HK2PAJcjs.MEDIA_FETCH_TIMEOUT_MS; exports.OAuthProvider = _chunkBTXI2HQScjs.OAuthProvider; exports.ServerState = _chunk27HK2PAJcjs.ServerState; exports.SessionError = _chunk27HK2PAJcjs.SessionError; exports.UnexpectedStateError = _chunk27HK2PAJcjs.UnexpectedStateError; exports.UserError = _chunk27HK2PAJcjs.UserError; exports.audioContent = _chunk27HK2PAJcjs.audioContent; exports.getAuthSession = _chunkBTXI2HQScjs.getAuthSession; exports.imageContent = _chunk27HK2PAJcjs.imageContent; exports.jsonSchemaAdapter = _chunk27HK2PAJcjs.jsonSchemaAdapter; exports.requireAll = _chunkBTXI2HQScjs.requireAll; exports.requireAny = _chunkBTXI2HQScjs.requireAny; exports.requireAuth = _chunkBTXI2HQScjs.requireAuth; exports.requireRole = _chunkBTXI2HQScjs.requireRole; exports.requireScopes = _chunkBTXI2HQScjs.requireScopes;
 //# sourceMappingURL=FastMCP.cjs.map

package/dist/FastMCP.d.cts

@@ -916,8 +916,13 @@ declare class FastMCPSession<T extends FastMCPSessionAuth = FastMCPSessionAuth>
      */
     get sessionId(): string | undefined;
     set sessionId(value: string | undefined);
-    constructor({ auth, icons, instructions, logger, name, onToolCall, ping, prompts, resources, resourcesTemplates, roots, sessionId, stateless, streamKeepalive, title, tools, transportType, utils, version, websiteUrl, }: {
+    constructor({ auth, hasTools, icons, instructions, logger, name, onToolCall, ping, prompts, resources, resourcesTemplates, roots, sessionId, stateless, streamKeepalive, title, tools, transportType, utils, version, websiteUrl, }: {
         auth?: T;
+        /**
+         * Whether the server has any tools at all, including ones this session's
+         * `canAccess` filtering removed from `tools`. Defaults to `tools.length > 0`.
+         */
+        hasTools?: boolean;
         icons?: Icon[];
         instructions?: string;
         logger: Logger;

package/dist/FastMCP.d.ts

@@ -916,8 +916,13 @@ declare class FastMCPSession<T extends FastMCPSessionAuth = FastMCPSessionAuth>
      */
     get sessionId(): string | undefined;
     set sessionId(value: string | undefined);
-    constructor({ auth, icons, instructions, logger, name, onToolCall, ping, prompts, resources, resourcesTemplates, roots, sessionId, stateless, streamKeepalive, title, tools, transportType, utils, version, websiteUrl, }: {
+    constructor({ auth, hasTools, icons, instructions, logger, name, onToolCall, ping, prompts, resources, resourcesTemplates, roots, sessionId, stateless, streamKeepalive, title, tools, transportType, utils, version, websiteUrl, }: {
         auth?: T;
+        /**
+         * Whether the server has any tools at all, including ones this session's
+         * `canAccess` filtering removed from `tools`. Defaults to `tools.length > 0`.
+         */
+        hasTools?: boolean;
         icons?: Icon[];
         instructions?: string;
         logger: Logger;

package/dist/FastMCP.js

@@ -11,7 +11,7 @@ import {
   audioContent,
   imageContent,
   jsonSchemaAdapter
-} from "./chunk-XYUWODT6.js";
+} from "./chunk-A5IEOE6F.js";
 import {
   AuthProvider,
   AzureProvider,
@@ -24,7 +24,7 @@ import {
   requireAuth,
   requireRole,
   requireScopes
-} from "./chunk-LRXZYGFR.js";
+} from "./chunk-YRIK6EIY.js";
 export {
   AuthProvider,
   AzureProvider,

package/dist/auth/index.cjs

@@ -24,7 +24,7 @@
 
 
 
-var _chunkYO76IUZ6cjs = require('../chunk-YO76IUZ6.cjs');
+var _chunkBTXI2HQScjs = require('../chunk-BTXI2HQS.cjs');
 
 
 
@@ -51,5 +51,5 @@ var _chunkYO76IUZ6cjs = require('../chunk-YO76IUZ6.cjs');
 
 
 
-exports.AuthProvider = _chunkYO76IUZ6cjs.AuthProvider; exports.AzureProvider = _chunkYO76IUZ6cjs.AzureProvider; exports.ConsentManager = _chunkYO76IUZ6cjs.ConsentManager; exports.DEFAULT_ACCESS_TOKEN_TTL = _chunkYO76IUZ6cjs.DEFAULT_ACCESS_TOKEN_TTL; exports.DEFAULT_ACCESS_TOKEN_TTL_NO_REFRESH = _chunkYO76IUZ6cjs.DEFAULT_ACCESS_TOKEN_TTL_NO_REFRESH; exports.DEFAULT_AUTHORIZATION_CODE_TTL = _chunkYO76IUZ6cjs.DEFAULT_AUTHORIZATION_CODE_TTL; exports.DEFAULT_REFRESH_TOKEN_TTL = _chunkYO76IUZ6cjs.DEFAULT_REFRESH_TOKEN_TTL; exports.DEFAULT_TRANSACTION_TTL = _chunkYO76IUZ6cjs.DEFAULT_TRANSACTION_TTL; exports.DiskStore = _chunkYO76IUZ6cjs.DiskStore; exports.EncryptedTokenStorage = _chunkYO76IUZ6cjs.EncryptedTokenStorage; exports.GitHubProvider = _chunkYO76IUZ6cjs.GitHubProvider; exports.GoogleProvider = _chunkYO76IUZ6cjs.GoogleProvider; exports.JWKSVerifier = _chunkYO76IUZ6cjs.JWKSVerifier; exports.JWTIssuer = _chunkYO76IUZ6cjs.JWTIssuer; exports.MemoryTokenStorage = _chunkYO76IUZ6cjs.MemoryTokenStorage; exports.OAuthProvider = _chunkYO76IUZ6cjs.OAuthProvider; exports.OAuthProxy = _chunkYO76IUZ6cjs.OAuthProxy; exports.OAuthProxyError = _chunkYO76IUZ6cjs.OAuthProxyError; exports.PKCEUtils = _chunkYO76IUZ6cjs.PKCEUtils; exports.getAuthSession = _chunkYO76IUZ6cjs.getAuthSession; exports.requireAll = _chunkYO76IUZ6cjs.requireAll; exports.requireAny = _chunkYO76IUZ6cjs.requireAny; exports.requireAuth = _chunkYO76IUZ6cjs.requireAuth; exports.requireRole = _chunkYO76IUZ6cjs.requireRole; exports.requireScopes = _chunkYO76IUZ6cjs.requireScopes;
+exports.AuthProvider = _chunkBTXI2HQScjs.AuthProvider; exports.AzureProvider = _chunkBTXI2HQScjs.AzureProvider; exports.ConsentManager = _chunkBTXI2HQScjs.ConsentManager; exports.DEFAULT_ACCESS_TOKEN_TTL = _chunkBTXI2HQScjs.DEFAULT_ACCESS_TOKEN_TTL; exports.DEFAULT_ACCESS_TOKEN_TTL_NO_REFRESH = _chunkBTXI2HQScjs.DEFAULT_ACCESS_TOKEN_TTL_NO_REFRESH; exports.DEFAULT_AUTHORIZATION_CODE_TTL = _chunkBTXI2HQScjs.DEFAULT_AUTHORIZATION_CODE_TTL; exports.DEFAULT_REFRESH_TOKEN_TTL = _chunkBTXI2HQScjs.DEFAULT_REFRESH_TOKEN_TTL; exports.DEFAULT_TRANSACTION_TTL = _chunkBTXI2HQScjs.DEFAULT_TRANSACTION_TTL; exports.DiskStore = _chunkBTXI2HQScjs.DiskStore; exports.EncryptedTokenStorage = _chunkBTXI2HQScjs.EncryptedTokenStorage; exports.GitHubProvider = _chunkBTXI2HQScjs.GitHubProvider; exports.GoogleProvider = _chunkBTXI2HQScjs.GoogleProvider; exports.JWKSVerifier = _chunkBTXI2HQScjs.JWKSVerifier; exports.JWTIssuer = _chunkBTXI2HQScjs.JWTIssuer; exports.MemoryTokenStorage = _chunkBTXI2HQScjs.MemoryTokenStorage; exports.OAuthProvider = _chunkBTXI2HQScjs.OAuthProvider; exports.OAuthProxy = _chunkBTXI2HQScjs.OAuthProxy; exports.OAuthProxyError = _chunkBTXI2HQScjs.OAuthProxyError; exports.PKCEUtils = _chunkBTXI2HQScjs.PKCEUtils; exports.getAuthSession = _chunkBTXI2HQScjs.getAuthSession; exports.requireAll = _chunkBTXI2HQScjs.requireAll; exports.requireAny = _chunkBTXI2HQScjs.requireAny; exports.requireAuth = _chunkBTXI2HQScjs.requireAuth; exports.requireRole = _chunkBTXI2HQScjs.requireRole; exports.requireScopes = _chunkBTXI2HQScjs.requireScopes;
 //# sourceMappingURL=index.cjs.map

package/dist/auth/index.js

@@ -24,7 +24,7 @@ import {
   requireAuth,
   requireRole,
   requireScopes
-} from "../chunk-LRXZYGFR.js";
+} from "../chunk-YRIK6EIY.js";
 export {
   AuthProvider,
   AzureProvider,

package/dist/{chunk-HTMIU2GU.cjs → chunk-27HK2PAJ.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 _chunkYO76IUZ6cjs = require('./chunk-YO76IUZ6.cjs');
+var _chunkBTXI2HQScjs = require('./chunk-BTXI2HQS.cjs');
 
 // src/FastMCP.ts
 var _indexjs = require('@modelcontextprotocol/sdk/server/index.js');
@@ -131,7 +131,7 @@ var DiscoveryDocumentCache = class {
       throw error;
     }
     if (!res.ok) {
-      await _chunkYO76IUZ6cjs.cancelResponseBody.call(void 0, res);
+      await _chunkBTXI2HQScjs.cancelResponseBody.call(void 0, res);
       throw new Error(
         `Failed to fetch discovery document from ${url}: ${res.status} ${res.statusText}`
       );
@@ -227,7 +227,7 @@ var imageContent = async (input) => {
           signal: AbortSignal.timeout(timeoutMs)
         });
         if (!response.ok) {
-          await _chunkYO76IUZ6cjs.cancelResponseBody.call(void 0, response);
+          await _chunkBTXI2HQScjs.cancelResponseBody.call(void 0, response);
           throw new Error(
             `Server responded with status: ${response.status} - ${response.statusText}`
           );
@@ -289,7 +289,7 @@ var audioContent = async (input) => {
           signal: AbortSignal.timeout(timeoutMs)
         });
         if (!response.ok) {
-          await _chunkYO76IUZ6cjs.cancelResponseBody.call(void 0, response);
+          await _chunkBTXI2HQScjs.cancelResponseBody.call(void 0, response);
           throw new Error(
             `Server responded with status: ${response.status} - ${response.statusText}`
           );
@@ -556,9 +556,11 @@ var FastMCPSession = class extends FastMCPSessionEventEmitter {
    * to interested clients only.
    */
   #subscriptions = /* @__PURE__ */ new Set();
+  #transportType;
   #utils;
   constructor({
     auth,
+    hasTools,
     icons,
     instructions,
     logger,
@@ -588,8 +590,10 @@ var FastMCPSession = class extends FastMCPSessionEventEmitter {
     this.#sessionId = sessionId;
     this.#stateless = stateless;
     this.#streamKeepaliveConfig = streamKeepalive;
+    this.#transportType = transportType;
     this.#needsEventLoopFlush = transportType === "httpStream";
-    if (tools.length) {
+    const supportsTools = _nullishCoalesce(hasTools, () => ( tools.length > 0));
+    if (supportsTools) {
       this.#capabilities.tools = {};
     }
     if (resources.length || resourcesTemplates.length) {
@@ -618,7 +622,7 @@ var FastMCPSession = class extends FastMCPSessionEventEmitter {
     this.setupLoggingHandlers();
     this.setupRootsHandlers();
     this.setupCompleteHandlers();
-    if (tools.length) {
+    if (supportsTools) {
       this.setupToolHandlers(tools);
     }
     if (resources.length || resourcesTemplates.length) {
@@ -692,7 +696,7 @@ ${e instanceof Error ? e.stack : JSON.stringify(e)}`
         }
       }
       if (this.#clientCapabilities) {
-        const pingConfig = this.#getPingConfig(transport);
+        const pingConfig = this.#getPingConfig();
         if (pingConfig.enabled) {
           this.#pingInterval = setInterval(async () => {
             if (this.#pingInFlight) {
@@ -916,14 +920,9 @@ ${error instanceof Error ? error.stack : JSON.stringify(error)}`
       return `${path}: ${issue.message}`;
     }).join(", ");
   }
-  #getPingConfig(transport) {
+  #getPingConfig() {
     const pingConfig = this.#pingConfig || {};
-    let defaultEnabled = false;
-    if ("type" in transport) {
-      if (transport.type === "httpStream") {
-        defaultEnabled = true;
-      }
-    }
+    const defaultEnabled = this.#transportType === "httpStream";
     return {
       enabled: pingConfig.enabled !== void 0 ? pingConfig.enabled : defaultEnabled,
       intervalMs: pingConfig.intervalMs || 5e3,
@@ -1836,9 +1835,15 @@ var FastMCP = class extends FastMCPEventEmitter {
       const result = await directResource.load();
       const results = Array.isArray(result) ? result : [result];
       const firstResult = results[0];
+      if (!firstResult) {
+        throw new UnexpectedStateError(
+          `Resource returned no contents: ${uri}`,
+          { uri }
+        );
+      }
       const resourceData = {
-        mimeType: directResource.mimeType,
-        uri
+        mimeType: _nullishCoalesce(firstResult.mimeType, () => ( directResource.mimeType)),
+        uri: _nullishCoalesce(firstResult.uri, () => ( uri))
       };
       if ("text" in firstResult) {
         resourceData.text = firstResult.text;
@@ -1857,15 +1862,23 @@ var FastMCP = class extends FastMCPEventEmitter {
       const result = await template.load(
         params
       );
+      const results = Array.isArray(result) ? result : [result];
+      const firstResult = results[0];
+      if (!firstResult) {
+        throw new UnexpectedStateError(
+          `Resource returned no contents: ${uri}`,
+          { uri }
+        );
+      }
       const resourceData = {
-        mimeType: template.mimeType,
-        uri
+        mimeType: _nullishCoalesce(firstResult.mimeType, () => ( template.mimeType)),
+        uri: _nullishCoalesce(firstResult.uri, () => ( uri))
       };
-      if ("text" in result) {
-        resourceData.text = result.text;
+      if ("text" in firstResult) {
+        resourceData.text = firstResult.text;
       }
-      if ("blob" in result) {
-        resourceData.blob = result.blob;
+      if ("blob" in firstResult) {
+        resourceData.blob = firstResult.blob;
       }
       return resourceData;
     }
@@ -2203,6 +2216,7 @@ var FastMCP = class extends FastMCPEventEmitter {
     ) : this.#tools;
     return new FastMCPSession({
       auth,
+      hasTools: this.#tools.length > 0,
       icons: this.#options.icons,
       instructions: this.#options.instructions,
       logger: this.#logger,
@@ -2913,4 +2927,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-HTMIU2GU.cjs.map
+//# sourceMappingURL=chunk-27HK2PAJ.cjs.map