@nxtedition/rocksdb 11.1.2 → 11.1.4

package/binding.cc

@@ -1487,17 +1487,22 @@ NAPI_METHOD(regex_init) {
   std::string pattern;
   NAPI_STATUS_THROWS(GetString(env, argv[0], pattern));
 
-  auto batch = std::make_unique<std::regex>(pattern, std::regex::optimize | std::regex::ECMAScript);
+  try {
+    auto regex = std::make_unique<std::regex>(pattern, std::regex::optimize | std::regex::ECMAScript);
 
-  napi_value result;
-  NAPI_STATUS_THROWS(napi_create_external(env, batch.get(), Finalize<std::regex>, batch.get(), &result));
-  batch.release();
+    napi_value result;
+    NAPI_STATUS_THROWS(napi_create_external(env, regex.get(), Finalize<std::regex>, regex.get(), &result));
+    regex.release();
 
-  return result;
+    return result;
+  } catch (const std::exception& e) {
+    napi_throw_error(env, nullptr, e.what());
+    return 0;
+  }
 }
 
 NAPI_METHOD(regex_test) {
-  NAPI_ARGV(2);
+  NAPI_ARGV(4);
 
   std::regex* regex;
   NAPI_STATUS_THROWS(napi_get_value_external(env, argv[0], reinterpret_cast<void**>(&regex)));
@@ -1505,12 +1510,25 @@ NAPI_METHOD(regex_test) {
   rocksdb::Slice value;
   NAPI_STATUS_THROWS(GetValue(env, argv[1], value));
 
-  const bool match = std::regex_search(value.data(), value.data() + value.size(), *regex);
+  int offset = 0;
+  NAPI_STATUS_THROWS(GetValue(env, argv[2], offset));
+  offset = std::max(0, std::min<int>(offset, value.size()));
 
-  napi_value result;
-  NAPI_STATUS_THROWS(napi_get_boolean(env, match, &result));
+  int length = 0;
+  NAPI_STATUS_THROWS(GetValue(env, argv[3], length));
+  length = std::max(0, std::min<int>(length, value.size() - offset));
 
-  return result;
+  try {
+    const bool match = std::regex_search(value.data() + offset, value.data() + offset + length, *regex);
+
+    napi_value result;
+    NAPI_STATUS_THROWS(napi_get_boolean(env, match, &result));
+
+    return result;
+  } catch (const std::exception& e) {
+    napi_throw_error(env, nullptr, e.what());
+    return 0;
+  }
 }
 
 NAPI_METHOD(regex_test_many) {
@@ -1525,22 +1543,27 @@ NAPI_METHOD(regex_test_many) {
   napi_value result;
   NAPI_STATUS_THROWS(napi_create_array_with_length(env, count, &result));
 
-  for (uint32_t n = 0; n < count; n++) {
-    napi_value valueElement;
-    NAPI_STATUS_THROWS(napi_get_element(env, argv[1], n, &valueElement));
+  try {
+    for (uint32_t n = 0; n < count; n++) {
+      napi_value valueElement;
+      NAPI_STATUS_THROWS(napi_get_element(env, argv[1], n, &valueElement));
 
-    rocksdb::Slice value;
-    NAPI_STATUS_THROWS(GetValue(env, valueElement, value));
+      rocksdb::Slice value;
+      NAPI_STATUS_THROWS(GetValue(env, valueElement, value));
 
-    const bool match = std::regex_search(value.data(), value.data() + value.size(), *regex);
+      const bool match = std::regex_search(value.data(), value.data() + value.size(), *regex);
 
-    napi_value matchElement;
-    NAPI_STATUS_THROWS(napi_get_boolean(env, match, &matchElement));
+      napi_value matchElement;
+      NAPI_STATUS_THROWS(napi_get_boolean(env, match, &matchElement));
 
-    NAPI_STATUS_THROWS(napi_set_element(env, result, n, matchElement));
-  }
+      NAPI_STATUS_THROWS(napi_set_element(env, result, n, matchElement));
+    }
 
-  return result;
+    return result;
+  } catch (const std::exception& e) {
+    napi_throw_error(env, nullptr, e.what());
+    return 0;
+  }
 }
 
 

package/deps/rocksdb/rocksdb.gyp

@@ -71,10 +71,10 @@
               "-momit-leaf-frame-pointer",
               "-fno-builtin-memcmp"
             ],
-            "cflags": ["-std=c++20"],
+            "cflags": ["-std=c++20", "-march=znver1"],
             "cflags!": ["-fno-rtti"],
             "cflags_cc!": ["-fno-rtti"],
-            "cflags_cc+": ["-frtti"]
+            "cflags_cc+": ["-frtti", '-march=znver1']
           }
         ],
         [

package/package.json

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

package/regex.js

@@ -9,8 +9,16 @@ class Regex {
     this.#context = binding.regex_init(pattern)
   }
 
-  test (value) {
-    return binding.regex_test(this.#context, value)
+  test (buffer, byteOffset, byteLength) {
+    if (byteOffset === undefined) {
+      byteOffset = 0
+    }
+
+    if (byteLength === undefined) {
+      byteLength = buffer.byteLength - byteOffset
+    }
+
+    return binding.regex_test(this.#context, buffer, byteOffset, byteLength)
   }
 
   testMany (values) {