blind-peer 2.9.2 → 2.9.4

package/bin.js

@@ -131,6 +131,9 @@ const cmd = command(
     blindPeer.on('announce-core', (core) => {
       logger.info(`Started announcing core ${coreToInfo(core, true)}`)
     })
+    blindPeer.on('announced-initial-cores', () => {
+      logger.info(`Announced all initial cores`)
+    })
     blindPeer.on('core-downloaded', (core) => {
       logger.info(`Announced core fully downloaded: ${coreToInfo(core, true)}`)
     })

package/index.js

@@ -61,6 +61,8 @@ class CoreTracker {
   }
 
   gc() {
+    if (!this.record) throw new Error('Record must be set before calling gc')
+
     // TODO: support gc-ing till less than last block (required hypercore to support getting byteLength at arbitrary versions)
     const bytesCleared = this.core.byteLength
     const blocksCleared = this.core.length
@@ -185,7 +187,16 @@ class WakeupHandler {
 class BlindPeer extends ReadyResource {
   constructor(
     rocks,
-    { swarm, store, wakeup, maxBytes = 100_000_000_000, enableGc = true, trustedPubKeys, port } = {}
+    {
+      swarm,
+      store,
+      wakeup,
+      maxBytes = 100_000_000_000,
+      enableGc = true,
+      trustedPubKeys,
+      port,
+      announcingInterval = 100
+    } = {}
   ) {
     super()
 
@@ -193,6 +204,7 @@ class BlindPeer extends ReadyResource {
     this.store = store || new Corestore(this.rocks, { active: false })
     this.swarm = swarm || null
     this._port = port || 0
+    this.announcingInterval = announcingInterval
     this.trustedPubKeys = new Set()
     for (const k of trustedPubKeys || []) this.addTrustedPubKey(k)
 
@@ -264,12 +276,7 @@ class BlindPeer extends ReadyResource {
     }
     this.swarm.on('connection', this._onconnection.bind(this))
 
-    const announceProms = []
-    for await (const record of this.db.createAnnouncingCoresStream()) {
-      announceProms.push(this._announceCore(record.key))
-    }
-    await Promise.all(announceProms)
-
+    this._announceCores().catch(safetyCatch) // announcing cores asynchronously
     this.flushInterval = setInterval(this.flush.bind(this), 10_000)
   }
 
@@ -336,6 +343,7 @@ class BlindPeer extends ReadyResource {
 
       try {
         const tracker = this.activeReplication.get(id)
+        if (!tracker.record) await tracker.refresh()
         const coreBytesCleared = tracker.gc()
         bytesCleared += coreBytesCleared
       } finally {
@@ -439,6 +447,18 @@ class BlindPeer extends ReadyResource {
     stream.on('close', () => core.close().catch(safetyCatch))
   }
 
+  async _announceCores() {
+    for await (const record of this.db.createAnnouncingCoresStream()) {
+      if (this.closing) return
+      await this._announceCore(record.key)
+      if (this.closing) return
+      await new Promise((resolve) => setTimeout(resolve, this.announcingInterval))
+      if (this.closing) return
+    }
+
+    this.emit('announced-initial-cores')
+  }
+
   async _announceCore(key) {
     const coreId = IdEnc.normalize(key)
     if (this.announcedCores.has(coreId)) return

package/package.json

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