hypercore 11.27.1 → 11.27.3

package/index.js

@@ -117,6 +117,10 @@ class Hypercore extends EventEmitter {
     UPDATE_COMPAT(enableCompat)
   }
 
+  static setRecoveryPeers(peers) {
+    Core.setRecoveryPeers(peers)
+  }
+
   static key(manifest, { compat, version, namespace } = {}) {
     if (b4a.isBuffer(manifest)) {
       manifest = { version, signers: [{ publicKey: manifest, namespace }] }
@@ -627,10 +631,19 @@ class Hypercore extends EventEmitter {
     return this.opened === false ? null : this.core.globalCache
   }
 
+  get recovering() {
+    return this.opened === false ? 0 : this.core.header.hints.recovering
+  }
+
   ready() {
     return this.opening
   }
 
+  async recover() {
+    if (this.opened === false) await this.opening
+    return this.state.waitForRecovery()
+  }
+
   async setUserData(key, value) {
     if (this.opened === false) await this.opening
     const existing = await this.getUserData(key)

package/lib/core.js

@@ -67,6 +67,10 @@ module.exports = class Core {
     this.opening.catch(noop)
   }
 
+  static setRecoveryPeers(peers) {
+    SessionState.RECOVERY_PEERS = peers
+  }
+
   ready() {
     return this.opening
   }

package/lib/session-state.js

@@ -16,7 +16,7 @@ const Mutex = require('./mutex')
 const Bitfield = require('./bitfield')
 const { MerkleTree, MerkleTreeBatch } = require('./merkle-tree')
 
-module.exports = class SessionState {
+class SessionState {
   constructor(core, parent, storage, treeInfo, name) {
     this.core = core
     this.index = this.core.sessionStates.push(this) - 1
@@ -54,6 +54,8 @@ module.exports = class SessionState {
     this.ref()
   }
 
+  static RECOVERY_PEERS = null
+
   isSnapshot() {
     return this.storage.snapshotted
   }
@@ -569,19 +571,21 @@ module.exports = class SessionState {
   }
 
   // simple tool to wait for other peers to catch us up
-  async _waitForRecovery() {
+  async waitForRecovery() {
     const length = this.length
     const replicator = this.core.replicator
 
     while (!this.closing) {
-      if (replicator.peers.length < 1) {
+      let peers = getRecoveryPeers(replicator.peers)
+
+      if (peers.length < 1) {
         await new Promise((resolve) => setTimeout(resolve, 5000))
         continue
       }
 
-      await new Promise((resolve) => setTimeout(resolve, 5000))
+      await new Promise((resolve) => setTimeout(resolve, 8000))
 
-      const peers = replicator.peers
+      peers = getRecoveryPeers(replicator.peers)
 
       if (peers.length < 1 || this.closing) continue
       if (peers[0].remoteLength > this.length) continue
@@ -607,7 +611,7 @@ module.exports = class SessionState {
   async append(values, { signature, keyPair, preappend, postappend, maxLength = -1 } = {}) {
     if (!keyPair && this.isDefault()) keyPair = this.core.header.keyPair
 
-    if (this.isDefault() && this.core.header.hints.recovering) await this._waitForRecovery()
+    if (this.isDefault() && this.core.header.hints.recovering) await this.waitForRecovery()
 
     await this.mutex.lock()
 
@@ -965,7 +969,7 @@ module.exports = class SessionState {
       throw ASSERTION('Cannot commit while repair mode is on')
     }
 
-    if (this.core.header.hints.recovering) await this._waitForRecovery()
+    if (this.core.header.hints.recovering) await this.waitForRecovery()
 
     let srcLocked = false
     await this.mutex.lock()
@@ -1189,6 +1193,8 @@ module.exports = class SessionState {
   }
 }
 
+module.exports = SessionState
+
 function noop() {}
 
 function getBitfieldPage(index) {
@@ -1287,3 +1293,20 @@ function isRootIndex(index, roots) {
 
   return false
 }
+
+function getRecoveryPeers(peers) {
+  if (!SessionState.RECOVERY_PEERS) return peers
+
+  const actual = []
+
+  for (const p of peers) {
+    for (const r of SessionState.RECOVERY_PEERS) {
+      if (b4a.equals(p.remotePublicKey, r)) {
+        actual.push(p)
+        break
+      }
+    }
+  }
+
+  return actual
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hypercore",
-  "version": "11.27.1",
+  "version": "11.27.3",
   "description": "Hypercore is a secure, distributed append-only log",
   "main": "index.js",
   "scripts": {