fix use_server_future

packages/fullstack/src/hooks/server_future.rs

@@ -4,6 +4,7 @@ use std::any::Any;
 use std::cell::Cell;
 use std::cell::Ref;
 use std::cell::RefCell;
+use std::fmt::Debug;
 use std::future::Future;
 use std::rc::Rc;
 use std::sync::Arc;
@@ -27,7 +28,7 @@ pub fn use_server_future<T, F, D>(
     future: impl FnOnce(D::Out) -> F,
 ) -> Option<&UseServerFuture<T>>
 where
-    T: 'static + Serialize + DeserializeOwned,
+    T: 'static + Serialize + DeserializeOwned + Debug,
     F: Future<Output = T> + 'static,
     D: UseFutureDep,
 {
@@ -39,7 +40,24 @@ where
         dependencies: Vec::new(),
     });
 
-    let first_run = { state.value.borrow().as_ref().is_none() };
+    let first_run = { state.value.borrow().as_ref().is_none() && state.task.get().is_none() };
+
+    #[cfg(not(feature = "ssr"))]
+    {
+        if first_run {
+            match crate::html_storage::deserialize::take_server_data() {
+                Some(data) => {
+                    log::trace!("Loaded {data:?} from server");
+                    *state.value.borrow_mut() = Some(Box::new(data));
+                    state.needs_regen.set(false);
+                    return Some(state);
+                }
+                None => {
+                    log::trace!("Failed to load from server... running future");
+                }
+            };
+        }
+    }
 
     if dependencies.clone().apply(&mut state.dependencies) || state.needs_regen.get() {
         // We don't need regen anymore
@@ -70,10 +88,7 @@ where
             }
             #[cfg(not(feature = "ssr"))]
             {
-                data = match crate::html_storage::deserialize::take_server_data() {
-                    Some(data) => data,
-                    None => fut.await,
-                };
+                data = fut.await;
             }
             *value.borrow_mut() = Some(Box::new(data));
 
@@ -82,20 +97,17 @@ where
     }
 
     if first_run {
-        log::trace!("Suspending first run of use_server_future");
-        cx.suspend();
+        #[cfg(feature = "ssr")]
+        {
+            log::trace!("Suspending first run of use_server_future");
+            cx.suspend();
+        }
         None
     } else {
         Some(state)
     }
 }
 
-pub enum FutureState<'a, T> {
-    Pending,
-    Complete(&'a T),
-    Regenerating(&'a T), // the old value
-}
-
 pub struct UseServerFuture<T> {
     update: Arc<dyn Fn()>,
     needs_regen: Cell<bool>,
@@ -104,12 +116,6 @@ pub struct UseServerFuture<T> {
     value: Rc<RefCell<Option<Box<T>>>>,
 }
 
-pub enum UseFutureState<'a, T> {
-    Pending,
-    Complete(&'a T),
-    Reloading(&'a T),
-}
-
 impl<T> UseServerFuture<T> {
     /// Restart the future with new dependencies.
     ///

packages/fullstack/src/html_storage/deserialize.rs

@@ -7,19 +7,42 @@ use super::HTMLDataCursor;
 
 #[allow(unused)]
 pub(crate) fn serde_from_bytes<T: DeserializeOwned>(string: &[u8]) -> Option<T> {
-    let decompressed = STANDARD.decode(string).ok()?;
+    let decompressed = match STANDARD.decode(string) {
+        Ok(bytes) => bytes,
+        Err(err) => {
+            log::error!("Failed to decode base64: {}", err);
+            return None;
+        }
+    };
 
-    postcard::from_bytes(&decompressed).ok()
+    match postcard::from_bytes(&decompressed) {
+        Ok(data) => Some(data),
+        Err(err) => {
+            log::error!("Failed to deserialize: {}", err);
+            None
+        }
+    }
 }
 
 static SERVER_DATA: once_cell::sync::Lazy<Option<HTMLDataCursor>> =
     once_cell::sync::Lazy::new(|| {
         #[cfg(target_arch = "wasm32")]
         {
-            let attribute = web_sys::window()?
-                .document()?
-                .get_element_by_id("dioxus-storage-data")?
-                .get_attribute("data-serialized")?;
+            let window = web_sys::window()?.document()?;
+            let element = match window.get_element_by_id("dioxus-storage-data") {
+                Some(element) => element,
+                None => {
+                    log::error!("Failed to get element by id: dioxus-storage-data");
+                    return None;
+                }
+            };
+            let attribute = match element.get_attribute("data-serialized") {
+                Some(attribute) => attribute,
+                None => {
+                    log::error!("Failed to get attribute: data-serialized");
+                    return None;
+                }
+            };
 
             let data: super::HTMLData = serde_from_bytes(attribute.as_bytes())?;
 

packages/fullstack/src/render.rs

@@ -12,7 +12,7 @@ use serde::Serialize;
 use std::sync::RwLock;
 use tokio::task::spawn_blocking;
 
-use crate::{prelude::*, server_context::with_server_context};
+use crate::prelude::*;
 use dioxus::prelude::*;
 
 enum SsrRendererPool {
@@ -300,6 +300,7 @@ impl<P: Clone + Serialize + Send + Sync + 'static> dioxus_ssr::incremental::Wrap
 }
 
 /// A rendered response from the server.
+#[derive(Debug)]
 pub struct RenderResponse {
     pub(crate) html: String,
     pub(crate) freshness: RenderFreshness,