5 files changed, 86 insertions, 8 deletions

diff --git a/test_napi/cleanup_hook_test.js b/test_napi/cleanup_hook_test.js
new file mode 100644
index 000000000..30ceae470
--- /dev/null
+++ b/test_napi/cleanup_hook_test.js
@@ -0,0 +1,33 @@
+// Copyright 2018-2023 the Deno authors. All rights reserved. MIT license.
+
+import { assertEquals, loadTestLibrary } from "./common.js";
+
+const properties = loadTestLibrary();
+
+if (import.meta.main) {
+  properties.installCleanupHook();
+  console.log("installed cleanup hook");
+} else {
+  Deno.test("napi cleanup hook", async () => {
+    const { stdout, stderr, code } = await new Deno.Command(Deno.execPath(), {
+      args: [
+        "run",
+        "--allow-read",
+        "--allow-run",
+        "--allow-ffi",
+        "--unstable",
+        import.meta.url,
+      ],
+    }).output();
+
+    assertEquals(code, 0);
+    assertEquals(new TextDecoder().decode(stderr), "");
+
+    const stdoutText = new TextDecoder().decode(stdout);
+    const stdoutLines = stdoutText.split("\n");
+    assertEquals(stdoutLines.length, 4);
+    assertEquals(stdoutLines[0], "installed cleanup hook");
+    assertEquals(stdoutLines[1], "cleanup(18)");
+    assertEquals(stdoutLines[2], "cleanup(42)");
+  });
+}
diff --git a/test_napi/src/arraybuffer.rs b/test_napi/src/arraybuffer.rs
index ce50f914f..6765df481 100644
--- a/test_napi/src/arraybuffer.rs
+++ b/test_napi/src/arraybuffer.rs
@@ -2,7 +2,6 @@
 
 use napi_sys::Status::napi_ok;
 use napi_sys::*;
-use std::ptr;
 
 extern "C" fn test_detached(
   env: napi_env,
diff --git a/test_napi/src/lib.rs b/test_napi/src/lib.rs
index 0bdea0280..3ab1f3c84 100644
--- a/test_napi/src/lib.rs
+++ b/test_napi/src/lib.rs
@@ -2,6 +2,9 @@
 #![allow(clippy::all)]
 #![allow(clippy::undocumented_unsafe_blocks)]
 
+use napi_sys::Status::napi_ok;
+use std::ffi::c_void;
+
 use napi_sys::*;
 
 pub mod array;
@@ -20,9 +23,9 @@ pub mod typedarray;
 #[macro_export]
 macro_rules! get_callback_info {
   ($env: expr, $callback_info: expr, $size: literal) => {{
-    let mut args = [ptr::null_mut(); $size];
+    let mut args = [std::ptr::null_mut(); $size];
     let mut argc = $size;
-    let mut this = ptr::null_mut();
+    let mut this = std::ptr::null_mut();
     unsafe {
       assert!(
         napi_get_cb_info(
@@ -31,7 +34,7 @@ macro_rules! get_callback_info {
           &mut argc,
           args.as_mut_ptr(),
           &mut this,
-          ptr::null_mut(),
+          std::ptr::null_mut(),
         ) == napi_ok,
       )
     };
@@ -44,17 +47,58 @@ macro_rules! new_property {
   ($env: expr, $name: expr, $value: expr) => {
     napi_property_descriptor {
       utf8name: $name.as_ptr() as *const std::os::raw::c_char,
-      name: ptr::null_mut(),
+      name: std::ptr::null_mut(),
       method: Some($value),
       getter: None,
       setter: None,
-      data: ptr::null_mut(),
+      data: std::ptr::null_mut(),
       attributes: 0,
-      value: ptr::null_mut(),
+      value: std::ptr::null_mut(),
     }
   };
 }
 
+extern "C" fn cleanup(arg: *mut c_void) {
+  println!("cleanup({})", arg as i64);
+}
+
+static SECRET: i64 = 42;
+static WRONG_SECRET: i64 = 17;
+static THIRD_SECRET: i64 = 18;
+
+extern "C" fn install_cleanup_hook(
+  env: napi_env,
+  info: napi_callback_info,
+) -> napi_value {
+  let (_args, argc, _) = get_callback_info!(env, info, 1);
+  assert_eq!(argc, 0);
+
+  unsafe {
+    napi_add_env_cleanup_hook(env, Some(cleanup), WRONG_SECRET as *mut c_void);
+    napi_add_env_cleanup_hook(env, Some(cleanup), SECRET as *mut c_void);
+    napi_add_env_cleanup_hook(env, Some(cleanup), THIRD_SECRET as *mut c_void);
+    napi_remove_env_cleanup_hook(
+      env,
+      Some(cleanup),
+      WRONG_SECRET as *mut c_void,
+    );
+  }
+
+  std::ptr::null_mut()
+}
+
+pub fn init_cleanup_hook(env: napi_env, exports: napi_value) {
+  let properties = &[new_property!(
+    env,
+    "installCleanupHook\0",
+    install_cleanup_hook
+  )];
+
+  unsafe {
+    napi_define_properties(env, exports, properties.len(), properties.as_ptr())
+  };
+}
+
 #[no_mangle]
 unsafe extern "C" fn napi_register_module_v1(
   env: napi_env,
@@ -77,6 +121,7 @@ unsafe extern "C" fn napi_register_module_v1(
   object_wrap::init(env, exports);
   callback::init(env, exports);
   r#async::init(env, exports);
+  init_cleanup_hook(env, exports);
 
   exports
 }
diff --git a/test_napi/src/strings.rs b/test_napi/src/strings.rs
index 5029944da..af6f84189 100644
--- a/test_napi/src/strings.rs
+++ b/test_napi/src/strings.rs
@@ -3,7 +3,6 @@
 use napi_sys::Status::napi_ok;
 use napi_sys::ValueType::napi_string;
 use napi_sys::*;
-use std::ptr;
 
 extern "C" fn test_utf8(env: napi_env, info: napi_callback_info) -> napi_value {
   let (args, argc, _) = crate::get_callback_info!(env, info, 1);
diff --git a/test_napi/tests/napi_tests.rs b/test_napi/tests/napi_tests.rs
index 1c0f59fdf..3351d74c1 100644
--- a/test_napi/tests/napi_tests.rs
+++ b/test_napi/tests/napi_tests.rs
@@ -30,6 +30,7 @@ fn napi_tests() {
     .arg("--allow-read")
     .arg("--allow-env")
     .arg("--allow-ffi")
+    .arg("--allow-run")
     .arg("--unstable")
     .spawn()
     .unwrap()
@@ -37,6 +38,7 @@ fn napi_tests() {
     .unwrap();
   let stdout = std::str::from_utf8(&output.stdout).unwrap();
   let stderr = std::str::from_utf8(&output.stderr).unwrap();
+
   if !output.status.success() {
     println!("stdout {}", stdout);
     println!("stderr {}", stderr);