重构请求变换

Author: xljiulang

HttpMouse/Abstractions/IReverseConnectionService.cs

@@ -1,7 +1,6 @@
 using Microsoft.AspNetCore.Connections;
 using System;
 using System.IO;
-using System.Net.Http;
 using System.Threading;
 using System.Threading.Tasks;
 
@@ -15,10 +14,10 @@ public interface IReverseConnectionService
         /// <summary>
         /// 创建一个反向连接
         /// </summary>
-        /// <param name="context"></param>
+        /// <param name="clientDomain">客户端域名</param>
         /// <param name="cancellation"></param>
         /// <returns></returns>
-        ValueTask<Stream> CreateReverseConnectionAsync(SocketsHttpConnectionContext context, CancellationToken cancellation);
+        ValueTask<Stream> CreateReverseConnectionAsync(string clientDomain, CancellationToken cancellation);
 
         /// <summary>
         /// 处理kestrel的连接 

HttpMouse/Implementions/MainConnection.cs

@@ -18,7 +18,6 @@ sealed class MainConnection : IMainConnection
     {
         private readonly WebSocket webSocket;
         private readonly IOptionsMonitor<HttpMouseOptions> options;
-        private static readonly ForwarderRequestConfig defaultHttpRequest = new();
 
         /// <summary>
         /// 获取绑定的域名
@@ -62,7 +61,7 @@ public ClusterConfig ToClusterConfig()
 
             if (this.options.CurrentValue.HttpRequest.TryGetValue(this.Domain, out var httpRequest) == false)
             {
-                httpRequest = defaultHttpRequest;
+                httpRequest = ForwarderRequestConfig.Empty;
             }
 
             return new ClusterConfig

HttpMouse/Implementions/MemoryConfig.cs

@@ -11,7 +11,7 @@ namespace HttpMouse.Implementions
     /// </summary>
     sealed class MemoryConfig : IProxyConfig
     {
-        private readonly CancellationTokenSource cancellationToken = new CancellationTokenSource();
+        private readonly CancellationTokenSource cancellationToken = new();
 
         /// <summary>
         /// 获取路由配置

HttpMouse/Implementions/ReverseConnectionService.cs

@@ -5,7 +5,6 @@
 using System.Collections.Concurrent;
 using System.IO;
 using System.IO.Pipelines;
-using System.Net.Http;
 using System.Threading;
 using System.Threading.Tasks;
 
@@ -17,7 +16,6 @@ namespace HttpMouse.Implementions
     sealed class ReverseConnectionService : IReverseConnectionService
     {
         private uint _reverseConnectionId = 0;
-        private readonly HttpRequestOptionsKey<string> clientDomainKey = new("ClientDomain");
         private readonly TimeSpan timeout = TimeSpan.FromSeconds(10d);
         private readonly ConcurrentDictionary<uint, IAwaitableCompletionSource<Stream>> reverseConnectAwaiterTable = new();
 
@@ -40,16 +38,11 @@ public ReverseConnectionService(
         /// <summary>
         /// 创建一个反向连接
         /// </summary>
-        /// <param name="context"></param>
+        /// <param name="clientDomain">客户端域名</param>
         /// <param name="cancellation"></param>
         /// <returns></returns>
-        public async ValueTask<Stream> CreateReverseConnectionAsync(SocketsHttpConnectionContext context, CancellationToken cancellation)
+        public async ValueTask<Stream> CreateReverseConnectionAsync(string clientDomain, CancellationToken cancellation)
         {
-            if (context.InitialRequestMessage.Options.TryGetValue(clientDomainKey, out var clientDomain) == false)
-            {
-                throw new InvalidOperationException("无法创建反向连接：未知道目标域名");
-            }
-
             if (this.mainConnectionService.TryGetValue(clientDomain, out var mainConnection) == false)
             {
                 throw new Exception($"无法创建反向连接：上游{clientDomain}未连接");

HttpMouse/Implementions/ReverseHttpClientFactory.cs

@@ -15,6 +15,8 @@ namespace HttpMouse.Implementions
     /// </summary>
     sealed class ReverseHttpClientFactory : IForwarderHttpClientFactory, IDisposable
     {
+        private readonly HttpRequestOptionsKey<string> clientDomainKey = new("ClientDomain");
+
         private readonly SocketsHttpHandler httpHandler;
         private readonly IReverseConnectionService reverseConnectionService;
         private readonly ILogger<ReverseHttpClientFactory> logger;
@@ -25,7 +27,8 @@ sealed class ReverseHttpClientFactory : IForwarderHttpClientFactory, IDisposable
         /// <param name="reverseConnectionService"></param>
         /// <param name="logger"></param>
         public ReverseHttpClientFactory(
-            IReverseConnectionService reverseConnectionService, ILogger<ReverseHttpClientFactory> logger)
+            IReverseConnectionService reverseConnectionService,
+            ILogger<ReverseHttpClientFactory> logger)
         {
             this.reverseConnectionService = reverseConnectionService;
             this.logger = logger;
@@ -52,9 +55,14 @@ public ReverseHttpClientFactory(
         /// <returns></returns>
         private async ValueTask<Stream> ConnectCallback(SocketsHttpConnectionContext context, CancellationToken cancellation)
         {
+            if (context.InitialRequestMessage.Options.TryGetValue(clientDomainKey, out var clientDomain) == false)
+            {
+                throw new InvalidOperationException($"未设置{nameof(HttpRequestMessage)}的Options：{clientDomainKey.Key}");
+            }
+
             try
             {
-                return await this.reverseConnectionService.CreateReverseConnectionAsync(context, cancellation);
+                return await this.reverseConnectionService.CreateReverseConnectionAsync(clientDomain, cancellation);
             }
             catch (Exception ex)
             {

HttpMouse/FallbackExtensions.cs renamed to HttpMouse/ReverseProxyExtensions.cs

@@ -3,11 +3,30 @@
 using Microsoft.AspNetCore.Routing;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Options;
+using System.Net.Http;
+using System.Threading.Tasks;
+using Yarp.ReverseProxy.Transforms;
 
 namespace HttpMouse
 {
-    static class FallbackExtensions
+    static class ReverseProxyExtensions
     {
+        /// <summary>
+        /// 添加ClientDomain的options
+        /// </summary>
+        /// <param name="builder"></param>
+        /// <returns></returns>
+        public static IReverseProxyBuilder AddClientDomainOptionsTransform(this IReverseProxyBuilder builder)
+        {
+            var optionsKey = new HttpRequestOptionsKey<string>("ClientDomain");
+            return builder.AddTransforms(ctx => ctx.AddRequestTransform(request =>
+            {
+                var clientDomain = request.HttpContext.Request.Host.Host;
+                request.ProxyRequest.Options.Set(optionsKey, clientDomain);
+                return ValueTask.CompletedTask;
+            }));
+        }
+
         /// <summary>
         /// 映射反向代理回退
         /// </summary>

HttpMouse/Startup.cs

@@ -4,11 +4,8 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using Serilog;
-using System.Net.Http;
-using System.Threading.Tasks;
 using Yarp.ReverseProxy.Configuration;
 using Yarp.ReverseProxy.Forwarder;
-using Yarp.ReverseProxy.Transforms;
 
 namespace HttpMouse
 {
@@ -29,13 +26,7 @@ public void ConfigureServices(IServiceCollection services)
         {
             services
                 .AddReverseProxy()
-                .AddTransforms(ctx => ctx.AddRequestTransform(request =>
-                {
-                    var key = new HttpRequestOptionsKey<string>("ClientDomain");
-                    var clientDomain = request.HttpContext.Request.Host.Host;
-                    request.ProxyRequest.Options.Set(key, clientDomain);
-                    return ValueTask.CompletedTask;
-                }));
+                .AddClientDomainOptionsTransform();
 
             services
                 .AddSingleton<IProxyConfigProvider, MomoryConfigProvider>()