autobee 2.0.0-rc.20 → 2.0.0-rc.21

package/encoding/spec/autobee/index.js

@@ -1048,6 +1048,33 @@ const encoding32 = {
   }
 }
 
+// @autobee/migrated-head
+const encoding33 = {
+  preencode(state, m) {
+    encoding22.preencode(state, m.system)
+    state.end++ // flags are fixed size
+
+    if (m.view) encoding22.preencode(state, m.view)
+  },
+  encode(state, m) {
+    const flags = m.view ? 1 : 0
+
+    encoding22.encode(state, m.system)
+    c.uint8.encode(state, flags)
+
+    if (m.view) encoding22.encode(state, m.view)
+  },
+  decode(state) {
+    const r0 = encoding22.decode(state)
+    const flags = c.uint8.decode(state)
+
+    return {
+      system: r0,
+      view: (flags & 1) !== 0 ? encoding22.decode(state) : null
+    }
+  }
+}
+
 // @autobee/system-info-v3.heads, deferred due to recusive use
 const encoding18_3 = c.array(encoding22)
 // @autobee/system-info-v3.indexers, deferred due to recusive use
@@ -1146,6 +1173,8 @@ function getEncoding(name) {
       return encoding31
     case '@autobee/trusted-head':
       return encoding32
+    case '@autobee/migrated-head':
+      return encoding33
     default:
       throw new Error('Encoder not found ' + name)
   }

package/encoding/spec/autobee/schema.json

@@ -836,6 +836,26 @@
           "version": 1
         }
       ]
+    },
+    {
+      "name": "migrated-head",
+      "namespace": "autobee",
+      "compact": true,
+      "flagsPosition": 1,
+      "fields": [
+        {
+          "name": "system",
+          "required": true,
+          "type": "@autobee/link",
+          "version": 1
+        },
+        {
+          "name": "view",
+          "required": false,
+          "type": "@autobee/link",
+          "version": 1
+        }
+      ]
     }
   ],
   "namespaces": [

package/index.js

@@ -132,6 +132,7 @@ module.exports = class Autobee extends ReadyResource {
     this.previousDrain = 0
 
     this._catchupMigratedNodes = null
+    this._migratedHead = null
 
     this.ready().catch(noop)
   }
@@ -390,20 +391,26 @@ module.exports = class Autobee extends ReadyResource {
 
     await this.system.boot(system)
 
-    // Use the view position from the system info (authoritative, post-processing)
-    // rather than from the oplog (stale, captured at append time before _bump)
+    const migrated = await this.local.getUserData('autobee/migrated-head')
+    if (migrated) this._migratedHead = encoding.decodeMigratedHead(migrated)
+
     let view = this.system.view
-    if (!view) {
-      const migrated = await this.local.getUserData('autobee/migrated-view')
-      view = migrated ? encoding.decodeBootRecord(migrated) : EMPTY_HEAD
-    }
+    if (!view) view = (this._migratedHead && this._migratedHead.view) || EMPTY_HEAD
 
     // @todo migration
     if (result.migration) {
       if (this._handlers.migrate) {
-        view = (await this._handlers.migrate(result.migration.views)) || EMPTY_HEAD
+        view =
+          (await this._handlers.migrate(result.migration.views, result.migration.system)) ||
+          EMPTY_HEAD
         this._catchupMigratedNodes = result.migration.catchup
-        await this._storeMigratedView(view)
+
+        this._migratedHead = {
+          system: result.migration.system,
+          view: view.length ? view : (this._migratedHead && this._migratedHead.view) || null
+        }
+
+        await this._storeMigratedHead()
       }
 
       // ff boot invalidated by migration
@@ -717,7 +724,7 @@ module.exports = class Autobee extends ReadyResource {
       value: m.node.value
     }
 
-    if (m.digest === null || m.checkpoint === null) return op
+    if (m.digest === null || m.checkpoint === null || !m.checkpoint.system) return op
 
     const fetches = []
 
@@ -733,9 +740,12 @@ module.exports = class Autobee extends ReadyResource {
     const { digest } = encoding.decodeRawOplog(digestNode)
     const { checkpoint } = encoding.decodeRawOplog(checkpointNode)
 
+    if (!checkpoint.system || !checkpoint.system.checkpoint) return op
+
     op.views = {
       system: {
         key: digest.key,
+        start: 0,
         length: checkpoint.system.checkpoint.length
       },
       flushes: seq
@@ -990,6 +1000,9 @@ module.exports = class Autobee extends ReadyResource {
       this.stats.undos++
       this.trusted.clear()
       t.view = await this.system.undo(t.undo)
+      if (!t.view.length && this._migratedHead && this._migratedHead.view) {
+        t.view = this._migratedHead.view
+      }
     }
 
     return t
@@ -1076,15 +1089,14 @@ module.exports = class Autobee extends ReadyResource {
     const boot = this.system.bootRecord()
     if (boot) {
       proms.push(this.local.setUserData('autobee/head', encoding.encodeBootRecord(boot)))
-      if (this.system.view) proms.push(this._storeMigratedView(EMPTY_HEAD))
     }
 
     return Promise.all(proms)
   }
 
-  _storeMigratedView(view) {
-    const value = view.key ? encoding.encodeBootRecord(view) : null
-    return this.local.setUserData('autobee/migrated-view', value)
+  _storeMigratedHead() {
+    const value = this._migratedHead ? encoding.encodeMigratedHead(this._migratedHead) : null
+    return this.local.setUserData('autobee/migrated-head', value)
   }
 
   static decodeValue(buf, opts) {
@@ -1316,8 +1328,14 @@ module.exports = class Autobee extends ReadyResource {
 
     // migrate is set when fast-forwarding from a legacy head
     if (migrate) {
-      const view = (await this._handlers.migrate(migrate)) || EMPTY_HEAD
-      await this._storeMigratedView(view)
+      const view = (await this._handlers.migrate(migrate, head)) || EMPTY_HEAD
+
+      this._migratedHead = {
+        system: head,
+        view: view.length ? view : (this._migratedHead && this._migratedHead.view) || null
+      }
+
+      await this._storeMigratedHead()
       this.bee.move(view)
       this._workingBee.move(view)
     } else {

package/lib/boot.js

@@ -257,7 +257,9 @@ async function getWriterBatch(store, head, key, encryptionKey, nodes = []) {
   const core = store.get(head.key)
   await core.ready()
 
-  await core.setEncryption(AutobeeEncryption.getWriterEncryption(key, encryptionKey))
+  if (encryptionKey) {
+    await core.setEncryption(AutobeeEncryption.getWriterEncryption(key, encryptionKey))
+  }
 
   let seq = head.length - 1
   const block = await core.get(seq--, { wait: false })

package/lib/encoding.js

@@ -12,6 +12,7 @@ const SystemInfo = getEncoding('@autobee/system-info')
 const SystemWriter = getEncoding('@autobee/system-writer')
 const ManifestData = getEncoding('@autobee/manifest-data')
 const AutobaseBootRecord = getEncoding('@autobase-compat/boot-record')
+const MigratedHead = getEncoding('@autobee/migrated-head')
 
 exports.OPLOG_VERSION = OPLOG_VERSION
 
@@ -21,6 +22,9 @@ exports.ManifestData = ManifestData
 exports.encodeBootRecord = encodeBootRecord
 exports.decodeBootRecord = decodeBootRecord
 
+exports.encodeMigratedHead = encodeMigratedHead
+exports.decodeMigratedHead = decodeMigratedHead
+
 exports.encodePreviousDrain = encodePreviousDrain
 exports.decodePreviousDrain = decodePreviousDrain
 
@@ -39,6 +43,14 @@ function decodeBootRecord(value) {
   return c.decode(Link, value)
 }
 
+function encodeMigratedHead(m) {
+  return c.encode(MigratedHead, m)
+}
+
+function decodeMigratedHead(value) {
+  return c.decode(MigratedHead, value)
+}
+
 function encodePreviousDrain(d) {
   return c.encode(c.uint, d)
 }

package/lib/fast-forward.js

@@ -234,8 +234,15 @@ module.exports = class FastForward {
 
     // a legacy system needs migrating rather than a plain fast-forward
     if (this.system.version <= LEGACY_AUTOBASE_VERSION) {
-      // already migrated, don't migrate again
-      if (this.auto.system.version > LEGACY_AUTOBASE_VERSION) return null
+      const migrated = this.auto._migratedHead && this.auto._migratedHead.system
+      if (
+        migrated &&
+        b4a.equals(migrated.key, this.head.key) &&
+        migrated.length >= this.head.length
+      ) {
+        return null
+      }
+
       return this._migrate()
     }
 

package/lib/system.js

@@ -411,6 +411,7 @@ module.exports = class Systembee {
 
     w.tryPut(INFO_KEY, encoding.encodeSystemInfo(info))
 
+    this.version = info.version
     this.view = info.view
 
     await w.flush()

package/package.json

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