autobee 2.4.0 → 2.5.0

package/README.md

@@ -279,7 +279,7 @@ Pass `{ timeout }` to bound the reads, so a head nobody can serve fails instead
 
 Peers fast-forward onto the heads of writers they trust, so a trusted writer that has nothing to say still has to stamp its view progress into its own oplog.
 
-Acking does that: an empty node is appended whenever the local writer falls `ackThreshold` (default `64`) flushes behind the system.
+Acking does that: an empty node is appended whenever the local writer falls `ackThreshold` (default `32`) flushes behind the system.
 
 It is enabled for exactly the writers `isTrusted` accepts. The local key is judged when the db opens, after a fast-forward, and after the local writer rotates, so a writer that becomes trusted starts acking without being told to. `setAcking` overrides it until the next of those points.
 

package/index.js

@@ -99,9 +99,9 @@ module.exports = class Autobee extends ReadyResource {
     this.bootFrom = (fastForward && fastForward.boot) || null
 
     // conservative (default on): only fast-forward onto a head someone can serve whole
-    this._conservativeFF = !fastForward || fastForward.conservative !== false
+    this._conservativeFF = !fastForward || !!fastForward.conservative
 
-    this.trusted = new TrustedPeers(handlers)
+    this.trusted = new TrustedPeers(this, handlers)
 
     this.ff = null
     this.fastForwarding = null

package/lib/system.js

@@ -48,6 +48,7 @@ module.exports = class Systembee {
     this.updates = new Map()
     this.writers = new Map()
     this.encrypted = opts.encrypted === true
+    this.indexers = null
     this.promotions = new Promotions(this.bee)
   }
 
@@ -143,6 +144,9 @@ module.exports = class Systembee {
       // ~~~ good enough estimation
       this.flushes = Math.floor(this.bee.core.length / 2)
       this.view = await this._migrate(info, { timeout })
+      this.indexers = info ? info.indexers : null
+    } else {
+      this.indexers = null
     }
 
     this.updates.clear()

package/lib/trusted.js

@@ -1,9 +1,10 @@
 const b4a = require('b4a')
 
 class TrustedPeers {
-  constructor(hooks) {
+  constructor(auto, hooks) {
     this.trusted = new Map()
     this.pending = new Map()
+    this.auto = auto
     this.hooks = hooks
   }
 
@@ -11,6 +12,18 @@ class TrustedPeers {
     const hex = b4a.toString(key, 'hex')
     if (this.trusted.get(hex)) return true
 
+    // bootstrap
+    if (this.auto.system.isGenesis() && b4a.equals(key, this.auto.key)) {
+      return true
+    }
+
+    // legacy handling
+    if (this.auto.system.indexers) {
+      for (const idx of this.auto.system.indexers) {
+        if (b4a.equals(key, idx.key)) return true
+      }
+    }
+
     let promise = this.pending.get(hex)
     if (promise) return promise
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "autobee",
-  "version": "2.4.0",
+  "version": "2.5.0",
   "description": "Bee based autobase",
   "license": "Apache-2.0",
   "author": "Holepunch Inc.",