Add generic state support to dioxus::server::router

packages/fullstack-server/src/launch.rs

@@ -93,7 +93,10 @@ async fn serve_server(
 /// - Hot-reloading
 /// - Async Runtime
 /// - Logging
-pub fn router(app: fn() -> Element) -> Router {
+pub fn router<S>(app: fn() -> Element) -> Router<S>
+where
+    S: Clone + Send + Sync + 'static,
+{
     let cfg = ServeConfig::new();
     apply_base_path(
         Router::new().serve_dioxus_application(cfg.clone(), app),
@@ -114,7 +117,7 @@ pub fn router(app: fn() -> Element) -> Router {
 /// This function uses axum to block on serving the application, and will not return.
 pub fn serve<F>(mut serve_it: impl FnMut() -> F) -> !
 where
-    F: Future<Output = Result<Router, anyhow::Error>> + 'static,
+    F: Future<Output=Result<Router, anyhow::Error>> + 'static,
 {
     let cb = move || Box::pin(serve_it()) as _;
 
@@ -132,7 +135,7 @@ where
 /// To enable hot-reloading of the router, the provided `serve_callback` should return a new `Router`
 /// each time it is called.
 pub async fn serve_router(
-    mut serve_callback: impl FnMut() -> Pin<Box<dyn Future<Output = Result<Router, anyhow::Error>>>>,
+    mut serve_callback: impl FnMut() -> Pin<Box<dyn Future<Output=Result<Router, anyhow::Error>>>>,
     addr: SocketAddr,
 ) {
     dioxus_logger::initialize_default();
@@ -186,8 +189,8 @@ pub async fn serve_router(
                             cx,
                         )
                     })
-                    .await
-                    .expect("Infallible");
+                        .await
+                        .expect("Infallible");
 
                     // upgrades needed for websockets
                     let builder = HyperBuilder::new(TokioExecutor::new());
@@ -222,10 +225,10 @@ pub async fn serve_router(
             //
             // todo(jon): I *believe* SSR is resilient to RSX changes, but we should verify that...
             Either::Right(DevserverMsg::HotReload(HotReloadMsg {
-                jump_table: Some(table),
-                for_build_id,
-                ..
-            })) if for_build_id == our_build_id => {
+                                                      jump_table: Some(table),
+                                                      for_build_id,
+                                                      ..
+                                                  })) if for_build_id == our_build_id => {
                 // Apply the hot-reload patch to the dioxus devtools first
                 unsafe { dioxus_devtools::subsecond::apply_patch(table).unwrap() };
 
@@ -250,7 +253,7 @@ pub async fn serve_router(
     }
 }
 
-fn block_on<T>(app_future: impl Future<Output = T>) {
+fn block_on<T>(app_future: impl Future<Output=T>) {
     if let Ok(handle) = tokio::runtime::Handle::try_current() {
         handle.block_on(app_future);
     } else {
@@ -262,12 +265,14 @@ fn block_on<T>(app_future: impl Future<Output = T>) {
     }
 }
 
-fn apply_base_path<M: 'static>(
-    mut router: Router,
+fn apply_base_path<M: 'static, S>(
+    mut router: Router<S>,
     root: impl ComponentFunction<(), M> + Send + Sync,
     cfg: ServeConfig,
     base_path: Option<String>,
-) -> Router {
+) -> Router<S> where
+    S: Clone + Send + Sync + 'static,
+{
     if let Some(base_path) = base_path {
         let base_path = base_path.trim_matches('/');
 
@@ -282,7 +287,7 @@ fn apply_base_path<M: 'static>(
                     FullstackState::render_handler(state, request).await
                 },
             )
-            .with_state(FullstackState::new(cfg, root)),
+                .with_state(FullstackState::new(cfg, root)),
         )
     }
 

packages/fullstack-server/src/server.rs

@@ -67,11 +67,12 @@ pub trait DioxusRouterExt {
     ///     rsx! { "Hello World" }
     /// }
     /// ```
-    fn serve_dioxus_application<M: 'static>(
+    fn serve_dioxus_application<M: 'static, S>(
         self,
         cfg: ServeConfig,
         app: impl ComponentFunction<(), M> + Send + Sync,
-    ) -> Router<()>;
+    ) -> Router<S> where
+        S: Clone + Send + Sync + 'static;
 
     /// Registers server functions with the default handler.
     ///
@@ -161,11 +162,12 @@ impl DioxusRouterExt for Router<FullstackState> {
             .with_state(FullstackState::new(cfg, app))
     }
 
-    fn serve_dioxus_application<M: 'static>(
+    fn serve_dioxus_application<M: 'static, S>(
         self,
         cfg: ServeConfig,
         app: impl ComponentFunction<(), M> + Send + Sync,
-    ) -> Router<()> {
+    ) -> Router<S> where
+        S: Clone + Send + Sync + 'static {
         self.register_server_functions()
             .serve_static_assets()
             .fallback(get(FullstackState::render_handler))