@mcp-ts/sdk 2.4.3 → 2.4.4

package/dist/index.js

@@ -2224,7 +2224,7 @@ var MCPClient = class {
    * @param options - Client configuration options
    */
   constructor(options) {
-    __publicField(this, "client", null);
+    __publicField(this, "client");
     __publicField(this, "oauthProvider", null);
     __publicField(this, "transport", null);
     __publicField(this, "userId");
@@ -2265,6 +2265,21 @@ var MCPClient = class {
     this.clientUri = options.clientUri;
     this.logoUri = options.logoUri;
     this.policyUri = options.policyUri;
+    this.client = new index_js.Client(
+      {
+        name: MCP_CLIENT_NAME,
+        version: MCP_CLIENT_VERSION
+      },
+      {
+        capabilities: {
+          extensions: {
+            "io.modelcontextprotocol/ui": {
+              mimeTypes: ["text/html+mcp"]
+            }
+          }
+        }
+      }
+    );
   }
   /**
    * Emit a connection state change event
@@ -2390,13 +2405,12 @@ var MCPClient = class {
     }
   }
   /**
-   * Initializes client components (client, transport, OAuth provider)
-   * Loads missing configuration from Redis session store if needed
-   * This method is idempotent and safe to call multiple times
+   * Ensures session metadata and OAuth provider are loaded.
+   * Does NOT create the SDK Client — callers that need one create it themselves.
    * @private
    */
-  async initialize() {
-    if (this.client && this.oauthProvider) {
+  async ensureSession() {
+    if (this.oauthProvider) {
       return;
     }
     this.emitStateChange("INITIALIZING");
@@ -2439,23 +2453,6 @@ var MCPClient = class {
         }
       });
     }
-    if (!this.client) {
-      this.client = new index_js.Client(
-        {
-          name: MCP_CLIENT_NAME,
-          version: MCP_CLIENT_VERSION
-        },
-        {
-          capabilities: {
-            extensions: {
-              "io.modelcontextprotocol/ui": {
-                mimeTypes: ["text/html+mcp"]
-              }
-            }
-          }
-        }
-      );
-    }
     if (existingSession === null) {
       existingSession = await sessions.get(this.userId, this.sessionId);
     }
@@ -2572,17 +2569,16 @@ var MCPClient = class {
    * @throws {Error} When connection fails for other reasons
    */
   async connect() {
-    if (this.client?.transport) {
+    if (this.client.transport) {
       this.transport = null;
       try {
         await this.client.close();
       } catch {
       }
-      this.client = null;
     }
-    await this.initialize();
-    if (!this.client || !this.oauthProvider) {
-      const error = "Client or OAuth provider not initialized";
+    await this.ensureSession();
+    if (!this.oauthProvider) {
+      const error = "OAuth provider not initialized";
       this.emitError(error, "connection");
       this.emitStateChange("FAILED");
       throw new Error(error);
@@ -2649,7 +2645,7 @@ var MCPClient = class {
   async finishAuth(authCode, state) {
     this.emitStateChange("AUTHENTICATING");
     this.emitProgress("Exchanging authorization code for tokens...");
-    await this.initialize();
+    await this.ensureSession();
     if (!this.oauthProvider) {
       const error = "OAuth provider not initialized";
       this.emitError(error, "auth");
@@ -2949,13 +2945,12 @@ var MCPClient = class {
       return await fn();
     } catch (error) {
       if (!(error instanceof Error && error.message.includes("MCP_SESSION_EXPIRED"))) throw error;
-      if (this.client) {
+      if (this.client.transport) {
         try {
           await this.client.close();
         } catch {
         }
         this.transport = null;
-        this.client = null;
       }
       await this.reconnect();
       return await fn();
@@ -2968,26 +2963,9 @@ var MCPClient = class {
    * @throws {Error} When OAuth provider is not initialized
    */
   async reconnect() {
-    await this.initialize();
-    if (!this.oauthProvider) {
-      throw new Error("OAuth provider not initialized");
-    }
-    if (this.client) {
-      try {
-        await this.client.close();
-      } catch {
-      }
-    }
-    this.client = new index_js.Client(
-      {
-        name: MCP_CLIENT_NAME,
-        version: MCP_CLIENT_VERSION
-      },
-      { capabilities: {} }
-    );
-    const tt = this.transportType || "streamable-http";
-    this.transport = this.getTransport(tt);
-    await this.client.connect(this.transport);
+    await this.ensureSession();
+    if (!this.oauthProvider) throw new Error("OAuth provider not initialized");
+    await this.connect();
   }
   /**
    * Completely removes the session from Redis including all OAuth data
@@ -2995,7 +2973,7 @@ var MCPClient = class {
    */
   async clearSession() {
     try {
-      await this.initialize();
+      await this.ensureSession();
     } catch (error) {
       console.warn("[MCPClient] Initialization failed during clearSession:", error);
     }
@@ -3010,7 +2988,7 @@ var MCPClient = class {
    * @returns True if connected, false otherwise
    */
   isConnected() {
-    return this.client !== null;
+    return this.client.transport !== void 0;
   }
   /**
    * Disconnects from the MCP server and cleans up resources.
@@ -3028,10 +3006,12 @@ var MCPClient = class {
       } catch {
       }
     }
-    if (this.client) {
-      this.client.close();
+    if (this.client.transport) {
+      try {
+        await this.client.close();
+      } catch {
+      }
     }
-    this.client = null;
     this.oauthProvider = null;
     this.transport = null;
     if (this.serverId) {