@nxtedition/rocksdb 15.4.0 → 15.4.1

package/binding.cc

@@ -1426,10 +1426,6 @@ NAPI_METHOD(db_open) {
   return 0;
 }
 
-napi_value noop_callback(napi_env env, napi_callback_info info) {
-  return 0;
-}
-
 NAPI_METHOD(db_close) {
   NAPI_ARGV(2);
 

package/cache.js

@@ -5,7 +5,7 @@ const binding = require('./binding')
 const kCacheContext = Symbol('cacheContext')
 
 class RocksCache {
-  constructor(optionsOrHandle = {}) {
+  constructor (optionsOrHandle = {}) {
     this[kCacheContext] = binding.cache_init(optionsOrHandle)
   }
 

package/chained-batch.js

@@ -23,6 +23,10 @@ class ChainedBatch extends AbstractChainedBatch {
     this[kBusy] = false
   }
 
+  [Symbol.asyncDispose] () {
+    return this.close()
+  }
+
   get length () {
     assert(this[kBatchContext])
 
@@ -109,10 +113,15 @@ class ChainedBatch extends AbstractChainedBatch {
     callback = fromCallback(callback, kPromise)
 
     this[kBusy] = true
-    binding.batch_write(this[kDbContext], this[kBatchContext], options ?? EMPTY, (err) => {
+    try {
+      binding.batch_write(this[kDbContext], this[kBatchContext], options ?? EMPTY, (err) => {
+        this[kBusy] = false
+        callback(err)
+      })
+    } catch (err) {
       this[kBusy] = false
-      callback(err)
-    })
+      process.nextTick(callback, err)
+    }
 
     return callback[kPromise]
   }

package/index.js

@@ -18,7 +18,7 @@ const kPendingClose = Symbol('pendingClose')
 
 const { kRef, kUnref } = require('./util')
 
-const kEmpty = {}
+const kEmpty = Object.freeze({})
 
 class RocksLevel extends AbstractLevel {
   constructor (locationOrHandle, { ...options } = {}) {
@@ -41,6 +41,10 @@ class RocksLevel extends AbstractLevel {
     this[kPendingClose] = null
   }
 
+  [Symbol.asyncDispose] () {
+    return this.close()
+  }
+
   static async open (...args) {
     const db = new this(...args)
     await db.open()
@@ -90,7 +94,7 @@ class RocksLevel extends AbstractLevel {
 
     if (options.createIfMissing) {
       fs.mkdir(this.location, { recursive: true }, (err) => {
-        if (err) {
+        if (err && err.code !== 'EEXIST') {
           callback(err)
         } else {
           doOpen()
@@ -157,6 +161,10 @@ class RocksLevel extends AbstractLevel {
   }
 
   _getManyAsync (keys, options, callback) {
+    if (keys.some(key => typeof key === 'string')) {
+      keys = keys.map(key => typeof key === 'string' ? Buffer.from(key) : key)
+    }
+
     callback = fromCallback(callback, kPromise)
 
     try {
@@ -170,6 +178,7 @@ class RocksLevel extends AbstractLevel {
         }
       })
     } catch (err) {
+      this[kUnref]()
       process.nextTick(callback, err)
     }
 

package/iterator.js

@@ -16,7 +16,7 @@ const kFirst = Symbol('first')
 const kPosition = Symbol('position')
 const kBusy = Symbol('busy')
 
-const kEmpty = []
+const kEmpty = Object.freeze([])
 
 class Iterator extends AbstractIterator {
   constructor (db, context, options) {
@@ -32,6 +32,10 @@ class Iterator extends AbstractIterator {
     this[kBusy] = false
   }
 
+  [Symbol.asyncDispose] () {
+    return this.close()
+  }
+
   _seek (target) {
     this._seekSync(target)
   }
@@ -132,6 +136,8 @@ class Iterator extends AbstractIterator {
     this[kPosition] = 0
 
     try {
+      this[kDB][kRef]()
+      this[kBusy] = true
       binding.iterator_seek(this[kContext], target, (err) => {
         this[kBusy] = false
         this[kDB][kUnref]()
@@ -142,9 +148,9 @@ class Iterator extends AbstractIterator {
           callback(null)
         }
       })
-      this[kDB][kRef]()
-      this[kBusy] = true
     } catch (err) {
+      this[kBusy] = false
+      this[kDB][kUnref]()
       process.nextTick(callback, err)
     }
 
@@ -175,6 +181,8 @@ class Iterator extends AbstractIterator {
       if (this[kFinished]) {
         process.nextTick(callback, null, { rows: [], finished: true })
       } else {
+        this[kDB][kRef]()
+        this[kBusy] = true
         binding.iterator_nextv(this[kContext], size, options, (err, result) => {
           this[kBusy] = false
           this[kDB][kUnref]()
@@ -186,10 +194,10 @@ class Iterator extends AbstractIterator {
             callback(null, result)
           }
         })
-        this[kBusy] = true
-        this[kDB][kRef]()
       }
     } catch (err) {
+      this[kBusy] = false
+      this[kDB][kUnref]()
       process.nextTick(callback, err)
     }
 

package/package.json

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