hypercore-storage 2.0.0 → 2.0.2

package/index.js

@@ -194,8 +194,9 @@ class HypercoreStorage {
   }
 
   atomize(atom) {
-    if (this.atom && this.atom !== atom)
+    if (this.atom && this.atom !== atom) {
       throw new Error('Cannot atomize and atomized session with a new atom')
+    }
     return new HypercoreStorage(this.store, this.db.session(), this.core, atom.view, atom)
   }
 
@@ -428,13 +429,12 @@ class CorestoreStorage {
     this.allowBackup = !!opts.allowBackup
     this.deviceFile = null
     this.wait = !!opts.wait
-    this.lock = !!opts.lock || this.wait
+
+    const preopen = this._openDeviceFile()
 
     // tmp sync fix for simplicty since not super deployed yet
     if (this.bootstrap && !this.readOnly) tmpFixStorage(this.path)
 
-    this.rocks = storage === null ? db : new RocksDB(path.join(this.path, 'db'), opts)
-    this.db = createColumnFamily(this.rocks, opts)
     this.id = opts.id || null
     this.view = null
     this.enters = 0
@@ -442,6 +442,14 @@ class CorestoreStorage {
     this.flushing = null
     this.version = 0
     this.migrating = null
+    this.preopen = preopen
+
+    this.rocks =
+      storage === null ? db : new RocksDB(path.join(this.path, 'db'), { ...opts, preopen })
+
+    this.db = createColumnFamily(this.rocks, opts)
+
+    preopen.catch(noop) // awaited in rocks
   }
 
   get opened() {
@@ -452,6 +460,19 @@ class CorestoreStorage {
     return this.db.closed
   }
 
+  async _openDeviceFile() {
+    if ((this.bootstrap && !this.readOnly && !this.allowBackup) || this.wait) {
+      const corestoreFile = path.join(this.path, 'CORESTORE')
+
+      this.deviceFile = new DeviceFile(corestoreFile, {
+        wait: this.wait,
+        data: { id: this.id }
+      })
+
+      await this.deviceFile.ready()
+    }
+  }
+
   async ready() {
     if (this.version === 0) await this._migrateStore()
     return this.db.ready()
@@ -537,20 +558,9 @@ class CorestoreStorage {
     try {
       if (this.version === VERSION) return
 
+      await this._preopen
       await this.db.ready()
 
-      if (this.bootstrap && !this.readOnly && !this.allowBackup) {
-        const corestoreFile = path.join(this.path, 'CORESTORE')
-
-        this.deviceFile = new DeviceFile(corestoreFile, {
-          wait: this.wait,
-          lock: this.lock,
-          data: { id: this.id }
-        })
-
-        await this.deviceFile.ready()
-      }
-
       const rx = new CorestoreRX(this.db, view)
       const headPromise = rx.getHead()
 

package/lib/streams.js

@@ -105,8 +105,9 @@ function createUserDataStream(
   view,
   { gt = null, gte = '', lte = null, lt = null, reverse = false } = {}
 ) {
-  if (gt !== null || lte !== null)
+  if (gt !== null || lte !== null) {
     throw new Error('gt and lte not yet supported for user data streams')
+  }
 
   const s = core.userData(ptr.dataPointer, gte)
   const e = lt === null ? core.userDataEnd(ptr.dataPointer) : core.userData(ptr.dataPointer, lt)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hypercore-storage",
-  "version": "2.0.0",
+  "version": "2.0.2",
   "main": "index.js",
   "files": [
     "index.js",