Suspense boundaries/out of order streaming/anyhow like error handling (#2365)
* create static site generation helpers in the router crate * work on integrating static site generation into fullstack * move ssg into a separate crate * integrate ssg with the launch builder * simplify ssg example * fix static_routes for child routes * move CLI hot reloading websocket code into dioxus-hot-reload * fix some unused imports * use the same hot reloading websocket code for fullstack * fix fullstack hot reloading * move cli hot reloading logic into the hot reload crate * ssg example working with dx serve * add more examples * fix clippy * switch to a result for Element * fix formatting * fix hot reload doctest imports * fix axum imports * add show method to error context * implement retaining nodes during suspense * fix unterminated if statements * communicate between tasks and suspense boundaries * make suspense placeholders easier to use * implement IntoDynNode and IntoVNode for more wrappers * fix clippy examples * fix rsx tests * add streaming html utilities to the ssr package * unify hydration and non-hydration ssr cache * fix router with Result Element * don't run server doc tests * Fix hot reload websocket doc examples * simple apps working with fullstack streaming * fix preloading wasm * Report errors encountered while streaming * remove async from incremental renderer * document new VirtualDom suspense methods * make streaming work with incremental rendering * fix static site generation * document suspense structs * create closure type; allow async event handlers in props; allow shorthand event handlers * test forwarding event handlers with the shorthand syntax * fix clippy * fix imports in spawn async doctest * fix empty rsx * fix async result event handlers * fix mounting router in multiple places * Fix task dead cancel race condition * simplify diffing before adding suspense * fix binary size increase * fix attribute diffing * more diffing fixes * create minimal fullstack feature * smaller fullstack bundles * allow mounting nodes that are already created and creating nodes without mounting them * fix hot reload feature * fix replacing components * don't reclaim virtual nodes * client side suspense working! * fix CLI * slightly smaller fullstack builds * fix multiple suspended scopes * fix merge errors * yield back to tokio every few polls to fix suspending on many tasks at once * remove logs * document suspense boundary and update suspense example * fix ssg * make streaming optional * fix some router and core tests * fix suspense example * fix serialization with out of order server futures * add incremental streaming hackernews demo * fix hackernews demo * fix root hackernews redirect * fix formatting * add tests for suspense cases * slightly smaller binaries * slightly smaller * improve error handling docs * fix errors example link * fix doc tests * remove log file * fix ssr cache type inference * remove index.html * fix ssg render template * fix assigning ids on elements with dynamic attributes * add desktop feature to the workspace examples * remove router static generation example; ssg lives in the dioxus-static-generation package * add a test for effects during suspense * only run effects on mounted nodes * fix multiple suspense roots * fix node iterator * fix closures without arguments * fix dioxus-core readme doctest * remove suspense logs * fix scope stack * fix clippy * remove unused suspense boundary from hackernews * assert that launch never returns for better compiler errors * fix static generation launch function * fix web renderer * pass context providers into server functions * add an example for FromContext * clean up DioxusRouterExt * fix server function context * fix fullstack desktop example * forward CLI serve settings to fullstack * re-export serve config at the root of fullstack * forward env directly instead of using a guard * just set the port in the CLI for fullstack playwright tests * fix fullstack dioxus-cli-config feature * fix launch server merge conflicts * fix fullstack launch context * Merge branch 'main' into suspense-2.0 * fix fullstack html data * remove drop virtual dom feature * add a comment about only_write_templates binary size workaround * remove explicit dependencies from use_server_future * make ErrorContext and SuspenseContext more similar * Tweak: small tweaks to tomls to make diff smaller * only rerun components under suspense after the initial placeholders are sent to the client * add module docs for suspense * keep track of when suspense boundaries are resolved * start implementing JS out of order streaming * fix core tests * implement the server side of suspense with js * fix streaming ssr with nested suspense * move streaming ssr code into fullstack * revert minification changes * serialize server future data as the html streams * start loading scripts wasm immediately instead of defering the script * very basic nested suspense example working with minimal html updates * clean up some suspense/error docs * fix hydrating nested pending server futures * sort resolved boundaries by height * Fix disconnecting clients while streaming * fix static generation crate * don't insert extra divs when hydrating streamed chunks * wait to swap in the elements until they are hydrated * remove inline streaming script * hackernews partially working * fix spa mode * banish the open shadow dom * fix removing placeholder * set up streaming playwright test * run web playwright tests on 9999 to avoid port conflicts with other local servers * remove suspense nodes if the suspense boundary is replaced before the suspense resolves on the server * ignore hydration of removed suspense boundaries * use path based indexing to fix hydrating suspense after parent suspense with child is removed * re-export dioxus error * remove resolved suspense divs if the suspense boundary has been removed * Fix client side initialized server futures * ignore comment nodes while traversing nodes in core to avoid lists getting swapped out with suspense * Pass initial hydration data to the client * hide pre nodes * don't panic if reclaiming an element fails * fix scope stack when polling tasks * improve deserialization out of length message * Ok(VNode::placeholder()) -> VNode::empty() * fix typo in rsx usage * restore testing changes from suspense example * clean up some logs and comments * fix playwright tests * clean up more changes in core * clean up core tests * remove anymap dependency * clean up changes to hooks * clean up changes in the router, rsx, and web * revert changes to axum-hello-world * fix use_server_future * fix clippy in dioxus-core * check that the next or previous node exist before checking if we should ignore them * fix formatting * fix suspense playwright test * remove unused suspense code * add more suspense playwright tests * add more docs for error boundaries * fix suspense core tests * fix ErrorBoundary example * remove a bunch of debug logging in js * fix router failure_external_navigation * use absolute paths in the interpreter build.rs * strip '\r' while hashing ts files * add a wrapper with a default error boundary and suspense boundary * restore hot reloading * ignore non-ts files when hashing * sort ts files before hashing them * fix rsx tests * fix fullstack doc tests * fix core tests * fix axum auth example * update suspense hydration diagram * longer playwright build limit * tiny fixes - spelling, formatting * update diagram link * remove comment and template nodes for suspense placeholders * remove comment nodes as we hydrate text * simplify hackernews example * clean up hydrating text nodes * switch to a separate environment variable for the base path for smaller binaries * clean up file system html trait * fix form data * move streaming code into fullstack * implement serialize and deserialize for CapturedError * remove waits in the nested suspense playwright spec * force sequential fullstack builds for CI * longer nested suspense delay for CI * fix --force-sequential flag * wait to launch server until client build is done --------- Co-authored-by: Jonathan Kelley <jkelleyrtp@gmail.com>
This commit is contained in:
1 parent
ffa36a67c3
commit
022e4ad203
175 files changed
+7872
-4010
No files matched your search
@@ -1,4 +1,8 @@
|
||||
use crate::{innerlude::SchedulerMsg, Element, Runtime, ScopeId, Task};
|
||||
use crate::{innerlude::SchedulerMsg, Runtime, ScopeId, Task};
|
||||
use crate::{
|
||||
innerlude::{throw_into, CapturedError},
|
||||
prelude::SuspenseContext,
|
||||
};
|
||||
use generational_box::{AnyStorage, Owner};
|
||||
use rustc_hash::FxHashSet;
|
||||
use std::{
|
||||
@@ -8,6 +12,32 @@ use std::{
|
||||
sync::Arc,
|
||||
};
|
||||
|
||||
pub(crate) enum ScopeStatus {
|
||||
Mounted,
|
||||
Unmounted {
|
||||
// Before the component is mounted, we need to keep track of effects that need to be run once the scope is mounted
|
||||
effects_queued: Vec<Box<dyn FnOnce() + 'static>>,
|
||||
},
|
||||
}
|
||||
|
||||
#[derive(Debug, Clone, Default)]
|
||||
pub(crate) enum SuspenseLocation {
|
||||
#[default]
|
||||
NotSuspended,
|
||||
InSuspensePlaceholder(SuspenseContext),
|
||||
UnderSuspense(SuspenseContext),
|
||||
}
|
||||
|
||||
impl SuspenseLocation {
|
||||
pub(crate) fn suspense_context(&self) -> Option<&SuspenseContext> {
|
||||
match self {
|
||||
SuspenseLocation::InSuspensePlaceholder(context) => Some(context),
|
||||
SuspenseLocation::UnderSuspense(context) => Some(context),
|
||||
_ => None,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// A component's state separate from its props.
|
||||
///
|
||||
/// This struct exists to provide a common interface for all scopes without relying on generics.
|
||||
@@ -23,10 +53,13 @@ pub(crate) struct Scope {
|
||||
pub(crate) hook_index: Cell<usize>,
|
||||
pub(crate) shared_contexts: RefCell<Vec<Box<dyn Any>>>,
|
||||
pub(crate) spawned_tasks: RefCell<FxHashSet<Task>>,
|
||||
/// The task that was last spawned that may suspend. We use this task to check what task to suspend in the event of an early None return from a component
|
||||
pub(crate) last_suspendable_task: Cell<Option<Task>>,
|
||||
pub(crate) before_render: RefCell<Vec<Box<dyn FnMut()>>>,
|
||||
pub(crate) after_render: RefCell<Vec<Box<dyn FnMut()>>>,
|
||||
|
||||
/// The suspense boundary that this scope is currently in (if any)
|
||||
suspense_boundary: SuspenseLocation,
|
||||
|
||||
pub(crate) status: RefCell<ScopeStatus>,
|
||||
}
|
||||
|
||||
impl Scope {
|
||||
@@ -35,6 +68,7 @@ impl Scope {
|
||||
id: ScopeId,
|
||||
parent_id: Option<ScopeId>,
|
||||
height: u32,
|
||||
suspense_boundary: SuspenseLocation,
|
||||
) -> Self {
|
||||
Self {
|
||||
name,
|
||||
@@ -44,11 +78,14 @@ impl Scope {
|
||||
render_count: Cell::new(0),
|
||||
shared_contexts: RefCell::new(vec![]),
|
||||
spawned_tasks: RefCell::new(FxHashSet::default()),
|
||||
last_suspendable_task: Cell::new(None),
|
||||
hooks: RefCell::new(vec![]),
|
||||
hook_index: Cell::new(0),
|
||||
before_render: RefCell::new(vec![]),
|
||||
after_render: RefCell::new(vec![]),
|
||||
status: RefCell::new(ScopeStatus::Unmounted {
|
||||
effects_queued: Vec::new(),
|
||||
}),
|
||||
suspense_boundary,
|
||||
}
|
||||
}
|
||||
|
||||
@@ -60,6 +97,30 @@ impl Scope {
|
||||
Runtime::with(|rt| rt.sender.clone()).unwrap()
|
||||
}
|
||||
|
||||
/// Mount the scope and queue any pending effects if it is not already mounted
|
||||
pub(crate) fn mount(&self, runtime: &Runtime) {
|
||||
let mut status = self.status.borrow_mut();
|
||||
if let ScopeStatus::Unmounted { effects_queued } = &mut *status {
|
||||
for f in effects_queued.drain(..) {
|
||||
runtime.queue_effect_on_mounted_scope(self.id, f);
|
||||
}
|
||||
*status = ScopeStatus::Mounted;
|
||||
}
|
||||
}
|
||||
|
||||
/// Get the suspense boundary this scope is currently in (if any)
|
||||
pub(crate) fn suspense_boundary(&self) -> SuspenseLocation {
|
||||
self.suspense_boundary.clone()
|
||||
}
|
||||
|
||||
/// Check if a node should run during suspense
|
||||
pub(crate) fn should_run_during_suspense(&self) -> bool {
|
||||
matches!(
|
||||
self.suspense_boundary,
|
||||
SuspenseLocation::UnderSuspense(_) | SuspenseLocation::InSuspensePlaceholder(_)
|
||||
)
|
||||
}
|
||||
|
||||
/// Mark this scope as dirty, and schedule a render for it.
|
||||
pub fn needs_update(&self) {
|
||||
self.needs_update_any(self.id)
|
||||
@@ -129,18 +190,18 @@ impl Scope {
|
||||
let mut search_parent = self.parent_id;
|
||||
let cur_runtime = Runtime::with(|runtime| {
|
||||
while let Some(parent_id) = search_parent {
|
||||
let parent = runtime.get_state(parent_id).unwrap();
|
||||
let Some(parent) = runtime.get_state(parent_id) else {
|
||||
tracing::error!("Parent scope {:?} not found", parent_id);
|
||||
return None;
|
||||
};
|
||||
tracing::trace!(
|
||||
"looking for context {} ({:?}) in {}",
|
||||
std::any::type_name::<T>(),
|
||||
std::any::TypeId::of::<T>(),
|
||||
parent.name
|
||||
);
|
||||
if let Some(shared) = parent.shared_contexts.borrow().iter().find_map(|any| {
|
||||
tracing::trace!("found context {:?}", (**any).type_id());
|
||||
any.downcast_ref::<T>()
|
||||
}) {
|
||||
return Some(shared.clone());
|
||||
if let Some(shared) = parent.has_context() {
|
||||
return Some(shared);
|
||||
}
|
||||
search_parent = parent.parent_id;
|
||||
}
|
||||
@@ -286,12 +347,6 @@ impl Scope {
|
||||
Runtime::with(|rt| rt.queue_effect(self.id, f)).expect("Runtime to exist");
|
||||
}
|
||||
|
||||
/// Mark this component as suspended on a specific task and then return None
|
||||
pub fn suspend(&self, task: Task) -> Option<Element> {
|
||||
self.last_suspendable_task.set(Some(task));
|
||||
None
|
||||
}
|
||||
|
||||
/// Store a value between renders. The foundational hook for all other hooks.
|
||||
///
|
||||
/// Accepts an `initializer` closure, which is run on the first use of the hook (typically the initial render).
|
||||
@@ -413,14 +468,6 @@ impl ScopeId {
|
||||
.expect("to be in a dioxus runtime")
|
||||
}
|
||||
|
||||
/// Suspended a component on a specific task and then return None
|
||||
pub fn suspend(self, task: Task) -> Option<Element> {
|
||||
Runtime::with_scope(self, |cx| {
|
||||
cx.suspend(task);
|
||||
});
|
||||
None
|
||||
}
|
||||
|
||||
/// Pushes the future onto the poll queue to be polled after the component renders.
|
||||
pub fn push_future(self, fut: impl Future<Output = ()> + 'static) -> Option<Task> {
|
||||
Runtime::with_scope(self, |cx| cx.spawn(fut))
|
||||
@@ -466,4 +513,25 @@ impl ScopeId {
|
||||
.expect("to be in a dioxus runtime")
|
||||
.on_scope(self, f)
|
||||
}
|
||||
|
||||
/// Throw a [`CapturedError`] into a scope. The error will bubble up to the nearest [`ErrorBoundary`] or the root of the app.
|
||||
///
|
||||
/// # Examples
|
||||
/// ```rust, no_run
|
||||
/// # use dioxus::prelude::*;
|
||||
/// fn Component() -> Element {
|
||||
/// let request = spawn(async move {
|
||||
/// match reqwest::get("https://api.example.com").await {
|
||||
/// Ok(_) => todo!(),
|
||||
/// // You can explicitly throw an error into a scope with throw_error
|
||||
/// Err(err) => ScopeId::APP.throw_error(err)
|
||||
/// }
|
||||
/// });
|
||||
///
|
||||
/// todo!()
|
||||
/// }
|
||||
/// ```
|
||||
pub fn throw_error(self, error: impl Into<CapturedError> + 'static) {
|
||||
throw_into(error, self)
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user