autobee 2.0.0-rc.12 → 2.0.0-rc.13

package/lib/topo.js

@@ -36,9 +36,14 @@ class Clock {
 async function getMostRecentHead(auto, system) {
   const ch = system.createChangesStream()
   for await (const data of ch) {
-    const { ref } = getOplog(data)
-    return { key: ref.oplog.key, length: ref.oplog.length }
+    const refs = getOplogCompat(data)
+    if (!refs.length) continue
+
+    const { oplog } = refs[0]
+    return { key: oplog.key, length: oplog.length }
   }
+
+  return null
 }
 
 async function rollback(auto, system, verified) {
@@ -109,48 +114,6 @@ async function isApplied(system, node) {
   return info.length >= node.length
 }
 
-// tolerates legacy nodes instead of asserting
-async function* oplogIterator(bee) {
-  try {
-    for await (const node of bee.createChangesStream({ wait: false })) {
-      const legacy = isLegacyNode(node)
-      const refs = getOplogs(node)
-      if (refs.length) yield { node, refs, legacy }
-    }
-  } catch {
-    yield null // signal data not available
-  }
-}
-
-// legacy nodes carry no isOplog flag so we cannot tell which writer update is
-// the oplog to fetch - yield every candidate until we have a better signal
-function getOplogs(data) {
-  const undo = data.tail || EMPTY_HEAD
-  const oplogs = []
-  const candidates = []
-
-  for (const { keys } of data.batch) {
-    for (const k of keys) {
-      if (k.key[0] !== 1) continue
-
-      let value = null
-      try {
-        value = encoding.decodeSystemWriter(k.key, k.value)
-      } catch {
-        continue
-      }
-
-      // writer was just added, nothing to fetch
-      if (!value.length) continue
-
-      if (value.isOplog) oplogs.push({ undo, oplog: value })
-      else candidates.push({ undo, oplog: value })
-    }
-  }
-
-  return oplogs.length ? oplogs : candidates
-}
-
 async function sort(auto, batch) {
   const node = batch[0]
   const ch = auto.system.bee.createChangesStream()
@@ -366,6 +329,19 @@ function getLocalBatch(undo, writer, length, weight, index) {
   return getOplogBatch(undo, writer.core, length, weight, index)
 }
 
+// tolerates legacy nodes instead of asserting
+async function* oplogIterator(bee) {
+  try {
+    for await (const node of bee.createChangesStream({ wait: false })) {
+      const legacy = isLegacyNode(node)
+      const refs = getOplogCompat(node)
+      if (refs.length) yield { node, refs, legacy }
+    }
+  } catch {
+    yield null // signal data not available
+  }
+}
+
 function getOplog(data) {
   const result = { ref: null, info: null }
   for (const { keys } of data.batch) {
@@ -391,6 +367,35 @@ function getOplog(data) {
   asserts.bail('Bad system node')
 }
 
+// legacy nodes carry no isOplog flag so we cannot tell which writer update is
+// the oplog to fetch - yield every candidate until we have a better signal
+function getOplogCompat(data) {
+  const undo = data.tail || EMPTY_HEAD
+  const oplogs = []
+  const candidates = []
+
+  for (const { keys } of data.batch) {
+    for (const k of keys) {
+      if (k.key[0] !== 1) continue
+
+      let value = null
+      try {
+        value = encoding.decodeSystemWriter(k.key, k.value)
+      } catch {
+        continue
+      }
+
+      // writer was just added, nothing to fetch
+      if (!value.length) continue
+
+      if (value.isOplog) oplogs.push({ undo, oplog: value })
+      else candidates.push({ undo, oplog: value })
+    }
+  }
+
+  return oplogs.length ? oplogs : candidates
+}
+
 function isLinking(node, link) {
   if (node.length >= link.length && b4a.equals(node.key, link.key)) {
     return true

package/package.json

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