hypercore 11.21.2 → 11.21.5

package/lib/replicator.js

@@ -26,6 +26,7 @@ const b4a = require('b4a')
 const safetyCatch = require('safety-catch')
 const RandomIterator = require('random-array-iterator')
 const flatTree = require('flat-tree')
+const Mutex = require('./mutex')
 const ReceiverQueue = require('./receiver-queue')
 const HotswapQueue = require('./hotswap-queue')
 const RemoteBitfield = require('./remote-bitfield')
@@ -461,7 +462,7 @@ class Peer {
     this.remoteBitfield = new RemoteBitfield()
     this.missingBlocks = new RemoteBitfield()
 
-    this.pushing = false
+    this.pushedLength = 0
 
     this.remoteFork = 0
     this.remoteLength = 0
@@ -909,15 +910,17 @@ 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
       }
     }
 
@@ -998,13 +1001,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({
@@ -1064,6 +1063,17 @@ class Peer {
   }
 
   async ondata(data) {
+    if (data.request !== 0) return this._handleData(data)
+
+    await this.replicator._pushLock.lock()
+    try {
+      await this._handleData(data)
+    } finally {
+      this.replicator._pushLock.unlock()
+    }
+  }
+
+  async _handleData(data) {
     // always allow a fork conflict proof to be sent
     if (data.request === 0 && data.upgrade && data.upgrade.start === 0) {
       if (await this.core.checkConflict(data, this)) return
@@ -1771,6 +1781,7 @@ module.exports = class Replicator {
     this._reorgs = []
     this._ranges = []
 
+    this._pushLock = new Mutex()
     this._hadPeers = false
     this._active = 0
     this._ifAvailable = 0

package/package.json

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