rocksdb-native 3.3.0 → 3.3.1

package/CMakeLists.txt

@@ -13,7 +13,7 @@ if(target MATCHES "win32")
   add_compile_options(/MT$<$<CONFIG:Debug>:d>)
 endif()
 
-fetch_package("github:holepunchto/librocksdb#2b388ab")
+fetch_package("github:holepunchto/librocksdb#2adf4ff")
 
 add_bare_module(rocksdb_native_bare)
 

package/lib/batch.js

@@ -20,6 +20,7 @@ class RocksDBBatch {
 
     this._request = null
     this._resolve = null
+    this._reject = null
 
     this._handle = null
     this._buffer = null
@@ -38,16 +39,20 @@ class RocksDBBatch {
     this._autoDestroy = autoDestroy
   }
 
-  _onfinished() {
+  _onfinished(err) {
     const resolve = this._resolve
+    const reject = this._reject
 
     this._operations = []
     this._promises = []
     this._request = null
     this._resolve = null
+    this._reject = null
 
     if (this._autoDestroy === true) this.destroy()
-    if (resolve !== null) resolve()
+
+    if (reject !== null && err) reject(err)
+    else if (resolve !== null) resolve()
   }
 
   _resize() {
@@ -96,8 +101,9 @@ class RocksDBBatch {
     if (this._request) throw new Error('Request in progress')
     if (this._destroyed) throw new Error('Batch is destroyed')
 
-    this._request = new Promise((resolve) => {
+    this._request = new Promise((resolve, reject) => {
       this._resolve = resolve
+      this._reject = reject
     })
 
     this._flush()
@@ -166,21 +172,26 @@ exports.ReadBatch = class RocksDBReadBatch extends RocksDBBatch {
   }
 
   _onread(errs, values) {
+    let applied = true
+
     for (let i = 0, n = this._promises.length; i < n; i++) {
       const promise = this._promises[i]
       if (promise === null) continue
 
       const err = errs[i]
 
-      if (err) promise.reject(new Error(err))
-      else {
+      if (err) {
+        applied = false
+
+        promise.reject(new Error(err))
+      } else {
         promise.resolve(
           values[i] ? this._decodeValue(Buffer.from(values[i])) : null
         )
       }
     }
 
-    this._onfinished()
+    this._onfinished(applied ? null : new Error('Batch was not applied'))
   }
 
   get(key) {
@@ -227,15 +238,22 @@ exports.WriteBatch = class RocksDBWriteBatch extends RocksDBBatch {
   }
 
   _onwrite(err) {
+    let applied = true
+
     for (let i = 0, n = this._promises.length; i < n; i++) {
       const promise = this._promises[i]
       if (promise === null) continue
 
-      if (err) promise.reject(new Error(err))
-      else promise.resolve()
+      if (err) {
+        applied = false
+
+        promise.reject(new Error(err))
+      } else {
+        promise.resolve()
+      }
     }
 
-    this._onfinished()
+    this._onfinished(applied ? null : new Error('Batch was not applied'))
   }
 
   put(key, value) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rocksdb-native",
-  "version": "3.3.0",
+  "version": "3.3.1",
   "description": "librocksdb bindings for JavaScript",
   "exports": {
     ".": "./index.js",