1
0
Fork 0
mirror of https://github.com/denoland/deno.git synced 2024-11-21 15:04:11 -05:00

fix(napi): return node globalThis from napi_get_global (#17613)

Fixes https://github.com/denoland/deno/issues/17587
This commit is contained in:
Divy Srivastava 2023-02-01 06:41:04 -08:00 committed by GitHub
parent 1b46b2f0e4
commit 524bccdf6a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 68 additions and 6 deletions

View file

@ -1718,12 +1718,12 @@ fn napi_get_element(
#[napi_sym::napi_sym]
fn napi_get_global(env: *mut Env, result: *mut napi_value) -> Result {
check_env!(env);
let env = unsafe { &mut *env };
check_arg!(env, result);
let context = &mut env.scope().get_current_context();
let global = context.global(&mut env.scope());
let value: v8::Local<v8::Value> = global.into();
let value: v8::Local<v8::Value> =
transmute::<NonNull<v8::Value>, v8::Local<v8::Value>>((*env).global);
*result = value.into();
napi_clear_last_error(env);
Ok(())
}

View file

@ -418,6 +418,7 @@ pub struct Env {
Rc<RefCell<Vec<(extern "C" fn(*const c_void), *const c_void)>>>,
pub tsfn_ref_counters: Arc<Mutex<ThreadsafeFunctionRefCounters>>,
pub last_error: napi_extended_error_info,
pub global: NonNull<v8::Value>,
}
unsafe impl Send for Env {}
@ -427,6 +428,7 @@ impl Env {
pub fn new(
isolate_ptr: *mut v8::OwnedIsolate,
context: v8::Global<v8::Context>,
global: v8::Global<v8::Value>,
sender: mpsc::UnboundedSender<PendingNapiAsyncWork>,
threadsafe_function_sender: mpsc::UnboundedSender<ThreadSafeFunctionStatus>,
cleanup_hooks: Rc<
@ -446,6 +448,7 @@ impl Env {
Self {
isolate_ptr,
context: context.into_raw(),
global: global.into_raw(),
shared: std::ptr::null_mut(),
open_handle_scopes: 0,
async_work_sender: sender,
@ -602,6 +605,7 @@ fn op_napi_open<NP, 'scope>(
scope: &mut v8::HandleScope<'scope>,
op_state: &mut OpState,
path: String,
global: serde_v8::Value,
) -> std::result::Result<serde_v8::Value<'scope>, AnyError>
where
NP: NapiPermissions + 'static,
@ -644,6 +648,7 @@ where
let mut env = Env::new(
isolate_ptr,
v8::Global::new(scope, ctx),
v8::Global::new(scope, global.v8_value),
async_work_sender,
tsfn_sender,
cleanup_hooks,

View file

@ -804,7 +804,7 @@
if (filename.endsWith("fsevents.node")) {
throw new Error("Using fsevents module is currently not supported");
}
module.exports = ops.op_napi_open(filename);
module.exports = ops.op_napi_open(filename, node.globalThis);
};
function createRequireFromPath(filename) {

View file

@ -17,5 +17,9 @@ const [libPrefix, libSuffix] = {
export function loadTestLibrary() {
const specifier = `${targetDir}/${libPrefix}test_napi.${libSuffix}`;
return Deno[Deno.internal].core.ops.op_napi_open(specifier); // Internal, used in ext/node
// Internal, used in ext/node
return Deno[Deno.internal].core.ops.op_napi_open(specifier, {
Buffer: {},
});
}

12
test_napi/env_test.js Normal file
View file

@ -0,0 +1,12 @@
// Copyright 2018-2023 the Deno authors. All rights reserved. MIT license.
import { assert, loadTestLibrary } from "./common.js";
const env = loadTestLibrary();
Deno.test("napi get global", function () {
const g = env.testNodeGlobal();
// Note: global is a mock object in the tests.
// See common.js
assert(g.Buffer);
});

39
test_napi/src/env.rs Normal file
View file

@ -0,0 +1,39 @@
// Copyright 2018-2023 the Deno authors. All rights reserved. MIT license.
use crate::assert_napi_ok;
use crate::napi_get_callback_info;
use crate::napi_new_property;
use napi_sys::*;
extern "C" fn get_node_global(
env: napi_env,
info: napi_callback_info,
) -> napi_value {
let (_, argc, _) = napi_get_callback_info!(env, info, 0);
assert_eq!(argc, 0);
let mut result: napi_value = std::ptr::null_mut();
assert_napi_ok!(napi_get_global(env, &mut result));
let mut r1: napi_value = std::ptr::null_mut();
assert_napi_ok!(napi_get_named_property(
env,
result,
"Buffer\0".as_ptr() as _,
&mut r1
));
result
}
pub fn init(env: napi_env, exports: napi_value) {
let properties =
&[napi_new_property!(env, "testNodeGlobal", get_node_global)];
assert_napi_ok!(napi_define_properties(
env,
exports,
properties.len(),
properties.as_ptr()
));
}

View file

@ -12,6 +12,7 @@ pub mod r#async;
pub mod callback;
pub mod coerce;
pub mod date;
pub mod env;
pub mod error;
pub mod mem;
pub mod numbers;
@ -143,6 +144,7 @@ unsafe extern "C" fn napi_register_module_v1(
typedarray::init(env, exports);
arraybuffer::init(env, exports);
array::init(env, exports);
env::init(env, exports);
error::init(env, exports);
primitives::init(env, exports);
properties::init(env, exports);