Skip to content

fix: Handle SSE Disconnects Properly When use starlette middleware #1222

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 12 commits into
base: main
Choose a base branch
from
46 changes: 26 additions & 20 deletions src/mcp/server/fastmcp/server.py
Original file line number Diff line number Diff line change
Expand Up @@ -735,20 +735,25 @@ def sse_app(self, mount_path: str | None = None) -> Starlette:
security_settings=self.settings.transport_security,
)

async def handle_sse(scope: Scope, receive: Receive, send: Send):
# Add client ID from auth context into request context if available

async with sse.connect_sse(
scope,
receive,
send,
) as streams:
await self._mcp_server.run(
streams[0],
streams[1],
self._mcp_server.create_initialization_options(),
)
return Response()
async def handle_sse(request: Request) -> Response:
"""Handle SSE connection using Starlette's EventSourceResponse."""

class SSEConnectionResponse(Response):
def __init__(self, sse_transport: SseServerTransport, server: MCPServer) -> None:
super().__init__()
self.sse_transport = sse_transport
self.server = server

async def __call__(self, scope: Scope, receive: Receive, send: Send) -> None:
async with self.sse_transport.connect_sse(scope, receive, send) as streams:
await self.server.run(
streams[0],
streams[1],
self.server.create_initialization_options(),
)

# Return the Response object for Starlette to handle
return SSEConnectionResponse(sse, self._mcp_server)

# Create routes
routes: list[Route | Mount] = []
Expand Down Expand Up @@ -798,10 +803,15 @@ async def handle_sse(scope: Scope, receive: Receive, send: Send):
)

# Auth is enabled, wrap the endpoints with RequireAuthMiddleware
async def handle_sse_auth(scope: Scope, receive: Receive, send: Send) -> None:
request = Request(scope, receive)
response = await handle_sse(request)
await response(scope, receive, send)

routes.append(
Route(
self.settings.sse_path,
endpoint=RequireAuthMiddleware(handle_sse, required_scopes, resource_metadata_url),
endpoint=RequireAuthMiddleware(handle_sse_auth, required_scopes, resource_metadata_url),
methods=["GET"],
)
)
Expand All @@ -814,14 +824,10 @@ async def handle_sse(scope: Scope, receive: Receive, send: Send):
else:
# Auth is disabled, no need for RequireAuthMiddleware
# Since handle_sse is an ASGI app, we need to create a compatible endpoint
async def sse_endpoint(request: Request) -> Response:
# Convert the Starlette request to ASGI parameters
return await handle_sse(request.scope, request.receive, request._send) # type: ignore[reportPrivateUsage]

routes.append(
Route(
self.settings.sse_path,
endpoint=sse_endpoint,
endpoint=handle_sse,
methods=["GET"],
)
)
Expand Down
Loading