90cef1db86
## Proposed Changes Two tiny updates to satisfy Clippy 1.68 Plus refactoring of the `http_api` into less complex types so the compiler can chew and digest them more easily. Co-authored-by: Michael Sproul <michael@sigmaprime.io>
38 lines
1.2 KiB
Rust
38 lines
1.2 KiB
Rust
use serde::Serialize;
|
|
use warp::reply::{Reply, Response};
|
|
|
|
/// A convenience wrapper around `blocking_task`.
|
|
pub async fn blocking_task<F, T>(func: F) -> Result<T, warp::Rejection>
|
|
where
|
|
F: FnOnce() -> Result<T, warp::Rejection> + Send + 'static,
|
|
T: Send + 'static,
|
|
{
|
|
tokio::task::spawn_blocking(func)
|
|
.await
|
|
.unwrap_or_else(|_| Err(warp::reject::reject()))
|
|
}
|
|
|
|
/// A convenience wrapper around `blocking_task` that returns a `warp::reply::Response`.
|
|
///
|
|
/// Using this method consistently makes it possible to simplify types using `.unify()` or `.uor()`.
|
|
pub async fn blocking_response_task<F, T>(func: F) -> Result<Response, warp::Rejection>
|
|
where
|
|
F: FnOnce() -> Result<T, warp::Rejection> + Send + 'static,
|
|
T: Reply + Send + 'static,
|
|
{
|
|
blocking_task(func).await.map(Reply::into_response)
|
|
}
|
|
|
|
/// A convenience wrapper around `blocking_task` for use with `warp` JSON responses.
|
|
pub async fn blocking_json_task<F, T>(func: F) -> Result<Response, warp::Rejection>
|
|
where
|
|
F: FnOnce() -> Result<T, warp::Rejection> + Send + 'static,
|
|
T: Serialize + Send + 'static,
|
|
{
|
|
blocking_response_task(|| {
|
|
let response = func()?;
|
|
Ok(warp::reply::json(&response))
|
|
})
|
|
.await
|
|
}
|