refactor: Make RequestConfig::timeout optional

This allows us to remove the default timeout on a per-request basis

Author: jmartinesp

crates/matrix-sdk/src/client/mod.rs

@@ -2312,7 +2312,7 @@ impl Client {
         });
         let mut request_config = self.request_config();
         if let Some(timeout) = sync_settings.timeout {
-            request_config.timeout += timeout;
+            request_config.timeout = Some(timeout);
         }
 
         let response = self.send(request).with_request_config(request_config).await?;

crates/matrix-sdk/src/config/request.rs

@@ -44,6 +44,7 @@ use crate::http_client::DEFAULT_REQUEST_TIMEOUT;
 #[derive(Copy, Clone)]
 pub struct RequestConfig {
     pub(crate) timeout: Duration,
+    pub(crate) timeout: Option<Duration>,
     pub(crate) retry_limit: Option<usize>,
     pub(crate) max_retry_time: Option<Duration>,
     pub(crate) max_concurrent_requests: Option<NonZeroUsize>,
@@ -82,6 +83,7 @@ impl Default for RequestConfig {
     fn default() -> Self {
         Self {
             timeout: DEFAULT_REQUEST_TIMEOUT,
+            timeout: Some(DEFAULT_REQUEST_TIMEOUT),
             retry_limit: Default::default(),
             max_retry_time: Default::default(),
             max_concurrent_requests: Default::default(),
@@ -132,8 +134,8 @@ impl RequestConfig {
 
     /// Set the timeout duration for all HTTP requests.
     #[must_use]
-    pub fn timeout(mut self, timeout: Duration) -> Self {
-        self.timeout = timeout;
+    pub fn timeout(mut self, timeout: impl Into<Option<Duration>>) -> Self {
+        self.timeout = timeout.into();
         self
     }
 

crates/matrix-sdk/src/http_client/native.rs

@@ -149,7 +149,8 @@ pub(crate) struct HttpSettings {
     pub(crate) disable_ssl_verification: bool,
     pub(crate) proxy: Option<String>,
     pub(crate) user_agent: Option<String>,
-    pub(crate) timeout: Duration,
+    pub(crate) timeout: Option<Duration>,
+    pub(crate) read_timeout: Option<Duration>,
     pub(crate) additional_root_certificates: Vec<Certificate>,
     pub(crate) disable_built_in_root_certificates: bool,
 }
@@ -161,7 +162,8 @@ impl Default for HttpSettings {
             disable_ssl_verification: false,
             proxy: None,
             user_agent: None,
-            timeout: DEFAULT_REQUEST_TIMEOUT,
+            timeout: Some(DEFAULT_REQUEST_TIMEOUT),
+            read_timeout: None,
             additional_root_certificates: Default::default(),
             disable_built_in_root_certificates: false,
         }
@@ -175,11 +177,14 @@ impl HttpSettings {
         let user_agent = self.user_agent.clone().unwrap_or_else(|| "matrix-rust-sdk".to_owned());
         let mut http_client = reqwest::Client::builder()
             .user_agent(user_agent)
-            .timeout(self.timeout)
             // As recommended by BCP 195.
             // See: https://datatracker.ietf.org/doc/bcp195/
             .min_tls_version(tls::Version::TLS_1_2);
 
+        if let Some(timeout) = self.timeout {
+            http_client = http_client.timeout(timeout);
+        }
+
         if self.disable_ssl_verification {
             warn!("SSL verification disabled in the HTTP client!");
             http_client = http_client.danger_accept_invalid_certs(true)
@@ -213,7 +218,7 @@ impl HttpSettings {
 pub(super) async fn send_request(
     client: &reqwest::Client,
     request: &http::Request<Bytes>,
-    timeout: Duration,
+    timeout: Option<Duration>,
     send_progress: SharedObservable<TransmissionProgress>,
 ) -> Result<http::Response<Bytes>, HttpError> {
     use std::convert::Infallible;
@@ -251,7 +256,7 @@ pub(super) async fn send_request(
             reqwest::Request::try_from(request)?
         };
 
-        *request.timeout_mut() = Some(timeout);
+        *request.timeout_mut() = timeout;
         request
     };