archive-gh-me/napi-rs
1
0
Fork 0
mirror of https://github.com/napi-rs/napi-rs.git synced 2025-12-08 19:56:07 +00:00
Code Issues Projects Releases Wiki Activity

fix(napi): PromiseRaw throw error logic (#2187)

Browse Source
This commit is contained in:
LongYinan 2024-07-14 23:28:36 +08:00 committed by GitHub
parent 13c18388f5
commit 54ec4897ea
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
crates/napi/src/bindgen_runtime/js_values/promise_raw.rs
View File

@ -1,4 +1,4 @@
use std::ffi::{CStr, CString};
use std::ffi::CStr;
use std::marker::PhantomData;
use std::ptr;
@ -239,6 +239,7 @@ pub(crate) fn validate_promise(
unsafe { crate::sys::napi_create_promise(env, &mut deferred, &mut promise) },
"Failed to create promise"
)?;
const INVALID_ARG: &[u8; 11] = b"InvalidArg\0";
let mut err = ptr::null_mut();
let mut code = ptr::null_mut();
let mut message = ptr::null_mut();
@ -246,7 +247,7 @@ pub(crate) fn validate_promise(
unsafe {
crate::sys::napi_create_string_utf8(
env,
CStr::from_bytes_with_nul_unchecked(b"InvalidArg\0").as_ptr(),
CStr::from_bytes_with_nul_unchecked(INVALID_ARG).as_ptr(),
10,
&mut code,
)
@ -434,20 +435,25 @@ impl<T: ToNapiValue> ToNapiValue for CallbackContext<T> {
#[inline(never)]
fn throw_error(env: sys::napi_env, err: Error, default_msg: &str) -> sys::napi_value {
const GENERIC_FAILURE: &str = "GenericFailure\0";
let code = if err.status.as_ref().is_empty() {
CString::new(Status::GenericFailure.as_ref())
GENERIC_FAILURE
} else {
CString::new(err.status.as_ref())
}
.map(|s| s.as_ptr())
.unwrap_or(ptr::null_mut());
err.status.as_ref()
};
let mut code_string = ptr::null_mut();
let msg = if err.reason.is_empty() {
CString::new(default_msg)
default_msg
} else {
CString::new(err.reason)
}
.map(|s| s.as_ptr())
.unwrap_or(ptr::null_mut());
unsafe { sys::napi_throw_error(env, code, msg) };
err.reason.as_ref()
};
let mut msg_string = ptr::null_mut();
let mut err = ptr::null_mut();
unsafe {
sys::napi_create_string_latin1(env, code.as_ptr().cast(), code.len(), &mut code_string);
sys::napi_create_string_utf8(env, msg.as_ptr().cast(), msg.len(), &mut msg_string);
sys::napi_create_error(env, code_string, msg_string, &mut err);
sys::napi_throw(env, err);
};
ptr::null_mut()
}