hypercore-storage 0.0.28 → 0.0.30

package/index.js

@@ -471,6 +471,18 @@ class HypercoreStorage {
     }
   }
 
+  async registerOverlay (head) {
+    const storage = new MemoryOverlay(this)
+    const batch = storage.createWriteBatch()
+
+    batch.setDataDependency({ data: this.dataPointer, length: head.length })
+    if (head.rootHash) batch.setCoreHead(head) // if no root hash its the empty core - no head yet
+
+    await batch.flush()
+
+    return storage
+  }
+
   createMemoryOverlay () {
     return new MemoryOverlay(this)
   }

package/lib/memory-overlay.js

@@ -115,6 +115,9 @@ class MemoryOverlay {
     this.bitfields = null
 
     this.snapshotted = false
+    this.snapshotShared = null
+    this.activeSnapshots = 0
+    this.copyOnWrite = false
   }
 
   async registerBatch (name, length, overwrite) {
@@ -122,29 +125,46 @@ class MemoryOverlay {
   }
 
   snapshot () {
+    if (this.snapshotShared !== null) return this.snapshotShared.snapshot()
+
+    this.activeSnapshots++
+    this.copyOnWrite = true
+
     const snap = new MemoryOverlay(this.storage.snapshot())
-    snap.merge(this)
 
-    if (this.userData !== null) snap.userData = new Map()
-    if (this.blocks !== null) snap.blocks = new TipList()
-    if (this.treeNodes !== null) snap.treeNodes = new Map()
-    if (this.bitfields !== null) snap.bitfields = new TipList()
+    snap.snapshotted = true
+    snap.snapshotShared = this
 
-    // clone state
-    if (this.head !== null) snap.head = Object.assign(this.head)
-    if (this.auth !== null) snap.auth = Object.assign(this.auth)
-    if (this.localKeyPair !== null) snap.localKeyPair = Object.assign(this.localKeyPair)
-    if (this.encryptionKey !== null) snap.encryptionKey = Object.assign(this.encryptionKey)
-    if (this.dataDependency !== null) snap.dataDependency = Object.assign(this.dataDependency)
-    if (this.dataInfo !== null) snap.dataInfo = Object.assign(this.dataInfo)
-    if (this.userData !== null) snap.userData = mergeMap(snap.userData, this.userData)
-    if (this.blocks !== null) snap.blocks = mergeTip(snap.blocks, this.blocks)
-    if (this.treeNodes !== null) snap.treeNodes = mergeMap(snap.treeNodes, this.treeNodes)
-    if (this.bitfields !== null) snap.bitfields = mergeTip(snap.bitfields, this.bitfields)
+    if (this.head !== null) snap.head = this.head
+    if (this.auth !== null) snap.auth = this.auth
+    if (this.localKeyPair !== null) snap.localKeyPair = this.localKeyPair
+    if (this.encryptionKey !== null) snap.encryptionKey = this.encryptionKey
+    if (this.dataDependency !== null) snap.dataDependency = this.dataDependency
+    if (this.dataInfo !== null) snap.dataInfo = this.dataInfo
+    if (this.userData !== null) snap.userData = this.userData
+    if (this.blocks !== null) snap.blocks = this.blocks
+    if (this.treeNodes !== null) snap.treeNodes = this.treeNodes
+    if (this.bitfields !== null) snap.bitfields = this.bitfields
 
     return snap
   }
 
+  _copy () {
+    this.copyOnWrite = false
+
+    // clone state
+    if (this.head !== null) this.head = Object.assign(this.head)
+    if (this.auth !== null) this.auth = Object.assign(this.auth)
+    if (this.localKeyPair !== null) this.localKeyPair = Object.assign(this.localKeyPair)
+    if (this.encryptionKey !== null) this.encryptionKey = Object.assign(this.encryptionKey)
+    if (this.dataDependency !== null) this.dataDependency = Object.assign(this.dataDependency)
+    if (this.dataInfo !== null) this.dataInfo = Object.assign(this.dataInfo)
+    if (this.userData !== null) this.userData = mergeMap(new Map(), this.userData)
+    if (this.blocks !== null) this.blocks = mergeTip(new TipList(), this.blocks)
+    if (this.treeNodes !== null) this.treeNodes = mergeMap(new Map(), this.treeNodes)
+    if (this.bitfields !== null) this.bitfields = mergeTip(new TipList(), this.bitfields)
+  }
+
   get dependencies () {
     return this.storage.dependencies
   }
@@ -159,6 +179,7 @@ class MemoryOverlay {
   }
 
   createWriteBatch () {
+    if (this.copyOnWrite) this._copy()
     return new MemoryOverlayWriteBatch(this)
   }
 
@@ -175,6 +196,7 @@ class MemoryOverlay {
   }
 
   createBitfieldPageStream (opts) {
+    if (this.bitfields === null) return createBitfieldPageStream(this.storage)
     return new OverlayStream(this.bitfields, this.storage, createBitfieldPageStream, opts)
   }
 
@@ -193,7 +215,12 @@ class MemoryOverlay {
     return (page && (!disk || index > disk.index)) ? { index, page } : disk
   }
 
-  destroy () {}
+  destroy () {
+    if (this.snapshotted) this.storage.destroy()
+    if (this.snapshotShared === null) return
+    if (--this.snapshotShared.activeSnapshots === 0) this.snapshotShared.copyOnWrite = false
+    this.snapshotShared = null
+  }
 
   merge (overlay) {
     if (overlay.head !== null) this.head = overlay.head

package/lib/messages.js

@@ -25,13 +25,13 @@ exports.KeyPair = {
 
 exports.StorageInfo = {
   preencode (state, m) {
-    c.uint.preencode(state, m.version)
+    c.uint.preencode(state, 0) // version
     c.uint.preencode(state, 0) // flags, reserved
     c.uint.preencode(state, m.free)
     c.uint.preencode(state, m.total)
   },
   encode (state, m) {
-    c.uint.encode(state, m.version)
+    c.uint.encode(state, 0) // version
     c.uint.encode(state, 0) // flags, reserved
     c.uint.encode(state, m.free)
     c.uint.encode(state, m.total)

package/lib/tip-list.js

@@ -78,7 +78,7 @@ module.exports = class TipList {
   }
 
   merge (tip) {
-    const invalidDeletion = tip.removed && tip.end() !== -1 && tip.end() < this.end()
+    const invalidDeletion = tip.removed > 0 && tip.end() !== -1 && tip.end() < this.end()
     const invalidTip = (tip.removed !== -1 && tip.end() < this.offset) || this.end() < tip.offset
 
     if (invalidTip || invalidDeletion) throw ASSERTION('Cannot merge tip list')

package/package.json

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