Skip to content
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

Jump to bottom

fix(napi): functions related to errors #17370

Merged
merged 19 commits into from
Jan 15, 2023
Merged

fix(napi): functions related to errors #17370

Changes from 1 commit
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
8357cc2
wip, some tests working
bartlomieju Jan 12, 2023
c66e8d9
wip
bartlomieju Jan 12, 2023
aab8165
finish tests
bartlomieju Jan 12, 2023
03e5dc4
add cstr! macro
bartlomieju Jan 12, 2023
3e0ac45
more apis
bartlomieju Jan 12, 2023
13a2d3a
napi_clear_last_error
bartlomieju Jan 12, 2023
cfcd1c4
add check env
bartlomieju Jan 13, 2023
46b85a1
add napi_to_v8
bartlomieju Jan 13, 2023
8c660eb
check_new_from_utf8
bartlomieju Jan 13, 2023
4fdb06f
use cstr!
bartlomieju Jan 13, 2023
4c989c5
use more return_status_if_false
bartlomieju Jan 13, 2023
b4ce5d3
use more cstr
bartlomieju Jan 13, 2023
3e96ad3
Merge branch 'main' into napi_error_tests
bartlomieju Jan 13, 2023
7892c7c
some lints
bartlomieju Jan 13, 2023
90d3dc9
use qualifier
bartlomieju Jan 13, 2023
4470e3a
Merge branch 'main' into napi_error_tests
bartlomieju Jan 14, 2023
fd20551
napi_value_unchecked
bartlomieju Jan 14, 2023
b0a1b7a
borrow mut error
bartlomieju Jan 14, 2023
5d3a065
simplify macros
bartlomieju Jan 14, 2023
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
Prev Previous commit
Next Next commit
check_new_from_utf8
  • Loading branch information
@bartlomieju
bartlomieju committed Jan 13, 2023
commit 8c660eb9d4d006b0307ca59dd149ec5c6159862a
165 changes: 95 additions & 70 deletions cli/napi/js_native_api.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,62 @@ macro_rules! check_env {
#[macro_export]
macro_rules! napi_to_v8 {
($val: ident) => {
transmute::<napi_value, v8::Local<v8::Value>>($val)
unsafe { transmute::<napi_value, v8::Local<v8::Value>>($val) }
};
}

#[macro_export]
macro_rules! return_status_if_false {
($env: expr, $condition: expr, $status: ident) => {
if !$condition {
return Err(
crate::napi::js_native_api::napi_set_last_error(
$env,
$status,
0,
std::ptr::null_mut(),
)
.into(),
);
}
};
}

#[macro_export]
macro_rules! check_new_from_utf8_len {
($env: expr, $result: expr, $str: expr, $len: expr) => {
return_status_if_false!(
$env,
($len == NAPI_AUTO_LENGTH) || $len <= INT_MAX as _,
napi_invalid_arg
);
return_status_if_false!($env, $str != std::ptr::null(), napi_invalid_arg);
let string = if $len == NAPI_AUTO_LENGTH {
let result = std::ffi::CStr::from_ptr($str as *const _).to_str();
return_status_if_false!($env, result.is_ok(), napi_generic_failure);
result.unwrap()
} else {
let string = std::slice::from_raw_parts($str, $len);
let result = std::str::from_utf8(string);
return_status_if_false!($env, result.is_ok(), napi_generic_failure);
result.unwrap()
};
let env = unsafe { &mut *$env };
let result = v8::String::new(&mut env.scope(), string);
return_status_if_false!($env, result.is_some(), napi_generic_failure);
$result = result.unwrap();
};
}

#[macro_export]
macro_rules! check_new_from_utf8 {
($env: expr, $result: expr, $str: expr) => {
check_new_from_utf8_len!(
$env,
$result,
$str as *const u8,
NAPI_AUTO_LENGTH
);
};
}

Expand All @@ -44,33 +99,13 @@ macro_rules! status_call {
#[macro_export]
macro_rules! check_arg {
($env: expr, $ptr: expr) => {
if $ptr.is_null() {
return Err(
crate::napi::js_native_api::napi_set_last_error(
$env,
napi_invalid_arg,
0,
std::ptr::null_mut(),
)
.into(),
);
}
crate::return_status_if_false!($env, !$ptr.is_null(), napi_invalid_arg);
};
}

macro_rules! check_arg_option {
($env: expr, $ptr: expr) => {
if $ptr.is_none() {
return Err(
crate::napi::js_native_api::napi_set_last_error(
$env,
napi_invalid_arg,
0,
std::ptr::null_mut(),
)
.into(),
);
}
($env: expr, $opt: expr) => {
crate::return_status_if_false!($env, $opt.is_some(), napi_invalid_arg);
};
}

Expand Down Expand Up @@ -371,7 +406,7 @@ fn set_error_code(
let err_object: v8::Local<v8::Object> = error.try_into().unwrap();

let code_value: v8::Local<v8::Value> = if code.is_some() {
let mut code_value = unsafe { napi_to_v8!(code) };
let mut code_value = napi_to_v8!(code);

if !code_value.is_string() {
return napi_string_expected;
Expand Down Expand Up @@ -410,11 +445,12 @@ fn napi_create_error(
check_arg!(env, result);
let env = unsafe { &mut *env };

let mut message_value = unsafe { napi_to_v8!(msg) };
// TODO: store last error here
if !message_value.is_string() {
return Err(Error::StringExpected);
}
let mut message_value = napi_to_v8!(msg);
return_status_if_false!(
env,
message_value.is_string(),
napi_string_expected
);

let scope = &mut env.scope();
let error_obj =
Expand All @@ -439,11 +475,12 @@ fn napi_create_type_error(
check_arg!(env, result);
let env = unsafe { &mut *env };

let mut message_value = unsafe { napi_to_v8!(msg) };
// TODO: store last error here
if !message_value.is_string() {
return Err(Error::StringExpected);
}
let mut message_value = napi_to_v8!(msg);
return_status_if_false!(
env,
message_value.is_string(),
napi_string_expected
);
let scope = &mut env.scope();
let error_obj =
v8::Exception::type_error(scope, message_value.try_into().unwrap());
Expand All @@ -467,12 +504,12 @@ fn napi_create_range_error(
check_arg!(env, result);
let env = unsafe { &mut *env };

let mut message_value = unsafe { napi_to_v8!(msg) };
// TODO: store last error here
if !message_value.is_string() {
return Err(Error::StringExpected);
}

let mut message_value = napi_to_v8!(msg);
return_status_if_false!(
env,
message_value.is_string(),
napi_string_expected
);
let scope = &mut env.scope();
let error_obj =
v8::Exception::range_error(scope, message_value.try_into().unwrap());
Expand Down Expand Up @@ -1014,6 +1051,7 @@ fn napi_get_value_double(
check_env!(env);
let env = unsafe { &mut *env };
let value = napi_to_v8!(value);
return_status_if_false!(env, value.is_number(), napi_number_expected);
*result = value.number_value(&mut env.scope()).unwrap();
Ok(())
}
Expand Down Expand Up @@ -2381,23 +2419,18 @@ fn napi_throw_error(

{
check_env!(env);
let env = unsafe { &mut *env };
let str_: v8::Local<v8::String>;
check_new_from_utf8!(env, str_, msg);

let env = unsafe { &mut *env };
let scope = &mut env.scope();
// TODO(bartlomieju): graceful handling of strings here
let msg = CStr::from_ptr(msg).to_str().unwrap();
let msg = v8::String::new(scope, msg).unwrap();

let error = v8::Exception::error(scope, msg);
let status = set_error_code(
let error = v8::Exception::error(scope, str_);
status_call!(set_error_code(
bartlomieju marked this conversation as resolved.
Show resolved Hide resolved
scope,
error,
transmute::<*mut (), napi_value>(std::ptr::null_mut()),
code,
);
if status != napi_ok {
return Err(status.into());
}
));

scope.throw_exception(error);
}
Expand All @@ -2415,21 +2448,17 @@ fn napi_throw_range_error(

{
check_env!(env);
let str_: v8::Local<v8::String>;
check_new_from_utf8!(env, str_, msg);
let env = unsafe { &mut *env };
let scope = &mut env.scope();
// TODO(bartlomieju): graceful handling of strings here
let msg = CStr::from_ptr(msg).to_str().unwrap();
let msg = v8::String::new(scope, msg).unwrap();
let error = v8::Exception::range_error(scope, msg);
let status = set_error_code(
let error = v8::Exception::range_error(scope, str_);
status_call!(set_error_code(
scope,
error,
transmute::<*mut (), napi_value>(std::ptr::null_mut()),
code,
);
if status != napi_ok {
return Err(status.into());
}
));
scope.throw_exception(error);
}
napi_clear_last_error(env);
Expand All @@ -2446,21 +2475,17 @@ fn napi_throw_type_error(

{
check_env!(env);
let str_: v8::Local<v8::String>;
check_new_from_utf8!(env, str_, msg);
let env = unsafe { &mut *env };
// TODO(bartlomieju): graceful handling of strings here
let scope = &mut env.scope();
let msg = CStr::from_ptr(msg).to_str().unwrap();
let msg = v8::String::new(scope, msg).unwrap();
let error = v8::Exception::type_error(scope, msg);
let status = set_error_code(
let error = v8::Exception::type_error(scope, str_);
status_call!(set_error_code(
scope,
error,
transmute::<*mut (), napi_value>(std::ptr::null_mut()),
code,
);
if status != napi_ok {
return Err(status.into());
}
));
scope.throw_exception(error);
}
napi_clear_last_error(env);
Expand Down