| |
| |
| |
| |
| @@ -428,6 +428,8 @@ export declare class Client<RequestT extends Request = Request, NotificationT ex |
| * |
| * For task-based execution with streaming behavior, use client.experimental.tasks.callToolStream() instead. |
| */ |
| + callTool(params: CallToolRequest['params'], resultSchema?: undefined, options?: RequestOptions): Promise<SchemaOutput<typeof CallToolResultSchema>>; |
| + callTool<T extends typeof CallToolResultSchema | typeof CompatibilityCallToolResultSchema>(params: CallToolRequest['params'], resultSchema: T, options?: RequestOptions): Promise<SchemaOutput<T>>; |
| callTool(params: CallToolRequest['params'], resultSchema?: typeof CallToolResultSchema | typeof CompatibilityCallToolResultSchema, options?: RequestOptions): Promise<{ |
| [x: string]: unknown; |
| content: ({ |
| |
| |
| |
| |
| @@ -428,6 +428,8 @@ export declare class Client<RequestT extends Request = Request, NotificationT ex |
| * |
| * For task-based execution with streaming behavior, use client.experimental.tasks.callToolStream() instead. |
| */ |
| + callTool(params: CallToolRequest['params'], resultSchema?: undefined, options?: RequestOptions): Promise<SchemaOutput<typeof CallToolResultSchema>>; |
| + callTool<T extends typeof CallToolResultSchema | typeof CompatibilityCallToolResultSchema>(params: CallToolRequest['params'], resultSchema: T, options?: RequestOptions): Promise<SchemaOutput<T>>; |
| callTool(params: CallToolRequest['params'], resultSchema?: typeof CallToolResultSchema | typeof CompatibilityCallToolResultSchema, options?: RequestOptions): Promise<{ |
| [x: string]: unknown; |
| content: ({ |
| |
| |
| |
| |
| @@ -288,41 +288,16 @@ class Client extends protocol_js_1.Protocol { |
| } |
| async connect(transport, options) { |
| await super.connect(transport); |
| + transport.onsessionexpired = async () => { |
| + await this._initialize(transport); |
| + }; |
| // When transport sessionId is already set this means we are trying to reconnect. |
| // In this case we don't need to initialize again. |
| if (transport.sessionId !== undefined) { |
| return; |
| } |
| try { |
| - const result = await this.request({ |
| - method: 'initialize', |
| - params: { |
| - protocolVersion: types_js_1.LATEST_PROTOCOL_VERSION, |
| - capabilities: this._capabilities, |
| - clientInfo: this._clientInfo |
| - } |
| - }, types_js_1.InitializeResultSchema, options); |
| - if (result === undefined) { |
| - throw new Error(`Server sent invalid initialize result: ${result}`); |
| - } |
| - if (!types_js_1.SUPPORTED_PROTOCOL_VERSIONS.includes(result.protocolVersion)) { |
| - throw new Error(`Server's protocol version is not supported: ${result.protocolVersion}`); |
| - } |
| - this._serverCapabilities = result.capabilities; |
| - this._serverVersion = result.serverInfo; |
| - // HTTP transports must set the protocol version in each header after initialization. |
| - if (transport.setProtocolVersion) { |
| - transport.setProtocolVersion(result.protocolVersion); |
| - } |
| - this._instructions = result.instructions; |
| - await this.notification({ |
| - method: 'notifications/initialized' |
| - }); |
| - // Set up list changed handlers now that we know server capabilities |
| - if (this._pendingListChangedConfig) { |
| - this._setupListChangedHandlers(this._pendingListChangedConfig); |
| - this._pendingListChangedConfig = undefined; |
| - } |
| + await this._initialize(transport, options); |
| } |
| catch (error) { |
| // Disconnect if initialization fails. |
| @@ -330,6 +305,37 @@ class Client extends protocol_js_1.Protocol { |
| throw error; |
| } |
| } |
| + async _initialize(transport, options) { |
| + const result = await this.request({ |
| + method: 'initialize', |
| + params: { |
| + protocolVersion: types_js_1.LATEST_PROTOCOL_VERSION, |
| + capabilities: this._capabilities, |
| + clientInfo: this._clientInfo |
| + } |
| + }, types_js_1.InitializeResultSchema, options); |
| + if (result === undefined) { |
| + throw new Error(`Server sent invalid initialize result: ${result}`); |
| + } |
| + if (!types_js_1.SUPPORTED_PROTOCOL_VERSIONS.includes(result.protocolVersion)) { |
| + throw new Error(`Server's protocol version is not supported: ${result.protocolVersion}`); |
| + } |
| + this._serverCapabilities = result.capabilities; |
| + this._serverVersion = result.serverInfo; |
| + // HTTP transports must set the protocol version in each header after initialization. |
| + if (transport.setProtocolVersion) { |
| + transport.setProtocolVersion(result.protocolVersion); |
| + } |
| + this._instructions = result.instructions; |
| + await this.notification({ |
| + method: 'notifications/initialized' |
| + }); |
| + // Set up list changed handlers now that we know server capabilities |
| + if (this._pendingListChangedConfig) { |
| + this._setupListChangedHandlers(this._pendingListChangedConfig); |
| + this._pendingListChangedConfig = undefined; |
| + } |
| + } |
| /** |
| * After initialization has completed, this will be populated with the server's reported capabilities. |
| */ |
| @@ -541,9 +547,11 @@ class Client extends protocol_js_1.Protocol { |
| * Called after listTools() to pre-compile validators for better performance. |
| */ |
| - cacheToolMetadata(tools) { |
| - this._cachedToolOutputValidators.clear(); |
| - this._cachedKnownTaskTools.clear(); |
| - this._cachedRequiredTaskTools.clear(); |
| + cacheToolMetadata(tools, reset = true) { |
| + if (reset) { |
| + this._cachedToolOutputValidators.clear(); |
| + this._cachedKnownTaskTools.clear(); |
| + this._cachedRequiredTaskTools.clear(); |
| + } |
| for (const tool of tools) { |
| // If the tool has an outputSchema, create and cache the validator |
| if (tool.outputSchema) { |
| @@ -569,7 +577,7 @@ class Client extends protocol_js_1.Protocol { |
| async listTools(params, options) { |
| const result = await this.request({ method: 'tools/list', params }, types_js_1.ListToolsResultSchema, options); |
| // Cache the tools and their output schemas for future validation |
| - this.cacheToolMetadata(result.tools); |
| + this.cacheToolMetadata(result.tools, params?.cursor === undefined); |
| return result; |
| } |
| /** |
| |
| |
| |
| |
| @@ -204,7 +204,7 @@ class StreamableHTTPClientTransport { |
| if (!event.event || event.event |
| try { |
| const message = types_js_1.JSONRPCMessageSchema.parse(JSON.parse(event.data)); |
| - if ((0, types_js_1.isJSONRPCResultResponse)(message)) { |
| + if ((0, types_js_1.isJSONRPCResultResponse)(message) || (0, types_js_1.isJSONRPCErrorResponse)(message)) { |
| // Mark that we received a response - no need to reconnect for this request |
| receivedResponse = true; |
| if (replayMessageId !== undefined) { |
| @@ -290,7 +290,38 @@ class StreamableHTTPClientTransport { |
| this.onclose?.(); |
| } |
| async send(message, options) { |
| + return this._send(message, options, false); |
| + } |
| + async _recoverSession(expiredSessionId) { |
| + if (this._sessionRecovery) { |
| + await this._sessionRecovery; |
| + return true; |
| + } |
| + if (this._sessionId !== expiredSessionId) |
| + return true; |
| + this._sessionId = undefined; |
| + this._sessionRecovery = Promise.resolve().then(() => this.onsessionexpired?.()); |
| try { |
| + await this._sessionRecovery; |
| + } |
| + catch (error) { |
| + this._sessionId = undefined; |
| + await this.close(); |
| + throw error; |
| + } |
| + finally { |
| + this._sessionRecovery = undefined; |
| + } |
| + return true; |
| + } |
| + async _send(message, options, isSessionRetry) { |
| + try { |
| + if (this._sessionRecovery && !(0, types_js_1.isInitializeRequest)(message) && !(0, types_js_1.isInitializedNotification)(message)) { |
| + await this._sessionRecovery; |
| + if (options?.isRequestActive?.() === false) { |
| + throw new Error('Request is no longer active'); |
| + } |
| + } |
| const { resumptionToken, onresumptiontoken } = options || {}; |
| if (resumptionToken) { |
| // If we have at last event ID, we need to reconnect the SSE stream |
| @@ -298,6 +329,7 @@ class StreamableHTTPClientTransport { |
| return; |
| } |
| const headers = await this._commonHeaders(); |
| + const requestSessionId = headers.get('mcp-session-id') ?? undefined; |
| headers.set('content-type', 'application/json'); |
| headers.set('accept', 'application/json, text/event-stream'); |
| const init = { |
| @@ -310,11 +342,20 @@ class StreamableHTTPClientTransport { |
| const response = await (this._fetch ?? fetch)(this._url, init); |
| // Handle session ID received during initialization |
| const sessionId = response.headers.get('mcp-session-id'); |
| - if (sessionId) { |
| + if (sessionId && (requestSessionId === undefined || this._sessionId === requestSessionId)) { |
| this._sessionId = sessionId; |
| } |
| if (!response.ok) { |
| const text = await response.text().catch(() => null); |
| + if (response.status === 404 && requestSessionId && !isSessionRetry && !(0, types_js_1.isInitializedNotification)(message)) { |
| + const recovered = await this._recoverSession(requestSessionId); |
| + if (options?.isRequestActive?.() === false) { |
| + throw new Error('Request is no longer active'); |
| + } |
| + if (recovered) { |
| + return this._send(message, options, true); |
| + } |
| + } |
| if (response.status |
| // Prevent infinite recursion when server returns 401 after successful auth |
| if (this._hasCompletedAuthFlow) { |
| @@ -335,7 +376,7 @@ class StreamableHTTPClientTransport { |
| // Mark that we completed auth flow |
| this._hasCompletedAuthFlow = true; |
| // Purposely _not_ awaited, so we don't call onerror twice |
| - return this.send(message); |
| + return this._send(message, options, isSessionRetry); |
| } |
| if (response.status |
| const { resourceMetadataUrl, scope, error } = (0, auth_js_1.extractWWWAuthenticateParams)(response); |
| @@ -362,7 +403,7 @@ class StreamableHTTPClientTransport { |
| if (result !== 'AUTHORIZED') { |
| throw new auth_js_1.UnauthorizedError(); |
| } |
| - return this.send(message); |
| + return this._send(message, options, isSessionRetry); |
| } |
| } |
| throw new StreamableHTTPError(response.status, `Error POSTing to endpoint: ${text}`); |
| |
| |
| |
| |
| @@ -744,7 +744,12 @@ class Protocol { |
| } |
| else { |
| // No related task - send through transport normally |
| - this._transport.send(jsonrpcRequest, { relatedRequestId, resumptionToken, onresumptiontoken }).catch(error => { |
| + this._transport.send(jsonrpcRequest, { |
| + relatedRequestId, |
| + resumptionToken, |
| + onresumptiontoken, |
| + isRequestActive: () => this._responseHandlers.has(messageId) |
| + }).catch(error => { |
| this._cleanupTimeout(messageId); |
| reject(error); |
| }); |
| |
| |
| |
| |
| @@ -205,6 +205,15 @@ export declare function parseErrorResponse(input: Response | string): Promise<OA |
| * @returns A Promise that resolves to an OAuthError instance |
| */ |
| export declare function parseErrorResponse(input: Response | string): Promise<OAuthError>; |
| +/** |
| + * Selects scopes per the MCP spec and augments them for refresh token support. |
| + */ |
| +export declare function determineScope(options: { |
| + requestedScope?: string; |
| + resourceMetadata?: OAuthProtectedResourceMetadata; |
| + authServerMetadata?: AuthorizationServerMetadata; |
| + clientMetadata: OAuthClientMetadata; |
| +}): string | undefined; |
| /** |
| * Orchestrates the full auth flow with a server. |
| * |
| |
| |
| |
| |
| @@ -7,6 +7,7 @@ exports.UnauthorizedError = void 0; |
| exports.selectClientAuthMethod = selectClientAuthMethod; |
| exports.parseErrorResponse = parseErrorResponse; |
| exports.auth = auth; |
| +exports.determineScope = determineScope; |
| exports.isHttpsUrl = isHttpsUrl; |
| exports.selectResourceURL = selectResourceURL; |
| exports.extractWWWAuthenticateParams = extractWWWAuthenticateParams; |
| @@ -186,6 +187,19 @@ async function auth(provider, options) { |
| throw error; |
| } |
| } |
| +/** |
| + * Selects scopes per the MCP spec and augments them for refresh token support. |
| + */ |
| +function determineScope({ requestedScope, resourceMetadata, authServerMetadata, clientMetadata }) { |
| + let effectiveScope = requestedScope || resourceMetadata?.scopes_supported?.join(' ') || clientMetadata.scope; |
| + if (effectiveScope && |
| + authServerMetadata?.scopes_supported?.includes('offline_access') && |
| + !effectiveScope.split(' ').includes('offline_access') && |
| + clientMetadata.grant_types?.includes('refresh_token')) { |
| + effectiveScope = `${effectiveScope} offline_access`; |
| + } |
| + return effectiveScope; |
| +} |
| async function authInternal(provider, { serverUrl, authorizationCode, scope, resourceMetadataUrl, fetchFn }) { |
| // Check if the provider has cached discovery state to skip discovery |
| const cachedState = await provider.discoveryState?.(); |
| @@ -241,12 +255,12 @@ async function authInternal(provider, { serverUrl, authorizationCode, scope, res |
| }); |
| } |
| const resource = await selectResourceURL(serverUrl, provider, resourceMetadata); |
| - // Apply scope selection strategy (SEP-835): |
| - // 1. WWW-Authenticate scope (passed via `scope` param) |
| - // 2. PRM scopes_supported |
| - // 3. Client metadata scope (user-configured fallback) |
| - // The resolved scope is used consistently for both DCR and the authorization request. |
| - const resolvedScope = scope || resourceMetadata?.scopes_supported?.join(' ') || provider.clientMetadata.scope; |
| + const resolvedScope = determineScope({ |
| + requestedScope: scope, |
| + resourceMetadata, |
| + authServerMetadata: metadata, |
| + clientMetadata: provider.clientMetadata |
| + }); |
| // Handle client registration if needed |
| let clientInformation = await Promise.resolve(provider.clientInformation()); |
| if (!clientInformation) { |
| @@ -741,7 +755,7 @@ async function startAuthorization(authorizationServerUrl, { metadata, clientInfo |
| if (scope) { |
| authorizationUrl.searchParams.set('scope', scope); |
| } |
| - if (scope?.includes('offline_access')) { |
| + if (scope?.split(' ').includes('offline_access')) { |
| // if the request includes the OIDC-only "offline_access" scope, |
| // we need to set the prompt to "consent" to ensure the user is prompted to grant offline access |
| // https://openid.net/specs/openid-connect-core-1_0.html#OfflineAccess |
| |
| |
| |
| |
| @@ -205,6 +205,15 @@ export declare function parseErrorResponse(input: Response | string): Promise<OA |
| * @returns A Promise that resolves to an OAuthError instance |
| */ |
| export declare function parseErrorResponse(input: Response | string): Promise<OAuthError>; |
| +/** |
| + * Selects scopes per the MCP spec and augments them for refresh token support. |
| + */ |
| +export declare function determineScope(options: { |
| + requestedScope?: string; |
| + resourceMetadata?: OAuthProtectedResourceMetadata; |
| + authServerMetadata?: AuthorizationServerMetadata; |
| + clientMetadata: OAuthClientMetadata; |
| +}): string | undefined; |
| /** |
| * Orchestrates the full auth flow with a server. |
| * |
| |
| |
| |
| |
| @@ -161,6 +161,19 @@ export async function auth(provider, options) { |
| throw error; |
| } |
| } |
| +/** |
| + * Selects scopes per the MCP spec and augments them for refresh token support. |
| + */ |
| +export function determineScope({ requestedScope, resourceMetadata, authServerMetadata, clientMetadata }) { |
| + let effectiveScope = requestedScope || resourceMetadata?.scopes_supported?.join(' ') || clientMetadata.scope; |
| + if (effectiveScope && |
| + authServerMetadata?.scopes_supported?.includes('offline_access') && |
| + !effectiveScope.split(' ').includes('offline_access') && |
| + clientMetadata.grant_types?.includes('refresh_token')) { |
| + effectiveScope = `${effectiveScope} offline_access`; |
| + } |
| + return effectiveScope; |
| +} |
| async function authInternal(provider, { serverUrl, authorizationCode, scope, resourceMetadataUrl, fetchFn }) { |
| // Check if the provider has cached discovery state to skip discovery |
| const cachedState = await provider.discoveryState?.(); |
| @@ -216,12 +229,12 @@ async function authInternal(provider, { serverUrl, authorizationCode, scope, res |
| }); |
| } |
| const resource = await selectResourceURL(serverUrl, provider, resourceMetadata); |
| - // Apply scope selection strategy (SEP-835): |
| - // 1. WWW-Authenticate scope (passed via `scope` param) |
| - // 2. PRM scopes_supported |
| - // 3. Client metadata scope (user-configured fallback) |
| - // The resolved scope is used consistently for both DCR and the authorization request. |
| - const resolvedScope = scope || resourceMetadata?.scopes_supported?.join(' ') || provider.clientMetadata.scope; |
| + const resolvedScope = determineScope({ |
| + requestedScope: scope, |
| + resourceMetadata, |
| + authServerMetadata: metadata, |
| + clientMetadata: provider.clientMetadata |
| + }); |
| // Handle client registration if needed |
| let clientInformation = await Promise.resolve(provider.clientInformation()); |
| if (!clientInformation) { |
| @@ -716,7 +729,7 @@ export async function startAuthorization(authorizationServerUrl, { metadata, cli |
| if (scope) { |
| authorizationUrl.searchParams.set('scope', scope); |
| } |
| - if (scope?.includes('offline_access')) { |
| + if (scope?.split(' ').includes('offline_access')) { |
| // if the request includes the OIDC-only "offline_access" scope, |
| // we need to set the prompt to "consent" to ensure the user is prompted to grant offline access |
| // https://openid.net/specs/openid-connect-core-1_0.html#OfflineAccess |
| |
| |
| |
| |
| @@ -284,41 +284,16 @@ export class Client extends Protocol { |
| } |
| async connect(transport, options) { |
| await super.connect(transport); |
| + transport.onsessionexpired = async () => { |
| + await this._initialize(transport); |
| + }; |
| // When transport sessionId is already set this means we are trying to reconnect. |
| // In this case we don't need to initialize again. |
| if (transport.sessionId !== undefined) { |
| return; |
| } |
| try { |
| - const result = await this.request({ |
| - method: 'initialize', |
| - params: { |
| - protocolVersion: LATEST_PROTOCOL_VERSION, |
| - capabilities: this._capabilities, |
| - clientInfo: this._clientInfo |
| - } |
| - }, InitializeResultSchema, options); |
| - if (result === undefined) { |
| - throw new Error(`Server sent invalid initialize result: ${result}`); |
| - } |
| - if (!SUPPORTED_PROTOCOL_VERSIONS.includes(result.protocolVersion)) { |
| - throw new Error(`Server's protocol version is not supported: ${result.protocolVersion}`); |
| - } |
| - this._serverCapabilities = result.capabilities; |
| - this._serverVersion = result.serverInfo; |
| - // HTTP transports must set the protocol version in each header after initialization. |
| - if (transport.setProtocolVersion) { |
| - transport.setProtocolVersion(result.protocolVersion); |
| - } |
| - this._instructions = result.instructions; |
| - await this.notification({ |
| - method: 'notifications/initialized' |
| - }); |
| - // Set up list changed handlers now that we know server capabilities |
| - if (this._pendingListChangedConfig) { |
| - this._setupListChangedHandlers(this._pendingListChangedConfig); |
| - this._pendingListChangedConfig = undefined; |
| - } |
| + await this._initialize(transport, options); |
| } |
| catch (error) { |
| // Disconnect if initialization fails. |
| @@ -326,6 +301,37 @@ export class Client extends Protocol { |
| throw error; |
| } |
| } |
| + async _initialize(transport, options) { |
| + const result = await this.request({ |
| + method: 'initialize', |
| + params: { |
| + protocolVersion: LATEST_PROTOCOL_VERSION, |
| + capabilities: this._capabilities, |
| + clientInfo: this._clientInfo |
| + } |
| + }, InitializeResultSchema, options); |
| + if (result === undefined) { |
| + throw new Error(`Server sent invalid initialize result: ${result}`); |
| + } |
| + if (!SUPPORTED_PROTOCOL_VERSIONS.includes(result.protocolVersion)) { |
| + throw new Error(`Server's protocol version is not supported: ${result.protocolVersion}`); |
| + } |
| + this._serverCapabilities = result.capabilities; |
| + this._serverVersion = result.serverInfo; |
| + // HTTP transports must set the protocol version in each header after initialization. |
| + if (transport.setProtocolVersion) { |
| + transport.setProtocolVersion(result.protocolVersion); |
| + } |
| + this._instructions = result.instructions; |
| + await this.notification({ |
| + method: 'notifications/initialized' |
| + }); |
| + // Set up list changed handlers now that we know server capabilities |
| + if (this._pendingListChangedConfig) { |
| + this._setupListChangedHandlers(this._pendingListChangedConfig); |
| + this._pendingListChangedConfig = undefined; |
| + } |
| + } |
| /** |
| * After initialization has completed, this will be populated with the server's reported capabilities. |
| */ |
| @@ -537,9 +543,11 @@ export class Client extends Protocol { |
| * Called after listTools() to pre-compile validators for better performance. |
| */ |
| - cacheToolMetadata(tools) { |
| - this._cachedToolOutputValidators.clear(); |
| - this._cachedKnownTaskTools.clear(); |
| - this._cachedRequiredTaskTools.clear(); |
| + cacheToolMetadata(tools, reset = true) { |
| + if (reset) { |
| + this._cachedToolOutputValidators.clear(); |
| + this._cachedKnownTaskTools.clear(); |
| + this._cachedRequiredTaskTools.clear(); |
| + } |
| for (const tool of tools) { |
| // If the tool has an outputSchema, create and cache the validator |
| if (tool.outputSchema) { |
| @@ -565,7 +573,7 @@ export class Client extends Protocol { |
| async listTools(params, options) { |
| const result = await this.request({ method: 'tools/list', params }, ListToolsResultSchema, options); |
| // Cache the tools and their output schemas for future validation |
| - this.cacheToolMetadata(result.tools); |
| + this.cacheToolMetadata(result.tools, params?.cursor === undefined); |
| return result; |
| } |
| /** |
| |
| |
| |
| |
| @@ -1,5 +1,5 @@ |
| import { createFetchWithInit, normalizeHeaders } from '../shared/transport.js'; |
| -import { isInitializedNotification, isJSONRPCRequest, isJSONRPCResultResponse, JSONRPCMessageSchema } from '../types.js'; |
| +import { isInitializedNotification, isInitializeRequest, isJSONRPCErrorResponse, isJSONRPCRequest, isJSONRPCResultResponse, JSONRPCMessageSchema } from '../types.js'; |
| import { auth, extractWWWAuthenticateParams, UnauthorizedError } from './auth.js'; |
| import { EventSourceParserStream } from 'eventsource-parser/stream'; |
| // Default reconnection options for StreamableHTTP connections |
| @@ -200,7 +200,7 @@ export class StreamableHTTPClientTransport { |
| if (!event.event || event.event |
| try { |
| const message = JSONRPCMessageSchema.parse(JSON.parse(event.data)); |
| - if (isJSONRPCResultResponse(message)) { |
| + if (isJSONRPCResultResponse(message) || isJSONRPCErrorResponse(message)) { |
| // Mark that we received a response - no need to reconnect for this request |
| receivedResponse = true; |
| if (replayMessageId !== undefined) { |
| @@ -286,7 +286,38 @@ export class StreamableHTTPClientTransport { |
| this.onclose?.(); |
| } |
| async send(message, options) { |
| + return this._send(message, options, false); |
| + } |
| + async _recoverSession(expiredSessionId) { |
| + if (this._sessionRecovery) { |
| + await this._sessionRecovery; |
| + return true; |
| + } |
| + if (this._sessionId !== expiredSessionId) |
| + return true; |
| + this._sessionId = undefined; |
| + this._sessionRecovery = Promise.resolve().then(() => this.onsessionexpired?.()); |
| try { |
| + await this._sessionRecovery; |
| + } |
| + catch (error) { |
| + this._sessionId = undefined; |
| + await this.close(); |
| + throw error; |
| + } |
| + finally { |
| + this._sessionRecovery = undefined; |
| + } |
| + return true; |
| + } |
| + async _send(message, options, isSessionRetry) { |
| + try { |
| + if (this._sessionRecovery && !isInitializeRequest(message) && !isInitializedNotification(message)) { |
| + await this._sessionRecovery; |
| + if (options?.isRequestActive?.() === false) { |
| + throw new Error('Request is no longer active'); |
| + } |
| + } |
| const { resumptionToken, onresumptiontoken } = options || {}; |
| if (resumptionToken) { |
| // If we have at last event ID, we need to reconnect the SSE stream |
| @@ -294,6 +325,7 @@ export class StreamableHTTPClientTransport { |
| return; |
| } |
| const headers = await this._commonHeaders(); |
| + const requestSessionId = headers.get('mcp-session-id') ?? undefined; |
| headers.set('content-type', 'application/json'); |
| headers.set('accept', 'application/json, text/event-stream'); |
| const init = { |
| @@ -306,11 +338,20 @@ export class StreamableHTTPClientTransport { |
| const response = await (this._fetch ?? fetch)(this._url, init); |
| // Handle session ID received during initialization |
| const sessionId = response.headers.get('mcp-session-id'); |
| - if (sessionId) { |
| + if (sessionId && (requestSessionId === undefined || this._sessionId === requestSessionId)) { |
| this._sessionId = sessionId; |
| } |
| if (!response.ok) { |
| const text = await response.text().catch(() => null); |
| + if (response.status === 404 && requestSessionId && !isSessionRetry && !isInitializedNotification(message)) { |
| + const recovered = await this._recoverSession(requestSessionId); |
| + if (options?.isRequestActive?.() === false) { |
| + throw new Error('Request is no longer active'); |
| + } |
| + if (recovered) { |
| + return this._send(message, options, true); |
| + } |
| + } |
| if (response.status |
| // Prevent infinite recursion when server returns 401 after successful auth |
| if (this._hasCompletedAuthFlow) { |
| @@ -331,7 +372,7 @@ export class StreamableHTTPClientTransport { |
| // Mark that we completed auth flow |
| this._hasCompletedAuthFlow = true; |
| // Purposely _not_ awaited, so we don't call onerror twice |
| - return this.send(message); |
| + return this._send(message, options, isSessionRetry); |
| } |
| if (response.status |
| const { resourceMetadataUrl, scope, error } = extractWWWAuthenticateParams(response); |
| @@ -358,7 +399,7 @@ export class StreamableHTTPClientTransport { |
| if (result !== 'AUTHORIZED') { |
| throw new UnauthorizedError(); |
| } |
| - return this.send(message); |
| + return this._send(message, options, isSessionRetry); |
| } |
| } |
| throw new StreamableHTTPError(response.status, `Error POSTing to endpoint: ${text}`); |
| |
| |
| |
| |
| @@ -740,7 +740,12 @@ export class Protocol { |
| } |
| else { |
| // No related task - send through transport normally |
| - this._transport.send(jsonrpcRequest, { relatedRequestId, resumptionToken, onresumptiontoken }).catch(error => { |
| + this._transport.send(jsonrpcRequest, { |
| + relatedRequestId, |
| + resumptionToken, |
| + onresumptiontoken, |
| + isRequestActive: () => this._responseHandlers.has(messageId) |
| + }).catch(error => { |
| this._cleanupTimeout(messageId); |
| reject(error); |
| }); |
|
|
