autobee 2.7.4 → 2.8.0

package/index.js

@@ -69,7 +69,15 @@ module.exports = class Autobee extends ReadyResource {
     this.id = null
     this.bootstrap = null
     this._handlers = handlers
-    this.stats = { undos: 0, fastForwards: 0, drains: 0, applies: 0, appends: 0 }
+    this.stats = {
+      undos: 0,
+      fastForwards: 0,
+      drains: 0,
+      applies: 0,
+      appends: 0,
+      writersOpened: 0,
+      writersClosed: 0
+    }
 
     const systemStore = this.store.session()
     this.system = new System(this, systemStore, {
@@ -205,9 +213,13 @@ module.exports = class Autobee extends ReadyResource {
     if (this._acking) this.bumpSoon()
   }
 
+  isLocalTrusted() {
+    return this.trusted.isTrusted(this.local.key, this._workingView.view)
+  }
+
   async _updateAcking() {
     if (this._interrupting) return
-    this.setAcking(await this.trusted.isTrusted(this.local.key, this._workingView.view))
+    this.setAcking(await this.isLocalTrusted())
   }
 
   // network free: only a migration needs peers, so ready() awaits the full

package/lib/writers.js

@@ -10,6 +10,7 @@ const WRITER_PREFETCH = 10
 
 const BATCH_WRITER_SANITY = 1024
 const BATCH_OPTIMISTIC_SANITY = 32
+const DEFAULT_MAX_UNTRUSTED_WRITERS = 128
 
 const MAX_FORWARD_TIME_DRIFT = 2 * 3600 * 1000
 
@@ -24,6 +25,11 @@ class ActiveWriters {
     this.writable = false
     this.pending = []
 
+    this.maxUntrustedWriters =
+      auto._handlers.maxUntrustedWriters === undefined
+        ? DEFAULT_MAX_UNTRUSTED_WRITERS
+        : auto._handlers.maxUntrustedWriters || Infinity
+
     this._pendingBuffer = new Map()
     this._adding = new Map()
     this._lock = new ReadWriteLock()
@@ -250,6 +256,14 @@ class ActiveWriters {
       let w = this.active.get(id)
       if (w) return w
 
+      // sanity limit while untrusted, a dropped writer is requested again by the
+      // links waiting on it or by peers announcing it once the round has gc'd
+      if (this.active.size >= this.maxUntrustedWriters && !(await this.auto.isLocalTrusted())) {
+        return null
+      }
+
+      this.auto.stats.writersOpened++
+
       const local = b4a.equals(key, this.auto.local.key)
       const encryption = this.auto.encryptionKey ? new WriterEncryption(this.auto) : null
 
@@ -446,6 +460,7 @@ class Writer {
   }
 
   close() {
+    if (!this.isClosed && this !== this.writers.localWriter) this.writers.auto.stats.writersClosed++
     this.isClosed = true
 
     if (this.waiting) {
@@ -677,25 +692,33 @@ class Writer {
 
     const has = await Promise.all(promises)
 
+    let missing = false
+
     for (let i = 0; i < links.length; i++) {
       if (has[i]) continue
       const link = links[i]
-      const id = b4a.toString(link.key, 'hex')
 
-      this.waiting = this.writers.triggers.add(id, link.length, this)
+      // one trigger per writer, wait on the first missing link
+      if (!missing) {
+        const id = b4a.toString(link.key, 'hex')
 
-      // check it didn't arrive underneath us
-      if (await this.system.has(link)) {
-        this.writers.triggers.remove(this.waiting)
-        this.waiting = null
-        continue
+        this.waiting = this.writers.triggers.add(id, link.length, this)
+
+        // check it didn't arrive underneath us
+        if (await this.system.has(link)) {
+          this.writers.triggers.remove(this.waiting)
+          this.waiting = null
+          continue
+        }
+
+        missing = true
       }
 
+      // but wake up every missing link so they fetch in parallel
       this.writers.wakeup(link.key, link.length).catch(noop)
-      return false
     }
 
-    return true
+    return !missing
   }
 
   get appending() {

package/package.json

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