@nxtedition/rocksdb 12.0.2 → 12.0.4

package/chained-batch.js

@@ -4,6 +4,7 @@ const { AbstractChainedBatch } = require('abstract-level')
 const binding = require('./binding')
 const ModuleError = require('module-error')
 const { fromCallback } = require('catering')
+const assert = require('node:assert')
 
 const kBatchContext = Symbol('batchContext')
 const kDbContext = Symbol('dbContext')
@@ -20,6 +21,8 @@ class ChainedBatch extends AbstractChainedBatch {
   }
 
   _put (key, value, options) {
+    assert(this[kBatchContext])
+
     if (key === null || key === undefined) {
       throw new ModuleError('Key cannot be null or undefined', {
         code: 'LEVEL_INVALID_KEY'
@@ -39,6 +42,8 @@ class ChainedBatch extends AbstractChainedBatch {
   }
 
   _del (key, options) {
+    assert(this[kBatchContext])
+
     if (key === null || key === undefined) {
       throw new ModuleError('Key cannot be null or undefined', {
         code: 'LEVEL_INVALID_KEY'
@@ -51,10 +56,14 @@ class ChainedBatch extends AbstractChainedBatch {
   }
 
   _clear () {
+    assert(this[kBatchContext])
+
     binding.batch_clear(this[kBatchContext])
   }
 
   _write (options, callback) {
+    assert(this[kBatchContext])
+
     callback = fromCallback(callback, kPromise)
 
     try {
@@ -68,19 +77,33 @@ class ChainedBatch extends AbstractChainedBatch {
   }
 
   _writeSync (options) {
+    assert(this[kBatchContext])
+
     binding.batch_write(this[kDbContext], this[kBatchContext], options ?? EMPTY)
   }
 
   _close (callback) {
-    binding.batch_clear(this[kBatchContext])
+    this._closeSync()
+
     process.nextTick(callback)
   }
 
+  _closeSync () {
+    if (this[kBatchContext]) {
+      binding.batch_clear(this[kBatchContext])
+      this[kBatchContext] = null
+    }
+  }
+
   get length () {
+    assert(this[kBatchContext])
+
     return binding.batch_count(this[kBatchContext])
   }
 
   _merge (key, value, options) {
+    assert(this[kBatchContext])
+
     if (key === null || key === undefined) {
       throw new ModuleError('Key cannot be null or undefined', {
         code: 'LEVEL_INVALID_KEY'
@@ -111,6 +134,8 @@ class ChainedBatch extends AbstractChainedBatch {
   }
 
   toArray (options) {
+    assert(this[kBatchContext])
+
     return binding.batch_iterate(this[kDbContext], this[kBatchContext], {
       keys: true,
       values: true,

package/iterator.js

@@ -2,6 +2,7 @@
 
 const { fromCallback } = require('catering')
 const { AbstractIterator } = require('abstract-level')
+const assert = require('node:assert')
 
 const binding = require('./binding')
 
@@ -26,6 +27,8 @@ class Iterator extends AbstractIterator {
   }
 
   _seek (target) {
+    assert(this[kContext])
+
     if (target.length === 0) {
       throw new Error('cannot seek() to an empty target')
     }
@@ -39,6 +42,8 @@ class Iterator extends AbstractIterator {
   }
 
   _next (callback) {
+    assert(this[kContext])
+
     if (this[kPosition] < this[kCache].length) {
       const key = this[kCache][this[kPosition]++]
       const val = this[kCache][this[kPosition]++]
@@ -65,6 +70,8 @@ class Iterator extends AbstractIterator {
   }
 
   _nextv (size, options, callback) {
+    assert(this[kContext])
+
     callback = fromCallback(callback, kPromise)
 
     if (this[kFinished]) {
@@ -72,28 +79,28 @@ class Iterator extends AbstractIterator {
     } else {
       this[kFirst] = false
 
-      setImmediate(() => {
-        try {
-          const { rows, finished } = binding.iterator_nextv(this[kContext], size)
+      try {
+        const { rows, finished } = binding.iterator_nextv(this[kContext], size)
 
-          const entries = []
-          for (let n = 0; n < rows.length; n += 2) {
-            entries.push([rows[n + 0], rows[n + 1]])
-          }
+        const entries = []
+        for (let n = 0; n < rows.length; n += 2) {
+          entries.push([rows[n + 0], rows[n + 1]])
+        }
 
-          this[kFinished] = finished
+        this[kFinished] = finished
 
-          callback(null, entries, finished)
-        } catch (err) {
-          callback(err)
-        }
-      })
+        process.nextTick(callback, null, entries, finished)
+      } catch (err) {
+        process.nextTick(callback, err)
+      }
     }
 
     return callback[kPromise]
   }
 
   _nextvSync (size, options) {
+    assert(this[kContext])
+
     if (this[kFinished]) {
       return { rows: [], finished: true }
     }
@@ -117,7 +124,11 @@ class Iterator extends AbstractIterator {
 
   _closeSync () {
     this[kCache] = kEmpty
-    binding.iterator_close(this[kContext])
+
+    if (this[kContext]) {
+      binding.iterator_close(this[kContext])
+      this[kContext] = null
+    }
   }
 
   _end (callback) {

package/package.json

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