hypercore 11.0.3 → 11.0.5

package/index.js

@@ -69,7 +69,6 @@ class Hypercore extends EventEmitter {
     this.closed = false
     this.weak = !!opts.weak
     this.snapshotted = !!opts.snapshot
-    this.draft = !!opts.draft
     this.onwait = opts.onwait || null
     this.wait = opts.wait !== false
     this.timeout = opts.timeout || 0
@@ -314,8 +313,9 @@ class Hypercore extends EventEmitter {
 
     if (this.keyPair === null) this.keyPair = opts.keyPair || this.core.header.keyPair
 
-    if (!this.core.encryption && opts.encryptionKey) {
-      this.core.encryption = new BlockEncryption(opts.encryptionKey, this.key, { compat: this.core.compat, isBlockKey: opts.isBlockKey })
+    if (!this.core.encryption) {
+      const e = getEncryptionOption(opts)
+      if (e) this.core.encryption = new BlockEncryption(e.key, this.key, { compat: this.core.compat, ...e })
     }
 
     if (this.core.encryption) this.encryption = this.core.encryption
@@ -341,14 +341,14 @@ class Hypercore extends EventEmitter {
 
     const parent = opts.parent || this.core
     const checkout = opts.checkout === undefined ? -1 : opts.checkout
+    const state = this.state
 
     if (opts.atom) {
       this.state = await parent.state.createSession(null, checkout, false, opts.atom)
+      if (state) state.unref()
     } else if (opts.name) {
       // todo: need to make named sessions safe before ready
       // atm we always copy the state in passCapabilities
-      const state = this.state
-
       this.state = await parent.state.createSession(opts.name, checkout, !!opts.overwrite, null)
       if (state) state.unref() // ref'ed above in setup session
 
@@ -896,7 +896,7 @@ class Hypercore extends EventEmitter {
     const defaultKeyPair = this.state.name === null ? this.keyPair : null
 
     const { keyPair = defaultKeyPair, signature = null } = opts
-    const writable = !!this.draft || !isDefault || !!signature || !!(keyPair && keyPair.secretKey)
+    const writable = !isDefault || !!signature || !!(keyPair && keyPair.secretKey)
 
     if (this._readonly || writable === false) throw SESSION_NOT_WRITABLE()
 
@@ -1012,7 +1012,7 @@ class Hypercore extends EventEmitter {
 
   _updateEncryption () {
     const e = this.encryption
-    this.encryption = new BlockEncryption(e.key, this.key, { compat: this.core.compat, isBlockKey: e.isBlockKey })
+    this.encryption = new BlockEncryption(e.key, this.key, { compat: this.core.compat, block: e.block })
     if (e === this.core.encryption) this.core.encryption = this.encryption
   }
 }
@@ -1029,7 +1029,7 @@ function toHex (buf) {
 
 function preappend (blocks) {
   const offset = this.state.length
-  const fork = this.state.fork
+  const fork = this.state.encryptionFork
 
   if (this.encryption.compat !== this.core.compat) this._updateEncryption()
 
@@ -1093,3 +1093,10 @@ function maybeAddMonitor (name) {
 function isSessionMoved (err) {
   return err.code === 'SESSION_MOVED'
 }
+
+function getEncryptionOption (opts) {
+  // old style, supported for now but will go away
+  if (opts.encryptionKey) return { key: opts.encryptionKey, block: !!opts.isBlockKey }
+  if (!opts.encryption) return null
+  return b4a.isBuffer(opts.encryption) ? { key: opts.encryption } : opts.encryption
+}

package/lib/block-encryption.js

@@ -6,17 +6,16 @@ const { BLOCK_ENCRYPTION } = require('./caps')
 const nonce = b4a.alloc(sodium.crypto_stream_NONCEBYTES)
 
 module.exports = class BlockEncryption {
-  constructor (encryptionKey, hypercoreKey, { isBlockKey = false, compat = true } = {}) {
+  constructor (encryptionKey, hypercoreKey, { block = false, compat = true } = {}) {
     const subKeys = b4a.alloc(2 * sodium.crypto_stream_KEYBYTES)
 
     this.key = encryptionKey
-    this.blockKey = isBlockKey ? encryptionKey : subKeys.subarray(0, sodium.crypto_stream_KEYBYTES)
+    this.blockKey = block ? encryptionKey : subKeys.subarray(0, sodium.crypto_stream_KEYBYTES)
     this.blindingKey = subKeys.subarray(sodium.crypto_stream_KEYBYTES)
     this.padding = 8
     this.compat = compat
-    this.isBlockKey = isBlockKey
 
-    if (!isBlockKey) {
+    if (!block) {
       if (compat) sodium.crypto_generichash_batch(this.blockKey, [encryptionKey], hypercoreKey)
       else sodium.crypto_generichash_batch(this.blockKey, [BLOCK_ENCRYPTION, hypercoreKey, encryptionKey])
     }

package/lib/core.js

@@ -374,7 +374,7 @@ module.exports = class Core {
 
   async _validateCommit (state, treeLength) {
     if (this.state.length > state.length) {
-      return false // TODO: partial commit in the future if possible
+      return false // TODO: partial commit and truncation possible in the future
     }
 
     if (this.state.length > treeLength) {

package/lib/session-state.js

@@ -25,6 +25,8 @@ module.exports = class SessionState {
     this.blocks = blocks
     this.tree = tree
 
+    this.treeFork = -1 // only updated if truncated below dependency
+
     // merkle state
     this.roots = []
     this.length = 0
@@ -101,6 +103,10 @@ module.exports = class SessionState {
     this.length = MerkleTree.span(roots) / 2
   }
 
+  get encryptionFork () {
+    return this.treeFork === -1 ? this.core.header.tree.fork : this.treeFork
+  }
+
   get byteLength () {
     return MerkleTree.size(this.roots)
   }
@@ -235,6 +241,8 @@ module.exports = class SessionState {
       }
 
       this._moveToCore(src.core)
+
+      await this.storage.close()
     }
 
     const truncated = (bitfield && bitfield.truncated !== -1)
@@ -792,8 +800,9 @@ module.exports = class SessionState {
       const treeLength = this.length
 
       if (!this.isSnapshot()) {
-        const truncation = length < this.length ? await truncateAndFlush(this, length) : null
+        const oldStorage = this.storage
 
+        const truncation = length < this.length ? await truncateAndFlush(this, length) : null
         const treeInfo = truncation ? truncation.tree : await state._getTreeHeadAt(this.length)
 
         treeInfo.fork = truncation ? this.fork + 1 : this.fork
@@ -821,6 +830,8 @@ module.exports = class SessionState {
           if (dependency) this.storage.updateDependencyLength(this.dependencyLength)
           this.ontruncate(tree, tree.length, treeLength, flushed)
         }
+
+        await oldStorage.close()
       }
 
       if (!this.storage.atom) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hypercore",
-  "version": "11.0.3",
+  "version": "11.0.5",
   "description": "Hypercore is a secure, distributed append-only log",
   "main": "index.js",
   "scripts": {