Merge branch 'main' into main

Author: durran

Cargo.toml

@@ -13,7 +13,7 @@ napi = { version = "2.2.0", default-features = false, features = [
   "async"
 ] }
 napi-derive = "2.2.0"
-zstd = "0.10.0+zstd.1.5.2"
+zstd = "0.11"
 
 [build-dependencies]
 napi-build = "1.2.1"

index.d.ts

@@ -3,5 +3,5 @@
 
 /* auto-generated by NAPI-RS */
 
-export function compress(buffer: Buffer): Promise<Buffer>
-export function decompress(buffer: Buffer): Promise<Buffer>
+export function compress(data: Buffer): Promise<Buffer>
+export function decompress(data: Buffer): Promise<Buffer>

src/lib.rs

@@ -1,14 +1,72 @@
 #[macro_use]
 extern crate napi_derive;
 
-use napi::bindgen_prelude::*;
+use napi::{
+  bindgen_prelude::AsyncTask,
+  Env, Error, JsBuffer, JsBufferValue, Ref, Result, Status, Task,
+};
+use zstd::stream::{encode_all, decode_all};
+
+struct Encoder {
+  data: Ref<JsBufferValue>
+}
+
+#[napi]
+impl Task for Encoder {
+  type Output = Vec<u8>;
+  type JsValue = JsBuffer;
+
+  fn compute(&mut self) -> Result<Self::Output> {
+    let data: &[u8] = self.data.as_ref();
+    encode_all(data, 3).map_err(|e| Error::new(Status::GenericFailure, format!("{}", e)))
+  }
+
+  fn resolve(&mut self, env: Env, output: Self::Output) -> Result<JsBuffer> {
+    env.create_buffer_with_data(output).map(|b| b.into_raw())
+  }
+
+  fn finally(&mut self, env: Env) -> Result<()> {
+    self.data.unref(env)?;
+    Ok(())
+  }
+}
+
+struct Decoder {
+  data: Ref<JsBufferValue>
+}
+
+#[napi]
+impl Task for Decoder {
+  type Output = Vec<u8>;
+  type JsValue = JsBuffer;
+
+  fn compute(&mut self) -> Result<Self::Output> {
+    let data: &[u8] = self.data.as_ref();
+    decode_all(data).map_err(|e| Error::new(Status::GenericFailure, format!("{}", e)))
+  }
+
+  fn resolve(&mut self, env: Env, output: Self::Output) -> Result<JsBuffer> {
+    env.create_buffer_with_data(output).map(|b| b.into_raw())
+  }
+
+  fn finally(&mut self, env: Env) -> Result<()> {
+    self.data.unref(env)?;
+    Ok(())
+  }
+}
 
 #[napi]
-async fn compress(buffer: Buffer) -> Result<Buffer> {
-  Ok(buffer)
+fn compress(data: JsBuffer) -> Result<AsyncTask<Encoder>> {
+  let encoder = Encoder {
+    data: data.into_ref()?,
+  };
+  Ok(AsyncTask::new(encoder))
 }
 
 #[napi]
-async fn decompress(buffer: Buffer) -> Result<Buffer> {
-  Ok(buffer)
+fn decompress(data: JsBuffer) -> Result<AsyncTask<Decoder>> {
+  let decoder = Decoder {
+    data: data.into_ref()?,
+  };
+  Ok(AsyncTask::new(decoder))
 }

test/debug.js

@@ -0,0 +1,10 @@
+const { compress, decompress } = require('../index');
+
+async function run() {
+    const buffer = Buffer.from('test');
+    const compressed = await compress(buffer);
+    const decompressed = await decompress(compressed);
+    console.log(compressed, decompressed);
+}
+
+run();

test/index.test.js

@@ -5,18 +5,9 @@ describe('zstd', () => {
   describe('#compress', () => {
     const buffer = Buffer.from('test');
 
-    it('returns the buffer', async () => {
+    it('returns a compressed buffer', async () => {
       const result = await compress(buffer);
-      expect(result).to.deep.equal(buffer);
-    });
-  });
-
-  describe('#decompress', () => {
-    const buffer = Buffer.from('test');
-
-    it('returns the buffer', async () => {
-      const result = await decompress(buffer);
-      expect(result).to.deep.equal(buffer);
+      expect(await decompress(result)).to.deep.equal(buffer);
     });
   });
 });