diff --git a/src/main.rs b/src/main.rs index e1b010d..623729e 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 futures_lite::FutureExt; use hyper::Uri; use hyper::{header::HeaderValue, Body, Request, Response}; @@ -83,9 +81,9 @@ async fn resource(body: &str, content_type: &str, cache: bool) -> Result 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 { - let uri = Uri::from_str("https://github.com/redlib-org/redlib/commits/main.atom").expect("Invalid URI"); - - 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() +#[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?.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, 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?)) // Could fail if no internet .unwrap_or_default(), ) } -#[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 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() +#[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 no internet + Ok(hyper::body::to_bytes(resp).await?.iter().copied().map(|x| x as char).collect()) }