Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
136 changes: 136 additions & 0 deletions src/client/index.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ import {
CreateMessageRequestSchema,
ElicitRequestSchema,
ListRootsRequestSchema,
ListPromptsRequestSchema,
ListResourceTemplatesRequestSchema,
ErrorCode,
} from "../types.js";
import { Transport } from "../shared/transport.js";
Expand Down Expand Up @@ -1301,3 +1303,137 @@ describe('outputSchema validation', () => {


});

test("should return empty arrays for all list methods when server has capabilities but no handlers", async () => {
const server = new Server(
{
name: "test server",
version: "1.0",
},
{
capabilities: {
prompts: {},
resources: {},
tools: {},
},
},
);

server.setRequestHandler(InitializeRequestSchema, (_request) => ({
protocolVersion: LATEST_PROTOCOL_VERSION,
capabilities: {
prompts: {},
resources: {},
tools: {},
},
serverInfo: {
name: "test",
version: "1.0",
},
}));

const [clientTransport, serverTransport] =
InMemoryTransport.createLinkedPair();

const client = new Client(
{
name: "test client",
version: "1.0",
},
{
capabilities: {
sampling: {},
},
},
);

await Promise.all([
client.connect(clientTransport),
server.connect(serverTransport),
]);

const promptsResult = await client.listPrompts();
const resourcesResult = await client.listResources();
const resourceTemplatesResult = await client.listResourceTemplates();
const toolsResult = await client.listTools();

expect(promptsResult.prompts).toEqual([]);
expect(resourcesResult.resources).toEqual([]);
expect(resourceTemplatesResult.resourceTemplates).toEqual([]);
expect(toolsResult.tools).toEqual([]);
});

test("should handle empty collections consistently across all capabilities", async () => {
const server = new Server(
{
name: "test server",
version: "1.0",
},
{
capabilities: {
prompts: {},
resources: {},
tools: {},
},
},
);

server.setRequestHandler(InitializeRequestSchema, (_request) => ({
protocolVersion: LATEST_PROTOCOL_VERSION,
capabilities: {
prompts: {},
resources: {},
tools: {},
},
serverInfo: {
name: "test",
version: "1.0",
},
}));

server.setRequestHandler(ListPromptsRequestSchema, () => ({
prompts: [],
}));

server.setRequestHandler(ListResourcesRequestSchema, () => ({
resources: [],
}));

server.setRequestHandler(ListResourceTemplatesRequestSchema, () => ({
resourceTemplates: [],
}));

server.setRequestHandler(ListToolsRequestSchema, () => ({
tools: [],
}));

const [clientTransport, serverTransport] =
InMemoryTransport.createLinkedPair();

const client = new Client(
{
name: "test client",
version: "1.0",
},
{
capabilities: {
sampling: {},
},
},
);

await Promise.all([
client.connect(clientTransport),
server.connect(serverTransport),
]);

const promptsResult = await client.listPrompts();
const resourcesResult = await client.listResources();
const resourceTemplatesResult = await client.listResourceTemplates();
const toolsResult = await client.listTools();

expect(promptsResult.prompts).toEqual([]);
expect(resourcesResult.resources).toEqual([]);
expect(resourceTemplatesResult.resourceTemplates).toEqual([]);
expect(toolsResult.tools).toEqual([]);
});
66 changes: 51 additions & 15 deletions src/shared/protocol.ts
Original file line number Diff line number Diff line change
Expand Up @@ -366,29 +366,65 @@ export abstract class Protocol<
);
}

/**
* Default handler for requests when no specific handler is registered.
* Automatically returns empty arrays for standard MCP list methods.
*/
private _defaultFallbackRequestHandler( request: JSONRPCRequest, transport: Transport ): SendResultT | null {
const method = request.method;
const listMethodResponses: Record<string, string> = {
"prompts/list": "prompts",
"resources/list": "resources",
"resources/templates/list": "resourceTemplates",
"tools/list": "tools",
};
const responseKey = listMethodResponses[method];
const result = responseKey ? { [responseKey]: [] } as SendResultT : null;
if (result !== null) {
transport
.send({
result: result,
jsonrpc: "2.0",
id: request.id,
})
.catch((error) =>
this._onerror(
new Error(`Failed to send default list response: ${error}`),
),
);
return result;
}

transport
.send({
jsonrpc: "2.0",
id: request.id,
error: {
code: ErrorCode.MethodNotFound,
message: "Method not found",
},
})
.catch((error) =>
this._onerror(
new Error(`Failed to send an error response: ${error}`),
),
);
return null;
}

private _onrequest(request: JSONRPCRequest, extra?: MessageExtraInfo): void {
const handler =
this._requestHandlers.get(request.method) ?? this.fallbackRequestHandler;

// Capture the current transport at request time to ensure responses go to the correct client
const capturedTransport = this._transport;

if(capturedTransport === undefined) {
throw new Error("Error: transport not found.")
}
if (handler === undefined) {
capturedTransport
?.send({
jsonrpc: "2.0",
id: request.id,
error: {
code: ErrorCode.MethodNotFound,
message: "Method not found",
},
})
.catch((error) =>
this._onerror(
new Error(`Failed to send an error response: ${error}`),
),
);
return;
this._defaultFallbackRequestHandler(request, capturedTransport);
return;
}

const abortController = new AbortController();
Expand Down