fastmcp 4.3.2 → 4.5.0

package/dist/{chunk-LWU5CQGW.js → chunk-BTMLQWIR.js}

@@ -599,6 +599,67 @@ ${error instanceof Error ? error.stack : JSON.stringify(error)}`
       });
     });
   }
+  /**
+   * Builds the context object passed as the third argument to
+   * `resource.load` / `resourceTemplate.load` / `prompt.load`.
+   *
+   * This mirrors the `client`, `log`, `requestId`, `session`, and
+   * `sessionId` fields available to `tool.execute` via {@link Context}.
+   * `reportProgress` and `streamContent` are intentionally omitted: they
+   * are tied to a tool call's progress token / streaming notification,
+   * which resource and prompt reads do not have.
+   */
+  #createLoadContext(meta) {
+    return {
+      client: {
+        version: this.#server.getClientVersion()
+      },
+      log: this.#createLog(),
+      requestId: typeof meta?.requestId === "string" ? meta.requestId : void 0,
+      session: this.#auth,
+      sessionId: this.#sessionId
+    };
+  }
+  #createLog() {
+    return {
+      debug: (message, context) => {
+        this.#server.sendLoggingMessage({
+          data: {
+            context,
+            message
+          },
+          level: "debug"
+        });
+      },
+      error: (message, context) => {
+        this.#server.sendLoggingMessage({
+          data: {
+            context,
+            message
+          },
+          level: "error"
+        });
+      },
+      info: (message, context) => {
+        this.#server.sendLoggingMessage({
+          data: {
+            context,
+            message
+          },
+          level: "info"
+        });
+      },
+      warn: (message, context) => {
+        this.#server.sendLoggingMessage({
+          data: {
+            context,
+            message
+          },
+          level: "warning"
+        });
+      }
+    };
+  }
   #formatSchemaIssues(issues) {
     return this.#utils?.formatInvalidParamsErrorMessage ? this.#utils.formatInvalidParamsErrorMessage(issues) : issues.map((issue) => {
       const path = issue.path?.join(".") || "root";
@@ -812,7 +873,8 @@ ${error instanceof Error ? error.stack : JSON.stringify(error)}`
       try {
         result = await prompt.load(
           args,
-          this.#auth
+          this.#auth,
+          this.#createLoadContext(request.params?._meta)
         );
       } catch (error) {
         const errorMessage = error instanceof Error ? error.message : String(error);
@@ -874,7 +936,11 @@ ${error instanceof Error ? error.stack : JSON.stringify(error)}`
                 continue;
               }
               const uri = uriTemplate.fill(match);
-              const result = await resourceTemplate.load(match, this.#auth);
+              const result = await resourceTemplate.load(
+                match,
+                this.#auth,
+                this.#createLoadContext(request.params?._meta)
+              );
               const resources = Array.isArray(result) ? result : [result];
               return {
                 contents: resources.map((resource2) => ({
@@ -896,7 +962,10 @@ ${error instanceof Error ? error.stack : JSON.stringify(error)}`
           }
           let maybeArrayResult;
           try {
-            maybeArrayResult = await resource.load(this.#auth);
+            maybeArrayResult = await resource.load(
+              this.#auth,
+              this.#createLoadContext(request.params?._meta)
+            );
           } catch (error) {
             const errorMessage = error instanceof Error ? error.message : String(error);
             throw new McpError(
@@ -1065,44 +1134,7 @@ ${error instanceof Error ? error.stack : JSON.stringify(error)}`
             );
           }
         };
-        const log = {
-          debug: (message, context) => {
-            this.#server.sendLoggingMessage({
-              data: {
-                context,
-                message
-              },
-              level: "debug"
-            });
-          },
-          error: (message, context) => {
-            this.#server.sendLoggingMessage({
-              data: {
-                context,
-                message
-              },
-              level: "error"
-            });
-          },
-          info: (message, context) => {
-            this.#server.sendLoggingMessage({
-              data: {
-                context,
-                message
-              },
-              level: "info"
-            });
-          },
-          warn: (message, context) => {
-            this.#server.sendLoggingMessage({
-              data: {
-                context,
-                message
-              },
-              level: "warning"
-            });
-          }
-        };
+        const log = this.#createLog();
         const streamContent = async (content) => {
           const contentArray = Array.isArray(content) ? content : [content];
           try {
@@ -1230,6 +1262,20 @@ function convertObjectToSnakeCase(obj) {
   }
   return result;
 }
+function joinPaths(basePath, path) {
+  return `${basePath}${normalizePath(path)}`;
+}
+function normalizeBasePath(path) {
+  if (!path || path === "/") {
+    return "";
+  }
+  const withLeadingSlash = path.startsWith("/") ? path : `/${path}`;
+  const withoutTrailingSlash = withLeadingSlash.replace(/\/+$/, "");
+  return withoutTrailingSlash ? withoutTrailingSlash : "";
+}
+function normalizePath(path) {
+  return path.startsWith("/") ? path : `/${path}`;
+}
 function parseBasicAuthHeader(authHeader) {
   const basicMatch = authHeader?.match(/^Basic\s+(.+)$/);
   if (!basicMatch) return null;
@@ -1242,6 +1288,18 @@ function parseBasicAuthHeader(authHeader) {
     return null;
   }
 }
+function stripBasePath(path, basePath) {
+  if (!basePath) {
+    return path;
+  }
+  if (path === basePath) {
+    return "/";
+  }
+  if (path.startsWith(`${basePath}/`)) {
+    return path.slice(basePath.length);
+  }
+  return null;
+}
 var FastMCPEventEmitterBase = EventEmitter;
 var FastMCPEventEmitter = class extends FastMCPEventEmitterBase {
 };
@@ -1596,9 +1654,13 @@ var FastMCP = class extends FastMCPEventEmitter {
     } else if (config.transportType === "httpStream") {
       const httpConfig = config.httpStream;
       const protocol = httpConfig.sslCert || httpConfig.sslKey ? "https" : "http";
+      const streamEndpoint = joinPaths(
+        httpConfig.basePath,
+        httpConfig.endpoint
+      );
       if (httpConfig.stateless) {
         this.#logger.info(
-          `[FastMCP info] Starting server in stateless mode on HTTP Stream at ${protocol}://${httpConfig.host}:${httpConfig.port}${httpConfig.endpoint}`
+          `[FastMCP info] Starting server in stateless mode on HTTP Stream at ${protocol}://${httpConfig.host}:${httpConfig.port}${streamEndpoint}`
         );
         this.#httpStreamServer = await startHTTPServer({
           ...this.#authenticate ? { authenticate: this.#authenticate } : {},
@@ -1638,7 +1700,8 @@ var FastMCP = class extends FastMCPEventEmitter {
               res,
               true,
               httpConfig.host,
-              httpConfig.endpoint
+              streamEndpoint,
+              httpConfig.basePath
             );
           },
           port: httpConfig.port,
@@ -1646,7 +1709,7 @@ var FastMCP = class extends FastMCPEventEmitter {
           sslCert: httpConfig.sslCert,
           sslKey: httpConfig.sslKey,
           stateless: true,
-          streamEndpoint: httpConfig.endpoint
+          streamEndpoint
         });
       } else {
         this.#httpStreamServer = await startHTTPServer({
@@ -1690,7 +1753,8 @@ var FastMCP = class extends FastMCPEventEmitter {
               res,
               false,
               httpConfig.host,
-              httpConfig.endpoint
+              streamEndpoint,
+              httpConfig.basePath
             );
           },
           port: httpConfig.port,
@@ -1698,10 +1762,10 @@ var FastMCP = class extends FastMCPEventEmitter {
           sslCert: httpConfig.sslCert,
           sslKey: httpConfig.sslKey,
           stateless: httpConfig.stateless,
-          streamEndpoint: httpConfig.endpoint
+          streamEndpoint
         });
         this.#logger.info(
-          `[FastMCP info] server is running on HTTP Stream at ${protocol}://${httpConfig.host}:${httpConfig.port}${httpConfig.endpoint}`
+          `[FastMCP info] server is running on HTTP Stream at ${protocol}://${httpConfig.host}:${httpConfig.port}${streamEndpoint}`
         );
       }
       this.#serverState = "running" /* Running */;
@@ -1751,8 +1815,9 @@ var FastMCP = class extends FastMCPEventEmitter {
   /**
    * Handles unhandled HTTP requests with health, readiness, OAuth endpoints, and custom routes
    */
-  #handleUnhandledRequest = async (req, res, isStateless = false, host, streamEndpoint) => {
+  #handleUnhandledRequest = async (req, res, isStateless = false, host, streamEndpoint, basePath = "") => {
     const url = new URL(req.url || "", `http://${host}`);
+    const basePathRelativePath = stripBasePath(url.pathname, basePath);
     try {
       const webRequest = this.#nodeRequestToWebRequest(req, url);
       const honoResponse = await this.#honoApp.fetch(webRequest, {
@@ -1788,9 +1853,8 @@ var FastMCP = class extends FastMCPEventEmitter {
     const enabled = healthConfig.enabled === void 0 ? true : healthConfig.enabled;
     if (enabled) {
       const path = healthConfig.path ?? "/health";
-      const url2 = new URL(req.url || "", `http://${host}`);
       try {
-        if ((req.method === "GET" || req.method === "HEAD") && url2.pathname === path) {
+        if ((req.method === "GET" || req.method === "HEAD") && url.pathname === joinPaths(basePath, path)) {
           res.writeHead(healthConfig.status ?? 200, {
             "Content-Type": "text/plain"
           }).end(
@@ -1798,7 +1862,7 @@ var FastMCP = class extends FastMCPEventEmitter {
           );
           return;
         }
-        if ((req.method === "GET" || req.method === "HEAD") && url2.pathname === "/ready") {
+        if ((req.method === "GET" || req.method === "HEAD") && url.pathname === joinPaths(basePath, "/ready")) {
           if (isStateless) {
             const response = {
               mode: "stateless",
@@ -1837,7 +1901,11 @@ var FastMCP = class extends FastMCPEventEmitter {
     const oauthConfig = this.#options.oauth;
     if (oauthConfig?.enabled && req.method === "GET") {
       const url2 = new URL(req.url || "", `http://${host}`);
-      if (url2.pathname === "/.well-known/oauth-authorization-server" && oauthConfig.authorizationServer) {
+      const authorizationServerMetadataPath = joinPaths(
+        "",
+        `/.well-known/oauth-authorization-server${basePath}`
+      );
+      if (url2.pathname === authorizationServerMetadataPath && oauthConfig.authorizationServer) {
         const metadata = convertObjectToSnakeCase(
           oauthConfig.authorizationServer
         );
@@ -1868,8 +1936,9 @@ var FastMCP = class extends FastMCPEventEmitter {
     const oauthProxy = oauthConfig?.proxy;
     if (oauthProxy && oauthConfig?.enabled) {
       const url2 = new URL(req.url || "", `http://${host}`);
+      const oauthPath = basePathRelativePath;
       try {
-        if (req.method === "POST" && url2.pathname === "/oauth/register") {
+        if (req.method === "POST" && oauthPath === "/oauth/register") {
           await new Promise((resolve) => {
             let body = "";
             req.on("data", (chunk) => body += chunk);
@@ -1893,7 +1962,7 @@ var FastMCP = class extends FastMCPEventEmitter {
           });
           return;
         }
-        if (req.method === "GET" && url2.pathname === "/oauth/authorize") {
+        if (req.method === "GET" && oauthPath === "/oauth/authorize") {
           try {
             const params = Object.fromEntries(url2.searchParams.entries());
             const response = await oauthProxy.authorize(
@@ -1917,7 +1986,7 @@ var FastMCP = class extends FastMCPEventEmitter {
           }
           return;
         }
-        if (req.method === "GET" && url2.pathname === "/oauth/callback") {
+        if (req.method === "GET" && oauthPath === "/oauth/callback") {
           try {
             const mockRequest = new Request(`http://${host}${req.url}`);
             const response = await oauthProxy.handleCallback(mockRequest);
@@ -1939,14 +2008,14 @@ var FastMCP = class extends FastMCPEventEmitter {
           }
           return;
         }
-        if (req.method === "POST" && url2.pathname === "/oauth/consent") {
+        if (req.method === "POST" && oauthPath === "/oauth/consent") {
           await new Promise((resolve) => {
             let body = "";
             req.on("data", (chunk) => body += chunk);
             req.on("end", async () => {
               try {
                 const mockRequest = new Request(
-                  `http://${host}/oauth/consent`,
+                  `http://${host}${url2.pathname}${url2.search}`,
                   {
                     body,
                     headers: {
@@ -1977,7 +2046,7 @@ var FastMCP = class extends FastMCPEventEmitter {
           });
           return;
         }
-        if (req.method === "POST" && url2.pathname === "/oauth/token") {
+        if (req.method === "POST" && oauthPath === "/oauth/token") {
           await new Promise((resolve) => {
             let body = "";
             req.on("data", (chunk) => body += chunk);
@@ -2081,11 +2150,13 @@ var FastMCP = class extends FastMCPEventEmitter {
     const transportArg = getArg("transport");
     const portArg = getArg("port");
     const endpointArg = getArg("endpoint");
+    const basePathArg = getArg("base-path");
     const statelessArg = getArg("stateless");
     const hostArg = getArg("host");
     const envTransport = process.env.FASTMCP_TRANSPORT;
     const envPort = process.env.FASTMCP_PORT;
     const envEndpoint = process.env.FASTMCP_ENDPOINT;
+    const envBasePath = process.env.FASTMCP_BASE_PATH;
     const envStateless = process.env.FASTMCP_STATELESS;
     const envHost = process.env.FASTMCP_HOST;
     const transportType = overrides?.transportType || (transportArg === "http-stream" ? "httpStream" : transportArg) || envTransport || "stdio";
@@ -2095,6 +2166,9 @@ var FastMCP = class extends FastMCPEventEmitter {
       );
       const host = overrides?.httpStream?.host || hostArg || envHost || "localhost";
       const endpoint = overrides?.httpStream?.endpoint || endpointArg || envEndpoint || "/mcp";
+      const basePath = normalizeBasePath(
+        overrides?.httpStream?.basePath || basePathArg || envBasePath
+      );
       const enableJsonResponse = overrides?.httpStream?.enableJsonResponse || false;
       const stateless = overrides?.httpStream?.stateless || statelessArg === "true" || envStateless === "true" || false;
       const cors = overrides?.httpStream?.cors;
@@ -2104,6 +2178,7 @@ var FastMCP = class extends FastMCPEventEmitter {
       const sslKey = overrides?.httpStream?.sslKey;
       return {
         httpStream: {
+          basePath,
           cors,
           enableJsonResponse,
           endpoint,
@@ -2173,4 +2248,4 @@ export {
   FastMCPSession,
   FastMCP
 };
-//# sourceMappingURL=chunk-LWU5CQGW.js.map
+//# sourceMappingURL=chunk-BTMLQWIR.js.map