[xitca-web] dep update.

frameworks/Rust/xitca-web/Cargo.toml

@@ -51,18 +51,18 @@ io-uring = ["xitca-http/io-uring", "xitca-server/io-uring"]
 axum = ["dep:axum", "http-body", "tower", "tower-http", "xitca-web/tower-http-compat" ]
 
 [dependencies]
-xitca-http = "0.2"
-xitca-io = "0.1"
-xitca-server = "0.1"
+xitca-http = "0.4"
+xitca-io = "0.2"
+xitca-server = "0.2"
 xitca-service = "0.1"
-xitca-unsafe-collection = "0.1"
+xitca-unsafe-collection = "0.1.1"
 
 atoi = "2"
 serde = { version = "1" }
 serde_json = { version = "1" }
 
 # web optional
-xitca-web = { version = "0.2", features = ["json"], optional = true }
+xitca-web = { version = "0.4", features = ["json"], optional = true }
 
 # raw-pg optional
 xitca-postgres = { version = "0.1", optional = true }
@@ -92,5 +92,5 @@ codegen-units = 1
 panic = "abort"
 
 [patch.crates-io]
-xitca-postgres = { git = "https://github.com/HFQR/xitca-web.git", rev = "d79f510197e0f36534fe22b7a467c55dbd683681" }
+xitca-postgres = { git = "https://github.com/HFQR/xitca-web.git", rev = "13a28c51a2f6e23e4e6b96e508a8af1e5e79d0b6" }
 mio = { git = "https://github.com/fakeshadow/mio.git", rev = "52b72d372bfe5807755b7f5e3e1edf282954d6ba" }

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

@@ -1,6 +1,8 @@
-use std::{collections::HashMap, fmt::Write, future::IntoFuture};
+use std::{collections::HashMap, fmt::Write};
 
-use xitca_postgres::{statement::Statement, AsyncLendingIterator, Postgres};
+use xitca_postgres::{
+    pipeline::Pipeline, statement::Statement, AsyncLendingIterator, SharedClient,
+};
 use xitca_unsafe_collection::no_hash::NoHashBuilder;
 
 use super::{
@@ -9,7 +11,7 @@ use super::{
 };
 
 pub struct Client {
-    client: xitca_postgres::Client,
+    client: SharedClient,
     #[cfg(not(feature = "pg-sync"))]
     rng: std::cell::RefCell<Rand>,
     #[cfg(feature = "pg-sync")]
@@ -19,27 +21,14 @@ pub struct Client {
     updates: HashMap<u16, Statement, NoHashBuilder>,
 }
 
-impl Drop for Client {
-    fn drop(&mut self) {
-        drop(self.fortune.clone().into_guarded(&self.client));
-        drop(self.world.clone().into_guarded(&self.client));
-        for (_, stmt) in std::mem::take(&mut self.updates) {
-            drop(stmt.into_guarded(&self.client))
-        }
-    }
-}
-
 pub async fn create() -> HandleResult<Client> {
-    let (client, driver) = Postgres::new(DB_URL.to_string()).connect().await?;
-
-    tokio::spawn(tokio::task::unconstrained(driver.into_future()));
+    let mut client = SharedClient::new(DB_URL.to_string()).await?;
 
-    let fortune = client.prepare("SELECT * FROM fortune", &[]).await?.leak();
+    let fortune = client.prepare_cached("SELECT * FROM fortune", &[]).await?;
 
     let world = client
-        .prepare("SELECT * FROM world WHERE id=$1", &[])
-        .await?
-        .leak();
+        .prepare_cached("SELECT * FROM world WHERE id=$1", &[])
+        .await?;
 
     let mut updates = HashMap::default();
 
@@ -59,7 +48,7 @@ pub async fn create() -> HandleResult<Client> {
         q.pop();
         q.push(')');
 
-        let st = client.prepare(&q, &[]).await?.leak();
+        let st = client.prepare_cached(&q, &[]).await?;
         updates.insert(num, st);
     }
 
@@ -94,11 +83,11 @@ impl Client {
             .try_next()
             .await?
             .map(|row| World::new(row.get_raw(0), row.get_raw(1)))
-            .ok_or_else(|| format!("World does not exist").into())
+            .ok_or_else(|| "World does not exist".into())
     }
 
     pub async fn get_worlds(&self, num: u16) -> HandleResult<Vec<World>> {
-        let mut pipe = self.client.pipeline();
+        let mut pipe = Pipeline::new();
 
         {
             let mut rng = self.borrow_rng_mut();
@@ -108,7 +97,7 @@ impl Client {
         let mut worlds = Vec::new();
         worlds.reserve(num as usize);
 
-        let mut res = pipe.run().await?;
+        let mut res = self.client.pipeline(pipe).await?;
         while let Some(mut item) = res.try_next().await? {
             while let Some(row) = item.try_next().await? {
                 worlds.push(World::new(row.get_raw(0), row.get_raw(1)))
@@ -124,7 +113,7 @@ impl Client {
         let mut params = Vec::new();
         params.reserve(len * 3);
 
-        let mut pipe = self.client.pipeline();
+        let mut pipe = Pipeline::new();
 
         {
             let mut rng = self.borrow_rng_mut();
@@ -144,7 +133,7 @@ impl Client {
         worlds.reserve(len);
         let mut r_ids = params.into_iter().skip(1).step_by(2);
 
-        let mut res = pipe.run().await?;
+        let mut res = self.client.pipeline(pipe).await?;
         while let Some(mut item) = res.try_next().await? {
             while let Some(row) = item.try_next().await? {
                 let r_id = r_ids.next().unwrap();

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

@@ -6,8 +6,9 @@ mod util;
 use serde::Serialize;
 use xitca_web::{
     codegen::route,
-    handler::{html::Html, json::Json, query::Query, state::StateOwn},
+    handler::{html::Html, json::Json, query::Query, state::StateOwn, text::Text},
     http::{header::SERVER, WebResponse},
+    route::get,
     App,
 };
 
@@ -18,8 +19,8 @@ use util::{HandleResult, SERVER_HEADER_VALUE};
 fn main() -> std::io::Result<()> {
     App::new()
         .with_state(db_diesel::create()?)
-        .at_typed(plaintext)
-        .at_typed(json)
+        .at("/plaintext", get(Text("Hello, World!")))
+        .at("/json", get(Json(ser::Message::new())))
         .at_typed(db)
         .at_typed(fortunes)
         .at_typed(queries)
@@ -36,16 +37,6 @@ fn header(mut res: WebResponse) -> WebResponse {
     res
 }
 
-#[route("/plaintext", method = get)]
-fn plaintext() -> &'static str {
-    "Hello, World!"
-}
-
-#[route("/json", method = get)]
-fn json() -> Json<ser::Message> {
-    Json(ser::Message::new())
-}
-
 #[route("/db", method = get)]
 fn db(StateOwn(pool): StateOwn<Pool>) -> HandleResult<Json<impl Serialize>> {
     pool.get_world().map(Json)

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

@@ -1,46 +1,31 @@
 mod ser;
 mod util;
 
-use std::{env, io, net::TcpListener, os::wasi::io::FromRawFd};
-
 use xitca_web::{
-    handler::{handler_service, json::Json},
+    handler::{json::Json, text::Text},
     http::{header::SERVER, WebResponse},
     route::get,
-    service::Service,
-    App, WebContext,
+    App,
 };
 
-fn main() -> io::Result<()> {
-    let fd = env::var("FD_COUNT")
+fn main() -> std::io::Result<()> {
+    let listener = std::env::var("FD_COUNT")
         .ok()
-        .and_then(|var| var.parse().ok())
+        .and_then(|v| v.parse().ok())
+        .map(|fd| unsafe { std::os::wasi::io::FromRawFd::from_raw_fd(fd) })
         .expect("failed to parse FD_COUNT env");
 
-    let listener = unsafe { TcpListener::from_raw_fd(fd) };
-
     App::new()
-        .at(
-            "/json",
-            get(handler_service(|| async { Json(ser::Message::new()) })),
-        )
-        .at(
-            "/plaintext",
-            get(handler_service(|| async { "Hello, World!" })),
-        )
-        .enclosed_fn(middleware_fn)
+        .at("/json", get(Json(ser::Message::new())))
+        .at("/plaintext", get(Text("Hello, World!")))
+        .map(header)
         .serve()
         .listen(listener)?
         .run()
         .wait()
 }
 
-async fn middleware_fn<S, E>(service: &S, ctx: WebContext<'_>) -> Result<WebResponse, E>
-where
-    S: for<'r> Service<WebContext<'r>, Response = WebResponse, Error = E>,
-{
-    service.call(ctx).await.map(|mut res| {
-        res.headers_mut().append(SERVER, util::SERVER_HEADER_VALUE);
-        res
-    })
+fn header(mut res: WebResponse) -> WebResponse {
+    res.headers_mut().append(SERVER, util::SERVER_HEADER_VALUE);
+    res
 }

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

@@ -11,6 +11,7 @@ use xitca_http::{
 
 use crate::util::Error;
 
+#[derive(Clone)]
 pub struct Message {
     message: &'static str,
 }

frameworks/Rust/xitca-web/xitca-web-axum.dockerfile

@@ -1,4 +1,4 @@
-FROM rust:1.75
+FROM rust:1.76
 
 ADD ./ /xitca-web
 WORKDIR /xitca-web

frameworks/Rust/xitca-web/xitca-web-iou.dockerfile

@@ -1,4 +1,4 @@
-FROM rust:1.75
+FROM rust:1.76
 
 ADD ./ /xitca-web
 WORKDIR /xitca-web

frameworks/Rust/xitca-web/xitca-web-sync.dockerfile

@@ -1,4 +1,4 @@
-FROM rust:1.75
+FROM rust:1.76
 
 ADD ./ /xitca-web
 WORKDIR /xitca-web

frameworks/Rust/xitca-web/xitca-web-wasm.dockerfile

@@ -1,7 +1,7 @@
 ARG WASMTIME_VERSION=15.0.0
 ARG WASM_TARGET=wasm32-wasi-preview1-threads
 
-FROM rust:1.75 AS compile
+FROM rust:1.76 AS compile
 
 ARG WASMTIME_VERSION
 ARG WASM_TARGET

frameworks/Rust/xitca-web/xitca-web.dockerfile

@@ -1,4 +1,4 @@
-FROM rust:1.75
+FROM rust:1.76
 
 ADD ./ /xitca-web
 WORKDIR /xitca-web