modelcontextprotocol/typescript-sdk
Watch
1
0
Fork
You've already forked typescript-sdk
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

SPEC COMPLIANCE: Remove loose/passthrough types not allowed/defined by MCP spec + Task types (#1242)

Browse source
This commit is contained in:
Konstantin Konstantinov 2025-12-09 13:52:23 +02:00 • committed by GitHub
commit a606fb1790
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 866 additions and 488 deletions
Download patch file Download diff file Expand all files Collapse all files

47
src/shared/protocol.ts
View file

@ -13,22 +13,20 @@ import {
ListTasksResultSchema,
CancelTaskRequestSchema,
CancelTaskResultSchema,
isJSONRPCError,
isJSONRPCErrorResponse,
isJSONRPCRequest,
isJSONRPCResponse,
isJSONRPCResultResponse,
isJSONRPCNotification,
JSONRPCError,
JSONRPCErrorResponse,
JSONRPCNotification,
JSONRPCRequest,
JSONRPCResponse,
McpError,
Notification,
PingRequestSchema,
Progress,
ProgressNotification,
ProgressNotificationSchema,
RELATED_TASK_META_KEY,
Request,
RequestId,
Result,
ServerCapabilities,
@ -41,7 +39,11 @@ import {
CancelledNotification,
Task,
TaskStatusNotification,
TaskStatusNotificationSchema
TaskStatusNotificationSchema,
Request,
Notification,
JSONRPCResultResponse,
isTaskAugmentedRequestParams
} from '../types.js';
import { Transport, TransportSendOptions } from './transport.js';
import { AuthInfo } from '../server/auth/types.js';
@ -324,7 +326,7 @@ export abstract class Protocol<SendRequestT extends Request, SendNotificationT e
> = new Map();
private _requestHandlerAbortControllers: Map<RequestId, AbortController> = new Map();
private _notificationHandlers: Map<string, (notification: JSONRPCNotification) => Promise<void>> = new Map();
private _responseHandlers: Map<number, (response: JSONRPCResponse | Error) => void> = new Map();
private _responseHandlers: Map<number, (response: JSONRPCResultResponse | Error) => void> = new Map();
private _progressHandlers: Map<number, ProgressCallback> = new Map();
private _timeoutInfo: Map<number, TimeoutInfo> = new Map();
private _pendingDebouncedNotifications = new Set<string>();
@ -335,7 +337,7 @@ export abstract class Protocol<SendRequestT extends Request, SendNotificationT e
private _taskStore?: TaskStore;
private _taskMessageQueue?: TaskMessageQueue;
private _requestResolvers: Map<RequestId, (response: JSONRPCResponse | Error) => void> = new Map();
private _requestResolvers: Map<RequestId, (response: JSONRPCResultResponse | Error) => void> = new Map();
/**
* Callback for when the connection is closed for any reason.
@ -408,18 +410,18 @@ export abstract class Protocol<SendRequestT extends Request, SendNotificationT e
const requestId = message.id;
// Lookup resolver in _requestResolvers map
const resolver = this._requestResolvers.get(requestId);
const resolver = this._requestResolvers.get(requestId as RequestId);
if (resolver) {
// Remove resolver from map after invocation
this._requestResolvers.delete(requestId);
this._requestResolvers.delete(requestId as RequestId);
// Invoke resolver with response or error
if (queuedMessage.type === 'response') {
resolver(message as JSONRPCResponse);
resolver(message as JSONRPCResultResponse);
} else {
// Convert JSONRPCError to McpError
const errorMessage = message as JSONRPCError;
const errorMessage = message as JSONRPCErrorResponse;
const error = new McpError(
errorMessage.error.code,
errorMessage.error.message,
@ -546,6 +548,9 @@ export abstract class Protocol<SendRequestT extends Request, SendNotificationT e
}
private async _oncancel(notification: CancelledNotification): Promise<void> {
if (!notification.params.requestId) {
return;
}
// Handle request cancellation
const controller = this._requestHandlerAbortControllers.get(notification.params.requestId);
controller?.abort(notification.params.reason);
@ -616,7 +621,7 @@ export abstract class Protocol<SendRequestT extends Request, SendNotificationT e
const _onmessage = this._transport?.onmessage;
this._transport.onmessage = (message, extra) => {
_onmessage?.(message, extra);
if (isJSONRPCResponse(message) || isJSONRPCError(message)) {
if (isJSONRPCResultResponse(message) || isJSONRPCErrorResponse(message)) {
this._onresponse(message);
} else if (isJSONRPCRequest(message)) {
this._onrequest(message, extra);
@ -675,7 +680,7 @@ export abstract class Protocol<SendRequestT extends Request, SendNotificationT e
const relatedTaskId = request.params?._meta?.[RELATED_TASK_META_KEY]?.taskId;
if (handler === undefined) {
const errorResponse: JSONRPCError = {
const errorResponse: JSONRPCErrorResponse = {
jsonrpc: '2.0',
id: request.id,
error: {
@ -706,7 +711,7 @@ export abstract class Protocol<SendRequestT extends Request, SendNotificationT e
const abortController = new AbortController();
this._requestHandlerAbortControllers.set(request.id, abortController);
const taskCreationParams = request.params?.task;
const taskCreationParams = isTaskAugmentedRequestParams(request.params) ? request.params.task : undefined;
const taskStore = this._taskStore ? this.requestTaskStore(request, capturedTransport?.sessionId) : undefined;
const fullExtra: RequestHandlerExtra<SendRequestT, SendNotificationT> = {
@ -791,7 +796,7 @@ export abstract class Protocol<SendRequestT extends Request, SendNotificationT e
return;
}
const errorResponse: JSONRPCError = {
const errorResponse: JSONRPCErrorResponse = {
jsonrpc: '2.0',
id: request.id,
error: {
@ -852,14 +857,14 @@ export abstract class Protocol<SendRequestT extends Request, SendNotificationT e
handler(params);
}
private _onresponse(response: JSONRPCResponse | JSONRPCError): void {
private _onresponse(response: JSONRPCResponse | JSONRPCErrorResponse): void {
const messageId = Number(response.id);
// Check if this is a response to a queued request
const resolver = this._requestResolvers.get(messageId);
if (resolver) {
this._requestResolvers.delete(messageId);
if (isJSONRPCResponse(response)) {
if (isJSONRPCResultResponse(response)) {
resolver(response);
} else {
const error = new McpError(response.error.code, response.error.message, response.error.data);
@ -879,7 +884,7 @@ export abstract class Protocol<SendRequestT extends Request, SendNotificationT e
// Keep progress handler alive for CreateTaskResult responses
let isTaskResponse = false;
if (isJSONRPCResponse(response) && response.result && typeof response.result === 'object') {
if (isJSONRPCResultResponse(response) && response.result && typeof response.result === 'object') {
const result = response.result as Record<string, unknown>;
if (result.task && typeof result.task === 'object') {
const task = result.task as Record<string, unknown>;
@ -894,7 +899,7 @@ export abstract class Protocol<SendRequestT extends Request, SendNotificationT e
this._progressHandlers.delete(messageId);
}
if (isJSONRPCResponse(response)) {
if (isJSONRPCResultResponse(response)) {
handler(response);
} else {
const error = McpError.fromError(response.error.code, response.error.message, response.error.data);
@ -1191,7 +1196,7 @@ export abstract class Protocol<SendRequestT extends Request, SendNotificationT e
const relatedTaskId = relatedTask?.taskId;
if (relatedTaskId) {
// Store the response resolver for this request so responses can be routed back
const responseResolver = (response: JSONRPCResponse | Error) => {
const responseResolver = (response: JSONRPCResultResponse | Error) => {
const handler = this._responseHandlers.get(messageId);
if (handler) {
handler(response);