@mcp-ts/sdk 2.4.2 → 2.4.4

package/dist/index.js

@@ -1741,12 +1741,12 @@ async function createStorage() {
   }
   if (type === "supabase") {
     const url = process.env.SUPABASE_URL;
-    const key = process.env.SUPABASE_SERVICE_ROLE_KEY || process.env.SUPABASE_ANON_KEY;
+    const key = process.env.SUPABASE_SECRET_KEY || process.env.SUPABASE_ANON_KEY;
     if (!url || !key) {
-      console.warn('[mcp-ts][Storage] Explicit selection "supabase" requires SUPABASE_URL and SUPABASE_SERVICE_ROLE_KEY.');
+      console.warn('[mcp-ts][Storage] Explicit selection "supabase" requires SUPABASE_URL and SUPABASE_SECRET_KEY.');
     } else {
-      if (!process.env.SUPABASE_SERVICE_ROLE_KEY) {
-        console.warn('[mcp-ts][Storage] \u26A0\uFE0F  Warning: Using "SUPABASE_ANON_KEY" for server-side storage. You may encounter RLS policy violations. "SUPABASE_SERVICE_ROLE_KEY" is recommended.');
+      if (!process.env.SUPABASE_SECRET_KEY) {
+        console.warn('[mcp-ts][Storage] \u26A0\uFE0F  Warning: Using "SUPABASE_ANON_KEY" for server-side storage. You may encounter RLS policy violations. "SUPABASE_SECRET_KEY" is recommended.');
       }
       try {
         const { createClient } = await import('@supabase/supabase-js');
@@ -1801,13 +1801,13 @@ async function createStorage() {
     console.log(`[mcp-ts][Storage] Auto-detection: "sqlite" (${process.env.MCP_TS_STORAGE_SQLITE_PATH})`);
     return await initializeStorage(new SqliteStorage({ path: process.env.MCP_TS_STORAGE_SQLITE_PATH }));
   }
-  if (process.env.SUPABASE_URL && (process.env.SUPABASE_SERVICE_ROLE_KEY || process.env.SUPABASE_ANON_KEY)) {
+  if (process.env.SUPABASE_URL && (process.env.SUPABASE_SECRET_KEY || process.env.SUPABASE_ANON_KEY)) {
     try {
       const { createClient } = await import('@supabase/supabase-js');
       const url = process.env.SUPABASE_URL;
-      const key = process.env.SUPABASE_SERVICE_ROLE_KEY || process.env.SUPABASE_ANON_KEY;
-      if (!process.env.SUPABASE_SERVICE_ROLE_KEY) {
-        console.warn('[mcp-ts][Storage] \u26A0\uFE0F Warning: Using "SUPABASE_ANON_KEY" for server-side storage. You may encounter RLS policy violations. "SUPABASE_SERVICE_ROLE_KEY" is recommended.');
+      const key = process.env.SUPABASE_SECRET_KEY || process.env.SUPABASE_ANON_KEY;
+      if (!process.env.SUPABASE_SECRET_KEY) {
+        console.warn('[mcp-ts][Storage] \u26A0\uFE0F Warning: Using "SUPABASE_ANON_KEY" for server-side storage. You may encounter RLS policy violations. "SUPABASE_SECRET_KEY" is recommended.');
       }
       const client = createClient(url, key);
       console.log('[mcp-ts][Storage] Auto-detection: "supabase" (via SUPABASE_URL)');
@@ -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
@@ -2375,7 +2390,6 @@ var MCPClient = class {
           const response = await fetch(url, { ...init, signal });
           const hasSessionHeader = init?.headers && new Headers(init.headers).has("mcp-session-id");
           if (response.status === 404 && hasSessionHeader) {
-            this.client = null;
             throw new Error("MCP_SESSION_EXPIRED: Downstream session was not found on the server.");
           }
           return response;
@@ -2391,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");
@@ -2440,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);
     }
@@ -2573,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);
@@ -2650,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");
@@ -2756,7 +2751,9 @@ var MCPClient = class {
         method: "tools/list",
         params: {}
       };
-      const result = await this.client.request(request, types_js.ListToolsResultSchema);
+      const result = await this.withRetry(
+        () => this.client.request(request, types_js.ListToolsResultSchema)
+      );
       if (this.serverId) {
         this._onConnectionEvent.fire({
           type: "tools_discovered",
@@ -2796,7 +2793,9 @@ var MCPClient = class {
       }
     };
     try {
-      const result = await this.client.request(request, types_js.CallToolResultSchema);
+      const result = await this.withRetry(
+        () => this.client.request(request, types_js.CallToolResultSchema)
+      );
       this._onObservabilityEvent.fire({
         type: "mcp:client:tool_call",
         level: "info",
@@ -2848,7 +2847,9 @@ var MCPClient = class {
         method: "prompts/list",
         params: {}
       };
-      const result = await this.client.request(request, types_js.ListPromptsResultSchema);
+      const result = await this.withRetry(
+        () => this.client.request(request, types_js.ListPromptsResultSchema)
+      );
       this.emitStateChange("READY");
       this.emitProgress(`Discovered ${result.prompts.length} prompts`);
       return result;
@@ -2877,7 +2878,9 @@ var MCPClient = class {
         arguments: args
       }
     };
-    return await this.client.request(request, types_js.GetPromptResultSchema);
+    return await this.withRetry(
+      () => this.client.request(request, types_js.GetPromptResultSchema)
+    );
   }
   /**
    * Lists all available resources from the connected MCP server
@@ -2894,7 +2897,9 @@ var MCPClient = class {
         method: "resources/list",
         params: {}
       };
-      const result = await this.client.request(request, types_js.ListResourcesResultSchema);
+      const result = await this.withRetry(
+        () => this.client.request(request, types_js.ListResourcesResultSchema)
+      );
       this.emitStateChange("READY");
       this.emitProgress(`Discovered ${result.resources.length} resources`);
       return result;
@@ -2921,7 +2926,35 @@ var MCPClient = class {
         uri
       }
     };
-    return await this.client.request(request, types_js.ReadResourceResultSchema);
+    return await this.withRetry(
+      () => this.client.request(request, types_js.ReadResourceResultSchema)
+    );
+  }
+  /**
+   * Wraps an MCP request with automatic transport-session recovery.
+   *
+   * When the downstream MCP server rejects the request with a 404 indicating
+   * the transport session has expired, this method tears down the stale SDK
+   * client and transport, calls {@link reconnect} to negotiate a fresh session,
+   * and retries the request once.
+   *
+   * Non-transient errors (network failures, auth errors, etc.) propagate as-is.
+   */
+  async withRetry(fn) {
+    try {
+      return await fn();
+    } catch (error) {
+      if (!(error instanceof Error && error.message.includes("MCP_SESSION_EXPIRED"))) throw error;
+      if (this.client.transport) {
+        try {
+          await this.client.close();
+        } catch {
+        }
+        this.transport = null;
+      }
+      await this.reconnect();
+      return await fn();
+    }
   }
   /**
    * Reconnects to MCP server using existing OAuth provider from Redis
@@ -2930,20 +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");
-    }
-    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
@@ -2951,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);
     }
@@ -2966,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.
@@ -2984,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) {
@@ -3130,6 +3154,18 @@ var MultiSessionClient = class {
   getClients() {
     return this.clients;
   }
+  /**
+   * Removes and disconnects a single session by ID.
+   *
+   * @returns `true` if the session was found and removed, `false` if not found.
+   */
+  async removeSession(sessionId) {
+    const idx = this.clients.findIndex((c) => c.getSessionId() === sessionId);
+    if (idx === -1) return false;
+    const [client] = this.clients.splice(idx, 1);
+    await client.disconnect();
+    return true;
+  }
   /**
    * Gracefully disconnects all active MCP clients and clears the internal list.
    *