Skip to content

[WASM] Make panic errors available from JS #532

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Feb 24, 2019
Merged

[WASM] Make panic errors available from JS #532

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
878c131
Make panic errors available and display them nicely for the demo
coolreader18 Feb 23, 2019
9a7bb31
Merge branch 'master' into wasm-better-panic
coolreader18 Feb 24, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions wasm/demo/src/main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,12 @@ function runCodeFromTextarea() {
if (result !== null) {
consoleElement.value += `\n${result}\n`;
}
} catch (e) {
errorElement.textContent = e;
console.error(e);
} catch (err) {
if (err instanceof WebAssembly.RuntimeError) {
err = window.__RUSTPYTHON_ERROR || err;
}
errorElement.textContent = err;
console.error(err);
}
}

Expand All @@ -61,4 +64,5 @@ snippets.addEventListener('change', () => {
runCodeFromTextarea();
});

runCodeFromTextarea(); // Run once for demo
// Run once for demo
runCodeFromTextarea();
21 changes: 19 additions & 2 deletions wasm/lib/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,17 +12,34 @@ extern crate wasm_bindgen_futures;
extern crate web_sys;

use js_sys::{Object, Reflect, TypeError};
use std::panic;
use wasm_bindgen::prelude::*;

pub use crate::vm_class::*;

const PY_EVAL_VM_ID: &str = "__py_eval_vm";

extern crate console_error_panic_hook;
fn panic_hook(info: &panic::PanicInfo) {
// If something errors, just ignore it; we don't want to panic in the panic hook
use js_sys::WebAssembly::RuntimeError;
let window = match web_sys::window() {
Some(win) => win,
None => return,
};
let msg = &info.to_string();
let _ = Reflect::set(&window, &"__RUSTPYTHON_ERROR_MSG".into(), &msg.into());
let error = RuntimeError::new(&msg);
let _ = Reflect::set(&window, &"__RUSTPYTHON_ERROR".into(), &error);
let stack = match Reflect::get(&error, &"stack".into()) {
Ok(stack) => stack,
Err(_) => return,
};
let _ = Reflect::set(&window, &"__RUSTPYTHON_ERROR_STACK".into(), &stack.into());
}

#[wasm_bindgen(start)]
pub fn setup_console_error() {
std::panic::set_hook(Box::new(console_error_panic_hook::hook));
std::panic::set_hook(Box::new(panic_hook));
}

// Hack to comment out wasm-bindgen's generated typescript definitons
Expand Down