Convert EverythingServer to use Streamable HTTP

samples/EverythingServer/EverythingServer.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
     <TargetFramework>net9.0</TargetFramework>
@@ -8,14 +8,13 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Hosting" />
     <PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" />
     <PackageReference Include="OpenTelemetry.Extensions.Hosting" />
     <PackageReference Include="OpenTelemetry.Instrumentation.Http" />
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\src\ModelContextProtocol\ModelContextProtocol.csproj" />
+    <ProjectReference Include="..\..\src\ModelContextProtocol.AspNetCore\ModelContextProtocol.AspNetCore.csproj" />
   </ItemGroup>
 
 </Project>

samples/EverythingServer/LoggingUpdateMessageSender.cs

@@ -1,11 +1,10 @@
-using Microsoft.Extensions.Hosting;
-using ModelContextProtocol;
+using ModelContextProtocol;
 using ModelContextProtocol.Protocol;
 using ModelContextProtocol.Server;
 
 namespace EverythingServer;
 
-public class LoggingUpdateMessageSender(IMcpServer server, Func<LoggingLevel> getMinLevel) : BackgroundService
+public class LoggingUpdateMessageSender(IServiceProvider serviceProvider) : BackgroundService
 {
     readonly Dictionary<LoggingLevel, string> _loggingLevelMap = new()
     {
@@ -21,19 +20,35 @@ public class LoggingUpdateMessageSender(IMcpServer server, Func<LoggingLevel> ge
 
     protected override async Task ExecuteAsync(CancellationToken stoppingToken)
     {
+        // Wait for the application to fully start before trying to access the MCP server
+        await Task.Delay(2000, stoppingToken);
+
         while (!stoppingToken.IsCancellationRequested)
         {
-            var newLevel = (LoggingLevel)Random.Shared.Next(_loggingLevelMap.Count);
-
-            var message = new
+            try
+            {
+                // Try to get the server from the service provider
+                var server = serviceProvider.GetService<IMcpServer>();
+                if (server != null)
                 {
-                    Level = newLevel.ToString().ToLower(),
-                    Data = _loggingLevelMap[newLevel],
-                };
+                    var newLevel = (LoggingLevel)Random.Shared.Next(_loggingLevelMap.Count);
 
-            if (newLevel > getMinLevel())
+                    var message = new
+                        {
+                            Level = newLevel.ToString().ToLower(),
+                            Data = _loggingLevelMap[newLevel],
+                        };
+
+                    if (newLevel > server.LoggingLevel)
+                    {
+                        await server.SendNotificationAsync("notifications/message", message, cancellationToken: stoppingToken);
+                    }
+                }
+            }
+            catch (Exception ex)
             {
-                await server.SendNotificationAsync("notifications/message", message, cancellationToken: stoppingToken);
+                // Log the exception but don't crash the service
+                Console.WriteLine($"Error in LoggingUpdateMessageSender: {ex.Message}");
             }
 
             await Task.Delay(15000, stoppingToken);

samples/EverythingServer/Program.cs

@@ -3,9 +3,6 @@
 using EverythingServer.Resources;
 using EverythingServer.Tools;
 using Microsoft.Extensions.AI;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Hosting;
-using Microsoft.Extensions.Logging;
 using ModelContextProtocol;
 using ModelContextProtocol.Protocol;
 using ModelContextProtocol.Server;
@@ -15,19 +12,14 @@
 using OpenTelemetry.Resources;
 using OpenTelemetry.Trace;
 
-var builder = Host.CreateApplicationBuilder(args);
-builder.Logging.AddConsole(consoleLogOptions =>
-{
-    // Configure all logs to go to stderr
-    consoleLogOptions.LogToStandardErrorThreshold = LogLevel.Trace;
-});
+var builder = WebApplication.CreateBuilder(args);
 
-HashSet<string> subscriptions = [];
-var _minimumLoggingLevel = LoggingLevel.Debug;
+// Subscriptions tracks resource URIs to McpServer instances
+Dictionary<string, List<IMcpServer>> subscriptions = new();
 
 builder.Services
     .AddMcpServer()
-    .WithStdioServerTransport()
+    .WithHttpTransport()
     .WithTools<AddTool>()
     .WithTools<AnnotatedMessageTool>()
     .WithTools<EchoTool>()
@@ -44,7 +36,11 @@
 
         if (uri is not null)
         {
-            subscriptions.Add(uri);
+            if (!subscriptions.ContainsKey(uri))
+            {
+                subscriptions[uri] = new List<IMcpServer>();
+            }
+            subscriptions[uri].Add(ctx.Server);
 
             await ctx.Server.SampleAsync([
                 new ChatMessage(ChatRole.System, "You are a helpful test server"),
@@ -65,7 +61,11 @@ await ctx.Server.SampleAsync([
         var uri = ctx.Params?.Uri;
         if (uri is not null)
         {
-            subscriptions.Remove(uri);
+            if (subscriptions.ContainsKey(uri))
+            {
+                // Remove ctx.Server from the subscription list
+                subscriptions[uri].Remove(ctx.Server);
+            }
         }
         return new EmptyResult();
     })
@@ -126,13 +126,13 @@ await ctx.Server.SampleAsync([
             throw new McpException("Missing required argument 'level'", McpErrorCode.InvalidParams);
         }
 
-        _minimumLoggingLevel = ctx.Params.Level;
+        // The SDK updates the LoggingLevel field of the IMcpServer
 
         await ctx.Server.SendNotificationAsync("notifications/message", new
         {
             Level = "debug",
             Logger = "test-server",
-            Data = $"Logging level set to {_minimumLoggingLevel}",
+            Data = $"Logging level set to {ctx.Params.Level}",
         }, cancellationToken: ct);
 
         return new EmptyResult();
@@ -145,10 +145,14 @@ await ctx.Server.SampleAsync([
     .WithLogging(b => b.SetResourceBuilder(resource))
     .UseOtlpExporter();
 
-builder.Services.AddSingleton(subscriptions);
+builder.Services.AddSingleton<IDictionary<string, List<IMcpServer>>>(subscriptions);
 builder.Services.AddHostedService<SubscriptionMessageSender>();
 builder.Services.AddHostedService<LoggingUpdateMessageSender>();
 
-builder.Services.AddSingleton<Func<LoggingLevel>>(_ => () => _minimumLoggingLevel);
+var app = builder.Build();
+
+app.UseHttpsRedirection();
+
+app.MapMcp();
 
-await builder.Build().RunAsync();
+app.Run();

samples/EverythingServer/Properties/launchSettings.json

@@ -0,0 +1,21 @@
+{
+  "$schema": "https://json.schemastore.org/launchsettings.json",
+  "profiles": {
+    "http": {
+      "commandName": "Project",
+      "dotnetRunMessages": true,
+      "applicationUrl": "http://localhost:3001",
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development",
+      }
+    },
+    "https": {
+      "commandName": "Project",
+      "dotnetRunMessages": true,
+      "applicationUrl": "https://localhost:7133;http://localhost:3001",
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development",
+      }
+    }
+  }
+}

samples/EverythingServer/SubscriptionMessageSender.cs

@@ -1,20 +1,33 @@
-using Microsoft.Extensions.Hosting;
-using ModelContextProtocol;
+using ModelContextProtocol;
 using ModelContextProtocol.Server;
 
-internal class SubscriptionMessageSender(IMcpServer server, HashSet<string> subscriptions) : BackgroundService
+internal class SubscriptionMessageSender(IDictionary<string, List<IMcpServer>> subscriptions) : BackgroundService
 {
     protected override async Task ExecuteAsync(CancellationToken stoppingToken)
     {
+        // Wait for the application to fully start before trying to access the MCP server
+        await Task.Delay(2000, stoppingToken);
+
         while (!stoppingToken.IsCancellationRequested)
         {
-            foreach (var uri in subscriptions)
+            try
             {
-                await server.SendNotificationAsync("notifications/resource/updated",
-                    new
+                foreach (var (uri, servers) in subscriptions)
+                {
+                    foreach (var server in servers)
                     {
-                        Uri = uri,
-                    }, cancellationToken: stoppingToken);
+                        await server.SendNotificationAsync("notifications/resource/updated",
+                            new
+                            {
+                                Uri = uri,
+                            }, cancellationToken: stoppingToken);
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                // Log the exception but don't crash the service
+                Console.WriteLine($"Error in SubscriptionMessageSender: {ex.Message}");
             }
 
             await Task.Delay(5000, stoppingToken);