hypercore 11.21.6 → 11.22.0

package/README.md

@@ -66,7 +66,7 @@ Alternatively you can pass a [Hypercore Storage](https://github.com/holepunchto/
 }
 ```
 
-You can also set `valueEncoding` to any [compact-encoding](https://github.com/compact-encoding) instance.
+You can also set `valueEncoding` to any [compact-encoding](https://github.com/holepunchto/compact-encoding) instance.
 
 `valueEncoding`s will be applied to individual blocks, even if you append batches. If you want to control encoding at the batch-level, you can use the `encodeBatch` option, which is a function that takes a batch and returns a binary-encoded batch. If you provide a custom `valueEncoding`, it will not be applied prior to `encodeBatch`.
 
@@ -169,7 +169,7 @@ Check if the core has all blocks between `start` and `end`.
 
 #### `const updated = await core.update([options])`
 
-Waits for initial proof of the new core length until all `findingPeers` calls has finished.
+Waits for initial proof of the new core length until all `findingPeers` calls have finished.
 
 ```js
 const updated = await core.update()
@@ -414,7 +414,7 @@ Register a custom protocol extension. This is a legacy implementation and is no
 ```
 {
   encoding: 'json' | 'utf-8' | 'binary', // Compact encoding to use for messages. Defaults to buffer
-  onmessage: (message, peer) => { ... } // Callback for when a message for the extension is receive
+  onmessage: (message, peer) => { ... } // Callback for when a message for the extension is received
 }
 ```
 
@@ -438,7 +438,7 @@ You must close any session you make.
 
 Options are inherited from the parent instance, unless they are re-set.
 
-`options` are the same as in the constructor with the follow additions:
+`options` are the same as in the constructor with the following additions:
 
 ```
 {
@@ -588,7 +588,7 @@ Populated after `ready` has been emitted. Will be `0` before the event.
 
 #### `core.signedLength`
 
-How many blocks of data are available on this core that have been signed by a quorum. This is equal to `core.length` for Hypercores's with a single signer.
+How many blocks of data are available on this core that have been signed by a quorum. This is equal to `core.length` for Hypercores with a single signer.
 
 Populated after `ready` has been emitted. Will be `0` before the event.
 
@@ -730,9 +730,9 @@ Returns the key for a given manifest.
 
 ```
 {
-  compat: false,  // Whether the manifest has a single singer whose public key is the key
-  version,        // Manifest version if the manifest argument is the public key of a single singer
-  namespace       // The signer namespace if the manifest argument is the public key of a single singer
+  compat: false,  // Whether the manifest has a single signer whose public key is the key
+  version,        // Manifest version if the manifest argument is the public key of a single signer
+  namespace       // The signer namespace if the manifest argument is the public key of a single signer
 }
 ```
 

package/lib/replicator.js

@@ -401,7 +401,7 @@ class Peer {
     this.remoteSupportsSeeks = false
     this.inflightRange = inflightRange
     this.remoteSegmentsWanted = new Set()
-    this.fullyDownloadedSignaled = false
+    this.fullyDownloadedSignaled = 0
 
     this.paused = false
     this.removed = false
@@ -511,9 +511,6 @@ class Peer {
   }
 
   signalUpgrade() {
-    if (this.fullyDownloadedSignaled && !this.replicator.fullyDownloaded()) {
-      this.fullyDownloadedSignaled = false
-    }
     if (this._shouldUpdateCanUpgrade() === true) this._updateCanUpgradeAndSync()
     else this.sendSync()
   }
@@ -546,8 +543,8 @@ class Peer {
       length = this.core.state.length
 
       // Always send the broadcast when we switch from sparse to fully contiguous, so remote knows too
-      if (!this.fullyDownloadedSignaled) {
-        this.fullyDownloadedSignaled = true
+      if (this.fullyDownloadedSignaled < length) {
+        this.fullyDownloadedSignaled = length
         force = true
       }
     }
@@ -608,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)
   }
@@ -1790,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
@@ -1823,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)
+  }
+
+  signalAllowPush(allowPush) {
+    if (allowPush === this.isAllowingPush()) return
+    for (const peer of this.peers) peer.signalUpgrade()
   }
 
-  setDownloadingNow(downloading) {
-    this._downloadingTimer = null
-    if (this.downloading === downloading) return
+  _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()
 
@@ -1861,6 +1874,7 @@ module.exports = class Replicator {
     }
 
     if (this.ondownloading !== null && downloading) this.ondownloading()
+    return true
   }
 
   cork() {
@@ -1892,7 +1906,10 @@ module.exports = class Replicator {
       }
     }
 
-    for (const peer of this.peers) peer._unclearLocalRange(newLength, truncated)
+    for (const peer of this.peers) {
+      peer.fullyDownloadedSignaled = Math.min(newLength, peer.fullyDownloadedSignaled)
+      peer._unclearLocalRange(newLength, truncated)
+    }
   }
 
   // Called externally when a upgrade has been processed
@@ -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.6",
+  "version": "11.22.0",
   "description": "Hypercore is a secure, distributed append-only log",
   "main": "index.js",
   "scripts": {