hypercore 10.24.6 → 10.24.7

package/index.js

@@ -85,6 +85,7 @@ module.exports = class Hypercore extends EventEmitter {
     this._snapshot = null
     this._batch = opts._batch || null
     this._findingPeers = 0
+    this._active = opts.active !== false
 
     this.opening = this._openSession(key, storage, opts)
     this.opening.catch(noop)
@@ -323,6 +324,8 @@ module.exports = class Hypercore extends EventEmitter {
     // It's required so that corestore can load a name from userData before 'ready' is emitted.
     if (opts._preready) await opts._preready(this)
 
+    this.replicator.updateActivity(this._active ? 1 : 0, this)
+
     this.opened = true
     this.emit('ready')
   }
@@ -441,6 +444,7 @@ module.exports = class Hypercore extends EventEmitter {
     if (this.replicator !== null) {
       this.replicator.findingPeers -= this._findingPeers
       this.replicator.clearRequests(this.activeRequests, err)
+      this.replicator.updateActivity(this._active ? -1 : 0, this)
     }
 
     this._findingPeers = 0
@@ -530,7 +534,7 @@ module.exports = class Hypercore extends EventEmitter {
   _attachToMuxerOpened (mux, useSession) {
     // If the user wants to, we can make this replication run in a session
     // that way the core wont close "under them" during replication
-    const session = useSession ? this.session() : null
+    const session = useSession ? this.session({ active: false }) : null
     this.replicator.attachTo(mux, session)
   }
 

package/lib/replicator.js

@@ -1046,7 +1046,7 @@ module.exports = class Replicator {
     this.findingPeers = 0 // updateable from the outside
     this.destroyed = false
     this.downloading = true
-    this.sessions = 0
+    this.activeSessions = 0
 
     this._attached = new Set()
     this._inflight = new InflightTracker()
@@ -1074,15 +1074,29 @@ module.exports = class Replicator {
     }
   }
 
+  updateActivity (inc, session) {
+    this.activeSessions += inc
+    this.setDownloading(this.activeSessions !== 0, session)
+  }
+
   isDownloading () {
     return this.downloading || !this._inflight.idle
   }
 
-  setDownloading (downloading) {
+  setDownloading (downloading, session) {
     if (this.downloading === downloading) return
     this.downloading = downloading
     if (!downloading && this.isDownloading()) return
+
     for (const peer of this.peers) peer.signalUpgrade()
+
+    if (downloading) { // restart channel if needed...
+      for (const protomux of this._attached) {
+        if (!protomux.stream.handshakeHash) continue
+        if (protomux.opened({ protocol: 'hypercore/alpha', id: this.discoveryKey })) continue
+        this._makePeer(protomux, session && session.session())
+      }
+    }
   }
 
   cork () {
@@ -1779,12 +1793,10 @@ module.exports = class Replicator {
   }
 
   _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)

package/package.json

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