hypercore 10.22.0 → 10.22.2

package/lib/replicator.js

@@ -295,6 +295,7 @@ class Peer {
     this.dataProcessing = 0
 
     this.canUpgrade = true
+    this.reopenMaybe = false
 
     this.needsSync = false
     this.syncsProcessing = 0
@@ -375,6 +376,7 @@ class Peer {
     }
 
     this.needsSync = false
+    if (this.replicator.downloading === false) this.reopenMaybe = true
 
     this.wireSync.send({
       fork: this.core.tree.fork,
@@ -382,7 +384,7 @@ class Peer {
       remoteLength: this.core.tree.fork === this.remoteFork ? this.remoteLength : 0,
       canUpgrade: this.canUpgrade,
       uploading: true,
-      downloading: true
+      downloading: this.replicator.downloading
     })
   }
 
@@ -417,7 +419,12 @@ class Peer {
   }
 
   onclose (isRemote) {
-    if (this.session) this.session.close().catch(noop)
+    // we might have signalled to the remote that we are done (ie not downloading) and the remote might agree on that
+    // if that happens, the channel might be closed by the remote. if so just renegotiate it.
+    const reopen = isRemote === true && this.remoteOpened === true && this.remoteDownloading === false &&
+       this.remoteUploading === true && this.replicator.downloading === true && this.reopenMaybe === true
+
+    if (this.session && !reopen) this.replicator._closeSession(this.session)
 
     if (this.remoteOpened === false) {
       this.replicator._ifAvailable--
@@ -427,6 +434,10 @@ class Peer {
 
     this.remoteOpened = false
     this.replicator._removePeer(this)
+
+    if (reopen) {
+      this.replicator._makePeer(this.protomux, this.session)
+    }
   }
 
   async onsync ({ fork, length, remoteLength, canUpgrade, uploading, downloading }) {
@@ -440,6 +451,12 @@ class Peer {
     this.remoteUploading = uploading
     this.remoteDownloading = downloading
 
+    if (this.remoteDownloading === false && this.replicator.downloading === false) {
+      // idling, shut it down...
+      this.channel.close()
+      return
+    }
+
     this.lengthAcked = sameFork ? remoteLength : 0
     this.syncsProcessing++
 
@@ -1016,6 +1033,8 @@ module.exports = class Replicator {
     this.peers = []
     this.findingPeers = 0 // updateable from the outside
     this.destroyed = false
+    this.downloading = true
+    this.sessions = 0
 
     this._attached = new Set()
     this._inflight = new InflightTracker()
@@ -1042,6 +1061,12 @@ module.exports = class Replicator {
     }
   }
 
+  setDownloading (downloading) {
+    if (this.downloading === downloading) return
+    this.downloading = downloading
+    for (const peer of this.peers) peer.sendSync()
+  }
+
   cork () {
     for (const peer of this.peers) peer.protomux.cork()
   }
@@ -1712,7 +1737,13 @@ module.exports = class Replicator {
     this._maybeResolveIfAvailableRanges()
   }
 
+  _closeSession (session) {
+    if (!session.closing) this.sessions--
+    session.close().catch(noop)
+  }
+
   attachTo (protomux, session) {
+    if (session) this.sessions++
     const makePeer = this._makePeer.bind(this, protomux, session)
 
     this._attached.add(protomux)
@@ -1725,7 +1756,7 @@ module.exports = class Replicator {
       this._ifAvailable--
 
       if (opened && !this.destroyed) makePeer()
-      else if (session) session.close().catch(noop)
+      else if (session) this._closeSession(session)
       this._checkUpgradeIfAvailable()
     })
   }
@@ -1749,6 +1780,7 @@ module.exports = class Replicator {
   }
 
   _makePeer (protomux, session) {
+    const replicator = this
     if (protomux.opened({ protocol: 'hypercore/alpha', id: this.discoveryKey })) return onnochannel()
 
     const channel = protomux.createChannel({
@@ -1776,7 +1808,7 @@ module.exports = class Replicator {
 
     if (channel === null) return onnochannel()
 
-    const peer = new Peer(this, protomux, channel, session)
+    const peer = new Peer(replicator, protomux, channel, session)
     const stream = protomux.stream
 
     peer.channel.open({
@@ -1787,7 +1819,7 @@ module.exports = class Replicator {
     return true
 
     function onnochannel () {
-      if (session) session.close().catch(noop)
+      if (session) replicator._closeSession(session)
       return false
     }
   }

package/package.json

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