blind-peer 3.8.1 → 3.9.0

package/index.js

@@ -55,6 +55,8 @@ class CoreTracker {
   }
 
   _onupdate() {
+    if (this.blindPeer.closing) return
+
     this.updated = true
     if (!this.record) return
 
@@ -65,6 +67,8 @@ class CoreTracker {
   }
 
   _onactive() {
+    if (this.blindPeer.closing) return
+
     this.activated = true
 
     if (this.record) {
@@ -94,6 +98,7 @@ class CoreTracker {
   }
 
   async refresh() {
+    if (this.destroyed || this.record) return
     await this.core.ready()
     if (this.destroyed) return
 
@@ -104,7 +109,7 @@ class CoreTracker {
     if (this.destroyed || this.record || !record) return
 
     this.record = record
-    this.core.download({ start: this.record.blocksCleared, end: -1 })
+    this.downloadRange = this.core.download({ start: this.record.blocksCleared, end: -1 })
 
     if (this.updated) this._onupdate()
     if (this.activated) this._onactive()
@@ -140,6 +145,7 @@ class CoreTracker {
   destroy() {
     if (this.destroyed) return
     this.destroyed = true
+    this.downloadRange.destroy()
   }
 }
 
@@ -218,13 +224,14 @@ class BlindPeer extends ReadyResource {
       wakeupGcTickTime = null,
       replicationLagThreshold = 100,
       topK = {},
-      adminRouter = null
+      adminRouter = null,
+      activeCorestore = false
     } = {}
   ) {
     super()
 
     this.rocks = typeof rocks === 'string' ? new RocksDB(rocks) : rocks
-    this.store = store || new Corestore(this.rocks, { active: false })
+    this.store = store || new Corestore(this.rocks, { active: activeCorestore })
     this.swarm = swarm || null
     const ipBanNs = this.store.namespace('ip-ban-lists')
     this.ipBanLists = ipBanListKeys.map((key) => new IpBanList(ipBanNs, { key }))
@@ -435,7 +442,7 @@ class BlindPeer extends ReadyResource {
 
       try {
         const tracker = this.activeReplication.get(id)
-        if (!tracker.record) await tracker.refresh()
+        await tracker.refresh()
         const coreBytesCleared = tracker.gc()
         bytesCleared += coreBytesCleared
       } finally {
@@ -572,7 +579,7 @@ class BlindPeer extends ReadyResource {
     await core.ready()
 
     const tracker = this.activeReplication.get(b4a.toString(core.discoveryKey, 'hex'))
-    if (tracker && !tracker.record) await tracker.refresh()
+    if (tracker) await tracker.refresh()
 
     if (record.announce) {
       await this._announceCore(core.key)
@@ -626,6 +633,7 @@ class BlindPeer extends ReadyResource {
     let activeSession = null
 
     core.on('append', () => {
+      if (this.closing) return
       const replicationLag = core.length - core.contiguousLength
       if (!activeSession.isClient && replicationLag > this.replicationLagThreshold) {
         activeSession.refresh({ server: true, client: true })
@@ -635,6 +643,7 @@ class BlindPeer extends ReadyResource {
       this.emit('core-append', core)
     })
     core.on('download', () => {
+      if (this.closing) return
       const replicationLag = core.length - core.contiguousLength
       if (replicationLag === 0) {
         if (activeSession.isClient) {
@@ -1057,6 +1066,14 @@ class BlindPeer extends ReadyResource {
           this.set(self.rocks.stats.writeBatches)
         }
       })
+
+      new promClient.Gauge({
+        name: 'blind_peer_corestore_active',
+        help: 'Whether the corestore is active (1) or passive (0)',
+        collect() {
+          this.set(self.store.active ? 1 : 0)
+        }
+      })
     }
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "blind-peer",
-  "version": "3.8.1",
+  "version": "3.9.0",
   "description": "Blind peers help keep hypercores available",
   "main": "index.js",
   "dependencies": {
@@ -34,7 +34,7 @@
     "bare-process": "^4.2.2",
     "bare-prom-client": "^15.1.3",
     "blind-peer-router": "^0.2.2",
-    "blind-peering": "^2.1.0",
+    "blind-peering": "^2.1.2",
     "brittle": "^3.7.0",
     "debounceify": "^1.1.0",
     "graceful-goodbye": "^1.3.3",