refactor: wrap setRequestHandler for high-level servers #14
+691
−160
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
naji247
requested changes
Nov 21, 2025
Comment on lines
31
to
36
| if (!(error instanceof Error)) { | ||
| return { | ||
| message: stringifyNonError(error), | ||
| type: "NonError", | ||
| type: "UnknownErrorType", | ||
| platform: "javascript", | ||
| }; |
Member
There was a problem hiding this comment.
I think based on their code, we know it is an McpError type I'm pretty sure. You could do a quick includes check or something here.
Comment on lines
+287
to
+297
| return await ( | ||
| originalCallback as ( | ||
| extra: CompatibleRequestHandlerExtra, | ||
| ) => Promise<CallToolResult> | ||
| )(extra); | ||
| } else { | ||
| return await ( | ||
| originalCallback as ( | ||
| args: any, | ||
| extra: CompatibleRequestHandlerExtra, | ||
| ) => Promise<CallToolResult> |
Member
There was a problem hiding this comment.
I feel like the type casting here makes this way less readable... Can we remove?
Comment on lines
+329
to
+361
| function setupToolsCallHandlerWrapping(server: HighLevelMCPServerLike): void { | ||
| const lowLevelServer = server.server as MCPServerLike; | ||
|
|
||
| // Check if tools/call handler already exists | ||
| const existingHandler = lowLevelServer._requestHandlers.get("tools/call"); | ||
| if (existingHandler) { | ||
| const wrappedHandler = createToolsCallWrapper( | ||
| existingHandler, | ||
| lowLevelServer, | ||
| ); | ||
| lowLevelServer._requestHandlers.set("tools/call", wrappedHandler); | ||
| } | ||
|
|
||
| // Intercept future calls to setRequestHandler for tools registered after track() | ||
| const originalSetRequestHandler = | ||
| lowLevelServer.setRequestHandler.bind(lowLevelServer); | ||
|
|
||
| lowLevelServer.setRequestHandler = function ( | ||
| requestSchema: any, | ||
| handler: any, | ||
| ) { | ||
| const method = requestSchema?.shape?.method?.value; | ||
|
|
||
| // Only wrap tools/call handler | ||
| if (method === "tools/call") { | ||
| const wrappedHandler = createToolsCallWrapper(handler, lowLevelServer); | ||
| return originalSetRequestHandler(requestSchema, wrappedHandler); | ||
| } | ||
|
|
||
| // Pass through all other handlers unchanged | ||
| return originalSetRequestHandler(requestSchema, handler); | ||
| } as any; | ||
| } |
Member
There was a problem hiding this comment.
I'm a bit confused as to what this whole function does lol...
Comment on lines
+342
to
+360
| // Intercept future calls to setRequestHandler for tools registered after track() | ||
| const originalSetRequestHandler = | ||
| lowLevelServer.setRequestHandler.bind(lowLevelServer); | ||
|
|
||
| lowLevelServer.setRequestHandler = function ( | ||
| requestSchema: any, | ||
| handler: any, | ||
| ) { | ||
| const method = requestSchema?.shape?.method?.value; | ||
|
|
||
| // Only wrap tools/call handler | ||
| if (method === "tools/call") { | ||
| const wrappedHandler = createToolsCallWrapper(handler, lowLevelServer); | ||
| return originalSetRequestHandler(requestSchema, wrappedHandler); | ||
| } | ||
|
|
||
| // Pass through all other handlers unchanged | ||
| return originalSetRequestHandler(requestSchema, handler); | ||
| } as any; |
Member
There was a problem hiding this comment.
I guess I just don't think this handler is ever called more than once so the rest of this function may be redundant
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary
Modified
tracingV2.tssetupToolsCallHandlerWrapping()to interceptsetRequestHandler()calls for tools/call handlercreateToolsCallWrapper()to centralize tracing logic at the protocol handler leveladdTracingToToolCallback()to only remove context from args instead of handling full tracingTest Plan