hypercore 11.27.2 → 11.27.4

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 }] }

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
   }
@@ -574,17 +576,27 @@ module.exports = class SessionState {
     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))
+      let restart = false
+
+      for (let i = 0; i < 32; i++) {
+        await new Promise((resolve) => setTimeout(resolve, 250))
 
-      const peers = replicator.peers
+        peers = getRecoveryPeers(replicator.peers)
+
+        if (this.closing || !validateRecoveryPeers(peers, this.length)) {
+          restart = true
+          break
+        }
+      }
 
-      if (peers.length < 1 || this.closing) continue
-      if (peers[0].remoteLength > this.length) continue
+      if (restart) continue
 
       if (this.length !== length) {
         throw SESSION_NOT_WRITABLE('core recovered during append')
@@ -1189,6 +1201,8 @@ module.exports = class SessionState {
   }
 }
 
+module.exports = SessionState
+
 function noop() {}
 
 function getBitfieldPage(index) {
@@ -1287,3 +1301,36 @@ 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
+}
+
+function validateRecoveryPeers(peers, length) {
+  if (peers.length < 1) return false
+
+  for (const p of peers) {
+    if (p.remoteLength > length) return false
+  }
+
+  let all = true
+
+  for (const p of peers) {
+    if (p.remoteLength === 0) all = false
+  }
+
+  return all
+}

package/package.json

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