feat(*): upgrade to NAPI-RS 3.0 alpha

Author: Brooooooklyn

.taplo.toml

@@ -3,5 +3,6 @@ exclude = ["node_modules/**/*.toml"]
 # https://taplo.tamasfe.dev/configuration/formatter-options.html
 [formatting]
 align_entries = true
+column_width  = 180
 indent_tables = true
 reorder_keys  = true

Cargo.toml

@@ -1,15 +1,28 @@
 [workspace]
-members = [
-  "./crates/alloc",
-  "./packages/argon2",
-  "./packages/bcrypt",
-  "./packages/crc32",
-  "./packages/jieba",
-  "./packages/jsonwebtoken",
-  "./packages/xxhash",
-]
+members  = ["./crates/alloc", "./packages/argon2", "./packages/bcrypt", "./packages/crc32", "./packages/jieba", "./packages/jsonwebtoken", "./packages/xxhash"]
 resolver = "2"
 
+  [workspace.dependencies]
+  argon2       = { version = "0.5", features = ["rand"] }
+  base64       = { version = "0.22" }
+  bcrypt       = "0.15"
+  blowfish     = { version = "0.9", features = ["bcrypt"] }
+  crc32c       = { version = "0.6" }
+  crc32fast    = { version = "1.4", features = ["nightly"] }
+  getrandom    = "0.2"
+  global_alloc = { path = "./crates/alloc" }
+  indexmap     = { version = "2", features = ["serde"] }
+  jieba-rs     = { version = "0.6", features = ["default-dict", "tfidf", "textrank"] }
+  jsonwebtoken = { version = "9" }
+  napi         = { version = "3.0.0-alpha.13", default-features = false, features = ["napi3"] }
+  napi-build   = "2"
+  napi-derive  = { version = "3.0.0-alpha.13", default-features = false, features = ["type-def"] }
+  once_cell    = "1"
+  quickcheck   = "1.0"
+  rand_core    = { version = "0.6", features = ["getrandom"] }
+  serde        = "1.0"
+  serde_json   = "1.0"
+  xxhash-rust  = { version = "0.8", features = ["xxh32", "xxh64", "xxh3"] }
 [profile.release]
 codegen-units   = 1
 lto             = true

packages/argon2/Cargo.toml

@@ -7,13 +7,11 @@ version = "0.0.0"
 crate-type = ["cdylib"]
 
 [dependencies]
-argon2 = { version = "0.5", features = ["rand"] }
-global_alloc = { path = "../../crates/alloc" }
-napi = { version = "2", default-features = false, features = ["napi3"] }
-napi-derive = { version = "2", default-features = false, features = [
-  "type-def",
-] }
-rand_core = { version = "0.6", features = ["getrandom"] }
+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 }
 
 [build-dependencies]
-napi-build = "2"
+napi-build = { workspace = true }

packages/argon2/index.d.ts

@@ -1,6 +1,6 @@
 /* auto-generated by NAPI-RS */
 /* eslint-disable */
-export const enum Algorithm {
+export declare const enum Algorithm {
   /**
    * Optimizes against GPU cracking attacks but vulnerable to side-channels.
    * Accesses the memory array in a password dependent order, reducing the possibility of time–memory tradeoff (TMTO) attacks.
@@ -19,13 +19,13 @@ export const enum Algorithm {
   Argon2id = 2
 }
 
-export declare function hash(password: string | Buffer, options?: Options | undefined | null, abortSignal?: AbortSignal | undefined | null): Promise<string>
+export declare function hash(password: string | Uint8Array, options?: Options | undefined | null, abortSignal?: AbortSignal | undefined | null): Promise<string>
 
-export declare function hashRaw(password: string | Buffer, options?: Options | undefined | null, abortSignal?: AbortSignal | undefined | null): Promise<Buffer>
+export declare function hashRaw(password: string | Uint8Array, options?: Options | undefined | null, abortSignal?: AbortSignal | undefined | null): Promise<Buffer>
 
-export declare function hashRawSync(password: string | Buffer, options?: Options | undefined | null): Buffer
+export declare function hashRawSync(password: string | Uint8Array, options?: Options | undefined | null): Buffer
 
-export declare function hashSync(password: string | Buffer, options?: Options | undefined | null): string
+export declare function hashSync(password: string | Uint8Array, options?: Options | undefined | null): string
 
 export interface Options {
   /**
@@ -60,15 +60,15 @@ export interface Options {
   parallelism?: number
   algorithm?: Algorithm
   version?: Version
-  secret?: Buffer
-  salt?: Buffer
+  secret?: Uint8Array
+  salt?: Uint8Array
 }
 
-export declare function verify(hashed: string | Buffer, password: string | Buffer, options?: Options | undefined | null, abortSignal?: AbortSignal | undefined | null): Promise<boolean>
+export declare function verify(hashed: string | Uint8Array, password: string | Uint8Array, options?: Options | undefined | null, abortSignal?: AbortSignal | undefined | null): Promise<boolean>
 
-export declare function verifySync(hashed: string | Buffer, password: string | Buffer, options?: Options | undefined | null): boolean
+export declare function verifySync(hashed: string | Uint8Array, password: string | Uint8Array, options?: Options | undefined | null): boolean
 
-export const enum Version {
+export declare const enum Version {
   /** Version 16 (0x10 in hex) */
   V0x10 = 0,
   /**

packages/argon2/index.js

@@ -336,15 +336,15 @@ if (!nativeBinding || process.env.NAPI_RS_FORCE_WASI) {
     nativeBinding = require('./argon2.wasi.cjs')
   } catch (err) {
     if (process.env.NAPI_RS_FORCE_WASI) {
-      console.error(err)
+      loadErrors.push(err)
     }
   }
   if (!nativeBinding) {
     try {
       nativeBinding = require('@node-rs/argon2-wasm32-wasi')
     } catch (err) {
       if (process.env.NAPI_RS_FORCE_WASI) {
-        console.error(err)
+        loadErrors.push(err)
       }
     }
   }

packages/argon2/src/lib.rs

@@ -13,6 +13,7 @@ use argon2::{
 use rand_core::OsRng;
 
 #[napi]
+#[derive(Clone, Copy)]
 pub enum Algorithm {
   /// Optimizes against GPU cracking attacks but vulnerable to side-channels.
   /// Accesses the memory array in a password dependent order, reducing the possibility of time–memory tradeoff (TMTO) attacks.
@@ -40,6 +41,7 @@ impl Algorithm {
 }
 
 #[napi]
+#[derive(Clone, Copy)]
 pub enum Version {
   /// Version 16 (0x10 in hex)
   V0x10,
@@ -89,8 +91,8 @@ pub struct Options {
   pub parallelism: Option<u32>,
   pub algorithm: Option<Algorithm>,
   pub version: Option<Version>,
-  pub secret: Option<Buffer>,
-  pub salt: Option<Buffer>,
+  pub secret: Option<Uint8Array>,
+  pub salt: Option<Uint8Array>,
 }
 
 impl Options {
@@ -140,7 +142,7 @@ impl Task for HashTask {
 
 #[napi]
 pub fn hash(
-  password: Either<String, Buffer>,
+  password: Either<String, &[u8]>,
   options: Option<Options>,
   abort_signal: Option<AbortSignal>,
 ) -> AsyncTask<HashTask> {
@@ -159,7 +161,7 @@ pub fn hash(
 #[napi]
 pub fn hash_sync(
   env: Env,
-  password: Either<String, Buffer>,
+  password: Either<String, &[u8]>,
   options: Option<Options>,
 ) -> Result<String> {
   let mut hash_task = HashTask {
@@ -216,7 +218,7 @@ impl Task for RawHashTask {
 
 #[napi]
 pub fn hash_raw(
-  password: Either<String, Buffer>,
+  password: Either<String, &[u8]>,
   options: Option<Options>,
   abort_signal: Option<AbortSignal>,
 ) -> AsyncTask<RawHashTask> {
@@ -235,7 +237,7 @@ pub fn hash_raw(
 #[napi]
 pub fn hash_raw_sync(
   env: Env,
-  password: Either<String, Buffer>,
+  password: Either<String, &[u8]>,
   options: Option<Options>,
 ) -> Result<Buffer> {
   let mut hash_task = RawHashTask {
@@ -279,8 +281,8 @@ impl Task for VerifyTask {
 
 #[napi]
 pub fn verify(
-  hashed: Either<String, Buffer>,
-  password: Either<String, Buffer>,
+  hashed: Either<String, &[u8]>,
+  password: Either<String, &[u8]>,
   options: Option<Options>,
   abort_signal: Option<AbortSignal>,
 ) -> Result<AsyncTask<VerifyTask>> {
@@ -305,8 +307,8 @@ pub fn verify(
 #[napi]
 pub fn verify_sync(
   env: Env,
-  hashed: Either<String, Buffer>,
-  password: Either<String, Buffer>,
+  hashed: Either<String, &[u8]>,
+  password: Either<String, &[u8]>,
   options: Option<Options>,
 ) -> Result<bool> {
   let mut verify_task = VerifyTask {

packages/bcrypt/Cargo.toml

@@ -8,16 +8,16 @@ version = "0.1.0"
 crate-type = ["cdylib"]
 
 [dependencies]
-base64       = { version = "0.22" }
-bcrypt       = "0.15"
-blowfish     = { version = "0.9", features = ["bcrypt"] }
-getrandom    = "0.2"
-global_alloc = { path = "../../crates/alloc" }
-napi         = { version = "2", default-features = false, features = ["napi3"] }
-napi-derive  = { version = "2" }
+base64       = { workspace = true }
+bcrypt       = { workspace = true }
+blowfish     = { workspace = true }
+getrandom    = { workspace = true }
+global_alloc = { workspace = true }
+napi         = { workspace = true, default-features = false, features = ["napi3"] }
+napi-derive  = { workspace = true }
 
 [dev-dependencies]
-quickcheck = "1.0"
+quickcheck = { workspace = true }
 
 [build-dependencies]
-napi-build = "2"
+napi-build = { workspace = true }

packages/bcrypt/binding.d.ts

@@ -6,11 +6,11 @@ export declare function genSalt(round: number, version?: '2a' | '2x' | '2y' | '2
 
 export declare function genSaltSync(round: number, version?: '2a' | '2x' | '2y' | '2b'): string
 
-export declare function hash(input: string | Buffer, cost?: number | undefined | null, salt?: string | Buffer | undefined | null, signal?: AbortSignal | undefined | null): Promise<string>
+export declare function hash(input: Uint8Array | string, cost?: number | undefined | null, salt?: string | Buffer | undefined | null, signal?: AbortSignal | undefined | null): Promise<string>
 
 export declare function hashSync(input: string | Buffer, cost?: number | undefined | null, salt?: string | Buffer | undefined | null): string
 
-export declare function verify(password: string | Buffer, hash: string | Buffer, signal?: AbortSignal | undefined | null): Promise<boolean>
+export declare function verify(password: Uint8Array | string, hash: Uint8Array | string, signal?: AbortSignal | undefined | null): Promise<boolean>
 
 export declare function verifySync(input: string | Buffer, hash: string | Buffer): boolean
 

packages/bcrypt/binding.js

@@ -336,15 +336,15 @@ if (!nativeBinding || process.env.NAPI_RS_FORCE_WASI) {
     nativeBinding = require('./bcrypt.wasi.cjs')
   } catch (err) {
     if (process.env.NAPI_RS_FORCE_WASI) {
-      console.error(err)
+      loadErrors.push(err)
     }
   }
   if (!nativeBinding) {
     try {
       nativeBinding = require('@node-rs/bcrypt-wasm32-wasi')
     } catch (err) {
       if (process.env.NAPI_RS_FORCE_WASI) {
-        console.error(err)
+        loadErrors.push(err)
       }
     }
   }

packages/bcrypt/src/hash_task.rs

@@ -1,42 +1,18 @@
 use napi::{
-  bindgen_prelude::Either, Env, Error, JsBuffer, JsBufferValue, Ref, Result, Status, Task,
+  bindgen_prelude::{Either, Uint8Array},
+  Env, Error, Result, Status, Task,
 };
 use napi_derive::napi;
 
-pub enum AsyncHashInput {
-  String(String),
-  Buffer(Ref<JsBufferValue>),
-}
-
-impl AsyncHashInput {
-  #[inline]
-  pub fn from_either(input: Either<String, JsBuffer>) -> Result<Self> {
-    match input {
-      Either::A(s) => Ok(Self::String(s)),
-      Either::B(b) => Ok(Self::Buffer(b.into_ref()?)),
-    }
-  }
-}
-
-impl AsRef<[u8]> for AsyncHashInput {
-  #[inline]
-  fn as_ref(&self) -> &[u8] {
-    match self {
-      Self::String(s) => s.as_bytes(),
-      Self::Buffer(b) => b.as_ref(),
-    }
-  }
-}
-
 pub struct HashTask {
-  buf: AsyncHashInput,
+  buf: Either<Uint8Array, String>,
   cost: u32,
   salt: [u8; 16],
 }
 
 impl HashTask {
   #[inline]
-  pub fn new(buf: AsyncHashInput, cost: u32, salt: [u8; 16]) -> HashTask {
+  pub fn new(buf: Either<Uint8Array, String>, cost: u32, salt: [u8; 16]) -> HashTask {
     HashTask { buf, cost, salt }
   }
 
@@ -54,20 +30,10 @@ impl Task for HashTask {
   type JsValue = String;
 
   fn compute(&mut self) -> Result<Self::Output> {
-    match &self.buf {
-      AsyncHashInput::String(s) => Self::hash(s.as_bytes(), self.salt, self.cost),
-      AsyncHashInput::Buffer(buf) => Self::hash(buf.as_ref(), self.salt, self.cost),
-    }
+    Self::hash(self.buf.as_ref(), self.salt, self.cost)
   }
 
   fn resolve(&mut self, _env: Env, output: Self::Output) -> Result<Self::JsValue> {
     Ok(output)
   }
-
-  fn finally(&mut self, env: Env) -> Result<()> {
-    if let AsyncHashInput::Buffer(buf) = &mut self.buf {
-      buf.unref(env)?;
-    }
-    Ok(())
-  }
 }

packages/bcrypt/src/lib.rs

@@ -8,10 +8,8 @@ use std::cmp;
 
 use bcrypt::Version;
 use napi::bindgen_prelude::*;
-use napi::{Error, JsBuffer, Result, Status};
 use napi_derive::*;
 
-use crate::hash_task::AsyncHashInput;
 use crate::hash_task::HashTask;
 use crate::salt_task::{format_salt, gen_salt};
 use crate::verify_task::VerifyTask;
@@ -74,7 +72,7 @@ pub fn hash_sync(
 
 #[napi]
 pub fn hash(
-  input: Either<String, JsBuffer>,
+  input: Either<Uint8Array, String>,
   cost: Option<u32>,
   salt: Option<Either<String, Buffer>>,
   signal: Option<AbortSignal>,
@@ -89,11 +87,7 @@ pub fn hash(
   } else {
     gen_salt().map_err(|err| Error::new(Status::InvalidArg, format!("{err}")))?
   };
-  let task = HashTask::new(
-    AsyncHashInput::from_either(input)?,
-    cost.unwrap_or(DEFAULT_COST),
-    salt,
-  );
+  let task = HashTask::new(input, cost.unwrap_or(DEFAULT_COST), salt);
   Ok(AsyncTask::with_optional_signal(task, signal))
 }
 
@@ -114,14 +108,11 @@ fn either_string_buffer_as_bytes(input: &Either<String, Buffer>) -> &[u8] {
 
 #[napi]
 pub fn verify(
-  password: Either<String, JsBuffer>,
-  hash: Either<String, JsBuffer>,
+  password: Either<Uint8Array, String>,
+  hash: Either<Uint8Array, String>,
   signal: Option<AbortSignal>,
 ) -> Result<AsyncTask<VerifyTask>> {
-  let task = VerifyTask::new(
-    AsyncHashInput::from_either(password)?,
-    AsyncHashInput::from_either(hash)?,
-  );
+  let task = VerifyTask::new(password, hash);
   Ok(AsyncTask::with_optional_signal(task, signal))
 }