hypercore 11.21.7 → 11.22.0

package/lib/replicator.js

@@ -605,7 +605,7 @@ class Peer {
       uploading: true,
       downloading: this.replicator.isDownloading(),
       hasManifest: !!this.core.header.manifest && this.core.compat === false,
-      allowPush: this.replicator.allowPush
+      allowPush: this.replicator.isAllowingPush()
     })
     incrementTx(this.stats.wireSync, this.replicator.stats.wireSync)
   }
@@ -1787,7 +1787,7 @@ module.exports = class Replicator {
     this._applyingReorg = null
     this._manifestPeer = null
     this._notDownloadingLinger = notDownloadingLinger
-    this._downloadingTimer = null
+    this._notDownloadingTimer = null
 
     const self = this
     this._onstreamclose = onstreamclose
@@ -1820,29 +1820,45 @@ module.exports = class Replicator {
     for (const peer of this.peers) peer.sendSync()
   }
 
+  isAllowingPush() {
+    if (!this.allowPush) return false
+    if (this._notDownloadingTimer) return false
+    return this.downloading
+  }
+
   setDownloading(downloading) {
-    clearTimeout(this._downloadingTimer)
+    const allowPush = this.isAllowingPush()
+    const linger = this._notDownloadingLinger
+
+    if (this._notDownloadingTimer) {
+      clearTimeout(this._notDownloadingTimer)
+      this._notDownloadingTimer = null
+    }
 
     if (this.destroyed) return
-    if (downloading || this._notDownloadingLinger === 0) {
-      this.setDownloadingNow(downloading)
+
+    if (downloading || linger === 0) {
+      if (!this._setDownloadingNow(downloading)) this.signalAllowPush(allowPush)
       return
     }
 
-    this._downloadingTimer = setTimeout(
-      setDownloadingLater,
-      this._notDownloadingLinger,
-      this,
-      downloading
-    )
-    if (this._downloadingTimer.unref) this._downloadingTimer.unref()
+    this._notDownloadingTimer = setTimeout(setNotDownloadingLater, linger, this)
+    if (this._notDownloadingTimer.unref) this._notDownloadingTimer.unref()
+    this.signalAllowPush(allowPush)
   }
 
-  setDownloadingNow(downloading) {
-    this._downloadingTimer = null
-    if (this.downloading === downloading) return
+  signalAllowPush(allowPush) {
+    if (allowPush === this.isAllowingPush()) return
+    for (const peer of this.peers) peer.signalUpgrade()
+  }
+
+  _setDownloadingNow(downloading) {
+    this._notDownloadingTimer = null
+
+    if (this.downloading === downloading) return false
     this.downloading = downloading
-    if (!downloading && this.isDownloading()) return
+
+    if (!downloading && this.isDownloading()) return false
 
     for (const peer of this.peers) peer.signalUpgrade()
 
@@ -1858,6 +1874,7 @@ module.exports = class Replicator {
     }
 
     if (this.ondownloading !== null && downloading) this.ondownloading()
+    return true
   }
 
   cork() {
@@ -1890,7 +1907,7 @@ module.exports = class Replicator {
     }
 
     for (const peer of this.peers) {
-      peer.fullyDownloadedSignaled = 0
+      peer.fullyDownloadedSignaled = Math.min(newLength, peer.fullyDownloadedSignaled)
       peer._unclearLocalRange(newLength, truncated)
     }
   }
@@ -2490,11 +2507,6 @@ module.exports = class Replicator {
     for (const peer of this.peers) peer._resetMissingBlock(index)
   }
 
-  fullyDownloaded() {
-    if (!this.core.state.length) return false
-    return this.core.state.length === this.core.header.hints.contiguousLength
-  }
-
   _ondata(peer, req, data) {
     if (req) {
       req.elapsed = Date.now() - req.timestamp
@@ -2830,9 +2842,9 @@ module.exports = class Replicator {
     if (this.destroyed) return
     this.destroyed = true
 
-    if (this._downloadingTimer) {
-      clearTimeout(this._downloadingTimer)
-      this._downloadingTimer = null
+    if (this._notDownloadingTimer) {
+      clearTimeout(this._notDownloadingTimer)
+      this._notDownloadingTimer = null
     }
 
     while (this.peers.length) {
@@ -3065,8 +3077,8 @@ function onwireextension(m, c) {
   return c.userData.onextension(m)
 }
 
-function setDownloadingLater(repl, downloading, session) {
-  repl.setDownloadingNow(downloading, session)
+function setNotDownloadingLater(repl, session) {
+  repl._setDownloadingNow(false, session)
 }
 
 function isBlockRequest(req) {

package/package.json

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