autobee 2.0.0-rc.18 → 2.0.0-rc.19

package/index.js

@@ -909,35 +909,28 @@ module.exports = class Autobee extends ReadyResource {
       this._catchupMigratedNodes = null
     }
 
-    let updated = false
+    // apply the best next node to keep the prefix stable
+    const next = await this.writers.nextPendingNode()
+    if (next === null) return false
 
-    const pending = this.writers.pending.slice()
+    const { writer: w, batch } = next
 
-    for (let i = pending.length - 1; i >= 0; i--) {
-      const w = pending[i]
-
-      const batch = await w.next()
-      if (batch === null) continue
-
-      if (w.isAdded || (w.isRemoved && w.hasReferrals())) {
-        await this._processBatch(batch)
-        w.notify(batch)
-        updated = true
-        continue
-      }
+    if (w.isAdded || (w.isRemoved && w.hasReferrals())) {
+      await this._processBatch(batch)
+      w.notify(batch)
+      return true
+    }
 
-      if (this.optimistic && !w.isRemoved && batch[0].optimistic) {
-        if (!(await this._optimisticBatch(batch))) {
-          w.removePending()
-          continue
-        }
-        w.notify(batch)
-        updated = true
-        continue
+    if (this.optimistic && !w.isRemoved && batch[0].optimistic) {
+      if (!(await this._optimisticBatch(batch))) {
+        w.removePending()
+        return true
       }
+      w.notify(batch)
+      return true
     }
 
-    return updated
+    return true
   }
 
   async _optimisticBatch(batch) {

package/lib/writers.js

@@ -1,7 +1,7 @@
 const b4a = require('b4a')
 const encoding = require('./encoding.js')
 const Triggers = require('./triggers.js')
-const { signAttestation } = require('./witness.js')
+const { signAttestation, resolveWeight } = require('./witness.js')
 const { WriterEncryption } = require('autobee-encryption')
 
 const WRITER_PREFETCH = 10
@@ -25,6 +25,8 @@ class ActiveWriters {
     this.witnesses = []
     this.attestations = []
 
+    this._pendingBuffer = new Map()
+
     this.localWriter.attach()
 
     this._bootstrap()
@@ -115,6 +117,9 @@ class ActiveWriters {
   }
 
   async refresh() {
+    // peeked batches were read against the pre-reboot system, drop them
+    this._pendingBuffer.clear()
+
     if (this.localWriter && !this.localWriter.isClosed) {
       await this.updateLocalState()
     }
@@ -129,6 +134,33 @@ class ActiveWriters {
     await this.localWriter.update()
   }
 
+  async nextPendingNode() {
+    for (const w of this.pending.slice()) {
+      if (this._pendingBuffer.has(w) || w.isFrozen) continue
+
+      const batch = await w.next()
+      if (batch !== null) this._pendingBuffer.set(w, batch)
+    }
+
+    if (this._pendingBuffer.size === 0) return null
+
+    let writer = null
+    let best = null
+
+    for (const [w, batch] of this._pendingBuffer) {
+      const head = batch[0]
+      // -1 marks a node next() has not resolved a sort weight for yet
+      if (head.weight < 0) head.weight = await resolveWeight(this.auto, head)
+      if (best === null || sortsBefore(head, best[0])) {
+        writer = w
+        best = batch
+      }
+    }
+
+    this._pendingBuffer.delete(writer)
+    return { writer, batch: best }
+  }
+
   _updateLocalState() {
     const w = this.localWriter
 
@@ -314,6 +346,8 @@ class Writer {
     if (!this.isPending) return
     this.isPending = false
 
+    this.writers._pendingBuffer.delete(this)
+
     const head = this.writers.pending.pop()
     if (head !== this) {
       this.writers.pending[this.index] = head
@@ -702,6 +736,17 @@ class Writer {
   }
 }
 
+// mirrors topo.cmp - kept local because topo.js requires this module
+function sortsBefore(a, b) {
+  if (a.weight !== b.weight) return a.weight > b.weight
+  if (a.timestamp !== b.timestamp) return a.timestamp < b.timestamp
+
+  const c = b4a.compare(a.key, b.key)
+  if (c !== 0) return c < 0
+
+  return a.length < b.length
+}
+
 exports.ActiveWriters = ActiveWriters
 exports.Writer = Writer
 exports.createNode = createNode

package/package.json

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