Merge pull request #39 from tnull/2025-08-enable-client-side-delays

Enable client-side timeouts and replace retry logic with `reqwest`'s

Author: tnull

src/client.rs

@@ -14,6 +14,7 @@ use crate::types::{
 use crate::util::retry::{retry, RetryPolicy};
 
 const APPLICATION_OCTET_STREAM: &str = "application/octet-stream";
+const DEFAULT_TIMEOUT: std::time::Duration = std::time::Duration::from_secs(10);
 
 /// Thin-client to access a hosted instance of Versioned Storage Service (VSS).
 /// The provided [`VssClient`] API is minimalistic and is congruent to the VSS server-side API.
@@ -31,7 +32,7 @@ where
 impl<R: RetryPolicy<E = VssError>> VssClient<R> {
 	/// Constructs a [`VssClient`] using `base_url` as the VSS server endpoint.
 	pub fn new(base_url: String, retry_policy: R) -> Self {
-		let client = Client::new();
+		let client = build_client();
 		Self::from_client(base_url, client, retry_policy)
 	}
 
@@ -45,13 +46,23 @@ impl<R: RetryPolicy<E = VssError>> VssClient<R> {
 		}
 	}
 
+	/// Constructs a [`VssClient`] from a given [`reqwest::Client`], using `base_url` as the VSS server endpoint.
+	///
+	/// HTTP headers will be provided by the given `header_provider`.
+	pub fn from_client_and_headers(
+		base_url: String, client: Client, retry_policy: R,
+		header_provider: Arc<dyn VssHeaderProvider>,
+	) -> Self {
+		Self { base_url, client, retry_policy, header_provider }
+	}
+
 	/// Constructs a [`VssClient`] using `base_url` as the VSS server endpoint.
 	///
 	/// HTTP headers will be provided by the given `header_provider`.
 	pub fn new_with_headers(
 		base_url: String, retry_policy: R, header_provider: Arc<dyn VssHeaderProvider>,
 	) -> Self {
-		let client = Client::new();
+		let client = build_client();
 		Self { base_url, client, retry_policy, header_provider }
 	}
 
@@ -162,3 +173,12 @@ impl<R: RetryPolicy<E = VssError>> VssClient<R> {
 		}
 	}
 }
+
+fn build_client() -> Client {
+	Client::builder()
+		.timeout(DEFAULT_TIMEOUT)
+		.connect_timeout(DEFAULT_TIMEOUT)
+		.read_timeout(DEFAULT_TIMEOUT)
+		.build()
+		.unwrap()
+}

src/lib.rs

@@ -11,6 +11,9 @@
 #![deny(rustdoc::private_intra_doc_links)]
 #![deny(missing_docs)]
 
+// Crate re-exports
+pub use reqwest;
+
 /// Implements a thin-client ([`client::VssClient`]) to access a hosted instance of Versioned Storage Service (VSS).
 pub mod client;
 

tests/tests.rs

@@ -221,7 +221,7 @@ mod tests {
 			message: "NoSuchKeyException".to_string(),
 		};
 		let mock_server = mockito::mock("POST", GET_OBJECT_ENDPOINT)
-			.with_status(409)
+			.with_status(404)
 			.with_body(&error_response.encode_to_vec())
 			.create();