hypercore 11.6.0 → 11.6.2

package/index.js

@@ -235,8 +235,8 @@ class Hypercore extends EventEmitter {
     return s
   }
 
-  setEncryptionKey (encryptionKey, opts) {
-    const encryption = this._getEncryptionProvider(encryptionKey, !!(opts && opts.block))
+  setEncryptionKey (key, opts) {
+    const encryption = this._getEncryptionProvider({ key, block: !!(opts && opts.block) })
     return this.setEncryption(encryption, opts)
   }
 
@@ -331,7 +331,8 @@ class Hypercore extends EventEmitter {
     const parent = opts.parent || null
     if (parent && parent.encryption) this.encryption = parent.encryption
 
-    if (!this.encryption) this.encryption = this._getEncryptionProvider(opts)
+    const e = getEncryptionOption(opts)
+    if (!this.encryption) this.encryption = this._getEncryptionProvider(e)
 
     this.writable = this._isWritable()
 
@@ -1054,8 +1055,7 @@ class Hypercore extends EventEmitter {
     return block
   }
 
-  _getEncryptionProvider (opts) {
-    const e = getEncryptionOption(opts)
+  _getEncryptionProvider (e) {
     if (isEncryptionProvider(e)) return e
     if (!e || !e.key) return null
     return new DefaultEncryption(e.key, this.key, { block: e.block, compat: this.core.compat })

package/lib/session-state.js

@@ -287,14 +287,16 @@ module.exports = class SessionState {
 
       if (dependency) this.storage.setDependencyHead(dependency)
 
-      const truncated = bitfield ? bitfield.truncated : -1
+      const b = bitfield
 
-      if (truncated !== -1 && truncated < currLength) {
-        this.ontruncate(tree, truncated, currLength, true)
-        if (!bitfield || bitfield.length === 0) return
+      if (b && b.truncated && b.start < currLength) {
+        this.ontruncate(tree, b.start, currLength, true)
+        if (!b || b.appends === 0) return
       }
 
-      this.onappend(tree, bitfield, true)
+      const append = b ? { start: b.start, length: b.appends, drop: false } : null
+
+      this.onappend(tree, append, true)
     } finally {
       this.mutex.unlock()
       this.core.checkIfIdle()
@@ -604,35 +606,36 @@ module.exports = class SessionState {
     const b = bitfield
 
     if (b.drop) {
-      if (p === null) {
-        this._pendingBitfield = { truncated: b.start, start: b.start, length: 0, drop: false }
-        return
+      // truncation must be from end
+      if (p && (b.start + b.length !== p.start + p.appends)) {
+        throw INVALID_OPERATION('Atomic truncations must be contiguous')
       }
 
-      if (p.drop || p.truncated !== -1) {
-        if (p.truncated !== b.start + b.length) throw INVALID_OPERATION('Atomic truncations must be contiguous')
-        p.truncated = b.start
+      // actual truncation
+      if (p === null || b.start < p.start) {
+        this._pendingBitfield = { truncated: true, start: b.start, appends: 0 }
         return
       }
 
-      if (b.start < p.start) throw INVALID_OPERATION('Atomic truncations must be contiguous')
-      p.length = b.start - p.start
+      // just clearing batch data
+      p.appends = b.start - p.start
+
+      // we cleared the current batch
+      if (p.appends === 0) this._pendingBitfield = null
 
-      if (p.length === 0) this._pendingBitfield = null
       return
     }
 
     if (p === null) {
-      this._pendingBitfield = { truncated: -1, start: b.start, length: b.length, drop: false }
+      this._pendingBitfield = { truncated: false, start: b.start, appends: b.length }
       return
     }
 
-    const start = p.truncated === -1 ? p.start : p.truncated
-    if (b.start !== start + p.length) {
+    if (b.start !== p.start + p.appends) {
       throw INVALID_OPERATION('Atomic operations must be contiguous')
     }
 
-    p.length += b.length
+    p.appends += b.length
   }
 
   async catchup (length) {

package/package.json

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