hypercore 10.24.2 → 10.24.4

package/lib/batch.js

@@ -76,6 +76,7 @@ module.exports = class HypercoreBatch extends EventEmitter {
   async update (opts) {
     if (this.opened === false) await this.ready()
     await this.session.update(opts)
+    await this._catchup()
   }
 
   setUserData (key, value, opts) {
@@ -271,14 +272,15 @@ module.exports = class HypercoreBatch extends EventEmitter {
       }
     }
 
-    const offset = this._sessionLength + this._appends.length - this.core.tree.length
-    for (let i = 0; i < offset; i++) this._byteLength -= this._appends[i]
+    const offset = this.core.tree.length - this._sessionLength
+    for (let i = 0; i < offset; i++) this._byteLength -= this._appends[i].byteLength
+
+    await this.core.insertValuesUnsafe(this._appends.slice(0, offset), this._sessionLength, this._sessionByteLength, b.nodes)
 
     this._sessionLength = this.session.length
     this._sessionByteLength = this.session.byteLength
     this._sessionBatch = this.session.createTreeBatch()
-
-    if (offset) this._appends = this._appends.slice(this._appends.length - offset)
+    this._appends = this._appends.slice(offset)
 
     return true
   }

package/lib/core.js

@@ -218,7 +218,7 @@ module.exports = class Core {
   }
 
   async copyFrom (src, signature) {
-    this._mutex.lock()
+    await this._mutex.lock()
 
     try {
       let pos = src.bitfield.firstSet(0)
@@ -432,6 +432,33 @@ module.exports = class Core {
     })
   }
 
+  // assumes mutex is already acquried
+  async insertValuesUnsafe (values, offset, byteOffset, treeNodes) {
+    if (!values.length) return
+
+    const bitfield = {
+      drop: false,
+      start: offset,
+      end: offset + values.length
+    }
+
+    await this.blocks.putBatch(offset, values, byteOffset)
+    await this.oplog.append({
+      userData: null,
+      treeNodes,
+      treeUpgrade: null,
+      bitfield
+    }, false)
+
+    this.bitfield.setRange(bitfield.start, values.length, true)
+    for (const node of treeNodes) this.tree.unflushed.set(node.index, node)
+
+    const status = updateContig(this.header, bitfield, this.bitfield)
+    this.onupdate(status, bitfield, null, null)
+
+    if (this._shouldFlush()) await this._flushOplog()
+  }
+
   async append (values, { lock, signature, keyPair = this.header.keyPair, preappend } = {}) {
     if (lock) await this._mutex.lock()
 

package/package.json

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