autobee 2.1.2 → 2.2.1

package/index.js

@@ -265,6 +265,62 @@ module.exports = class Autobee extends ReadyResource {
     return w.views()
   }
 
+  // the cores a mirror should pin: our writer core, our views when we are
+  // trusted, and (with wait) the most recent trusted head so a mirror that
+  // forgets to add one still pins a valid entrypoint
+  async cores({ wait = true, local = true, all = false } = {}) {
+    if (!this._bootGuard.opened) await this._bootGuard.ready()
+
+    const result = { key: this.key, views: null, writers: [] }
+    const views = new Map()
+
+    if (local) {
+      result.writers.push(this.local.key)
+
+      if (await this.trusted.isTrusted(this.local.key, this.view)) {
+        const localViews = await this.writers.localWriter.views()
+        for (const { key } of localViews) {
+          views.set(b4a.toString(key, 'hex'), key)
+        }
+      }
+    }
+
+    if (wait) {
+      const head = await this.trusted.mostRecentTrusted(this.view, null)
+
+      if (head && (!local || !b4a.equals(head.key, this.local.key))) {
+        const oplog = await this._resolveOplogHint(head.key, head.length)
+        if (oplog && oplog.op.views) {
+          const skey = oplog.op.views.system.key
+          const vkey = oplog.op.views.view.key
+
+          views.set(b4a.toString(skey, 'hex'), skey)
+          views.set(b4a.toString(vkey, 'hex'), vkey)
+        }
+
+        result.writers.push(head.key)
+      }
+
+      if (all) {
+        const [viewCores, systemCores] = await Promise.all([
+          this.bee.cores({ local: false }),
+          this.system.bee.cores({ local: false })
+        ])
+
+        for (const key of viewCores) {
+          views.set(b4a.toString(key, 'hex'), key)
+        }
+        for (const key of systemCores) {
+          views.set(b4a.toString(key, 'hex'), key)
+        }
+      }
+    }
+
+    result.views = [...views.values()]
+
+    return result
+  }
+
   static getViewEncryption(bootstrap, encryptionKey, name) {
     return AutobeeEncryption.getViewEncryption(bootstrap, encryptionKey, name)
   }
@@ -288,6 +344,29 @@ module.exports = class Autobee extends ReadyResource {
   async _close() {
     this._interrupting = true
 
+    // the local core holds the exclusive lock but the local writer closes it
+    // early in the teardown, so hand the lock to a detached session that
+    // outlives the teardown and only release it once everything is down
+    let lock = null
+
+    if (this.local.exclusive) {
+      lock = this.store.session()
+      const local = lock.get({ key: this.local.key, active: false })
+      await local.ready()
+
+      // transfer exclusiveness, the detached session now unlocks on close
+      local.exclusive = true
+      this.local.exclusive = false
+    }
+
+    try {
+      await this._teardown()
+    } finally {
+      if (lock) await lock.close()
+    }
+  }
+
+  async _teardown() {
     try {
       await ApplyView.close(this.view, this)
     } catch (err) {
@@ -295,7 +374,6 @@ module.exports = class Autobee extends ReadyResource {
     }
 
     if (this.writers) await this.writers.close()
-    await this.local.close()
     await this.system.close()
     await this._wakeup.close()
     if (this.bootstrap) await this.bootstrap.close()
@@ -310,6 +388,8 @@ module.exports = class Autobee extends ReadyResource {
     // don't rely on the store teardown to stop the notify watcher
     if (this._notifyHandler) this._notifyHandler.destroy()
 
+    await this.local.close()
+
     // rugpull the rest
     await this.store.close()
 

package/package.json

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