fix(deps): upgrade napi-rs/cli and fix build errors

Cargo.toml

@@ -3,7 +3,7 @@ members  = ["./crates/alloc", "./packages/argon2", "./packages/bcrypt", "./packa
 resolver = "2"
 
   [workspace.dependencies]
-  argon2       = { version = "0.5", features = ["rand"] }
+  argon2       = { version = "0.5", features = ["rand", "std"] }
   base64       = { version = "0.22" }
   bcrypt       = "0.17"
   blowfish     = { version = "0.9", features = ["bcrypt"] }
@@ -20,7 +20,7 @@ resolver = "2"
   once_cell    = "1"
   quickcheck   = "1.0"
   rand         = "0.9"
-  rand_core    = { version = "0.9", features = ["getrandom"] }
+  rand_core    = { version = "0.9", features = ["os_rng"] }
   serde        = "1.0"
   serde_json   = "1.0"
   xxhash-rust  = { version = "0.8", features = ["xxh32", "const_xxh32", "xxh64", "const_xxh64", "xxh3", "const_xxh3"] }

package.json

@@ -22,7 +22,7 @@
     "postinstall": "husky install"
   },
   "devDependencies": {
-    "@napi-rs/cli": "^3.0.0-alpha.64",
+    "@napi-rs/cli": "^3.5.0",
     "@napi-rs/wasm-runtime": "^0.2.5",
     "@taplo/cli": "^0.7.0",
     "@tybys/wasm-util": "^0.10.0",

packages/argon2/Cargo.toml

@@ -11,7 +11,7 @@ argon2       = { workspace = true }
 global_alloc = { workspace = true }
 napi         = { workspace = true, features = ["napi3"] }
 napi-derive  = { workspace = true, default-features = false, features = ["type-def"] }
-rand_core    = { workspace = true }
+rand_core    = { version = "0.6", features = ["getrandom"] }
 
 [build-dependencies]
 napi-build = { workspace = true }

packages/argon2/argon2.wasi-browser.js

@@ -1,16 +1,15 @@
 import {
-  instantiateNapiModuleSync as __emnapiInstantiateNapiModuleSync,
+  createOnMessage as __wasmCreateOnMessageForFsProxy,
   getDefaultContext as __emnapiGetDefaultContext,
+  instantiateNapiModuleSync as __emnapiInstantiateNapiModuleSync,
   WASI as __WASI,
-  createOnMessage as __wasmCreateOnMessageForFsProxy,
 } from '@napi-rs/wasm-runtime'
 
-import __wasmUrl from './argon2.wasm32-wasi.wasm?url'
-
 const __wasi = new __WASI({
   version: 'preview1',
 })
 
+const __wasmUrl = new URL('./argon2.wasm32-wasi.wasm', import.meta.url).href
 const __emnapiContext = __emnapiGetDefaultContext()
 
 const __sharedMemory = new WebAssembly.Memory({
@@ -46,24 +45,14 @@ const {
     return importObject
   },
   beforeInit({ instance }) {
-    __napi_rs_initialize_modules(instance)
+    for (const name of Object.keys(instance.exports)) {
+      if (name.startsWith('__napi_register__')) {
+        instance.exports[name]()
+      }
+    }
   },
 })
-
-function __napi_rs_initialize_modules(__napiInstance) {
-  __napiInstance.exports['__napi_register__Algorithm_0']?.()
-  __napiInstance.exports['__napi_register__Version_1']?.()
-  __napiInstance.exports['__napi_register__Options_struct_2']?.()
-  __napiInstance.exports['__napi_register__HashTask_impl_3']?.()
-  __napiInstance.exports['__napi_register__hash_4']?.()
-  __napiInstance.exports['__napi_register__hash_sync_5']?.()
-  __napiInstance.exports['__napi_register__RawHashTask_impl_6']?.()
-  __napiInstance.exports['__napi_register__hash_raw_7']?.()
-  __napiInstance.exports['__napi_register__hash_raw_sync_8']?.()
-  __napiInstance.exports['__napi_register__VerifyTask_impl_9']?.()
-  __napiInstance.exports['__napi_register__verify_10']?.()
-  __napiInstance.exports['__napi_register__verify_sync_11']?.()
-}
+export default __napiModule.exports
 export const Algorithm = __napiModule.exports.Algorithm
 export const hash = __napiModule.exports.hash
 export const hashRaw = __napiModule.exports.hashRaw

packages/argon2/argon2.wasi.cjs

@@ -9,9 +9,9 @@ const { WASI: __nodeWASI } = require('node:wasi')
 const { Worker } = require('node:worker_threads')
 
 const {
-  instantiateNapiModuleSync: __emnapiInstantiateNapiModuleSync,
-  getDefaultContext: __emnapiGetDefaultContext,
   createOnMessage: __wasmCreateOnMessageForFsProxy,
+  getDefaultContext: __emnapiGetDefaultContext,
+  instantiateNapiModuleSync: __emnapiInstantiateNapiModuleSync,
 } = require('@napi-rs/wasm-runtime')
 
 const __rootDir = __nodePath.parse(process.cwd()).root
@@ -56,15 +56,38 @@ 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)
     }
+
+    // The main thread of Node.js waits for all the active handles before exiting.
+    // But Rust threads are never waited without `thread::join`.
+    // So here we hack the code of Node.js to prevent the workers from being referenced (active).
+    // According to https://github.com/nodejs/node/blob/19e0d472728c79d418b74bddff588bea70a403d0/lib/internal/worker.js#L415,
+    // a worker is consist of two handles: kPublicPort and kHandle.
+    {
+      const kPublicPort = Object.getOwnPropertySymbols(worker).find(s =>
+        s.toString().includes("kPublicPort")
+      );
+      if (kPublicPort) {
+        worker[kPublicPort].ref = () => {};
+      }
+
+      const kHandle = Object.getOwnPropertySymbols(worker).find(s =>
+        s.toString().includes("kHandle")
+      );
+      if (kHandle) {
+        worker[kHandle].ref = () => {};
+      }
+
+      worker.unref();
+    }
     return worker
   },
   overwriteImports(importObject) {
@@ -77,24 +100,14 @@ const { instance: __napiInstance, module: __wasiModule, napiModule: __napiModule
     return importObject
   },
   beforeInit({ instance }) {
-    __napi_rs_initialize_modules(instance)
-  }
+    for (const name of Object.keys(instance.exports)) {
+      if (name.startsWith('__napi_register__')) {
+        instance.exports[name]()
+      }
+    }
+  },
 })
-
-function __napi_rs_initialize_modules(__napiInstance) {
-  __napiInstance.exports['__napi_register__Algorithm_0']?.()
-  __napiInstance.exports['__napi_register__Version_1']?.()
-  __napiInstance.exports['__napi_register__Options_struct_2']?.()
-  __napiInstance.exports['__napi_register__HashTask_impl_3']?.()
-  __napiInstance.exports['__napi_register__hash_4']?.()
-  __napiInstance.exports['__napi_register__hash_sync_5']?.()
-  __napiInstance.exports['__napi_register__RawHashTask_impl_6']?.()
-  __napiInstance.exports['__napi_register__hash_raw_7']?.()
-  __napiInstance.exports['__napi_register__hash_raw_sync_8']?.()
-  __napiInstance.exports['__napi_register__VerifyTask_impl_9']?.()
-  __napiInstance.exports['__napi_register__verify_10']?.()
-  __napiInstance.exports['__napi_register__verify_sync_11']?.()
-}
+module.exports = __napiModule.exports
 module.exports.Algorithm = __napiModule.exports.Algorithm
 module.exports.hash = __napiModule.exports.hash
 module.exports.hashRaw = __napiModule.exports.hashRaw