diff --git a/src/fetchers.rs b/src/fetchers.rs index 9b6df316..24fbf502 100644 --- a/src/fetchers.rs +++ b/src/fetchers.rs @@ -1,8 +1,10 @@ use std::path::Path; +use std::sync::Arc; pub use gh_crate_meta::*; pub use log::debug; pub use quickinstall::*; +use tokio::task::JoinHandle; use crate::{BinstallError, PkgFmt, PkgMeta}; @@ -10,9 +12,9 @@ mod gh_crate_meta; mod quickinstall; #[async_trait::async_trait] -pub trait Fetcher { +pub trait Fetcher: Send + Sync { /// Create a new fetcher from some data - async fn new(data: &Data) -> Box + async fn new(data: &Data) -> Arc where Self: Sized; @@ -47,30 +49,59 @@ pub struct Data { #[derive(Default)] pub struct MultiFetcher { - fetchers: Vec>, + fetchers: Vec>, } impl MultiFetcher { - pub fn add(&mut self, fetcher: Box) { + pub fn add(&mut self, fetcher: Arc) { self.fetchers.push(fetcher); } - pub async fn first_available(&self) -> Option<&dyn Fetcher> { - for fetcher in &self.fetchers { - let available = fetcher.check().await.unwrap_or_else(|err| { - debug!( - "Error while checking fetcher {}: {}", - fetcher.source_name(), - err - ); - false - }); + pub async fn first_available(&self) -> Option> { + let handles: Vec<_> = self + .fetchers + .iter() + .cloned() + .map(|fetcher| { + let fetcher_cloned = fetcher.clone(); - if available { - return Some(&**fetcher); + ( + AutoAbortJoinHandle(tokio::spawn(async move { fetcher.check().await })), + fetcher_cloned, + ) + }) + .collect(); + + for (mut handle, fetcher) in handles { + match (&mut handle.0).await { + Ok(Ok(true)) => return Some(fetcher), + Ok(Ok(false)) => (), + Ok(Err(err)) => { + debug!( + "Error while checking fetcher {}: {}", + fetcher.source_name(), + err + ); + } + Err(join_err) => { + debug!( + "Error while checking fetcher {}: {}", + fetcher.source_name(), + join_err + ); + } } } None } } + +#[derive(Debug)] +struct AutoAbortJoinHandle(JoinHandle>); + +impl Drop for AutoAbortJoinHandle { + fn drop(&mut self) { + self.0.abort(); + } +} diff --git a/src/fetchers/gh_crate_meta.rs b/src/fetchers/gh_crate_meta.rs index 1c096189..e38d7ae1 100644 --- a/src/fetchers/gh_crate_meta.rs +++ b/src/fetchers/gh_crate_meta.rs @@ -1,4 +1,5 @@ use std::path::Path; +use std::sync::Arc; use log::{debug, info, warn}; use reqwest::Method; @@ -22,8 +23,8 @@ impl GhCrateMeta { #[async_trait::async_trait] impl super::Fetcher for GhCrateMeta { - async fn new(data: &Data) -> Box { - Box::new(Self { data: data.clone() }) + async fn new(data: &Data) -> Arc { + Arc::new(Self { data: data.clone() }) } async fn check(&self) -> Result { @@ -36,7 +37,7 @@ impl super::Fetcher for GhCrateMeta { } info!("Checking for package at: '{url}'"); - remote_exists(url.as_str(), Method::HEAD).await + remote_exists(url, Method::HEAD).await } async fn fetch(&self, dst: &Path) -> Result<(), BinstallError> { diff --git a/src/fetchers/quickinstall.rs b/src/fetchers/quickinstall.rs index 1d500647..e433194c 100644 --- a/src/fetchers/quickinstall.rs +++ b/src/fetchers/quickinstall.rs @@ -1,4 +1,5 @@ use std::path::Path; +use std::sync::Arc; use log::info; use reqwest::Method; @@ -18,11 +19,11 @@ pub struct QuickInstall { #[async_trait::async_trait] impl super::Fetcher for QuickInstall { - async fn new(data: &Data) -> Box { + async fn new(data: &Data) -> Arc { let crate_name = &data.name; let version = &data.version; let target = data.target.clone(); - Box::new(Self { + Arc::new(Self { package: format!("{crate_name}-{version}-{target}"), target, }) @@ -32,7 +33,7 @@ impl super::Fetcher for QuickInstall { let url = self.package_url(); self.report().await?; info!("Checking for package at: '{url}'"); - remote_exists(&url, Method::HEAD).await + remote_exists(Url::parse(&url)?, Method::HEAD).await } async fn fetch(&self, dst: &Path) -> Result<(), BinstallError> { diff --git a/src/helpers.rs b/src/helpers.rs index e0d85b99..9471eb4f 100644 --- a/src/helpers.rs +++ b/src/helpers.rs @@ -32,8 +32,7 @@ pub fn load_manifest_path>( Ok(manifest) } -pub async fn remote_exists(url: &str, method: Method) -> Result { - let url = Url::parse(url)?; +pub async fn remote_exists(url: Url, method: Method) -> Result { let req = reqwest::Client::new() .request(method.clone(), url.clone()) .send() diff --git a/src/main.rs b/src/main.rs index e282004a..bf58ac70 100644 --- a/src/main.rs +++ b/src/main.rs @@ -11,7 +11,7 @@ use miette::{miette, IntoDiagnostic, Result, WrapErr}; use simplelog::{ColorChoice, ConfigBuilder, TermLogger, TerminalMode}; use structopt::StructOpt; use tempfile::TempDir; -use tokio::{process::Command, runtime::Runtime}; +use tokio::{process::Command, runtime::Runtime, task::JoinError}; use cargo_binstall::{ bins, @@ -84,6 +84,7 @@ enum MainExit { Success(Duration), Error(BinstallError), Report(miette::Report), + JoinErr(JoinError), } impl Termination for MainExit { @@ -99,6 +100,11 @@ impl Termination for MainExit { eprintln!("{err:?}"); ExitCode::from(16) } + Self::JoinErr(err) => { + error!("Fatal error:"); + eprintln!("{err:?}"); + ExitCode::from(17) + } } } } @@ -107,19 +113,20 @@ fn main() -> MainExit { let start = Instant::now(); let rt = Runtime::new().unwrap(); - let result = rt.block_on(entry()); + let handle = rt.spawn(entry()); + let result = rt.block_on(handle); drop(rt); let done = start.elapsed(); debug!("run time: {done:?}"); - result - .map(|_| MainExit::Success(done)) - .unwrap_or_else(|err| { + result.map_or_else(MainExit::JoinErr, |res| { + res.map(|_| MainExit::Success(done)).unwrap_or_else(|err| { err.downcast::() .map(MainExit::Error) .unwrap_or_else(MainExit::Report) }) + }) } async fn entry() -> Result<()> { @@ -240,7 +247,7 @@ async fn entry() -> Result<()> { Some(fetcher) => { install_from_package( binaries, - fetcher, + &*fetcher, install_path, meta, opts,