@nxtedition/rocksdb 15.2.2 → 15.2.4

package/binding.gyp

@@ -9,28 +9,43 @@
                     "OS == 'linux'",
                     {
                         "direct_dependent_settings": {
-                          "libraries": [
-                          ],
+                            "libraries": [],
                         },
                         "include_dirs": [
-                          "/usr/lib/x86_64-linux-gnu/include",
-                          "/usr/lib/include",
+                            "/usr/lib/x86_64-linux-gnu/include",
+                            "/usr/lib/include",
+                        ],
+                        "libraries": [
+                            "/usr/local/lib/libre2.a",
+                            "<!@(ls /usr/local/lib/libabsl_*.a)",
                         ],
                         "cflags": ["-march=znver3", "-mtune=znver3"],
-                        "ccflags": ["-flto", '-std=c++20', "-march=znver3", "-mtune=znver3"],
+                        "cflags_cc": [
+                            "-flto",
+                            "-std=c++23",
+                            "-march=znver3",
+                            "-mtune=znver3",
+                        ],
                         "cflags!": ["-fno-exceptions"],
                         "cflags_cc!": ["-fno-exceptions"],
-                        "ldflags": ["-flto", "-fuse-linker-plugin"],
+                        "ldflags": [
+                            "-flto",
+                            "-fuse-linker-plugin",
+                            "-Wl,--whole-archive,/usr/local/lib/libsnappy.a,--no-whole-archive",
+                        ],
                     },
                 ],
                 [
                     "OS == 'mac'",
                     {
                         "direct_dependent_settings": {
-                          "libraries": [
-                          ],
+                            "libraries": [],
                         },
-                        "include_dirs": [
+                        "include_dirs": ["/opt/homebrew/include", "/usr/local/include"],
+                        "libraries": [
+                            "-L/opt/homebrew/lib",
+                            "-L/usr/local/lib",
+                            "-lre2",
                         ],
                         "xcode_settings": {
                             "WARNING_CFLAGS": [
@@ -41,122 +56,26 @@
                             ],
                             "OTHER_CPLUSPLUSFLAGS": [
                                 "-mmacosx-version-min=13.4.0",
-                                "-std=c++20",
+                                "-std=c++23",
                                 "-fno-omit-frame-pointer",
                                 "-momit-leaf-frame-pointer",
                                 "-arch x86_64",
                                 "-arch arm64",
                             ],
+                            "OTHER_LDFLAGS": [
+                                "-L/opt/homebrew/lib",
+                                "-L/usr/local/lib",
+                            ],
                             "GCC_ENABLE_CPP_RTTI": "YES",
                             "GCC_ENABLE_CPP_EXCEPTIONS": "YES",
                             "MACOSX_DEPLOYMENT_TARGET": "13.4.0",
-                        }
+                        },
                     },
                 ],
             ],
             "dependencies": ["<(module_root_dir)/deps/rocksdb/rocksdb.gyp:rocksdb"],
-            "include_dirs": [
-              "<!(node -e \"require('napi-macros')\")",
-              "deps/re2",
-              "deps/abseil-cpp"
-            ],
-            "sources": [
-              "binding.cc",
-              "deps/re2/re2/bitmap256.cc",
-              "deps/re2/re2/bitstate.cc",
-              "deps/re2/re2/compile.cc",
-              "deps/re2/re2/dfa.cc",
-              "deps/re2/re2/filtered_re2.cc",
-              "deps/re2/re2/mimics_pcre.cc",
-              "deps/re2/re2/nfa.cc",
-              "deps/re2/re2/onepass.cc",
-              "deps/re2/re2/parse.cc",
-              "deps/re2/re2/perl_groups.cc",
-              "deps/re2/re2/prefilter.cc",
-              "deps/re2/re2/prefilter_tree.cc",
-              "deps/re2/re2/prog.cc",
-              "deps/re2/re2/re2.cc",
-              "deps/re2/re2/regexp.cc",
-              "deps/re2/re2/set.cc",
-              "deps/re2/re2/simplify.cc",
-              "deps/re2/re2/tostring.cc",
-              "deps/re2/re2/unicode_casefold.cc",
-              "deps/re2/re2/unicode_groups.cc",
-              "deps/re2/util/pcre.cc",
-              "deps/re2/util/rune.cc",
-              "deps/re2/util/strutil.cc",
-              "deps/abseil-cpp/absl/base/internal/cycleclock.cc",
-              "deps/abseil-cpp/absl/base/internal/low_level_alloc.cc",
-              "deps/abseil-cpp/absl/base/internal/raw_logging.cc",
-              "deps/abseil-cpp/absl/base/internal/spinlock.cc",
-              "deps/abseil-cpp/absl/base/internal/spinlock_wait.cc",
-              "deps/abseil-cpp/absl/base/internal/strerror.cc",
-              "deps/abseil-cpp/absl/base/internal/sysinfo.cc",
-              "deps/abseil-cpp/absl/base/internal/thread_identity.cc",
-              "deps/abseil-cpp/absl/base/internal/throw_delegate.cc",
-              "deps/abseil-cpp/absl/base/internal/unscaledcycleclock.cc",
-              "deps/abseil-cpp/absl/debugging/internal/demangle.cc",
-              "deps/abseil-cpp/absl/container/internal/raw_hash_set.cc",
-              "deps/abseil-cpp/absl/debugging/internal/address_is_readable.cc",
-              "deps/abseil-cpp/absl/debugging/internal/elf_mem_image.cc",
-              "deps/abseil-cpp/absl/debugging/internal/examine_stack.cc",
-              "deps/abseil-cpp/absl/debugging/internal/vdso_support.cc",
-              "deps/abseil-cpp/absl/debugging/stacktrace.cc",
-              "deps/abseil-cpp/absl/debugging/symbolize.cc",
-              "deps/abseil-cpp/absl/flags/commandlineflag.cc",
-              "deps/abseil-cpp/absl/flags/internal/commandlineflag.cc",
-              "deps/abseil-cpp/absl/flags/internal/flag.cc",
-              "deps/abseil-cpp/absl/flags/internal/private_handle_accessor.cc",
-              "deps/abseil-cpp/absl/flags/internal/program_name.cc",
-              "deps/abseil-cpp/absl/flags/marshalling.cc",
-              "deps/abseil-cpp/absl/flags/reflection.cc",
-              "deps/abseil-cpp/absl/flags/usage_config.cc",
-              "deps/abseil-cpp/absl/hash/internal/city.cc",
-              "deps/abseil-cpp/absl/hash/internal/hash.cc",
-              "deps/abseil-cpp/absl/hash/internal/print_hash_of.cc",
-              "deps/abseil-cpp/absl/log/internal/globals.cc",
-              "deps/abseil-cpp/absl/log/internal/log_format.cc",
-              "deps/abseil-cpp/absl/log/internal/log_message.cc",
-              "deps/abseil-cpp/absl/log/internal/log_sink_set.cc",
-              "deps/abseil-cpp/absl/log/internal/nullguard.cc",
-              "deps/abseil-cpp/absl/log/internal/proto.cc",
-              "deps/abseil-cpp/absl/log/globals.cc",
-              "deps/abseil-cpp/absl/log/log_sink.cc",
-              "deps/abseil-cpp/absl/numeric/int128.cc",
-              "deps/abseil-cpp/absl/strings/ascii.cc",
-              "deps/abseil-cpp/absl/strings/charconv.cc",
-              "deps/abseil-cpp/absl/strings/internal/charconv_bigint.cc",
-              "deps/abseil-cpp/absl/strings/internal/charconv_parse.cc",
-              "deps/abseil-cpp/absl/strings/internal/memutil.cc",
-              "deps/abseil-cpp/absl/strings/internal/str_format/arg.cc",
-              "deps/abseil-cpp/absl/strings/internal/str_format/bind.cc",
-              "deps/abseil-cpp/absl/strings/internal/str_format/extension.cc",
-              "deps/abseil-cpp/absl/strings/internal/str_format/float_conversion.cc",
-              "deps/abseil-cpp/absl/strings/internal/str_format/output.cc",
-              "deps/abseil-cpp/absl/strings/internal/str_format/parser.cc",
-              "deps/abseil-cpp/absl/strings/match.cc",
-              "deps/abseil-cpp/absl/strings/numbers.cc",
-              "deps/abseil-cpp/absl/strings/str_cat.cc",
-              "deps/abseil-cpp/absl/strings/str_split.cc",
-              "deps/abseil-cpp/absl/synchronization/internal/create_thread_identity.cc",
-              "deps/abseil-cpp/absl/synchronization/internal/graphcycles.cc",
-              "deps/abseil-cpp/absl/synchronization/internal/futex_waiter.cc",
-              "deps/abseil-cpp/absl/synchronization/internal/kernel_timeout.cc",
-              "deps/abseil-cpp/absl/synchronization/internal/per_thread_sem.cc",
-              "deps/abseil-cpp/absl/synchronization/internal/waiter_base.cc",
-              "deps/abseil-cpp/absl/synchronization/mutex.cc",
-              "deps/abseil-cpp/absl/time/clock.cc",
-              "deps/abseil-cpp/absl/time/duration.cc",
-              "deps/abseil-cpp/absl/time/internal/cctz/src/time_zone_fixed.cc",
-              "deps/abseil-cpp/absl/time/internal/cctz/src/time_zone_if.cc",
-              "deps/abseil-cpp/absl/time/internal/cctz/src/time_zone_impl.cc",
-              "deps/abseil-cpp/absl/time/internal/cctz/src/time_zone_info.cc",
-              "deps/abseil-cpp/absl/time/internal/cctz/src/time_zone_libc.cc",
-              "deps/abseil-cpp/absl/time/internal/cctz/src/time_zone_lookup.cc",
-              "deps/abseil-cpp/absl/time/internal/cctz/src/time_zone_posix.cc",
-              "deps/abseil-cpp/absl/time/internal/cctz/src/zone_info_source.cc",
-              "deps/abseil-cpp/absl/time/time.cc",
-          ],
+            "include_dirs": ["<!(node -e \"require('napi-macros')\")"],
+            "sources": ["binding.cc"],
         }
     ],
 }

package/build.sh

@@ -1,6 +1,9 @@
 #!/bin/bash
 set -e
 
+echo "Initializing submodules..."
+git submodule update --init
+
 echo "Building image..."
 docker build --iidfile prebuilds.iid .
 

package/deps/rocksdb/rocksdb.gyp

@@ -82,6 +82,7 @@
           "OS == 'linux'",
           {
             "defines": [
+              "SNAPPY=1",
               "OS_LINUX=1",
               "ROCKSDB_FALLOCATE_PRESENT=1",
               "ROCKSDB_MALLOC_USABLE_SIZE=1",
@@ -107,7 +108,8 @@
                 "/usr/lib/x86_64-linux-gnu/libglog.a",
                 "/usr/lib/x86_64-linux-gnu/libiberty.a",
                 "/usr/lib/x86_64-linux-gnu/libunwind.a",
-                "/usr/lib/x86_64-linux-gnu/libgflags.a"
+                "/usr/lib/x86_64-linux-gnu/libgflags.a",
+                "/usr/local/lib/libsnappy.a"
                 # "/usr/lib/x86_64-linux-gnu/libjemalloc.a"
               ],
             },

package/index.js

@@ -287,10 +287,6 @@ class RocksLevel extends AbstractLevel {
   }
 
   async * updates (options) {
-    yield * this.updatesSync(options)
-  }
-
-  * updatesSync (options) {
     if (this.status !== 'open') {
       throw new ModuleError('Database is not open', {
         code: 'LEVEL_DATABASE_NOT_OPEN'
@@ -300,7 +296,9 @@ class RocksLevel extends AbstractLevel {
     const handle = binding.updates_init(this[kContext], options)
     try {
       while (true) {
-        const value = binding.updates_next(handle)
+        const value = await new Promise((resolve, reject) => {
+          binding.updates_next(handle, (err, val) => err ? reject(err) : resolve(val))
+        })
         if (!value) {
           break
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nxtedition/rocksdb",
-  "version": "15.2.2",
+  "version": "15.2.4",
   "description": "A low-level Node.js RocksDB binding",
   "license": "MIT",
   "main": "index.js",

package/util.h

@@ -164,10 +164,12 @@ static napi_status GetString(napi_env env, napi_value from, std::string& to) {
   if (type == napi_string) {
     size_t length = 0;
     NAPI_STATUS_RETURN(napi_get_value_string_utf8(env, from, nullptr, 0, &length));
-    // TODO (perf): Avoid zero initialization...
-    to.resize(length, '\0');
-    NAPI_STATUS_RETURN(napi_get_value_string_utf8(env, from, &to[0], length + 1, &length));
-    to[length] = 0;
+    napi_status status = napi_ok;
+    to.resize_and_overwrite(length, [&](char* buf, size_t count) {
+      status = napi_get_value_string_utf8(env, from, buf, length + 1, &length);
+      return status == napi_ok ? length : 0;
+    });
+    NAPI_STATUS_RETURN(status);
   } else {
     rocksdb::Slice slice;
     NAPI_STATUS_RETURN(GetString(env, from, slice));
@@ -184,8 +186,12 @@ static napi_status GetString(napi_env env, napi_value from, rocksdb::PinnableSli
   if (type == napi_string) {
     size_t length = 0;
     NAPI_STATUS_RETURN(napi_get_value_string_utf8(env, from, nullptr, 0, &length));
-    to.GetSelf()->resize(length, '\0');
-    NAPI_STATUS_RETURN(napi_get_value_string_utf8(env, from, to.GetSelf()->data(), length + 1, &length));
+    napi_status status = napi_ok;
+    to.GetSelf()->resize_and_overwrite(length, [&](char* buf, size_t count) {
+      status = napi_get_value_string_utf8(env, from, buf, length + 1, &length);
+      return status == napi_ok ? length : 0;
+    });
+    NAPI_STATUS_RETURN(status);
     to.PinSelf();
   } else {
     rocksdb::Slice slice;
@@ -400,13 +406,6 @@ static napi_status GetProperty(napi_env env,
     return napi_invalid_arg;
   }
 
-  bool has = false;
-  NAPI_STATUS_RETURN(napi_has_named_property(env, obj, key.data(), &has));
-
-  if (!has) {
-    return required ? napi_invalid_arg : napi_ok;
-  }
-
   napi_value value;
   NAPI_STATUS_RETURN(napi_get_named_property(env, obj, key.data(), &value));
 
@@ -421,19 +420,23 @@ static napi_status GetProperty(napi_env env,
 }
 
 template <typename T>
-napi_status Convert(napi_env env, T&& s, Encoding encoding, napi_value& result, bool unsafe = false) {
-  if (!s) {
-    return napi_get_null(env, &result);
+napi_status Convert(napi_env env, const T& s, Encoding encoding, napi_value& result, bool unsafe = false) {
+  if constexpr (requires(std::decay_t<T> v) { *v; }) {
+    return s ? Convert(env, *s, encoding, result, unsafe) : napi_get_null(env, &result);
   } else if (encoding == Encoding::Buffer) {
-    return napi_create_buffer_copy(env, s->size(), s->data(), nullptr, &result);
+    return napi_create_buffer_copy(env, s.size(), s.data(), nullptr, &result);
   } else if (encoding == Encoding::String) {
-    return napi_create_string_utf8(env, s->data(), s->size(), &result);
+    return napi_create_string_utf8(env, s.data(), s.size(), &result);
   } else {
     return napi_invalid_arg;
   }
 }
 
-napi_status Convert(napi_env env, rocksdb::PinnableSlice&& s, Encoding encoding, napi_value& result, bool unsafe = false) {
+napi_status Convert(napi_env env,
+                    rocksdb::PinnableSlice&& s,
+                    Encoding encoding,
+                    napi_value& result,
+                    bool unsafe = false) {
   if (encoding == Encoding::Buffer) {
     if (unsafe) {
       auto s2 = new rocksdb::PinnableSlice(std::move(s));
@@ -451,9 +454,7 @@ napi_status Convert(napi_env env, rocksdb::PinnableSlice&& s, Encoding encoding,
 
 class HandleScope {
  public:
-  HandleScope(napi_env env) : env_(env) {
-    status_ = napi_open_handle_scope(env_, &scope_);
-  }
+  HandleScope(napi_env env) : env_(env) { status_ = napi_open_handle_scope(env_, &scope_); }
   ~HandleScope() {
     if (status_ == napi_ok && scope_) {
       napi_close_handle_scope(env_, scope_);
@@ -461,6 +462,7 @@ class HandleScope {
   }
   HandleScope(const HandleScope&) = delete;
   HandleScope& operator=(const HandleScope&) = delete;
+
  private:
   napi_env env_ = nullptr;
   napi_handle_scope scope_ = nullptr;
@@ -468,18 +470,7 @@ class HandleScope {
 };
 
 template <typename State, typename T1, typename T2>
-napi_status runAsync(State&& state,
-                     const std::string& name,
-                     napi_env env,
-                     napi_value callback,
-                     T1&& execute,
-                     T2&& then) {
-  {
-    napi_valuetype t;
-    NAPI_STATUS_RETURN(napi_typeof(env, callback, &t));
-    if (t != napi_function) { return napi_function_expected; }
-  }
-
+napi_status runAsync(napi_value asyncResourceName, napi_env env, napi_value callback, T1&& execute, T2&& then) {
   struct Worker final {
     static void Execute(napi_env env, void* data) {
       auto worker = reinterpret_cast<Worker*>(data);
@@ -495,6 +486,10 @@ napi_status runAsync(State&& state,
     static void Complete(napi_env env, napi_status status, void* data) {
       auto worker = std::unique_ptr<Worker>(reinterpret_cast<Worker*>(data));
 
+      if (status == napi_cancelled) {
+        return;  // env is tearing down, just clean up
+      }
+
       HandleScope scope(env);
 
       napi_value callback;
@@ -503,32 +498,31 @@ napi_status runAsync(State&& state,
       napi_value global;
       NAPI_STATUS_THROWS_VOID(napi_get_global(env, &global));
 
-      if (worker->status.ok()) {
-        std::vector<napi_value> argv;
-
-        argv.resize(1);
-        NAPI_STATUS_THROWS_VOID(napi_get_null(env, &argv[0]));
-
-        const auto ret = worker->then(worker->state, env, argv);
-
-        if (ret == napi_ok) {
-          NAPI_STATUS_THROWS_VOID(napi_call_function(env, global, callback, argv.size(), argv.data(), nullptr));
-        } else {
-          const napi_extended_error_info* errInfo = nullptr;
-          NAPI_STATUS_THROWS_VOID(napi_get_last_error_info(env, &errInfo));
-          auto err = CreateError(env, std::nullopt,
-                                 !errInfo || !errInfo->error_message ? "empty error message" : errInfo->error_message);
-          NAPI_STATUS_THROWS_VOID(napi_call_function(env, global, callback, 1, &err, nullptr));
-        }
-      } else {
-        auto err = ToError(env, worker->status);
-        NAPI_STATUS_THROWS_VOID(napi_call_function(env, global, callback, 1, &err, nullptr));
+      std::array<napi_value, 2> argv;
+      NAPI_STATUS_THROWS_VOID(napi_get_null(env, &argv[0]));
+      NAPI_STATUS_THROWS_VOID(napi_get_null(env, &argv[1]));
+
+      if (!worker->status.ok()) {
+        argv[0] = ToError(env, worker->status);
+      } else if (worker->then(worker->state, env, &argv[1]) != napi_ok) {
+        const napi_extended_error_info* errInfo = nullptr;
+        NAPI_STATUS_THROWS_VOID(napi_get_last_error_info(env, &errInfo));
+        argv[0] = CreateError(env, std::nullopt,
+                              !errInfo || !errInfo->error_message ? "empty error message" : errInfo->error_message);
       }
+
+      napi_call_function(env, global, callback, argv.size(), argv.data(), nullptr);
     }
 
     ~Worker() {
-      if (ref) { napi_delete_reference(env, ref); }
-      if (asyncWork) { napi_delete_async_work(env, asyncWork); }
+      if (ref) {
+        napi_delete_reference(env, ref);
+        ref = nullptr;
+      }
+      if (asyncWork) {
+        napi_delete_async_work(env, asyncWork);
+        asyncWork = nullptr;
+      }
     }
 
     napi_env env = nullptr;
@@ -543,12 +537,9 @@ napi_status runAsync(State&& state,
     rocksdb::Status status = rocksdb::Status::OK();
   };
 
-  auto worker =
-      std::unique_ptr<Worker>(new Worker{env, std::forward<T1>(execute), std::forward<T2>(then), std::move(state)});
+  auto worker = std::unique_ptr<Worker>(new Worker{env, std::forward<T1>(execute), std::forward<T2>(then)});
 
   NAPI_STATUS_RETURN(napi_create_reference(env, callback, 1, &worker->ref));
-  napi_value asyncResourceName;
-  NAPI_STATUS_RETURN(napi_create_string_utf8(env, name.data(), name.size(), &asyncResourceName));
   NAPI_STATUS_RETURN(napi_create_async_work(env, callback, asyncResourceName, Worker::Execute, Worker::Complete,
                                             worker.get(), &worker->asyncWork));
 
@@ -558,7 +549,15 @@ napi_status runAsync(State&& state,
 
   return napi_ok;
 }
-template <typename State, typename T1, typename T2>
-napi_status runAsync(const std::string& name, napi_env env, napi_value callback, T1&& execute, T2&& then) {
-  return runAsync<State>(State{}, name, env, callback, std::forward<T1>(execute), std::forward<T2>(then));
+
+template <typename State, typename T1>
+napi_status runAsync(napi_value asyncResourceName, napi_env env, napi_value callback, T1&& execute) {
+  return runAsync<State>(asyncResourceName, env, callback, std::forward<T1>(execute),
+                         [](auto& state, auto env, auto result) { return napi_ok; });
+}
+
+template <typename T1>
+napi_status runAsync(napi_value asyncResourceName, napi_env env, napi_value callback, T1&& execute) {
+  return runAsync<std::nullptr_t>(asyncResourceName, env, callback, std::forward<T1>(execute),
+                                  [](auto& state, auto env, auto result) { return napi_ok; });
 }

package/deps/abseil-cpp/BUILD.bazel

@@ -1,35 +0,0 @@
-# Copyright 2020 The Abseil Authors.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-package(default_visibility = ["//visibility:public"])
-
-licenses(["notice"])  # Apache 2.0
-
-# Expose license for external usage through bazel.
-exports_files([
-    "AUTHORS",
-    "LICENSE",
-])
-
-# For building with clang-cl.
-# https://bazel.build/configure/windows#clang
-platform(
-    name = "x64_windows-clang-cl",
-    constraint_values = [
-        "@platforms//cpu:x86_64",
-        "@platforms//os:windows",
-        "@bazel_tools//tools/cpp:clang-cl",
-    ],
-)