nutomic/ibis
1
0
Fork 0
mirror of https://github.com/Nutomic/ibis.git synced 2024-12-24 13:51:23 +00:00
Code Projects Releases Packages Activity

Better logging for api errors in frontend

Browse source
This commit is contained in:
Felix Ableitner 2024-12-11 12:11:46 +01:00
parent 997ed05505
commit dc31906528
1 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/frontend/api.rs
View file

@ -4,7 +4,7 @@ use crate::common::{
*, *,
}; };
use http::{Method, StatusCode}; use http::{Method, StatusCode};
use leptos::prelude::ServerFnError; use leptos::{prelude::ServerFnError, server_fn::error::NoCustomError};
use log::error; use log::error;
use newtypes::PersonId; use newtypes::PersonId;
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
@ -22,7 +22,7 @@ pub static CLIENT: LazyLock<ApiClient> = LazyLock::new(|| {
} }
}); });
#[derive(Clone)] #[derive(Clone, Debug)]
pub struct ApiClient { pub struct ApiClient {
#[cfg(feature = "ssr")] #[cfg(feature = "ssr")]
client: reqwest::Client, client: reqwest::Client,
@ -277,8 +277,9 @@ impl ApiClient {
} }
let res = req.send().await?; let res = req.send().await?;
let status = res.status(); let status = res.status();
let url = res.url().to_string();
let text = res.text().await?.to_string(); let text = res.text().await?.to_string();
Self::response(status.into(), text) Self::response(status.into(), text, &url)
} }
#[cfg(not(feature = "ssr"))] #[cfg(not(feature = "ssr"))]
@ -333,19 +334,25 @@ impl ApiClient {
let res = req.send().await?; let res = req.send().await?;
let status = res.status(); let status = res.status();
let text = res.text().await?; let text = res.text().await?;
Self::response(status, text) Self::response(status, text, &res.url())
}) })
} }
fn response<T>(status: u16, text: String) -> Result<T, ServerFnError> fn response<T>(status: u16, text: String, url: &str) -> Result<T, ServerFnError>
where where
T: for<'de> Deserialize<'de>, T: for<'de> Deserialize<'de>,
{ {
let json = serde_json::from_str(&text)?; let json = serde_json::from_str(&text).map_err(|e| {
ServerFnError::<NoCustomError>::Deserialization(format!(
"Serde error: {e} from {text}on {url}"
))
})?;
if status == StatusCode::OK { if status == StatusCode::OK {
Ok(json) Ok(json)
} else { } else {
Err(ServerFnError::Response(format!("API error: {text}"))) Err(ServerFnError::Response(format!(
"API error: {text} on {url} status {status}"
)))
} }
} }