@nxtedition/rocksdb 5.2.28 → 5.2.33

package/binding.cc

@@ -167,19 +167,6 @@ static std::string StringProperty(napi_env env,
   return defaultValue;
 }
 
-static size_t StringOrBufferLength(napi_env env, napi_value value) {
-  size_t size = 0;
-
-  if (IsString(env, value)) {
-    napi_get_value_string_utf8(env, value, nullptr, 0, &size);
-  } else if (IsBuffer(env, value)) {
-    char* buf = nullptr;
-    napi_get_buffer_info(env, value, (void**)&buf, &size);
-  }
-
-  return size;
-}
-
 static std::optional<std::string> RangeOption(napi_env env, napi_value opts, const std::string_view& name) {
   if (HasProperty(env, opts, name)) {
     const auto value = GetProperty(env, opts, name);
@@ -190,9 +177,20 @@ static std::optional<std::string> RangeOption(napi_env env, napi_value opts, con
 }
 
 static napi_status CallFunction(napi_env env, napi_value callback, const int argc, napi_value* argv) {
+  napi_status status;
   napi_value global;
-  napi_get_global(env, &global);
-  return napi_call_function(env, global, callback, argc, argv, nullptr);
+
+  status = napi_get_global(env, &global);
+  if (status != napi_ok) {
+    return status;
+  }
+
+  status = napi_call_function(env, global, callback, argc, argv, nullptr);
+  if (status != napi_ok) {
+    return status;
+  }
+
+  return napi_ok;
 }
 
 static napi_value ToError(napi_env env, const rocksdb::Status& status) {
@@ -222,11 +220,11 @@ static napi_value ToError(napi_env env, const rocksdb::Status& status) {
 }
 
 template <typename T>
-void Convert(napi_env env, const T& s, bool asBuffer, napi_value& result) {
+napi_status Convert(napi_env env, const T& s, bool asBuffer, napi_value& result) {
   if (asBuffer) {
-    napi_create_buffer_copy(env, s.size(), s.data(), nullptr, &result);
+    return napi_create_buffer_copy(env, s.size(), s.data(), nullptr, &result);
   } else {
-    napi_create_string_utf8(env, s.data(), s.size(), &result);
+    return napi_create_string_utf8(env, s.data(), s.size(), &result);
   }
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nxtedition/rocksdb",
-  "version": "5.2.28",
+  "version": "5.2.33",
   "description": "A low-level Node.js RocksDB binding",
   "license": "MIT",
   "main": "index.js",
@@ -12,17 +12,17 @@
     "test-prebuild": "cross-env PREBUILDS_ONLY=1 npm t",
     "coverage": "nyc report -r lcovonly",
     "rebuild": "npm run install --build-from-source",
-    "prebuild": "prebuildify -t 18.0.0 --napi --strip",
+    "prebuild": "prebuildify -t -t 8.14.0 --napi --strip",
     "download-prebuilds": "prebuildify-ci download",
     "hallmark": "hallmark --fix",
     "dependency-check": "dependency-check --no-dev -i napi-macros . test/*.js",
     "prepublishOnly": "npm run dependency-check",
-    "prebuild-linux-arm": "prebuildify-cross -i linux-armv6 -i linux-armv7 -i linux-arm64 -t 18.0.0 --napi --strip",
-    "prebuild-android-arm": "prebuildify-cross -i android-armv7 -i android-arm64 -t 18.0.0 --napi --strip",
-    "prebuild-linux-x64": "prebuildify-cross -i centos7-devtoolset7 -i alpine -t 18.0.0 --napi --strip",
-    "prebuild-darwin-x64+arm64": "prebuildify -t 18.0.0 --napi --strip --arch x64+arm64",
-    "prebuild-win32-x86": "prebuildify -t 18.0.0 --napi --strip",
-    "prebuild-win32-x64": "prebuildify -t 18.0.0 --napi --strip"
+    "prebuild-linux-arm": "prebuildify-cross -i linux-armv6 -i linux-armv7 -i linux-arm64 -t -t 8.14.0 --napi --strip",
+    "prebuild-android-arm": "prebuildify-cross -i android-armv7 -i android-arm64 -t -t 8.14.0 --napi --strip",
+    "prebuild-linux-x64": "prebuildify-cross -i centos7-devtoolset7 -i alpine -t -t 8.14.0 --napi --strip",
+    "prebuild-darwin-x64+arm64": "prebuildify -t -t 8.14.0 --napi --strip --arch x64+arm64",
+    "prebuild-win32-x86": "prebuildify -t -t 8.14.0 --napi --strip",
+    "prebuild-win32-x64": "prebuildify -t -t 8.14.0 --napi --strip"
   },
   "dependencies": {
     "abstract-level": "^1.0.2",