hypercore-storage 0.0.24 → 0.0.26

package/index.js

@@ -263,12 +263,9 @@ class ReadBatch {
 }
 
 module.exports = class CoreStorage {
-  constructor (dir, { autoClose = true } = {}) {
+  constructor (dir) {
     this.db = new RocksDB(dir)
     this.mutex = new RW()
-    this.autoClose = !!autoClose
-
-    this.sessions = 0
   }
 
   // just a helper to make tests easier
@@ -361,7 +358,7 @@ module.exports = class CoreStorage {
     return new HypercoreStorage(this, discoveryKey, core, data, null)
   }
 
-  async create ({ key, manifest, keyPair, encryptionKey, discoveryKey }) {
+  async create ({ key, manifest, keyPair, encryptionKey, discoveryKey, userData }) {
     await this.mutex.write.lock()
 
     try {
@@ -393,7 +390,7 @@ module.exports = class CoreStorage {
       const batch = new WriteBatch(storage, write)
 
       initialiseCoreInfo(batch, { key, manifest, keyPair, encryptionKey })
-      initialiseCoreData(batch)
+      initialiseCoreData(batch, { userData })
 
       await batch.flush()
       return storage
@@ -401,11 +398,6 @@ module.exports = class CoreStorage {
       this.mutex.write.unlock()
     }
   }
-
-  _onclose () {
-    if (--this.sessions > 0 || !this.autoClose) return Promise.resolve()
-    return this.close()
-  }
 }
 
 class HypercoreStorage {
@@ -415,8 +407,6 @@ class HypercoreStorage {
     this.dbSnapshot = snapshot
     this.mutex = root.mutex
 
-    this.root.sessions++
-
     this.discoveryKey = discoveryKey
 
     this.dependencies = []
@@ -425,7 +415,7 @@ class HypercoreStorage {
     this.corePointer = core
     this.dataPointer = data
 
-    this.closed = false
+    this.destroyed = false
   }
 
   get snapshotted () {
@@ -486,30 +476,30 @@ class HypercoreStorage {
   }
 
   snapshot () {
-    assert(this.closed === false)
+    assert(this.destroyed === false)
     return new HypercoreStorage(this.root, this.discoveryKey, this.corePointer, this.dataPointer, this.db.snapshot())
   }
 
   createReadBatch (opts) {
-    assert(this.closed === false)
+    assert(this.destroyed === false)
 
     const snapshot = this.dbSnapshot
     return new ReadBatch(this, this.db.read({ snapshot }))
   }
 
   createWriteBatch () {
-    assert(this.closed === false)
+    assert(this.destroyed === false)
 
     return new WriteBatch(this, this.db.write())
   }
 
   createBlockStream (opts = {}) {
-    assert(this.closed === false)
+    assert(this.destroyed === false)
     return createStream(this, createBlockStream, opts)
   }
 
   createUserDataStream (opts = {}) {
-    assert(this.closed === false)
+    assert(this.destroyed === false)
 
     const r = encodeIndexRange(this.dataPointer, DATA.USER_DATA, this.dbSnapshot, opts)
     const s = this.db.iterator(r)
@@ -518,7 +508,7 @@ class HypercoreStorage {
   }
 
   createTreeNodeStream (opts = {}) {
-    assert(this.closed === false)
+    assert(this.destroyed === false)
 
     const r = encodeIndexRange(this.dataPointer, DATA.TREE, this.dbSnapshot, opts)
     const s = this.db.iterator(r)
@@ -527,7 +517,7 @@ class HypercoreStorage {
   }
 
   createBitfieldPageStream (opts = {}) {
-    assert(this.closed === false)
+    assert(this.destroyed === false)
 
     const r = encodeIndexRange(this.dataPointer, DATA.BITFIELD, this.dbSnapshot, opts)
     const s = this.db.iterator(r)
@@ -536,7 +526,7 @@ class HypercoreStorage {
   }
 
   async peekLastTreeNode () {
-    assert(this.closed === false)
+    assert(this.destroyed === false)
 
     const last = await this.db.peek(encodeIndexRange(this.dataPointer, DATA.TREE, this.dbSnapshot, { reverse: true }))
     if (last === null) return null
@@ -544,7 +534,7 @@ class HypercoreStorage {
   }
 
   async peekLastBitfieldPage () {
-    assert(this.closed === false)
+    assert(this.destroyed === false)
 
     const last = await this.db.peek(encodeIndexRange(this.dataPointer, DATA.BITFIELD, this.dbSnapshot, { reverse: true }))
     if (last === null) return null
@@ -552,18 +542,11 @@ class HypercoreStorage {
   }
 
   destroy () {
-    if (this.dbSnapshot === null) return
-    this.dbSnapshot.destroy()
-  }
-
-  close () {
-    if (this.closed) return Promise.resolve()
-    this.closed = true
+    if (this.destroyed) return
+    this.destroyed = true
 
     if (this.dbSnapshot) this.dbSnapshot.destroy()
     this.dbSnapshot = null
-
-    return this.root._onclose()
   }
 }
 
@@ -762,6 +745,11 @@ function initialiseCoreInfo (db, { key, manifest, keyPair, encryptionKey }) {
   if (encryptionKey) db.setEncryptionKey(encryptionKey)
 }
 
-function initialiseCoreData (db) {
+function initialiseCoreData (db, { userData } = {}) {
   db.setDataInfo({ version: 0 })
+  if (userData) {
+    for (const { key, value } of userData) {
+      db.setUserData(key, value)
+    }
+  }
 }

package/lib/memory-overlay.js

@@ -75,9 +75,7 @@ class MemoryOverlay {
     return (page && (!disk || index > disk.index)) ? { index, page } : disk
   }
 
-  close () {
-    return Promise.resolve()
-  }
+  destroy () {}
 
   merge (overlay) {
     if (overlay.head !== null) this.head = overlay.head

package/package.json

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