@nxtedition/rocksdb 15.3.0 → 15.4.1

package/.claude/settings.local.json

@@ -28,7 +28,8 @@
       "Bash(git rm:*)",
       "WebFetch(domain:raw.githubusercontent.com)",
       "Bash(git log:*)",
-      "WebFetch(domain:github.com)"
+      "WebFetch(domain:github.com)",
+      "Bash(npm run rebuild:*)"
     ]
   }
 }

package/binding.cc

@@ -812,7 +812,7 @@ static void FinalizeDatabase(napi_env env, void* data, void* hint) {
 }
 
 NAPI_METHOD(db_init) {
-  NAPI_ARGV(1);
+  NAPI_ARGV(2);
 
   Database* database = nullptr;
 
@@ -1024,7 +1024,35 @@ napi_status InitOptions(napi_env env, T& columnOptions, const U& options) {
   tableOptions.decouple_partitioned_filters = true;
 
   std::shared_ptr<rocksdb::Cache> cache;
+
   {
+    napi_value cacheValue;
+    NAPI_STATUS_RETURN(napi_get_named_property(env, options, "cache", &cacheValue));
+
+    napi_valuetype cacheType;
+    NAPI_STATUS_RETURN(napi_typeof(env, cacheValue, &cacheType));
+
+    if (cacheType == napi_object) {
+      napi_value handleValue;
+      NAPI_STATUS_RETURN(napi_get_named_property(env, cacheValue, "handle", &handleValue));
+
+      bool lossless;
+      int64_t ptr;
+      NAPI_STATUS_RETURN(napi_get_value_bigint_int64(env, handleValue, &ptr, &lossless));
+
+      cache = *reinterpret_cast<std::shared_ptr<rocksdb::Cache>*>(ptr);
+    } else if (cacheType == napi_bigint) {
+      bool lossless;
+      int64_t ptr;
+      NAPI_STATUS_RETURN(napi_get_value_bigint_int64(env, cacheValue, &ptr, &lossless));
+
+      cache = *reinterpret_cast<std::shared_ptr<rocksdb::Cache>*>(ptr);
+    } else if (cacheType != napi_undefined && cacheType != napi_null) {
+      return napi_invalid_arg;
+    }
+  }
+
+  if (!cache) {
     uint32_t cacheSize = 8 << 20;
     double compressedRatio = 0.0;
 
@@ -1032,7 +1060,7 @@ napi_status InitOptions(napi_env env, T& columnOptions, const U& options) {
     NAPI_STATUS_RETURN(GetProperty(env, options, "cacheCompressedRatio", compressedRatio));
 
     if (cacheSize == 0) {
-      cache = nullptr;
+      // Do nothing...
     } else if (compressedRatio > 0.0) {
       rocksdb::TieredCacheOptions options;
       options.cache_type = rocksdb::PrimaryCacheType::kCacheTypeHCC;
@@ -1398,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);
 
@@ -2248,6 +2272,32 @@ NAPI_METHOD(db_compact_range) {
   return 0;
 }
 
+NAPI_METHOD(cache_init) {
+  NAPI_ARGV(1);
+
+  size_t capacity = 32 * 1024 * 1024;  // 32 MiB
+  NAPI_STATUS_THROWS(GetProperty(env, argv[0], "capacity", capacity));
+
+  auto cache = new std::shared_ptr<rocksdb::Cache>(rocksdb::HyperClockCacheOptions(capacity, 0).MakeSharedCache());
+
+  napi_value result;
+  NAPI_STATUS_THROWS(napi_create_external(env, cache, Finalize<std::shared_ptr<rocksdb::Cache>>, cache, &result));
+
+  return result;
+}
+
+NAPI_METHOD(cache_get_handle) {
+  NAPI_ARGV(1);
+
+  std::shared_ptr<rocksdb::Cache>* cache;
+  NAPI_STATUS_THROWS(napi_get_value_external(env, argv[0], reinterpret_cast<void**>(&cache)));
+
+  napi_value result;
+  NAPI_STATUS_THROWS(napi_create_bigint_int64(env, reinterpret_cast<intptr_t>(cache), &result));
+
+  return result;
+}
+
 NAPI_INIT() {
   NAPI_EXPORT_FUNCTION(db_init);
   NAPI_EXPORT_FUNCTION(db_open);
@@ -2286,4 +2336,7 @@ NAPI_INIT() {
   NAPI_EXPORT_FUNCTION(batch_merge);
   NAPI_EXPORT_FUNCTION(batch_count);
   NAPI_EXPORT_FUNCTION(batch_iterate);
+
+  NAPI_EXPORT_FUNCTION(cache_init);
+  NAPI_EXPORT_FUNCTION(cache_get_handle);
 }

package/cache.js

@@ -0,0 +1,17 @@
+'use strict'
+
+const binding = require('./binding')
+
+const kCacheContext = Symbol('cacheContext')
+
+class RocksCache {
+  constructor (optionsOrHandle = {}) {
+    this[kCacheContext] = binding.cache_init(optionsOrHandle)
+  }
+
+  get handle () {
+    return binding.cache_get_handle(this[kCacheContext])
+  }
+}
+
+exports.RocksCache = RocksCache

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

@@ -5,6 +5,7 @@ const { AbstractLevel } = require('abstract-level')
 const ModuleError = require('module-error')
 const binding = require('./binding')
 const { ChainedBatch } = require('./chained-batch')
+const { RocksCache } = require('./cache')
 const { Iterator } = require('./iterator')
 const fs = require('node:fs')
 const assert = require('node:assert')
@@ -17,10 +18,10 @@ const kPendingClose = Symbol('pendingClose')
 
 const { kRef, kUnref } = require('./util')
 
-const kEmpty = {}
+const kEmpty = Object.freeze({})
 
 class RocksLevel extends AbstractLevel {
-  constructor (locationOrHandle, options) {
+  constructor (locationOrHandle, { ...options } = {}) {
     super({
       encodings: {
         buffer: true,
@@ -40,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()
@@ -89,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()
@@ -156,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 {
@@ -169,6 +178,7 @@ class RocksLevel extends AbstractLevel {
         }
       })
     } catch (err) {
+      this[kUnref]()
       process.nextTick(callback, err)
     }
 
@@ -339,3 +349,4 @@ class RocksLevel extends AbstractLevel {
 }
 
 exports.RocksLevel = RocksLevel
+exports.RocksCache = RocksCache

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.3.0",
+  "version": "15.4.1",
   "description": "A low-level Node.js RocksDB binding",
   "license": "MIT",
   "main": "index.js",