@mcp-ts/sdk 2.4.3 → 2.4.5

package/dist/{multi-session-client-DOBvtaQV.d.ts → multi-session-client-ChQrBZhF.d.mts}

@@ -1,4 +1,4 @@
-import { m as Event, M as McpConnectionEvent, t as McpObservabilityEvent, s as McpConnectionState, A as ToolClientProvider } from './types-CjczQwNX.js';
+import { m as Event, M as McpConnectionEvent, t as McpObservabilityEvent, s as McpConnectionState, A as ToolClientProvider } from './types-Bf-7GOLW.mjs';
 import { ListToolsResult, CallToolResult, ListPromptsResult, GetPromptResult, ListResourcesResult, ReadResourceResult } from '@modelcontextprotocol/sdk/types.js';
 import { OAuthClientProvider } from '@modelcontextprotocol/sdk/client/auth.js';
 import { OAuthClientMetadata, OAuthClientInformationMixed, OAuthClientInformationFull, OAuthTokens } from '@modelcontextprotocol/sdk/shared/auth.js';
@@ -184,12 +184,11 @@ declare class MCPClient {
      */
     private getTransport;
     /**
-     * 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
      */
-    private initialize;
+    private ensureSession;
     /**
      * Saves current session state to the session store
      * Creates new session if it doesn't exist, updates if it does

package/dist/{multi-session-client-B6hsYO8V.d.mts → multi-session-client-QOOPdEVp.d.ts}

@@ -1,4 +1,4 @@
-import { m as Event, M as McpConnectionEvent, t as McpObservabilityEvent, s as McpConnectionState, A as ToolClientProvider } from './types-CjczQwNX.mjs';
+import { m as Event, M as McpConnectionEvent, t as McpObservabilityEvent, s as McpConnectionState, A as ToolClientProvider } from './types-Bf-7GOLW.js';
 import { ListToolsResult, CallToolResult, ListPromptsResult, GetPromptResult, ListResourcesResult, ReadResourceResult } from '@modelcontextprotocol/sdk/types.js';
 import { OAuthClientProvider } from '@modelcontextprotocol/sdk/client/auth.js';
 import { OAuthClientMetadata, OAuthClientInformationMixed, OAuthClientInformationFull, OAuthTokens } from '@modelcontextprotocol/sdk/shared/auth.js';
@@ -184,12 +184,11 @@ declare class MCPClient {
      */
     private getTransport;
     /**
-     * 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
      */
-    private initialize;
+    private ensureSession;
     /**
      * Saves current session state to the session store
      * Creates new session if it doesn't exist, updates if it does

package/dist/server/index.d.mts

@@ -1,8 +1,8 @@
-import { c as SessionMutationListener, e as SessionStore } from '../multi-session-client-B6hsYO8V.mjs';
-export { M as MCPClient, a as MultiSessionClient, S as Session, b as SessionMutationEvent, d as SessionMutationType, f as StorageOAuthClientProvider } from '../multi-session-client-B6hsYO8V.mjs';
+import { c as SessionMutationListener, e as SessionStore } from '../multi-session-client-ChQrBZhF.mjs';
+export { M as MCPClient, a as MultiSessionClient, S as Session, b as SessionMutationEvent, d as SessionMutationType, f as StorageOAuthClientProvider } from '../multi-session-client-ChQrBZhF.mjs';
 export { U as UnauthorizedError, s as sanitizeServerLabel } from '../utils-DELRKQPU.mjs';
-import { M as McpConnectionEvent, t as McpObservabilityEvent, x as McpRpcResponse, w as McpRpcRequest } from '../types-CjczQwNX.mjs';
-export { a as CallToolRequest, b as CallToolResponse, f as ConnectRequest, g as ConnectResponse, k as Disposable, E as Emitter, m as Event, q as ListToolsResponse, s as McpConnectionState, T as ToolClient, A as ToolClientProvider, B as ToolInfo } from '../types-CjczQwNX.mjs';
+import { M as McpConnectionEvent, t as McpObservabilityEvent, x as McpRpcResponse, w as McpRpcRequest } from '../types-Bf-7GOLW.mjs';
+export { a as CallToolRequest, b as CallToolResponse, f as ConnectRequest, g as ConnectResponse, k as Disposable, E as Emitter, m as Event, q as ListToolsResponse, s as McpConnectionState, T as ToolClient, A as ToolClientProvider, B as ToolInfo } from '../types-Bf-7GOLW.mjs';
 export { OAuthClientInformation, OAuthClientInformationFull, OAuthClientMetadata, OAuthTokens } from '@modelcontextprotocol/sdk/shared/auth.js';
 export { CallToolResult, ListToolsResult, Tool } from '@modelcontextprotocol/sdk/types.js';
 import '@modelcontextprotocol/sdk/client/auth.js';

package/dist/server/index.d.ts

@@ -1,8 +1,8 @@
-import { c as SessionMutationListener, e as SessionStore } from '../multi-session-client-DOBvtaQV.js';
-export { M as MCPClient, a as MultiSessionClient, S as Session, b as SessionMutationEvent, d as SessionMutationType, f as StorageOAuthClientProvider } from '../multi-session-client-DOBvtaQV.js';
+import { c as SessionMutationListener, e as SessionStore } from '../multi-session-client-QOOPdEVp.js';
+export { M as MCPClient, a as MultiSessionClient, S as Session, b as SessionMutationEvent, d as SessionMutationType, f as StorageOAuthClientProvider } from '../multi-session-client-QOOPdEVp.js';
 export { U as UnauthorizedError, s as sanitizeServerLabel } from '../utils-DELRKQPU.js';
-import { M as McpConnectionEvent, t as McpObservabilityEvent, x as McpRpcResponse, w as McpRpcRequest } from '../types-CjczQwNX.js';
-export { a as CallToolRequest, b as CallToolResponse, f as ConnectRequest, g as ConnectResponse, k as Disposable, E as Emitter, m as Event, q as ListToolsResponse, s as McpConnectionState, T as ToolClient, A as ToolClientProvider, B as ToolInfo } from '../types-CjczQwNX.js';
+import { M as McpConnectionEvent, t as McpObservabilityEvent, x as McpRpcResponse, w as McpRpcRequest } from '../types-Bf-7GOLW.js';
+export { a as CallToolRequest, b as CallToolResponse, f as ConnectRequest, g as ConnectResponse, k as Disposable, E as Emitter, m as Event, q as ListToolsResponse, s as McpConnectionState, T as ToolClient, A as ToolClientProvider, B as ToolInfo } from '../types-Bf-7GOLW.js';
 export { OAuthClientInformation, OAuthClientInformationFull, OAuthClientMetadata, OAuthTokens } from '@modelcontextprotocol/sdk/shared/auth.js';
 export { CallToolResult, ListToolsResult, Tool } from '@modelcontextprotocol/sdk/types.js';
 import '@modelcontextprotocol/sdk/client/auth.js';

package/dist/server/index.js

@@ -159,13 +159,9 @@ init_cjs_shims();
 // src/shared/utils.ts
 init_cjs_shims();
 var OAUTH_STATE_SEPARATOR = ".";
-var firstChar = nanoid.customAlphabet(
-  "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz",
-  1
-);
-var rest = nanoid.customAlphabet(
-  "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789",
-  11
+var serverIdAlphabet = nanoid.customAlphabet(
+  "abcdefghijklmnopqrstuvwxyz0123456789",
+  12
 );
 function sanitizeServerLabel(name) {
   let sanitized = name.replace(/[^a-zA-Z0-9-_]/g, "_").replace(/_{2,}/g, "_").toLowerCase();
@@ -175,7 +171,10 @@ function sanitizeServerLabel(name) {
   return sanitized;
 }
 function generateSessionId() {
-  return firstChar() + rest();
+  return "sess_" + nanoid.nanoid(21);
+}
+function generateServerId() {
+  return serverIdAlphabet();
 }
 function formatOAuthState(nonce, sessionId) {
   return `${nonce}${OAUTH_STATE_SEPARATOR}${sessionId}`;
@@ -2149,7 +2148,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");
@@ -2190,6 +2189,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
@@ -2315,13 +2329,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");
@@ -2364,30 +2377,21 @@ 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);
     }
     if (!existingSession && this.serverId && this.serverUrl && this.callbackUrl) {
       this.createdAt = Date.now();
       const updatedAt = this.createdAt;
-      console.log(`[MCPClient] Creating pending session ${this.sessionId} for connection setup`);
+      this._onObservabilityEvent.fire({
+        type: "mcp:client:session_created",
+        level: "info",
+        message: `Creating pending session ${this.sessionId} for connection setup`,
+        sessionId: this.sessionId,
+        serverId: this.serverId,
+        timestamp: Date.now(),
+        id: nanoid.nanoid()
+      });
       await sessions.create({
         sessionId: this.sessionId,
         userId: this.userId,
@@ -2497,17 +2501,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);
@@ -2518,7 +2521,15 @@ var MCPClient = class {
       this.transportType = transportType;
       this.emitStateChange("CONNECTED");
       this.emitProgress("Connected successfully");
-      console.log(`[MCPClient] Saving active session ${this.sessionId} (connect success)`);
+      this._onObservabilityEvent.fire({
+        type: "mcp:client:session_saved",
+        level: "info",
+        message: `Saving active session ${this.sessionId} (connect success)`,
+        sessionId: this.sessionId,
+        serverId: this.serverId,
+        timestamp: Date.now(),
+        id: nanoid.nanoid()
+      });
       await this.saveSession("active");
     } catch (error) {
       if (error instanceof auth_js.UnauthorizedError || error instanceof Error && error.message.toLowerCase().includes("unauthorized")) {
@@ -2535,7 +2546,15 @@ var MCPClient = class {
           throw new Error(message);
         }
         this.emitStateChange("AUTHENTICATING");
-        console.log(`[MCPClient] Saving pending OAuth session ${this.sessionId}`);
+        this._onObservabilityEvent.fire({
+          type: "mcp:client:session_saved",
+          level: "info",
+          message: `Saving pending OAuth session ${this.sessionId}`,
+          sessionId: this.sessionId,
+          serverId: this.serverId,
+          timestamp: Date.now(),
+          id: nanoid.nanoid()
+        });
         await this.saveSession("pending");
         if (this.serverId) {
           this._onConnectionEvent.fire({
@@ -2574,7 +2593,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");
@@ -2610,27 +2629,25 @@ var MCPClient = class {
           this.emitStateChange("AUTHENTICATED");
           authenticatedStateEmitted = true;
         }
-        this.emitProgress("Creating authenticated client...");
-        this.client = new index_js.Client(
-          {
-            name: MCP_CLIENT_NAME,
-            version: MCP_CLIENT_VERSION
-          },
-          {
-            capabilities: {
-              extensions: {
-                "io.modelcontextprotocol/ui": {
-                  mimeTypes: ["text/html+mcp"]
-                }
-              }
-            }
-          }
-        );
         this.emitStateChange("CONNECTING");
+        if (this.client.transport) {
+          try {
+            await this.client.close();
+          } catch {
+          }
+        }
         await this.client.connect(this.transport);
         this.transportType = currentType;
         this.emitStateChange("CONNECTED");
-        console.log(`[MCPClient] Saving active session ${this.sessionId} (OAuth complete)`);
+        this._onObservabilityEvent.fire({
+          type: "mcp:client:session_saved",
+          level: "info",
+          message: `Saving active session ${this.sessionId} (OAuth complete)`,
+          sessionId: this.sessionId,
+          serverId: this.serverId,
+          timestamp: Date.now(),
+          id: nanoid.nanoid()
+        });
         await this.saveSession("active");
         return;
       } catch (error) {
@@ -2671,9 +2688,6 @@ var MCPClient = class {
    * @throws {Error} When client is not connected
    */
   async listTools() {
-    if (!this.client) {
-      throw new Error("Not connected to server");
-    }
     this.emitStateChange("DISCOVERING");
     try {
       const request = {
@@ -2711,9 +2725,6 @@ var MCPClient = class {
    * @throws {Error} When client is not connected
    */
   async callTool(toolName, toolArgs) {
-    if (!this.client) {
-      throw new Error("Not connected to server");
-    }
     const request = {
       method: "tools/call",
       params: {
@@ -2767,9 +2778,6 @@ var MCPClient = class {
    * @throws {Error} When client is not connected
    */
   async listPrompts() {
-    if (!this.client) {
-      throw new Error("Not connected to server");
-    }
     this.emitStateChange("DISCOVERING");
     try {
       const request = {
@@ -2797,9 +2805,6 @@ var MCPClient = class {
    * @throws {Error} When client is not connected
    */
   async getPrompt(name, args) {
-    if (!this.client) {
-      throw new Error("Not connected to server");
-    }
     const request = {
       method: "prompts/get",
       params: {
@@ -2817,9 +2822,6 @@ var MCPClient = class {
    * @throws {Error} When client is not connected
    */
   async listResources() {
-    if (!this.client) {
-      throw new Error("Not connected to server");
-    }
     this.emitStateChange("DISCOVERING");
     try {
       const request = {
@@ -2846,9 +2848,6 @@ var MCPClient = class {
    * @throws {Error} When client is not connected
    */
   async readResource(uri) {
-    if (!this.client) {
-      throw new Error("Not connected to server");
-    }
     const request = {
       method: "resources/read",
       params: {
@@ -2874,13 +2873,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();
@@ -2893,26 +2891,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
@@ -2920,9 +2901,18 @@ var MCPClient = class {
    */
   async clearSession() {
     try {
-      await this.initialize();
+      await this.ensureSession();
     } catch (error) {
-      console.warn("[MCPClient] Initialization failed during clearSession:", error);
+      this._onObservabilityEvent.fire({
+        type: "mcp:client:error",
+        level: "warn",
+        message: "Initialization failed during clearSession",
+        sessionId: this.sessionId,
+        serverId: this.serverId,
+        payload: { error: String(error) },
+        timestamp: Date.now(),
+        id: nanoid.nanoid()
+      });
     }
     if (this.oauthProvider) {
       await this.oauthProvider.invalidateCredentials("all");
@@ -2935,7 +2925,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.
@@ -2953,10 +2943,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) {
@@ -3402,7 +3394,7 @@ var SSEConnectionManager = class {
   async connect(params) {
     const { serverName, serverUrl, callbackUrl, transportType } = params;
     const headers = normalizeHeaders(params.headers);
-    const serverId = params.serverId && params.serverId.length <= 12 ? params.serverId : await sessions.generateSessionId();
+    const serverId = params.serverId && params.serverId.length <= 12 ? params.serverId : generateServerId();
     const existingSessions = await sessions.list(this.userId);
     const duplicate = existingSessions.find(
       (s) => s.serverId === serverId || s.serverUrl === serverUrl