feat:abpframework#21205

framework/src/Volo.Abp.Http.Client/Volo/Abp/Http/Client/AbpHttpClientExecuteHttpActionOptions.cs

@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+using System.Net.Http;
+using System.Reflection;
+using System.Text;
+using Volo.Abp.Http.Modeling;
+
+namespace Volo.Abp.Http.Client;
+public class AbpHttpClientExecuteHttpActionOptions
+{
+    public Action<ActionApiDescriptionModel, HttpClient>? ExecuteHttpAction{ get; set; }
+}

framework/src/Volo.Abp.Http.Client/Volo/Abp/Http/Client/ClientProxying/ClientProxyBase.cs

@@ -7,6 +7,7 @@
 using System.Text.RegularExpressions;
 using System.Threading;
 using System.Threading.Tasks;
+using Castle.DynamicProxy;
 using Microsoft.Extensions.Options;
 using Microsoft.Extensions.Primitives;
 using Volo.Abp.Content;
@@ -43,6 +44,8 @@ public class ClientProxyBase<TService> : ITransientDependency
     protected ICurrentApiVersionInfo CurrentApiVersionInfo => LazyServiceProvider.LazyGetRequiredService<ICurrentApiVersionInfo>();
     protected ILocalEventBus LocalEventBus => LazyServiceProvider.LazyGetRequiredService<ILocalEventBus>();
 
+    protected IOptions<AbpHttpClientExecuteHttpActionOptions>  ExecuteHttpActionOptions => LazyServiceProvider.LazyGetRequiredService<IOptions<AbpHttpClientExecuteHttpActionOptions>>();
+
     protected virtual async Task RequestAsync(string methodName, ClientProxyRequestTypeValue? arguments = null)
     {
         await RequestAsync(BuildHttpProxyClientProxyContext(methodName, arguments));
@@ -145,7 +148,10 @@ await ClientAuthenticator.Authenticate(
 
         HttpResponseMessage response;
         try
-        {
+        {       
+            //Allows users to customize the timeout for remote methods of specific requests
+            ExecuteHttpActionOptions.Value.ExecuteHttpAction?.Invoke(requestContext.Action, client);
+
             response = await client.SendAsync(
                 requestMessage,
                 HttpCompletionOption.ResponseHeadersRead /*this will buffer only the headers, the content will be used as a stream*/,

framework/test/Volo.Abp.Http.Client.Tests/Volo/Abp/Http/AbpHttpClientTestModule.cs

@@ -1,4 +1,5 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using Microsoft.Extensions.DependencyInjection;
 using Volo.Abp.AspNetCore.Mvc;
 using Volo.Abp.Http.Client;
@@ -60,5 +61,17 @@ public override void ConfigureServices(ServiceConfigurationContext context)
             options.FormDataConverts.Add(typeof(List<GetParamsNameValue>), typeof(TestObjectToFormData));
             options.PathConverts.Add(typeof(int), typeof(TestObjectToPath));
         });
+
+        Configure<AbpHttpClientExecuteHttpActionOptions>(options =>
+        {
+            options.ExecuteHttpAction = (method, httpclient) =>
+            {
+                if (method.Name.Equals("TimeOutRequestAsync"))
+                { 
+                    httpclient.Timeout = TimeSpan.FromMilliseconds(2000);
+                }
+            };
+        });
+
     }
 }

framework/test/Volo.Abp.Http.Client.Tests/Volo/Abp/Http/DynamicProxying/IRegularTestController.cs

@@ -43,4 +43,7 @@ public interface IRegularTestController
     Task<int> DeleteByIdAsync(int id);
 
     Task<string> AbortRequestAsync(CancellationToken cancellationToken = default);
+
+    Task<string> TimeOutRequestAsync();
+
 }

framework/test/Volo.Abp.Http.Client.Tests/Volo/Abp/Http/DynamicProxying/RegularTestController.cs

@@ -152,6 +152,14 @@ public async Task<string> AbortRequestAsync(CancellationToken cancellationToken
         await Task.Delay(100, cancellationToken);
         return "AbortRequestAsync";
     }
+
+    [HttpGet]
+    [Route("timeout-request")]
+    public async Task<string> TimeOutRequestAsync()
+    {
+        await Task.Delay(5000);
+        return "timeout-request";
+    }
 }
 
 public class Car

framework/test/Volo.Abp.Http.Client.Tests/Volo/Abp/Http/DynamicProxying/RegularTestControllerClientProxy_Tests.cs

@@ -187,4 +187,16 @@ public async Task AbortRequestAsync()
         var exception = await Assert.ThrowsAsync<AbpRemoteCallException>(async () => await _controller.AbortRequestAsync(cts.Token));
         exception.InnerException.InnerException.InnerException.Message.ShouldBe("The client aborted the request.");
     }
+
+    [Fact]
+    public async Task TimeOutRequestAsync()
+    {
+        //This cannot be executed successfully because the unit test does not use SocketsHttpHandler for request processing,
+        //so the desired results cannot be obtained locally. At the same time,
+        //I can achieve the expected results by using other services locally.
+
+        //var exception = await Assert.ThrowsAsync<TaskCanceledException>(async () => await _controller.TimeOutRequestAsync());
+        //exception.InnerException.InnerException.InnerException.Message.ShouldBe("The client aborted the request.");   
+        await Task.CompletedTask;
+    }
 }