hypercore 10.28.6 → 10.28.8

package/index.js

@@ -242,7 +242,7 @@ module.exports = class Hypercore extends EventEmitter {
       s.cache = opts.cache === true || !opts.cache ? this.cache : opts.cache
     }
 
-    ensureEncryption(s, opts)
+    if (this.opened) ensureEncryption(s, opts)
 
     this.sessions.push(s)
 
@@ -289,6 +289,11 @@ module.exports = class Hypercore extends EventEmitter {
     this.replicator.findingPeers += this._findingPeers
 
     ensureEncryption(this, opts)
+
+    // we need to manually fwd the encryption cap as the above removes it potentially
+    if (this.encryption && !from.encryption) {
+      for (const s of sessions) s.encryption = this.encryption
+    }
   }
 
   async _openSession (key, storage, opts) {
@@ -317,6 +322,8 @@ module.exports = class Hypercore extends EventEmitter {
           this._clone = null
         }
       }
+    } else {
+      ensureEncryption(this, opts)
     }
 
     this.writable = this._isWritable()
@@ -659,11 +666,14 @@ module.exports = class Hypercore extends EventEmitter {
         for (let i = 0; i < this.sessions.length; i++) {
           const s = this.sessions[i]
 
-          s.emit('manifest')
           if (s.encryption && s.encryption.compat !== this.core.compat) {
-            s.encryption = new BlockEncryption(s.encryptionKey, this.key, { compat: this.core.compat, isBlockKey: s.isBlockKey })
+            s.encryption = new BlockEncryption(s.encryption.key, this.key, { compat: this.core.compat, isBlockKey: s.encryption.isBlockKey })
           }
         }
+
+        for (let i = 0; i < this.sessions.length; i++) {
+          this.sessions[i].emit('manifest')
+        }
       }
 
       for (let i = 0; i < this.sessions.length; i++) {
@@ -1118,8 +1128,8 @@ function ensureEncryption (core, opts) {
   if (!opts.encryptionKey) return
   // Only override the block encryption if it's either not already set or if
   // the caller provided a different key.
-  if (core.encryption && b4a.equals(core.encryption.key, opts.encryptionKey)) return
-  core.encryption = new BlockEncryption(opts.encryptionKey, core.key, { compat: core.core.compat, isBlockKey: opts.isBlockKey })
+  if (core.encryption && b4a.equals(core.encryption.key, opts.encryptionKey) && core.encryption.compat === core.core.compat) return
+  core.encryption = new BlockEncryption(opts.encryptionKey, core.key, { compat: core.core ? core.core.compat : true, isBlockKey: opts.isBlockKey })
 }
 
 function createCache (cache) {

package/lib/block-encryption.js

@@ -6,7 +6,7 @@ const { BLOCK_ENCRYPTION } = require('./caps')
 const nonce = b4a.alloc(sodium.crypto_stream_NONCEBYTES)
 
 module.exports = class BlockEncryption {
-  constructor (encryptionKey, hypercoreKey, { isBlockKey = false, compat = false } = {}) {
+  constructor (encryptionKey, hypercoreKey, { isBlockKey = false, compat = true } = {}) {
     const subKeys = b4a.alloc(2 * sodium.crypto_stream_KEYBYTES)
 
     this.key = encryptionKey

package/lib/core.js

@@ -222,6 +222,13 @@ module.exports = class Core {
   async copyFrom (src, signature, { length = src.tree.length } = {}) {
     await this._mutex.lock()
 
+    try {
+      await src._mutex.lock()
+    } catch (err) {
+      this._mutex.unlock()
+      throw err
+    }
+
     try {
       let pos = 0
 
@@ -290,6 +297,7 @@ module.exports = class Core {
 
       await this._flushOplog()
     } finally {
+      src._mutex.unlock()
       this._mutex.unlock()
     }
   }

package/package.json

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