release: 0.23.4

Author: joshstoik1

CREDITS.md

@@ -1,6 +1,6 @@
 [package]
 name = "adbyss"
-version = "0.23.3"
+version = "0.23.4"
 license = "WTFPL"
 authors = ["Josh Stoik <josh@blobfolio.com>"]
 edition = "2024"
@@ -91,9 +91,9 @@ items = [
 [dependencies]
 argyle = "0.15.*"
 dactyl = "0.13.*"
-fyi_msg = "2.5.*"
+fyi_msg = "2.6.*"
 regex = "1.12.*"
-toml = "=1.0.*"
+toml = "=1.1.*"
 trimothy = "0.9.*"
 utc2k = "0.19.*"
 write_atomic = "0.7.*"
@@ -102,16 +102,15 @@ write_atomic = "0.7.*"
 path = "../adbyss_psl"
 features = [ "serde" ]
 
-[dependencies.minreq]
-version = "2.14.*"
-default-features = false
-features = [ "https" ]
-
 [dependencies.nix]
 version = "0.31.*"
 default-features = false
 features = [ "user" ]
 
+[dependencies.reqwest]
+version = "0.13.*"
+features = [ "blocking", "gzip" ]
+
 [dependencies.serde]
 version = "1.0.*"
 features = [ "derive" ]

adbyss/Cargo.toml

@@ -56,6 +56,7 @@
 
 
 mod err;
+mod net;
 mod settings;
 mod source;
 mod write;
@@ -161,7 +162,7 @@ fn main__() -> Result<(), AdbyssError> {
 	}
 
 	// Make sure we're online if any sources other than our own are enabled.
-	if settings.needs_internet() { check_internet()?; }
+	if settings.needs_internet() { net::check_internet()?; }
 
 	// Just print the domains.
 	if flags.contains(Flags::Show) {
@@ -200,41 +201,6 @@ fn main__() -> Result<(), AdbyssError> {
 	Ok(())
 }
 
-/// # Check Internet.
-///
-/// This method attempts to check for an internet connection by trying to reach
-/// Github (which is serving one of the lists Adbyss needs anyway). It will
-/// give it ten tries, with ten seconds in between each try, returning an
-/// error if nothing has been reached after that.
-///
-/// ## Errors
-///
-/// If the site can't be reached, an error will be returned.
-fn check_internet() -> Result<(), AdbyssError> {
-	use std::{
-		thread::sleep,
-		time::Duration,
-	};
-
-	let mut tries: u8 = 0;
-	loop {
-		// Are you there?
-		let res = minreq::head("https://github.com/")
-			.with_header("user-agent", "Mozilla/5.0")
-			.with_timeout(15)
-			.send();
-
-		if res.is_ok_and(|r| r.status_code == 200) { return Ok(()); }
-
-		// Out of tries?
-		if tries == 9 { return Err(AdbyssError::NoInternet); }
-
-		// Wait and try again.
-		tries += 1;
-		sleep(Duration::from_secs(10));
-	}
-}
-
 /// # Require Root.
 ///
 /// This will restart the command with root privileges if necessary, or fail

adbyss/src/main.rs

@@ -0,0 +1,65 @@
+/*!
+# Adbyss: Networking.
+*/
+
+use crate::AdbyssError;
+use reqwest::{
+	blocking::{
+		Client,
+		ClientBuilder,
+	},
+	StatusCode,
+};
+use std::{
+	sync::OnceLock,
+	thread::sleep,
+	time::Duration,
+};
+
+/// # HTTP Client.
+static CLIENT: OnceLock<Option<Client>> = OnceLock::new();
+
+
+
+/// # Check Internet.
+///
+/// This method attempts to check for an internet connection by trying to reach
+/// Github (which is serving one of the lists Adbyss needs anyway). It will
+/// give it ten tries, with ten seconds in between each try, returning an
+/// error if nothing has been reached after that.
+///
+/// ## Errors
+///
+/// If the site can't be reached, an error will be returned.
+pub(super) fn check_internet() -> Result<(), AdbyssError> {
+	let mut tries: u8 = 0;
+	loop {
+		// Are you there?
+		let res = client()
+			.ok_or(AdbyssError::NoInternet)?
+			.head("https://github.com/")
+			.send();
+
+		if res.is_ok_and(|r| matches!(r.status(), StatusCode::OK)) { return Ok(()); }
+
+		// Out of tries?
+		if tries == 9 { return Err(AdbyssError::NoInternet); }
+
+		// Wait and try again.
+		tries += 1;
+		sleep(Duration::from_secs(10));
+	}
+}
+
+#[must_use]
+/// # Initialize HTTP Client.
+pub(super) fn client() -> Option<&'static Client> {
+	CLIENT.get_or_init(||
+		ClientBuilder::new()
+			.user_agent("Mozilla/5.0")
+			.gzip(true)
+			.build()
+			.ok()
+	)
+	.as_ref()
+}

adbyss/src/net.rs

@@ -121,16 +121,19 @@ impl Source {
 /// content, so the extra complexity is worth it.
 fn download_source(kind: Source) -> Result<String, AdbyssError> {
 	if
-		let Ok(res) = minreq::get(kind.url())
-			.with_header("user-agent", "Mozilla/5.0")
-			.with_timeout(15)
-			.send() &&
-		(200..=399).contains(&res.status_code) &&
-		let Ok(out) = res.as_str()
+		let Some(client) = crate::net::client() &&
+		let Ok(res) = client.get(kind.url()).send()
 	{
-		Ok(out.to_owned())
+		let status = res.status();
+		if
+			(status.is_success() || status.is_redirection()) &&
+			let Ok(out) = res.text()
+		{
+			return Ok(out);
+		}
 	}
-	else { Err(AdbyssError::SourceFetch(kind)) }
+
+	Err(AdbyssError::SourceFetch(kind))
 }
 
 /// # Read From Cache.

adbyss/src/source.rs

@@ -2,6 +2,14 @@
 
 
 
+## [0.23.4](https://github.com/Blobfolio/adbyss/releases/tag/v0.23.4) - 2026-04-16
+
+### Changed
+
+* Update suffix database
+
+
+
 ## [0.23.3](https://github.com/Blobfolio/adbyss/releases/tag/v0.23.3) - 2026-03-05
 
 ### Changed

adbyss_psl/CHANGELOG.md

@@ -1,6 +1,6 @@
 [package]
 name = "adbyss_psl"
-version = "0.23.3"
+version = "0.23.4"
 license = "WTFPL"
 authors = ["Josh Stoik <josh@blobfolio.com>"]
 edition = "2024"