archive-gh-me/yew
1
0
Fork 0
mirror of https://github.com/yewstack/yew.git synced 2025-12-08 21:26:25 +00:00
Code Issues Projects Releases Wiki Activity

Fix VList Stream in SSR (#2801)

Browse Source 
* Fix rendering stream.

* Update naming.

* Resolve first, then transfer.

* Use slice pattern.

* Update workflow paths.

* Use join_all.

* Do not map.

* Remove map.

* Fix rustfmt.
This commit is contained in:
Kaede Hoshikawa 2022-08-07 11:59:54 +09:00 committed by GitHub
parent 108a5e80ba
commit f0b0df33e6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 43 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
packages/yew/src/virtual_dom/vlist.rs
View File

@ -156,7 +156,8 @@ mod test {
#[cfg(feature = "ssr")] #[cfg(feature = "ssr")]
mod feat_ssr { mod feat_ssr {
use futures::stream::{FuturesOrdered, StreamExt}; use futures::stream::{FuturesUnordered, StreamExt};
use futures::{future, FutureExt};
use super::*; use super::*;
use crate::html::AnyScope; use crate::html::AnyScope;
@ -174,28 +175,52 @@ mod feat_ssr {
[child] => { [child] => {
child.render_into_stream(w, parent_scope, hydratable).await; child.render_into_stream(w, parent_scope, hydratable).await;
} }
_ => { [first_child, rest_children @ ..] => {
let buf_capacity = w.capacity(); let buf_capacity = w.capacity();
let mut child_streams = Vec::with_capacity(self.children.len() - 1);
// Concurrently render all children. // Concurrently render rest children into a separate buffer.
let mut children: FuturesOrdered<_> = self let rest_child_furs = rest_children.iter().map(|child| {
.children let (mut w, r) = io::buffer(buf_capacity);
.iter()
.map(|m| async move {
let (mut w, r) = io::buffer(buf_capacity);
m.render_into_stream(&mut w, parent_scope, hydratable).await; child_streams.push(r);
drop(w);
r async move {
}) child
.collect(); .render_into_stream(&mut w, parent_scope, hydratable)
.await;
while let Some(mut r) = children.next().await {
while let Some(next_chunk) = r.next().await {
w.write(next_chunk.into());
} }
} });
// Concurrently resolve all child futures.
let resolve_fur = if rest_children.len() <= 30 {
// 30 is selected by join_all to be deemed small.
let rest_child_furs = future::join_all(rest_child_furs);
async move {
rest_child_furs.await;
}
.left_future()
} else {
let mut rest_child_furs: FuturesUnordered<_> = rest_child_furs.collect();
async move { while rest_child_furs.next().await.is_some() {} }
.right_future()
};
let transfer_fur = async move {
// Render first child to parent buffer directly.
first_child
.render_into_stream(w, parent_scope, hydratable)
.await;
// Transfer results to parent writer.
for mut r in child_streams {
while let Some(next_chunk) = r.next().await {
w.write(next_chunk.into());
}
}
};
future::join(resolve_fur, transfer_fur).await;
} }
} }
} }