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

package/dist/index.js

@@ -469,6 +469,9 @@ var init_base = __esm({
       serverInfoCache = null;
       authorizationCache;
       connected = false;
+      connectPromise = null;
+      disconnectPromise = null;
+      disconnectGeneration = 0;
       opts;
       notificationHandlers = [];
       rootsCache = [];
@@ -731,6 +734,54 @@ var init_base = __esm({
           "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.
@@ -756,17 +807,42 @@ var init_base = __esm({
       /**
        * 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() {
@@ -1351,11 +1427,7 @@ var init_stdio = __esm({
        *
        * @returns A promise that resolves after protocol negotiation completes.
        */
-      async connect() {
-        if (this.connected) {
-          logger.debug("Already connected to MCP implementation");
-          return;
-        }
+      async establishTransport() {
         logger.debug(`Connecting to MCP implementation via stdio: ${this.command}`);
         try {
           const serverParams = {
@@ -1423,7 +1495,6 @@ var init_stdio = __esm({
           );
           await this.client.connect(transport);
           this.setupRoundProgressForwarding();
-          this.connected = true;
           this.setupNotificationHandler();
           logger.debug(
             `Successfully connected to MCP implementation: ${this.command}`
@@ -1435,7 +1506,6 @@ var init_stdio = __esm({
           });
         } catch (err) {
           logger.error(`Failed to connect to MCP implementation: ${err}`);
-          await this.cleanupResources();
           throw err;
         }
       }
@@ -1527,7 +1597,7 @@ init_connector_telemetry();
 init_logging();
 
 // src/utils/version.ts
-var VERSION = "2.3.1-canary.0";
+var VERSION = "2.3.1-canary.2";
 function getPackageVersion() {
   return VERSION;
 }
@@ -3272,11 +3342,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;
@@ -3295,7 +3361,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");
@@ -3469,7 +3534,6 @@ var HttpConnector = class extends BaseConnector {
           }
         }
       };
-      this.connected = true;
       this.transportType = "streamable-http";
       logger.debug(
         `Successfully connected to MCP implementation via streamable HTTP: ${baseUrl}`
@@ -5426,11 +5490,7 @@ var CodeModeConnector = class extends BaseConnector {
     this.connected = true;
     this._tools = this._createToolsList();
   }
-  async connect() {
-    this.connected = true;
-  }
-  async disconnect() {
-    this.connected = false;
+  async establishTransport() {
   }
   get publicIdentifier() {
     return { name: "code_mode", version: "1.0.0" };