1
0
Эх сурвалжийг харах

allow server functions to read request and modify responce

Evan Almloff 2 жил өмнө
parent
commit
7ff5d356d5

+ 5 - 4
packages/server/Cargo.toml

@@ -23,7 +23,6 @@ http-body = { version = "0.4.5", optional = true }
 # axum
 axum = { version = "0.6.1", features = ["ws"], optional = true }
 tower-http = { version = "0.4.0", optional = true, features = ["fs"] }
-hyper = { version = "0.14.25", optional = true }
 axum-macros = "0.3.7"
 
 # salvo
@@ -33,6 +32,8 @@ serde = "1.0.159"
 # Dioxus + SSR
 dioxus-core = { path = "../core", version = "^0.3.0" }
 dioxus-ssr = { path = "../ssr", version = "^0.3.0", optional = true }
+hyper = { version = "0.14.25", optional = true }
+http = { version = "0.2.9", optional = true }
 
 log = "0.4.17"
 once_cell = "1.17.1"
@@ -57,6 +58,6 @@ web-sys = { version = "0.3.61", features = ["Window", "Document", "Element", "Ht
 default = ["hot-reload"]
 hot-reload = ["serde_json", "tokio-stream", "futures-util"]
 warp = ["dep:warp", "http-body", "ssr"]
-axum = ["dep:axum", "tower-http", "hyper", "ssr"]
-salvo = ["dep:salvo", "hyper", "ssr"]
-ssr = ["server_fn/ssr", "tokio", "dioxus-ssr"]
+axum = ["dep:axum", "tower-http", "ssr"]
+salvo = ["dep:salvo", "ssr"]
+ssr = ["server_fn/ssr", "tokio", "dioxus-ssr", "hyper", "http"]

+ 7 - 0
packages/server/examples/axum-hello-world/Cargo.toml

@@ -18,3 +18,10 @@ serde = "1.0.159"
 default = ["web"]
 ssr = ["axum", "tokio", "dioxus-server/axum"]
 web = ["dioxus-web"]
+
+[profile.release]
+lto = true
+panic = "abort"
+opt-level = 3
+strip = true
+codegen-units = 1

+ 7 - 2
packages/server/examples/axum-hello-world/src/main.rs

@@ -56,11 +56,12 @@ fn app(cx: Scope<AppProps>) -> Element {
         button {
             onclick: move |_| {
                 to_owned![text];
+                let sc = cx.sc();
                 async move {
                     if let Ok(data) = get_server_data().await {
                         println!("Client received: {}", data);
                         text.set(data.clone());
-                        post_server_data(data).await.unwrap();
+                        post_server_data(sc, data).await.unwrap();
                     }
                 }
             },
@@ -71,8 +72,12 @@ fn app(cx: Scope<AppProps>) -> Element {
 }
 
 #[server(PostServerData)]
-async fn post_server_data(data: String) -> Result<(), ServerFnError> {
+async fn post_server_data(cx: DioxusServerContext, data: String) -> Result<(), ServerFnError> {
+    // The server context contains information about the current request and allows you to modify the response.
+    cx.responce_headers_mut()
+        .insert("Set-Cookie", "foo=bar".parse().unwrap());
     println!("Server received: {}", data);
+    println!("Request parts are {:?}", cx.request_parts());
 
     Ok(())
 }

+ 7 - 0
packages/server/examples/axum-router/Cargo.toml

@@ -21,3 +21,10 @@ http = { version = "0.2.9", optional = true }
 default = ["web"]
 ssr = ["axum", "tokio", "dioxus-server/axum", "tower-http", "http"]
 web = ["dioxus-web", "dioxus-router/web"]
+
+[profile.release]
+lto = true
+panic = "abort"
+opt-level = 3
+strip = true
+codegen-units = 1

+ 7 - 0
packages/server/examples/salvo-hello-world/Cargo.toml

@@ -18,3 +18,10 @@ salvo = { version = "0.37.9", optional = true }
 default = ["web"]
 ssr = ["salvo", "tokio", "dioxus-server/salvo"]
 web = ["dioxus-web"]
+
+[profile.release]
+lto = true
+panic = "abort"
+opt-level = 3
+strip = true
+codegen-units = 1

+ 8 - 3
packages/server/examples/salvo-hello-world/src/main.rs

@@ -44,6 +44,7 @@ struct AppProps {
 fn app(cx: Scope<AppProps>) -> Element {
     let mut count = use_state(cx, || cx.props.count);
     let text = use_state(cx, || "...".to_string());
+    let server_context = cx.sc();
 
     cx.render(rsx! {
         h1 { "High-Five counter: {count}" }
@@ -51,12 +52,12 @@ fn app(cx: Scope<AppProps>) -> Element {
         button { onclick: move |_| count -= 1, "Down low!" }
         button {
             onclick: move |_| {
-                to_owned![text];
+                to_owned![text, server_context];
                 async move {
                     if let Ok(data) = get_server_data().await {
                         println!("Client received: {}", data);
                         text.set(data.clone());
-                        post_server_data(data).await.unwrap();
+                        post_server_data(server_context, data).await.unwrap();
                     }
                 }
             },
@@ -67,8 +68,12 @@ fn app(cx: Scope<AppProps>) -> Element {
 }
 
 #[server(PostServerData)]
-async fn post_server_data(data: String) -> Result<(), ServerFnError> {
+async fn post_server_data(cx: DioxusServerContext, data: String) -> Result<(), ServerFnError> {
+    // The server context contains information about the current request and allows you to modify the response.
+    cx.responce_headers_mut()
+        .insert("Set-Cookie", "foo=bar".parse().unwrap());
     println!("Server received: {}", data);
+    println!("Request parts are {:?}", cx.request_parts());
 
     Ok(())
 }

+ 7 - 0
packages/server/examples/warp-hello-world/Cargo.toml

@@ -18,3 +18,10 @@ warp = { version = "0.3.3", optional = true }
 default = ["web"]
 ssr = ["warp", "tokio", "dioxus-server/warp"]
 web = ["dioxus-web"]
+
+[profile.release]
+lto = true
+panic = "abort"
+opt-level = 3
+strip = true
+codegen-units = 1

+ 8 - 3
packages/server/examples/warp-hello-world/src/main.rs

@@ -41,6 +41,7 @@ struct AppProps {
 fn app(cx: Scope<AppProps>) -> Element {
     let mut count = use_state(cx, || cx.props.count);
     let text = use_state(cx, || "...".to_string());
+    let server_context = cx.sc();
 
     cx.render(rsx! {
         h1 { "High-Five counter: {count}" }
@@ -48,12 +49,12 @@ fn app(cx: Scope<AppProps>) -> Element {
         button { onclick: move |_| count -= 1, "Down low!" }
         button {
             onclick: move |_| {
-                to_owned![text];
+                to_owned![text, server_context];
                 async move {
                     if let Ok(data) = get_server_data().await {
                         println!("Client received: {}", data);
                         text.set(data.clone());
-                        post_server_data(data).await.unwrap();
+                        post_server_data(server_context, data).await.unwrap();
                     }
                 }
             },
@@ -64,8 +65,12 @@ fn app(cx: Scope<AppProps>) -> Element {
 }
 
 #[server(PostServerData)]
-async fn post_server_data(data: String) -> Result<(), ServerFnError> {
+async fn post_server_data(cx: DioxusServerContext, data: String) -> Result<(), ServerFnError> {
+    // The server context contains information about the current request and allows you to modify the response.
+    cx.responce_headers_mut()
+        .insert("Set-Cookie", "foo=bar".parse().unwrap());
     println!("Server received: {}", data);
+    println!("Request parts are {:?}", cx.request_parts());
 
     Ok(())
 }

+ 30 - 16
packages/server/src/adapters/axum_adapter.rs

@@ -57,16 +57,17 @@
 
 use axum::{
     body::{self, Body, BoxBody, Full},
-    extract::RawQuery,
     extract::{State, WebSocketUpgrade},
     handler::Handler,
-    http::{HeaderMap, Request, Response, StatusCode},
+    http::{Request, Response, StatusCode},
     response::IntoResponse,
     routing::{get, post},
     Router,
 };
+use dioxus_core::VirtualDom;
 use server_fn::{Encoding, Payload, ServerFunctionRegistry};
 use std::error::Error;
+use std::sync::Arc;
 use tokio::task::spawn_blocking;
 
 use crate::{
@@ -223,8 +224,11 @@ where
 
     fn register_server_fns(self, server_fn_route: &'static str) -> Self {
         self.register_server_fns_with_handler(server_fn_route, |func| {
-            move |headers: HeaderMap, RawQuery(query): RawQuery, body: Request<Body>| async move {
-                server_fn_handler((), func.clone(), headers, query, body).await
+            move |req: Request<Body>| async move {
+                let (parts, body) = req.into_parts();
+                let parts: Arc<RequestParts> = Arc::new(parts.into());
+                let server_context = DioxusServerContext::new(parts.clone());
+                server_fn_handler(server_context, func.clone(), parts, body).await
             }
         })
     }
@@ -296,44 +300,54 @@ where
 
 async fn render_handler<P: Clone + serde::Serialize + Send + Sync + 'static>(
     State((cfg, ssr_state)): State<(ServeConfig<P>, SSRState)>,
+    request: Request<Body>,
 ) -> impl IntoResponse {
-    let rendered = ssr_state.render(&cfg);
+    let (parts, _) = request.into_parts();
+    let parts: Arc<RequestParts> = Arc::new(parts.into());
+    let server_context = DioxusServerContext::new(parts);
+    let mut vdom =
+        VirtualDom::new_with_props(cfg.app, cfg.props.clone()).with_root_context(server_context);
+    let _ = vdom.rebuild();
+
+    let rendered = ssr_state.render_vdom(&vdom, &cfg);
     Full::from(rendered)
 }
 
 /// A default handler for server functions. It will deserialize the request body, call the server function, and serialize the response.
 pub async fn server_fn_handler(
-    server_context: impl Into<DioxusServerContext>,
+    server_context: DioxusServerContext,
     function: ServerFunction,
-    headers: HeaderMap,
-    query: Option<String>,
-    req: Request<Body>,
+    parts: Arc<RequestParts>,
+    body: Body,
 ) -> impl IntoResponse {
-    let server_context = server_context.into();
-    let (_, body) = req.into_parts();
     let body = hyper::body::to_bytes(body).await;
-    let Ok(body)=body else {
+    let Ok(body) = body else {
         return report_err(body.err().unwrap());
     };
 
     // Because the future returned by `server_fn_handler` is `Send`, and the future returned by this function must be send, we need to spawn a new runtime
     let (resp_tx, resp_rx) = tokio::sync::oneshot::channel();
+    let query_string = parts.uri.query().unwrap_or_default().to_string();
     spawn_blocking({
         move || {
             tokio::runtime::Runtime::new()
                 .expect("couldn't spawn runtime")
                 .block_on(async {
-                    let query = &query.unwrap_or_default().into();
+                    let query = &query_string.into();
                     let data = match &function.encoding {
                         Encoding::Url | Encoding::Cbor => &body,
                         Encoding::GetJSON | Encoding::GetCBOR => query,
                     };
-                    let resp = match (function.trait_obj)(server_context, &data).await {
+                    let resp = match (function.trait_obj)(server_context.clone(), &data).await {
                         Ok(serialized) => {
                             // if this is Accept: application/json then send a serialized JSON response
-                            let accept_header =
-                                headers.get("Accept").and_then(|value| value.to_str().ok());
+                            let accept_header = parts
+                                .headers
+                                .get("Accept")
+                                .and_then(|value| value.to_str().ok());
                             let mut res = Response::builder();
+                            *res.headers_mut().expect("empty responce should be valid") =
+                                server_context.take_responce_headers();
                             if accept_header == Some("application/json")
                                 || accept_header
                                     == Some(

+ 43 - 15
packages/server/src/adapters/salvo_adapter.rs

@@ -50,8 +50,7 @@
 //! }
 //! ```
 
-use std::error::Error;
-
+use dioxus_core::VirtualDom;
 use hyper::{http::HeaderValue, StatusCode};
 use salvo::{
     async_trait, handler,
@@ -59,6 +58,8 @@ use salvo::{
     Depot, FlowCtrl, Handler, Request, Response, Router,
 };
 use server_fn::{Encoding, Payload, ServerFunctionRegistry};
+use std::error::Error;
+use std::sync::Arc;
 use tokio::task::spawn_blocking;
 
 use crate::{
@@ -172,7 +173,7 @@ pub trait DioxusRouterExt {
     /// }
     ///
     /// fn app(cx: Scope) -> Element {todo!()}
-    /// ```    
+    /// ```
     fn serve_dioxus_application<P: Clone + serde::Serialize + Send + Sync + 'static>(
         self,
         server_fn_path: &'static str,
@@ -264,6 +265,17 @@ impl DioxusRouterExt for Router {
     }
 }
 
+/// Extracts the parts of a request that are needed for server functions. This will take parts of the request and replace them with empty values.
+pub fn extract_parts(req: &mut Request) -> RequestParts {
+    RequestParts {
+        method: std::mem::take(req.method_mut()),
+        uri: std::mem::take(req.uri_mut()),
+        version: req.version(),
+        headers: std::mem::take(req.headers_mut()),
+        extensions: std::mem::take(req.extensions_mut()),
+    }
+}
+
 struct SSRHandler<P: Clone> {
     cfg: ServeConfig<P>,
 }
@@ -272,7 +284,7 @@ struct SSRHandler<P: Clone> {
 impl<P: Clone + serde::Serialize + Send + Sync + 'static> Handler for SSRHandler<P> {
     async fn handle(
         &self,
-        _req: &mut Request,
+        req: &mut Request,
         depot: &mut Depot,
         res: &mut Response,
         _flow: &mut FlowCtrl,
@@ -285,7 +297,16 @@ impl<P: Clone + serde::Serialize + Send + Sync + 'static> Handler for SSRHandler
             depot.inject(renderer.clone());
             renderer
         };
-        res.write_body(renderer_pool.render(&self.cfg)).unwrap();
+        let parts: Arc<RequestParts> = Arc::new(extract_parts(req));
+        let server_context = DioxusServerContext::new(parts);
+        let mut vdom = VirtualDom::new_with_props(self.cfg.app, self.cfg.props.clone())
+            .with_root_context(server_context.clone());
+        let _ = vdom.rebuild();
+
+        res.write_body(renderer_pool.render_vdom(&vdom, &self.cfg))
+            .unwrap();
+
+        *res.headers_mut() = server_context.take_responce_headers();
     }
 }
 
@@ -314,25 +335,29 @@ impl ServerFnHandler {
             function,
         } = self;
 
+        let query = req
+            .uri()
+            .query()
+            .unwrap_or_default()
+            .as_bytes()
+            .to_vec()
+            .into();
         let body = hyper::body::to_bytes(req.body_mut().unwrap()).await;
         let Ok(body)=body else {
             handle_error(body.err().unwrap(), res);
             return;
         };
         let headers = req.headers();
+        let accept_header = headers.get("Accept").cloned();
+
+        let parts = Arc::new(extract_parts(req));
 
         // Because the future returned by `server_fn_handler` is `Send`, and the future returned by this function must be send, we need to spawn a new runtime
         let (resp_tx, resp_rx) = tokio::sync::oneshot::channel();
-        let function = function.clone();
-        let server_context = server_context.clone();
-        let query = req
-            .uri()
-            .query()
-            .unwrap_or_default()
-            .as_bytes()
-            .to_vec()
-            .into();
         spawn_blocking({
+            let function = function.clone();
+            let mut server_context = server_context.clone();
+            server_context.parts = parts;
             move || {
                 tokio::runtime::Runtime::new()
                     .expect("couldn't spawn runtime")
@@ -349,10 +374,13 @@ impl ServerFnHandler {
         });
         let result = resp_rx.await.unwrap();
 
+        // Set the headers from the server context
+        *res.headers_mut() = server_context.take_responce_headers();
+
         match result {
             Ok(serialized) => {
                 // if this is Accept: application/json then send a serialized JSON response
-                let accept_header = headers.get("Accept").and_then(|value| value.to_str().ok());
+                let accept_header = accept_header.as_ref().and_then(|value| value.to_str().ok());
                 if accept_header == Some("application/json")
                     || accept_header
                         == Some(

+ 93 - 52
packages/server/src/adapters/warp_adapter.rs

@@ -51,13 +51,16 @@ use crate::{
     prelude::*, render::SSRState, serve_config::ServeConfig, server_fn::DioxusServerFnRegistry,
 };
 
+use dioxus_core::VirtualDom;
 use server_fn::{Encoding, Payload, ServerFunctionRegistry};
 use std::error::Error;
+use std::sync::Arc;
 use tokio::task::spawn_blocking;
+use warp::path::FullPath;
 use warp::{
     filters::BoxedFilter,
     http::{Response, StatusCode},
-    hyper::{body::Bytes, HeaderMap},
+    hyper::body::Bytes,
     path, Filter, Reply,
 };
 
@@ -125,48 +128,16 @@ where
 /// ```
 pub fn register_server_fns(server_fn_route: &'static str) -> BoxedFilter<(impl Reply,)> {
     register_server_fns_with_handler(server_fn_route, |full_route, func| {
-        let func2 = func.clone();
-        let func3 = func.clone();
         path(full_route.clone())
-            .and(warp::filters::method::get())
-            .and(warp::header::headers_cloned())
-            .and(warp::filters::query::raw())
+            .and(warp::post().or(warp::get()).unify())
+            .and(request_parts())
             .and(warp::body::bytes())
-            .and_then(move |headers, query, body| {
+            .and_then(move |parts, bytes| {
                 let func = func.clone();
                 async move {
-                    server_fn_handler(
-                        DioxusServerContext::default(),
-                        func,
-                        headers,
-                        Some(query),
-                        body,
-                    )
-                    .await
+                    server_fn_handler(DioxusServerContext::default(), func, parts, bytes).await
                 }
             })
-            .or(path(full_route.clone())
-                .and(warp::filters::method::get())
-                .and(warp::header::headers_cloned())
-                .and(warp::body::bytes())
-                .and_then(move |headers, body| {
-                    let func = func2.clone();
-                    async move {
-                        server_fn_handler(DioxusServerContext::default(), func, headers, None, body)
-                            .await
-                    }
-                }))
-            .or(path(full_route)
-                .and(warp::filters::method::post())
-                .and(warp::header::headers_cloned())
-                .and(warp::body::bytes())
-                .and_then(move |headers, body| {
-                    let func = func3.clone();
-                    async move {
-                        server_fn_handler(DioxusServerContext::default(), func, headers, None, body)
-                            .await
-                    }
-                }))
     })
 }
 
@@ -199,18 +170,71 @@ pub fn serve_dioxus_application<P: Clone + serde::Serialize + Send + Sync + 'sta
 
     connect_hot_reload()
         .or(register_server_fns(server_fn_route))
-        .or(warp::path::end()
-            .and(warp::get())
-            .and(with_ssr_state())
-            .map(move |renderer: SSRState| warp::reply::html(renderer.render(&cfg))))
+        .or(warp::path::end().and(render_ssr(cfg)))
         .or(serve_dir)
         .boxed()
 }
 
+/// Server render the application.
+pub fn render_ssr<P: Clone + serde::Serialize + Send + Sync + 'static>(
+    cfg: ServeConfig<P>,
+) -> impl Filter<Extract = (impl Reply,), Error = warp::Rejection> + Clone {
+    warp::get()
+        .and(request_parts())
+        .and(with_ssr_state())
+        .map(move |parts, renderer: SSRState| {
+            let parts = Arc::new(parts);
+
+            let server_context = DioxusServerContext::new(parts);
+
+            let mut vdom = VirtualDom::new_with_props(cfg.app, cfg.props.clone())
+                .with_root_context(server_context.clone());
+            let _ = vdom.rebuild();
+
+            let html = renderer.render_vdom(&vdom, &cfg);
+
+            let mut res = Response::builder();
+
+            *res.headers_mut().expect("empty request should be valid") =
+                server_context.take_responce_headers();
+
+            res.header("Content-Type", "text/html")
+                .body(Bytes::from(html))
+                .unwrap()
+        })
+}
+
+/// An extractor for the request parts (used in [DioxusServerContext]). This will extract the method, uri, query, and headers from the request.
+pub fn request_parts(
+) -> impl Filter<Extract = (RequestParts,), Error = warp::reject::Rejection> + Clone {
+    warp::method()
+        .and(warp::filters::path::full())
+        .and(
+            warp::filters::query::raw()
+                .or(warp::any().map(String::new))
+                .unify(),
+        )
+        .and(warp::header::headers_cloned())
+        .and_then(move |method, path: FullPath, query, headers| async move {
+            http::uri::Builder::new()
+                .path_and_query(format!("{}?{}", path.as_str(), query))
+                .build()
+                .map_err(|err| {
+                    warp::reject::custom(FailedToReadBody(format!("Failed to build uri: {}", err)))
+                })
+                .map(|uri| RequestParts {
+                    method,
+                    uri,
+                    headers,
+                    ..Default::default()
+                })
+        })
+}
+
 fn with_ssr_state() -> impl Filter<Extract = (SSRState,), Error = std::convert::Infallible> + Clone
 {
-    let renderer = SSRState::default();
-    warp::any().map(move || renderer.clone())
+    let state = SSRState::default();
+    warp::any().map(move || state.clone())
 }
 
 #[derive(Debug)]
@@ -227,29 +251,46 @@ impl warp::reject::Reject for RecieveFailed {}
 pub async fn server_fn_handler(
     server_context: impl Into<DioxusServerContext>,
     function: ServerFunction,
-    headers: HeaderMap,
-    query: Option<String>,
+    parts: RequestParts,
     body: Bytes,
 ) -> Result<Box<dyn warp::Reply>, warp::Rejection> {
-    let server_context = server_context.into();
+    let mut server_context = server_context.into();
+
+    let parts = Arc::new(parts);
+
+    server_context.parts = parts.clone();
+
     // Because the future returned by `server_fn_handler` is `Send`, and the future returned by this function must be send, we need to spawn a new runtime
     let (resp_tx, resp_rx) = tokio::sync::oneshot::channel();
     spawn_blocking({
         move || {
             tokio::runtime::Runtime::new()
                 .expect("couldn't spawn runtime")
-                .block_on(async {
-                    let query = &query.unwrap_or_default().into();
+                .block_on(async move {
+                    let query = parts
+                        .uri
+                        .query()
+                        .unwrap_or_default()
+                        .as_bytes()
+                        .to_vec()
+                        .into();
                     let data = match &function.encoding {
                         Encoding::Url | Encoding::Cbor => &body,
-                        Encoding::GetJSON | Encoding::GetCBOR => query,
+                        Encoding::GetJSON | Encoding::GetCBOR => &query,
                     };
-                    let resp = match (function.trait_obj)(server_context, &data).await {
+                    let resp = match (function.trait_obj)(server_context.clone(), data).await {
                         Ok(serialized) => {
                             // if this is Accept: application/json then send a serialized JSON response
-                            let accept_header =
-                                headers.get("Accept").and_then(|value| value.to_str().ok());
+                            let accept_header = parts
+                                .headers
+                                .get("Accept")
+                                .as_ref()
+                                .and_then(|value| value.to_str().ok());
                             let mut res = Response::builder();
+
+                            *res.headers_mut().expect("empty request should be valid") =
+                                server_context.take_responce_headers();
+
                             if accept_header == Some("application/json")
                                 || accept_header
                                     == Some(

+ 4 - 2
packages/server/src/lib.rs

@@ -30,8 +30,10 @@ pub mod prelude {
     #[cfg(feature = "ssr")]
     pub use crate::render::SSRState;
     #[cfg(feature = "ssr")]
-    pub use crate::serve_config::{ServeConfig, ServeConfigBuilder};
-    pub use crate::server_context::DioxusServerContext;
+    pub use crate::serve_config::{ ServeConfig, ServeConfigBuilder};
+    #[cfg(feature = "ssr")]
+    pub use crate::server_context::{RequestParts};
+    pub use crate::server_context::{ DioxusServerContext, HasServerContext};
     pub use crate::server_fn::ServerFn;
     #[cfg(feature = "ssr")]
     pub use crate::server_fn::{ServerFnTraitObj, ServerFunction};

+ 13 - 2
packages/server/src/render.rs

@@ -26,20 +26,31 @@ impl SSRState {
     /// Render the application to HTML.
     pub fn render<P: 'static + Clone + serde::Serialize>(&self, cfg: &ServeConfig<P>) -> String {
         let ServeConfig {
-            app, props, index, ..
+            app, props, ..
         } = cfg;
 
         let mut vdom = VirtualDom::new_with_props(*app, props.clone());
 
         let _ = vdom.rebuild();
 
+        self.render_vdom(&vdom, cfg)
+    }
+
+    /// Render a VirtualDom to HTML.
+    pub fn render_vdom<P: 'static + Clone + serde::Serialize>(
+        &self,
+        vdom: &VirtualDom,
+        cfg: &ServeConfig<P>,
+    ) -> String {
+        let ServeConfig { index, .. } = cfg;
+
         let mut renderer = self.renderers.pull(pre_renderer);
 
         let mut html = String::new();
 
         html += &index.pre_main;
 
-        let _ = renderer.render_to(&mut html, &vdom);
+        let _ = renderer.render_to(&mut html, vdom);
 
         // serialize the props
         let _ = crate::props_html::serialize_props::encode_in_element(&cfg.props, &mut html);

+ 139 - 51
packages/server/src/server_context.rs

@@ -1,72 +1,160 @@
-use std::sync::{Arc, PoisonError, RwLock, RwLockWriteGuard};
+use dioxus_core::ScopeState;
 
-use anymap::{any::Any, Map};
+/// A trait for an object that contains a server context
+pub trait HasServerContext {
+    /// Get the server context from the state
+    fn server_context(&self) -> DioxusServerContext;
 
-type SendSyncAnyMap = Map<dyn Any + Send + Sync + 'static>;
+    /// A shortcut for `self.server_context()`
+    fn sc(&self) -> DioxusServerContext {
+        self.server_context()
+    }
+}
+
+impl HasServerContext for &ScopeState {
+    fn server_context(&self) -> DioxusServerContext {
+        #[cfg(feature = "ssr")]
+        {
+            self.consume_context().expect("No server context found")
+        }
+        #[cfg(not(feature = "ssr"))]
+        {
+            DioxusServerContext {}
+        }
+    }
+}
 
-/// A shared context for server functions.
+/// A shared context for server functions that contains infomation about the request and middleware state.
 /// This allows you to pass data between your server framework and the server functions. This can be used to pass request information or information about the state of the server. For example, you could pass authentication data though this context to your server functions.
+///
+/// You should not construct this directly inside components. Instead use the `HasServerContext` trait to get the server context from the scope.
 #[derive(Clone)]
 pub struct DioxusServerContext {
-    shared_context: Arc<RwLock<SendSyncAnyMap>>,
+    #[cfg(feature = "ssr")]
+    shared_context: std::sync::Arc<
+        std::sync::RwLock<anymap::Map<dyn anymap::any::Any + Send + Sync + 'static>>,
+    >,
+    #[cfg(feature = "ssr")]
+    headers: std::sync::Arc<std::sync::RwLock<hyper::header::HeaderMap>>,
+    #[cfg(feature = "ssr")]
+    pub(crate) parts: std::sync::Arc<RequestParts>,
 }
 
+#[allow(clippy::derivable_impls)]
 impl Default for DioxusServerContext {
     fn default() -> Self {
         Self {
-            shared_context: Arc::new(RwLock::new(SendSyncAnyMap::new())),
+            #[cfg(feature = "ssr")]
+            shared_context: std::sync::Arc::new(std::sync::RwLock::new(anymap::Map::new())),
+            #[cfg(feature = "ssr")]
+            headers: Default::default(),
+            #[cfg(feature = "ssr")]
+            parts: Default::default(),
         }
     }
 }
 
-impl DioxusServerContext {
-    /// Clone a value from the shared server context
-    pub fn get<T: Any + Send + Sync + Clone + 'static>(&self) -> Option<T> {
-        self.shared_context.read().ok()?.get::<T>().cloned()
+#[cfg(feature = "ssr")]
+pub use server_fn_impl::*;
+
+#[cfg(feature = "ssr")]
+mod server_fn_impl {
+    use super::*;
+    use std::sync::LockResult;
+    use std::sync::{Arc, PoisonError, RwLock, RwLockReadGuard, RwLockWriteGuard};
+
+    use anymap::{any::Any, Map};
+    type SendSyncAnyMap = Map<dyn Any + Send + Sync + 'static>;
+
+    impl DioxusServerContext {
+        /// Create a new server context from a request
+        pub fn new(parts: impl Into<Arc<RequestParts>>) -> Self {
+            Self {
+                parts: parts.into(),
+                shared_context: Arc::new(RwLock::new(SendSyncAnyMap::new())),
+                headers: Default::default(),
+            }
+        }
+
+        /// Clone a value from the shared server context
+        pub fn get<T: Any + Send + Sync + Clone + 'static>(&self) -> Option<T> {
+            self.shared_context.read().ok()?.get::<T>().cloned()
+        }
+
+        /// Insert a value into the shared server context
+        pub fn insert<T: Any + Send + Sync + 'static>(
+            &mut self,
+            value: T,
+        ) -> Result<(), PoisonError<RwLockWriteGuard<'_, SendSyncAnyMap>>> {
+            self.shared_context
+                .write()
+                .map(|mut map| map.insert(value))
+                .map(|_| ())
+        }
+
+        /// Get the headers from the server context
+        pub fn responce_headers(&self) -> RwLockReadGuard<'_, hyper::header::HeaderMap> {
+            self.try_responce_headers()
+                .expect("Failed to get headers from server context")
+        }
+
+        /// Try to get the headers from the server context
+        pub fn try_responce_headers(
+            &self,
+        ) -> LockResult<RwLockReadGuard<'_, hyper::header::HeaderMap>> {
+            self.headers.read()
+        }
+
+        /// Get the headers mutably from the server context
+        pub fn responce_headers_mut(&self) -> RwLockWriteGuard<'_, hyper::header::HeaderMap> {
+            self.try_responce_headers_mut()
+                .expect("Failed to get headers mutably from server context")
+        }
+
+        /// Try to get the headers mut from the server context
+        pub fn try_responce_headers_mut(
+            &self,
+        ) -> LockResult<RwLockWriteGuard<'_, hyper::header::HeaderMap>> {
+            self.headers.write()
+        }
+
+        pub(crate) fn take_responce_headers(&self) -> hyper::header::HeaderMap {
+            let mut headers = self.headers.write().unwrap();
+            std::mem::take(&mut *headers)
+        }
+
+        /// Get the request that triggered:
+        /// - The initial SSR render if called from a ScopeState or ServerFn
+        /// - The server function to be called if called from a server function after the initial render
+        pub fn request_parts(&self) -> &RequestParts {
+            &self.parts
+        }
     }
 
-    /// Insert a value into the shared server context
-    pub fn insert<T: Any + Send + Sync + 'static>(
-        &mut self,
-        value: T,
-    ) -> Result<(), PoisonError<RwLockWriteGuard<'_, SendSyncAnyMap>>> {
-        self.shared_context
-            .write()
-            .map(|mut map| map.insert(value))
-            .map(|_| ())
+    /// Associated parts of an HTTP Request
+    #[derive(Debug, Default)]
+    pub struct RequestParts {
+        /// The request's method
+        pub method: http::Method,
+        /// The request's URI
+        pub uri: http::Uri,
+        /// The request's version
+        pub version: http::Version,
+        /// The request's headers
+        pub headers: http::HeaderMap<http::HeaderValue>,
+        /// The request's extensions
+        pub extensions: http::Extensions,
     }
-}
 
-/// Generate a server context from a tuple of values
-macro_rules! server_context {
-    ($({$(($name:ident: $ty:ident)),*}),*) => {
-        $(
-            #[allow(unused_mut)]
-            impl< $($ty: Send + Sync + 'static),* > From<($($ty,)*)> for $crate::server_context::DioxusServerContext {
-                fn from(( $($name,)* ): ($($ty,)*)) -> Self {
-                    let mut context = $crate::server_context::DioxusServerContext::default();
-                    $(context.insert::<$ty>($name).unwrap();)*
-                    context
-                }
+    impl From<http::request::Parts> for RequestParts {
+        fn from(parts: http::request::Parts) -> Self {
+            Self {
+                method: parts.method,
+                uri: parts.uri,
+                version: parts.version,
+                headers: parts.headers,
+                extensions: parts.extensions,
             }
-        )*
-    };
+        }
+    }
 }
-
-server_context!(
-    {},
-    {(a: A)},
-    {(a: A), (b: B)},
-    {(a: A), (b: B), (c: C)},
-    {(a: A), (b: B), (c: C), (d: D)},
-    {(a: A), (b: B), (c: C), (d: D), (e: E)},
-    {(a: A), (b: B), (c: C), (d: D), (e: E), (f: F)},
-    {(a: A), (b: B), (c: C), (d: D), (e: E), (f: F), (g: G)},
-    {(a: A), (b: B), (c: C), (d: D), (e: E), (f: F), (g: G), (h: H)},
-    {(a: A), (b: B), (c: C), (d: D), (e: E), (f: F), (g: G), (h: H), (i: I)},
-    {(a: A), (b: B), (c: C), (d: D), (e: E), (f: F), (g: G), (h: H), (i: I), (j: J)},
-    {(a: A), (b: B), (c: C), (d: D), (e: E), (f: F), (g: G), (h: H), (i: I), (j: J), (k: K)},
-    {(a: A), (b: B), (c: C), (d: D), (e: E), (f: F), (g: G), (h: H), (i: I), (j: J), (k: K), (l: L)},
-    {(a: A), (b: B), (c: C), (d: D), (e: E), (f: F), (g: G), (h: H), (i: I), (j: J), (k: K), (l: L), (m: M)},
-    {(a: A), (b: B), (c: C), (d: D), (e: E), (f: F), (g: G), (h: H), (i: I), (j: J), (k: K), (l: L), (m: M), (n: N)}
-);