Merge pull request #7 from kolan72/dev

kolan72 · web-flow · commit a8dd3672048c · 2025-10-20T16:58:04.000+03:00
Update main before release.
diff --git a/README.md b/README.md
@@ -8,7 +8,7 @@ The library provides an outgoing request resiliency pipeline for `HttpClient`, u
 
 ## ⚡ Key Features
 
-- Provides the ability to create a pipeline to handle typical transient HTTP failures (including the `HttpRequestException` exception).  
+- Provides the ability to create a resiliency pipeline to handle typical transient HTTP failures (including the `HttpRequestException` exception).  
 - Flexible transient failure filter for the final `DelegatingHandler` in the pipeline for the response.  
 - Additionally, custom failure status codes or categories can be added to the final handler filter.  
 - Other exception types (besides `HttpRequestException`) can also be included in the final handler filter.  
diff --git a/samples/FromOptions/RetryFromOptions/RetryFromOptions.csproj b/samples/FromOptions/RetryFromOptions/RetryFromOptions.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <LangVersion>latest</LangVersion>
diff --git a/samples/Intro/Fallback/Fallback.csproj b/samples/Intro/Fallback/Fallback.csproj
@@ -2,17 +2,12 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <SuppressTfmSupportBuildWarnings>true</SuppressTfmSupportBuildWarnings>
   </PropertyGroup>
 
-  <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.8" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="9.0.8" />
-  </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\..\Shared\Shared.csproj" />
   </ItemGroup>
diff --git a/samples/Intro/Retries/Retries.csproj b/samples/Intro/Retries/Retries.csproj
@@ -2,20 +2,11 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <LangVersion>latest</LangVersion>
     <SuppressTfmSupportBuildWarnings>true</SuppressTfmSupportBuildWarnings>
   </PropertyGroup>
 
-  <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="9.0.8" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.8" />
-    <PackageReference Include="Microsoft.Extensions.Http" Version="9.0.8" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="9.0.8" />
-    <PackageReference Include="PoliNorError.Extensions.Http" Version="0.3.0" />
-    <PackageReference Include="System.Text.Json" Version="9.0.8" />
-  </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\..\Shared\Shared.csproj" />
   </ItemGroup>
diff --git a/samples/Shared/Shared.csproj b/samples/Shared/Shared.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <SuppressTfmSupportBuildWarnings>true</SuppressTfmSupportBuildWarnings>
   </PropertyGroup>
 
@@ -11,9 +11,9 @@
     <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.8" />
     <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="9.0.8" />
     <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="9.0.8" />
-    <PackageReference Include="PoliNorError" Version="2.24.0" />
-    <PackageReference Include="PoliNorError.Extensions.Http" Version="0.3.0" />
-    <PackageReference Include="Spectre.Console" Version="0.50.0" />
+    <PackageReference Include="PoliNorError" Version="2.24.12" />
+    <PackageReference Include="PoliNorError.Extensions.Http" Version="0.5.0" />
+    <PackageReference Include="Spectre.Console" Version="0.51.1" />
     <PackageReference Include="System.Text.Json" Version="9.0.8" />
     <PackageReference Include="vertical-spectreconsolelogger" Version="0.10.1-dev.20240326.31" />
   </ItemGroup>
diff --git a/src/HttpPolicyResultHandler.cs b/src/HttpPolicyResultHandler.cs
@@ -2,12 +2,13 @@
 using System.Net.Http;
 using System.Threading.Tasks;
 using System.Threading;
+using PoliNorError.Extensions.PolicyResultHandling;
 
 namespace PoliNorError.Extensions.Http
 {
 	internal interface IHttpPolicyResultHandler
 	{
-		void AttachTo(RetryPolicy retryPolicy);
+		void AttachTo(Policy policy);
 	}
 
 	internal class SyncHttpPolicyResultHandler : IHttpPolicyResultHandler
@@ -19,9 +20,9 @@ public SyncHttpPolicyResultHandler(Action<PolicyResult<HttpResponseMessage>, Can
 			_syncHandler = syncHandler;
 		}
 
-		public void AttachTo(RetryPolicy retryPolicy)
+		public void AttachTo(Policy policy)
 		{
-			retryPolicy.AddPolicyResultHandler(_syncHandler);
+			policy.AddHandlerForPolicyResult(_syncHandler);
 		}
 	}
 
@@ -34,9 +35,9 @@ public NotCancelableSyncHttpPolicyResultHandler(Action<PolicyResult<HttpResponse
 			_syncHandler = syncHandler;
 		}
 
-        public void AttachTo(RetryPolicy retryPolicy)
+        public void AttachTo(Policy policy)
 		{
-			retryPolicy.AddPolicyResultHandler(_syncHandler);
+			policy.AddHandlerForPolicyResult(_syncHandler);
 		}
 	}
 
@@ -49,9 +50,9 @@ public AsyncHttpPolicyResultHandler(Func<PolicyResult<HttpResponseMessage>, Canc
 			_asyncHandler = asyncHandler;
 		}
 
-		public void AttachTo(RetryPolicy retryPolicy)
+		public void AttachTo(Policy policy)
 		{
-			retryPolicy.AddPolicyResultHandler(_asyncHandler);
+			policy.AddHandlerForPolicyResult(_asyncHandler);
 		}
 	}
 
@@ -64,9 +65,9 @@ public NotCancelableAsyncHttpPolicyResultHandler(Func<PolicyResult<HttpResponseM
 			_asyncHandler = asyncHandler;
 		}
 
-		public void AttachTo(RetryPolicy retryPolicy)
+		public void AttachTo(Policy policy)
 		{
-			retryPolicy.AddPolicyResultHandler(_asyncHandler);
+			policy.AddHandlerForPolicyResult(_asyncHandler);
 		}
 	}
 }
diff --git a/src/IHttpPolicyResultHandlers.cs b/src/IHttpPolicyResultHandlers.cs
@@ -95,11 +95,11 @@ public IHttpPolicyResultHandlers AddHandler(Func<PolicyResult<HttpResponseMessag
 			return this;
 		}
 
-		internal void AttachTo(RetryPolicy retryPolicy)
+		internal void AttachTo(Policy policy)
 		{
 			foreach (var handler in _hanlders)
 			{
-				handler.AttachTo(retryPolicy);
+				handler.AttachTo(policy);
 			}
 		}
 	}
diff --git a/src/PoliNorError.Extensions.Http.csproj b/src/PoliNorError.Extensions.Http.csproj
@@ -26,8 +26,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Http" Version="9.0.8" />
-    <PackageReference Include="PoliNorError" Version="2.24.0" />
+    <PackageReference Include="Microsoft.Extensions.Http" Version="9.0.10" />
+    <PackageReference Include="PoliNorError" Version="2.24.12" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/PolicyHandlerStorageExtensions.Retry.FromOptions.cs b/src/PolicyHandlerStorageExtensions.Retry.FromOptions.cs
@@ -6,6 +6,38 @@ public static partial class PolicyHandlerStorageExtensions
 	{
 		private static readonly Func<int, RetryPolicyOptions, IBulkErrorProcessor, RetryPolicy> _retryPolicyCreator = (rc, rpo, bep) => new RetryPolicy(rc, bep, retryDelay: rpo.RetryDelay);
 
+		private static readonly Func<RetryPolicyOptions, IBulkErrorProcessor, RetryPolicy> _infiniteRetryPolicyCreator = (rpo, bep) => RetryPolicy.InfiniteRetries(bep, retryDelay: rpo.RetryDelay);
+
+		/// <summary>
+		/// Adds a handler based on a <see cref="RetryPolicy"/> to a pipeline builder
+		/// that implements the <see cref="IPolicyHandlerStorage{TStorage}"/> interface,
+		/// configured for **infinite retries**.
+		/// </summary>
+		/// <typeparam name="TStorage">Storage type for <see cref="System.Net.Http.DelegatingHandler"/>.</typeparam>
+		/// <param name="storage">Storage for <see cref="System.Net.Http.DelegatingHandler"/>.</param>
+		/// <param name="options"><see cref="RetryPolicyOptions"/>.</param>
+		public static TStorage AddInfiniteRetryHandler<TStorage>(this IPolicyHandlerStorage<TStorage> storage, RetryPolicyOptions options) where TStorage : IPolicyHandlerStorage<TStorage>
+		{
+			return storage.AddRetryHandler(_infiniteRetryPolicyCreator, options);
+		}
+
+		/// <summary>
+		/// Adds a handler based on a <see cref="RetryPolicy"/> to a pipeline builder
+		/// that implements the <see cref="IPolicyHandlerStorage{TStorage}"/> interface,
+		/// configured for **infinite retries**.
+		/// </summary>
+		/// <typeparam name="TStorage">Storage type for <see cref="System.Net.Http.DelegatingHandler"/>.</typeparam>
+		/// <param name="storage">Storage for <see cref="System.Net.Http.DelegatingHandler"/>.</param>
+		/// <param name="configure">Delegate for configuring <see cref="RetryPolicyOptions"/>.</param>
+		/// <returns></returns>
+		public static TStorage AddInfiniteRetryHandler<TStorage>(this IPolicyHandlerStorage<TStorage> storage, Action<RetryPolicyOptions> configure = null) where TStorage : IPolicyHandlerStorage<TStorage>
+		{
+			var options = new RetryPolicyOptions();
+			configure?.Invoke(options);
+
+			return storage.AddInfiniteRetryHandler(options);
+		}
+
 		/// <summary>
 		/// Adds a handler based on a RetryPolicy to a pipeline builder
 		/// that implements the <see cref="IPolicyHandlerStorage{TStorage}"/> interface.
diff --git a/src/PolicyOptions.cs b/src/PolicyOptions.cs
@@ -20,7 +20,7 @@ public class PolicyOptions
 		/// <summary>
 		/// Gets or sets the action that configures error processing by adding an <see cref=“IErrorProcessor”/> to a policy.
 		/// </summary>
-		public Action<IBulkErrorProcessor> ConfigureErrorProcessing { get; set; }
+		public Action<BulkErrorProcessor> ConfigureErrorProcessing { get; set; }
 
 		/// <summary>
 		/// Gets or sets the function that configures the error filter for a policy.
diff --git a/src/docs/NuGet.md b/src/docs/NuGet.md
@@ -1,16 +1,24 @@
 The library provides an outgoing request resiliency pipeline for `HttpClient`, using policies from the [PoliNorError](https://github.com/kolan72/PoliNorError) library.
 
-## Key Features
+## ⚡ Key Features
 
-- Provides the ability to create a pipeline to handle typical transient HTTP failures (including the `HttpRequestException` exception).  
+- Provides the ability to create a resiliency pipeline to handle typical transient HTTP failures (including the `HttpRequestException` exception).  
 - Flexible transient failure filter for the final `DelegatingHandler` in the pipeline for the response.  
 - Additionally, custom failure status codes or categories can be added to the final handler filter.  
 - Other exception types (besides `HttpRequestException`) can also be included in the final handler filter.  
 - Inclusion in the outer handler filter of any `Exception` type thrown by the inner handler is also supported.  
 - Both typed and named `HttpClient`, as well as `IHttpClientFactory`, can be used.  
 - Targets .NET Standard 2.0.  
 
-## Usage
+## 🔑 Key Concepts
+
+- 🟦 **Resiliency pipeline**  - the pipeline of `DelegatingHandler`, using policies from the `PoliNorError` library.
+- ➡ **OuterHandler** is the **first** handler in the pipeline (closest to the request initiator).
+- ⬅ **InnerHandler** is the **next** handler in the pipeline (closer to the final destination).
+- 🔵 **FinalHandler** is the innermost handler in the pipeline.
+- ❌ **Transient HTTP errors** are temporary failures that occur when making HTTP requests (HTTP 5xx, HTTP 408, HTTP 429 and `HttpRequestException`). 
+
+## 🚀 Usage
 
 1. Configure  typed or named `HttpClient`:
 ```csharp
@@ -120,3 +128,21 @@ catch (Exception ex)
 }
 ```
 
+## 📜 `HttpPolicyResultException` properties
+
+Public properties of the `HttpPolicyResultException`:
+
+- `InnerException` 
+	- If the response status code matches the handling filter’s status code, it will be a special `FailedHttpResponseException`.  
+	- If no handlers inside or outside the resiliency pipeline throw an exception, and the `HttpClient`’s primary handler throws an `HttpRequestException`, the `InnerException` will be that `HttpRequestException`.
+	- Otherwise, the exception originates from one of the handlers, either inside or outside the pipeline.
+- `FailedResponseData` - not null if the status code part of the handling filter matches the response status code.
+- `HasFailedResponse` - true if `FailedResponseData` is not null.
+- `PolicyResult` - specifies the `PolicyResult<HttpResponseMessage>` result that is produced by a policy that belongs to the `DelegatingHandler` that throws this exception.  
+- `InnermostPolicyResult` - specifies the `PolicyResult<HttpResponseMessage>` result produced by a policy of the final handler or by a handler in the pipeline that throws its own exception. 
+- `IsErrorExpected` - indicates whether the filter for the original exception was satisfied.
+- `IsCanceled` - indicates whether the execution was canceled.
+
+##  Samples
+
+See the samples folder for concrete examples.
diff --git a/tests/PipelineTests.For.AddRetryHandler.FromRetryPolicyOptions.cs b/tests/PipelineTests.For.AddRetryHandler.FromRetryPolicyOptions.cs
diff --git a/tests/PoliNorError.Extensions.Http.Tests.csproj b/tests/PoliNorError.Extensions.Http.Tests.csproj
diff --git a/tests/packages.config b/tests/packages.config

Original file line number	Diff line number	Diff line change
`@@ -2,12 +2,13 @@`
`2`	`2`	`using System.Net.Http;`
`3`	`3`	`using System.Threading.Tasks;`
`4`	`4`	`using System.Threading;`
	`5`	`+using PoliNorError.Extensions.PolicyResultHandling;`
`5`	`6`
`6`	`7`	`namespace PoliNorError.Extensions.Http`
`7`	`8`	`{`
`8`	`9`	`internal interface IHttpPolicyResultHandler`
`9`	`10`	`{`
`10`		`- void AttachTo(RetryPolicy retryPolicy);`
	`11`	`+ void AttachTo(Policy policy);`
`11`	`12`	`}`
`12`	`13`
`13`	`14`	`internal class SyncHttpPolicyResultHandler : IHttpPolicyResultHandler`
`@@ -19,9 +20,9 @@ public SyncHttpPolicyResultHandler(Action<PolicyResult<HttpResponseMessage>, Can`
`19`	`20`	`_syncHandler = syncHandler;`
`20`	`21`	`}`
`21`	`22`
`22`		`- public void AttachTo(RetryPolicy retryPolicy)`
	`23`	`+ public void AttachTo(Policy policy)`
`23`	`24`	`{`
`24`		`- retryPolicy.AddPolicyResultHandler(_syncHandler);`
	`25`	`+ policy.AddHandlerForPolicyResult(_syncHandler);`
`25`	`26`	`}`
`26`	`27`	`}`
`27`	`28`
`@@ -34,9 +35,9 @@ public NotCancelableSyncHttpPolicyResultHandler(Action<PolicyResult<HttpResponse`
`34`	`35`	`_syncHandler = syncHandler;`
`35`	`36`	`}`
`36`	`37`
`37`		`- public void AttachTo(RetryPolicy retryPolicy)`
	`38`	`+ public void AttachTo(Policy policy)`
`38`	`39`	`{`
`39`		`- retryPolicy.AddPolicyResultHandler(_syncHandler);`
	`40`	`+ policy.AddHandlerForPolicyResult(_syncHandler);`
`40`	`41`	`}`
`41`	`42`	`}`
`42`	`43`
`@@ -49,9 +50,9 @@ public AsyncHttpPolicyResultHandler(Func<PolicyResult<HttpResponseMessage>, Canc`
`49`	`50`	`_asyncHandler = asyncHandler;`
`50`	`51`	`}`
`51`	`52`
`52`		`- public void AttachTo(RetryPolicy retryPolicy)`
	`53`	`+ public void AttachTo(Policy policy)`
`53`	`54`	`{`
`54`		`- retryPolicy.AddPolicyResultHandler(_asyncHandler);`
	`55`	`+ policy.AddHandlerForPolicyResult(_asyncHandler);`
`55`	`56`	`}`
`56`	`57`	`}`
`57`	`58`
`@@ -64,9 +65,9 @@ public NotCancelableAsyncHttpPolicyResultHandler(Func<PolicyResult<HttpResponseM`
`64`	`65`	`_asyncHandler = asyncHandler;`
`65`	`66`	`}`
`66`	`67`
`67`		`- public void AttachTo(RetryPolicy retryPolicy)`
	`68`	`+ public void AttachTo(Policy policy)`
`68`	`69`	`{`
`69`		`- retryPolicy.AddPolicyResultHandler(_asyncHandler);`
	`70`	`+ policy.AddHandlerForPolicyResult(_asyncHandler);`
`70`	`71`	`}`
`71`	`72`	`}`
`72`	`73`	`}`
Original file line number	Diff line number	Diff line change
`@@ -95,11 +95,11 @@ public IHttpPolicyResultHandlers AddHandler(Func<PolicyResult<HttpResponseMessag`
`95`	`95`	`return this;`
`96`	`96`	`}`
`97`	`97`
`98`		`- internal void AttachTo(RetryPolicy retryPolicy)`
	`98`	`+ internal void AttachTo(Policy policy)`
`99`	`99`	`{`
`100`	`100`	`foreach (var handler in _hanlders)`
`101`	`101`	`{`
`102`		`- handler.AttachTo(retryPolicy);`
	`102`	`+ handler.AttachTo(policy);`
`103`	`103`	`}`
`104`	`104`	`}`
`105`	`105`	`}`