autobee 2.7.2 → 2.7.4

package/index.js

@@ -810,6 +810,13 @@ module.exports = class Autobee extends ReadyResource {
     if (this.fastForwardTo !== null || this.fastForwarding !== null) return
     if (this._interrupting || this.closing || this.bootFrom) return
 
+    // the migrated legacy nodes have to land on the legacy system before we
+    // move off it - requeue the hints so the ff is retried once they applied
+    if (this._catchupMigratedNodes !== null) {
+      this._wakeup.hint(hints)
+      return
+    }
+
     try {
       const heads = await this._readCandidateHeads(hints, FastForward.DEFAULT_TIMEOUT)
 
@@ -1025,19 +1032,32 @@ module.exports = class Autobee extends ReadyResource {
     return anchor
   }
 
+  // apply in linearizer order so the catchup never undoes. weights are fixed,
+  // legacy nodes carry no witness
   async _bumpMigratedWriters() {
     const opened = new Set()
     let updated = false
 
     for (const batch of this._catchupMigratedNodes) {
-      await this._processBatch(batch)
-      updated = true
       for (const node of batch) {
         if (node.from) opened.add(node.from)
       }
     }
 
-    for (const core of opened) await core.close()
+    try {
+      for (const batch of this._catchupMigratedNodes) {
+        const weight = await resolveWeight(this, batch[0])
+        for (const node of batch) node.weight = weight
+      }
+
+      for (const batch of topo.linearize(this._catchupMigratedNodes)) {
+        await this._processBatch(batch)
+        updated = true
+      }
+    } finally {
+      for (const core of opened) await core.close()
+    }
+
     return updated
   }
 

package/lib/topo.js

@@ -9,6 +9,8 @@ const INFO_LEGACY_KEY = b4a.concat([b4a.from([0, 0]), b4a.from('info')])
 
 exports.sort = sort
 exports.replay = replay
+exports.linearize = linearize
+exports.getOplogBatch = getOplogBatch
 
 exports.isLinking = isLinking
 exports.isLinkingAll = isLinkingAll
@@ -92,6 +94,18 @@ async function sort(auto, batch) {
   }
 }
 
+// the order the batches settle in - applying them in it never undoes.
+// batches must arrive after the batches they link
+function linearize(batches) {
+  const list = []
+
+  for (const batch of batches) {
+    addSorted(list, { undo: null, batch, index: -1 })
+  }
+
+  return list.map((e) => e.batch)
+}
+
 function addSorted(list, entry) {
   const node = entry.batch[0]
   const clock = new Clock()
@@ -215,16 +229,17 @@ async function getOplogBatch(undo, core, length, weight, index, readOpts = null)
   const head = createNode(core, length, weight, oplog)
   const legacy = oplog.version <= LEGACY_OPLOG_VERSION
 
-  // if this is legacy the start pointer is always 0, fix
-  if (legacy && !oplog.links.length) {
+  // legacy start is always 0, walk back to the previous head (end 0). links
+  // do not mark the start, legacy batch nodes link their own predecessor.
+  // only the block before the batch can be missing (legacy ff), so a miss is
+  // the boundary
+  if (legacy) {
     for (let i = length - 1; i > 0; i--) {
-      const block = await core.get(i - 1, readOpts)
-      if (block === null) return null // wait: false in replay helper
+      const block = await core.get(i - 1, { wait: false })
+      if (block === null) break
 
-      const oplog = encoding.decodeOplog(block)
-      if (oplog.batch.end === 0) break
+      if (encoding.decodeOplog(block).batch.end === 0) break
       head.batch.start++
-      if (oplog.links.length > 0) break // always start of batch in legacy
     }
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "autobee",
-  "version": "2.7.2",
+  "version": "2.7.4",
   "description": "Bee based autobase",
   "license": "Apache-2.0",
   "author": "Holepunch Inc.",
@@ -46,6 +46,7 @@
     "prettier": "^3.8.1",
     "prettier-config-holepunch": "^2.0.0",
     "protomux-wakeup": "^2.9.0",
-    "replication-simulator": "^3.0.0"
+    "replication-simulator": "^3.0.0",
+    "uncaughts": "^1.1.3"
   }
 }