autobee 2.11.2 → 2.11.4

package/index.js

@@ -29,6 +29,7 @@ const migrations = require('./lib/migrations.js')
 const EMPTY_HEAD = { length: 0, key: null }
 const DEFAULT_ACK_THRESHOLD = 32
 const BOOT_NETWORK_TIMEOUT = 5000
+const REINDEX_PREFETCH = 4096
 const INTERRUPT = new Error('Apply interrupted')
 
 module.exports = class Autobee extends ReadyResource {
@@ -150,6 +151,7 @@ module.exports = class Autobee extends ReadyResource {
     this._preapply = handlers.preapply || null
     this._preApplied = false
     this._reindexed = false
+    this._strictReindex = !!handlers.strictReindex
     this._warmup = handlers.warmup || null
     this._hasApply = !!handlers.apply
     this._hasUpdate = !!handlers.update
@@ -686,10 +688,13 @@ module.exports = class Autobee extends ReadyResource {
   async compactMaybe() {
     if (await this._isReindexed()) return
 
-    await this._reindexBee(this._workingBee)
+    const latest = await this.writers.getLatestLocalOplog()
+    const views = latest ? latest.views : null
+
+    await this._reindexBee(this._workingBee, views ? views.view : null)
     this.bee.move(this._workingBee.head())
 
-    await this._reindexBee(this.system.bee)
+    await this._reindexBee(this.system.bee, views ? views.system : null)
 
     this._reindexed = true
   }
@@ -704,17 +709,20 @@ module.exports = class Autobee extends ReadyResource {
     return !(await this._shouldReindex(view.key))
   }
 
-  async _reindexBee(bee) {
+  async _reindexBee(bee, flushed) {
     const head = bee.head()
     const local = bee.context.local
     if (head === null) return
     if (!(await this._shouldReindex(head.key))) return
 
-    // a non-empty local core is a completed reindex whose head was never stored
-    if (local.length === 0) {
-      await bee.reindex(async (change) => !(await this._shouldReindex(change.head.key)))
+    if (flushed && flushed.key && b4a.equals(flushed.key, local.key)) {
+      bee.move({ key: local.key, length: flushed.start + flushed.length })
+      return
     }
 
+    await bee.reindex(async (change) => !(await this._shouldReindex(change.head.key)), {
+      prefetch: REINDEX_PREFETCH
+    })
     bee.move({ key: local.key, length: local.length })
   }
 
@@ -729,7 +737,8 @@ module.exports = class Autobee extends ReadyResource {
       }
 
       if (core.manifest === null) return unknown
-      return core.manifest.version > 1 && core.manifest.version < DEFAULT_MANIFEST_VERSION
+      if (core.manifest.version >= DEFAULT_MANIFEST_VERSION) return false
+      return this._strictReindex || core.manifest.version > 1
     } finally {
       await core.close()
     }
@@ -1450,13 +1459,7 @@ module.exports = class Autobee extends ReadyResource {
 
     const changed = await this.system.flush(batch, this._workingBee)
 
-    if (this._reindexed && (await this._isReindexed())) {
-      this._reindexed = false
-      await this.local.setUserData(
-        'autobee/head',
-        encoding.encodeBootRecord(this.system.bootRecord())
-      )
-    }
+    if (this._reindexed && (await this._isReindexed())) this._reindexed = false
 
     if (this.system.promotions.changed) this._prefetchApprovals().catch(safetyCatch)
 

package/package.json

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