autobee 2.0.0-rc.32 → 2.0.0-rc.34

package/index.js

@@ -461,6 +461,11 @@ module.exports = class Autobee extends ReadyResource {
     for (const head of this.system.heads) {
       await this.writers.add(head.key)
     }
+
+    if (!this.system.heads.length) {
+      await this.writers.add(this.bootstrap.key)
+    }
+
     await this._bump()
   }
 

package/lib/writers.js

@@ -28,8 +28,6 @@ class ActiveWriters {
 
     this.localWriter = new Writer(this, auto.system, true, local, b4a.toString(local.key, 'hex'))
     this.localWriter.attach()
-
-    this._bootstrap()
   }
 
   get size() {
@@ -208,6 +206,7 @@ class ActiveWriters {
     const encryption = this.auto.encryptionKey ? new WriterEncryption(this.auto) : null
 
     const core = this.auto.store.get({
+      active: false,
       key,
       encryption,
       group: local || !this.auto.wakeupCapability ? null : this.auto.wakeupCapability.discoveryKey
@@ -251,29 +250,6 @@ class ActiveWriters {
     w.decouple()
     if (w !== this.localWriter) await w.close()
   }
-
-  _bootstrap() {
-    const bootstrap = this.auto.bootstrap
-
-    bootstrap.setEncryption(this.auto._getEncryptionProvider())
-    bootstrap.setActive(true)
-
-    const id = b4a.toString(bootstrap.key, 'hex')
-    let w = this.active.get(id)
-    if (w) {
-      w.isHead = true
-      w.couple() // couple if we weren't ready first time
-      return
-    }
-
-    const session = bootstrap.session()
-    session.setEncryption(this.auto._getEncryptionProvider())
-
-    w = new Writer(this, this.auto.system, false, session, id)
-    w.isHead = true // the root of the autobase, never gc'd
-    w.attach()
-    w.couple()
-  }
 }
 
 class Writer {
@@ -305,8 +281,6 @@ class Writer {
 
     if (!local) this.core.on('append', this._onchangeBound)
     if (!local) this.core.on('download', this._onchangeBound)
-
-    this.couple()
   }
 
   get isIndexer() {
@@ -314,6 +288,10 @@ class Writer {
   }
 
   isSystemHead() {
+    if (this.system.heads.length === 0) {
+      return b4a.equals(this.core.key, this.writers.auto.key)
+    }
+
     return this.system.isHead(this.core.key)
   }
 
@@ -403,26 +381,7 @@ class Writer {
       this.waiting = null
     }
 
-    const isHead = this.isSystemHead()
-
-    if (isHead && !this.isHead) {
-      this.isHead = true
-      this.couple()
-    }
-
-    if (!isHead && this.isHead) {
-      this.isHead = false
-      this.decouple()
-    }
-
     const length = await this.update()
-    const active = length < this.core.length || length < this.hintedLength
-
-    if (this.isHead || active) {
-      this.core.setActive(true)
-    } else {
-      this.core.setActive(false)
-    }
 
     // don't drop any local nodes left in buffer, or work a peer told us about
     if (length < this.core.length || length < this.hintedLength || this.appending) {
@@ -474,12 +433,24 @@ class Writer {
 
   async update() {
     const info = await this.system.get(this.core.key)
+    const length = info ? info.length : 0
 
-    // an anchor core is prologue-only, so once its single node has applied
-    // nothing more can ever come - retire the writer
-    if (info && info.length > 0 && isAnchor(this.core)) {
-      await this.detachAndClose()
-      return info.length
+    const isHead = this.isSystemHead()
+
+    if (isHead) {
+      this.isHead = true
+      this.couple()
+    } else {
+      this.isHead = false
+      this.decouple()
+    }
+
+    const active = length < this.core.length || length < this.hintedLength
+
+    if (this.isHead || active) {
+      this.core.setActive(true)
+    } else {
+      this.core.setActive(false)
     }
 
     if (!info) {
@@ -495,7 +466,7 @@ class Writer {
       this.writers._updateLocalState()
     }
 
-    return info ? info.length : 0
+    return length
   }
 
   next() {
@@ -720,6 +691,7 @@ class Writer {
     head.views = views
 
     head.trusted = trusted ? [{ key: trusted.key, length: trusted.length }] : null
+    this.writers.auto.emit('appending', this.pending)
 
     const buffers = []
     for (let i = 0; i < this.processed; i++) {
@@ -789,7 +761,3 @@ function finalizeNodeBatch(batch) {
 }
 
 function noop() {}
-
-function isAnchor(core) {
-  return !!(core.manifest && core.manifest.signers.length === 0 && core.length === 1)
-}

package/package.json

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