fastmcp 4.22.8 → 4.22.10

package/dist/{chunk-44X25GBU.cjs → chunk-RE2YJZA6.cjs}

@@ -668,10 +668,6 @@ var FastMCPSession = class extends FastMCPSessionEventEmitter {
     }
   }
   async close() {
-    this.#connectionState = "closed";
-    if (this.#pingInterval) {
-      clearInterval(this.#pingInterval);
-    }
     this.#abortSession();
     try {
       await this.#server.close();
@@ -828,11 +824,16 @@ ${error instanceof Error ? error.stack : JSON.stringify(error)}`
     });
   }
   /**
-   * Cancels the `signal` held by every tool still executing on this session.
-   * Idempotent, so the close path and the transport's own close handler can
-   * both call it.
+   * Marks the session closed, stops pinging the client and cancels the
+   * `signal` held by every tool still executing on this session. Idempotent,
+   * so the close path and the transport's own close handler can both call it.
    */
   #abortSession() {
+    this.#connectionState = "closed";
+    if (this.#pingInterval) {
+      clearInterval(this.#pingInterval);
+      this.#pingInterval = null;
+    }
     if (!this.#abortController.signal.aborted) {
       this.#abortController.abort(new SessionError("Session closed"));
     }
@@ -1013,6 +1014,9 @@ ${error instanceof Error ? error.stack : JSON.stringify(error)}`
       void this.#loadRoots(true);
     } else {
       await this.#loadRoots(false);
+      if (this.#abortController.signal.aborted) {
+        return;
+      }
     }
     if (this.#clientCapabilities) {
       const pingConfig = this.#getPingConfig();
@@ -1775,6 +1779,35 @@ function parseBasicAuthHeader(authHeader) {
     return null;
   }
 }
+function parseBooleanSetting(value, source) {
+  if (!value) {
+    return void 0;
+  }
+  switch (value.toLowerCase()) {
+    case "false":
+      return false;
+    case "true":
+      return true;
+    default:
+      throw new Error(`${source} must be "true" or "false", got "${value}"`);
+  }
+}
+function parseTransportSetting(value, source) {
+  if (!value) {
+    return void 0;
+  }
+  switch (value.toLowerCase()) {
+    case "http-stream":
+    case "httpstream":
+      return "httpStream";
+    case "stdio":
+      return "stdio";
+    default:
+      throw new Error(
+        `${source} must be "stdio", "httpStream" or "http-stream", got "${value}"`
+      );
+  }
+}
 function protectedResourceMetadataUrl(resource) {
   let url;
   try {
@@ -1972,7 +2005,8 @@ var FastMCP = class extends FastMCPEventEmitter {
    *
    * The transport's lifecycle belongs to the caller: `stop()` does not close
    * transports passed here. Close the returned session (or the transport) when
-   * you are done with it.
+   * you are done with it. If the client hangs up before the session is set up,
+   * the returned session is already closed and is not listed in `sessions`.
    *
    * @param transport - An already-constructed MCP server transport.
    * @param auth - Session auth, equivalent to what `authenticate` would return.
@@ -1980,21 +2014,7 @@ var FastMCP = class extends FastMCPEventEmitter {
    */
   async connect(transport, auth) {
     const session = this.#createSession(auth);
-    await session.connect(transport);
-    this.#sessions.push(session);
-    session.once("error", () => {
-      this.#removeSession(session);
-    });
-    const originalOnClose = transport.onclose;
-    transport.onclose = () => {
-      this.#removeSession(session);
-      if (originalOnClose) {
-        originalOnClose();
-      }
-    };
-    this.emit("connect", {
-      session
-    });
+    await this.#connectSession(session, transport);
     this.#serverState = "running" /* Running */;
     return session;
   }
@@ -2232,7 +2252,6 @@ var FastMCP = class extends FastMCPEventEmitter {
         version: this.#options.version,
         websiteUrl: this.#options.websiteUrl
       });
-      await session.connect(transport);
       let stdinClosed = false;
       const onStdinClose = () => {
         if (stdinClosed) return;
@@ -2244,29 +2263,9 @@ var FastMCP = class extends FastMCPEventEmitter {
       };
       process.stdin.on("close", onStdinClose);
       process.stdin.on("end", onStdinClose);
-      this.#sessions.push(session);
-      session.once("error", () => {
-        this.#removeSession(session);
-      });
-      if (transport.onclose) {
-        const originalOnClose = transport.onclose;
-        transport.onclose = () => {
-          process.stdin.off("close", onStdinClose);
-          process.stdin.off("end", onStdinClose);
-          this.#removeSession(session);
-          if (originalOnClose) {
-            originalOnClose();
-          }
-        };
-      } else {
-        transport.onclose = () => {
-          process.stdin.off("close", onStdinClose);
-          process.stdin.off("end", onStdinClose);
-          this.#removeSession(session);
-        };
-      }
-      this.emit("connect", {
-        session
+      await this.#connectSession(session, transport, () => {
+        process.stdin.off("close", onStdinClose);
+        process.stdin.off("end", onStdinClose);
       });
       this.#serverState = "running" /* Running */;
     } else if (config.transportType === "httpStream") {
@@ -2388,6 +2387,32 @@ var FastMCP = class extends FastMCPEventEmitter {
     }
     this.#serverState = "stopped" /* Stopped */;
   }
+  /**
+   * Connects `session` to `transport` and lists it in `sessions` until the
+   * transport closes. The close is watched from before the session connects,
+   * so a client that hangs up during setup leaves no session behind.
+   */
+  async #connectSession(session, transport, onClose) {
+    let closed = false;
+    const originalOnClose = transport.onclose;
+    transport.onclose = () => {
+      closed = true;
+      _optionalChain([onClose, 'optionalCall', _46 => _46()]);
+      this.#removeSession(session);
+      _optionalChain([originalOnClose, 'optionalCall', _47 => _47()]);
+    };
+    await session.connect(transport);
+    if (closed) {
+      return;
+    }
+    this.#sessions.push(session);
+    session.once("error", () => {
+      this.#removeSession(session);
+    });
+    this.emit("connect", {
+      session
+    });
+  }
   /**
    * Creates a new FastMCPSession instance with the current configuration.
    * Used both for regular sessions and stateless requests.
@@ -2438,7 +2463,7 @@ var FastMCP = class extends FastMCPEventEmitter {
    */
   #createUnauthorizedResponse(message) {
     const oauth = this.#options.oauth;
-    const resource = _optionalChain([oauth, 'optionalAccess', _46 => _46.enabled]) ? _optionalChain([oauth, 'access', _47 => _47.protectedResource, 'optionalAccess', _48 => _48.resource]) : void 0;
+    const resource = _optionalChain([oauth, 'optionalAccess', _48 => _48.enabled]) ? _optionalChain([oauth, 'access', _49 => _49.protectedResource, 'optionalAccess', _50 => _50.resource]) : void 0;
     const wwwAuthenticateParts = [
       'error="invalid_token"',
       `error_description="${message.replace(/"/g, '\\"')}"`
@@ -2577,7 +2602,7 @@ var FastMCP = class extends FastMCPEventEmitter {
       }
     }
     const oauthConfig = this.#options.oauth;
-    if (_optionalChain([oauthConfig, 'optionalAccess', _49 => _49.enabled]) && req.method === "GET") {
+    if (_optionalChain([oauthConfig, 'optionalAccess', _51 => _51.enabled]) && req.method === "GET") {
       const url2 = new URL(req.url || "", `http://${host}`);
       const authorizationServerMetadataPath = joinPaths(
         "",
@@ -2611,8 +2636,8 @@ var FastMCP = class extends FastMCPEventEmitter {
         }
       }
     }
-    const oauthProxy = _optionalChain([oauthConfig, 'optionalAccess', _50 => _50.proxy]);
-    if (oauthProxy && _optionalChain([oauthConfig, 'optionalAccess', _51 => _51.enabled])) {
+    const oauthProxy = _optionalChain([oauthConfig, 'optionalAccess', _52 => _52.proxy]);
+    if (oauthProxy && _optionalChain([oauthConfig, 'optionalAccess', _53 => _53.enabled])) {
       const url2 = new URL(req.url || "", `http://${host}`);
       const oauthPath = basePathRelativePath;
       try {
@@ -2665,7 +2690,7 @@ var FastMCP = class extends FastMCPEventEmitter {
                 const statusCode = error.statusCode || 400;
                 res.writeHead(statusCode, OAUTH_CREDENTIAL_RESPONSE_HEADERS).end(
                   JSON.stringify(
-                    _optionalChain([error, 'access', _52 => _52.toJSON, 'optionalCall', _53 => _53()]) || {
+                    _optionalChain([error, 'access', _54 => _54.toJSON, 'optionalCall', _55 => _55()]) || {
                       error: "invalid_request"
                     }
                   )
@@ -2692,7 +2717,7 @@ var FastMCP = class extends FastMCPEventEmitter {
           } catch (error) {
             res.writeHead(400, { "Content-Type": "application/json" }).end(
               JSON.stringify(
-                _optionalChain([error, 'access', _54 => _54.toJSON, 'optionalCall', _55 => _55()]) || {
+                _optionalChain([error, 'access', _56 => _56.toJSON, 'optionalCall', _57 => _57()]) || {
                   error: "invalid_request"
                 }
               )
@@ -2714,7 +2739,7 @@ var FastMCP = class extends FastMCPEventEmitter {
           } catch (error) {
             res.writeHead(400, { "Content-Type": "application/json" }).end(
               JSON.stringify(
-                _optionalChain([error, 'access', _56 => _56.toJSON, 'optionalCall', _57 => _57()]) || {
+                _optionalChain([error, 'access', _58 => _58.toJSON, 'optionalCall', _59 => _59()]) || {
                   error: "server_error"
                 }
               )
@@ -2783,7 +2808,7 @@ var FastMCP = class extends FastMCPEventEmitter {
               } catch (error) {
                 res.writeHead(400, { "Content-Type": "application/json" }).end(
                   JSON.stringify(
-                    _optionalChain([error, 'access', _58 => _58.toJSON, 'optionalCall', _59 => _59()]) || {
+                    _optionalChain([error, 'access', _60 => _60.toJSON, 'optionalCall', _61 => _61()]) || {
                       error: "server_error"
                     }
                   )
@@ -2841,8 +2866,8 @@ var FastMCP = class extends FastMCPEventEmitter {
                 const basicAuth = parseBasicAuthHeader(
                   req.headers.authorization
                 );
-                const clientId = _optionalChain([basicAuth, 'optionalAccess', _60 => _60.clientId]) || params.get("client_id") || "";
-                const clientSecret = _nullishCoalesce(_nullishCoalesce(_optionalChain([basicAuth, 'optionalAccess', _61 => _61.clientSecret]), () => ( params.get("client_secret"))), () => ( void 0));
+                const clientId = _optionalChain([basicAuth, 'optionalAccess', _62 => _62.clientId]) || params.get("client_id") || "";
+                const clientSecret = _nullishCoalesce(_nullishCoalesce(_optionalChain([basicAuth, 'optionalAccess', _63 => _63.clientSecret]), () => ( params.get("client_secret"))), () => ( void 0));
                 let response;
                 if (grantType === "authorization_code") {
                   response = await oauthProxy.exchangeAuthorizationCode({
@@ -2872,7 +2897,7 @@ var FastMCP = class extends FastMCPEventEmitter {
                 const statusCode = error.statusCode || 400;
                 res.writeHead(statusCode, OAUTH_CREDENTIAL_RESPONSE_HEADERS).end(
                   JSON.stringify(
-                    _optionalChain([error, 'access', _62 => _62.toJSON, 'optionalCall', _63 => _63()]) || {
+                    _optionalChain([error, 'access', _64 => _64.toJSON, 'optionalCall', _65 => _65()]) || {
                       error: "invalid_request"
                     }
                   )
@@ -2898,7 +2923,7 @@ var FastMCP = class extends FastMCPEventEmitter {
    * regardless (RFC 7235), so no config is needed just to get the header.
    */
   #httpStreamOAuthConfig() {
-    const resource = _optionalChain([this, 'access', _64 => _64.#options, 'access', _65 => _65.oauth, 'optionalAccess', _66 => _66.enabled]) ? _optionalChain([this, 'access', _67 => _67.#options, 'access', _68 => _68.oauth, 'access', _69 => _69.protectedResource, 'optionalAccess', _70 => _70.resource]) : void 0;
+    const resource = _optionalChain([this, 'access', _66 => _66.#options, 'access', _67 => _67.oauth, 'optionalAccess', _68 => _68.enabled]) ? _optionalChain([this, 'access', _69 => _69.#options, 'access', _70 => _70.oauth, 'access', _71 => _71.protectedResource, 'optionalAccess', _72 => _72.resource]) : void 0;
     if (!resource) {
       return {};
     }
@@ -2982,8 +3007,17 @@ var FastMCP = class extends FastMCPEventEmitter {
   #parseRuntimeConfig(overrides) {
     const args = process.argv.slice(2);
     const getArg = (name) => {
-      const index = args.findIndex((arg) => arg === `--${name}`);
-      return index !== -1 && index + 1 < args.length ? args[index + 1] : void 0;
+      const index = args.findIndex(
+        (arg) => arg === `--${name}` || arg.startsWith(`--${name}=`)
+      );
+      if (index === -1) {
+        return void 0;
+      }
+      if (args[index] !== `--${name}`) {
+        return args[index].slice(name.length + 3);
+      }
+      const value = args[index + 1];
+      return value === void 0 || value.startsWith("--") ? "" : value;
     };
     const transportArg = getArg("transport");
     const portArg = getArg("port");
@@ -2997,23 +3031,24 @@ 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', _71 => _71.transportType]) || (transportArg === "http-stream" ? "httpStream" : transportArg) || envTransport || "stdio";
+    const transportType = _optionalChain([overrides, 'optionalAccess', _73 => _73.transportType]) || parseTransportSetting(transportArg, "--transport") || parseTransportSetting(envTransport, "FASTMCP_TRANSPORT") || "stdio";
     if (transportType === "httpStream") {
       const port = parseInt(
-        _optionalChain([overrides, 'optionalAccess', _72 => _72.httpStream, 'optionalAccess', _73 => _73.port, 'optionalAccess', _74 => _74.toString, 'call', _75 => _75()]) || portArg || envPort || "8080"
+        _optionalChain([overrides, 'optionalAccess', _74 => _74.httpStream, 'optionalAccess', _75 => _75.port, 'optionalAccess', _76 => _76.toString, 'call', _77 => _77()]) || portArg || envPort || "8080"
       );
-      const host = _optionalChain([overrides, 'optionalAccess', _76 => _76.httpStream, 'optionalAccess', _77 => _77.host]) || hostArg || envHost || "localhost";
-      const endpoint = _optionalChain([overrides, 'optionalAccess', _78 => _78.httpStream, 'optionalAccess', _79 => _79.endpoint]) || endpointArg || envEndpoint || "/mcp";
+      const host = _optionalChain([overrides, 'optionalAccess', _78 => _78.httpStream, 'optionalAccess', _79 => _79.host]) || hostArg || envHost || "localhost";
+      const endpoint = _optionalChain([overrides, 'optionalAccess', _80 => _80.httpStream, 'optionalAccess', _81 => _81.endpoint]) || endpointArg || envEndpoint || "/mcp";
       const basePath = normalizeBasePath(
-        _optionalChain([overrides, 'optionalAccess', _80 => _80.httpStream, 'optionalAccess', _81 => _81.basePath]) || basePathArg || envBasePath
+        _optionalChain([overrides, 'optionalAccess', _82 => _82.httpStream, 'optionalAccess', _83 => _83.basePath]) || basePathArg || envBasePath
       );
-      const enableJsonResponse = _optionalChain([overrides, 'optionalAccess', _82 => _82.httpStream, 'optionalAccess', _83 => _83.enableJsonResponse]) || false;
-      const stateless = _nullishCoalesce(_optionalChain([overrides, 'optionalAccess', _84 => _84.httpStream, 'optionalAccess', _85 => _85.stateless]), () => ( (statelessArg !== void 0 ? statelessArg === "true" : envStateless === "true")));
-      const cors = _optionalChain([overrides, 'optionalAccess', _86 => _86.httpStream, 'optionalAccess', _87 => _87.cors]);
-      const eventStore = _optionalChain([overrides, 'optionalAccess', _88 => _88.httpStream, 'optionalAccess', _89 => _89.eventStore]);
-      const sslCa = _optionalChain([overrides, 'optionalAccess', _90 => _90.httpStream, 'optionalAccess', _91 => _91.sslCa]);
-      const sslCert = _optionalChain([overrides, 'optionalAccess', _92 => _92.httpStream, 'optionalAccess', _93 => _93.sslCert]);
-      const sslKey = _optionalChain([overrides, 'optionalAccess', _94 => _94.httpStream, 'optionalAccess', _95 => _95.sslKey]);
+      const enableJsonResponse = _optionalChain([overrides, 'optionalAccess', _84 => _84.httpStream, 'optionalAccess', _85 => _85.enableJsonResponse]) || false;
+      const stateless = _nullishCoalesce(_nullishCoalesce(_nullishCoalesce(_optionalChain([overrides, 'optionalAccess', _86 => _86.httpStream, 'optionalAccess', _87 => _87.stateless]), () => ( // A bare `--stateless` means `--stateless true`.
+      (statelessArg === "" ? true : parseBooleanSetting(statelessArg, "--stateless")))), () => ( parseBooleanSetting(envStateless, "FASTMCP_STATELESS"))), () => ( false));
+      const cors = _optionalChain([overrides, 'optionalAccess', _88 => _88.httpStream, 'optionalAccess', _89 => _89.cors]);
+      const eventStore = _optionalChain([overrides, 'optionalAccess', _90 => _90.httpStream, 'optionalAccess', _91 => _91.eventStore]);
+      const sslCa = _optionalChain([overrides, 'optionalAccess', _92 => _92.httpStream, 'optionalAccess', _93 => _93.sslCa]);
+      const sslCert = _optionalChain([overrides, 'optionalAccess', _94 => _94.httpStream, 'optionalAccess', _95 => _95.sslCert]);
+      const sslKey = _optionalChain([overrides, 'optionalAccess', _96 => _96.httpStream, 'optionalAccess', _97 => _97.sslKey]);
       return {
         httpStream: {
           basePath,
@@ -3105,7 +3140,7 @@ var FastMCP = class extends FastMCPEventEmitter {
    */
   #useEndpointAsResource(endpoint) {
     const oauth = this.#options.oauth;
-    if (this.#providerResourceBase === void 0 || !_optionalChain([oauth, 'optionalAccess', _96 => _96.protectedResource]))
+    if (this.#providerResourceBase === void 0 || !_optionalChain([oauth, 'optionalAccess', _98 => _98.protectedResource]))
       return;
     this.#options = {
       ...this.#options,
@@ -3134,4 +3169,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-44X25GBU.cjs.map
+//# sourceMappingURL=chunk-RE2YJZA6.cjs.map