autobee 1.0.4 → 1.0.6

package/index.js

@@ -101,7 +101,7 @@ module.exports = class Autobee extends ReadyResource {
 
     this.wakeupCapability = null
     this._wakeup = new AutobeeWakeup(this, handlers)
-    this._previousDrain = 0
+    this.previousDrain = 0
 
     this.ready().catch(noop)
   }
@@ -141,6 +141,7 @@ module.exports = class Autobee extends ReadyResource {
   }
 
   _registerWakeup() {
+    if (!this.wakeupCapability) return
     this._wakeup.recouple()
     this._wakeup.setCapability(this.wakeupCapability.key, this.wakeupCapability.discoveryKey)
   }
@@ -242,6 +243,7 @@ module.exports = class Autobee extends ReadyResource {
     this.discoveryKey = result.bootstrap.core.discoveryKey
     this.id = result.bootstrap.core.id
     this.encryptionKey = result.encryptionKey
+    this.previousDrain = result.previousDrain
 
     if (this.encrypted) {
       asserts.assert(this.encryptionKey !== null, 'Encryption key is expected')
@@ -261,12 +263,14 @@ module.exports = class Autobee extends ReadyResource {
 
     this._registerWakeup()
 
-    if (this.bootstrap !== this.local) {
-      await this.bootstrap.setGroup(this.wakeupCapability.discoveryKey)
-    }
+    if (this.wakeupCapability) {
+      if (this.bootstrap !== this.local) {
+        await this.bootstrap.setGroup(this.wakeupCapability.discoveryKey)
+      }
 
-    this._notifyHandler = this.store.notifyGroup(this.wakeupCapability.discoveryKey)
-    this._notifyHandler.on('update', this._bumpSoonBound)
+      this._notifyHandler = this.store.notifyGroup(this.wakeupCapability.discoveryKey)
+      this._notifyHandler.on('update', this._bumpSoonBound)
+    }
 
     const system = result.system || EMPTY_HEAD
 
@@ -404,9 +408,11 @@ module.exports = class Autobee extends ReadyResource {
   async _flushWakeup() {
     const hints = this._wakeup.flush()
 
-    for await (const key of this._notifyHandler.updates({ since: this.previousDrain })) {
-      const hex = b4a.toString(key, 'hex')
-      hints.set(hex, -1)
+    if (this._notifyHandler) {
+      for await (const key of this._notifyHandler.updates({ since: this.previousDrain })) {
+        const hex = b4a.toString(key, 'hex')
+        hints.set(hex, -1)
+      }
     }
 
     this.previousDrain = Date.now()
@@ -683,9 +689,20 @@ module.exports = class Autobee extends ReadyResource {
   }
 
   _storeBoot() {
+    const proms = []
+    proms.push(
+      this.local.setUserData(
+        'autobee/previous-drain',
+        encoding.encodePreviousDrain(this.previousDrain)
+      )
+    )
+
     const boot = this.system.bootRecord()
-    if (!boot) return
-    return this.local.setUserData('autobee/head', encoding.encodeBootRecord(boot))
+    if (boot) {
+      proms.push(this.local.setUserData('autobee/head', encoding.encodeBootRecord(boot)))
+    }
+
+    return Promise.all(proms)
   }
 
   static decodeValue(buf, opts) {

package/lib/boot.js

@@ -11,7 +11,8 @@ module.exports = async function boot(
     bootstrap: null,
     encryptionKey: null,
     system: null,
-    flushes: null
+    flushes: null,
+    previousDrain: 0
   }
 
   const manifest = keyPair
@@ -91,15 +92,15 @@ module.exports = async function boot(
     await result.local.setUserData('referrer', result.key)
   }
 
-  const [systemHead, encryptionKeyBuffer] = await Promise.all([
+  const [systemHead, encryptionKeyBuffer, prevDrainBuffer] = await Promise.all([
     result.local.getUserData('autobee/head'),
-    result.local.getUserData('autobee/encryption')
+    result.local.getUserData('autobee/encryption'),
+    result.local.getUserData('autobee/previous-drain')
   ])
 
   if (systemHead) result.system = encoding.decodeBootRecord(systemHead)
-  if (encryptionKeyBuffer) {
-    result.encryptionKey = encryptionKeyBuffer
-  }
+  if (encryptionKeyBuffer) result.encryptionKey = encryptionKeyBuffer
+  if (prevDrainBuffer) result.previousDrain = encoding.decodePreviousDrain(prevDrainBuffer)
 
   if (!result.encryptionKey && (encryptionKey || encrypt)) {
     if (!encryptionKey) {

package/lib/encoding.js

@@ -18,6 +18,8 @@ exports.Oplog = Oplog
 exports.ManifestData = ManifestData
 exports.encodeBootRecord = encodeBootRecord
 exports.decodeBootRecord = decodeBootRecord
+exports.encodePreviousDrain = encodePreviousDrain
+exports.decodePreviousDrain = decodePreviousDrain
 exports.encodeSystemWriter = encodeSystemWriter
 exports.decodeSystemWriter = decodeSystemWriter
 
@@ -29,6 +31,14 @@ function decodeBootRecord(value) {
   return c.decode(Link, value)
 }
 
+function encodePreviousDrain(d) {
+  return c.encode(c.uint, d)
+}
+
+function decodePreviousDrain(value) {
+  return c.decode(c.uint, value)
+}
+
 function encodeSystemWriter(m) {
   return c.encode(SystemWriter, m)
 }

package/lib/writers.js

@@ -83,11 +83,7 @@ class ActiveWriters {
     }
 
     for (const writer of this.active.values()) {
-      await writer.update()
-
-      if (writer !== this.localWriter && !writer.isIndexer) {
-        await writer.detachAndClose()
-      }
+      await writer.reset()
     }
   }
 
@@ -126,7 +122,7 @@ class ActiveWriters {
     const core = this.auto.store.get({
       key,
       encryption,
-      group: local ? null : this.auto.wakeupCapability.discoveryKey
+      group: local || !this.auto.wakeupCapability ? null : this.auto.wakeupCapability.discoveryKey
     })
 
     await core.ready()
@@ -264,12 +260,28 @@ class Writer {
   detach() {
     if (!this.isAttached) return
     this.isAttached = false
-    this.download.destroy()
+    if (this.download) this.download.destroy()
     this.download = null
     this.writers.active.delete(this.id)
     this.removePending()
   }
 
+  async reset() {
+    this.removePending()
+
+    if (this.waiting) {
+      this.writers.triggers.remove(this.waiting)
+      this.waiting = null
+    }
+
+    const length = await this.update()
+    if (length < this.core.length) {
+      this.addPending()
+    } else if (this !== this.localWriter && this.weight < 2) {
+      await this.detachAndClose()
+    }
+  }
+
   close() {
     this.isClosed = true
 

package/package.json

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