use shared http client

Author: QaidVoid

src/bin/soar-dl/download_manager.rs

@@ -69,7 +69,7 @@ impl DownloadManager {
 
     async fn handle_platform_download<P: ReleasePlatform, R, A>(
         &self,
-        handler: &ReleaseHandler<P>,
+        handler: &ReleaseHandler<'_, P>,
         project: &str,
     ) -> Result<(), PlatformError>
     where

src/downloader.rs

@@ -21,6 +21,7 @@ use url::Url;
 use crate::{
     archive,
     error::DownloadError,
+    http_client::SHARED_CLIENT,
     oci::{OciClient, OciLayer, OciManifest, Reference},
     utils::{
         build_absolute_path, extract_filename, extract_filename_from_url, is_elf, matches_pattern,
@@ -45,9 +46,8 @@ pub struct DownloadOptions {
     pub extract_dir: Option<String>,
 }
 
-#[derive(Default)]
-pub struct Downloader {
-    client: reqwest::Client,
+pub struct Downloader<'a> {
+    client: &'a reqwest::Client,
 }
 
 #[derive(Clone)]
@@ -63,7 +63,19 @@ pub struct OciDownloadOptions {
     pub exact_case: bool,
 }
 
-impl Downloader {
+impl<'a> Default for Downloader<'a> {
+    fn default() -> Self {
+        Downloader {
+            client: &SHARED_CLIENT,
+        }
+    }
+}
+
+impl Downloader<'_> {
+    pub fn client(&self) -> &reqwest::Client {
+        self.client
+    }
+
     pub async fn download(&self, options: DownloadOptions) -> Result<String, DownloadError> {
         let url = Url::parse(&options.url).map_err(|err| DownloadError::InvalidUrl {
             url: options.url.clone(),

src/http_client.rs

@@ -0,0 +1,41 @@
+use std::{sync::LazyLock, time::Duration};
+
+use reqwest::{header::HeaderMap, Client};
+
+pub static SHARED_CLIENT: LazyLock<Client> = LazyLock::new(|| {
+    Client::builder()
+        .user_agent("pkgforge/soar")
+        .build()
+        .expect("failed to build default client")
+});
+
+pub struct ClientConfig {
+    pub user_agent: Option<String>,
+    pub headers: Option<HeaderMap>,
+    pub proxy: Option<String>,
+    pub timeout: Option<Duration>,
+}
+
+impl ClientConfig {
+    pub fn build(self) -> Result<Client, reqwest::Error> {
+        let mut builder = Client::builder();
+
+        if let Some(user_agent) = self.user_agent {
+            builder = builder.user_agent(user_agent);
+        }
+
+        if let Some(headers) = self.headers {
+            builder = builder.default_headers(headers);
+        }
+
+        if let Some(proxy_url) = self.proxy {
+            builder = builder.proxy(reqwest::Proxy::all(&proxy_url)?);
+        }
+
+        if let Some(timeout) = self.timeout {
+            builder = builder.timeout(timeout);
+        }
+
+        builder.build()
+    }
+}

src/lib.rs

@@ -3,6 +3,7 @@ pub mod downloader;
 pub mod error;
 pub mod github;
 pub mod gitlab;
+pub mod http_client;
 pub mod oci;
 pub mod platform;
 pub mod utils;

src/platform.rs

@@ -129,17 +129,15 @@ pub struct PlatformDownloadOptions {
 }
 
 #[derive(Default)]
-pub struct ReleaseHandler<P: ReleasePlatform> {
-    downloader: Downloader,
-    client: reqwest::Client,
+pub struct ReleaseHandler<'a, P: ReleasePlatform> {
+    downloader: Downloader<'a>,
     _platform: std::marker::PhantomData<P>,
 }
 
-impl<P: ReleasePlatform> ReleaseHandler<P> {
+impl<P: ReleasePlatform> ReleaseHandler<'_, P> {
     pub fn new() -> Self {
         Self {
             downloader: Downloader::default(),
-            client: reqwest::Client::new(),
             _platform: std::marker::PhantomData,
         }
     }
@@ -168,7 +166,8 @@ impl<P: ReleasePlatform> ReleaseHandler<P> {
         }
 
         Ok(self
-            .client
+            .downloader
+            .client()
             .get(&url)
             .headers(headers)
             .send()