Move RunAsync inside of Try in MapMcp

halter73 · halter73 · commit 548af092a903 · 2025-04-01T10:50:58.000-07:00
diff --git a/src/ModelContextProtocol.AspNetCore/McpEndpointRouteBuilderExtensions.cs b/src/ModelContextProtocol.AspNetCore/McpEndpointRouteBuilderExtensions.cs
@@ -47,11 +47,11 @@ public static IEndpointConventionBuilder MapMcp(this IEndpointRouteBuilder endpo
             {
                 throw new Exception($"Unreachable given good entropy! Session with ID '{sessionId}' has already been created.");
             }
-            await using var server = McpServerFactory.Create(transport, mcpServerOptions.Value, loggerFactory, endpoints.ServiceProvider);
 
             try
             {
                 var transportTask = transport.RunAsync(cancellationToken: requestAborted);
+                await using var server = McpServerFactory.Create(transport, mcpServerOptions.Value, loggerFactory, endpoints.ServiceProvider);
 
                 try
                 {

Original file line number	Diff line number	Diff line change
`@@ -47,11 +47,11 @@ public static IEndpointConventionBuilder MapMcp(this IEndpointRouteBuilder endpo`
`47`	`47`	`{`
`48`	`48`	`throw new Exception($"Unreachable given good entropy! Session with ID '{sessionId}' has already been created.");`
`49`	`49`	`}`
`50`		`- await using var server = McpServerFactory.Create(transport, mcpServerOptions.Value, loggerFactory, endpoints.ServiceProvider);`
`51`	`50`
`52`	`51`	`try`
`53`	`52`	`{`
`54`	`53`	`var transportTask = transport.RunAsync(cancellationToken: requestAborted);`
	`54`	`+ await using var server = McpServerFactory.Create(transport, mcpServerOptions.Value, loggerFactory, endpoints.ServiceProvider);`
`55`	`55`
`56`	`56`	`try`
`57`	`57`	`{`