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()) }