fix(napi): resuse threads worker on Node.js (#2399)

Author: Brooooooklyn

.cargo/config.toml

@@ -1,2 +1,7 @@
 [target.'cfg(target_family = "wasm")']
-rustflags = ["-C", "target-feature=+atomics,+bulk-memory"]
+rustflags = [
+  "--cfg",
+  "tokio_unstable",
+  "-C",
+  "target-feature=+atomics,+bulk-memory",
+]

.github/workflows/test-release.yaml

@@ -153,7 +153,7 @@ jobs:
       - name: 'Install dependencies'
         shell: bash
         run: |
-          yarn config set supportedArchitectures.cpu --json '["current", "x64", "x86"]'
+          yarn config set supportedArchitectures.cpu --json '["current", "x64", "ia32", "wasm32"]'
           yarn install --mode=skip-build --immutable
 
       - name: Check build

.yarnrc.yml

@@ -1,3 +1,8 @@
 nodeLinker: node-modules
 
 yarnPath: .yarn/releases/yarn-4.5.3.cjs
+
+supportedArchitectures:
+  cpu:
+    - current
+    - wasm32

cli/cli.mjs

@@ -5,7 +5,7 @@ import { resolve } from 'path'
 import { fileURLToPath } from 'url'
 
 execSync(
-  `node --loader ts-node/esm/transpile-only ${resolve(
+  `node --import @oxc-node/core/register ${resolve(
     fileURLToPath(import.meta.url),
     '../src/cli.ts',
   )} ${process.argv.slice(2).join(' ')}`,

cli/esbuild.mjs

@@ -1,9 +1,9 @@
-import * as esbuild from 'esbuild'
+import { build} from 'esbuild'
 import { pull } from 'lodash-es'
 
 import packageJson from './package.json' assert { type: 'json' }
 
-await esbuild.build({
+await build({
   entryPoints: ['./dist/index.js'],
   outfile: './dist/index.cjs',
   bundle: true,

cli/src/api/templates/load-wasi-template.ts

@@ -15,7 +15,7 @@ const __wasi = new __WASI({
   fs: __fs,
   preopens: {
     '/': '/',
-  }
+  },
 })`
     : `
 const __wasi = new __WASI({
@@ -147,11 +147,11 @@ const { instance: __napiInstance, module: __wasiModule, napiModule: __napiModule
       return 4
     }
   })(),
+  reuseWorker: true,
   wasi: __wasi,
   onCreateWorker() {
     const worker = new Worker(__nodePath.join(__dirname, 'wasi-worker.mjs'), {
       env: process.env,
-      execArgv: ['--experimental-wasi-unstable-preview1'],
     })
     worker.onmessage = ({ data }) => {
       __wasmCreateOnMessageForFsProxy(__nodeFs)(data)

crates/backend/src/codegen/fn.rs

@@ -79,7 +79,7 @@ impl TryToTokens for NapiFn {
 
           #(#refs)*
 
-          #[cfg(debug_assert)]
+          #[cfg(debug_assertions)]
           {
               for a in &_args_array {
                 assert!(!a.is_null(), "failed to initialize napi ref");

crates/build/src/wasi.rs

@@ -25,4 +25,9 @@ pub fn setup() {
     println!("cargo:rustc-link-search={setjmp_link_dir}");
     println!("cargo:rustc-link-lib=static=setjmp-mt");
   }
+  if let Ok(wasi_sdk_path) = env::var("WASI_SDK_PATH") {
+    println!(
+      "cargo:rustc-link-search={wasi_sdk_path}/share/wasi-sysroot/lib/wasm32-wasip1-threads"
+    );
+  }
 }

crates/napi/src/bindgen_runtime/module_register.rs

@@ -6,12 +6,6 @@ use std::ffi::CStr;
 use std::mem::MaybeUninit;
 #[cfg(not(feature = "noop"))]
 use std::ptr;
-#[cfg(all(
-  not(any(target_os = "macos", target_family = "wasm")),
-  feature = "napi4",
-  feature = "tokio_rt"
-))]
-use std::sync::atomic::AtomicUsize;
 #[cfg(not(feature = "noop"))]
 use std::sync::atomic::{AtomicBool, Ordering};
 use std::sync::{LazyLock, RwLock};
@@ -411,13 +405,13 @@ pub unsafe extern "C" fn napi_register_module_v1(
         }
       }
     });
+  });
 
-    REGISTERED_CLASSES.borrow_mut(|map| {
-      map.insert(
-        std::thread::current().id(),
-        PersistedPerInstanceHashMap::from_hashmap(registered_classes),
-      )
-    });
+  REGISTERED_CLASSES.borrow_mut(|map| {
+    map.insert(
+      std::thread::current().id(),
+      PersistedPerInstanceHashMap::from_hashmap(registered_classes),
+    )
   });
 
   #[cfg(feature = "compat-mode")]
@@ -430,23 +424,25 @@ pub unsafe extern "C" fn napi_register_module_v1(
     })
   }
 
-  #[cfg(all(
-    not(any(target_os = "macos", target_family = "wasm")),
-    feature = "napi4",
-    feature = "tokio_rt"
-  ))]
+  #[cfg(all(feature = "napi4", feature = "tokio_rt"))]
   {
     crate::tokio_runtime::ensure_runtime();
 
-    static init_counter: AtomicUsize = AtomicUsize::new(0);
-    let cleanup_hook_payload =
-      init_counter.fetch_add(1, Ordering::Relaxed) as *mut std::ffi::c_void;
-
+    #[cfg(not(target_family = "wasm"))]
     unsafe {
       sys::napi_add_env_cleanup_hook(
         env,
         Some(crate::tokio_runtime::drop_runtime),
-        cleanup_hook_payload,
+        ptr::null_mut(),
+      )
+    };
+
+    #[cfg(target_family = "wasm")]
+    unsafe {
+      crate::napi_add_env_cleanup_hook(
+        env,
+        Some(crate::tokio_runtime::drop_runtime),
+        ptr::null_mut(),
       )
     };
   }

crates/napi/src/env.rs

@@ -1011,13 +1011,27 @@ impl Env {
       hook: Box::new(cleanup_fn),
     };
     let hook_ref = Box::leak(Box::new(hook));
-    check_status!(unsafe {
-      sys::napi_add_env_cleanup_hook(
-        self.0,
-        Some(cleanup_env::<T>),
-        hook_ref as *mut CleanupEnvHookData<T> as *mut _,
-      )
-    })?;
+    #[cfg(not(target_family = "wasm"))]
+    {
+      check_status!(unsafe {
+        sys::napi_add_env_cleanup_hook(
+          self.0,
+          Some(cleanup_env::<T>),
+          (hook_ref as *mut CleanupEnvHookData<T>).cast(),
+        )
+      })?;
+    }
+
+    #[cfg(target_family = "wasm")]
+    {
+      check_status!(unsafe {
+        crate::napi_add_env_cleanup_hook(
+          self.0,
+          Some(cleanup_env::<T>),
+          (hook_ref as *mut CleanupEnvHookData<T>).cast(),
+        )
+      })?;
+    }
     Ok(CleanupEnvHook(hook_ref))
   }
 
@@ -1146,8 +1160,7 @@ impl Env {
     check_status!(unsafe {
       sys::napi_set_instance_data(
         self.0,
-        Box::leak(Box::new((TaggedObject::new(native), finalize_cb))) as *mut (TaggedObject<T>, F)
-          as *mut c_void,
+        Box::into_raw(Box::new((TaggedObject::new(native), finalize_cb))).cast(),
         Some(
           set_instance_finalize_callback::<T, Hint, F>
             as unsafe extern "C" fn(
@@ -1156,7 +1169,7 @@ impl Env {
               finalize_hint: *mut c_void,
             ),
         ),
-        Box::leak(Box::new(hint)) as *mut Hint as *mut c_void,
+        Box::into_raw(Box::new(hint)).cast(),
       )
     })
   }
@@ -1377,6 +1390,7 @@ unsafe extern "C" fn drop_buffer(
   mem::drop(unsafe { Vec::from_raw_parts(finalize_data as *mut u8, length, cap) });
 }
 
+#[cfg_attr(target_family = "wasm", allow(unused_variables))]
 pub(crate) unsafe extern "C" fn raw_finalize<T>(
   env: sys::napi_env,
   finalize_data: *mut c_void,