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"))]
     {

packages/fullstack/src/render.rs

@@ -3,7 +3,10 @@
 use std::sync::Arc;
 
 use dioxus::prelude::VirtualDom;
-use dioxus_ssr::{incremental::IncrementalRendererConfig, Renderer};
+use dioxus_ssr::{
+    incremental::{IncrementalRendererConfig, RenderFreshness},
+    Renderer,
+};
 
 use crate::prelude::*;
 use dioxus::prelude::*;
@@ -20,7 +23,7 @@ enum SsrRendererPool {
 }
 
 impl SsrRendererPool {
-    fn render_to<P: Clone + 'static>(
+    async fn render_to<P: Clone + 'static>(
         &self,
         cfg: &ServeConfig<P>,
         route: String,
@@ -28,7 +31,7 @@ impl SsrRendererPool {
         props: P,
         to: &mut String,
         modify_vdom: impl FnOnce(&mut VirtualDom),
-    ) -> Result<(), dioxus_ssr::incremental::IncrementalRendererError> {
+    ) -> Result<RenderFreshness, dioxus_ssr::incremental::IncrementalRendererError> {
         match self {
             Self::Renderer(pool) => {
                 let mut vdom = VirtualDom::new_with_props(component, props);
@@ -37,13 +40,16 @@ impl SsrRendererPool {
                 let _ = vdom.rebuild();
                 let mut renderer = pool.pull(pre_renderer);
                 renderer.render_to(to, &vdom)?;
+
+                Ok(RenderFreshness::now(None))
             }
             Self::Incremental(pool) => {
                 let mut renderer = pool.pull(|| incremental_pre_renderer(cfg));
-                renderer.render_to_string(route, component, props, to, modify_vdom)?;
+                Ok(renderer
+                    .render_to_string(route, component, props, to, modify_vdom)
+                    .await?)
             }
         }
-        Ok(())
     }
 }
 
@@ -74,30 +80,36 @@ impl SSRState {
     }
 
     /// Render the application to HTML.
-    pub fn render<P: 'static + Clone + serde::Serialize>(
-        &self,
+    pub fn render<'a, P: 'static + Clone + serde::Serialize + Send + Sync>(
+        &'a self,
         route: String,
-        cfg: &ServeConfig<P>,
-        modify_vdom: impl FnOnce(&mut VirtualDom),
-    ) -> Result<String, dioxus_ssr::incremental::IncrementalRendererError> {
-        let ServeConfig { app, props, .. } = cfg;
+        cfg: &'a ServeConfig<P>,
+        modify_vdom: impl FnOnce(&mut VirtualDom) + Send + 'a,
+    ) -> impl std::future::Future<
+        Output = Result<RenderResponse, dioxus_ssr::incremental::IncrementalRendererError>,
+    > + Send
+           + 'a {
+        async move {
+            let ServeConfig { app, props, .. } = cfg;
 
-        let ServeConfig { index, .. } = cfg;
+            let ServeConfig { index, .. } = cfg;
 
-        let mut html = String::new();
+            let mut html = String::new();
 
-        html += &index.pre_main;
+            html += &index.pre_main;
 
-        self.renderers
-            .render_to(cfg, route, *app, props.clone(), &mut html, modify_vdom)?;
+            let freshness = self
+                .renderers
+                .render_to(cfg, route, *app, props.clone(), &mut html, modify_vdom)
+                .await?;
 
-        // serialize the props
-        let _ = crate::props_html::serialize_props::encode_in_element(&cfg.props, &mut html);
+            // serialize the props
+            let _ = crate::props_html::serialize_props::encode_in_element(&cfg.props, &mut html);
 
-        #[cfg(all(debug_assertions, feature = "hot-reload"))]
-        {
-            // In debug mode, we need to add a script to the page that will reload the page if the websocket disconnects to make full recompile hot reloads work
-            let disconnect_js = r#"(function () {
+            #[cfg(all(debug_assertions, feature = "hot-reload"))]
+            {
+                // In debug mode, we need to add a script to the page that will reload the page if the websocket disconnects to make full recompile hot reloads work
+                let disconnect_js = r#"(function () {
     const protocol = window.location.protocol === 'https:' ? 'wss:' : 'ws:';
     const url = protocol + '//' + window.location.host + '/_dioxus/disconnect';
     const poll_interval = 1000;
@@ -123,14 +135,33 @@ impl SSRState {
     ws.onclose = reload_upon_connect;
 })()"#;
 
-            html += r#"<script>"#;
-            html += disconnect_js;
-            html += r#"</script>"#;
+                html += r#"<script>"#;
+                html += disconnect_js;
+                html += r#"</script>"#;
+            }
+
+            html += &index.post_main;
+
+            Ok(RenderResponse { html, freshness })
         }
+    }
+}
 
-        html += &index.post_main;
+/// A rendered response from the server.
+pub struct RenderResponse {
+    pub(crate) html: String,
+    pub(crate) freshness: RenderFreshness,
+}
 
-        Ok(html)
+impl RenderResponse {
+    /// Get the rendered HTML.
+    pub fn html(&self) -> &str {
+        &self.html
+    }
+
+    /// Get the freshness of the rendered HTML.
+    pub fn freshness(&self) -> RenderFreshness {
+        self.freshness
     }
 }