autobee 1.0.6 → 1.0.8

package/lib/encoding.js

@@ -1,7 +1,7 @@
 const b4a = require('b4a')
 const c = require('compact-encoding')
 const crypto = require('hypercore-crypto')
-const { AutobeeEncryption } = require('autobee-encryption')
+const { AutobeeEncryption, WriterEncryption } = require('autobee-encryption')
 
 const { getEncoding } = require('../encoding/spec/autobee')
 const { LEGACY_OPLOG_VERSION, OPLOG_VERSION } = require('./constants')
@@ -155,6 +155,13 @@ function encodeValue(value, opts = {}) {
   return b4a.concat([padding.subarray(0, AutobeeEncryption.PADDING), state.buffer])
 }
 
-function decodeValue(buf, opts = {}) {
+async function decodeValue(buf, { encryptionKey, autobeeKey, key, manifest, index = 0 } = {}) {
+  if (encryptionKey) {
+    const w = new WriterEncryption({ encryptionKey, key: autobeeKey })
+
+    await w.decrypt(index, buf, { key, manifest })
+    buf = buf.subarray(AutobeeEncryption.PADDING)
+  }
+
   return decodeOplog(buf).value
 }

package/lib/writers.js

@@ -277,7 +277,7 @@ class Writer {
     const length = await this.update()
     if (length < this.core.length) {
       this.addPending()
-    } else if (this !== this.localWriter && this.weight < 2) {
+    } else if (this !== this.writers.localWriter && !this.isIndexer) {
       await this.detachAndClose()
     }
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "autobee",
-  "version": "1.0.6",
+  "version": "1.0.8",
   "description": "Bee based autobase",
   "license": "Apache-2.0",
   "author": "Holepunch Inc.",
@@ -23,7 +23,7 @@
     "test:generate": "brittle -r test/all.js test/*.js"
   },
   "dependencies": {
-    "autobee-encryption": "^0.0.5",
+    "autobee-encryption": "^0.1.2",
     "autobee-wakeup": "^1.0.5",
     "b4a": "^1.8.0",
     "compact-encoding": "^2.18.0",