blind-peer 2.7.17 → 2.8.1

package/bin.js

@@ -60,6 +60,15 @@ const cmd = command('blind-peer',
         logger.info(record)
       }
     })
+    blindPeer.on('delete-blocked', (stream, { key }) => {
+      logger.info(`Blocked delete-core request from untrusted peer ${streamToStr(stream)} for core ${idEnc.normalize(key)}`)
+    })
+    blindPeer.on('delete-core', (stream, { key, existing }) => {
+      logger.info(`Received delete-core request from trusted peer ${streamToStr(stream)} for core ${idEnc.normalize(key)}. Existing: ${existing}`)
+    })
+    blindPeer.on('delete-core-end', (stream, { key, announced }) => {
+      logger.info(`Completed delete-core request from trusted peer ${streamToStr(stream)} for core ${idEnc.normalize(key)}. Was announced: ${announced}`)
+    })
 
     blindPeer.on('downgrade-announce', ({ record, remotePublicKey }) => {
       try {
@@ -70,13 +79,13 @@ const cmd = command('blind-peer',
     })
 
     blindPeer.on('announce-core', core => {
-      logger.info(`Started announcing core ${coreToInfo(core)}`)
+      logger.info(`Started announcing core ${coreToInfo(core, true)}`)
     })
     blindPeer.on('core-downloaded', core => {
-      logger.info(`Announced core fully downloaded: ${coreToInfo(core)}`)
+      logger.info(`Announced core fully downloaded: ${coreToInfo(core, true)}`)
     })
     blindPeer.on('core-append', core => {
-      logger.info(`Detected announced-core length update: ${coreToInfo(core)}`)
+      logger.info(`Detected announced-core length update: ${coreToInfo(core, true)}`)
     })
 
     blindPeer.on('gc-start', ({ bytesToClear }) => {
@@ -220,9 +229,11 @@ function streamToStr (stream) {
   return `${pubKey}`
 }
 
-function coreToInfo (core) {
+function coreToInfo (core, includePublicKey = false) {
   const discKey = hypCrypto.discoveryKey(core.key)
-  return `Discovery key ${idEnc.normalize(discKey)} (${core.contiguousLength} / ${core.length}, ${core.peers.length} peers)`
+  let res = `Discovery key ${idEnc.normalize(discKey)} (${core.contiguousLength} / ${core.length}, ${core.peers.length} peers)`
+  if (includePublicKey) res += `. Public key: ${idEnc.normalize(core.key)}`
+  return res
 }
 
 cmd.parse()

package/index.js

@@ -15,6 +15,7 @@ const IdEnc = require('hypercore-id-encoding')
 const BlindPeerDB = require('./lib/db.js')
 
 const { AddCoreEncoding } = require('blind-peer-encodings')
+const { DeleteCoreEncoding } = require('blind-peer-encodings')
 
 class CoreTracker {
   constructor (blindPeer, core) {
@@ -365,6 +366,7 @@ class BlindPeer extends ReadyResource {
     })
 
     rpc.respond('add-core', AddCoreEncoding, this._onaddcore.bind(this, conn))
+    rpc.respond('delete-core', DeleteCoreEncoding, this._ondeletecore.bind(this, conn))
   }
 
   async _activateCore (stream, record) {
@@ -454,6 +456,51 @@ class BlindPeer extends ReadyResource {
     return coreRecord
   }
 
+  async _ondeletecore (stream, { key }) {
+    if (!this._isTrustedPeer(stream.remotePublicKey)) {
+      this.emit('delete-blocked', stream, { key })
+      throw new Error('Only trusted peers can delete cores')
+    }
+
+    const existing = await this.db.getCoreRecord(key) !== null
+    this.emit('delete-core', stream, { key, existing })
+    if (!existing) return false
+
+    const core = this.store.get({ key })
+    await core.ready()
+
+    const announced = this.announcedCores.has(core.id)
+    if (announced) {
+      this.swarm.leave(core.discoveryKey)
+      try {
+        // Closes the download session
+        await this.announcedCores.get(core.id).close()
+      } catch (e) {
+        safetyCatch(e)
+      }
+      this.announcedCores.delete(core.id)
+    }
+
+    const hexId = b4a.toString(core.discoveryKey, 'hex')
+    const tracker = this.activeReplication.get(hexId)
+    if (tracker) {
+      try {
+        // cancel the download request and trigger the cleanup logic
+        // which removes it from the active replication map
+        await tracker.core.close()
+      } catch (e) {
+        safetyCatch(e)
+      }
+    }
+
+    await core.clear(0, core.length)
+
+    this.db.deleteCore(key)
+    await this.flush()
+    this.emit('delete-core-end', stream, { key, announced })
+    return true
+  }
+
   async _close () {
     clearInterval(this.flushInterval)
     if (this.ownsWakeup) this.wakeup.destroy()

package/lib/db.js

@@ -1,6 +1,7 @@
 const HyperDB = require('hyperdb')
 const crypto = require('hypercore-crypto')
 const ReadyResource = require('ready-resource')
+const IdEnc = require('hypercore-id-encoding')
 const { definition: spec } = require('blind-peer-encodings')
 
 // LOW, NORMAL, HIGH
@@ -18,6 +19,7 @@ module.exports = class BlindPeerDB extends ReadyResource {
     this.swarmingKeyPair = null
 
     this.coresAdding = []
+    this.coresDeleting = []
     this.coresUpdated = new Map()
 
     this.stats = {
@@ -66,17 +68,27 @@ module.exports = class BlindPeerDB extends ReadyResource {
 
     const coresAdding = this.coresAdding
     const coresUpdated = this.coresUpdated
+    const coresDeleting = this.coresDeleting
 
     this.coresAdding = []
     this.coresUpdated = new Map()
+    this.coresDeleting = []
 
     const tx = this.db.transaction()
     const time = Date.now()
 
     let addedCores = 0
+    let deletedCores = 0
     let addedReferrers = 0
     let bytesAllocated = 0
 
+    for (const key of coresDeleting) {
+      const record = await tx.get('@blind-peer/cores', { key })
+      deletedCores++
+      bytesAllocated -= record.bytesAllocated
+      await tx.delete('@blind-peer/cores', { key })
+    }
+
     for (const info of coresAdding) {
       const key = info.key
       const existing = await tx.get('@blind-peer/cores', { key })
@@ -128,8 +140,8 @@ module.exports = class BlindPeerDB extends ReadyResource {
       await tx.insert('@blind-peer/cores', c)
     }
 
-    if (addedCores || addedReferrers || bytesAllocated || this.closing) {
-      this.digest.cores += addedCores
+    if (addedCores || deletedCores || addedReferrers || bytesAllocated || this.closing) {
+      this.digest.cores += addedCores - deletedCores
       this.digest.referrers += addedReferrers
       this.digest.bytesAllocated += bytesAllocated
       this.digest.flushed = !!this.closing
@@ -141,16 +153,25 @@ module.exports = class BlindPeerDB extends ReadyResource {
     await tx.flush()
   }
 
+  async hasCore (key) {
+    key = IdEnc.decode(key)
+    return await this.db.get('@blind-peer/cores', { key }) !== null
+  }
+
   addCore (info) {
     this.coresAdding.push(info)
   }
 
+  deleteCore (key) {
+    this.coresDeleting.push(key)
+  }
+
   updateCore (core, id) { // TODO: id is technically optional
     this.coresUpdated.set(id, core)
   }
 
   updated () {
-    return this.coresAdding.length > 0 || this.coresUpdated.size > 0
+    return this.coresAdding.length > 0 || this.coresUpdated.size > 0 || this.coresDeleting.length > 0
   }
 
   createGcCandidateReadStream () {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "blind-peer",
-  "version": "2.7.17",
+  "version": "2.8.1",
   "description": "Blind peers help keep hypercores available",
   "main": "index.js",
   "bin": {
@@ -10,7 +10,7 @@
     "autobase": "^7.0.18",
     "autobase-discovery": "^1.0.0",
     "b4a": "^1.6.7",
-    "blind-peer-encodings": "^3.0.0",
+    "blind-peer-encodings": "^3.1.0",
     "compact-encoding": "^2.16.0",
     "corestore": "^7.4.4",
     "graceful-goodbye": "^1.3.3",
@@ -33,7 +33,7 @@
     "tiny-byte-size": "^1.1.0"
   },
   "devDependencies": {
-    "blind-peering": "^1.10.1",
+    "blind-peering": "^1.12.0",
     "brittle": "^3.7.0",
     "debounceify": "^1.1.0",
     "hyperdht": "^6.20.1",