autobee 2.11.6 → 2.11.8

package/index.js

@@ -732,7 +732,8 @@ module.exports = class Autobee extends ReadyResource {
   }
 
   async _shouldReindex(key, { unknown = false, length = 0, timeout = 0 } = {}) {
-    const core = this.store.get({ key, active: false })
+    // an inactive session never attaches to a peer, so fetching needs an active one
+    const core = this.store.get({ key, active: unknown && length > 0 })
 
     try {
       await core.ready()
@@ -1611,10 +1612,11 @@ module.exports = class Autobee extends ReadyResource {
     if (!this._bootGuard.opened) await this._bootGuard.ready()
     if (this.closing) throw new Error('Autobee closed')
 
-    const ff = await FastForward.fromHead(this, head, null, { force: true, timeout })
+    // an explicit move goes wherever it is pointed, backwards included
+    const ff = await FastForward.fromHead(this, head, null, { force: true, rewind: true, timeout })
     if (ff === null) return null
 
-    if (!(await this._runFastForward(ff, { force: true }))) return null
+    if (!(await this._runFastForward(ff, { force: true, rewind: true }))) return null
 
     return this.ff.promise
   }
@@ -1680,7 +1682,7 @@ module.exports = class Autobee extends ReadyResource {
     }
   }
 
-  async _runFastForward(ff, { force = false } = {}) {
+  async _runFastForward(ff, { force = false, rewind = false } = {}) {
     if (this.fastForwardTo !== null || this.fastForwarding !== null) {
       await ff.close()
       return false
@@ -1696,6 +1698,9 @@ module.exports = class Autobee extends ReadyResource {
 
     if (!result) return false
 
+    // never move backwards, a boot head can be older than what we already have
+    if (!rewind && flushes < this.system.flushes) return false
+
     // apply ran while we searched, only drop it if it no longer moves us forward
     if (!force && flushes <= this.system.flushes) return false
 

package/lib/fast-forward.js

@@ -39,7 +39,12 @@ class FastForward {
 
   static DEFAULT_TIMEOUT = DEFAULT_OP_TIMEOUT
 
-  static async fromHead(auto, head, trusted, { force = false, skipGap = false, timeout = 0 } = {}) {
+  static async fromHead(
+    auto,
+    head,
+    trusted,
+    { force = false, skipGap = false, rewind = false, timeout = 0 } = {}
+  ) {
     const conservative = !force && auto._conservativeFF
 
     const oplog = await FastForward.flushHead(auto, head, { timeout })
@@ -51,6 +56,9 @@ class FastForward {
     // legacy nodes from non-indexers have no system info to fast-forward from
     if (!oplog.op.views || !verified.op.views) return null
 
+    // never move backwards, even when forced or the gap is skipped
+    if (!rewind && verified.op.views.flushes < auto.system.flushes) return null
+
     if (!force && !skipGap && verified.op.views.flushes - auto.system.flushes < MIN_FF_GAP) {
       return null
     }
@@ -86,6 +94,7 @@ class FastForward {
 
     for (let i = 0; i < ops.length; i++) {
       const res = ops[i]
+      if (res.op.views.flushes < auto.system.flushes) continue
       if (!force && !skipGap && res.op.views.flushes - auto.system.flushes < MIN_FF_GAP) continue
 
       if (!trust[i]) {

package/package.json

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