From 38422a83b098447a30b2195c5d3711934e24beb4 Mon Sep 17 00:00:00 2001 From: Tokarak <63452145+Tokarak@users.noreply.github.com> Date: Tue, 18 Mar 2025 02:32:13 +0000 Subject: [PATCH 1/5] Use `from_static` instead of `from_string` --- src/main.rs | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/main.rs b/src/main.rs index e1b010d..e4af4b7 100644 --- a/src/main.rs +++ b/src/main.rs @@ -5,7 +5,7 @@ use cached::proc_macro::cached; use clap::{Arg, ArgAction, Command}; use std::str::FromStr; - +use bincode::Error; use futures_lite::FutureExt; use hyper::Uri; use hyper::{header::HeaderValue, Body, Request, Response}; @@ -83,9 +83,7 @@ async fn resource(body: &str, content_type: &str, cache: bool) -> Result Result, String> { #[cached(time = 600)] async fn fetch_commit_info() -> String { - let uri = Uri::from_str("https://github.com/redlib-org/redlib/commits/main.atom").expect("Invalid URI"); + let uri = Uri::from_static("https://github.com/redlib-org/redlib/commits/main.atom"); let resp: Body = CLIENT.get(uri).await.expect("Failed to request GitHub").into_body(); @@ -452,7 +450,7 @@ pub async fn proxy_instances() -> Result, String> { #[cached(time = 600)] async fn fetch_instances() -> String { - let uri = Uri::from_str("https://raw.githubusercontent.com/redlib-org/redlib-instances/refs/heads/main/instances.json").expect("Invalid URI"); + let uri = Uri::from_static("https://raw.githubusercontent.com/redlib-org/redlib-instances/refs/heads/main/instances.json"); let resp: Body = CLIENT.get(uri).await.expect("Failed to request GitHub").into_body(); From 87206772b88b5fde6e8c4f55fd7fe62d30419866 Mon Sep 17 00:00:00 2001 From: Tokarak <63452145+Tokarak@users.noreply.github.com> Date: Tue, 18 Mar 2025 03:02:07 +0000 Subject: [PATCH 2/5] On error, fallback to cache; Use `hyper::Error` The interaction with the rest of the codebase is a little ugly, but functionality is practically the same. --- src/main.rs | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/src/main.rs b/src/main.rs index e4af4b7..fc1480e 100644 --- a/src/main.rs +++ b/src/main.rs @@ -4,8 +4,6 @@ use cached::proc_macro::cached; use clap::{Arg, ArgAction, Command}; -use std::str::FromStr; -use bincode::Error; use futures_lite::FutureExt; use hyper::Uri; use hyper::{header::HeaderValue, Body, Request, Response}; @@ -259,7 +257,7 @@ async fn main() { app.at("/copy.js").get(|_| resource(include_str!("../static/copy.js"), "text/javascript", false).boxed()); app.at("/commits.atom").get(|_| async move { proxy_commit_info().await }.boxed()); - app.at("/instances.json").get(|_| async move { proxy_instances().await }.boxed()); + app.at("/instances.json").get(|_| async move { Ok(proxy_instances().await.unwrap()) }.boxed()); // TODO: In the process of migrating error handling. (I recommend thiserror crate for dynamic errors.) No proper error handling yes, so functionality unimpacted. // Proxy media through Redlib app.at("/vid/:id/:size").get(|r| proxy(r, "https://v.redd.it/{id}/DASH_{size}").boxed()); @@ -438,21 +436,21 @@ async fn fetch_commit_info() -> String { hyper::body::to_bytes(resp).await.expect("Failed to read body").iter().copied().map(|x| x as char).collect() } -pub async fn proxy_instances() -> Result, String> { +pub async fn proxy_instances() -> Result, hyper::Error> { Ok( Response::builder() .status(200) .header("content-type", "application/json") - .body(Body::from(fetch_instances().await)) + .body(Body::from(fetch_instances().await?)) .unwrap_or_default(), ) } -#[cached(time = 600)] -async fn fetch_instances() -> String { +#[cached(time = 600, result = true, result_fallback = true)] +async fn fetch_instances() -> Result { let uri = Uri::from_static("https://raw.githubusercontent.com/redlib-org/redlib-instances/refs/heads/main/instances.json"); - let resp: Body = CLIENT.get(uri).await.expect("Failed to request GitHub").into_body(); + let resp: Body = CLIENT.get(uri).await?.into_body(); // Could fail if there is no internet - hyper::body::to_bytes(resp).await.expect("Failed to read body").iter().copied().map(|x| x as char).collect() + Ok(hyper::body::to_bytes(resp).await?.iter().copied().map(|x| x as char).collect()) } From 47771b57c06984ca6d8530bc9772e7131132a03a Mon Sep 17 00:00:00 2001 From: Tokarak <63452145+Tokarak@users.noreply.github.com> Date: Tue, 18 Mar 2025 03:33:52 +0000 Subject: [PATCH 3/5] Same fix for another function --- src/main.rs | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/src/main.rs b/src/main.rs index fc1480e..d56d06e 100644 --- a/src/main.rs +++ b/src/main.rs @@ -256,7 +256,7 @@ async fn main() { .get(|_| resource(include_str!("../static/check_update.js"), "text/javascript", false).boxed()); app.at("/copy.js").get(|_| resource(include_str!("../static/copy.js"), "text/javascript", false).boxed()); - app.at("/commits.atom").get(|_| async move { proxy_commit_info().await }.boxed()); + app.at("/commits.atom").get(|_| async move { Ok(proxy_instances().await.unwrap()) }.boxed()); // TODO: see below app.at("/instances.json").get(|_| async move { Ok(proxy_instances().await.unwrap()) }.boxed()); // TODO: In the process of migrating error handling. (I recommend thiserror crate for dynamic errors.) No proper error handling yes, so functionality unimpacted. // Proxy media through Redlib @@ -417,23 +417,21 @@ async fn main() { } } -pub async fn proxy_commit_info() -> Result, String> { +pub async fn proxy_commit_info() -> Result, hyper::Error> { Ok( Response::builder() .status(200) .header("content-type", "application/atom+xml") - .body(Body::from(fetch_commit_info().await)) + .body(Body::from(fetch_commit_info().await?)) .unwrap_or_default(), ) } -#[cached(time = 600)] -async fn fetch_commit_info() -> String { +#[cached(time = 600, result = true, result_fallback = true)] +async fn fetch_commit_info() -> Result { let uri = Uri::from_static("https://github.com/redlib-org/redlib/commits/main.atom"); - - let resp: Body = CLIENT.get(uri).await.expect("Failed to request GitHub").into_body(); - - hyper::body::to_bytes(resp).await.expect("Failed to read body").iter().copied().map(|x| x as char).collect() + let resp: Body = CLIENT.get(uri).await?.into_body(); // Could fail if there is no internet + Ok(hyper::body::to_bytes(resp).await?.iter().copied().map(|x| x as char).collect()) } pub async fn proxy_instances() -> Result, hyper::Error> { @@ -441,7 +439,7 @@ pub async fn proxy_instances() -> Result, hyper::Error> { Response::builder() .status(200) .header("content-type", "application/json") - .body(Body::from(fetch_instances().await?)) + .body(Body::from(fetch_instances().await?))// Could fail if no internet .unwrap_or_default(), ) } @@ -449,8 +447,6 @@ pub async fn proxy_instances() -> Result, hyper::Error> { #[cached(time = 600, result = true, result_fallback = true)] async fn fetch_instances() -> Result { let uri = Uri::from_static("https://raw.githubusercontent.com/redlib-org/redlib-instances/refs/heads/main/instances.json"); - - let resp: Body = CLIENT.get(uri).await?.into_body(); // Could fail if there is no internet - + let resp: Body = CLIENT.get(uri).await?.into_body(); // Could fail if no internet Ok(hyper::body::to_bytes(resp).await?.iter().copied().map(|x| x as char).collect()) } From d6d399d97b8064b2b55fdaac839db2968cd71ba5 Mon Sep 17 00:00:00 2001 From: Tokarak <63452145+Tokarak@users.noreply.github.com> Date: Tue, 18 Mar 2025 03:38:51 +0000 Subject: [PATCH 4/5] cargo fmt --- src/main.rs | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main.rs b/src/main.rs index d56d06e..3cd0d65 100644 --- a/src/main.rs +++ b/src/main.rs @@ -81,7 +81,9 @@ async fn resource(body: &str, content_type: &str, cache: bool) -> Result Result, hyper::Error> { Response::builder() .status(200) .header("content-type", "application/json") - .body(Body::from(fetch_instances().await?))// Could fail if no internet + .body(Body::from(fetch_instances().await?)) // Could fail if no internet .unwrap_or_default(), ) } From f3043932a5cda1305fbf365d5d4fa865965a353a Mon Sep 17 00:00:00 2001 From: Tokarak <63452145+Tokarak@users.noreply.github.com> Date: Tue, 18 Mar 2025 19:36:33 +0000 Subject: [PATCH 5/5] Fix wrong content served in previous commit --- src/main.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main.rs b/src/main.rs index 3cd0d65..623729e 100644 --- a/src/main.rs +++ b/src/main.rs @@ -258,7 +258,7 @@ async fn main() { .get(|_| resource(include_str!("../static/check_update.js"), "text/javascript", false).boxed()); app.at("/copy.js").get(|_| resource(include_str!("../static/copy.js"), "text/javascript", false).boxed()); - app.at("/commits.atom").get(|_| async move { Ok(proxy_instances().await.unwrap()) }.boxed()); // TODO: see below + app.at("/commits.atom").get(|_| async move { Ok(proxy_commit_info().await.unwrap()) }.boxed()); // TODO: see below app.at("/instances.json").get(|_| async move { Ok(proxy_instances().await.unwrap()) }.boxed()); // TODO: In the process of migrating error handling. (I recommend thiserror crate for dynamic errors.) No proper error handling yes, so functionality unimpacted. // Proxy media through Redlib