autobee 2.5.1 → 2.5.2

package/index.js

@@ -1165,17 +1165,25 @@ module.exports = class Autobee extends ReadyResource {
 
     const { writer: w, batch } = next
 
-    if (w.isAdded || (w.isRemoved && w.hasReferrals())) {
-      await this._processBatch(batch)
-      w.notify(batch)
-      return true
-    }
+    // an optimistic batch from a writer that is not (or no longer) added gets a
+    // shot at apply and is rolled back unless apply adds or acks the writer
+    if (this.optimistic && batch[0].optimistic && (!w.isAdded || w.isRemoved)) {
+      if (await this._optimisticBatch(batch)) {
+        w.notify(batch)
+        return true
+      }
 
-    if (this.optimistic && !w.isRemoved && batch[0].optimistic) {
-      if (!(await this._optimisticBatch(batch))) {
+      if (!(w.isRemoved && w.hasReferrals())) {
         w.removePending()
         return true
       }
+
+      // declined, but other writers link to it: fall through and process it
+      // like any other node from a removed writer
+    }
+
+    if (w.isAdded || (w.isRemoved && w.hasReferrals())) {
+      await this._processBatch(batch)
       w.notify(batch)
       return true
     }

package/lib/system.js

@@ -90,10 +90,12 @@ module.exports = class Systembee {
     if (length === 0) {
       length = info ? info.length : 0
     }
-    // acked but never granted: keep the op (record its length) but record the
-    // writer as removed so nothing else from it is applied
-    const isRemoved = !info || info.isAdded === false
-    this.update(key, length, -1, -1, false, false, isRemoved, -1, null)
+    // acked but never granted (unknown, ack-only or removed): keep the op
+    // (record its length) but record the writer as removed - it is not writable
+    // and only its optimistic ops reach apply, each rolled back unless acked again
+    const w = this.writers.get(b4a.toString(key, 'hex'))
+    const granted = w ? w.added : info !== null && info.isAdded !== false && !info.isRemoved
+    this.update(key, length, -1, -1, false, false, !granted, -1, null)
   }
 
   async removeWriter(key, { length = 0 } = {}) {
@@ -233,11 +235,14 @@ module.exports = class Systembee {
   }
 
   async canApply(key, optimistic) {
+    // an optimistic node always reaches apply, whether its writer is unknown,
+    // acked or removed - the caller rolls it back unless apply accepts it
+    if (optimistic) return true
     const id = b4a.toString(key, 'hex')
     const w = this.writers.get(id)
     if (w) return w.added
     const info = await this.get(key)
-    return info ? !info.isRemoved : !!optimistic
+    return info ? !info.isRemoved : false
   }
 
   snapshot(head = null) {

package/package.json

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