Garmelon/showbits
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Improve server error handling

Browse source
This commit is contained in:
Joscha 2024-03-10 15:26:50 +01:00
parent 9d17d34642
commit e0a668a581
6 changed files with 79 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

41
showbits-thermal-printer/src/server.rs
View file

@ -1,8 +1,11 @@
mod somehow;
mod r#static;
mod statuscode;
use axum::{
extract::{DefaultBodyLimit, Multipart, State},
http::StatusCode,
response::{IntoResponse, Redirect, Response},
routing::{get, post},
Form, Router,
};
@ -11,6 +14,8 @@ use tokio::{net::TcpListener, sync::mpsc};
use crate::drawer::Command;
use self::{r#static::get_static_file, statuscode::status_code};
#[derive(Clone)]
struct Server {
tx: mpsc::Sender<Command>,
@ -22,9 +27,9 @@ pub async fn run(tx: mpsc::Sender<Command>, addr: String) -> anyhow::Result<()>
.route("/test", post(post_test))
.route("/rip", post(post_rip))
.route("/text", post(post_text))
.route("/image", post(post_image))
.route("/image", post(post_image).fallback(get_static_file))
.route("/chat_message", post(post_chat_message))
.fallback(get(r#static::get_static_file))
.fallback(get(get_static_file))
.layer(DefaultBodyLimit::max(32 * 1024 * 1024)) // 32 MiB
.with_state(Server { tx });
@ -54,35 +59,25 @@ async fn post_text(server: State<Server>, request: Form<PostTextForm>) {
let _ = server.tx.send(Command::Text(request.0.text)).await;
}
async fn post_image(server: State<Server>, mut multipart: Multipart) -> Result<(), StatusCode> {
async fn post_image(server: State<Server>, mut multipart: Multipart) -> somehow::Result<Response> {
let mut image = None;
while let Some(field) = multipart
.next_field()
.await
.map_err(|_| StatusCode::INTERNAL_SERVER_ERROR)?
{
let name = field.name().ok_or(StatusCode::INTERNAL_SERVER_ERROR)?;
if name == "image" {
let data = field
.bytes()
.await
.map_err(|_| StatusCode::INTERNAL_SERVER_ERROR)?;
let decoded = image::load_from_memory(&data)
.map_err(|_| StatusCode::INTERNAL_SERVER_ERROR)?
.into_rgba8();
image = Some(decoded);
while let Some(field) = multipart.next_field().await? {
if let Some(name) = field.name() {
if name == "image" {
let data = field.bytes().await?;
let decoded = image::load_from_memory(&data)?.into_rgba8();
image = Some(decoded);
}
}
}
if let Some(image) = image {
let _ = server.tx.send(Command::Image(image)).await;
Ok(())
} else {
Err(StatusCode::INTERNAL_SERVER_ERROR)
return Ok(Redirect::to("image").into_response());
}
Ok(status_code(StatusCode::UNPROCESSABLE_ENTITY))
}
#[derive(Deserialize)]