fastmcp 4.23.4 → 4.23.6

package/dist/{chunk-G6TNGO7A.js → chunk-5QKBH7JC.js}

@@ -9,19 +9,24 @@ import {
 import { Server } from "@modelcontextprotocol/sdk/server/index.js";
 import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js";
 import {
+  AudioContentSchema,
   CallToolRequestSchema,
   CompleteRequestSchema,
+  EmbeddedResourceSchema,
   ErrorCode,
   GetPromptRequestSchema,
+  ImageContentSchema,
   ListPromptsRequestSchema,
   ListResourcesRequestSchema,
   ListResourceTemplatesRequestSchema,
   ListToolsRequestSchema,
   McpError,
   ReadResourceRequestSchema,
+  ResourceLinkSchema,
   RootsListChangedNotificationSchema,
   SetLevelRequestSchema,
   SubscribeRequestSchema,
+  TextContentSchema,
   UnsubscribeRequestSchema
 } from "@modelcontextprotocol/sdk/types.js";
 import { EventEmitter } from "events";
@@ -220,6 +225,16 @@ function unwrapDefault(value) {
 
 // src/FastMCP.ts
 var MEDIA_FETCH_TIMEOUT_MS = 3e4;
+var isSvg = (buffer) => {
+  let text = buffer.toString("utf8").trimStart();
+  const preamble = /^(?:<\?[\s\S]*?\?>|<!--[\s\S]*?-->|<!DOCTYPE\s[^[>]*(?:\[[\s\S]*?\]\s*)?>)/;
+  let match = preamble.exec(text);
+  while (match) {
+    text = text.slice(match[0].length).trimStart();
+    match = preamble.exec(text);
+  }
+  return /^<svg(?:\s|\/?>)/.test(text);
+};
 var imageContent = async (input) => {
   let rawData;
   try {
@@ -262,16 +277,17 @@ var imageContent = async (input) => {
       );
     }
     const { fileTypeFromBuffer } = await import("file-type");
-    const mimeType = await fileTypeFromBuffer(rawData);
-    if (!mimeType || !mimeType.mime.startsWith("image/")) {
+    const fileType = await fileTypeFromBuffer(rawData);
+    const mimeType = (!fileType || fileType.mime === "application/xml") && isSvg(rawData) ? "image/svg+xml" : fileType?.mime;
+    if (!mimeType || !mimeType.startsWith("image/")) {
       console.warn(
-        `Warning: Content may not be a valid image. Detected MIME: ${mimeType?.mime || "unknown"}`
+        `Warning: Content may not be a valid image. Detected MIME: ${mimeType || "unknown"}`
       );
     }
     const base64Data = rawData.toString("base64");
     return {
       data: base64Data,
-      mimeType: mimeType?.mime ?? "image/png",
+      mimeType: mimeType ?? "image/png",
       type: "image"
     };
   } catch (error) {
@@ -282,8 +298,27 @@ var imageContent = async (input) => {
     }
   }
 };
+var AUDIO_CONTAINER_TYPES = /* @__PURE__ */ new Map([
+  ["video/3gpp", "audio/3gpp"],
+  ["video/3gpp2", "audio/3gpp2"],
+  ["video/matroska", "audio/matroska"],
+  ["video/mp4", "audio/mp4"],
+  ["video/ogg", "audio/ogg"],
+  ["video/webm", "audio/webm"]
+]);
+var resolveAudioMimeType = (detected, declared) => {
+  if (detected?.startsWith("audio/")) {
+    return detected;
+  }
+  const declaredMime = declared?.split(";", 1)[0].trim().toLowerCase();
+  if (declaredMime?.startsWith("audio/")) {
+    return declaredMime;
+  }
+  return (detected && AUDIO_CONTAINER_TYPES.get(detected)) ?? detected;
+};
 var audioContent = async (input) => {
   let rawData;
+  let declaredMimeType = null;
   try {
     if ("url" in input) {
       const timeoutMs = input.timeoutMs ?? MEDIA_FETCH_TIMEOUT_MS;
@@ -297,6 +332,7 @@ var audioContent = async (input) => {
             `Server responded with status: ${response.status} - ${response.statusText}`
           );
         }
+        declaredMimeType = response.headers.get("content-type");
         rawData = Buffer.from(await response.arrayBuffer());
       } catch (error) {
         if (error instanceof Error && (error.name === "AbortError" || error.name === "TimeoutError")) {
@@ -324,16 +360,17 @@ var audioContent = async (input) => {
       );
     }
     const { fileTypeFromBuffer } = await import("file-type");
-    const mimeType = await fileTypeFromBuffer(rawData);
-    if (!mimeType || !mimeType.mime.startsWith("audio/")) {
+    const detected = await fileTypeFromBuffer(rawData);
+    const mimeType = resolveAudioMimeType(detected?.mime, declaredMimeType);
+    if (!mimeType || !mimeType.startsWith("audio/")) {
       console.warn(
-        `Warning: Content may not be a valid audio file. Detected MIME: ${mimeType?.mime || "unknown"}`
+        `Warning: Content may not be a valid audio file. Detected MIME: ${mimeType || "unknown"}`
       );
     }
     const base64Data = rawData.toString("base64");
     return {
       data: base64Data,
-      mimeType: mimeType?.mime ?? "audio/mpeg",
+      mimeType: mimeType ?? "audio/mpeg",
       type: "audio"
     };
   } catch (error) {
@@ -381,55 +418,20 @@ function assertToolSchemas(tool) {
 }
 var STREAM_KEEPALIVE_LOGGER = "fastmcp-keepalive";
 var STREAM_KEEPALIVE_DEFAULT_INTERVAL_MS = 2e4;
-var TextContentZodSchema = z.object({
-  /**
-   * The text content of the message.
-   */
-  text: z.string(),
-  type: z.literal("text")
+var TextContentZodSchema = TextContentSchema.strict();
+var ImageContentZodSchema = ImageContentSchema.extend({
+  data: z.string().base64()
 }).strict();
-var ImageContentZodSchema = z.object({
-  /**
-   * The base64-encoded image data.
-   */
-  data: z.string().base64(),
-  /**
-   * The MIME type of the image. Different providers may support different image types.
-   */
-  mimeType: z.string(),
-  type: z.literal("image")
-}).strict();
-var AudioContentZodSchema = z.object({
-  /**
-   * The base64-encoded audio data.
-   */
-  data: z.string().base64(),
-  mimeType: z.string(),
-  type: z.literal("audio")
-}).strict();
-var ResourceContentZodSchema = z.object({
-  resource: z.object({
-    blob: z.string().optional(),
-    mimeType: z.string().optional(),
-    text: z.string().optional(),
-    uri: z.string()
-  }),
-  type: z.literal("resource")
+var AudioContentZodSchema = AudioContentSchema.extend({
+  data: z.string().base64()
 }).strict();
-var ResourceLinkZodSchema = z.object({
-  description: z.string().optional(),
-  mimeType: z.string().optional(),
-  name: z.string(),
-  title: z.string().optional(),
-  type: z.literal("resource_link"),
-  uri: z.string()
-});
+var ResourceContentZodSchema = EmbeddedResourceSchema.strict();
 var ContentZodSchema = z.discriminatedUnion("type", [
   TextContentZodSchema,
   ImageContentZodSchema,
   AudioContentZodSchema,
   ResourceContentZodSchema,
-  ResourceLinkZodSchema
+  ResourceLinkSchema
 ]);
 var ContentResultZodSchema = z.object({
   _meta: z.record(z.string(), z.unknown()).optional(),
@@ -575,6 +577,7 @@ var FastMCPSession = class extends FastMCPSessionEventEmitter {
    * to interested clients only.
    */
   #subscriptions = /* @__PURE__ */ new Set();
+  #tools;
   #transportType;
   /**
    * Capabilities this session has already warned about in `#canRefresh`, so a
@@ -583,6 +586,7 @@ var FastMCPSession = class extends FastMCPSessionEventEmitter {
    */
   #unnegotiatedWarnings = /* @__PURE__ */ new Set();
   #utils;
+  #visibleTools = [];
   constructor({
     auth,
     authRequired = false,
@@ -617,6 +621,7 @@ var FastMCPSession = class extends FastMCPSessionEventEmitter {
     this.#sessionId = sessionId;
     this.#stateless = stateless;
     this.#streamKeepaliveConfig = streamKeepalive;
+    this.#tools = tools;
     this.#transportType = transportType;
     this.#needsEventLoopFlush = transportType === "httpStream";
     const supportsTools = hasTools ?? tools.length > 0;
@@ -650,7 +655,9 @@ var FastMCPSession = class extends FastMCPSessionEventEmitter {
     this.setupRootsHandlers();
     this.setupCompleteHandlers();
     if (supportsTools) {
-      this.setupToolHandlers(tools);
+      this.setupToolHandlers(
+        toolsVisibleTo(tools, this.#auth, this.#authRequired)
+      );
     }
     if (resources.length || resourcesTemplates.length) {
       for (const resource of resources) {
@@ -771,6 +778,7 @@ ${error instanceof Error ? error.stack : JSON.stringify(error)}`
     if (!this.#canRefresh("tools")) {
       return;
     }
+    this.#tools = tools;
     this.setupToolHandlers(
       toolsVisibleTo(tools, this.#auth, this.#authRequired)
     );
@@ -795,6 +803,11 @@ ${error instanceof Error ? error.stack : JSON.stringify(error)}`
    */
   updateAuth(auth) {
     this.#auth = auth;
+    const tools = toolsVisibleTo(this.#tools, auth, this.#authRequired);
+    if (tools.length !== this.#visibleTools.length || tools.some((tool, index) => tool !== this.#visibleTools[index])) {
+      this.setupToolHandlers(tools);
+      this.triggerListChangedNotification("notifications/tools/list_changed");
+    }
   }
   waitForReady() {
     if (this.isReady) {
@@ -872,31 +885,31 @@ ${error instanceof Error ? error.stack : JSON.stringify(error)}`
    * are tied to a tool call's progress token / streaming notification,
    * which resource and prompt reads do not have.
    */
-  #createLoadContext(meta) {
+  #createLoadContext(meta, sendNotification) {
     return {
       client: {
         version: this.#server.getClientVersion()
       },
       elicit: (params, options) => this.#server.elicitInput(params, options),
-      log: this.#createLog(),
+      log: this.#createLog(sendNotification),
       requestId: typeof meta?.requestId === "string" ? meta.requestId : void 0,
       session: this.#auth,
       sessionId: this.sessionId
     };
   }
-  #createLog() {
+  #createLog(sendNotification) {
     return {
       debug: (message, context) => {
-        this.#sendLog("debug", message, context);
+        this.#sendLog(sendNotification, "debug", message, context);
       },
       error: (message, context) => {
-        this.#sendLog("error", message, context);
+        this.#sendLog(sendNotification, "error", message, context);
       },
       info: (message, context) => {
-        this.#sendLog("info", message, context);
+        this.#sendLog(sendNotification, "info", message, context);
       },
       warn: (message, context) => {
-        this.#sendLog("warning", message, context);
+        this.#sendLog(sendNotification, "warning", message, context);
       }
     };
   }
@@ -962,22 +975,23 @@ ${e instanceof Error ? e.stack : JSON.stringify(e)}`
     }
   }
   /**
-   * `sendLoggingMessage` rejects once the client has hung up, and these four
+   * Sending rejects once the client has hung up, and these four
    * callers are synchronous, so the rejection has nowhere to go. Swallow it the
    * way every other notification sender in this class does, or a client that
    * disconnects mid-tool takes the server process down with it.
    */
-  #sendLog(level, message, context) {
+  #sendLog(sendNotification, level, message, context) {
     if (this.#loggingLevel && LOGGING_LEVEL_SEVERITY[level] < LOGGING_LEVEL_SEVERITY[this.#loggingLevel]) {
       return;
     }
-    this.#server.sendLoggingMessage({
+    const params = {
       data: {
         context,
         message
       },
       level
-    }).catch((error) => {
+    };
+    sendNotification({ method: "notifications/message", params }).catch(() => this.#server.sendLoggingMessage(params)).catch((error) => {
       this.#logger.error(
         `[FastMCP error] failed to send ${level} log notification.
 
@@ -1288,54 +1302,60 @@ ${error instanceof Error ? error.stack : JSON.stringify(error)}`
         prompts: cachedPromptsList
       };
     });
-    this.#server.setRequestHandler(GetPromptRequestSchema, async (request) => {
-      const prompt = this.#prompts.get(request.params.name);
-      if (!prompt) {
-        throw new McpError(
-          ErrorCode.InvalidParams,
-          `Unknown prompt: ${request.params.name}`
-        );
-      }
-      const args = request.params.arguments;
-      for (const arg of prompt.arguments ?? []) {
-        if (arg.required && !(args && Object.hasOwn(args, arg.name))) {
+    this.#server.setRequestHandler(
+      GetPromptRequestSchema,
+      async (request, extra) => {
+        const prompt = this.#prompts.get(request.params.name);
+        if (!prompt) {
           throw new McpError(
             ErrorCode.InvalidParams,
-            `Prompt '${request.params.name}' requires argument '${arg.name}': ${arg.description || "No description provided"}`
+            `Unknown prompt: ${request.params.name}`
           );
         }
+        const args = request.params.arguments;
+        for (const arg of prompt.arguments ?? []) {
+          if (arg.required && !(args && Object.hasOwn(args, arg.name))) {
+            throw new McpError(
+              ErrorCode.InvalidParams,
+              `Prompt '${request.params.name}' requires argument '${arg.name}': ${arg.description || "No description provided"}`
+            );
+          }
+        }
+        let result;
+        try {
+          result = await prompt.load(
+            args ?? {},
+            this.#auth,
+            this.#createLoadContext(
+              request.params?._meta,
+              extra.sendNotification
+            )
+          );
+        } catch (error) {
+          const errorMessage = error instanceof Error ? error.message : String(error);
+          throw new McpError(
+            ErrorCode.InternalError,
+            `Failed to load prompt '${request.params.name}': ${errorMessage}`
+          );
+        }
+        if (typeof result === "string") {
+          return {
+            description: prompt.description,
+            messages: [
+              {
+                content: { text: result, type: "text" },
+                role: "user"
+              }
+            ]
+          };
+        } else {
+          return {
+            description: prompt.description,
+            messages: result.messages
+          };
+        }
       }
-      let result;
-      try {
-        result = await prompt.load(
-          args ?? {},
-          this.#auth,
-          this.#createLoadContext(request.params?._meta)
-        );
-      } catch (error) {
-        const errorMessage = error instanceof Error ? error.message : String(error);
-        throw new McpError(
-          ErrorCode.InternalError,
-          `Failed to load prompt '${request.params.name}': ${errorMessage}`
-        );
-      }
-      if (typeof result === "string") {
-        return {
-          description: prompt.description,
-          messages: [
-            {
-              content: { text: result, type: "text" },
-              role: "user"
-            }
-          ]
-        };
-      } else {
-        return {
-          description: prompt.description,
-          messages: result.messages
-        };
-      }
-    });
+    );
   }
   setupResourceHandlers() {
     let cachedResourcesList = null;
@@ -1359,7 +1379,7 @@ ${error instanceof Error ? error.stack : JSON.stringify(error)}`
     });
     this.#server.setRequestHandler(
       ReadResourceRequestSchema,
-      async (request) => {
+      async (request, extra) => {
         if ("uri" in request.params) {
           const resource = this.#resources.get(request.params.uri);
           if (!resource) {
@@ -1375,7 +1395,10 @@ ${error instanceof Error ? error.stack : JSON.stringify(error)}`
               const result = await resourceTemplate.load(
                 match,
                 this.#auth,
-                this.#createLoadContext(request.params?._meta)
+                this.#createLoadContext(
+                  request.params?._meta,
+                  extra.sendNotification
+                )
               );
               const resources = Array.isArray(result) ? result : [result];
               return {
@@ -1401,7 +1424,10 @@ ${error instanceof Error ? error.stack : JSON.stringify(error)}`
           try {
             maybeArrayResult = await resource.load(
               this.#auth,
-              this.#createLoadContext(request.params?._meta)
+              this.#createLoadContext(
+                request.params?._meta,
+                extra.sendNotification
+              )
             );
           } catch (error) {
             const errorMessage = error instanceof Error ? error.message : String(error);
@@ -1501,6 +1527,7 @@ ${error instanceof Error ? error.stack : JSON.stringify(error)}`
     }
   }
   setupToolHandlers(tools) {
+    this.#visibleTools = tools;
     const toolsMap = new Map(tools.map((tool) => [tool.name, tool]));
     let cachedToolsList = null;
     this.#server.setRequestHandler(ListToolsRequestSchema, async () => {
@@ -1583,7 +1610,7 @@ ${error instanceof Error ? error.stack : JSON.stringify(error)}`
               );
             }
           };
-          const log = this.#createLog();
+          const log = this.#createLog(extra.sendNotification);
           const streamContent = async (content) => {
             const contentArray = Array.isArray(content) ? content : [content];
             try {
@@ -2247,7 +2274,7 @@ var FastMCP = class extends FastMCPEventEmitter {
         roots: this.#options.roots,
         streamKeepalive: this.#options.streamKeepalive,
         title: this.#options.title,
-        tools: toolsVisibleTo(this.#tools, auth, authRequired),
+        tools: this.#tools,
         transportType: "stdio",
         utils: this.#options.utils,
         version: this.#options.version,
@@ -2458,7 +2485,7 @@ var FastMCP = class extends FastMCPEventEmitter {
       stateless,
       streamKeepalive: this.#options.streamKeepalive,
       title: this.#options.title,
-      tools: toolsVisibleTo(this.#tools, auth, authRequired),
+      tools: this.#tools,
       transportType: "httpStream",
       utils: this.#options.utils,
       version: this.#options.version,
@@ -3186,4 +3213,4 @@ export {
   FastMCPSession,
   FastMCP
 };
-//# sourceMappingURL=chunk-G6TNGO7A.js.map
+//# sourceMappingURL=chunk-5QKBH7JC.js.map