Add DeserializationTimeout to ApiEndpoint (#39)

ArbusBiz · Jun 15, 2023 · 0129c82 · 0129c82
1 parent 0964a2a
commit 0129c82
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 7 deletions.
diff --git a/samples/Arbus.Network.Demo/GetAllOrdersApiEndpoint.cs b/samples/Arbus.Network.Demo/GetAllOrdersApiEndpoint.cs
@@ -4,7 +4,7 @@ namespace Arbus.Network.Demo;
 
 public class GetAllOrdersApiEndpoint : ApiEndpoint<OrdersResponseDto>
 {
-    public override string Uri => "https://example.com/api/v1/orders";
-
-    public override HttpMethod Method => HttpMethod.Get;
+    public GetAllOrdersApiEndpoint() : base(HttpMethod.Get, "https://example.com/api/v1/orders")
+    {
+    }
 }
diff --git a/src/Arbus.Network/Abstractions/ApiEndpoint.cs b/src/Arbus.Network/Abstractions/ApiEndpoint.cs
@@ -12,14 +12,20 @@ public abstract class ApiEndpoint
     /// <summary>
     /// Relative Uri if HttpClientContext.GetBaseUri() returns not null. Absolute Uri otherwise.
     /// </summary>
-    public abstract string Uri { get; }
+    public string Uri { get; }
 
-    public abstract HttpMethod Method { get; }
+    public HttpMethod Method { get; }
 
     public virtual TimeSpan Timeout => _defaultTimeout;
 
     public CancellationToken? CancellationToken { get; set; }
 
+    public ApiEndpoint(HttpMethod method, string uri)
+    {
+        Method = method;
+        Uri = uri;
+    }
+
     public virtual HttpRequestMessage CreateRequest(Uri? baseUri)
     {
         var requestUri = CreateRequestUri(baseUri);
@@ -95,7 +101,13 @@ public virtual async Task<Exception> HandleAnyResponse(HttpResponseMessage respo
 
 public abstract class ApiEndpoint<TResponse> : ApiEndpoint
 {
-    private static readonly TimeSpan _maxDeserializationTime = TimeSpan.FromSeconds(5);
+    private static readonly TimeSpan _defaultDeserializationTimeout = TimeSpan.FromSeconds(100);
+
+    public virtual TimeSpan DeserializationTimeout => _defaultDeserializationTimeout;
+
+    public ApiEndpoint(HttpMethod method, string uri) : base(method, uri)
+    {
+    }
 
     public virtual ValueTask<TResponse> GetResponse(HttpResponseMessage responseMessage)
         => FromJson<TResponse>(responseMessage.Content);
@@ -104,7 +116,7 @@ public static async ValueTask<T> FromJson<T>(HttpContent content, CancellationTo
     {
         using var responseStream = await GetStream(content, cancellationToken).ConfigureAwait(false);
 
-        using var tokenSource = new CancellationTokenSource(_maxDeserializationTime);
+        using var tokenSource = new CancellationTokenSource(_defaultDeserializationTimeout);
         cancellationToken = tokenSource.Token;
 
         return await Deserialize<T>(responseStream, cancellationToken.Value).ConfigureAwait(false)