YGGverse/nexy
1
0
Fork 0
mirror of https://github.com/YGGverse/nexy.git synced 2026-03-31 17:25:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

apply minor optimizations

Browse source
This commit is contained in:
yggverse 2025-06-29 14:34:21 +03:00
parent 9a40d2a7a5
commit 90b8b8c921
3 changed files with 44 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/response.rs
View file

@ -3,7 +3,7 @@ pub enum Response<'a> {
/// Includes reference to the original request
AccessDenied(&'a str),
/// Includes query + server-side error description
InternalServerError(&'a str, String),
InternalServerError(Option<&'a str>, String),
/// Includes reference to the original request
NotFound(&'a str),
/// Includes bytes array

55
src/server/connection.rs
View file

@ -1,7 +1,7 @@
use crate::{response::Response, session::Session};
use anyhow::Result;
use std::{
io::{Read, Write},
io::{ErrorKind, Read, Write},
net::{SocketAddr, TcpStream},
sync::Arc,
};
@ -41,15 +41,11 @@ impl Connection {
self.address.server, self.address.client
)
}
if let Some(ref r) = self.session.request {
r.add(&self.address.client, &q)
if let Some(ref request) = self.session.request {
request.add(&self.address.client, &q)
}
if self
.session
.clone()
.public
.request(&q, |r| match self.response(r) {
Ok(sent) => {
if self.session.clone().public.request(&q, |response| {
self.response(response).is_ok_and(|sent| {
t += sent;
if self.session.is_debug {
println!(
@ -58,16 +54,8 @@ impl Connection {
)
};
true
}
Err(e) => {
eprintln!(
"[{}] > [{}] `{q}`: error sending response: `{e}`",
self.address.server, self.address.client
);
false
}
})
{
}) {
self.session
.access_log
.clf(&self.address.client, Some(&q), 0, t);
@ -76,10 +64,16 @@ impl Connection {
self.session
.access_log
.clf(&self.address.client, Some(&q), 1, t);
if self.session.is_debug {
println!(
"[{}] - [{}] connection closed by client.",
self.address.server, self.address.client,
)
}
}
}
Err(e) => match self.response(Response::InternalServerError(
"",
None,
format!(
"[{}] < [{}] failed to handle incoming request: `{e}`",
self.address.server, self.address.client
@ -118,8 +112,8 @@ impl Connection {
Ok(urlencoding::decode(std::str::from_utf8(&b[..n])?.trim())?.to_string())
}
fn response(&mut self, response: Response) -> Result<usize> {
let bytes = match response {
fn response(&mut self, response: Response) -> std::io::Result<usize> {
let data = match response {
Response::File(b) => b,
Response::Directory(q, ref s, is_root) => {
&if is_root {
@ -138,7 +132,7 @@ impl Connection {
}
Response::InternalServerError(q, e) => {
eprintln!(
"[{}] > [{}] `{q}`: internal server error: `{e}`",
"[{}] > [{}] `{q:?}`: internal server error: `{e}`",
self.address.server, self.address.client
);
self.session.template.internal_server_error()
@ -158,9 +152,22 @@ impl Connection {
self.session.template.not_found()
}
};
self.stream.write_all(bytes)?;
match self.stream.write_all(data) {
Ok(()) => {
self.stream.flush()?;
Ok(bytes.len())
Ok(data.len())
}
Err(e) => {
// client may close the active connection unexpectedly, ignore some kinds
if !matches!(e.kind(), ErrorKind::BrokenPipe | ErrorKind::ConnectionReset) {
eprintln!(
"[{}] > [{}] error sending response: `{e}`",
self.address.server, self.address.client
)
}
Err(e)
}
}
}
fn shutdown(self) {

8
src/session/public.rs
View file

@ -61,7 +61,7 @@ impl Public {
Ok(t) => match (t.is_dir(), t.is_file()) {
(true, _) => callback(match self.list(&p) {
Ok(list) => Response::Directory(query, list, p == self.public_dir),
Err(e) => Response::InternalServerError(query, e.to_string()),
Err(e) => Response::InternalServerError(Some(query), e.to_string()),
}),
(_, true) => match fs::File::open(p) {
Ok(mut f) => loop {
@ -75,21 +75,21 @@ impl Public {
}
Err(e) => {
return callback(Response::InternalServerError(
query,
Some(query),
format!("failed to read response chunk: `{e}`"),
));
}
}
},
Err(e) => callback(Response::InternalServerError(
query,
Some(query),
format!("failed to read response: `{e}`"),
)),
},
_ => panic!(), // unexpected
},
Err(e) => callback(Response::InternalServerError(
query,
Some(query),
format!("failed to read storage: `{e}`"),
)),
}