fastmcp 4.22.7 → 4.22.9

package/dist/{chunk-QICOIGCH.cjs → chunk-YDWOFVQN.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"));
     }
@@ -996,6 +997,9 @@ ${error instanceof Error ? error.stack : JSON.stringify(error)}`
           break;
         }
         await _promises3.setTimeout.call(void 0, retryDelay);
+        if (this.#connectionState === "closed") {
+          return;
+        }
       }
       if (!this.#clientCapabilities) {
         this.#logger.warn(
@@ -1010,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();
@@ -1728,7 +1735,15 @@ function joinPaths(basePath, path) {
   return `${basePath}${normalizePath(path)}`;
 }
 function matchUriTemplate(template, uri) {
-  const match = template.fromUri(uri);
+  let match;
+  try {
+    match = template.fromUri(uri);
+  } catch (error) {
+    if (error instanceof URIError) {
+      return void 0;
+    }
+    throw error;
+  }
   if (!match) {
     return void 0;
   }
@@ -1764,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 {
@@ -2971,8 +3015,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");
@@ -2986,7 +3039,7 @@ 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', _71 => _71.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"
@@ -2997,7 +3050,8 @@ var FastMCP = class extends FastMCPEventEmitter {
         _optionalChain([overrides, 'optionalAccess', _80 => _80.httpStream, 'optionalAccess', _81 => _81.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 stateless = _nullishCoalesce(_nullishCoalesce(_nullishCoalesce(_optionalChain([overrides, 'optionalAccess', _84 => _84.httpStream, 'optionalAccess', _85 => _85.stateless]), () => ( // A bare `--stateless` means `--stateless true`.
+      (statelessArg === "" ? true : parseBooleanSetting(statelessArg, "--stateless")))), () => ( parseBooleanSetting(envStateless, "FASTMCP_STATELESS"))), () => ( false));
       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]);
@@ -3123,4 +3177,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-QICOIGCH.cjs.map
+//# sourceMappingURL=chunk-YDWOFVQN.cjs.map