Add IServerDelegationFeature to DI #40043 (#41737)

Author: Tratcher

src/Servers/HttpSys/src/MessagePump.cs

@@ -13,7 +13,7 @@
 
 namespace Microsoft.AspNetCore.Server.HttpSys;
 
-internal sealed partial class MessagePump : IServer
+internal sealed partial class MessagePump : IServer, IServerDelegationFeature
 {
     private readonly ILogger _logger;
     private readonly HttpSysOptions _options;
@@ -53,8 +53,7 @@ public MessagePump(IOptions<HttpSysOptions> options, ILoggerFactory loggerFactor
 
         if (HttpApi.SupportsDelegation)
         {
-            var delegationProperty = new ServerDelegationPropertyFeature(Listener.UrlGroup, _logger);
-            Features.Set<IServerDelegationFeature>(delegationProperty);
+            Features.Set<IServerDelegationFeature>(this);
         }
 
         _maxAccepts = _options.MaxAccepts;
@@ -271,6 +270,13 @@ void RegisterCancelation()
         return _shutdownSignal.Task;
     }
 
+    public DelegationRule CreateDelegationRule(string queueName, string uri)
+    {
+        var rule = new DelegationRule(Listener.UrlGroup, queueName, uri, _logger);
+        Listener.UrlGroup.SetDelegationProperty(rule.Queue);
+        return rule;
+    }
+
     public void Dispose()
     {
         _stopping = 1;

src/Servers/HttpSys/src/ServerDelegationPropertyFeature.cs

@@ -28,7 +28,12 @@ public static IWebHostBuilder UseHttpSys(this IWebHostBuilder hostBuilder)
     {
         return hostBuilder.ConfigureServices(services =>
         {
-            services.AddSingleton<IServer, MessagePump>();
+            services.AddSingleton<MessagePump>();
+            services.AddSingleton<IServer>(services => services.GetRequiredService<MessagePump>());
+            if (HttpApi.SupportsDelegation)
+            {
+                services.AddSingleton<IServerDelegationFeature>(services => services.GetRequiredService<MessagePump>());
+            }
             services.AddTransient<AuthenticationHandler>();
             services.AddSingleton<IServerIntegratedAuth>(services =>
             {

src/Servers/HttpSys/src/WebHostBuilderHttpSysExtensions.cs

@@ -3,16 +3,35 @@
 
 using System.Net.Http;
 using System.Runtime.InteropServices;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.Hosting.Server;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.HttpSys.Internal;
 using Microsoft.AspNetCore.Testing;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Hosting;
 
 namespace Microsoft.AspNetCore.Server.HttpSys.FunctionalTests;
 
 public class DelegateTests
 {
     private static readonly string _expectedResponseString = "Hello from delegatee";
 
+    [ConditionalFact]
+    [DelegateSupportedCondition(true)]
+    public void IServerDelegationFeature_IsAvailableFromServices()
+    {
+        var builder = new HostBuilder();
+        builder.ConfigureWebHost(webHost =>
+        {
+            webHost.UseHttpSys();
+        });
+        using var host = builder.Build();
+        var server = host.Services.GetRequiredService<IServer>();
+        var delegationFeature = host.Services.GetRequiredService<IServerDelegationFeature>();
+        Assert.Same(server, delegationFeature);
+    }
+
     [ConditionalFact]
     [DelegateSupportedCondition(true)]
     public async Task DelegateRequestTest()