last comment

Author: baileympearson

.eslintrc.json

@@ -64,6 +64,13 @@
     "@typescript-eslint/no-require-imports": "off"
   },
   "overrides": [
+    {
+      "files": ["lib/*js"],
+      "parserOptions": {
+        "ecmaVersion": 2019,
+        "sourceType": "commonjs"
+      }
+    },
     {
       "files": ["test/**/*ts"],
       "rules": {

addon/compression.cpp

@@ -2,7 +2,7 @@
 
 #include "compression.h"
 
-std::vector<uint8_t> Compression::compress(const std::vector<uint8_t>& data,
+std::vector<uint8_t> mongodb_zstd::compress(const std::vector<uint8_t>& data,
                                            size_t compression_level) {
     size_t output_buffer_size = ZSTD_compressBound(data.size());
     std::vector<uint8_t> output(output_buffer_size);
@@ -19,7 +19,7 @@ std::vector<uint8_t> Compression::compress(const std::vector<uint8_t>& data,
     return output;
 }
 
-std::vector<uint8_t> Compression::decompress(const std::vector<uint8_t>& compressed) {
+std::vector<uint8_t> mongodb_zstd::decompress(const std::vector<uint8_t>& compressed) {
     std::vector<uint8_t> decompressed;
 
     using DCTX_Deleter = void (*)(ZSTD_DCtx*);
@@ -50,18 +50,20 @@ std::vector<uint8_t> Compression::decompress(const std::vector<uint8_t>& compres
     //                                 the return value is a suggested next input size (just a hint
     //                                 for better latency) that will never request more than the
     //                                 remaining frame size.
-    auto inputRemains = [](ZSTD_inBuffer& input) { return input.pos < input.size; };
-    auto isOutputBufferFlushed = [](ZSTD_outBuffer& output) { return output.pos < output.size; };
+    auto inputRemains = [](const ZSTD_inBuffer& input) { return input.pos < input.size; };
+    auto isOutputBufferFlushed = [](const ZSTD_outBuffer& output) { return output.pos < output.size; };
 
     while (inputRemains(input) || !isOutputBufferFlushed(output)) {
         size_t const ret = ZSTD_decompressStream(decompression_context.get(), &output, &input);
         if (ZSTD_isError(ret)) {
             throw std::runtime_error(ZSTD_getErrorName(ret));
         }
 
-        for (size_t i = 0; i < output.pos; ++i) {
-            decompressed.push_back(output_buffer[i]);
-        }
+        size_t decompressed_size = decompressed.size();
+        decompressed.resize(decompressed_size + output.pos);
+        std::copy(output_buffer.data(),
+                  output_buffer.data() + output.pos,
+                  decompressed.data() + decompressed_size);
 
         // move the position back go 0, to indicate that we are ready for more data
         output.pos = 0;

addon/compression.h

@@ -7,9 +7,9 @@
 #include "compression_worker.h"
 #include "zstd.h"
 
-namespace Compression {
+namespace mongodb_zstd {
 std::vector<uint8_t> compress(const std::vector<uint8_t>& data, size_t compression_level);
 std::vector<uint8_t> decompress(const std::vector<uint8_t>& data);
-}  // namespace Compression
+}  // namespace mongodb_zstd
 
 #endif

addon/compression_worker.h

@@ -7,6 +7,7 @@
 
 using namespace Napi;
 
+namespace mongodb_zstd {
 /**
  * @brief An asynchronous Napi::Worker that can be with any function that produces
  * CompressionResults.
@@ -17,11 +18,11 @@ class CompressionWorker final : public Napi::AsyncWorker {
         : Napi::AsyncWorker{callback, "compression worker"}, m_worker(worker), m_result{} {}
 
    protected:
-    void Execute() final {
+    void Execute() {
         m_result = m_worker();
     }
 
-    void OnOK() final {
+    void OnOK() {
         if (!m_result.has_value()) {
             Callback().Call({Napi::Error::New(Env(),
                                               "zstd runtime error - async worker finished without "
@@ -41,4 +42,5 @@ class CompressionWorker final : public Napi::AsyncWorker {
     std::optional<std::vector<uint8_t>> m_result;
 };
 
+}  // namespace mongodb_zstd
 #endif

addon/zstd.cpp

@@ -2,18 +2,18 @@
 
 #include <napi.h>
 
-#include <string>
 #include <vector>
 
 #include "compression.h"
 #include "compression_worker.h"
 
 using namespace Napi;
 
+namespace mongodb_zstd {
 void Compress(const Napi::CallbackInfo& info) {
     // Argument handling happens in JS
     if (info.Length() != 3) {
-        std::string error_message = "Expected three arguments.";
+        const char* error_message = "Expected three arguments.";
         throw TypeError::New(info.Env(), error_message);
     }
 
@@ -25,7 +25,7 @@ void Compress(const Napi::CallbackInfo& info) {
 
     CompressionWorker* worker =
         new CompressionWorker(callback, [data = std::move(data), compression_level] {
-            return Compression::compress(data, compression_level);
+            return mongodb_zstd::compress(data, compression_level);
         });
 
     worker->Queue();
@@ -34,7 +34,7 @@ void Compress(const Napi::CallbackInfo& info) {
 void Decompress(const CallbackInfo& info) {
     // Argument handling happens in JS
     if (info.Length() != 2) {
-        std::string error_message = "Expected two argument.";
+        const char* error_message = "Expected two argument.";
         throw TypeError::New(info.Env(), error_message);
     }
 
@@ -44,7 +44,7 @@ void Decompress(const CallbackInfo& info) {
     const Napi::Function& callback = info[1].As<Function>();
 
     CompressionWorker* worker = new CompressionWorker(
-        callback, [data = std::move(data)] { return Compression::decompress(data); });
+        callback, [data = std::move(data)] { return mongodb_zstd::decompress(data); });
 
     worker->Queue();
 }
@@ -56,3 +56,6 @@ Napi::Object Init(Napi::Env env, Napi::Object exports) {
 }
 
 NODE_API_MODULE(zstd, Init)
+
+} // namespace mongodb_zstd
+

etc/install-zstd.sh

@@ -1,4 +1,4 @@
-
+#!/bin/sh
 set -o xtrace
 
 clean_deps() {

lib/index.js

@@ -1,3 +1,4 @@
+'use strict';
 const zstd = require('bindings')('zstd');
 const { promisify } = require('util');
 

package.json

@@ -29,9 +29,7 @@
     "node": ">= 16.20.1"
   },
   "scripts": {
-    "prepare": "npm run compile",
     "compile": "node-gyp rebuild",
-
     "test": "mocha test/index.test.js",
     "install-zstd": "bash etc/install-zstd.sh",
     "check:eslint": "ESLINT_USE_FLAT_CONFIG=false eslint *ts lib/ .*.json",