eframe web: Better panic handling (emilk#2942)

* Refactor: remove extra store of events * Remove unnecessary extra function * Refactor: simplify event registering * Store panic summary * egui_demo_app: move web-part to own module * index.html: await * Properly unsubscribe from events on panic * Better error handling * Demo app html: hide the wasm canvas and show an error message on panic * egui_demo_app: add panic button to test panic response on web * fix typo * Use a constructor to create WebHandle * Refactor: less use of locks in the interfaces * More consistent naming
rahulmr · Apr 21, 2023 · ac50fa0 · ac50fa0
1 parent 7f2de42
commit ac50fa0
Show file tree

Hide file tree

Showing 10 changed files with 680 additions and 627 deletions.
diff --git a/crates/eframe/src/lib.rs b/crates/eframe/src/lib.rs
@@ -81,61 +81,17 @@ pub use epi::*;
 // ----------------------------------------------------------------------------
 // When compiling for web
 
-#[cfg(target_arch = "wasm32")]
-pub mod web;
-
 #[cfg(target_arch = "wasm32")]
 pub use wasm_bindgen;
 
-#[cfg(target_arch = "wasm32")]
-use web::AppRunnerRef;
-
 #[cfg(target_arch = "wasm32")]
 pub use web_sys;
 
-/// Install event listeners to register different input events
-/// and start running the given app.
-///
-/// ``` no_run
-/// #[cfg(target_arch = "wasm32")]
-/// use wasm_bindgen::prelude::*;
-///
-/// /// This is the entry-point for all the web-assembly.
-/// /// This is called from the HTML.
-/// /// It loads the app, installs some callbacks, then returns.
-/// /// It returns a handle to the running app that can be stopped calling `AppRunner::stop_web`.
-/// /// You can add more callbacks like this if you want to call in to your code.
-/// #[cfg(target_arch = "wasm32")]
-/// #[wasm_bindgen]
-/// pub struct WebHandle {
-///     handle: AppRunnerRef,
-/// }
-/// #[cfg(target_arch = "wasm32")]
-/// #[wasm_bindgen]
-/// pub async fn start(canvas_id: &str) -> Result<WebHandle, eframe::wasm_bindgen::JsValue> {
-///     let web_options = eframe::WebOptions::default();
-///     eframe::start_web(
-///         canvas_id,
-///         web_options,
-///         Box::new(|cc| Box::new(MyEguiApp::new(cc))),
-///     )
-///     .await
-///     .map(|handle| WebHandle { handle })
-/// }
-/// ```
-///
-/// # Errors
-/// Failing to initialize WebGL graphics.
 #[cfg(target_arch = "wasm32")]
-pub async fn start_web(
-    canvas_id: &str,
-    web_options: WebOptions,
-    app_creator: AppCreator,
-) -> std::result::Result<AppRunnerRef, wasm_bindgen::JsValue> {
-    let handle = web::start(canvas_id, web_options, app_creator).await?;
+pub mod web;
 
-    Ok(handle)
-}
+#[cfg(target_arch = "wasm32")]
+pub use web::start_web;
 
 // ----------------------------------------------------------------------------
 // When compiling natively