Merge pull request #99 from napi-rs/upgrade-napi

chore: upgrade napi-rs to 0.4.7

Author: Brooooooklyn

.github/workflows/ci.yaml

@@ -234,11 +234,24 @@ jobs:
       - name: Run simple tests
         run: docker run --rm -v $(pwd)/.cargo:/root/.cargo -v $(pwd):/node-rs -w /node-rs node:${{ matrix.node }}-alpine sh -c "node ./scripts/simple-tests.js"
 
+  dependabot:
+    needs:
+      - test_musl_binding
+      - test_binding
+    runs-on: ubuntu-latest
+    steps:
+      - name: auto-merge
+        uses: ridedott/dependabot-auto-merge-action@master
+        with:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
   publish:
     name: Publish
     if: "startsWith(github.event.head_commit.message, 'chore(release): publish')"
     runs-on: ubuntu-latest
-    needs: test_binding
+    needs:
+      - test_binding
+      - test_musl_binding
 
     steps:
       - uses: actions/checkout@v2

packages/bcrypt/src/hash_task.rs

@@ -3,17 +3,20 @@ use napi::{Env, Error, JsBuffer, JsString, Result, Status, Task};
 use crate::lib_bcrypt::hash;
 
 pub struct HashTask {
-  buf: JsBuffer,
+  buf: &'static [u8],
   cost: u32,
 }
 
 impl HashTask {
   pub fn new(buf: JsBuffer, cost: u32) -> HashTask {
-    HashTask { buf, cost }
+    HashTask {
+      buf: buf.data,
+      cost,
+    }
   }
 
   #[inline]
-  pub fn hash(buf: JsBuffer, cost: u32) -> Result<String> {
+  pub fn hash(buf: &[u8], cost: u32) -> Result<String> {
     hash(buf, cost).map_err(|_| Error::from_status(Status::GenericFailure))
   }
 }

packages/bcrypt/src/lib.rs

@@ -58,7 +58,7 @@ fn js_salt(ctx: CallContext) -> Result<JsString> {
 fn js_hash(ctx: CallContext) -> Result<JsString> {
   let password = ctx.get::<JsBuffer>(0)?;
   let cost = ctx.get::<JsNumber>(1)?;
-  let result = HashTask::hash(password, cost.try_into()?)?;
+  let result = HashTask::hash(&password, cost.try_into()?)?;
   ctx.env.create_string(result.as_str())
 }
 
@@ -74,7 +74,7 @@ fn js_async_hash(ctx: CallContext) -> Result<JsObject> {
 fn js_verify(ctx: CallContext) -> Result<JsBoolean> {
   let password = ctx.get::<JsBuffer>(0)?;
   let hash = ctx.get::<JsBuffer>(1)?;
-  let result = VerifyTask::verify(password, hash)
+  let result = VerifyTask::verify(&password, &hash)
     .map_err(|e| Error::new(Status::GenericFailure, format!("{}", e)))?;
   ctx.env.get_boolean(result)
 }

packages/bcrypt/src/verify_task.rs

@@ -4,17 +4,20 @@ use crate::lib_bcrypt::verify;
 use napi::{Env, Error, JsBoolean, JsBuffer, Result, Status, Task};
 
 pub struct VerifyTask {
-  password: JsBuffer,
-  hash: JsBuffer,
+  password: &'static [u8],
+  hash: &'static [u8],
 }
 
 impl VerifyTask {
   pub fn new(password: JsBuffer, hash: JsBuffer) -> VerifyTask {
-    Self { password, hash }
+    Self {
+      password: password.data,
+      hash: hash.data,
+    }
   }
 
   #[inline]
-  pub fn verify(password: JsBuffer, hash: JsBuffer) -> Result<bool> {
+  pub fn verify(password: &[u8], hash: &[u8]) -> Result<bool> {
     verify(
       &password,
       str::from_utf8(&hash).map_err(|_| Error::from_status(Status::StringExpected))?,