autobee 2.0.0-rc.3 → 2.0.0-rc.5

package/index.js

@@ -106,6 +106,7 @@ module.exports = class Autobee extends ReadyResource {
     this._hasUpdate = !!handlers.update
     this._needsUpdate = false
     this._ackRequired = false
+    this._ackedHeads = new Map()
     this._updateLocalCore = null
     this._host = new ApplyCalls(this)
     this._notifyHandler = null
@@ -477,6 +478,8 @@ module.exports = class Autobee extends ReadyResource {
   }
 
   async _drain() {
+    if (this._updating) await this._updating
+
     if (this.bootFrom) {
       await this._initFromHead(this.bootFrom)
       this.bootFrom = null
@@ -526,7 +529,15 @@ module.exports = class Autobee extends ReadyResource {
     if (this._interrupting) return
 
     if (this._needsUpdate) {
-      await this._update(changes)
+      const updating = rrp()
+      this._updating = updating.promise
+
+      try {
+        await this._update(changes)
+      } finally {
+        this._updating = null
+        updating.resolve()
+      }
     }
   }
 
@@ -756,13 +767,30 @@ module.exports = class Autobee extends ReadyResource {
   _appendAck() {
     if (!this._ackRequired) return false
     if (!this.writers.writable) return false
-    if (this.writers.attestations.length === 0) return false
 
     if (this.writers.localWriter.pending !== null) return false
 
     const links = this.system.getLinks(this.local.key)
     const t = Math.max(this._now(), this.system.timestamp)
 
+    let unlinked = false
+    for (const { key, length } of links) {
+      const hex = b4a.toString(key, 'hex')
+      const acked = this._ackedHeads.get(hex) || 0
+      if (length > acked) {
+        unlinked = true
+        break
+      }
+    }
+    if (!unlinked) {
+      this._ackRequired = false
+      return false
+    }
+
+    for (const { key, length } of links) {
+      this._ackedHeads.set(b4a.toString(key, 'hex'), length)
+    }
+
     this.writers.appendLocal(null, t, { start: 0, end: 0 }, links, false, null)
     this._ackRequired = false
     return true

package/lib/apply-calls.js

@@ -1,4 +1,5 @@
 const ID = require('hypercore-id-encoding')
+const b4a = require('b4a')
 
 class ApplyCalls {
   constructor(auto) {
@@ -39,7 +40,10 @@ class ApplyCalls {
 
   ackWriter(key) {
     if (typeof key === 'string') key = ID.decode(key)
-    if (this.applying && this.applying[0].optimistic) this.auto._ackRequired = true
+    // acking an optimistic node means we owe it a linking node
+    if (this.applying && this.applying[0].optimistic && !b4a.equals(key, this.auto.local.key)) {
+      this.auto._ackRequired = true
+    }
     return this.auto.system.ackWriter(key)
   }
 

package/lib/system.js

@@ -13,6 +13,27 @@ const INDEXER_LT = b4a.from([3])
 const EMPTY_HEAD = { length: 0, key: null }
 const EMPTY = b4a.from([])
 
+class SystemSnapshot {
+  constructor(bee) {
+    this.bee = bee
+  }
+
+  async get(key, { timeout } = {}) {
+    const node = await this.bee.get(encoding.encodeSystemWriterKey(key), { timeout })
+    return node !== null ? encoding.decodeSystemWriter(node.key, node.value) : null
+  }
+
+  async has(link) {
+    const node = await this.get(link.key)
+    if (!node || node.length < link.length) return false
+    return true
+  }
+
+  close() {
+    return this.bee.close()
+  }
+}
+
 module.exports = class Systembee {
   constructor(store, name, opts = {}) {
     this.name = name // for debuggin
@@ -230,6 +251,14 @@ module.exports = class Systembee {
     return info ? !info.isRemoved : !!optimistic
   }
 
+  snapshot(head = null) {
+    const bee =
+      head === null
+        ? this.bee.snapshot()
+        : this.bee.checkout({ length: head.length, key: head.key })
+    return new SystemSnapshot(bee)
+  }
+
   async get(key, { unflushed = false, timeout } = {}) {
     const node = await this.bee.get(encoding.encodeSystemWriterKey(key), { timeout })
     const info = node !== null ? encoding.decodeSystemWriter(node.key, node.value) : null

package/package.json

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