foster/denoland-deno
1
0
Fork 0
mirror of https://github.com/denoland/deno.git synced 2024-11-24 15:19:26 -05:00
Code Issues Packages 1 Wiki Activity

refactor(core): add more information when unable to build error (#17027)

Browse source 
This should help debug problem in
https://github.com/denoland/deno/issues/16963
This commit is contained in:
Bartek Iwańczuk 2022-12-13 22:59:21 +01:00 committed by GitHub
parent 878590b773
commit 3551955b63
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 30 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
core/01_core.js
View file

@ -129,7 +129,14 @@
} }
function buildCustomError(className, message, code) { function buildCustomError(className, message, code) {
const error = errorMap[className]?.(message); let error;
try {
error = errorMap[className]?.(message);
} catch (e) {
throw new Error(
`Unsable to build custom error for "${className}"\n ${e.message}`,
);
}
// Strip buildCustomError() calls from stack trace // Strip buildCustomError() calls from stack trace
if (typeof error == "object") { if (typeof error == "object") {
ErrorCaptureStackTrace(error, buildCustomError); ErrorCaptureStackTrace(error, buildCustomError);

32
core/error.rs
View file

@ -97,23 +97,35 @@ pub fn to_v8_error<'a>(
get_class: GetErrorClassFn, get_class: GetErrorClassFn,
error: &Error, error: &Error,
) -> v8::Local<'a, v8::Value> { ) -> v8::Local<'a, v8::Value> {
let cb = JsRuntime::state(scope) let tc_scope = &mut v8::TryCatch::new(scope);
let cb = JsRuntime::state(tc_scope)
.borrow() .borrow()
.js_build_custom_error_cb .js_build_custom_error_cb
.clone() .clone()
.expect("Custom error builder must be set"); .expect("Custom error builder must be set");
let cb = cb.open(scope); let cb = cb.open(tc_scope);
let this = v8::undefined(scope).into(); let this = v8::undefined(tc_scope).into();
let class = v8::String::new(scope, get_class(error)).unwrap(); let class = v8::String::new(tc_scope, get_class(error)).unwrap();
let message = v8::String::new(scope, &format!("{:#}", error)).unwrap(); let message = v8::String::new(tc_scope, &format!("{:#}", error)).unwrap();
let mut args = vec![class.into(), message.into()]; let mut args = vec![class.into(), message.into()];
if let Some(code) = crate::error_codes::get_error_code(error) { if let Some(code) = crate::error_codes::get_error_code(error) {
args.push(v8::String::new(scope, code).unwrap().into()); args.push(v8::String::new(tc_scope, code).unwrap().into());
}
let maybe_exception = cb.call(tc_scope, this, &args);
match maybe_exception {
Some(exception) => exception,
None => {
let mut msg =
"Custom error class must have a builder registered".to_string();
if tc_scope.has_caught() {
let e = tc_scope.exception().unwrap();
let js_error = JsError::from_v8_exception(tc_scope, e);
msg = format!("{}: {}", msg, js_error.exception_message);
}
panic!("{}", msg);
}
} }
let exception = cb
.call(scope, this, &args)
.expect("Custom error class must have a builder registered");
exception
} }
/// A `JsError` represents an exception coming from V8, with stack frames and /// A `JsError` represents an exception coming from V8, with stack frames and