hypercore 11.21.4 → 11.21.6

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')
@@ -895,6 +896,7 @@ class Peer {
 
   async push(index) {
     if (!this.remoteAllowPush) return
+    if (!this.remoteDownloading) return
     if (this.core.state.fork !== this.remoteFork) return
     if (this.remoteBitfield.get(index)) return
 
@@ -1062,6 +1064,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
@@ -1769,6 +1782,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.4",
+  "version": "11.21.6",
   "description": "Hypercore is a secure, distributed append-only log",
   "main": "index.js",
   "scripts": {