mirror of
https://github.com/denoland/deno.git
synced 2024-12-22 15:24:46 -05:00
fix(core/js_errors): Get error's name and message from JS fields (#4808)
This commit is contained in:
Nayeem Rahman
GitHub
parent
5292d24e6f
commit
4e3532fe7b
2 changed files with 156 additions and 130 deletions
|
|
@ -1,10 +1,14 @@
|
|||
class CustomError extends Error {
|
||||
constructor(message: string) {
|
||||
super(message);
|
||||
constructor() {
|
||||
super();
|
||||
this.name = "CustomError";
|
||||
}
|
||||
|
||||
get message(): string {
|
||||
return "custom error";
|
||||
}
|
||||
}
|
||||
|
||||
const error = new CustomError("custom error");
|
||||
const error = new CustomError();
|
||||
console.log(error.stack);
|
||||
throw error;
|
||||
|
|
|
|||
|
|
@ -73,148 +73,170 @@ impl JSError {
|
|||
|
||||
let msg = v8::Exception::create_message(scope, exception);
|
||||
|
||||
let exception: Option<v8::Local<v8::Object>> =
|
||||
exception.clone().try_into().ok();
|
||||
let _ = exception.map(|e| get_property(scope, context, e, "stack"));
|
||||
let (message, frames, formatted_frames) = if exception.is_native_error() {
|
||||
// The exception is a JS Error object.
|
||||
let exception: v8::Local<v8::Object> =
|
||||
exception.clone().try_into().unwrap();
|
||||
|
||||
let maybe_call_sites = exception
|
||||
.and_then(|e| get_property(scope, context, e, "__callSiteEvals"));
|
||||
let maybe_call_sites: Option<v8::Local<v8::Array>> =
|
||||
maybe_call_sites.and_then(|a| a.try_into().ok());
|
||||
// Get the message by formatting error.name and error.message.
|
||||
let name = get_property(scope, context, exception, "name")
|
||||
.and_then(|m| m.to_string(scope))
|
||||
.map(|s| s.to_rust_string_lossy(scope))
|
||||
.unwrap_or_else(|| "undefined".to_string());
|
||||
let message_prop = get_property(scope, context, exception, "message")
|
||||
.and_then(|m| m.to_string(scope))
|
||||
.map(|s| s.to_rust_string_lossy(scope))
|
||||
.unwrap_or_else(|| "undefined".to_string());
|
||||
let message = format!("Uncaught {}: {}", name, message_prop);
|
||||
|
||||
let (frames, formatted_frames) = if let Some(call_sites) = maybe_call_sites
|
||||
{
|
||||
// Access error.stack to ensure that prepareStackTrace() has been called.
|
||||
// This should populate error.__callSiteEvals and error.__formattedFrames.
|
||||
let _ = get_property(scope, context, exception, "stack");
|
||||
|
||||
// Read an array of structured frames from error.__callSiteEvals.
|
||||
let frames_v8 =
|
||||
get_property(scope, context, exception, "__callSiteEvals");
|
||||
let frames_v8: Option<v8::Local<v8::Array>> =
|
||||
frames_v8.and_then(|a| a.try_into().ok());
|
||||
|
||||
// Read an array of pre-formatted frames from error.__formattedFrames.
|
||||
let formatted_frames_v8 =
|
||||
get_property(scope, context, exception, "__formattedFrames");
|
||||
let formatted_frames_v8: Option<v8::Local<v8::Array>> =
|
||||
formatted_frames_v8.and_then(|a| a.try_into().ok());
|
||||
|
||||
// Convert them into Vec<JSStack> and Vec<String> respectively.
|
||||
let mut frames: Vec<JSStackFrame> = vec![];
|
||||
let mut formatted_frames: Vec<String> = vec![];
|
||||
|
||||
let formatted_frames_v8 =
|
||||
get_property(scope, context, exception.unwrap(), "__formattedFrames");
|
||||
let formatted_frames_v8: v8::Local<v8::Array> = formatted_frames_v8
|
||||
.and_then(|a| a.try_into().ok())
|
||||
.expect("__formattedFrames should be defined if __callSiteEvals is.");
|
||||
|
||||
for i in 0..call_sites.length() {
|
||||
let call_site: v8::Local<v8::Object> = call_sites
|
||||
.get_index(scope, context, i)
|
||||
.unwrap()
|
||||
.try_into()
|
||||
.unwrap();
|
||||
let type_name: Option<v8::Local<v8::String>> =
|
||||
get_property(scope, context, call_site, "typeName")
|
||||
.unwrap()
|
||||
.try_into()
|
||||
.ok();
|
||||
let type_name = type_name.map(|s| s.to_rust_string_lossy(scope));
|
||||
let function_name: Option<v8::Local<v8::String>> =
|
||||
get_property(scope, context, call_site, "functionName")
|
||||
.unwrap()
|
||||
.try_into()
|
||||
.ok();
|
||||
let function_name =
|
||||
function_name.map(|s| s.to_rust_string_lossy(scope));
|
||||
let method_name: Option<v8::Local<v8::String>> =
|
||||
get_property(scope, context, call_site, "methodName")
|
||||
.unwrap()
|
||||
.try_into()
|
||||
.ok();
|
||||
let method_name = method_name.map(|s| s.to_rust_string_lossy(scope));
|
||||
let file_name: Option<v8::Local<v8::String>> =
|
||||
get_property(scope, context, call_site, "fileName")
|
||||
.unwrap()
|
||||
.try_into()
|
||||
.ok();
|
||||
let file_name = file_name.map(|s| s.to_rust_string_lossy(scope));
|
||||
let line_number: Option<v8::Local<v8::Integer>> =
|
||||
get_property(scope, context, call_site, "lineNumber")
|
||||
.unwrap()
|
||||
.try_into()
|
||||
.ok();
|
||||
let line_number = line_number.map(|n| n.value());
|
||||
let column_number: Option<v8::Local<v8::Integer>> =
|
||||
get_property(scope, context, call_site, "columnNumber")
|
||||
.unwrap()
|
||||
.try_into()
|
||||
.ok();
|
||||
let column_number = column_number.map(|n| n.value());
|
||||
let eval_origin: Option<v8::Local<v8::String>> =
|
||||
get_property(scope, context, call_site, "evalOrigin")
|
||||
.unwrap()
|
||||
.try_into()
|
||||
.ok();
|
||||
let eval_origin = eval_origin.map(|s| s.to_rust_string_lossy(scope));
|
||||
let is_top_level: Option<v8::Local<v8::Boolean>> =
|
||||
get_property(scope, context, call_site, "isTopLevel")
|
||||
.unwrap()
|
||||
.try_into()
|
||||
.ok();
|
||||
let is_top_level = is_top_level.map(|b| b.is_true());
|
||||
let is_eval: v8::Local<v8::Boolean> =
|
||||
get_property(scope, context, call_site, "isEval")
|
||||
if let (Some(frames_v8), Some(formatted_frames_v8)) =
|
||||
(frames_v8, formatted_frames_v8)
|
||||
{
|
||||
for i in 0..frames_v8.length() {
|
||||
let call_site: v8::Local<v8::Object> = frames_v8
|
||||
.get_index(scope, context, i)
|
||||
.unwrap()
|
||||
.try_into()
|
||||
.unwrap();
|
||||
let is_eval = is_eval.is_true();
|
||||
let is_native: v8::Local<v8::Boolean> =
|
||||
get_property(scope, context, call_site, "isNative")
|
||||
let type_name: Option<v8::Local<v8::String>> =
|
||||
get_property(scope, context, call_site, "typeName")
|
||||
.unwrap()
|
||||
.try_into()
|
||||
.ok();
|
||||
let type_name = type_name.map(|s| s.to_rust_string_lossy(scope));
|
||||
let function_name: Option<v8::Local<v8::String>> =
|
||||
get_property(scope, context, call_site, "functionName")
|
||||
.unwrap()
|
||||
.try_into()
|
||||
.ok();
|
||||
let function_name =
|
||||
function_name.map(|s| s.to_rust_string_lossy(scope));
|
||||
let method_name: Option<v8::Local<v8::String>> =
|
||||
get_property(scope, context, call_site, "methodName")
|
||||
.unwrap()
|
||||
.try_into()
|
||||
.ok();
|
||||
let method_name = method_name.map(|s| s.to_rust_string_lossy(scope));
|
||||
let file_name: Option<v8::Local<v8::String>> =
|
||||
get_property(scope, context, call_site, "fileName")
|
||||
.unwrap()
|
||||
.try_into()
|
||||
.ok();
|
||||
let file_name = file_name.map(|s| s.to_rust_string_lossy(scope));
|
||||
let line_number: Option<v8::Local<v8::Integer>> =
|
||||
get_property(scope, context, call_site, "lineNumber")
|
||||
.unwrap()
|
||||
.try_into()
|
||||
.ok();
|
||||
let line_number = line_number.map(|n| n.value());
|
||||
let column_number: Option<v8::Local<v8::Integer>> =
|
||||
get_property(scope, context, call_site, "columnNumber")
|
||||
.unwrap()
|
||||
.try_into()
|
||||
.ok();
|
||||
let column_number = column_number.map(|n| n.value());
|
||||
let eval_origin: Option<v8::Local<v8::String>> =
|
||||
get_property(scope, context, call_site, "evalOrigin")
|
||||
.unwrap()
|
||||
.try_into()
|
||||
.ok();
|
||||
let eval_origin = eval_origin.map(|s| s.to_rust_string_lossy(scope));
|
||||
let is_top_level: Option<v8::Local<v8::Boolean>> =
|
||||
get_property(scope, context, call_site, "isTopLevel")
|
||||
.unwrap()
|
||||
.try_into()
|
||||
.ok();
|
||||
let is_top_level = is_top_level.map(|b| b.is_true());
|
||||
let is_eval: v8::Local<v8::Boolean> =
|
||||
get_property(scope, context, call_site, "isEval")
|
||||
.unwrap()
|
||||
.try_into()
|
||||
.unwrap();
|
||||
let is_eval = is_eval.is_true();
|
||||
let is_native: v8::Local<v8::Boolean> =
|
||||
get_property(scope, context, call_site, "isNative")
|
||||
.unwrap()
|
||||
.try_into()
|
||||
.unwrap();
|
||||
let is_native = is_native.is_true();
|
||||
let is_constructor: v8::Local<v8::Boolean> =
|
||||
get_property(scope, context, call_site, "isConstructor")
|
||||
.unwrap()
|
||||
.try_into()
|
||||
.unwrap();
|
||||
let is_constructor = is_constructor.is_true();
|
||||
let is_async: v8::Local<v8::Boolean> =
|
||||
get_property(scope, context, call_site, "isAsync")
|
||||
.unwrap()
|
||||
.try_into()
|
||||
.unwrap();
|
||||
let is_async = is_async.is_true();
|
||||
let is_promise_all: v8::Local<v8::Boolean> =
|
||||
get_property(scope, context, call_site, "isPromiseAll")
|
||||
.unwrap()
|
||||
.try_into()
|
||||
.unwrap();
|
||||
let is_promise_all = is_promise_all.is_true();
|
||||
let promise_index: Option<v8::Local<v8::Integer>> =
|
||||
get_property(scope, context, call_site, "columnNumber")
|
||||
.unwrap()
|
||||
.try_into()
|
||||
.ok();
|
||||
let promise_index = promise_index.map(|n| n.value());
|
||||
frames.push(JSStackFrame {
|
||||
type_name,
|
||||
function_name,
|
||||
method_name,
|
||||
file_name,
|
||||
line_number,
|
||||
column_number,
|
||||
eval_origin,
|
||||
is_top_level,
|
||||
is_eval,
|
||||
is_native,
|
||||
is_constructor,
|
||||
is_async,
|
||||
is_promise_all,
|
||||
promise_index,
|
||||
});
|
||||
let formatted_frame: v8::Local<v8::String> = formatted_frames_v8
|
||||
.get_index(scope, context, i)
|
||||
.unwrap()
|
||||
.try_into()
|
||||
.unwrap();
|
||||
let is_native = is_native.is_true();
|
||||
let is_constructor: v8::Local<v8::Boolean> =
|
||||
get_property(scope, context, call_site, "isConstructor")
|
||||
.unwrap()
|
||||
.try_into()
|
||||
.unwrap();
|
||||
let is_constructor = is_constructor.is_true();
|
||||
let is_async: v8::Local<v8::Boolean> =
|
||||
get_property(scope, context, call_site, "isAsync")
|
||||
.unwrap()
|
||||
.try_into()
|
||||
.unwrap();
|
||||
let is_async = is_async.is_true();
|
||||
let is_promise_all: v8::Local<v8::Boolean> =
|
||||
get_property(scope, context, call_site, "isPromiseAll")
|
||||
.unwrap()
|
||||
.try_into()
|
||||
.unwrap();
|
||||
let is_promise_all = is_promise_all.is_true();
|
||||
let promise_index: Option<v8::Local<v8::Integer>> =
|
||||
get_property(scope, context, call_site, "columnNumber")
|
||||
.unwrap()
|
||||
.try_into()
|
||||
.ok();
|
||||
let promise_index = promise_index.map(|n| n.value());
|
||||
frames.push(JSStackFrame {
|
||||
type_name,
|
||||
function_name,
|
||||
method_name,
|
||||
file_name,
|
||||
line_number,
|
||||
column_number,
|
||||
eval_origin,
|
||||
is_top_level,
|
||||
is_eval,
|
||||
is_native,
|
||||
is_constructor,
|
||||
is_async,
|
||||
is_promise_all,
|
||||
promise_index,
|
||||
});
|
||||
let formatted_frame: v8::Local<v8::String> = formatted_frames_v8
|
||||
.get_index(scope, context, i)
|
||||
.unwrap()
|
||||
.try_into()
|
||||
.unwrap();
|
||||
let formatted_frame = formatted_frame.to_rust_string_lossy(scope);
|
||||
formatted_frames.push(formatted_frame)
|
||||
let formatted_frame = formatted_frame.to_rust_string_lossy(scope);
|
||||
formatted_frames.push(formatted_frame)
|
||||
}
|
||||
}
|
||||
(frames, formatted_frames)
|
||||
(message, frames, formatted_frames)
|
||||
} else {
|
||||
(vec![], vec![])
|
||||
// The exception is not a JS Error object.
|
||||
// Get the message given by V8::Exception::create_message(), and provide
|
||||
// empty frames.
|
||||
(msg.get(scope).to_rust_string_lossy(scope), vec![], vec![])
|
||||
};
|
||||
|
||||
Self {
|
||||
message: msg.get(scope).to_rust_string_lossy(scope),
|
||||
message,
|
||||
script_resource_name: msg
|
||||
.get_script_resource_name(scope)
|
||||
.and_then(|v| v8::Local::<v8::String>::try_from(v).ok())
|
||||
|
|
|
|||
Loading…
Reference in a new issue