blind-peer 3.8.0 → 3.8.2

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()
   }
 }
 
@@ -213,6 +219,7 @@ class BlindPeer extends ReadyResource {
       ipBanListKeys = [],
       banTimeout = 16_000,
       port,
+      bootstrap = null,
       announcingInterval = 100,
       wakeupGcTickTime = null,
       replicationLagThreshold = 100,
@@ -230,6 +237,7 @@ class BlindPeer extends ReadyResource {
     this.banTimeout = banTimeout
 
     this._port = port || 0
+    this.bootstrap = bootstrap
     this.announcingInterval = announcingInterval
     this.trustedPubKeys = new Set()
     for (const k of trustedPubKeys || []) this.addTrustedPubKey(k)
@@ -341,7 +349,7 @@ class BlindPeer extends ReadyResource {
     this.store.watch(this._oncoreopen.bind(this))
 
     if (this.swarm === null) {
-      const swarmOpts = { keyPair: this.db.swarmingKeyPair }
+      const swarmOpts = { keyPair: this.db.swarmingKeyPair, bootstrap: this.bootstrap }
       if (this._port) {
         swarmOpts.port = typeof this._port === 'number' ? [this._port, this._port + 64] : this._port
       }
@@ -433,7 +441,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 {
@@ -570,7 +578,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)
@@ -624,6 +632,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 })
@@ -633,6 +642,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) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "blind-peer",
-  "version": "3.8.0",
+  "version": "3.8.2",
   "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",