[xitca-web] clean up and optimization

Author: fakeshadow

frameworks/Rust/xitca-web/Cargo.lock

@@ -6,12 +6,12 @@ edition = "2024"
 [[bin]]
 name = "xitca-web"
 path = "./src/main.rs"
-required-features = ["io-uring", "pg", "router", "template"]
+required-features = ["io-uring", "pg", "router", "template", "zero-copy"]
 
 [[bin]]
 name = "xitca-web-barebone"
 path = "./src/main_barebone.rs"
-required-features = ["perf", "perf-json", "pg", "template"]
+required-features = ["perf", "perf-json", "pg", "template", "zero-copy"]
 
 [[bin]]
 name = "xitca-web-diesel"
@@ -38,6 +38,8 @@ web-codegen = ["xitca-web/codegen", "xitca-web/urlencoded"]
 template = ["dep:sailfish"]
 # io-uring optional
 io-uring = ["dep:tokio-uring", "xitca-http/io-uring", "xitca-server/io-uring"]
+# zero-copy database row parsing optional(not supported by ORMs)
+zero-copy = []
 # unrealistic performance optimization
 perf = ["perf-allocator", "dep:core_affinity", "tokio/parking_lot"]
 perf-allocator = ["dep:mimalloc"]
@@ -70,7 +72,7 @@ xitca-postgres-diesel = { version = "0.2", default-features = false, optional =
 futures-util = { version = "0.3", default-features = false, optional = true }
 
 # toasty orm optional
-xitca-postgres-toasty = { version = "0.1", optional = true }
+xitca-postgres-toasty = { version = "0.1", features = ["nightly"], optional = true }
 toasty = { version = "0.1", optional = true }
 
 # template optional
@@ -99,18 +101,18 @@ panic = "abort"
 
 [patch.crates-io]
 xitca-postgres-diesel = { git = "https://github.com/fakeshadow/xitca-postgres-diesel", rev = "b6d1922" }
-xitca-postgres-toasty = { git = "https://github.com/fakeshadow/xitca-postgres-toasty", rev = "6034a22" }
+xitca-postgres-toasty = { git = "https://github.com/fakeshadow/xitca-postgres-toasty", rev = "6e91d2f" }
 
-toasty = { git = "https://github.com/fakeshadow/toasty", branch = "engine" }
-toasty-core = { git = "https://github.com/fakeshadow/toasty", branch = "engine" }
-toasty-sql = { git = "https://github.com/fakeshadow/toasty", branch = "engine" }
+toasty = { git = "https://github.com/fakeshadow/toasty", rev = "51c8186" }
+toasty-core = { git = "https://github.com/fakeshadow/toasty", rev = "51c8186" }
+toasty-sql = { git = "https://github.com/fakeshadow/toasty", rev = "51c8186" }
 
 # personal fork of tokio-uring with tokio local runtime enabled
 tokio-uring = { git = "http://github.com/fakeshadow/tokio-uring", rev = "c3d5887" }
 
-xitca-codegen = { git = "http://github.com/HFQR/xitca-web", rev = "3f38156" }
-xitca-http = { git = "http://github.com/HFQR/xitca-web", rev = "3f38156" }
-xitca-postgres = { git = "http://github.com/HFQR/xitca-web", rev = "3f38156" }
-xitca-server = { git = "http://github.com/HFQR/xitca-web", rev = "3f38156" }
-xitca-service = { git = "http://github.com/HFQR/xitca-web", rev = "3f38156" }
-xitca-web = { git = "http://github.com/HFQR/xitca-web", rev = "3f38156" }
+xitca-codegen = { git = "http://github.com/HFQR/xitca-web", rev = "2fb7b62" }
+xitca-http = { git = "http://github.com/HFQR/xitca-web", rev = "2fb7b62" }
+xitca-postgres = { git = "http://github.com/HFQR/xitca-web", rev = "2fb7b62" }
+xitca-server = { git = "http://github.com/HFQR/xitca-web", rev = "2fb7b62" }
+xitca-service = { git = "http://github.com/HFQR/xitca-web", rev = "2fb7b62" }
+xitca-web = { git = "http://github.com/HFQR/xitca-web", rev = "2fb7b62" }

frameworks/Rust/xitca-web/Cargo.toml

@@ -14,8 +14,8 @@ use xitca_http::{
     bytes::Bytes,
     h1::RequestBody,
     http::{
-        self, IntoResponse as _, RequestExt, StatusCode,
-        const_header_value::{TEXT_HTML_UTF8, TEXT_UTF8},
+        self, HeaderValue, IntoResponse as _, RequestExt, StatusCode,
+        const_header_value::{JSON, TEXT_HTML_UTF8, TEXT_UTF8},
         header::{CONTENT_TYPE, SERVER},
     },
     util::{
@@ -28,8 +28,8 @@ use xitca_http::{
 };
 use xitca_service::{Service, ServiceExt, fn_service};
 
-use ser::{HELLO_BYTES, Message};
-use util::{HandleResult, QueryParse, SERVER_HEADER_VALUE};
+use ser::{HELLO, Message};
+use util::{HandleResult, QueryParse};
 
 type Request<B> = http::Request<RequestExt<B>>;
 
@@ -43,7 +43,7 @@ fn main() -> std::io::Result<()> {
             "/plaintext",
             get(fn_service(async |ctx: Ctx| {
                 let (req, _) = ctx.into_parts();
-                let mut res = req.into_response(const { Bytes::from_static(HELLO_BYTES) });
+                let mut res = req.into_response(const { Bytes::from_static(HELLO.as_bytes()) });
                 res.headers_mut().insert(CONTENT_TYPE, TEXT_UTF8);
                 Ok(res)
             })),
@@ -52,7 +52,7 @@ fn main() -> std::io::Result<()> {
             "/json",
             get(fn_service(async |ctx: Ctx| {
                 let (req, _) = ctx.into_parts();
-                json_response(req, &Message::new())
+                json_response(req, Message::HELLO)
             })),
         )
         .insert(
@@ -91,7 +91,7 @@ fn main() -> std::io::Result<()> {
         .enclosed(ContextBuilder::new(db_pool::Client::create))
         .enclosed_fn(async |service, req| {
             let mut res = service.call(req).await.unwrap_or_else(error_handler);
-            res.headers_mut().insert(SERVER, SERVER_HEADER_VALUE);
+            res.headers_mut().insert(SERVER, HeaderValue::from_static("x"));
             Ok::<_, core::convert::Infallible>(res)
         })
         .enclosed(HttpServiceBuilder::h1().io_uring());
@@ -118,16 +118,9 @@ fn error_handler(e: RouterError<util::Error>) -> Response {
         .unwrap()
 }
 
-#[cfg(any(feature = "json", feature = "perf-json"))]
 fn json_response<Ext>(req: Request<Ext>, val: &impl serde_core::Serialize) -> HandleResult<Response> {
-    let mut buf = xitca_http::bytes::BytesMut::new();
-    #[cfg(all(feature = "json", not(feature = "perf-json")))]
-    serde_json::to_writer(xitca_http::bytes::BufMutWriter(&mut buf), val)?;
-
-    #[cfg(all(feature = "perf-json", not(feature = "json")))]
-    sonic_rs::to_writer(xitca_http::bytes::BufMut::writer(&mut buf), val)?;
-
-    let mut res = req.into_response(buf.freeze());
-    res.headers_mut().insert(CONTENT_TYPE, http::const_header_value::JSON);
+    let buf = ser::json_serialize(val)?;
+    let mut res = req.into_response(Bytes::from(buf));
+    res.headers_mut().insert(CONTENT_TYPE, JSON);
     Ok(res)
 }

frameworks/Rust/xitca-web/src/main.rs

@@ -13,14 +13,13 @@ mod util;
 use std::io;
 
 use xitca_http::{
-    bytes::BufMut,
     h1::dispatcher_unreal::{Dispatcher, Request, Response},
     http::StatusCode,
 };
 use xitca_service::Service;
 
 use self::{
-    ser::{HELLO_BYTES, Message},
+    ser::{HELLO, Message},
     util::QueryParse,
 };
 
@@ -96,19 +95,9 @@ async fn handler<'h>(req: Request<'h, db_unrealistic::Client>, res: Response<'h>
             res.status(StatusCode::OK)
                 .header("content-type", "text/plain")
                 .header("server", "X")
-                // unrealistic content length header.
-                .header("content-length", "13")
-                .body_writer(|buf| buf.extend_from_slice(HELLO_BYTES))
+                .body(HELLO.as_bytes())
         }
-        "/json" => res
-            .status(StatusCode::OK)
-            .header("content-type", "application/json")
-            .header("server", "X")
-            // unrealistic content length header.
-            .header("content-length", "27")
-            // snoic-rs crate is realistic approach to json serializer.
-            // That said xitca-web by default utilize serde-json as serializer making it an unrealistic representation of framework performance
-            .body_writer(|buf| sonic_rs::to_writer(buf.writer(), &Message::new()).unwrap()),
+        "/json" => json_response(res, Message::HELLO),
 
         // all database related categories are unrealistic. please reference db_unrealistic module for detail.
         "/fortunes" => {
@@ -138,12 +127,10 @@ async fn handler<'h>(req: Request<'h, db_unrealistic::Client>, res: Response<'h>
     }
 }
 
-fn json_response<'r, T>(res: Response<'r>, val: &T) -> Response<'r, 3>
-where
-    T: serde_core::Serialize,
-{
-    let mut buf = xitca_http::bytes::BytesMut::new();
-    sonic_rs::to_writer((&mut buf).writer(), val).unwrap();
+fn json_response<'r>(res: Response<'r>, val: &impl serde_core::Serialize) -> Response<'r, 3> {
+    // snoic-rs crate is realistic approach to json serializer.
+    // That said xitca-web by default utilize serde-json as serializer making it an unrealistic representation of framework performance
+    let buf = ser::json_serialize(val).unwrap();
     res.status(StatusCode::OK)
         .header("content-type", "application/json")
         .header("server", "X")

frameworks/Rust/xitca-web/src/main_barebone.rs

@@ -16,22 +16,23 @@ use xitca_web::{
     App,
     codegen::route,
     handler::{html::Html, json::Json, query::Query, state::StateRef},
-    http::{WebResponse, header::SERVER},
+    http::{HeaderValue, WebResponse, header::SERVER},
 };
 
 use orm::Pool;
-use ser::{Num, World};
-use util::{HandleResult, SERVER_HEADER_VALUE};
+use ser::{Message, Num, World};
+use util::HandleResult;
 
 fn main() -> std::io::Result<()> {
     App::new()
         .with_async_state(Pool::create)
+        .at("/json", Json(Message::HELLO))
         .at_typed(db)
         .at_typed(fortunes)
         .at_typed(queries)
         .at_typed(updates)
         .map(|mut res: WebResponse| {
-            res.headers_mut().insert(SERVER, SERVER_HEADER_VALUE);
+            res.headers_mut().insert(SERVER, HeaderValue::from_static("xitca-web"));
             res
         })
         .serve()