skyler
/
egui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Log warning instead of error when failing to decode RON in storage (#2961) 

* Log warning instead of error when failing to decode RON in storage

* New web demo

* Clean up some warn/error logging

* Avoid deadlock that could happen on crash

* Log errors using console.warn, because console.error can cause crashes

* Use patched version of wasm-bindgen-cli, allowing >2GB memory

* New web demo
This commit is contained in:
Emil Ernerfeldt 2023-04-27 09:45:44 +02:00 committed by GitHub
parent f76eefb98d
commit 3d6a15f442
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 41 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
crates/eframe/src/epi/mod.rs
View File

@ -1051,7 +1051,13 @@ impl Storage for DummyStorage {
pub fn get_value<T: serde::de::DeserializeOwned>(storage: &dyn Storage, key: &str) -> Option<T> {
storage
.get_string(key)
.and_then(|value| ron::from_str(&value).ok())
.and_then(|value| match ron::from_str(&value) {
Ok(value) => Some(value),
Err(err) => {
log::warn!("Failed to decode RON: {err}");
None
}
})
}
/// Serialize the given value as [RON](https://github.com/ron-rs/ron) and store with the given key.

4
crates/eframe/src/web/backend.rs
View File

@ -529,7 +529,7 @@ impl AppRunnerRef {
log::debug!("Unsubscribing from {} events", events_to_unsubscribe.len());
for x in events_to_unsubscribe {
if let Err(err) = x.unsubscribe() {
log::error!("Failed to unsubscribe from event: {err:?}");
log::warn!("Failed to unsubscribe from event: {err:?}");
}
}
}
@ -560,7 +560,7 @@ impl AppRunnerRef {
if self.has_panicked() {
None
} else {
let lock = self.runner.borrow_mut();
let lock = self.runner.try_borrow_mut().ok()?;
if lock.is_destroyed.fetch() {
None
} else {

2
crates/eframe/src/web/mod.rs
View File

@ -192,7 +192,7 @@ pub fn set_clipboard_text(s: &str) {
let future = wasm_bindgen_futures::JsFuture::from(promise);
let future = async move {
if let Err(err) = future.await {
log::error!("Copy/cut action denied: {:?}", err);
log::error!("Copy/cut action failed: {err:?}");
}
};
wasm_bindgen_futures::spawn_local(future);

4
crates/eframe/src/web/storage.rs
View File

@ -18,7 +18,7 @@ pub fn load_memory(ctx: &egui::Context) {
ctx.memory_mut(|m| *m = memory);
}
Err(err) => {
log::error!("Failed to parse memory RON: {}", err);
log::warn!("Failed to parse memory RON: {err}");
}
}
}
@ -34,7 +34,7 @@ pub fn save_memory(ctx: &egui::Context) {
local_storage_set("egui_memory_ron", &ron);
}
Err(err) => {
log::error!("Failed to serialize memory as RON: {}", err);
log::warn!("Failed to serialize memory as RON: {err}");
}
}
}

14
crates/eframe/src/web/web_logger.rs
View File

@ -37,7 +37,11 @@ impl log::Log for WebLogger {
log::Level::Debug => console::debug(&msg),
log::Level::Info => console::info(&msg),
log::Level::Warn => console::warn(&msg),
log::Level::Error => console::error(&msg),
// Using console.error causes crashes for unknown reason
// https://github.com/emilk/egui/pull/2961
// log::Level::Error => console::error(&msg),
log::Level::Error => console::warn(&format!("ERROR: {msg}")),
}
}
@ -66,9 +70,11 @@ mod console {
#[wasm_bindgen(js_namespace = console)]
pub fn warn(s: &str);
/// `console.error`
#[wasm_bindgen(js_namespace = console)]
pub fn error(s: &str);
// Using console.error causes crashes for unknown reason
// https://github.com/emilk/egui/pull/2961
// /// `console.error`
// #[wasm_bindgen(js_namespace = console)]
// pub fn error(s: &str);
}
}

2
crates/egui-wgpu/src/winit.rs
View File

@ -311,7 +311,7 @@ impl Painter {
height_in_pixels,
);
} else {
log::error!("Ignoring window resize notification with no surface created via Painter::set_window()");
log::warn!("Ignoring window resize notification with no surface created via Painter::set_window()");
}
}

4
crates/egui_glow/src/winit.rs
View File

@ -21,8 +21,8 @@ impl EguiGlow {
shader_version: Option<ShaderVersion>,
) -> Self {
let painter = crate::Painter::new(gl, "", shader_version)
.map_err(|error| {
log::error!("error occurred in initializing painter:\n{}", error);
.map_err(|err| {
log::error!("error occurred in initializing painter:\n{err}");
})
.unwrap();

25
docs/egui_demo_app.js
View File

@ -43,6 +43,7 @@ function getUint8Memory0() {
}
function getStringFromWasm0(ptr, len) {
ptr = ptr >>> 0;
return cachedTextDecoder.decode(getUint8Memory0().subarray(ptr, ptr + len));
}
@ -76,14 +77,14 @@ function passStringToWasm0(arg, malloc, realloc) {
if (realloc === undefined) {
const buf = cachedTextEncoder.encode(arg);
const ptr = malloc(buf.length);
const ptr = malloc(buf.length) >>> 0;
getUint8Memory0().subarray(ptr, ptr + buf.length).set(buf);
WASM_VECTOR_LEN = buf.length;
return ptr;
}
let len = arg.length;
let ptr = malloc(len);
let ptr = malloc(len) >>> 0;
const mem = getUint8Memory0();
@ -99,7 +100,7 @@ function passStringToWasm0(arg, malloc, realloc) {
if (offset !== 0) {
arg = arg.slice(offset);
}
ptr = realloc(ptr, len, len = offset + arg.length * 3);
ptr = realloc(ptr, len, len = offset + arg.length * 3) >>> 0;
const view = getUint8Memory0().subarray(ptr + offset, ptr + len);
const ret = encodeString(arg, view);
@ -279,7 +280,7 @@ function handleError(f, args) {
wasm.__wbindgen_exn_store(addHeapObject(e));
}
}
function __wbg_adapter_586(arg0, arg1, arg2, arg3) {
function __wbg_adapter_584(arg0, arg1, arg2, arg3) {
wasm.wasm_bindgen__convert__closures__invoke2_mut__h125af29ab38d9781(arg0, arg1, addHeapObject(arg2), addHeapObject(arg3));
}
@ -288,6 +289,7 @@ function __wbg_adapter_586(arg0, arg1, arg2, arg3) {
class WebHandle {
static __wrap(ptr) {
ptr = ptr >>> 0;
const obj = Object.create(WebHandle.prototype);
obj.ptr = ptr;
@ -469,13 +471,6 @@ function getImports() {
imports.wbg.__wbg_warn_8b4e19d4032139f0 = function(arg0, arg1) {
console.warn(getStringFromWasm0(arg0, arg1));
};
imports.wbg.__wbg_error_e62b64b85c2bc545 = function(arg0, arg1) {
try {
console.error(getStringFromWasm0(arg0, arg1));
} finally {
wasm.__wbindgen_free(arg0, arg1);
}
};
imports.wbg.__wbg_new_40620131643ca1cf = function() {
const ret = new Error();
return addHeapObject(ret);
@ -1578,7 +1573,7 @@ function getImports() {
const a = state0.a;
state0.a = 0;
try {
return __wbg_adapter_586(a, state0.b, arg0, arg1);
return __wbg_adapter_584(a, state0.b, arg0, arg1);
} finally {
state0.a = a;
}
@ -1674,15 +1669,15 @@ function getImports() {
const ret = makeMutClosure(arg0, arg1, 981, __wbg_adapter_34);
return addHeapObject(ret);
};
imports.wbg.__wbindgen_closure_wrapper3275 = function(arg0, arg1, arg2) {
imports.wbg.__wbindgen_closure_wrapper3272 = function(arg0, arg1, arg2) {
const ret = makeClosure(arg0, arg1, 1143, __wbg_adapter_37);
return addHeapObject(ret);
};
imports.wbg.__wbindgen_closure_wrapper3277 = function(arg0, arg1, arg2) {
imports.wbg.__wbindgen_closure_wrapper3274 = function(arg0, arg1, arg2) {
const ret = makeClosure(arg0, arg1, 1143, __wbg_adapter_37);
return addHeapObject(ret);
};
imports.wbg.__wbindgen_closure_wrapper3320 = function(arg0, arg1, arg2) {
imports.wbg.__wbindgen_closure_wrapper3317 = function(arg0, arg1, arg2) {
const ret = makeMutClosure(arg0, arg1, 1166, __wbg_adapter_42);
return addHeapObject(ret);
};

BIN
docs/egui_demo_app_bg.wasm
View File

Binary file not shown.

7
scripts/setup_web.sh
View File

@ -5,4 +5,9 @@ cd "$script_path/.."
# Pre-requisites:
rustup target add wasm32-unknown-unknown
cargo install wasm-bindgen-cli --version 0.2.84
# For generating JS bindings:
# cargo install wasm-bindgen-cli --version 0.2.84
# We use a patched version containing this critical fix: https://github.com/rustwasm/wasm-bindgen/pull/3310
# See https://github.com/rerun-io/wasm-bindgen/commits/0.2.84-patch
cargo install wasm-bindgen-cli --git https://github.com/rerun-io/wasm-bindgen.git --rev 13283975ddf48c2d90758095e235b28d381c5762