@mcp-use/client 2.2.1-canary.0 → 2.2.2-canary.0

package/dist/react/index.js

@@ -1901,7 +1901,7 @@ var HttpConnector = class extends BaseConnector {
 };
 
 // src/utils/version.ts
-var VERSION = "2.2.1-canary.0";
+var VERSION = "2.2.2-canary.0";
 function getPackageVersion() {
   return VERSION;
 }
@@ -4007,6 +4007,12 @@ var BaseMCPClient = class {
    * Map of server names to their active sessions.
    */
   sessions = {};
+  /**
+   * Tracks teardown by session identity so overlapping cleanup paths share the
+   * same disconnect. In particular, createSession() can replace a session while
+   * closeSession() is already disconnecting it.
+   */
+  sessionDisconnects = /* @__PURE__ */ new WeakMap();
   /**
    * List of server names that have active sessions.
    * This array is kept in sync with the sessions map and can be used
@@ -4040,6 +4046,15 @@ var BaseMCPClient = class {
       this.config = config;
     }
   }
+  disconnectSession(session) {
+    const existingDisconnect = this.sessionDisconnects.get(session);
+    if (existingDisconnect) {
+      return existingDisconnect;
+    }
+    const disconnect = Promise.resolve().then(() => session.disconnect());
+    this.sessionDisconnects.set(session, disconnect);
+    return disconnect;
+  }
   /**
    * Creates a client instance from a configuration dictionary.
    *
@@ -4268,7 +4283,7 @@ var BaseMCPClient = class {
     if (previous && previous !== session) {
       try {
         logger.debug(`Disconnecting replaced session for server ${serverName}`);
-        await previous.disconnect();
+        await this.disconnectSession(previous);
       } catch (e) {
         logger.error(
           `Error disconnecting replaced session for server '${serverName}': ${e}`
@@ -4453,7 +4468,7 @@ var BaseMCPClient = class {
     }
     try {
       logger.debug(`Closing session for server ${serverName}`);
-      await session.disconnect();
+      await this.disconnectSession(session);
     } catch (e) {
       logger.error(`Error closing session for server '${serverName}': ${e}`);
     } finally {
@@ -5849,6 +5864,66 @@ function useMcp(options) {
           addLog("debug", "Server capabilities:", capabilities2);
           setCapabilities(capabilities2);
         }
+        if (authProviderRef.current) {
+          let tokens;
+          try {
+            tokens = await authProviderRef.current.tokens?.();
+          } catch (error2) {
+            addLog("warn", "Failed to read OAuth tokens:", error2);
+            tokens = void 0;
+          }
+          if (!isMountedRef.current) {
+            addLog(
+              "debug",
+              "Connection aborted after token fetch for auth tokens - component unmounted"
+            );
+            return "failed";
+          }
+          if (tokens?.access_token) {
+            if (authorizationRef.current?.mode === "mixed") {
+              const authenticatedAuthorization = {
+                ...authorizationRef.current,
+                authenticated: true
+              };
+              setAuthorization(authenticatedAuthorization);
+              authorizationRef.current = authenticatedAuthorization;
+            }
+            const expiresAt = getOAuthTokenExpiry(tokens);
+            let tokenEndpoint = null;
+            let resource = null;
+            let clientCreds = null;
+            try {
+              tokenEndpoint = await authProviderRef.current.getTokenEndpoint?.() ?? null;
+            } catch {
+              tokenEndpoint = null;
+            }
+            try {
+              resource = await authProviderRef.current.getResource?.() ?? null;
+            } catch {
+              resource = null;
+            }
+            try {
+              clientCreds = await authProviderRef.current.getClientCredentials?.() ?? null;
+            } catch {
+              clientCreds = null;
+            }
+            if (!isMountedRef.current) {
+              addLog("debug", "Skipping state update - component unmounted");
+              return "failed";
+            }
+            setAuthTokens({
+              access_token: tokens.access_token,
+              token_type: tokens.token_type || "Bearer",
+              expires_at: expiresAt,
+              refresh_token: tokens.refresh_token,
+              scope: tokens.scope,
+              ...tokenEndpoint ? { token_endpoint: tokenEndpoint } : {},
+              ...resource ? { resource } : {},
+              ...clientCreds?.client_id ? { client_id: clientCreds.client_id } : {},
+              ...clientCreds?.client_secret ? { client_secret: clientCreds.client_secret } : {}
+            });
+          }
+        }
         successfulTransportRef.current = transportTypeParam;
         setState("ready");
         const discoverAuthorizationAfterReady = () => {
@@ -5914,66 +5989,6 @@ function useMcp(options) {
             setSkills([]);
           }
         }
-        if (authProviderRef.current) {
-          let tokens;
-          try {
-            tokens = await authProviderRef.current.tokens?.();
-          } catch (error2) {
-            addLog("warn", "Failed to read OAuth tokens:", error2);
-            tokens = void 0;
-          }
-          if (!isMountedRef.current) {
-            addLog(
-              "debug",
-              "Connection aborted after token fetch for auth tokens - component unmounted"
-            );
-            return "failed";
-          }
-          if (tokens?.access_token) {
-            if (authorizationRef.current?.mode === "mixed") {
-              const authenticatedAuthorization = {
-                ...authorizationRef.current,
-                authenticated: true
-              };
-              setAuthorization(authenticatedAuthorization);
-              authorizationRef.current = authenticatedAuthorization;
-            }
-            const expiresAt = getOAuthTokenExpiry(tokens);
-            let tokenEndpoint = null;
-            let resource = null;
-            let clientCreds = null;
-            try {
-              tokenEndpoint = await authProviderRef.current.getTokenEndpoint?.() ?? null;
-            } catch {
-              tokenEndpoint = null;
-            }
-            try {
-              resource = await authProviderRef.current.getResource?.() ?? null;
-            } catch {
-              resource = null;
-            }
-            try {
-              clientCreds = await authProviderRef.current.getClientCredentials?.() ?? null;
-            } catch {
-              clientCreds = null;
-            }
-            if (!isMountedRef.current) {
-              addLog("debug", "Skipping state update - component unmounted");
-              return "failed";
-            }
-            setAuthTokens({
-              access_token: tokens.access_token,
-              token_type: tokens.token_type || "Bearer",
-              expires_at: expiresAt,
-              refresh_token: tokens.refresh_token,
-              scope: tokens.scope,
-              ...tokenEndpoint ? { token_endpoint: tokenEndpoint } : {},
-              ...resource ? { resource } : {},
-              ...clientCreds?.client_id ? { client_id: clientCreds.client_id } : {},
-              ...clientCreds?.client_secret ? { client_secret: clientCreds.client_secret } : {}
-            });
-          }
-        }
         return "success";
       } catch (err) {
         const error2 = err;