hypercore 11.21.1 → 11.21.4

package/lib/replicator.js

@@ -461,7 +461,7 @@ class Peer {
     this.remoteBitfield = new RemoteBitfield()
     this.missingBlocks = new RemoteBitfield()
 
-    this.pushing = false
+    this.pushedLength = 0
 
     this.remoteFork = 0
     this.remoteLength = 0
@@ -909,22 +909,29 @@ class Peer {
       priority: 0
     }
 
+    const remoteLength = Math.max(this.remoteLength, this.pushedLength)
+
     msg.block = {
       index,
-      nodes: MerkleTree.maxMissingNodes(2 * index, this.remoteLength)
+      nodes: MerkleTree.maxMissingNodes(2 * index, remoteLength)
     }
 
     if (index >= this.remoteLength) {
       msg.upgrade = {
-        start: this.remoteLength,
-        length: this.core.state.length - this.remoteLength
+        start: remoteLength,
+        length: this.core.state.length - remoteLength
       }
     }
 
+    let req = null
     const batch = this.core.storage.read()
-    const req = await this._getProof(batch, msg, true)
-    if (req === null) return
+    try {
+      req = await this._getProof(batch, msg, true)
+    } catch {
+      return
+    }
 
+    if (req === null) return
     batch.tryFlush()
 
     await this._fulfillRequest(req, true)
@@ -993,13 +1000,9 @@ class Peer {
       this.replicator._onupload(proof.block.index, proof.block.value.byteLength, this)
     }
 
-    // TODO: we should prob move to a sep length prop for this. This is just quick and dirty
-    // to produce better push upgrade proofs as we can better predict what length the remote
-    // is going to be at.
-    if ((pushing || this.pushing) && proof.upgrade) {
-      this.pushing = true
+    if (proof.upgrade) {
       const remoteLength = proof.upgrade.start + proof.upgrade.length
-      if (remoteLength > this.remoteLength) this.remoteLength = remoteLength
+      if (remoteLength > this.pushedLength) this.pushedLength = remoteLength
     }
 
     this.wireData.send({

package/package.json

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