autobee 2.0.0-rc.6 → 2.0.0-rc.7

package/index.js

@@ -253,7 +253,12 @@ module.exports = class Autobee extends ReadyResource {
       view: info ? info.view : EMPTY_HEAD
     }
 
-    const shared = await this.system.commonAncestor(system || EMPTY_HEAD)
+    // no common ancestor (null) -> flushes -1 never matches, forcing a full diff
+    const shared = (await this.system.commonAncestor(system || EMPTY_HEAD)) || {
+      flushes: -1,
+      system: EMPTY_HEAD,
+      view: EMPTY_HEAD
+    }
 
     return UpdateChanges.from(shared, current)
   }

package/lib/system.js

@@ -2,7 +2,6 @@ const Hyperbee = require('hyperbee2')
 const b4a = require('b4a')
 
 const { AUTOBEE_VERSION } = require('./constants')
-const asserts = require('./asserts.js')
 const encoding = require('./encoding.js')
 const topo = require('./topo.js')
 
@@ -117,46 +116,57 @@ module.exports = class Systembee {
   }
 
   async commonAncestor(head) {
-    const info = await this.getInfo()
-
     const snap = this.bee.checkout(head)
 
-    const hist1 = this.bee.createChangesStream()[Symbol.asyncIterator]()
-    const hist2 = snap.createChangesStream()[Symbol.asyncIterator]()
+    const ca = infoIterator(this.bee)
+    const cb = infoIterator(snap)
+
+    let l = await next(ca)
+    let r = await next(cb)
+
+    while (l && r) {
+      if (l.legacy && r.legacy) {
+        // legacy nodes just compare head
+        if (sameHead(l.node.head, r.node.head)) {
+          return {
+            flushes: l.info.flushes,
+            system: l.node.head,
+            view: l.info.view || EMPTY_HEAD
+          }
+        }
 
-    let a = await hist1.next()
-    let b = await hist2.next()
+        // different legacy cores never converge - genuinely unrelated history
+        if (!b4a.equals(l.node.head.key, r.node.head.key)) return null
 
-    if (!a.value || !b.value) {
-      return { flushes: 0, system: EMPTY_HEAD, view: EMPTY_HEAD }
-    }
+        if (l.node.head.length >= r.node.head.length) l = await next(ca)
+        else r = await next(cb)
+        continue
+      }
 
-    let l = getInfo(a.value)
-    let r = getInfo(b.value)
+      if (l.legacy !== r.legacy) {
+        // current-format history sits above the legacy band: descend it
+        if (!l.legacy) l = await next(ca)
+        else r = await next(cb)
+        continue
+      }
 
-    while (!a.done || !b.done) {
-      if (l.flushes === r.flushes && sameHead(l.view, r.view)) {
+      if (l.info.flushes === r.info.flushes && sameHead(l.info.view, r.info.view)) {
         return {
-          flushes: l.flushes,
-          system: a.value.head,
-          view: l.view || EMPTY_HEAD
+          flushes: l.info.flushes,
+          system: l.node.head,
+          view: l.info.view || EMPTY_HEAD
         }
       }
 
-      if (l.flushes >= r.flushes) {
-        if (a.done) break
-        a = await hist1.next()
-        if (a.value) l = getInfo(a.value)
-      }
+      const lf = l.info.flushes
+      const rf = r.info.flushes
 
-      if (r.flushes >= l.flushes) {
-        if (b.done) break
-        b = await hist2.next()
-        if (b.value) r = getInfo(b.value)
-      }
+      if (lf >= rf) l = await next(ca)
+      if (rf >= lf) r = await next(cb)
     }
 
-    return { flushes: 0, system: EMPTY_HEAD, view: EMPTY_HEAD }
+    // no common ancestor
+    return null
   }
 
   async reset({ timeout } = {}) {
@@ -491,12 +501,16 @@ function getInfo(data) {
       const prefix = k.key[0]
 
       if (prefix === 0) {
-        return encoding.decodeSystemInfo(k.value)
+        try {
+          return encoding.decodeSystemInfo(k.value)
+        } catch {
+          return null
+        }
       }
     }
   }
 
-  asserts.bail('Bad system node')
+  return null
 }
 
 function sameHead(a, b) {
@@ -504,3 +518,35 @@ function sameHead(a, b) {
   if (!a.key || !b.key) return a.key === b.key
   return b4a.equals(a.key, b.key)
 }
+
+async function* infoIterator(bee) {
+  try {
+    for await (const node of bee.createChangesStream()) {
+      const legacy = topo.isLegacyNode(node)
+      const info = legacy ? getLegacyInfo(node) : getInfo(node)
+      if (info) yield { node, info, legacy }
+    }
+  } catch {
+    // fall through
+  }
+}
+
+async function next(it) {
+  const res = await it.next()
+  return res.done ? null : res.value
+}
+
+function getLegacyInfo(data) {
+  for (const { keys } of data.batch) {
+    for (const k of keys) {
+      if (b4a.equals(k.key, INFO_LEGACY_KEY)) {
+        try {
+          return encoding.decodeSystemInfo(k.value)
+        } catch {
+          return null
+        }
+      }
+    }
+  }
+  return null
+}

package/lib/topo.js

@@ -13,6 +13,7 @@ exports.getMostRecentHead = getMostRecentHead
 
 exports.isLinking = isLinking
 exports.isLinkingAll = isLinkingAll
+exports.isLegacyNode = isLegacyNode
 
 class Clock {
   constructor() {

package/package.json

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