ssr mode works properly now

Author: orual

crates/weaver-app/src/blobcache.rs

@@ -42,37 +42,28 @@ impl BlobCache {
             }
             AtIdentifier::Handle(handle) => self.client.pds_for_handle(&handle).await?,
         };
-        // let blob = if let Ok(blob_stream) = self
-        //     .client
-        //     .xrpc(pds_url)
-        //     .send(
-        //         &GetBlob::new()
-        //             .cid(cid.clone())
-        //             .did(repo_did.clone())
-        //             .build(),
-        //     )
-        //     .await
-        // {
-        //     blob_stream.buffer().clone()
-        // } else {
-        //     reqwest::get(format!(
-        //         "https://cdn.bsky.app/img/feed_fullsize/plain/{}/{}@jpeg",
-        //         repo_did, cid
-        //     ))
-        //     .await?
-        //     .bytes()
-        //     .await?
-        //     .clone()
-        // };
-        //
-        let blob = reqwest::get(format!(
-            "https://cdn.bsky.app/img/feed_fullsize/plain/{}/{}@jpeg",
-            repo_did, cid
-        ))
-        .await?
-        .bytes()
-        .await?
-        .clone();
+        let blob = if let Ok(blob_stream) = self
+            .client
+            .xrpc(pds_url)
+            .send(
+                &GetBlob::new()
+                    .cid(cid.clone())
+                    .did(repo_did.clone())
+                    .build(),
+            )
+            .await
+        {
+            blob_stream.buffer().clone()
+        } else {
+            reqwest::get(format!(
+                "https://cdn.bsky.app/img/feed_fullsize/plain/{}/{}@jpeg",
+                repo_did, cid
+            ))
+            .await?
+            .bytes()
+            .await?
+            .clone()
+        };
 
         self.cache.insert(cid.clone(), blob);
         if let Some(name) = name {

crates/weaver-app/src/components/entry.rs

@@ -24,39 +24,46 @@ use jacquard::{
 use std::sync::Arc;
 use weaver_api::sh_weaver::notebook::{BookEntryView, EntryView, entry};
 
-#[component]
-pub fn EntryPage(
-    ident: ReadSignal<AtIdentifier<'static>>,
-    book_title: ReadSignal<SmolStr>,
-    title: ReadSignal<SmolStr>,
-) -> Element {
-    tracing::debug!(
-        "EntryPage component rendering for ident: {:?}, book: {}, title: {}",
-        ident(),
-        book_title(),
-        title()
-    );
-    rsx! {
-        {std::iter::once(rsx! {Entry {ident, book_title, title}})}
-    }
-}
+// #[component]
+// pub fn EntryPage(
+//     ident: ReadSignal<AtIdentifier<'static>>,
+//     book_title: ReadSignal<SmolStr>,
+//     title: ReadSignal<SmolStr>,
+// ) -> Element {
+//     rsx! {
+//         {std::iter::once(rsx! {Entry {ident, book_title, title}})}
+//     }
+// }
 
 #[component]
-pub fn Entry(
+pub fn EntryPage(
     ident: ReadSignal<AtIdentifier<'static>>,
     book_title: ReadSignal<SmolStr>,
     title: ReadSignal<SmolStr>,
 ) -> Element {
-    tracing::debug!(
-        "Entry component rendering for ident: {:?}, book: {}, title: {}",
-        ident(),
-        book_title(),
-        title()
-    );
     // Use feature-gated hook for SSR support
-    let entry = crate::data::use_entry_data(ident, book_title, title);
+    let (entry_res, entry) = crate::data::use_entry_data(ident, book_title, title);
+    let route = use_route::<Route>();
+    let mut last_route = use_signal(|| route.clone());
+
+    #[cfg(all(
+        target_family = "wasm",
+        target_os = "unknown",
+        not(feature = "fullstack-server")
+    ))]
     let fetcher = use_context::<crate::fetch::Fetcher>();
-    tracing::debug!("Entry component got entry data");
+
+    // Suspend SSR until entry loads
+    #[cfg(feature = "fullstack-server")]
+    let mut entry_res = entry_res?;
+
+    #[cfg(feature = "fullstack-server")]
+    use_effect(use_reactive!(|route| {
+        if route != last_route() {
+            entry_res.restart();
+            last_route.set(route.clone());
+        }
+    }));
 
     // Handle blob caching when entry data is available
     match &*entry.read() {

crates/weaver-app/src/components/identity.rs

@@ -26,9 +26,16 @@ pub fn RepositoryIndex(ident: ReadSignal<AtIdentifier<'static>>) -> Element {
         ident()
     );
     use crate::components::ProfileDisplay;
-    let notebooks = data::use_notebooks_for_did(ident);
-    let profile = crate::data::use_profile_data(ident);
+    let (notebooks_result, notebooks) = data::use_notebooks_for_did(ident);
+    let (profile_result, profile) = crate::data::use_profile_data(ident);
     tracing::debug!("RepositoryIndex got profile and notebooks");
+
+    #[cfg(feature = "fullstack-server")]
+    notebooks_result?;
+
+    #[cfg(feature = "fullstack-server")]
+    profile_result?;
+
     rsx! {
         document::Stylesheet { href: NOTEBOOK_CARD_CSS }
 

crates/weaver-app/src/components/mod.rs

@@ -7,7 +7,7 @@ pub use css::NotebookCss;
 
 mod entry;
 #[allow(unused_imports)]
-pub use entry::{Entry, EntryCard, EntryMarkdown, EntryPage};
+pub use entry::{EntryCard, EntryMarkdown, EntryPage};
 
 pub mod identity;
 #[allow(unused_imports)]