hypercore 11.13.4 → 11.14.1

package/index.js

@@ -453,6 +453,11 @@ class Hypercore extends EventEmitter {
     return this.closing
   }
 
+  clearRequests (activeRequests, error) {
+    if (!activeRequests.length) return
+    if (this.core) this.core.replicator.clearRequests(activeRequests, error)
+  }
+
   async _close (error) {
     if (this.opened === false) {
       try {

package/lib/core.js

@@ -49,7 +49,6 @@ module.exports = class Core {
     this.destroyed = false
     this.closed = false
 
-    this._manifestFlushed = false
     this._bitfield = null
     this._verifies = null
     this._verifiesFlushed = null
@@ -264,6 +263,14 @@ module.exports = class Core {
     // to unslab
     if (header.manifest) {
       header.manifest = Verifier.createManifest(header.manifest)
+      const tx = storage.write()
+      tx.setAuth({
+        key: header.key,
+        discoveryKey: crypto.discoveryKey(header.key),
+        manifest: header.manifest,
+        keyPair: header.keyPair
+      })
+      await tx.flush()
     }
 
     const verifier = header.manifest ? new Verifier(header.key, header.manifest, { crypto, legacy }) : null
@@ -279,8 +286,6 @@ module.exports = class Core {
     if (this.discoveryKey === null) this.discoveryKey = crypto.discoveryKey(this.key)
     if (this.id === null) this.id = z32.encode(this.key)
     if (this.manifest === null) this.manifest = this.header.manifest
-
-    this._manifestFlushed = !!header.manifest
   }
 
   async audit (opts) {
@@ -329,7 +334,6 @@ module.exports = class Core {
 
     this.compat = verifier.compat
     this.verifier = verifier
-    this._manifestFlushed = false
 
     this.replicator.onupgrade()
     this.emitManifest()

package/lib/replicator.js

@@ -382,6 +382,7 @@ class Peer {
     this.remoteSupportsSeeks = false
     this.inflightRange = inflightRange
     this.remoteSegmentsWanted = new Set()
+    this.fullyDownloadedSignaled = false
 
     this.paused = false
     this.removed = false
@@ -482,6 +483,7 @@ class Peer {
   }
 
   signalUpgrade () {
+    if (this.fullyDownloadedSignaled && !this.replicator.fullyDownloaded()) this.fullyDownloadedSignaled = false
     if (this._shouldUpdateCanUpgrade() === true) this._updateCanUpgradeAndSync()
     else this.sendSync()
   }
@@ -501,13 +503,20 @@ class Peer {
 
     if (start + LAST_BLOCKS < this.core.state.length && !this.remoteSegmentsWanted.has(i) && !drop && !contig) return
 
+    let force = false
     if (contig && !drop) {
       start = 0
       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
+        force = true
+      }
     }
 
     // TODO: consider also adding early-returns on the drop===true case
-    if (!drop) {
+    if (!force && !drop) {
       // No need to broadcast if the remote already has this range
 
       if (this._remoteContiguousLength >= start + length) return
@@ -2156,6 +2165,11 @@ 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) {
     req.elapsed = Date.now() - req.timestamp
     if (data.block !== null) {

package/package.json

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