autobee 2.1.0 → 2.1.1

package/lib/migrations.js

@@ -15,6 +15,7 @@ const SystemInfoV2 = getEncoding('@autobase-compat/info-v2')
 
 const EMPTY = b4a.alloc(0)
 const INDEX_VERSION = 1
+const INFO = b4a.from([0x00, 0x00, 0x69, 0x6e, 0x66, 0x6f])
 const [NS_SIGNER_NAMESPACE] = crypto.namespace('autobase', 1)
 
 // indexer rotations chain legacy systems - how many generations we chase
@@ -41,15 +42,13 @@ async function checkAutobaseMigration(store, local, bootstrap, legacyViews) {
   const core = store.get({ key: key, encryption: null })
   await core.ready()
 
-  const length = await findLocalSystemLength(core, systemLength)
-  assert(length > 0, 'Expected system block to exist locally')
-
-  const system = { key, length }
-
   // setup encryption
   const encryptionKey = await local.getUserData('autobase/encryption')
   await AutobeeEncryption.setSystemEncryption(bootstrap.key, encryptionKey, core)
 
+  const length = await findLocalSystemLength(core, systemLength)
+  const system = { key, length }
+
   const session = core.session({ name: 'batch' })
   await session.ready()
 
@@ -284,8 +283,21 @@ function deriveNamespace(name, bootstrap, entropy, encryptionKey) {
 // scan back for the newest block the signed core actually has locally
 async function findLocalSystemLength(core, systemLength) {
   let length = Math.min(core.length, systemLength)
-  while (length > 0 && !(await core.has(length - 1))) length--
-  return length
+
+  while (length > 0) {
+    const seq = length - 1
+    const node = await core.get(seq, { wait: false })
+
+    if (node) {
+      const blk = decodeBlock(node)
+      const entry = blk.keys[0]
+      if (b4a.equals(entry.key, INFO)) return length
+    }
+
+    length--
+  }
+
+  assert(false, 'Expected system block to exist locally')
 }
 
 function coreLength(core, timeout) {
@@ -392,28 +404,56 @@ async function getPersistedView(store, view) {
   return { key: view.key, length }
 }
 
+function getOplog(info, batch) {
+  if (batch.length === 1) return batch[0].keys[0]
+
+  const { heads } = encoding.decodeSystemInfo(info.value)
+
+  for (const b of batch) {
+    const entry = b.keys[0]
+    const w = encoding.decodeSystemWriter(entry.key, entry.value)
+
+    for (const { key } of heads) {
+      if (b4a.equals(w.key, key)) return b.keys[0]
+    }
+  }
+
+  throw new Error('Could not infer oplog node')
+}
+
 async function getCatchupHeads(session, from) {
   const seen = new Map()
   const nodes = []
 
+  let batch = []
+
   // block 0 is the bee header, never a node
   for (let i = Math.max(from, 1); i < session.length; i++) {
     const node = await session.get(i, { wait: false })
     if (!node) throw new Error('Expect nodes to exist locally')
 
-    const entry = decodeBlock(node).keys[0]
-    if (entry.key[0] !== 0x01) continue
+    const blk = decodeBlock(node)
+    const entry = blk.keys[0]
+
+    if (b4a.equals(entry.key, INFO)) {
+      const oplog = getOplog(entry, batch)
+      const { key, length } = encoding.decodeSystemWriter(oplog.key, oplog.value)
 
-    const { key, length } = encoding.decodeSystemWriter(entry.key, entry.value)
-    if (!length) continue
+      batch = []
 
-    const id = b4a.toString(key, 'hex')
-    const current = seen.get(id) || 0
+      if (!length) continue
 
-    if (current >= length) continue
+      const id = b4a.toString(key, 'hex')
+      const current = seen.get(id) || 0
+
+      if (current >= length) continue
+
+      seen.set(id, length)
+      nodes.push({ key, length })
+      continue
+    }
 
-    seen.set(id, length)
-    nodes.push({ key, length })
+    if (entry.key[0] === 0x01) batch.push(blk)
   }
 
   return nodes

package/package.json

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