fastmcp 4.23.7 → 4.23.8

package/dist/{chunk-7WNI6AGD.js → chunk-PLUAEIWE.js}

@@ -1,10 +1,11 @@
 import {
   cancelResponseBody
-} from "./chunk-CA2EPNZF.js";
+} from "./chunk-UY253ACS.js";
 import {
+  objectRootSchema,
   strictInputSchema,
   zodInputSchema
-} from "./chunk-YZ5QEHBX.js";
+} from "./chunk-F76U45MT.js";
 
 // src/FastMCP.ts
 import { Server } from "@modelcontextprotocol/sdk/server/index.js";
@@ -186,9 +187,11 @@ function jsonSchemaAdapter(schema) {
   };
 }
 async function compileSchema(schema) {
+  const dialect = schema.$schema?.replace(/^http:\/\//, "https://").replace(/#$/, "");
+  const isDraft2020 = dialect === "https://json-schema.org/draft/2020-12/schema";
   let ajvModule;
   try {
-    ajvModule = await import("ajv");
+    ajvModule = isDraft2020 ? await import("ajv/dist/2020.js") : await import("ajv");
   } catch {
     throw new Error(
       'The "ajv" package is required to validate JSON Schema tool parameters. Install it with: npm install ajv'
@@ -204,7 +207,7 @@ async function compileSchema(schema) {
     addFormats(ajv);
   } catch {
   }
-  return ajv.compile(schema);
+  return ajv.compile(isDraft2020 ? { ...schema, $schema: dialect } : schema);
 }
 function toIssue(error) {
   const path = error.instancePath.split("/").slice(1).map((segment) => segment.replaceAll("~1", "/").replaceAll("~0", "~")).map((segment) => {
@@ -1571,8 +1574,8 @@ ${error instanceof Error ? error.stack : JSON.stringify(error)}`
             },
             name: tool.name,
             ...tool.outputSchema && {
-              outputSchema: await toJsonSchema(
-                tool.outputSchema
+              outputSchema: objectRootSchema(
+                await toJsonSchema(tool.outputSchema)
               )
             },
             // Pass through _meta for MCP ext-apps UI support (issue #229)
@@ -1745,10 +1748,22 @@ ${error instanceof Error ? error.stack : JSON.stringify(error)}`
           }
         } catch (error) {
           if (error instanceof UserError) {
+            let structuredContent = error.extras;
+            if (structuredContent && tool.outputSchema) {
+              try {
+                structuredContent = await this.#validateStructuredContent(
+                  tool,
+                  structuredContent,
+                  request.params.name
+                );
+              } catch {
+                structuredContent = void 0;
+              }
+            }
             return {
               content: [{ text: error.message, type: "text" }],
               isError: true,
-              ...error.extras ? { structuredContent: error.extras } : {}
+              ...structuredContent ? { structuredContent } : {}
             };
           }
           const errorMessage = error instanceof Error ? error.message : String(error);
@@ -1964,7 +1979,9 @@ var FastMCP = class extends FastMCPEventEmitter {
    * Adds a resource to the server.
    */
   addResource(resource) {
-    this.#resources = this.#resources.filter((r) => r.name !== resource.name);
+    this.#resources = this.#resources.filter(
+      (r) => r.name !== resource.name && r.uri !== resource.uri
+    );
     this.#resources.push(resource);
     if (this.#serverState === "running" /* Running */) {
       this.#resourcesListChanged(this.#resources);
@@ -1974,13 +1991,12 @@ var FastMCP = class extends FastMCPEventEmitter {
    * Adds resources to the server.
    */
   addResources(resources) {
-    const newResourceNames = new Set(
-      resources.map((resource) => resource.name)
-    );
-    this.#resources = this.#resources.filter(
-      (r) => !newResourceNames.has(r.name)
-    );
-    this.#resources.push(...resources);
+    for (const resource of resources) {
+      this.#resources = this.#resources.filter(
+        (r) => r.name !== resource.name && r.uri !== resource.uri
+      );
+      this.#resources.push(resource);
+    }
     if (this.#serverState === "running" /* Running */) {
       this.#resourcesListChanged(this.#resources);
     }
@@ -2028,9 +2044,12 @@ var FastMCP = class extends FastMCPEventEmitter {
    */
   addTools(tools) {
     tools.forEach(assertToolSchemas);
-    const newToolNames = new Set(tools.map((tool) => tool.name));
-    this.#tools = this.#tools.filter((t) => !newToolNames.has(t.name));
-    this.#tools.push(...tools);
+    const toolsByName = new Map(this.#tools.map((tool) => [tool.name, tool]));
+    for (const tool of tools) {
+      toolsByName.delete(tool.name);
+      toolsByName.set(tool.name, tool);
+    }
+    this.#tools = Array.from(toolsByName.values());
     if (this.#serverState === "running" /* Running */) {
       this.#toolsListChanged(this.#tools);
     }
@@ -2332,6 +2351,9 @@ var FastMCP = class extends FastMCPEventEmitter {
         this.#serverState = "running" /* Running */;
       }
     } else if (config.transportType === "httpStream") {
+      if (this.#httpStreamServer) {
+        throw new Error("HTTP server is already running");
+      }
       const httpConfig = config.httpStream;
       const protocol = httpConfig.sslCert || httpConfig.sslKey ? "https" : "http";
       const streamEndpoint = joinPaths(
@@ -2461,6 +2483,7 @@ var FastMCP = class extends FastMCPEventEmitter {
     );
     if (this.#httpStreamServer) {
       await this.#httpStreamServer.close();
+      this.#httpStreamServer = null;
     }
     this.#serverState = "stopped" /* Stopped */;
   }
@@ -3247,4 +3270,4 @@ export {
   FastMCPSession,
   FastMCP
 };
-//# sourceMappingURL=chunk-7WNI6AGD.js.map
+//# sourceMappingURL=chunk-PLUAEIWE.js.map