Add RequestReadyAsync override to HttpClientService.

FacilityApi · Feb 2, 2024 · cfe0384 · cfe0384
1 parent 503df20
commit cfe0384
Show file tree

Hide file tree

Showing 12 changed files with 205 additions and 3 deletions.
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -6,8 +6,8 @@
     <PackageVersion Include="ArgsReading" Version="2.3.2" />
     <PackageVersion Include="BenchmarkDotNet" Version="0.13.3" />
     <PackageVersion Include="Facility.AspNetCore" Version="3.4.0" />
-    <PackageVersion Include="Facility.Definition" Version="2.11.0" />
-    <PackageVersion Include="Facility.CodeGen.Console" Version="2.11.0" />
+    <PackageVersion Include="Facility.Definition" Version="2.12.0-alpha.1" />
+    <PackageVersion Include="Facility.CodeGen.Console" Version="2.12.0-alpha.1" />
     <PackageVersion Include="FluentAssertions" Version="6.12.0" />
     <PackageVersion Include="MessagePack" Version="2.5.140" />
     <PackageVersion Include="Microsoft.CSharp" Version="4.7.0" />

diff --git a/src/Facility.Core/Http/HttpClientService.cs b/src/Facility.Core/Http/HttpClientService.cs
@@ -193,8 +193,15 @@ protected virtual bool ShouldCreateErrorFromException(Exception exception)
 	/// </summary>
 	protected virtual ServiceErrorDto CreateErrorFromException(Exception exception) => ServiceErrorUtility.CreateInternalErrorForException(exception);
 
+	/// <summary>
+	/// Called right before the request is sent, before aspects are applied.
+	/// </summary>
+	protected virtual Task RequestReadyAsync(HttpRequestMessage httpRequest, ServiceDto requestDto, CancellationToken cancellationToken) => Task.CompletedTask;
+
 	private async Task<HttpResponseMessage> SendRequestAsync(HttpRequestMessage httpRequest, ServiceDto requestDto, CancellationToken cancellationToken)
 	{
+		await AdaptTask(RequestReadyAsync(httpRequest, requestDto, cancellationToken)).ConfigureAwait(true);
+
 		if (m_aspects != null)
 		{
 			foreach (var aspect in m_aspects)

diff --git a/tools/EdgeCases.fsd b/tools/EdgeCases.fsd
@@ -15,6 +15,21 @@ service EdgeCases
 	{
 	}
 
+	/// Custom HTTP method.
+	method customHttp
+	{
+		value: string;
+
+		[http(from: "custom")]
+		extras: map<string>;
+	}:
+	{
+		value: string;
+
+		[http(from: "custom")]
+		extras: map<string>;
+	}
+
 	/// An old DTO.
 	[obsolete]
 	data OldEmptyData

diff --git a/tools/EdgeCases/CustomHttpRequestDto.g.cs b/tools/EdgeCases/CustomHttpRequestDto.g.cs
diff --git a/tools/EdgeCases/CustomHttpResponseDto.g.cs b/tools/EdgeCases/CustomHttpResponseDto.g.cs
diff --git a/tools/EdgeCases/DelegatingEdgeCases.g.cs b/tools/EdgeCases/DelegatingEdgeCases.g.cs
diff --git a/tools/EdgeCases/EdgeCasesMethods.g.cs b/tools/EdgeCases/EdgeCasesMethods.g.cs
diff --git a/tools/EdgeCases/Http/EdgeCasesHttpHandler.g.cs b/tools/EdgeCases/Http/EdgeCasesHttpHandler.g.cs
diff --git a/tools/EdgeCases/Http/EdgeCasesHttpMapping.g.cs b/tools/EdgeCases/Http/EdgeCasesHttpMapping.g.cs
diff --git a/tools/EdgeCases/Http/HttpClientEdgeCases.cs b/tools/EdgeCases/Http/HttpClientEdgeCases.cs
@@ -0,0 +1,19 @@
+using System.Web;
+using Facility.Core;
+
+namespace EdgeCases.Http;
+
+public sealed partial class HttpClientEdgeCases
+{
+	protected override Task RequestReadyAsync(HttpRequestMessage httpRequest, ServiceDto requestDto, CancellationToken cancellationToken)
+	{
+		if (requestDto is CustomHttpRequestDto customDto)
+		{
+			const string prefix = "extra-";
+			var query = HttpUtility.ParseQueryString(httpRequest.RequestUri.Query);
+			customDto.Extras = query.AllKeys.Where(x => x?.StartsWith(prefix, StringComparison.Ordinal) is true).ToDictionary(x => x.Substring(prefix.Length), x => query[x]);
+		}
+
+		return Task.CompletedTask;
+	}
+}
diff --git a/tools/EdgeCases/Http/HttpClientEdgeCases.g.cs b/tools/EdgeCases/Http/HttpClientEdgeCases.g.cs
diff --git a/tools/EdgeCases/IEdgeCases.g.cs b/tools/EdgeCases/IEdgeCases.g.cs