blind-peer 2.9.0 → 2.9.2

package/index.js

@@ -96,8 +96,9 @@ class CoreTracker {
 
   announceToReferrer() {
     if (!this.record || !this.record.referrer) return
-    if (!this.referrerDiscoveryKey)
+    if (!this.referrerDiscoveryKey) {
       this.referrerDiscoveryKey = crypto.discoveryKey(this.record.referrer)
+    }
 
     const sessions = this.blindPeer.wakeup.getSessions(null, {
       discoveryKey: this.referrerDiscoveryKey
@@ -127,11 +128,28 @@ class CoreTracker {
 }
 
 class WakeupHandler {
-  constructor(db, key, discoveryKey) {
+  constructor(wakeup, db, key, discoveryKey) {
+    this.wakeup = wakeup
     this.db = db
     this.key = key
     this.discoveryKey = discoveryKey
     this.active = false
+    this.timeout = setTimeout(this._gc.bind(this), 15_000) // sanity
+  }
+
+  remoteAttached() {
+    if (!this.timeout) return
+    clearTimeout(this.timeout)
+    this.timeout = null
+  }
+
+  onpeeradd(peer, session) {
+    this.remoteAttached()
+  }
+
+  onpeerremove(peer, session) {
+    this.remoteAttached()
+    if (session.peers.length === 0) session.destroy()
   }
 
   async onpeeractive(peer, session) {
@@ -151,6 +169,17 @@ class WakeupHandler {
       // do nothing
     }
   }
+
+  _gc() {
+    const sessions = this.wakeup.getSessions(this.key)
+    if (!sessions.length) return
+    const session = sessions[0]
+    if (session.peers.length === 0) session.destroy()
+  }
+
+  ondestroy(session) {
+    this.remoteAttached()
+  }
 }
 
 class BlindPeer extends ReadyResource {
@@ -228,8 +257,9 @@ class BlindPeer extends ReadyResource {
 
     if (this.swarm === null) {
       const swarmOpts = { keyPair: this.db.swarmingKeyPair }
-      if (this._port)
+      if (this._port) {
         swarmOpts.port = typeof this._port === 'number' ? [this._port, this._port + 64] : this._port
+      }
       this.swarm = new Hyperswarm(swarmOpts)
     }
     this.swarm.on('connection', this._onconnection.bind(this))
@@ -243,6 +273,16 @@ class BlindPeer extends ReadyResource {
     this.flushInterval = setInterval(this.flush.bind(this), 10_000)
   }
 
+  _getSession(key, discoveryKey) {
+    const sessions = this.wakeup.getSessions(key)
+    if (sessions.length) return sessions[0]
+
+    const handler = new WakeupHandler(this.wakeup, this.db, key, discoveryKey)
+    const session = this.wakeup.session(key, handler)
+    if (session.peers.length) handler.remoteAttached()
+    return session
+  }
+
   async _onwakeup(discoveryKey, muxer) {
     this.stats.wakeups++
 
@@ -250,21 +290,16 @@ class BlindPeer extends ReadyResource {
     if (!auth) return
 
     const stream = muxer.stream
-    const handler = new WakeupHandler(this.db, auth.key, discoveryKey)
+    if (stream.destroying || stream.destroyed) return
 
-    if (this.wakeup.hasStream(stream, auth.key, handler)) {
-      return
-    }
+    const session = this._getSession(auth.key, discoveryKey)
 
-    const w = this.wakeup.session(auth.key, handler)
-    w.addStream(stream)
-
-    for (const peer of w.peers) {
-      if (peer.active) handler.onpeeractive(peer, w)
-    }
+    if (session.hasStream(stream)) return
+    session.addStream(stream)
 
-    stream.setMaxListeners(0)
-    stream.once('close', () => w.destroy())
+    // if new peer, send back the active handler for this peer
+    const peer = session.getPeer(stream)
+    if (peer && peer.active) session.handlers.onpeeractive(peer, session)
   }
 
   async listen() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "blind-peer",
-  "version": "2.9.0",
+  "version": "2.9.2",
   "description": "Blind peers help keep hypercores available",
   "main": "index.js",
   "bin": {