Refactor AddYllibedHttpServer to avoid recursion and simplify handler registrations

Author: carldebilly

Yllibed.HttpServer/Extensions/ServiceCollectionExtensions.cs

@@ -39,7 +39,18 @@ public static IServiceCollection AddYllibedHttpServer(this IServiceCollection se
 	public static IServiceCollection AddYllibedHttpServer(this IServiceCollection services, Action<ServerOptions> configureOptions)
 	{
 		services.Configure(configureOptions);
-		return services.AddYllibedHttpServer();
+
+		// Avoid calling the parameterless overload to prevent confusion/recursion; register the same singletons directly.
+		services.TryAddSingleton<HandlerRegistrationService>();
+		services.TryAddSingleton<Server>(sp =>
+		{
+			var server = new Server(sp.GetRequiredService<IOptions<ServerOptions>>());
+			var registrationService = sp.GetRequiredService<HandlerRegistrationService>();
+			registrationService.RegisterHandlers(server, sp);
+			return server;
+		});
+
+		return services;
 	}
 
 	/// <summary>

Yllibed.HttpServer/Handlers/GuardHandler.cs

@@ -60,7 +60,7 @@ public GuardHandler(
 		MaxHeadersCount = maxHeadersCount;
 		MaxHeadersTotalSize = maxHeadersTotalSize;
 		MaxBodyBytes = maxBodyBytes;
-		_allowedMethods = allowedMethods != null ? new HashSet<string>(allowedMethods.Select(m => m.ToUpperInvariant()), StringComparer.OrdinalIgnoreCase) : null;
+		_allowedMethods = allowedMethods != null ? new HashSet<string>(allowedMethods, StringComparer.OrdinalIgnoreCase) : null;
 		_allowedHosts = allowedHosts != null ? new HashSet<string>(allowedHosts, StringComparer.OrdinalIgnoreCase) : null;
 		RequireHostHeader = requireHostHeader;
 		_inner = inner;
@@ -138,11 +138,11 @@ public async Task HandleRequest(CancellationToken ct, IHttpServerRequest request
 				{
 					// Approximate header size as key length + sum of values length
 					total += kvp.Key.Length;
-					foreach (var v in kvp.Value)
+					total += kvp.Value.Sum(v => v?.Length ?? 0);
+					if (total > maxSize)
 					{
-						total += v?.Length ?? 0;
+						break;
 					}
-					if (total > maxSize) break;
 				}
 				if (total > maxSize)
 				{
@@ -162,7 +162,7 @@ public async Task HandleRequest(CancellationToken ct, IHttpServerRequest request
 		// 4) If wrapping another handler, pass-through
 		if (_inner is not null)
 		{
-			await _inner.HandleRequest(ct, request, relativePath).ConfigureAwait(true);
+			await _inner.HandleRequest(ct, request, relativePath);
 		}
 	}