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

Emit root-relative /message endpoint when using SSE Server (#323)

Browse source
This commit is contained in:
dogdie233 2025-04-21 05:31:48 +08:00 • committed by GitHub
commit 0c9e91f98c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 18 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/ModelContextProtocol.AspNetCore/SseHandler.cs
View file

@ -31,7 +31,9 @@ internal sealed class SseHandler(
StreamableHttpHandler.InitializeSseResponse(context); StreamableHttpHandler.InitializeSseResponse(context);
await using var transport = new SseResponseStreamTransport(context.Response.Body, $"message?sessionId={sessionId}"); var requestPath = (context.Request.PathBase + context.Request.Path).ToString();
var endpointPattern = requestPath[..(requestPath.LastIndexOf('/') + 1)];
await using var transport = new SseResponseStreamTransport(context.Response.Body, $"{endpointPattern}message?sessionId={sessionId}");
await using var httpMcpSession = new HttpMcpSession<SseResponseStreamTransport>(sessionId, transport, context.User, httpMcpServerOptions.Value.TimeProvider); await using var httpMcpSession = new HttpMcpSession<SseResponseStreamTransport>(sessionId, transport, context.User, httpMcpServerOptions.Value.TimeProvider);
if (!_sessions.TryAdd(sessionId, httpMcpSession)) if (!_sessions.TryAdd(sessionId, httpMcpSession))
{ {

19
tests/ModelContextProtocol.AspNetCore.Tests/MapMcpTests.cs
View file

@ -32,23 +32,34 @@ public class MapMcpTests(ITestOutputHelper testOutputHelper) : KestrelInMemoryTe
Assert.StartsWith("You must call WithHttpTransport()", exception.Message); Assert.StartsWith("You must call WithHttpTransport()", exception.Message);
} }
[Fact] [Theory]
public async Task Allows_Customizing_Route() [InlineData("/mcp")]
[InlineData("/mcp/secondary")]
public async Task Allows_Customizing_Route(string pattern)
{ {
Builder.Services.AddMcpServer().WithHttpTransport(); Builder.Services.AddMcpServer().WithHttpTransport();
await using var app = Builder.Build(); await using var app = Builder.Build();
app.MapMcp("/mcp"); app.MapMcp(pattern);
await app.StartAsync(TestContext.Current.CancellationToken); await app.StartAsync(TestContext.Current.CancellationToken);
using var response = await HttpClient.GetAsync("http://localhost/mcp/sse", HttpCompletionOption.ResponseHeadersRead, TestContext.Current.CancellationToken); using var response = await HttpClient.GetAsync($"http://localhost{pattern}/sse", HttpCompletionOption.ResponseHeadersRead, TestContext.Current.CancellationToken);
response.EnsureSuccessStatusCode(); response.EnsureSuccessStatusCode();
using var sseStream = await response.Content.ReadAsStreamAsync(TestContext.Current.CancellationToken);
using var sseStreamReader = new StreamReader(sseStream, System.Text.Encoding.UTF8);
var eventLine = await sseStreamReader.ReadLineAsync(TestContext.Current.CancellationToken);
var dataLine = await sseStreamReader.ReadLineAsync(TestContext.Current.CancellationToken);
Assert.NotNull(eventLine);
Assert.Equal("event: endpoint", eventLine);
Assert.NotNull(dataLine);
Assert.Equal($"data: {pattern}/message", dataLine[..dataLine.IndexOf('?')]);
} }
[Theory] [Theory]
[InlineData("/a", "/a/sse")] [InlineData("/a", "/a/sse")]
[InlineData("/a/", "/a/sse")] [InlineData("/a/", "/a/sse")]
[InlineData("/a/b", "/a/b/sse")]
public async Task CanConnect_WithMcpClient_AfterCustomizingRoute(string routePattern, string requestPath) public async Task CanConnect_WithMcpClient_AfterCustomizingRoute(string routePattern, string requestPath)
{ {
Builder.Services.AddMcpServer(options => Builder.Services.AddMcpServer(options =>