feat(bestool): download from tailscale proxies when available

Author: passcod

Cargo.lock

@@ -23,7 +23,7 @@ aws-credential-types = { version = "1.1.7", features = [
 aws-sdk-route53 = { version = "1.58.0", optional = true }
 aws-sdk-sts = { version = "1.54.1", optional = true }
 base64ct = { version = "1.6.0", features = ["std"], optional = true }
-binstalk-downloader = { version = "0.13.8", optional = true }
+binstalk-downloader = { version = "0.13.8", optional = true, git = "https://github.com/cargo-bins/cargo-binstall", branch = "feat/downloader-custom-client" }
 bitflags = { version = "2.7.0", optional = true }
 bitvec = { version = "1.0.1", optional = true }
 blake3 = { version = "1.5.5", optional = true }
@@ -58,7 +58,7 @@ itertools = { version = "0.14.0", optional = true }
 json5 = { version = "0.4.1", optional = true }
 leon = { version = "3.0.1", optional = true }
 leon-macros = { version = "1.0.2", optional = true }
-lloggs = "1.0.0"
+lloggs = "1.0.1"
 local-ip-address = { version = "0.6.1", optional = true }
 mailgun-rs = { version = "1.0.0", optional = true }
 merkle_hash = { version = "3.7.0", optional = true }

crates/bestool/Cargo.toml

@@ -1,19 +1,15 @@
-use std::{
-	iter,
-	num::{NonZeroU16, NonZeroU64},
-	path::PathBuf,
-};
+use std::path::PathBuf;
 
-use binstalk_downloader::{
-	download::{Download, PkgFmt},
-	remote::{Client, Url},
-};
+use binstalk_downloader::download::{Download, PkgFmt};
 use clap::Parser;
 use detect_targets::get_desired_targets;
 use miette::{bail, IntoDiagnostic, Result};
 use tracing::{debug, info};
 
-use crate::actions::Context;
+use crate::{
+	actions::Context,
+	download::{client, DownloadSource},
+};
 
 use super::CaddyArgs;
 
@@ -57,27 +53,23 @@ pub async fn run(ctx: Context<CaddyArgs, DownloadArgs>) -> Result<()> {
 	let detected_targets = get_desired_targets(target.map(|t| vec![t]));
 	let detected_targets = detected_targets.get().await;
 
-	let client = Client::new(
-		crate::APP_NAME,
-		None,
-		NonZeroU16::new(1).unwrap(),
-		NonZeroU64::new(1).unwrap(),
-		iter::empty(),
-	)
-	.into_diagnostic()?;
+	let client = client().await?;
+
+	let host = DownloadSource::Tools.host();
 
 	let mut url = None;
 	for target in detected_targets {
-		let try_url = Url::parse(&format!(
-			"https://tools.ops.tamanu.io/caddy/{version}/caddy-{target}{ext}?bust={date}",
-			ext = if target.contains("windows") {
-				".exe"
-			} else {
-				""
-			},
-			date = chrono::Utc::now(),
-		))
-		.into_diagnostic()?;
+		let try_url = host
+			.join(&format!(
+				"/caddy/{version}/caddy-{target}{ext}?bust={date}",
+				ext = if target.contains("windows") {
+					".exe"
+				} else {
+					""
+				},
+				date = chrono::Utc::now(),
+			))
+			.into_diagnostic()?;
 		debug!(url=%try_url, "trying URL");
 		if client
 			.remote_gettable(try_url.clone())

crates/bestool/src/actions/caddy/download.rs

@@ -1,19 +1,14 @@
-use std::{
-	iter,
-	num::{NonZeroU16, NonZeroU64},
-	path::PathBuf,
-};
+use std::path::PathBuf;
 
 use clap::Parser;
 
-use binstalk_downloader::{
-	download::{Download, PkgFmt},
-	remote::{Client, Url},
-};
+use binstalk_downloader::download::{Download, PkgFmt};
 use detect_targets::{get_desired_targets, TARGET};
 use miette::{miette, IntoDiagnostic, Result};
 use tracing::info;
 
+use crate::download::{client, DownloadSource};
+
 use super::Context;
 
 /// Update this bestool.
@@ -50,14 +45,7 @@ pub async fn run(ctx: Context<SelfUpdateArgs>) -> Result<()> {
 		add_to_path,
 	} = ctx.args_top;
 
-	let client = Client::new(
-		crate::APP_NAME,
-		None,
-		NonZeroU16::new(1).unwrap(),
-		NonZeroU64::new(1).unwrap(),
-		iter::empty(),
-	)
-	.into_diagnostic()?;
+	let client = client().await?;
 
 	let detected_targets = get_desired_targets(target.map(|t| vec![t]));
 	let detected_targets = detected_targets.get().await;
@@ -69,16 +57,19 @@ pub async fn run(ctx: Context<SelfUpdateArgs>) -> Result<()> {
 	);
 	let dest = dir.join(&filename);
 
-	let url = format!(
-		"https://tools.ops.tamanu.io/bestool/{version}/{target}/{filename}",
-		target = detected_targets
-			.first()
-			.cloned()
-			.unwrap_or_else(|| TARGET.into()),
-	);
+	let host = DownloadSource::Tools.host();
+	let url = host
+		.join(&format!(
+			"/bestool/{version}/{target}/{filename}",
+			target = detected_targets
+				.first()
+				.cloned()
+				.unwrap_or_else(|| TARGET.into()),
+		))
+		.into_diagnostic()?;
 	info!(url = %url, "downloading");
 
-	Download::new(client, Url::parse(&url).into_diagnostic()?)
+	Download::new(client, url)
 		.and_extract(PkgFmt::Bin, &dest)
 		.await
 		.into_diagnostic()?;
@@ -99,8 +90,12 @@ pub async fn run(ctx: Context<SelfUpdateArgs>) -> Result<()> {
 #[cfg(windows)]
 fn add_self_to_path() -> Result<()> {
 	let self_path = std::env::current_exe().into_diagnostic()?;
-	let self_dir = self_path.parent().ok_or_else(|| miette!("current exe is not in a dir?"))?;
-	let self_dir = self_dir.to_str().ok_or_else(|| miette!("current exe path is not utf-8"))?;
+	let self_dir = self_path
+		.parent()
+		.ok_or_else(|| miette!("current exe is not in a dir?"))?;
+	let self_dir = self_dir
+		.to_str()
+		.ok_or_else(|| miette!("current exe path is not utf-8"))?;
 
 	windows_env::prepend("PATH", self_dir).into_diagnostic()?;
 

crates/bestool/src/actions/self_update.rs

@@ -1,17 +1,16 @@
-use std::{
-	iter,
-	num::{NonZeroU16, NonZeroU64},
-	path::{Path, PathBuf},
-};
+use std::path::PathBuf;
 
 use binstalk_downloader::{
 	download::{Download, PkgFmt},
-	remote::{Client, Url},
+	remote::Url,
 };
 use clap::{Parser, ValueEnum};
 use miette::{IntoDiagnostic, Result};
 
-use crate::actions::Context;
+use crate::{
+	actions::Context,
+	download::{client, DownloadSource},
+};
 
 use super::{ApiServerKind, TamanuArgs};
 
@@ -29,7 +28,10 @@ pub struct DownloadArgs {
 	pub kind: ServerKind,
 
 	/// Version to download.
-	#[cfg_attr(docsrs, doc("\n\n**2nd Argument**: version (e.g. `bestool tamanu download web 1.2.3`)"))]
+	#[cfg_attr(
+		docsrs,
+		doc("\n\n**2nd Argument**: version (e.g. `bestool tamanu download web 1.2.3`)")
+	)]
 	#[arg(value_name = "VERSION")]
 	pub version: String,
 
@@ -76,19 +78,25 @@ pub async fn run(ctx: Context<TamanuArgs, DownloadArgs>) -> Result<()> {
 		url_only,
 	} = ctx.args_sub;
 
-	let url = make_url(kind, version)?;
+	let url = make_url(kind, version).await?;
 
 	if url_only {
 		println!("{}", url);
 		return Ok(());
 	}
 
-	download(url, into).await
+	let client = client().await?;
+	Download::new(client, url)
+		.and_extract(PkgFmt::Tzstd, &into)
+		.await
+		.into_diagnostic()?;
+	Ok(())
 }
 
-pub fn make_url(kind: ServerKind, version: String) -> Result<Url> {
-	let url_string = format!(
-		"https://servers.ops.tamanu.io/{version}/{kind}-{version}{platform}.tar.zst",
+pub async fn make_url(kind: ServerKind, version: String) -> Result<Url> {
+	let host = DownloadSource::Servers.host();
+	host.join(&format!(
+		"/{version}/{kind}-{version}{platform}.tar.zst",
 		kind = match kind {
 			ServerKind::Central => "central",
 			ServerKind::Facility => "facility",
@@ -99,25 +107,6 @@ pub fn make_url(kind: ServerKind, version: String) -> Result<Url> {
 		} else {
 			"-windows"
 		},
-	);
-
-	Url::parse(&url_string).into_diagnostic()
-}
-
-pub async fn download(url: Url, into: impl AsRef<Path>) -> Result<()> {
-	let client = Client::new(
-		crate::APP_NAME,
-		None,
-		NonZeroU16::new(1).unwrap(),
-		NonZeroU64::new(1).unwrap(),
-		iter::empty(),
-	)
-	.into_diagnostic()?;
-	let download = Download::new(client, url);
-	download
-		.and_extract(PkgFmt::Tzstd, into)
-		.await
-		.into_diagnostic()?;
-
-	Ok(())
+	))
+	.into_diagnostic()
 }

crates/bestool/src/actions/tamanu/download.rs

@@ -1,19 +1,15 @@
-use std::{
-	iter,
-	num::{NonZeroU16, NonZeroU64},
-	path::PathBuf,
-};
+use std::path::PathBuf;
 
-use binstalk_downloader::{
-	download::{Download, PkgFmt},
-	remote::{Client, Url},
-};
+use binstalk_downloader::download::{Download, PkgFmt};
 use clap::Parser;
 use detect_targets::get_desired_targets;
 use miette::{bail, IntoDiagnostic, Result};
 use tracing::{debug, info};
 
-use crate::actions::Context;
+use crate::{
+	actions::Context,
+	download::{client, DownloadSource},
+};
 
 use super::WalgArgs;
 
@@ -57,27 +53,23 @@ pub async fn run(ctx: Context<WalgArgs, DownloadArgs>) -> Result<()> {
 	let detected_targets = get_desired_targets(target.map(|t| vec![t]));
 	let detected_targets = detected_targets.get().await;
 
-	let client = Client::new(
-		crate::APP_NAME,
-		None,
-		NonZeroU16::new(1).unwrap(),
-		NonZeroU64::new(1).unwrap(),
-		iter::empty(),
-	)
-	.into_diagnostic()?;
+	let client = client().await?;
+
+	let host = DownloadSource::Tools.host();
 
 	let mut url = None;
 	for target in detected_targets {
-		let try_url = Url::parse(&format!(
-			"https://tools.ops.tamanu.io/wal-g/{version}/wal-g-{target}{ext}?bust={date}",
-			ext = if target.contains("windows") {
-				".exe"
-			} else {
-				""
-			},
-			date = chrono::Utc::now(),
-		))
-		.into_diagnostic()?;
+		let try_url = host
+			.join(&format!(
+				"/wal-g/{version}/wal-g-{target}{ext}?bust={date}",
+				ext = if target.contains("windows") {
+					".exe"
+				} else {
+					""
+				},
+				date = chrono::Utc::now(),
+			))
+			.into_diagnostic()?;
 		debug!(url=%try_url, "trying URL");
 		if client
 			.remote_gettable(try_url.clone())