hypercore-storage 0.0.27 → 0.0.28

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()
   }
@@ -115,7 +122,27 @@ class MemoryOverlay {
   }
 
   snapshot () {
-    return new MemoryOverlay(this.storage.snapshot())
+    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()
+
+    // 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)
+
+    return snap
   }
 
   get dependencies () {
@@ -373,6 +400,8 @@ function mergeTip (a, b) {
   return a
 }
 
+function noop () {}
+
 function todo () {
   throw ASSERTION('Not supported yet, but will be')
 }

package/package.json

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