hypercore-storage 0.0.27 → 0.0.29

package/lib/memory-overlay.js

@@ -9,7 +9,7 @@ class OverlayStream extends Readable {
 
     this.tip = tip
     this.storage = storage
-    this.opts = opts
+    this.options = opts
 
     this._reverse = !!opts.reverse
     this._active = null
@@ -18,11 +18,7 @@ class OverlayStream extends Readable {
     this._createStream = createStream
     this._pendingDestroy = null
 
-    if (!opts.reverse) {
-      this._active = createStream(storage, opts)
-      this._active.on('close', this._onclose.bind(this))
-      this._active.on('data', this._ondata.bind(this))
-    }
+    if (!opts.reverse) this._makeActiveStream()
   }
 
   _predestroy () {
@@ -31,7 +27,10 @@ class OverlayStream extends Readable {
 
   _read (cb) {
     if (this._active === null) {
-      if (this._yield()) return cb(null)
+      if (this._yield()) {
+        cb(null)
+        return
+      }
     }
 
     if (this._active) {
@@ -69,13 +68,18 @@ class OverlayStream extends Readable {
       return true
     }
 
-    this._active = this._createStream(this.storage, this.opts)
-    this._active.on('close', this._onclose.bind(this))
-    this._active.on('data', this._ondata.bind(this))
+    this._makeActiveStream()
 
     return false
   }
 
+  _makeActiveStream () {
+    this._active = this._createStream(this.storage, this.options)
+    this._active.on('error', noop) // handled in onclose
+    this._active.on('close', this._onclose.bind(this))
+    this._active.on('data', this._ondata.bind(this))
+  }
+
   _ondata (data) {
     if (!this.push(data)) this._active.pause()
   }
@@ -87,7 +91,10 @@ class OverlayStream extends Readable {
       return
     }
 
-    if (this._reverse) return this.push(null)
+    if (this._reverse) {
+      this.push(null)
+      return
+    }
 
     this._yield()
   }
@@ -108,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) {
@@ -115,7 +125,44 @@ class MemoryOverlay {
   }
 
   snapshot () {
-    return new MemoryOverlay(this.storage.snapshot())
+    if (this.snapshotShared !== null) return this.snapshotShared.snapshot()
+
+    this.activeSnapshots++
+    this.copyOnWrite = true
+
+    const snap = new MemoryOverlay(this.storage.snapshot())
+
+    snap.snapshotted = true
+    snap.snapshotShared = this
+
+    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 () {
@@ -132,6 +179,7 @@ class MemoryOverlay {
   }
 
   createWriteBatch () {
+    if (this.copyOnWrite) this._copy()
     return new MemoryOverlayWriteBatch(this)
   }
 
@@ -166,7 +214,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
@@ -373,6 +426,8 @@ function mergeTip (a, b) {
   return a
 }
 
+function noop () {}
+
 function todo () {
   throw ASSERTION('Not supported yet, but will be')
 }

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/package.json

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