hypercore 10.29.0 → 10.29.2

package/lib/replicator.js

@@ -813,6 +813,9 @@ class Peer {
   }
 
   _requestSeek (s) {
+    // if replicator is updating the seeks etc, bail and wait for it to drain
+    if (this.replicator._updatesPending > 0) return false
+
     const { length, fork } = this.core.tree
 
     if (fork !== this.remoteFork) return false
@@ -851,8 +854,9 @@ class Peer {
       if (h.inflight.length > 0) continue
 
       const req = this._makeRequest(false, h.priority)
+      const nodes = flatTree.depth(s.seeker.start + s.seeker.end - 1)
 
-      req.hash = { index: 2 * index, nodes: 0 }
+      req.hash = { index: 2 * index, nodes }
       req.seek = this.remoteSupportsSeeks ? { bytes: s.seeker.bytes, padding: s.seeker.padding } : null
 
       s.inflight.push(req)
@@ -1055,6 +1059,11 @@ class Peer {
     }
   }
 
+  isActive () {
+    if (this.paused || this.removed) return false
+    return true
+  }
+
   async _send (req) {
     const fork = this.core.tree.fork
 
@@ -1070,8 +1079,15 @@ class Peer {
       if (req.block !== null && req.fork === fork) {
         req.block.nodes = await this.core.tree.missingNodes(2 * req.block.index)
       }
-      if (req.hash !== null && req.fork === fork) {
+      if (req.hash !== null && req.fork === fork && req.hash.nodes === 0) {
         req.hash.nodes = await this.core.tree.missingNodes(req.hash.index)
+
+        // nodes === 0, we already have it, bail
+        if (req.hash.nodes === 0 && (req.hash.index & 1) === 0) {
+          this.inflight--
+          this.replicator._resolveHashLocally(this, req)
+          return
+        }
       }
     } catch (err) {
       this.stream.destroy(err)
@@ -1188,7 +1204,7 @@ module.exports = class Replicator {
     for (const peer of this.peers) peer.signalUpgrade()
     if (this._blocks.isEmpty() === false) this._resolveBlocksLocally()
     if (this._upgrade !== null) this._resolveUpgradeRequest(null)
-    if (this._ranges.length !== 0 || this._seeks.length !== 0) this._updateNonPrimary()
+    if (this._ranges.length !== 0 || this._seeks.length !== 0) this._updateNonPrimary(true)
   }
 
   // Called externally when a conflict has been detected and verified
@@ -1272,7 +1288,7 @@ module.exports = class Replicator {
 
     // Trigger this to see if this is already resolved...
     // Also auto compresses the range based on local bitfield
-    this._updateNonPrimary()
+    this._updateNonPrimary(true)
 
     return ref
   }
@@ -1403,6 +1419,7 @@ module.exports = class Replicator {
 
   _removePeer (peer) {
     this.peers.splice(this.peers.indexOf(peer), 1)
+    peer.removed = true
 
     if (this._manifestPeer === peer) this._manifestPeer = null
 
@@ -1422,6 +1439,12 @@ module.exports = class Replicator {
     this._queued.push(b)
   }
 
+  _resolveHashLocally (peer, req) {
+    this._removeInflight(req.id)
+    this._resolveBlockRequest(this._hashes, req.hash.index / 2, null, req)
+    this.updatePeer(peer)
+  }
+
   // Runs in the background - not allowed to throw
   async _resolveBlocksLocally () {
     // TODO: check if fork compat etc. Requires that we pass down truncation info
@@ -1530,7 +1553,7 @@ module.exports = class Replicator {
   }
 
   // "slow" updates here - async but not allowed to ever throw
-  async _updateNonPrimary () {
+  async _updateNonPrimary (updateAll) {
     // Check if running, if so skip it and the running one will issue another update for us (debounce)
     while (++this._updatesPending === 1) {
       for (let i = 0; i < this._ranges.length; i++) {
@@ -1566,13 +1589,13 @@ module.exports = class Replicator {
         else s.resolve(res)
       }
 
-      if (this._inflight.idle) this.updateAll()
-
-      // No additional updates scheduled - return
-      if (--this._updatesPending === 0) return
+      // No additional updates scheduled - break
+      if (--this._updatesPending === 0) break
       // Debounce the additional updates - continue
       this._updatesPending = 0
     }
+
+    if (this._inflight.idle || updateAll) this.updateAll()
   }
 
   _maybeResolveIfAvailableRanges () {
@@ -1643,8 +1666,8 @@ module.exports = class Replicator {
       this._manifestPeer = null
     }
 
-    if (this._seeks.length > 0 || this._ranges.length > 0) this._updateNonPrimary()
-    else this.updatePeer(peer)
+    if (this._seeks.length > 0 || this._ranges.length > 0) this._updateNonPrimary(this._seeks.length > 0)
+    this.updatePeer(peer)
   }
 
   _onwant (peer, start, length) {
@@ -1748,7 +1771,7 @@ module.exports = class Replicator {
   }
 
   _updatePeer (peer) {
-    if (peer.paused || peer.inflight >= peer.getMaxInflight()) {
+    if (!peer.isActive() || peer.inflight >= peer.getMaxInflight()) {
       return false
     }
 
@@ -1780,7 +1803,7 @@ module.exports = class Replicator {
   }
 
   _updatePeerNonPrimary (peer) {
-    if (peer.paused || peer.inflight >= peer.getMaxInflight()) {
+    if (!peer.isActive() || peer.inflight >= peer.getMaxInflight()) {
       return false
     }
 

package/package.json

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