hypercore 10.18.2 → 10.18.4

package/lib/merkle-tree.js

@@ -56,6 +56,23 @@ class MerkleTreeBatch {
     this.upgraded = false
   }
 
+  clone () {
+    const b = new MerkleTreeBatch(this.tree)
+
+    b.fork = this.fork
+    b.roots = [...this.roots]
+    b.length = this.length
+    b.byteLength = this.byteLength
+    b.signature = this.signature
+    b.treeLength = this.treeLength
+    b.treeFork = this.treeFork
+    b.tree = this.tree
+    b.nodes = [...this.nodes]
+    b.upgraded = this.upgraded
+
+    return b
+  }
+
   hash () {
     return this.tree.crypto.tree(this.roots)
   }

package/lib/replicator.js

@@ -141,7 +141,7 @@ class RangeRequest extends Attachable {
     const i = this.ranges.indexOf(this)
     if (i === -1) return
     const h = this.ranges.pop()
-    if (i < this.ranges.length - 1) this.ranges[i] = h
+    if (i < this.ranges.length) this.ranges[i] = h
   }
 
   _cancel (r) {
@@ -183,7 +183,7 @@ class SeekRequest extends Attachable {
     const i = this.seeks.indexOf(this)
     if (i === -1) return
     const h = this.seeks.pop()
-    if (i < this.seeks.length - 1) this.seeks[i] = h
+    if (i < this.seeks.length) this.seeks[i] = h
   }
 }
 
@@ -305,6 +305,7 @@ class Peer {
 
     this.remoteOpened = false
     this.remoteBitfield = new RemoteBitfield()
+    this.skipList = new RemoteBitfield()
 
     this.remoteFork = 0
     this.remoteLength = 0
@@ -678,6 +679,7 @@ class Peer {
 
   onbitfield ({ start, bitfield }) {
     if (this.remoteBitfield.insert(start, bitfield)) {
+      this.skipList.setRange(start, bitfield.byteLength * 8, false)
       this._update()
     }
   }
@@ -687,12 +689,14 @@ class Peer {
 
     if (length === 1) {
       this.remoteBitfield.setRange(start, length, has)
+      this.skipList.set(start, false)
     } else {
       const rangeStart = this.remoteBitfield.findFirst(!has, start)
       const rangeLength = length - (rangeStart - start)
 
       if (rangeLength > 0) {
         this.remoteBitfield.setRange(rangeStart, rangeLength, has)
+        this.skipList.setRange(rangeStart, rangeLength, false)
       }
     }
 
@@ -850,17 +854,36 @@ class Peer {
     // as they are "cheaper" and will trigger an auto upgrade if possible
     // If no blocks < .length is avaible then try the "needs upgrade" range
 
-    for (let i = 0; i < len; i++) {
+    let wrapped = 0
+
+    for (let i = 0; i < len && wrapped < 2; i++) {
       let index = off + i
       if (index >= end) index -= len
 
-      if (r.blocks !== null) index = r.blocks[index]
+      if (r.blocks !== null) {
+        index = r.blocks[index]
+      } else { // TODO: make this loop better (something like a for loop that skips with the skip list)
+        index = this.skipList.findFirst(false, index)
+        if (index === -1 || index >= end) {
+          wrapped++
+          index = this.skipList.findFirst(false, r.start)
+          if (index === -1 || index >= end) {
+            return false
+          }
+        }
+      }
 
-      if (this.remoteBitfield.get(index) === false) continue
-      if (this.core.bitfield.get(index) === true) continue
+      if (this.remoteBitfield.get(index) === false || this.core.bitfield.get(index) === true) {
+        this.skipList.set(index, true)
+        continue
+      }
 
       const b = this.replicator._blocks.add(index, PRIORITY.NORMAL)
-      if (b.inflight.length > 0) continue
+
+      if (b.inflight.length > 0) {
+        this.skipList.set(index, true)
+        continue
+      }
 
       const req = this._makeRequest(index >= length, b.priority)
 
@@ -870,6 +893,8 @@ class Peer {
         return false
       }
 
+      this.skipList.set(index, true)
+
       req.block = { index, nodes: 0 }
 
       b.inflight.push(req)
@@ -1332,6 +1357,10 @@ module.exports = class Replicator {
 
     if (b === null || removeInflight(b.inflight, req) === false) return
 
+    if (isBlock && this.core.bitfield.get(index) === false) {
+      for (const peer of this.peers) peer.skipList.set(index, false)
+    }
+
     if (b.refs.length > 0 && isBlock === true) {
       this._queueBlock(b)
       return

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hypercore",
-  "version": "10.18.2",
+  "version": "10.18.4",
   "description": "Hypercore is a secure, distributed append-only log",
   "main": "index.js",
   "scripts": {