blind-peer 2.8.3 → 2.9.1

package/bin.js

@@ -60,6 +60,10 @@ const cmd = command(
     '--repl [repl]',
     'Expose a repl-swarm at the passed-in seed (32 bytes in hex or z32 notation). Use for debugging only.'
   ),
+  flag(
+    '--auto-shutdown-minutes [auto-shutdown-minutes]',
+    '(Temporary, Advanced) Automatically shut the process down after X minutes, with a variation of 20%'
+  ),
   async function ({ flags }) {
     const debug = flags.debug
     const logger = pino({
@@ -290,6 +294,18 @@ const cmd = command(
 
     logger.info(`Listening at ${idEnc.normalize(blindPeer.publicKey)}`)
     logger.info(`Encryption public key is ${idEnc.normalize(blindPeer.encryptionPublicKey)}`)
+
+    if (flags.autoShutdownMinutes) {
+      const delay = flags.autoShutdownMinutes * (1 + Math.random() / 5)
+      logger.warn(`Automatically shutting down the process in ${delay} minutes`)
+      setTimeout(
+        () => {
+          logger.warn('Auto-shutdown triggered. Shutting down...')
+          goodbye.exit()
+        },
+        delay * 60 * 1000
+      )
+    }
   }
 )
 

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
@@ -151,6 +152,10 @@ class WakeupHandler {
       // do nothing
     }
   }
+
+  onpeerinactive(peer, session) {
+    if (session.peers.length === 0) session.destroy()
+  }
 }
 
 class BlindPeer extends ReadyResource {
@@ -228,8 +233,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 +249,14 @@ 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.db, key, discoveryKey)
+    return this.wakeup.session(key, handler)
+  }
+
   async _onwakeup(discoveryKey, muxer) {
     this.stats.wakeups++
 
@@ -250,21 +264,14 @@ class BlindPeer extends ReadyResource {
     if (!auth) return
 
     const stream = muxer.stream
-    const handler = new WakeupHandler(this.db, auth.key, discoveryKey)
+    const session = this._getSession(auth.key, discoveryKey)
 
-    if (this.wakeup.hasStream(stream, auth.key, handler)) {
-      return
-    }
-
-    const w = this.wakeup.session(auth.key, handler)
-    w.addStream(stream)
+    if (session.hasStream(stream)) return
+    session.addStream(stream)
 
-    for (const peer of w.peers) {
-      if (peer.active) handler.onpeeractive(peer, w)
-    }
-
-    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) handler.onpeeractive(peer, session)
   }
 
   async listen() {
@@ -527,6 +534,8 @@ class BlindPeer extends ReadyResource {
   }
 
   registerMetrics(promClient) {
+    this.wakeup.registerMetrics(promClient)
+
     const self = this
     new promClient.Gauge({
       // eslint-disable-line no-new

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "blind-peer",
-  "version": "2.8.3",
+  "version": "2.9.1",
   "description": "Blind peers help keep hypercores available",
   "main": "index.js",
   "bin": {
@@ -24,7 +24,7 @@
     "paparam": "^1.8.0",
     "pino": "^9.6.0",
     "protomux-rpc": "^1.7.1",
-    "protomux-wakeup": "^2.6.0",
+    "protomux-wakeup": "^2.7.0",
     "ready-resource": "^1.1.2",
     "repl-swarm": "^2.3.0",
     "rocksdb-native": "^3.1.6",