Binary patching rust hot-reloading, sub-second rebuilds, independent server/client hot-reload (#3797)
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
This commit is contained in:
Jonathan Kelley authored and GitHub committed
1 parent
71d85e6dd5
commit
d976ca184a
142 files changed
+17982
-7156
No files matched your search
@@ -1,7 +1,6 @@
|
||||
use crate::{
|
||||
serve::{ansi_buffer::AnsiStringLine, Builder, ServeUpdate, Watcher, WebServer},
|
||||
BuildStage, BuildUpdate, DioxusCrate, Platform, RustcDetails, ServeArgs, TraceContent,
|
||||
TraceMsg, TraceSrc,
|
||||
serve::{ansi_buffer::AnsiStringLine, ServeUpdate, WebServer},
|
||||
BuildStage, BuilderUpdate, Platform, TraceContent, TraceMsg, TraceSrc,
|
||||
};
|
||||
use crossterm::{
|
||||
cursor::{Hide, Show},
|
||||
@@ -26,6 +25,8 @@ use std::{
|
||||
};
|
||||
use tracing::Level;
|
||||
|
||||
use super::AppServer;
|
||||
|
||||
const TICK_RATE_MS: u64 = 100;
|
||||
const VIEWPORT_MAX_WIDTH: u16 = 100;
|
||||
const VIEWPORT_HEIGHT_SMALL: u16 = 5;
|
||||
@@ -46,7 +47,6 @@ pub struct Output {
|
||||
// A list of all messages from build, dev, app, and more.
|
||||
more_modal_open: bool,
|
||||
interactive: bool,
|
||||
platform: Platform,
|
||||
|
||||
// Whether to show verbose logs or not
|
||||
// We automatically hide "debug" logs if verbose is false (only showing "info" / "warn" / "error")
|
||||
@@ -64,31 +64,24 @@ pub struct Output {
|
||||
// ! needs to be wrapped in an &mut since `render stateful widget` requires &mut... but our
|
||||
// "render" method only borrows &self (for no particular reason at all...)
|
||||
throbber: RefCell<throbber_widgets_tui::ThrobberState>,
|
||||
|
||||
rustc_details: RustcDetails,
|
||||
}
|
||||
|
||||
#[allow(unused)]
|
||||
#[derive(Clone, Copy)]
|
||||
struct RenderState<'a> {
|
||||
opts: &'a ServeArgs,
|
||||
krate: &'a DioxusCrate,
|
||||
build_engine: &'a Builder,
|
||||
runner: &'a AppServer,
|
||||
server: &'a WebServer,
|
||||
watcher: &'a Watcher,
|
||||
}
|
||||
|
||||
impl Output {
|
||||
pub(crate) async fn start(cfg: &ServeArgs) -> crate::Result<Self> {
|
||||
pub(crate) async fn start(interactive: bool) -> crate::Result<Self> {
|
||||
let mut output = Self {
|
||||
interactive,
|
||||
term: Rc::new(RefCell::new(None)),
|
||||
interactive: cfg.is_interactive_tty(),
|
||||
dx_version: format!(
|
||||
"{}-{}",
|
||||
env!("CARGO_PKG_VERSION"),
|
||||
crate::dx_build_info::GIT_COMMIT_HASH_SHORT.unwrap_or("main")
|
||||
),
|
||||
platform: cfg.build_arguments.platform.expect("To be resolved by now"),
|
||||
events: None,
|
||||
more_modal_open: false,
|
||||
pending_logs: VecDeque::new(),
|
||||
@@ -101,7 +94,6 @@ impl Output {
|
||||
interval.set_missed_tick_behavior(tokio::time::MissedTickBehavior::Delay);
|
||||
interval
|
||||
},
|
||||
rustc_details: RustcDetails::from_cli().await?,
|
||||
};
|
||||
|
||||
output.startup()?;
|
||||
@@ -113,15 +105,6 @@ impl Output {
|
||||
/// This is meant to be paired with "shutdown" to restore the terminal to its original state.
|
||||
fn startup(&mut self) -> io::Result<()> {
|
||||
if self.interactive {
|
||||
// set the panic hook to fix the terminal in the event of a panic
|
||||
// The terminal might be left in a wonky state if a panic occurs, and we don't want it to be completely broken
|
||||
let original_hook = std::panic::take_hook();
|
||||
std::panic::set_hook(Box::new(move |info| {
|
||||
_ = disable_raw_mode();
|
||||
_ = stdout().execute(Show);
|
||||
original_hook(info);
|
||||
}));
|
||||
|
||||
// Check if writing the terminal is going to block infinitely.
|
||||
// If it does, we should disable interactive mode. This ensures we work with programs like `bg`
|
||||
// which suspend the process and cause us to block when writing output.
|
||||
@@ -183,7 +166,12 @@ impl Output {
|
||||
/// Call the shutdown functions that might mess with the terminal settings - see the related code
|
||||
/// in "startup" for more details about what we need to unset
|
||||
pub(crate) fn shutdown(&self) -> io::Result<()> {
|
||||
if self.interactive {
|
||||
Self::remote_shutdown(self.interactive)?;
|
||||
Ok(())
|
||||
}
|
||||
|
||||
pub(crate) fn remote_shutdown(interactive: bool) -> io::Result<()> {
|
||||
if interactive {
|
||||
stdout()
|
||||
.execute(Show)?
|
||||
.execute(DisableFocusChange)?
|
||||
@@ -329,7 +317,7 @@ impl Output {
|
||||
}
|
||||
|
||||
/// Push a message from the websocket to the logs
|
||||
pub fn push_ws_message(&mut self, platform: Platform, message: axum::extract::ws::Message) {
|
||||
pub fn push_ws_message(&mut self, platform: Platform, message: &axum::extract::ws::Message) {
|
||||
use dioxus_devtools_types::ClientMsg;
|
||||
|
||||
// We can only handle text messages from the websocket...
|
||||
@@ -341,14 +329,18 @@ impl Output {
|
||||
let res = serde_json::from_str::<ClientMsg>(text.as_str());
|
||||
|
||||
// Client logs being errors aren't fatal, but we should still report them them
|
||||
let ClientMsg::Log { level, messages } = match res {
|
||||
let msg = match res {
|
||||
Ok(msg) => msg,
|
||||
Err(err) => {
|
||||
tracing::error!(dx_src = ?TraceSrc::Dev, "Error parsing message from {}: {}", platform, err);
|
||||
tracing::error!(dx_src = ?TraceSrc::Dev, "Error parsing message from {}: {} -> {:?}", platform, err, text.as_str());
|
||||
return;
|
||||
}
|
||||
};
|
||||
|
||||
let ClientMsg::Log { level, messages } = msg else {
|
||||
return;
|
||||
};
|
||||
|
||||
// FIXME(jon): why are we pulling only the first message here?
|
||||
let content = messages.first().unwrap_or(&String::new()).clone();
|
||||
|
||||
@@ -373,26 +365,19 @@ impl Output {
|
||||
/// approach, but then we'd need to do that *everywhere* instead of simply performing a react-like
|
||||
/// re-render when external state changes. Ratatui will diff the intermediate buffer, so we at least
|
||||
/// we won't be drawing it.
|
||||
pub(crate) fn new_build_update(&mut self, update: &BuildUpdate) {
|
||||
pub(crate) fn new_build_update(&mut self, update: &BuilderUpdate) {
|
||||
match update {
|
||||
BuildUpdate::Progress {
|
||||
BuilderUpdate::Progress {
|
||||
stage: BuildStage::Starting { .. },
|
||||
} => self.tick_animation = true,
|
||||
BuildUpdate::BuildReady { .. } => self.tick_animation = false,
|
||||
BuildUpdate::BuildFailed { .. } => self.tick_animation = false,
|
||||
BuilderUpdate::BuildReady { .. } => self.tick_animation = false,
|
||||
BuilderUpdate::BuildFailed { .. } => self.tick_animation = false,
|
||||
_ => {}
|
||||
}
|
||||
}
|
||||
|
||||
/// Render the current state of everything to the console screen
|
||||
pub fn render(
|
||||
&mut self,
|
||||
opts: &ServeArgs,
|
||||
config: &DioxusCrate,
|
||||
build_engine: &Builder,
|
||||
server: &WebServer,
|
||||
watcher: &Watcher,
|
||||
) {
|
||||
pub fn render(&mut self, runner: &AppServer, server: &WebServer) {
|
||||
if !self.interactive {
|
||||
return;
|
||||
}
|
||||
@@ -409,16 +394,7 @@ impl Output {
|
||||
|
||||
// Then, draw the frame, passing along all the state of the TUI so we can render it properly
|
||||
_ = term.draw(|frame| {
|
||||
self.render_frame(
|
||||
frame,
|
||||
RenderState {
|
||||
opts,
|
||||
krate: config,
|
||||
build_engine,
|
||||
server,
|
||||
watcher,
|
||||
},
|
||||
);
|
||||
self.render_frame(frame, RenderState { runner, server });
|
||||
});
|
||||
}
|
||||
|
||||
@@ -488,39 +464,46 @@ impl Output {
|
||||
])
|
||||
.areas(gauge_area);
|
||||
|
||||
let client = &state.runner.client();
|
||||
self.render_single_gauge(
|
||||
frame,
|
||||
app_progress,
|
||||
state.build_engine.compile_progress(),
|
||||
client.compile_progress(),
|
||||
"App: ",
|
||||
state,
|
||||
state.build_engine.compile_duration(),
|
||||
client.compile_duration(),
|
||||
);
|
||||
|
||||
if state.build_engine.request.build.fullstack() {
|
||||
if state.runner.is_fullstack() {
|
||||
self.render_single_gauge(
|
||||
frame,
|
||||
second_progress,
|
||||
state.build_engine.server_compile_progress(),
|
||||
state.runner.server_compile_progress(),
|
||||
"Server: ",
|
||||
state,
|
||||
state.build_engine.compile_duration(),
|
||||
client.compile_duration(),
|
||||
);
|
||||
} else {
|
||||
self.render_single_gauge(
|
||||
frame,
|
||||
second_progress,
|
||||
state.build_engine.bundle_progress(),
|
||||
client.bundle_progress(),
|
||||
"Bundle: ",
|
||||
state,
|
||||
state.build_engine.bundle_duration(),
|
||||
client.bundle_duration(),
|
||||
);
|
||||
}
|
||||
|
||||
let mut lines = vec!["Status: ".white()];
|
||||
match &state.build_engine.stage {
|
||||
match &client.stage {
|
||||
BuildStage::Initializing => lines.push("Initializing".yellow()),
|
||||
BuildStage::Starting { .. } => lines.push("Starting build".yellow()),
|
||||
BuildStage::Starting { patch, .. } => {
|
||||
if *patch {
|
||||
lines.push("Hot-patching...".yellow())
|
||||
} else {
|
||||
lines.push("Starting build".yellow())
|
||||
}
|
||||
}
|
||||
BuildStage::InstallingTooling => lines.push("Installing tooling".yellow()),
|
||||
BuildStage::Compiling {
|
||||
current,
|
||||
@@ -535,7 +518,6 @@ impl Output {
|
||||
BuildStage::OptimizingWasm => lines.push("Optimizing wasm".yellow()),
|
||||
BuildStage::SplittingBundle => lines.push("Splitting bundle".yellow()),
|
||||
BuildStage::CompressingAssets => lines.push("Compressing assets".yellow()),
|
||||
BuildStage::PrerenderingRoutes => lines.push("Prerendering static routes".yellow()),
|
||||
BuildStage::RunningBindgen => lines.push("Running wasm-bindgen".yellow()),
|
||||
BuildStage::RunningGradle => lines.push("Running gradle assemble".yellow()),
|
||||
BuildStage::Bundling => lines.push("Bundling app".yellow()),
|
||||
@@ -552,15 +534,18 @@ impl Output {
|
||||
}
|
||||
BuildStage::Success => {
|
||||
lines.push("Serving ".yellow());
|
||||
lines.push(state.krate.executable_name().white());
|
||||
lines.push(client.build.executable_name().white());
|
||||
lines.push(" 🚀 ".green());
|
||||
if let Some(comp_time) = state.build_engine.total_build_time() {
|
||||
if let Some(comp_time) = client.total_build_time() {
|
||||
lines.push(format!("{:.1}s", comp_time.as_secs_f32()).dark_gray());
|
||||
}
|
||||
}
|
||||
BuildStage::Failed => lines.push("Failed".red()),
|
||||
BuildStage::Aborted => lines.push("Aborted".red()),
|
||||
BuildStage::Restarting => lines.push("Restarting".yellow()),
|
||||
BuildStage::Linking => lines.push("Linking".yellow()),
|
||||
BuildStage::Hotpatching => lines.push("Hot-patching...".yellow()),
|
||||
BuildStage::ExtractingAssets => lines.push("Extracting assets".yellow()),
|
||||
_ => {}
|
||||
};
|
||||
|
||||
@@ -576,7 +561,7 @@ impl Output {
|
||||
state: RenderState,
|
||||
time_taken: Option<Duration>,
|
||||
) {
|
||||
let failed = state.build_engine.stage == BuildStage::Failed;
|
||||
let failed = state.runner.client.stage == BuildStage::Failed;
|
||||
let value = if failed { 1.0 } else { value.clamp(0.0, 1.0) };
|
||||
|
||||
let [gauge_row, _, icon] = Layout::horizontal([
|
||||
@@ -647,11 +632,12 @@ impl Output {
|
||||
])
|
||||
.areas(area);
|
||||
|
||||
let client = &state.runner.client();
|
||||
frame.render_widget(
|
||||
Paragraph::new(Line::from(vec![
|
||||
"Platform: ".gray(),
|
||||
self.platform.expected_name().yellow(),
|
||||
if state.opts.build_arguments.fullstack() {
|
||||
client.build.platform.expected_name().yellow(),
|
||||
if state.runner.is_fullstack() {
|
||||
" + fullstack".yellow()
|
||||
} else {
|
||||
" ".dark_gray()
|
||||
@@ -671,7 +657,7 @@ impl Output {
|
||||
|
||||
frame.render_widget_ref(
|
||||
Paragraph::new(Line::from(vec![
|
||||
if self.platform == Platform::Web {
|
||||
if client.build.platform == Platform::Web {
|
||||
"Serving at: ".gray()
|
||||
} else {
|
||||
"ServerFns at: ".gray()
|
||||
@@ -688,7 +674,7 @@ impl Output {
|
||||
Paragraph::new(Line::from({
|
||||
let mut lines = vec!["App features: ".gray(), "[".yellow()];
|
||||
|
||||
let feature_list: Vec<String> = state.build_engine.request.all_target_features();
|
||||
let feature_list: Vec<String> = state.runner.client().build.all_target_features();
|
||||
let num_features = feature_list.len();
|
||||
|
||||
for (idx, feature) in feature_list.into_iter().enumerate() {
|
||||
@@ -737,7 +723,7 @@ impl Output {
|
||||
frame.render_widget(
|
||||
Paragraph::new(Line::from(vec![
|
||||
"rustc: ".gray(),
|
||||
self.rustc_details.version.as_str().yellow(),
|
||||
state.runner.workspace.rustc_version.as_str().yellow(),
|
||||
])),
|
||||
meta_list[2],
|
||||
);
|
||||
@@ -869,8 +855,8 @@ impl Output {
|
||||
.iter()
|
||||
.map(|line| {
|
||||
// Very important to strip ansi codes before counting graphemes - the ansi codes count as multiple graphemes!
|
||||
let grapheme_count = console::strip_ansi_codes(line).graphemes(true).count() as u16;
|
||||
grapheme_count.max(1).div_ceil(term_size.width)
|
||||
let grapheme_count = console::strip_ansi_codes(line).graphemes(true).count();
|
||||
grapheme_count.max(1).div_ceil(term_size.width as usize) as u16
|
||||
})
|
||||
.sum::<u16>();
|
||||
|
||||
@@ -1005,7 +991,11 @@ impl Output {
|
||||
|
||||
// Create the ansi -> raw string line with a width of either the viewport width or the max width
|
||||
let line_length = line.styled_graphemes(Style::default()).count();
|
||||
lines.push(AnsiStringLine::new(line_length as _).render(&line));
|
||||
if line_length < u16::MAX as usize {
|
||||
lines.push(AnsiStringLine::new(line_length as _).render(&line));
|
||||
} else {
|
||||
lines.push(line.to_string())
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user