hypercore 10.37.21 → 10.37.23

package/lib/replicator.js

@@ -37,6 +37,7 @@ const DEFAULT_MAX_INFLIGHT = [16, 512]
 const SCALE_LATENCY = 50
 const DEFAULT_SEGMENT_SIZE = 256 * 1024 * 8 // 256 KiB in bits
 const NOT_DOWNLOADING_SLACK = 20000 + (Math.random() * 20000) | 0
+const MAX_PEERS_UPGRADE = 3
 
 const PRIORITY = {
   NORMAL: 0,
@@ -537,9 +538,11 @@ class Peer {
     const reopen = isRemote === true && this.remoteOpened === true && this.remoteDownloading === false &&
        this.remoteUploading === true && this.replicator.downloading === true
 
-    if (this.useSession && !reopen) this.replicator._closeSession()
-
     if (this.remoteOpened === false) {
+      if (this.useSession) {
+        this.replicator._peerSessions--
+        this.replicator._closeSessionMaybe()
+      }
       this.replicator._ifAvailable--
       this.replicator.updateAll()
       return
@@ -559,6 +562,11 @@ class Peer {
     if (reopen) {
       this.replicator._makePeer(this.protomux, this.useSession)
     }
+
+    if (this.useSession) {
+      this.replicator._peerSessions--
+      this.replicator._closeSessionMaybe()
+    }
   }
 
   closeIfIdle () {
@@ -1456,6 +1464,8 @@ module.exports = class Replicator {
     this._updatesPending = 0
     this._applyingReorg = null
     this._manifestPeer = null
+    this._hasSession = false
+    this._peerSessions = 0
     this._notDownloadingLinger = notDownloadingLinger
     this._downloadingTimer = null
 
@@ -1658,12 +1668,15 @@ module.exports = class Replicator {
   // instead its more efficient to only call it when the conditions in here change - ie on sync/add/remove peer
   // Do this when we have more tests.
   _checkUpgradeIfAvailable () {
-    if (this._ifAvailable > 0 || this._upgrade === null || this._upgrade.refs.length === 0) return
+    if (this._ifAvailable > 0 && this.peers.length < MAX_PEERS_UPGRADE) return
+    if (this._upgrade === null || this._upgrade.refs.length === 0) return
     if (this._hadPeers === false && this.findingPeers > 0) return
 
+    const maxPeers = Math.min(this.peers.length, MAX_PEERS_UPGRADE)
+
     // check if a peer can upgrade us
 
-    for (let i = 0; i < this.peers.length; i++) {
+    for (let i = 0; i < maxPeers; i++) {
       const peer = this.peers[i]
 
       if (peer.remoteSynced === false) return
@@ -1690,6 +1703,9 @@ module.exports = class Replicator {
       if (r.inflight.length > 0) return
     }
 
+    // if something is inflight, wait for that first
+    if (this._upgrade.inflight.length > 0) return
+
     // nothing to do, indicate no update avail
 
     const u = this._upgrade
@@ -1771,6 +1787,8 @@ module.exports = class Replicator {
       this._clearRequest(peer, req)
     }
 
+    if (peer.useSession) this._closeSessionMaybe()
+
     this.onpeerupdate(false, peer)
     this.updateAll()
   }
@@ -2243,8 +2261,11 @@ module.exports = class Replicator {
     this._maybeResolveIfAvailableRanges()
   }
 
-  _closeSession () {
-    this.core.active--
+  _closeSessionMaybe () {
+    if (this._hasSession && this._peerSessions === 0) {
+      this._hasSession = false
+      this.core.active--
+    }
 
     // we were the last active ref, so lets shut things down
     if (this.core.active === 0 && this.core.sessions.length === 0) {
@@ -2263,10 +2284,15 @@ module.exports = class Replicator {
     return this._attached.has(protomux)
   }
 
+  ensureSession () {
+    if (this._hasSession) return
+    this._hasSession = true
+    this.core.active++
+  }
+
   attachTo (protomux, useSession) {
-    if (useSession) {
-      this.core.active++
-    }
+    if (this.core.closed) return
+    if (useSession) this.ensureSession()
 
     const makePeer = this._makePeer.bind(this, protomux, useSession)
 
@@ -2275,12 +2301,15 @@ module.exports = class Replicator {
     protomux.stream.setMaxListeners(0)
     protomux.stream.on('close', this._onstreamclose)
 
+    if (useSession) this._peerSessions++
     this._ifAvailable++
+
     protomux.stream.opened.then((opened) => {
+      if (useSession) this._peerSessions--
       this._ifAvailable--
 
       if (opened && !this.destroyed) makePeer()
-      else if (useSession) this._closeSession()
+      else if (useSession) this._closeSessionMaybe()
       this._checkUpgradeIfAvailable()
     })
   }
@@ -2339,6 +2368,12 @@ module.exports = class Replicator {
     const peer = new Peer(replicator, protomux, channel, useSession, this.inflightRange)
     const stream = protomux.stream
 
+    if (useSession) {
+      // session may have been unref'd underneath us
+      replicator.ensureSession()
+      replicator._peerSessions++
+    }
+
     peer.channel.open({
       seeks: true,
       capability: caps.replicate(stream.isInitiator, this.key, stream.handshakeHash)
@@ -2347,7 +2382,7 @@ module.exports = class Replicator {
     return true
 
     function onnochannel () {
-      if (useSession) replicator._closeSession()
+      if (useSession) replicator._closeSessionMaybe()
       return false
     }
   }

package/package.json

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