Skip to content

Commit

Permalink
fix(napi): return node globalThis from napi_get_global (denoland#17613)
Browse files Browse the repository at this point in the history
  • Loading branch information
littledivy committed Feb 1, 2023
1 parent 1b46b2f commit 524bccd
Show file tree
Hide file tree
Showing 7 changed files with 68 additions and 6 deletions.
8 changes: 4 additions & 4 deletions cli/napi/js_native_api.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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(())
}

Expand Down
5 changes: 5 additions & 0 deletions ext/napi/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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 {}
Expand All @@ -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<
Expand All @@ -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,
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion ext/node/02_require.js
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
6 changes: 5 additions & 1 deletion test_napi/common.js
Original file line number Diff line number Diff line change
Expand Up @@ -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 changes: 12 additions & 0 deletions test_napi/env_test.js
Original file line number Diff line number Diff line change
@@ -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 changes: 39 additions & 0 deletions test_napi/src/env.rs
Original file line number Diff line number Diff line change
@@ -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()
));
}
2 changes: 2 additions & 0 deletions test_napi/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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);
Expand Down

0 comments on commit 524bccd

Please sign in to comment.