hypercore 11.15.0 → 11.16.1

package/lib/bitfield.js

@@ -400,6 +400,30 @@ module.exports = class Bitfield {
     return this.findLast(false, position)
   }
 
+  hasSet (start, length) {
+    const end = start + length
+
+    let j = start & (BITS_PER_SEGMENT - 1)
+    let i = (start - j) / BITS_PER_SEGMENT
+
+    while (i < this._segments.maxLength) {
+      const s = this._segments.get(i)
+
+      let index = -1
+
+      if (s) index = s.findFirst(true, j)
+
+      if (index !== -1) return (i * BITS_PER_SEGMENT + index) < end
+
+      j = 0
+      i++
+
+      if (i * BITS_PER_SEGMENT >= end) return false
+    }
+
+    return false
+  }
+
   count (start, length, val) {
     let j = start & (BITS_PER_PAGE - 1)
     let i = (start - j) / BITS_PER_PAGE

package/lib/replicator.js

@@ -1752,8 +1752,8 @@ module.exports = class Replicator {
 
     while (session.length > 0) {
       const ref = session[session.length - 1]
-      ref.context.detach(ref, err)
       updated.add(ref.context.replicator)
+      ref.context.detach(ref, err)
     }
 
     for (const replicator of updated) {

package/lib/session-state.js

@@ -476,6 +476,22 @@ module.exports = class SessionState {
     try {
       const tx = this.createWriteBatch()
 
+      const ite = flat.iterator(start * 2)
+      while (!isRootIndex(ite.index, this.roots)) {
+        const a = ite.index
+        const b = ite.sibling()
+        ite.parent()
+
+        const [left, right] = flat.spans(b)
+        const s = left / 2
+        const e = (right / 2) + 1
+        const has = (s <= start && e <= end) ? false : this.core.bitfield.hasSet(s, e - s)
+        if (has) break
+
+        tx.deleteTreeNode(a)
+        tx.deleteTreeNode(b)
+      }
+
       if (this.isDefault()) {
         await storeBitfieldRange(this.storage, tx, start, end, false)
         if (start < this.core.header.hints.contiguousLength) {
@@ -1134,3 +1150,11 @@ function getCoreHead (storage) {
   b.tryFlush()
   return p
 }
+
+function isRootIndex (index, roots) {
+  for (const node of roots) {
+    if (node.index === index) return true
+  }
+
+  return false
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hypercore",
-  "version": "11.15.0",
+  "version": "11.16.1",
   "description": "Hypercore is a secure, distributed append-only log",
   "main": "index.js",
   "scripts": {
@@ -70,6 +70,7 @@
     "hyperswarm": "^4.3.6",
     "rache": "^1.0.0",
     "range-parser": "^1.2.1",
+    "resolve-reject-promise": "^1.1.0",
     "speedometer": "^1.1.0",
     "standard": "^17.0.0",
     "test-tmp": "^1.0.2",