@nxtedition/rocksdb 7.1.9 → 7.1.12

package/binding.cc

@@ -1495,23 +1495,39 @@ NAPI_METHOD(batch_write) {
     napi_ref batchRef;
     NAPI_STATUS_THROWS(napi_create_reference(env, argv[1], 1, &batchRef));
 
-    struct State {};
-    runAsync<State>(
+    runAsync<int64_t>(
         "leveldown.batch.write", env, callback,
-        [=](auto& state) {
+        [=](int64_t& seq) {
           rocksdb::WriteOptions writeOptions;
           writeOptions.sync = *sync;
+
+          // TODO (fix): Better way to get final batch sequence?
+          seq = database->db->GetLatestSequenceNumber() + 1;
+
           return database->db->Write(writeOptions, batch);
         },
-        [=](auto& state, auto env, auto& argv) { return napi_delete_reference(env, batchRef); });
+        [=](int64_t& seq, auto env, auto& argv) {
+          argv.resize(2);
+          NAPI_STATUS_RETURN(napi_delete_reference(env, batchRef));
+          NAPI_STATUS_RETURN(napi_create_int64(env, seq, &argv[1]));
+          return napi_ok;
+        });
   } else {
+    // TODO (fix): Better way to get final batch sequence?
+    auto seq = database->db->GetLatestSequenceNumber() + 1;
+
+    std::array<napi_value, 2> result;
+
+    NAPI_STATUS_THROWS(napi_get_null(env, &result[0]));
+    NAPI_STATUS_THROWS(napi_create_int64(env, seq, &result[1]));
+
     rocksdb::WriteOptions writeOptions;
     ROCKS_STATUS_THROWS_NAPI(database->db->Write(writeOptions, batch));
 
     napi_value global;
     NAPI_STATUS_THROWS(napi_get_global(env, &global));
 
-    NAPI_STATUS_THROWS(napi_call_function(env, global, callback, 0, nullptr, nullptr));
+    NAPI_STATUS_THROWS(napi_call_function(env, global, callback, result.size(), result.data(), nullptr));
   }
 
   return 0;

package/index.js

@@ -206,14 +206,20 @@ class RocksLevel extends AbstractLevel {
         const seq = this.sequence
         let sync = true
         this[kRef]()
-        binding.batch_write(this[kContext], context, options, (err) => {
+        binding.batch_write(this[kContext], context, options, (err, sequence) => {
           this[kUnref]()
 
+          // TODO (fix): Temporary workaround.
+          if (sequence == null && typeof err === 'number') {
+            sequence = err
+            err = null
+          }
+
           if (!err) {
             this.emit('update', {
               rows: batch.toArray(),
               count: batch.length,
-              sequence: seq + 1
+              sequence: sequence ?? (seq + 1)
             })
           }
           if (sync) {
@@ -346,7 +352,7 @@ class RocksLevel extends AbstractLevel {
     const db = this
 
     try {
-      let since = options.since
+      let since = (options.since ?? 0) + 1
       while (true) {
         const buffer = new Readable({
           signal: ac.signal,

package/package.json

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