IHttpRequest.Timeoutでリクエスト毎にタイムアウト時間を設定可能にする

diff --git a/OpenTween/Connection/DeleteRequest.cs b/OpenTween/Connection/DeleteRequest.cs
index e8bd353..60927f2 100644 (file)
--- a/OpenTween/Connection/DeleteRequest.cs
+++ b/OpenTween/Connection/DeleteRequest.cs
@@ -35,6 +35,8 @@ namespace OpenTween.Connection
 
         public string? EndpointName { get; set; }
 
+        public TimeSpan Timeout { get; set; } = Networking.DefaultTimeout;
+
         public HttpRequestMessage CreateMessage(Uri baseUri)
             => new()
             {

diff --git a/OpenTween/Connection/GetRequest.cs b/OpenTween/Connection/GetRequest.cs
index 48682c3..2a9791d 100644 (file)
--- a/OpenTween/Connection/GetRequest.cs
+++ b/OpenTween/Connection/GetRequest.cs
@@ -35,6 +35,8 @@ namespace OpenTween.Connection
 
         public string? EndpointName { get; set; }
 
+        public TimeSpan Timeout { get; set; } = Networking.DefaultTimeout;
+
         public HttpRequestMessage CreateMessage(Uri baseUri)
             => new()
             {

diff --git a/OpenTween/Connection/IHttpRequest.cs b/OpenTween/Connection/IHttpRequest.cs
index 55dd9e3..ab309cb 100644 (file)
--- a/OpenTween/Connection/IHttpRequest.cs
+++ b/OpenTween/Connection/IHttpRequest.cs
@@ -30,6 +30,8 @@ namespace OpenTween.Connection
     {
         string? EndpointName { get; }
 
+        TimeSpan Timeout { get; }
+
         HttpRequestMessage CreateMessage(Uri baseUri);
     }
 }

diff --git a/OpenTween/Connection/PostJsonRequest.cs b/OpenTween/Connection/PostJsonRequest.cs
index 715d541..236bfe6 100644 (file)
--- a/OpenTween/Connection/PostJsonRequest.cs
+++ b/OpenTween/Connection/PostJsonRequest.cs
@@ -35,6 +35,8 @@ namespace OpenTween.Connection
 
         public string? EndpointName { get; set; }
 
+        public TimeSpan Timeout { get; set; } = Networking.DefaultTimeout;
+
         public HttpRequestMessage CreateMessage(Uri baseUri)
             => new()
             {

diff --git a/OpenTween/Connection/TwitterApiConnection.cs b/OpenTween/Connection/TwitterApiConnection.cs
index 0e86060..db00455 100644 (file)
--- a/OpenTween/Connection/TwitterApiConnection.cs
+++ b/OpenTween/Connection/TwitterApiConnection.cs
@@ -75,6 +75,9 @@ namespace OpenTween.Connection
         {
             this.Http = InitializeHttpClient(this.Credential);
 
+            // タイムアウト設定は IHttpRequest.Timeout でリクエスト毎に制御する
+            this.Http.Timeout = Timeout.InfiniteTimeSpan;
+
             this.HttpUpload = InitializeHttpClient(this.Credential);
             this.HttpUpload.Timeout = Networking.UploadImageTimeout;
         }
@@ -94,7 +97,7 @@ namespace OpenTween.Connection
             {
                 responseMessage = await HandleTimeout(
                     (token) => this.Http.SendAsync(requestMessage, HttpCompletionOption.ResponseHeadersRead, token),
-                    Networking.DefaultTimeout
+                    request.Timeout
                 );
 
                 if (endpointName != null)