hypercore-storage 0.0.29 → 0.0.31

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)
   }
@@ -501,7 +513,7 @@ class HypercoreStorage {
   createUserDataStream (opts = {}) {
     assert(this.destroyed === false)
 
-    const r = encodeIndexRange(this.dataPointer, DATA.USER_DATA, this.dbSnapshot, opts)
+    const r = encodeUserDataRange(this.dataPointer, DATA.USER_DATA, this.dbSnapshot, opts)
     const s = this.db.iterator(r)
     s._readableState.map = mapStreamUserData
     return s
@@ -572,6 +584,8 @@ function mapStreamUserData (data) {
 
   const key = c.string.decode(state)
 
+  if (data.value.byteLength === 0) return null
+
   return { key, value: data.value }
 }
 
@@ -643,6 +657,20 @@ function encodeIndexRange (pointer, type, snapshot, opts) {
   return bounded
 }
 
+function encodeUserDataRange (pointer, type, snapshot, opts) {
+  const bounded = { snapshot, gt: null, gte: null, lte: null, lt: null, reverse: !!opts.reverse, limit: toLimit(opts.limit) }
+
+  if (opts.gt || opts.gt === 0) bounded.gt = encodeUserDataIndex(pointer, type, opts.gt)
+  else if (opts.gte) bounded.gte = encodeUserDataIndex(pointer, type, opts.gte)
+  else bounded.gte = encodeDataIndex(pointer, type, 0)
+
+  if (opts.lt || opts.lt === 0) bounded.lt = encodeUserDataIndex(pointer, type, opts.lt)
+  else if (opts.lte) bounded.lte = encodeUserDataIndex(pointer, type, opts.lte)
+  else bounded.lte = encodeDataIndex(pointer, type, Infinity)
+
+  return bounded
+}
+
 function toLimit (n) {
   return n === 0 ? 0 : (n || Infinity)
 }

package/lib/memory-overlay.js

@@ -196,6 +196,7 @@ class MemoryOverlay {
   }
 
   createBitfieldPageStream (opts) {
+    if (this.bitfields === null) return createBitfieldPageStream(this.storage)
     return new OverlayStream(this.bitfields, this.storage, createBitfieldPageStream, opts)
   }
 

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.29",
+  "version": "0.0.31",
   "main": "index.js",
   "files": [
     "index.js",