Enable runtime rust hot patching. * roll back wry to 0.45 * cleanup rustc * wip * wip: fix client/server * get the subsecond cli thing working again * back to list of builds but with accessors * migrate some methods to workspace, clean up impl a bit * pass mode through build context * use a build context, similar to cargo/rustc * merge BuildUpdate and HandleUpdate into BuilderUpdate * Move more resolution of args into runner * migrate some methods to runner * hoist out fullstack * fix build request resolver * yay request is cleaned up * fixup resolution a bit * spawn off the build! * re-wire android autodetection * re-wire android autodetection * wire back up a few more things * re-wire tooling verification * I think it's mostly in the right condition for regular app * add depinfo parser * yay okay works with regular apps again * full rebuilds are back * rewire file wtcher * wire patch! * yayyyyyy patching works and is really fast * yay android works * clean up stdout piping * yayyy memap on android so we don't need root * create a static wasm jump table * wip: global offset table for wasm * wip... thinking about making the patches relocatable * wip: customized relocation * YESSSSSS RELOCATABLE WASM * clean up impl a bit * lil bit more cleanup * lil bit more * lil bit more cleanup * lil bit more cleanup, support 32 bit platforms * sick, wasm is completely pic * hmmmm not quite working yet * woooo, patches loading from rust+wasm * integrated into the cli 😎 * condense a bit * cleaned up request a bit * bust fingerprints * Make the file diffing logic a bit more sensible * still working through a few issues, server launches but is acting weird * fix merge conflict * more merge issues * remove stuff we don't want anymore * revert name change * wip: server not working anymore :( * split apart "dioxus fullstack" into "dioxus server" and "dioxus web" * fixup a few more compile errors * grrr opening server * simultaneous frontend and backend patching * use rustc wrapper * wip: passing assets to jumptable * migrate project-like examples * patchy patchy server fns! * rollback some random changes * unwind the js files * rollback hash * no need for patch * more cleanups * lil bit more cleanup, remove some old cruft * allow patching when wasm webpage is closed * tiny bit more robust * lil bit of clean up * clean up ws code * bit more clean ups * condense * undo file moves * move back other project * move other project * migrate out harness and janky CLI * fix compile * anonymize some files, heavily document others * lots more documentation, for posterity! * ton more docs * clean up the cli a bit more * more ws cleanup * more cleanup * migrate build id to cli-config * add command file handling * random small cleanups * wip.... * wip.... * fix: use workspace for krate discovery * fix panic logging on serve by placing it *after* the logs * reorder logging to be sensible on success * bring back swc * ws cruft * small patches to relocs in loader * bump krates * hoist main funcs into the ifunc table, fixing wasm * fix tui output for long lines * add more linker logging * wow, incredible, we build fat binaries, holy heckkkkk * fix args for frontend/backend * small cleanups * properly send along build IDs to clients * fix workspace compiles * clean up jump table work a bit * clean up logging a bit * open existing * fixup some commands * open existing browser integration * wire up the new dx serve client/server syntax * fixup `dx run` command * bring back some old functionality * fix serverfn feature sets * remove toast animation and simplify its code a bit * less intrusive toast * dont change build status when patching on web * add proper cache busting to vcomponent * clean up the patch file a bit * more lints/checks cleaned up * go back to TargetArgs but a BuildTargets resolved struct * clean up more nits * use an atomicptr for jumptable * fix interaction with initial web load + suspense * don't run asset system on wasm/bindgen js in dev * reduce blast radius of PR * use profile to determine if we're in release * cleanup prod html template * cleanup profiles * fix feature resolution of fullstack * if fullstack is explicitly false, don't use it * light cleanups * drop carg config2 * pass along linker args properly * make workspace examples compile with dx again * fewer unwraps and better error loggign * bit more error handlign * small cleanup * drive-by cleanups * use queries instead of initialize for aslr stuff * fix hotpatch with higher opt level * fix aslr bug from multiple clients * fix merge conflict * fix typos * clippy * fix miscompile * fix doctest * properly rollback wry to 0.45 * fix markdown path issues, other test issues * fix test in router * fix release mode test * fix some more tests, clean up a few more items * use fnptr instead of typeid * clean up memozation via subsecond in core * use "main" as sentinel * fix imports and re-exports * get off __rust_alloc for aslr offset detection * wip * wip... fixing unoptimized web * hmmmm mmmm * close,ish, still missing the wasmbindgen dynaimc imports * aha! full wasm works now - disable externref when compilng patch modules - manually link wasm instrinsics - displace the __wbindgen_placeholder__ table with the synthesized wbg imports what an awful pain. There might be a few items missing, so will test against the docsite shortly * remove failing test * hmmmm things aren't perfect * from what I can tell, relocatable wasm just doesn't work with wasm-bindgen sad https://github.com/rustwasm/wasm-bindgen/issues/1420 * AI IS LITERALLY THE WORST * preserve wasm snippets across compiles * IT HOTPATCHES THE DOCSITE, WE ARE LIVING IN THE FUTURE * remove the macos cfg-out * fix: need to allocate 1 more page * fix url issue * properly span props * properly fill in extra symbols * light cleanups and good docs * delete cruft, better docs * More cleanups and simplifications * clippy, typos * remove harnesses * wasm-bindgen error logging * clean up deps * remove cruft * proper priv/pub * use ifuncs for all env imports * cruft * use par_iter, better output * implement a cache for the base module * delete custom sections * cache the main native module too * add par iter in a few more places * clippy, map ident * better logging and status bars * wip: some small windows support * wip more windowss * fix weird regression * implement windows jump table * small fixes for windows * better windows support * windows support pt2 * rust lld is not msvc * whole archive the rlibs * ignore windows and sys crates * logging * ohhhhhh, pop out dlls * dedupe * thANK GOD FAT LINKING WORKS ON WINDOWS * hoist caching * implement patch based on cache * fix location for pdb * pass data symbols, correct object * add all symbol for windows * add log * treat none rva as undefined * whoops * handle windows calling convention * dont use relocated arm64 stub windows * not all are text? * WINDOWS FUNCTION PATCHING WORKS but issue with statics? * use our own entry * handle windows imp symbols * add log * jump to the real symbol not the layout * whoops * hotpatching windows works completely holy heck yay * drop linker args crate * disable ssg playwright for now * light cleanups * some cleanups / preps: - bump to serverfn 0.8.2 - fix playwright test - fix clippy * use fix from #4042 * bring in other fix for liveview * hoist some configuration * use __aslr_reference instead of aslr_reference * add better errors to patcherror * fix android * panic if patching fails * clean up tomls * wip: fixing wasm compile for server * fullstack wasm again * fix cfg * fixup feature detection * fix issue with features * fix playwright! * add barebones template test harness * fix compatibility between the two hotreload engines * fix preldue of server * fix check for wasm-opt * small fixes
437 lines
15 KiB
Rust
437 lines
15 KiB
Rust
use crate::{render::SSRError, with_server_context, DioxusServerContext, SSRState, ServeConfig};
|
|
use crate::{ContextProviders, ProvideServerContext};
|
|
use axum::body;
|
|
use axum::extract::State;
|
|
use axum::routing::*;
|
|
use axum::{
|
|
body::Body,
|
|
http::{Request, Response, StatusCode},
|
|
response::IntoResponse,
|
|
};
|
|
use dioxus_lib::prelude::{Element, VirtualDom};
|
|
use http::header::*;
|
|
use server_fn::ServerFnTraitObj;
|
|
use std::sync::Arc;
|
|
|
|
/// A extension trait with utilities for integrating Dioxus with your Axum router.
|
|
pub trait DioxusRouterExt<S>: DioxusRouterFnExt<S> {
|
|
/// Serves the static WASM for your Dioxus application (except the generated index.html).
|
|
///
|
|
/// # Example
|
|
/// ```rust, no_run
|
|
/// # #![allow(non_snake_case)]
|
|
/// # use dioxus_lib::prelude::*;
|
|
/// # use dioxus_fullstack::prelude::*;
|
|
/// #[tokio::main]
|
|
/// async fn main() {
|
|
/// let addr = dioxus::cli_config::fullstack_address_or_localhost();
|
|
/// let router = axum::Router::new()
|
|
/// // Server side render the application, serve static assets, and register server functions
|
|
/// .serve_static_assets()
|
|
/// // Server render the application
|
|
/// // ...
|
|
/// .into_make_service();
|
|
/// let listener = tokio::net::TcpListener::bind(addr).await.unwrap();
|
|
/// axum::serve(listener, router).await.unwrap();
|
|
/// }
|
|
/// ```
|
|
fn serve_static_assets(self) -> Self
|
|
where
|
|
Self: Sized;
|
|
|
|
/// Serves the Dioxus application. This will serve a complete server side rendered application.
|
|
/// This will serve static assets, server render the application, register server functions, and integrate with hot reloading.
|
|
///
|
|
/// # Example
|
|
/// ```rust, no_run
|
|
/// # #![allow(non_snake_case)]
|
|
/// # use dioxus_lib::prelude::*;
|
|
/// # use dioxus_fullstack::prelude::*;
|
|
/// #[tokio::main]
|
|
/// async fn main() {
|
|
/// let addr = dioxus::cli_config::fullstack_address_or_localhost();
|
|
/// let router = axum::Router::new()
|
|
/// // Server side render the application, serve static assets, and register server functions
|
|
/// .serve_dioxus_application(ServeConfig::new().unwrap(), app)
|
|
/// .into_make_service();
|
|
/// let listener = tokio::net::TcpListener::bind(addr).await.unwrap();
|
|
/// axum::serve(listener, router).await.unwrap();
|
|
/// }
|
|
///
|
|
/// fn app() -> Element {
|
|
/// rsx! { "Hello World" }
|
|
/// }
|
|
/// ```
|
|
fn serve_dioxus_application(self, cfg: ServeConfig, app: fn() -> Element) -> Self
|
|
where
|
|
Self: Sized;
|
|
}
|
|
|
|
#[cfg(not(target_arch = "wasm32"))]
|
|
impl<S> DioxusRouterExt<S> for Router<S>
|
|
where
|
|
S: Send + Sync + Clone + 'static,
|
|
{
|
|
fn serve_static_assets(mut self) -> Self {
|
|
use tower_http::services::{ServeDir, ServeFile};
|
|
|
|
let public_path = crate::public_path();
|
|
|
|
if !public_path.exists() {
|
|
return self;
|
|
}
|
|
|
|
// Serve all files in public folder except index.html
|
|
let dir = std::fs::read_dir(&public_path).unwrap_or_else(|e| {
|
|
panic!(
|
|
"Couldn't read public directory at {:?}: {}",
|
|
&public_path, e
|
|
)
|
|
});
|
|
|
|
for entry in dir.flatten() {
|
|
let path = entry.path();
|
|
if path.ends_with("index.html") {
|
|
continue;
|
|
}
|
|
let route = path
|
|
.strip_prefix(&public_path)
|
|
.unwrap()
|
|
.iter()
|
|
.map(|segment| {
|
|
segment.to_str().unwrap_or_else(|| {
|
|
panic!("Failed to convert path segment {:?} to string", segment)
|
|
})
|
|
})
|
|
.collect::<Vec<_>>()
|
|
.join("/");
|
|
let route = format!("/{}", route);
|
|
if path.is_dir() {
|
|
self = self.nest_service(&route, ServeDir::new(path).precompressed_br());
|
|
} else {
|
|
self = self.nest_service(&route, ServeFile::new(path).precompressed_br());
|
|
}
|
|
}
|
|
|
|
self
|
|
}
|
|
|
|
fn serve_dioxus_application(self, cfg: ServeConfig, app: fn() -> Element) -> Self {
|
|
// Add server functions and render index.html
|
|
let server = self
|
|
.serve_static_assets()
|
|
.register_server_functions_with_context(cfg.context_providers.clone());
|
|
|
|
let ssr_state = SSRState::new(&cfg);
|
|
|
|
server.fallback(
|
|
get(render_handler)
|
|
.with_state(RenderHandleState::new(cfg, app).with_ssr_state(ssr_state)),
|
|
)
|
|
}
|
|
}
|
|
|
|
/// A extension trait with server function utilities for integrating Dioxus with your Axum router.
|
|
pub trait DioxusRouterFnExt<S> {
|
|
/// Registers server functions with the default handler. This handler function will pass an empty [`DioxusServerContext`] to your server functions.
|
|
///
|
|
/// # Example
|
|
/// ```rust, no_run
|
|
/// # use dioxus_lib::prelude::*;
|
|
/// # use dioxus_fullstack::prelude::*;
|
|
/// #[tokio::main]
|
|
/// async fn main() {
|
|
/// let addr = dioxus::cli_config::fullstack_address_or_localhost();
|
|
/// let router = axum::Router::new()
|
|
/// // Register server functions routes with the default handler
|
|
/// .register_server_functions()
|
|
/// .into_make_service();
|
|
/// let listener = tokio::net::TcpListener::bind(addr).await.unwrap();
|
|
/// axum::serve(listener, router).await.unwrap();
|
|
/// }
|
|
/// ```
|
|
#[allow(dead_code)]
|
|
fn register_server_functions(self) -> Self
|
|
where
|
|
Self: Sized,
|
|
{
|
|
self.register_server_functions_with_context(Default::default())
|
|
}
|
|
|
|
/// Registers server functions with some additional context to insert into the [`DioxusServerContext`] for that handler.
|
|
///
|
|
/// # Example
|
|
/// ```rust, no_run
|
|
/// # use dioxus_lib::prelude::*;
|
|
/// # use dioxus_fullstack::prelude::*;
|
|
/// # use std::sync::Arc;
|
|
/// #[tokio::main]
|
|
/// async fn main() {
|
|
/// let addr = dioxus::cli_config::fullstack_address_or_localhost();
|
|
/// let router = axum::Router::new()
|
|
/// // Register server functions routes with the default handler
|
|
/// .register_server_functions_with_context(Arc::new(vec![Box::new(|| Box::new(1234567890u32))]))
|
|
/// .into_make_service();
|
|
/// let listener = tokio::net::TcpListener::bind(addr).await.unwrap();
|
|
/// axum::serve(listener, router).await.unwrap();
|
|
/// }
|
|
/// ```
|
|
fn register_server_functions_with_context(self, context_providers: ContextProviders) -> Self;
|
|
}
|
|
|
|
impl<S> DioxusRouterFnExt<S> for Router<S>
|
|
where
|
|
S: Send + Sync + Clone + 'static,
|
|
{
|
|
fn register_server_functions_with_context(
|
|
mut self,
|
|
context_providers: ContextProviders,
|
|
) -> Self {
|
|
for f in collect_raw_server_fns() {
|
|
self = register_server_fn_on_router(f, self, context_providers.clone());
|
|
}
|
|
self
|
|
}
|
|
}
|
|
|
|
pub fn register_server_fn_on_router<S>(
|
|
f: &'static AxumServerFn,
|
|
router: Router<S>,
|
|
context_providers: ContextProviders,
|
|
) -> Router<S>
|
|
where
|
|
S: Send + Sync + Clone + 'static,
|
|
{
|
|
use http::method::Method;
|
|
let path = f.path();
|
|
let method = f.method();
|
|
|
|
tracing::trace!("Registering server function: {} {}", method, path);
|
|
let handler = move |req| handle_server_fns_inner(f, context_providers, req);
|
|
match method {
|
|
Method::GET => router.route(path, get(handler)),
|
|
Method::POST => router.route(path, post(handler)),
|
|
Method::PUT => router.route(path, put(handler)),
|
|
_ => unimplemented!("Unsupported server function method: {}", method),
|
|
}
|
|
}
|
|
|
|
pub type AxumServerFn = ServerFnTraitObj<http::Request<Body>, http::Response<Body>>;
|
|
|
|
pub(crate) fn collect_raw_server_fns() -> Vec<&'static AxumServerFn> {
|
|
inventory::iter::<AxumServerFn>().collect()
|
|
}
|
|
|
|
/// A handler for Dioxus server functions. This will run the server function and return the result.
|
|
async fn handle_server_fns_inner(
|
|
f: &AxumServerFn,
|
|
additional_context: ContextProviders,
|
|
req: Request<Body>,
|
|
) -> Response<axum::body::Body> {
|
|
let (parts, body) = req.into_parts();
|
|
let req = Request::from_parts(parts.clone(), body);
|
|
|
|
// Create the server context with info from the request
|
|
let server_context = DioxusServerContext::new(parts);
|
|
|
|
// Provide additional context from the render state
|
|
add_server_context(&server_context, &additional_context);
|
|
|
|
// store Accepts and Referrer in case we need them for redirect (below)
|
|
let accepts_html = req
|
|
.headers()
|
|
.get(ACCEPT)
|
|
.and_then(|v| v.to_str().ok())
|
|
.map(|v| v.contains("text/html"))
|
|
.unwrap_or(false);
|
|
let referrer = req.headers().get(REFERER).cloned();
|
|
|
|
// this is taken from server_fn source...
|
|
//
|
|
// [`server_fn::axum::get_server_fn_service`]
|
|
let mut service = {
|
|
let middleware = f.middleware();
|
|
let mut service = f.clone().boxed();
|
|
for middleware in middleware {
|
|
service = middleware.layer(service);
|
|
}
|
|
service
|
|
};
|
|
|
|
// actually run the server fn (which may use the server context)
|
|
let fut = with_server_context(server_context.clone(), || service.run(req));
|
|
|
|
let mut res = ProvideServerContext::new(fut, server_context.clone()).await;
|
|
|
|
// it it accepts text/html (i.e., is a plain form post) and doesn't already have a
|
|
// Location set, then redirect to Referer
|
|
if accepts_html {
|
|
if let Some(referrer) = referrer {
|
|
let has_location = res.headers().get(LOCATION).is_some();
|
|
if !has_location {
|
|
*res.status_mut() = StatusCode::FOUND;
|
|
res.headers_mut().insert(LOCATION, referrer);
|
|
}
|
|
}
|
|
}
|
|
|
|
// apply the response parts from the server context to the response
|
|
server_context.send_response(&mut res);
|
|
|
|
res
|
|
}
|
|
|
|
pub(crate) fn add_server_context(
|
|
server_context: &DioxusServerContext,
|
|
context_providers: &ContextProviders,
|
|
) {
|
|
for index in 0..context_providers.len() {
|
|
let context_providers = context_providers.clone();
|
|
server_context.insert_boxed_factory(Box::new(move || context_providers[index]()));
|
|
}
|
|
}
|
|
|
|
/// State used by [`render_handler`] to render a dioxus component with axum
|
|
#[derive(Clone)]
|
|
pub struct RenderHandleState {
|
|
config: ServeConfig,
|
|
build_virtual_dom: Arc<dyn Fn() -> VirtualDom + Send + Sync>,
|
|
ssr_state: once_cell::sync::OnceCell<SSRState>,
|
|
}
|
|
|
|
impl RenderHandleState {
|
|
/// Create a new [`RenderHandleState`]
|
|
pub fn new(config: ServeConfig, root: fn() -> Element) -> Self {
|
|
Self {
|
|
config,
|
|
build_virtual_dom: Arc::new(move || VirtualDom::new(root)),
|
|
ssr_state: Default::default(),
|
|
}
|
|
}
|
|
|
|
/// Create a new [`RenderHandleState`] with a custom [`VirtualDom`] factory. This method can be used to pass context into the root component of your application.
|
|
pub fn new_with_virtual_dom_factory(
|
|
config: ServeConfig,
|
|
build_virtual_dom: impl Fn() -> VirtualDom + Send + Sync + 'static,
|
|
) -> Self {
|
|
Self {
|
|
config,
|
|
build_virtual_dom: Arc::new(build_virtual_dom),
|
|
ssr_state: Default::default(),
|
|
}
|
|
}
|
|
|
|
/// Set the [`ServeConfig`] for this [`RenderHandleState`]
|
|
pub fn with_config(mut self, config: ServeConfig) -> Self {
|
|
self.config = config;
|
|
self
|
|
}
|
|
|
|
/// Set the [`SSRState`] for this [`RenderHandleState`]. Sharing a [`SSRState`] between multiple [`RenderHandleState`]s is more efficient than creating a new [`SSRState`] for each [`RenderHandleState`].
|
|
pub fn with_ssr_state(mut self, ssr_state: SSRState) -> Self {
|
|
self.ssr_state = once_cell::sync::OnceCell::new();
|
|
if self.ssr_state.set(ssr_state).is_err() {
|
|
panic!("SSRState already set");
|
|
}
|
|
self
|
|
}
|
|
|
|
fn ssr_state(&self) -> &SSRState {
|
|
self.ssr_state.get_or_init(|| SSRState::new(&self.config))
|
|
}
|
|
}
|
|
|
|
/// SSR renderer handler for Axum with added context injection.
|
|
///
|
|
/// # Example
|
|
/// ```rust,no_run
|
|
/// #![allow(non_snake_case)]
|
|
/// use std::sync::{Arc, Mutex};
|
|
///
|
|
/// use axum::routing::get;
|
|
/// use dioxus::prelude::*;
|
|
///
|
|
/// fn app() -> Element {
|
|
/// rsx! {
|
|
/// "hello!"
|
|
/// }
|
|
/// }
|
|
///
|
|
/// #[tokio::main]
|
|
/// async fn main() {
|
|
/// let addr = dioxus::cli_config::fullstack_address_or_localhost();
|
|
/// let router = axum::Router::new()
|
|
/// // Register server functions, etc.
|
|
/// // Note you can use `register_server_functions_with_context`
|
|
/// // to inject the context into server functions running outside
|
|
/// // of an SSR render context.
|
|
/// .fallback(get(render_handler)
|
|
/// .with_state(RenderHandleState::new(ServeConfig::new().unwrap(), app))
|
|
/// )
|
|
/// .into_make_service();
|
|
/// let listener = tokio::net::TcpListener::bind(addr).await.unwrap();
|
|
/// axum::serve(listener, router).await.unwrap();
|
|
/// }
|
|
/// ```
|
|
pub async fn render_handler(
|
|
State(state): State<RenderHandleState>,
|
|
request: Request<Body>,
|
|
) -> impl IntoResponse {
|
|
let cfg = &state.config;
|
|
let ssr_state = state.ssr_state();
|
|
let build_virtual_dom = {
|
|
let build_virtual_dom = state.build_virtual_dom.clone();
|
|
let context_providers = state.config.context_providers.clone();
|
|
move || {
|
|
let mut vdom = build_virtual_dom();
|
|
for state in context_providers.as_slice() {
|
|
vdom.insert_any_root_context(state());
|
|
}
|
|
vdom
|
|
}
|
|
};
|
|
|
|
let (parts, _) = request.into_parts();
|
|
let url = parts
|
|
.uri
|
|
.path_and_query()
|
|
.ok_or(StatusCode::BAD_REQUEST)?
|
|
.to_string();
|
|
let parts: Arc<parking_lot::RwLock<http::request::Parts>> =
|
|
Arc::new(parking_lot::RwLock::new(parts));
|
|
// Create the server context with info from the request
|
|
let server_context = DioxusServerContext::from_shared_parts(parts.clone());
|
|
// Provide additional context from the render state
|
|
add_server_context(&server_context, &state.config.context_providers);
|
|
|
|
match ssr_state
|
|
.render(url, cfg, build_virtual_dom, &server_context)
|
|
.await
|
|
{
|
|
Ok((freshness, rx)) => {
|
|
let mut response = axum::response::Html::from(Body::from_stream(rx)).into_response();
|
|
freshness.write(response.headers_mut());
|
|
server_context.send_response(&mut response);
|
|
Result::<http::Response<axum::body::Body>, StatusCode>::Ok(response)
|
|
}
|
|
Err(SSRError::Incremental(e)) => {
|
|
tracing::error!("Failed to render page: {}", e);
|
|
Ok(report_err(e).into_response())
|
|
}
|
|
Err(SSRError::Routing(e)) => {
|
|
tracing::trace!("Page not found: {}", e);
|
|
Ok(Response::builder()
|
|
.status(StatusCode::NOT_FOUND)
|
|
.body(Body::from("Page not found"))
|
|
.unwrap())
|
|
}
|
|
}
|
|
}
|
|
|
|
fn report_err<E: std::fmt::Display>(e: E) -> Response<axum::body::Body> {
|
|
Response::builder()
|
|
.status(StatusCode::INTERNAL_SERVER_ERROR)
|
|
.body(body::Body::new(format!("Error: {}", e)))
|
|
.unwrap()
|
|
}
|