@mcp-use/client 2.3.1-canary.0 → 2.3.1-canary.2

package/dist/react/index.js

@@ -645,6 +645,9 @@ var BaseConnector = class {
   serverInfoCache = null;
   authorizationCache;
   connected = false;
+  connectPromise = null;
+  disconnectPromise = null;
+  disconnectGeneration = 0;
   opts;
   notificationHandlers = [];
   rootsCache = [];
@@ -907,6 +910,54 @@ var BaseConnector = class {
       "setupElicitationHandler: Elicitation handler registered successfully"
     );
   }
+  /**
+   * Establishes the transport connection and creates the SDK client.
+   *
+   * Coalesces concurrent connection attempts, synchronizes with ongoing
+   * disconnections, and guarantees that orphaned processes or transports
+   * are not leaked on failure or rapid disconnect.
+   *
+   * @returns A promise that resolves when the connector is connected.
+   */
+  async connect() {
+    const generation = this.disconnectGeneration;
+    while (this.disconnectPromise) {
+      await this.disconnectPromise;
+    }
+    if (generation !== this.disconnectGeneration) {
+      throw new Error("Connection cancelled by disconnect");
+    }
+    if (this.connected) {
+      logger.debug("Already connected to MCP implementation");
+      return;
+    }
+    if (this.connectPromise) {
+      return this.connectPromise;
+    }
+    const currentConnect = (async () => {
+      try {
+        await this.establishTransport();
+        if (generation !== this.disconnectGeneration) {
+          throw new Error("Connection cancelled by disconnect");
+        }
+        this.connected = true;
+      } catch (err) {
+        this.connected = false;
+        await this.cleanupResources();
+        throw err;
+      } finally {
+        this.connectPromise = null;
+      }
+    })();
+    this.connectPromise = currentConnect;
+    return this.connectPromise;
+  }
+  /**
+   * Subclasses override this method to perform transport-specific connection logic.
+   * Default implementation is a no-op for backwards compatibility.
+   */
+  async establishTransport() {
+  }
   /**
    * Run one logical MCP operation. HTTP connectors override this host seam to
    * finish an SDK-started interactive OAuth flow and retry exactly once.
@@ -932,17 +983,42 @@ var BaseConnector = class {
   /**
    * Disconnects the SDK client and releases transport resources.
    *
+   * Coalesces concurrent calls and coordinates with in-flight connections
+   * to ensure no child processes or transports are orphaned.
+   *
    * @returns A promise that resolves after cleanup completes.
    */
   async disconnect() {
-    if (!this.connected) {
+    this.disconnectGeneration++;
+    if (this.disconnectPromise) {
+      return this.disconnectPromise;
+    }
+    if (!this.connected && !this.connectPromise) {
       logger.debug("Not connected to MCP implementation");
       return;
     }
-    logger.debug("Disconnecting from MCP implementation");
-    await this.cleanupResources();
-    this.connected = false;
-    logger.debug("Disconnected from MCP implementation");
+    const currentDisconnect = (async () => {
+      let connectFailed = false;
+      try {
+        if (this.connectPromise) {
+          try {
+            await this.connectPromise;
+          } catch {
+            connectFailed = true;
+          }
+        }
+        if (!connectFailed) {
+          logger.debug("Disconnecting from MCP implementation");
+          await this.cleanupResources();
+        }
+        this.connected = false;
+        logger.debug("Disconnected from MCP implementation");
+      } finally {
+        this.disconnectPromise = null;
+      }
+    })();
+    this.disconnectPromise = currentDisconnect;
+    return this.disconnectPromise;
   }
   /** Whether an SDK client currently exists for this connector. */
   get isClientConnected() {
@@ -1639,11 +1715,7 @@ var HttpConnector = class extends BaseConnector {
    * @returns A promise that resolves after protocol negotiation completes.
    * @throws An error with `code: 401` when authentication is required.
    */
-  async connect() {
-    if (this.connected) {
-      logger.debug("Already connected to MCP implementation");
-      return;
-    }
+  async establishTransport() {
     const baseUrl = this.baseUrl;
     logger.debug(`Connecting to MCP implementation via HTTP: ${baseUrl}`);
     const oauthProvider = this.oauthProvider;
@@ -1662,7 +1734,6 @@ var HttpConnector = class extends BaseConnector {
     } catch (err) {
       logger.debug("Streamable HTTP connect failed", err);
       const { fallbackReason, is401Error, httpStatusCode } = this.classifyStreamableHttpFailure(err);
-      await this.cleanupResources();
       if (is401Error) {
         logger.info("Authentication required");
         const authError = new Error("Authentication required");
@@ -1836,7 +1907,6 @@ var HttpConnector = class extends BaseConnector {
           }
         }
       };
-      this.connected = true;
       this.transportType = "streamable-http";
       logger.debug(
         `Successfully connected to MCP implementation via streamable HTTP: ${baseUrl}`
@@ -1905,7 +1975,7 @@ var HttpConnector = class extends BaseConnector {
 };
 
 // src/utils/version.ts
-var VERSION = "2.3.1-canary.0";
+var VERSION = "2.3.1-canary.2";
 function getPackageVersion() {
   return VERSION;
 }
@@ -4725,6 +4795,26 @@ function assert(condition, message) {
     throw new Error(message);
   }
 }
+function serializeClientIcons(icons) {
+  if (icons === void 0) return "null";
+  if (icons.length === 0) return "[]";
+  return JSON.stringify(
+    icons.map((icon) => [
+      icon.src,
+      icon.mimeType === void 0 ? null : icon.mimeType,
+      icon.sizes === void 0 ? null : [...icon.sizes].sort()
+    ])
+  );
+}
+function serializeProxyHeaders(headers, customHeaders) {
+  if (headers === void 0 && customHeaders === void 0) return "";
+  const serializeEntries = (record) => {
+    if (record === void 0) return "null";
+    const keys = Object.keys(record).sort();
+    return JSON.stringify(keys.map((k) => [k, record[k]]));
+  };
+  return `${serializeEntries(headers)}|${serializeEntries(customHeaders)}`;
+}
 async function loadServerIcon(params) {
   try {
     const iconUrl = params.serverInfo.icons?.[0]?.src;
@@ -5171,7 +5261,7 @@ function useMcp(options) {
     storageKeyPrefix = "mcp:auth",
     authProvider: providedAuthProvider,
     headers: headersOption,
-    proxyConfig,
+    proxyConfig: rawProxyConfig,
     oauthProxyUrl: oauthProxyUrlOption,
     connectionMode,
     autoProxyFallback = false,
@@ -5197,6 +5287,34 @@ function useMcp(options) {
     onElicitation: onElicitationOption,
     oauth: oauthOptions
   } = options;
+  const rawClientInfo = options.clientInfo;
+  const clientInfoName = rawClientInfo?.name;
+  const clientInfoTitle = rawClientInfo?.title;
+  const clientInfoVersion = rawClientInfo?.version;
+  const clientInfoDescription = rawClientInfo?.description;
+  const clientInfoWebsiteUrl = rawClientInfo?.websiteUrl;
+  const serializedClientIcons = serializeClientIcons(rawClientInfo?.icons);
+  const clientInfo = useMemo(() => {
+    if (!rawClientInfo) return void 0;
+    return { ...rawClientInfo };
+  }, [
+    clientInfoName,
+    clientInfoTitle,
+    clientInfoVersion,
+    clientInfoDescription,
+    clientInfoWebsiteUrl,
+    serializedClientIcons
+  ]);
+  const rawProxyAddress = rawProxyConfig?.proxyAddress;
+  const serializedProxyHeaders = serializeProxyHeaders(
+    rawProxyConfig?.headers,
+    rawProxyConfig?.customHeaders
+  );
+  const proxyConfig = useMemo(() => {
+    if (!rawProxyConfig) return void 0;
+    return { ...rawProxyConfig };
+  }, [rawProxyAddress, serializedProxyHeaders]);
+  const headers = headersOption ?? {};
   const transportType = "http";
   const requestedProxyAddress = proxyConfig?.proxyAddress;
   const oauthClientId = oauthOptions?.clientId?.trim() || void 0;
@@ -5214,7 +5332,6 @@ function useMcp(options) {
     }
     return inst;
   }, [url, logLevelOption]);
-  const headers = headersOption ?? {};
   const effectiveClientOptions = useMemo(
     () => resolveClientOptions(clientOptions),
     [clientOptions]
@@ -5237,8 +5354,8 @@ function useMcp(options) {
     []
   );
   const mergedClientInfo = useMemo(
-    () => options.clientInfo ? { ...defaultClientInfo, ...options.clientInfo } : defaultClientInfo,
-    [options.clientInfo, defaultClientInfo]
+    () => clientInfo ? { ...defaultClientInfo, ...clientInfo } : defaultClientInfo,
+    [clientInfo, defaultClientInfo]
   );
   const derivedOAuthClientConfig = useMemo(
     () => deriveOAuthClientConfigFromClientInfo(mergedClientInfo),