autobee 2.11.1 → 2.11.3

package/index.js

@@ -684,14 +684,15 @@ module.exports = class Autobee extends ReadyResource {
   }
 
   async compactMaybe() {
-    if (!this.writers.writable) return
-
     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
   }
@@ -706,18 +707,18 @@ 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(local.key)) 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)))
     bee.move({ key: local.key, length: local.length })
   }
 
@@ -793,6 +794,7 @@ module.exports = class Autobee extends ReadyResource {
 
           if (this.fastForwardTo !== null) {
             await this._applyFastForward()
+            await this.compactMaybe()
             if (changes) changes.track()
             this._needsUpdate = false
             break // revaluate conditions...
@@ -1452,13 +1454,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.1",
+  "version": "2.11.3",
   "description": "Bee based autobase",
   "license": "Apache-2.0",
   "author": "Holepunch Inc.",