add cache headers

packages/fullstack/src/adapters/axum_adapter.rs

@@ -349,6 +349,17 @@ where
     }
 }
 
+fn apply_request_parts_to_response<B>(
+    parts: &RequestParts,
+    response: &mut axum::response::Response<B>,
+) {
+    let headers = response.headers_mut();
+    for (key, value) in parts.headers.iter() {
+        headers.insert(key, value.clone());
+    }
+}
+
+#[axum::debug_handler]
 async fn render_handler<P: Clone + serde::Serialize + Send + Sync + 'static>(
     State((cfg, ssr_state)): State<(ServeConfig<P>, SSRState)>,
     request: Request<Body>,
@@ -356,12 +367,21 @@ async fn render_handler<P: Clone + serde::Serialize + Send + Sync + 'static>(
     let (parts, _) = request.into_parts();
     let parts: Arc<RequestParts> = Arc::new(parts.into());
     let url = parts.uri.path_and_query().unwrap().to_string();
-    let server_context = DioxusServerContext::new(parts);
+    let server_context = DioxusServerContext::new(parts.clone());
 
-    match ssr_state.render(url, &cfg, |vdom| {
-        vdom.base_scope().provide_context(server_context);
-    }) {
-        Ok(html) => Full::from(html).into_response(),
+    match ssr_state
+        .render(url, &cfg, |vdom| {
+            vdom.base_scope().provide_context(server_context);
+        })
+        .await
+    {
+        Ok(rendered) => {
+            let crate::render::RenderResponse { html, freshness } = rendered;
+            let mut response = axum::response::Html::from(html).into_response();
+            freshness.write(response.headers_mut());
+            apply_request_parts_to_response(&parts, &mut response);
+            response
+        }
         Err(e) => {
             log::error!("Failed to render page: {}", e);
             report_err(e).into_response()

packages/fullstack/src/adapters/salvo_adapter.rs

@@ -332,16 +332,25 @@ impl<P: Clone + serde::Serialize + Send + Sync + 'static> Handler for SSRHandler
         let route = parts.uri.path().to_string();
         let server_context = DioxusServerContext::new(parts);
 
-        res.write_body(
-            renderer_pool
-                .render(route, &self.cfg, |vdom| {
-                    vdom.base_scope().provide_context(server_context.clone());
-                })
-                .unwrap(),
-        )
-        .unwrap();
+        match renderer_pool
+            .render(route, &self.cfg, |vdom| {
+                vdom.base_scope().provide_context(server_context.clone());
+            })
+            .await
+        {
+            Ok(rendered) => {
+                let crate::render::RenderResponse { html, freshness } = rendered;
 
-        *res.headers_mut() = server_context.take_response_headers();
+                res.write_body(html).unwrap();
+
+                *res.headers_mut() = server_context.take_response_headers();
+                freshness.write(res.headers_mut());
+            }
+            Err(err) => {
+                log::error!("Error rendering SSR: {}", err);
+                res.write_body("Error rendering SSR").unwrap();
+            }
+        };
     }
 }
 

packages/fullstack/src/adapters/warp_adapter.rs

@@ -185,24 +185,42 @@ pub fn render_ssr<P: Clone + serde::Serialize + Send + Sync + 'static>(
     warp::get()
         .and(request_parts())
         .and(with_ssr_state(&cfg))
-        .map(move |parts: RequestParts, renderer: SSRState| {
+        .then(move |parts: RequestParts, renderer: SSRState| {
             let route = parts.uri.path().to_string();
             let parts = Arc::new(parts);
+            let cfg = cfg.clone();
+            async move {
+                let server_context = DioxusServerContext::new(parts);
 
-            let server_context = DioxusServerContext::new(parts);
+                match renderer
+                    .render(route, &cfg, |vdom| {
+                        vdom.base_scope().provide_context(server_context.clone());
+                    })
+                    .await
+                {
+                    Ok(rendered) => {
+                        let crate::render::RenderResponse { html, freshness } = rendered;
 
-            let html = renderer.render(route, &cfg, |vdom| {
-                vdom.base_scope().provide_context(server_context.clone());
-            });
+                        let mut res = Response::builder()
+                            .header("Content-Type", "text/html")
+                            .body(html)
+                            .unwrap();
 
-            let mut res = Response::builder();
+                        let headers_mut = res.headers_mut();
+                        *headers_mut = server_context.take_response_headers();
+                        freshness.write(headers_mut);
 
-            *res.headers_mut().expect("empty request should be valid") =
-                server_context.take_response_headers();
-
-            res.header("Content-Type", "text/html")
-                .body(Bytes::from(html.unwrap()))
-                .unwrap()
+                        res
+                    }
+                    Err(err) => {
+                        log::error!("Failed to render ssr: {}", err);
+                        Response::builder()
+                            .status(500)
+                            .body("Failed to render ssr".into())
+                            .unwrap()
+                    }
+                }
+            }
         })
 }
 
@@ -364,9 +382,8 @@ pub fn connect_hot_reload() -> impl Filter<Extract = (impl Reply,), Error = warp
     #[cfg(not(all(debug_assertions, feature = "hot-reload", feature = "ssr")))]
     {
         warp::path!("_dioxus" / "hot_reload")
-            .and(warp::ws())
             .map(warp::reply)
-            .map(|reply| warp::reply::with_status(reply, warp::http::StatusCode::NOT_FOUND));
+            .map(|reply| warp::reply::with_status(reply, warp::http::StatusCode::NOT_FOUND))
     }
     #[cfg(all(debug_assertions, feature = "hot-reload", feature = "ssr"))]
     {