autobee 2.0.0-rc.10 → 2.0.0-rc.11

package/index.js

@@ -88,6 +88,7 @@ module.exports = class Autobee extends ReadyResource {
 
     this._localSystemStart = 0
     this._localSystemLength = 0
+    this._localFlushes = 0
     this._localViewStart = 0
     this._localViewLength = 0
 
@@ -163,6 +164,7 @@ module.exports = class Autobee extends ReadyResource {
 
     this._localSystemStart = this.system.bee.context.local.length
     this._localViewStart = this._workingBee.context.local.length
+    this._localFlushes = this.system.flushes
 
     this.bumpSoon()
   }
@@ -967,6 +969,7 @@ module.exports = class Autobee extends ReadyResource {
     if (local) {
       this._localSystemLength = this.system.bee.context.local.length - this._localSystemStart
       this._localViewLength = this._workingBee.context.local.length - this._localViewStart
+      this._localFlushes = this.system.flushes
     }
 
     this.writers.attest(witnessed)
@@ -1081,7 +1084,7 @@ module.exports = class Autobee extends ReadyResource {
 
   async _flushLocal() {
     await this.writers.flushLocal({
-      flushes: this.system.flushes,
+      flushes: this._localFlushes,
       system: {
         key: this.system.bee.context.local.key,
         start: this._localSystemStart,
@@ -1096,6 +1099,7 @@ module.exports = class Autobee extends ReadyResource {
 
     this._localSystemStart = this.system.bee.context.local.length
     this._localSystemLength = 0
+    this._localFlushes = this.system.flushes
     this._localViewStart = this._workingBee.context.local.length
     this._localViewLength = 0
   }
@@ -1168,13 +1172,15 @@ module.exports = class Autobee extends ReadyResource {
       return null
     }
 
-    const moved = await this._moveTo(batchToHead(verified.op.views.system), {
+    const tip = {
       system: batchToHead(oplog.op.views.system),
       verified: {
         op: trusted || head,
         flushes: verified.op.views.flushes
       }
-    })
+    }
+
+    const moved = await this._moveTo(batchToHead(verified.op.views.system), tip)
 
     if (moved && wait) return this.reboot.promise
 
@@ -1277,7 +1283,8 @@ module.exports = class Autobee extends ReadyResource {
     const t = await topo.rollback(this, sys, verified)
     await sys.close()
 
-    await this.applyBacklog(t.tip)
+    if (t !== null) await this.applyBacklog(t.tip)
+
     return this._update(changes)
   }
 

package/lib/topo.js

@@ -42,20 +42,35 @@ async function getMostRecentHead(auto, system) {
 }
 
 async function rollback(auto, system, verified) {
+  if (!(await isApplied(system, verified.op))) return null
+
   const tip = []
   const ch = system.createChangesStream()
 
+  let found = false
+
   for await (const data of ch) {
     const { ref, info } = getOplog(data)
+
     if (sameNode(ref.oplog, verified.op)) {
-      asserts.assert(info.flushes === verified.flushes, 'Expect tip to be continuous')
+      // stale views.flushes - the verified head describes a prefix this system
+      // does not share, so nothing above it is ours to reapply
+      if (info.flushes === verified.flushes) found = true
+      break
+    }
+
+    // walking back, a writer's lengths only decrease - once this writer is
+    // behind the verified head the marker cannot be further down
+    if (b4a.equals(ref.oplog.key, verified.op.key) && ref.oplog.length < verified.op.length) {
       break
     }
 
     tip.push(ref)
   }
 
-  const inflated = await inflate(auto, tip)
+  if (!found) return null
+
+  const inflated = await inflate(auto, tip.reverse())
 
   // @todo: verify sort
 
@@ -86,6 +101,14 @@ async function replay(auto) {
   return inflated.flatMap((b) => (b === null ? [null] : b.batch))
 }
 
+async function isApplied(system, node) {
+  const entry = await system.get(encoding.encodeSystemWriterKey(node.key))
+  if (entry === null) return false
+
+  const info = encoding.decodeSystemWriter(entry.key, entry.value)
+  return info.length >= node.length
+}
+
 // tolerates legacy nodes instead of asserting
 async function* oplogIterator(bee) {
   try {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "autobee",
-  "version": "2.0.0-rc.10",
+  "version": "2.0.0-rc.11",
   "description": "Bee based autobase",
   "license": "Apache-2.0",
   "author": "Holepunch Inc.",