blind-peer 2.7.11 → 2.7.12

package/bin.js

@@ -9,6 +9,7 @@ const safetyCatch = require('safety-catch')
 const byteSize = require('tiny-byte-size')
 const pino = require('pino')
 const b4a = require('b4a')
+const hypCrypto = require('hypercore-crypto')
 
 const BlindPeer = require('.')
 
@@ -48,9 +49,9 @@ const cmd = command('blind-peer',
       logger.warn(`Error while flushing the db: ${e.stack}`)
     })
 
-    blindPeer.on('add-core', record => {
+    blindPeer.on('add-core', (record, _, stream) => {
       try {
-        logger.info(`add-core request received for record ${recordToStr(record)}`)
+        logger.info(`add-core request received from peer ${streamToStr(stream)} for record ${recordToStr(record)}`)
       } catch (e) {
         logger.info(`Invalid add-core request received: ${e.stack}`)
         logger.info(record)
@@ -87,6 +88,13 @@ const cmd = command('blind-peer',
       })
     }
 
+    blindPeer.on('invalid-request', (core, err, req, from) => {
+      const address = `${from.stream?.rawStream?.remoteHost}:${from.stream?.rawStream?.remotePort}`
+      const remotePubKey = idEnc.normalize(from.stream.remotePublicKey)
+      const key = idEnc.normalize(core.key)
+      console.warn(`Received invalid request for core ${key} from peer ${remotePubKey} at ${address} (${err.stack})`)
+    })
+
     logger.info(`Using storage '${storage}'`)
     if (trustedPubKeys.length > 0) {
       logger.info(`Trusted public keys:\n  -${[...blindPeer.trustedPubKeys].map(idEnc.normalize).join('\n  -')}`)
@@ -174,11 +182,18 @@ const cmd = command('blind-peer',
 )
 
 function recordToStr (record) {
-  return `DB Record for key ${idEnc.normalize(record.key)} with priority: ${record.priority}. Announcing? ${record.announce}`
+  const discKey = hypCrypto.discoveryKey(record.key)
+  return `DB Record for discovery key ${idEnc.normalize(discKey)} with priority: ${record.priority}. Announcing? ${record.announce}`
+}
+
+function streamToStr (stream) {
+  const pubKey = idEnc.normalize(stream.remotePublicKey)
+  return `${pubKey}`
 }
 
 function coreToInfo (core) {
-  return `${idEnc.normalize(core.key)} (${core.contiguousLength} / ${core.length}, ${core.peers.length} peers)`
+  const discKey = hypCrypto.discoveryKey(core.key)
+  return `Discovery key ${idEnc.normalize(discKey)} (${core.contiguousLength} / ${core.length}, ${core.peers.length} peers)`
 }
 
 cmd.parse()

package/index.js

@@ -206,11 +206,15 @@ class BlindPeer extends ReadyResource {
 
   async _open () {
     await this.store.ready()
+
     // legacy, we can remove once current ones are upgraded
     const { secretKey } = await this.store.createKeyPair('blind-mirror-swarm')
     this.db = new BlindPeerDB(this.rocks.session(), { swarming: secretKey.subarray(0, 32), encryption: null })
     await this.db.ready()
 
+    // We don't need to track our own db, so we set this handler after the db core opened
+    this.store.watch(this._oncoreopen.bind(this))
+
     if (this.swarm === null) {
       const swarmOpts = { keyPair: this.db.swarmingKeyPair }
       if (this._port) swarmOpts.port = typeof this._port === 'number' ? [this._port, this._port + 64] : this._port
@@ -224,8 +228,6 @@ class BlindPeer extends ReadyResource {
     }
     await Promise.all(announceProms)
 
-    this.store.watch(this._oncoreopen.bind(this))
-
     this.flushInterval = setInterval(this.flush.bind(this), 10_000)
   }
 
@@ -331,6 +333,9 @@ class BlindPeer extends ReadyResource {
         this.activeReplication.delete(id)
       }
     })
+    session.on('invalid-request', (err, req, from) => {
+      this.emit('invalid-request', session, err, req, from)
+    })
   }
 
   async flush () { // not allowed to throw
@@ -437,7 +442,7 @@ class BlindPeer extends ReadyResource {
     }
 
     this.stats.coresAdded++
-    this.emit('add-core', record, true)
+    this.emit('add-core', record, true, stream)
 
     await this._activateCore(stream, record)
 

package/package.json

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