fix(server): restore onclose after modern exchanges - #2778
Open
vjymisal0 wants to merge 1 commit into
Open
Conversation
|
@modelcontextprotocol/client
@modelcontextprotocol/codemod
@modelcontextprotocol/core
@modelcontextprotocol/server
@modelcontextprotocol/server-legacy
@modelcontextprotocol/express
@modelcontextprotocol/fastify
@modelcontextprotocol/hono
@modelcontextprotocol/node
commit: |
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
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
Fixes #2607.
When a
createMcpHandlerfactory returns the sameMcpServerinstance for multiple modern requests, the handler temporarily wrapsserver.onclosefor in-flight tracking. The wrapper removed the server from the in-flight set but did not restore the previousonclose, so reused servers accumulated a nested wrapper chain across requests.This restores the previous
onclosebefore invoking it, so each completed exchange leaves a reused server with its original close callback instead of another wrapper layer.Tests
pnpm --filter @modelcontextprotocol/server exec vitest run test/server/createMcpHandler.test.ts -t "restores a reused server onclose"pnpm --filter @modelcontextprotocol/server exec vitest run test/server/createMcpHandler.test.tspnpm exec prettier --check packages/server/src/server/createMcpHandler.ts packages/server/test/server/createMcpHandler.test.tspnpm --dir packages/server exec eslint src/server/createMcpHandler.tspnpm --filter @modelcontextprotocol/server run typecheckNote:
pnpm --filter @modelcontextprotocol/server run checkcurrently reaches Prettier warnings across many existing package files unrelated to this patch, so I also ran targeted Prettier/ESLint on the touched files.