* 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>
176 lines
5.8 KiB
Rust
176 lines
5.8 KiB
Rust
#![allow(non_snake_case)]
|
|
|
|
use chrono::{DateTime, Utc};
|
|
|
|
use super::{IncrementalRendererError, RenderFreshness};
|
|
use std::{path::PathBuf, sync::Arc, time::SystemTime};
|
|
|
|
pub(crate) type PathMapFn = Arc<dyn Fn(&str) -> PathBuf + Send + Sync>;
|
|
|
|
pub(crate) struct FileSystemCache {
|
|
static_dir: PathBuf,
|
|
map_path: PathMapFn,
|
|
invalidate_after: Option<std::time::Duration>,
|
|
}
|
|
|
|
impl FileSystemCache {
|
|
pub fn new(
|
|
static_dir: PathBuf,
|
|
map_path: Option<PathMapFn>,
|
|
invalidate_after: Option<std::time::Duration>,
|
|
) -> Self {
|
|
Self {
|
|
static_dir: static_dir.clone(),
|
|
map_path: map_path.unwrap_or_else(move || {
|
|
Arc::new(move |route: &str| {
|
|
let (before_query, _) = route.split_once('?').unwrap_or((route, ""));
|
|
let mut path = static_dir.clone();
|
|
for segment in before_query.split('/') {
|
|
path.push(segment);
|
|
}
|
|
path
|
|
})
|
|
}),
|
|
invalidate_after,
|
|
}
|
|
}
|
|
|
|
pub fn put(
|
|
&mut self,
|
|
route: String,
|
|
timestamp: DateTime<Utc>,
|
|
data: Vec<u8>,
|
|
) -> Result<(), IncrementalRendererError> {
|
|
use std::io::Write;
|
|
let file_path = self.route_as_path(&route, timestamp);
|
|
if let Some(parent) = file_path.parent() {
|
|
if !parent.exists() {
|
|
std::fs::create_dir_all(parent)?;
|
|
}
|
|
}
|
|
let file = std::fs::File::create(file_path)?;
|
|
let mut file = std::io::BufWriter::new(file);
|
|
file.write_all(&data)?;
|
|
Ok(())
|
|
}
|
|
|
|
pub fn clear(&mut self) {
|
|
// clear the static directory
|
|
let _ = std::fs::remove_dir_all(&self.static_dir);
|
|
}
|
|
|
|
pub fn invalidate(&mut self, route: &str) {
|
|
let file_path = self.find_file(route).unwrap().full_path;
|
|
if let Err(err) = std::fs::remove_file(file_path) {
|
|
tracing::error!("Failed to remove file: {}", err);
|
|
}
|
|
}
|
|
|
|
pub fn get(
|
|
&self,
|
|
route: &str,
|
|
) -> Result<Option<(RenderFreshness, Vec<u8>)>, IncrementalRendererError> {
|
|
if let Some(file_path) = self.find_file(route) {
|
|
if let Some(freshness) = file_path.freshness(self.invalidate_after) {
|
|
if let Ok(file) = std::fs::File::open(file_path.full_path) {
|
|
let mut file = std::io::BufReader::new(file);
|
|
let mut cache_hit = Vec::new();
|
|
std::io::copy(&mut file, &mut cache_hit)?;
|
|
tracing::trace!("file cache hit {:?}", route);
|
|
return Ok(Some((freshness, cache_hit)));
|
|
}
|
|
}
|
|
}
|
|
|
|
Ok(None)
|
|
}
|
|
|
|
fn find_file(&self, route: &str) -> Option<ValidCachedPath> {
|
|
let mut file_path = (self.map_path)(route);
|
|
if let Some(deadline) = self.invalidate_after {
|
|
// find the first file that matches the route and is a html file
|
|
file_path.push("index");
|
|
if let Ok(dir) = std::fs::read_dir(file_path) {
|
|
for entry in dir.flatten() {
|
|
if let Some(cached_path) = ValidCachedPath::try_from_path(entry.path()) {
|
|
if let Ok(elapsed) = cached_path.timestamp.elapsed() {
|
|
if elapsed < deadline {
|
|
// The timestamp is valid, return the file
|
|
return Some(cached_path);
|
|
}
|
|
}
|
|
// if the timestamp is invalid or passed, delete the file
|
|
if let Err(err) = std::fs::remove_file(entry.path()) {
|
|
tracing::error!("Failed to remove file: {}", err);
|
|
}
|
|
}
|
|
}
|
|
None
|
|
} else {
|
|
None
|
|
}
|
|
} else {
|
|
file_path.push("index.html");
|
|
file_path.exists().then_some({
|
|
ValidCachedPath {
|
|
full_path: file_path,
|
|
timestamp: SystemTime::now(),
|
|
}
|
|
})
|
|
}
|
|
}
|
|
|
|
fn route_as_path(&self, route: &str, timestamp: DateTime<Utc>) -> PathBuf {
|
|
let mut file_path = (self.map_path)(route);
|
|
if self.track_timestamps() {
|
|
file_path.push("index");
|
|
file_path.push(timestamp_to_string(timestamp));
|
|
} else {
|
|
file_path.push("index");
|
|
}
|
|
file_path.set_extension("html");
|
|
file_path
|
|
}
|
|
|
|
fn track_timestamps(&self) -> bool {
|
|
self.invalidate_after.is_some()
|
|
}
|
|
}
|
|
|
|
pub(crate) struct ValidCachedPath {
|
|
pub(crate) full_path: PathBuf,
|
|
pub(crate) timestamp: std::time::SystemTime,
|
|
}
|
|
|
|
impl ValidCachedPath {
|
|
pub fn try_from_path(value: PathBuf) -> Option<Self> {
|
|
if value.extension() != Some(std::ffi::OsStr::new("html")) {
|
|
return None;
|
|
}
|
|
let timestamp = decode_timestamp(value.file_stem()?.to_str()?)?;
|
|
let full_path = value;
|
|
Some(Self {
|
|
full_path,
|
|
timestamp,
|
|
})
|
|
}
|
|
|
|
pub fn freshness(&self, max_age: Option<std::time::Duration>) -> Option<RenderFreshness> {
|
|
let age = self.timestamp.elapsed().ok()?.as_secs();
|
|
let max_age = max_age.map(|max_age| max_age.as_secs());
|
|
Some(RenderFreshness::new(age, max_age?, self.timestamp.into()))
|
|
}
|
|
}
|
|
|
|
fn decode_timestamp(timestamp: &str) -> Option<std::time::SystemTime> {
|
|
let timestamp = u64::from_str_radix(timestamp, 16).ok()?;
|
|
Some(std::time::UNIX_EPOCH + std::time::Duration::from_secs(timestamp))
|
|
}
|
|
|
|
pub(crate) fn timestamp_to_string(timestamp: DateTime<Utc>) -> String {
|
|
let timestamp = timestamp
|
|
.signed_duration_since(DateTime::<Utc>::from(std::time::UNIX_EPOCH))
|
|
.num_seconds();
|
|
format!("{:x}", timestamp)
|
|
}
|