hypercore 10.24.3 → 10.24.5

package/index.js

@@ -629,7 +629,7 @@ module.exports = class Hypercore extends EventEmitter {
         this.replicator.ontruncate(bitfield.start)
       }
 
-      if ((status & 0b0011) !== 0) {
+      if ((status & 0b10011) !== 0) {
         this.replicator.onupgrade()
       }
 

package/lib/batch.js

@@ -272,13 +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()
-    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/lib/merkle-tree.js

@@ -1188,6 +1188,12 @@ async function generateProof (tree, block, hash, seek, upgrade) {
   const from = upgrade ? upgrade.start * 2 : 0
   const to = upgrade ? from + upgrade.length * 2 : head
   const node = normalizeIndexed(block, hash)
+
+  const result = { fork, block: null, hash: null, seek: null, upgrade: null, manifest: null }
+
+  // can't do anything as we have no data...
+  if (head === 0) return result
+
   if (from >= to || to > head) {
     throw INVALID_OPERATION('Invalid upgrade')
   }
@@ -1218,7 +1224,6 @@ async function generateProof (tree, block, hash, seek, upgrade) {
   }
 
   const [pNode, pSeek, pUpgrade, pAdditional] = await settleProof(p)
-  const result = { fork, block: null, hash: null, seek: null, upgrade: null, manifest: null }
 
   if (block) {
     result.block = {

package/lib/mutex.js

@@ -10,7 +10,7 @@ module.exports = class Mutex {
   }
 
   lock () {
-    if (this.destroyed) return Promise.reject(this._destroyError)
+    if (this.destroyed) return Promise.reject(this._destroyError || new Error('Mutex has been destroyed'))
     if (this.locked) return new Promise(this._enqueue)
     this.locked = true
     return Promise.resolve()
@@ -28,7 +28,7 @@ module.exports = class Mutex {
     if (!this._destroying) this._destroying = this.locked ? this.lock().catch(() => {}) : Promise.resolve()
 
     this.destroyed = true
-    this._destroyError = err || new Error('Mutex has been destroyed')
+    if (err) this._destroyError = err
 
     if (err) {
       while (this._queue.length) this._queue.shift()[1](err)

package/lib/replicator.js

@@ -384,7 +384,7 @@ class Peer {
       remoteLength: this.core.tree.fork === this.remoteFork ? this.remoteLength : 0,
       canUpgrade: this.canUpgrade,
       uploading: true,
-      downloading: this.replicator.downloading,
+      downloading: this.replicator.isDownloading(),
       hasManifest: !!this.core.header.manifest && this.core.compat === false
     })
   }
@@ -582,9 +582,9 @@ class Peer {
     if (msg.fork === this.core.tree.fork) {
       try {
         proof = await this._getProof(msg)
-      } catch (err) { // TODO: better error handling here, ie custom errors
+      } catch (err) {
         safetyCatch(err)
-        if (this.replicator.core.closed) throw err // just an extra safety check...
+        if (isCriticalError(err)) throw err
       }
     }
 
@@ -619,7 +619,7 @@ class Peer {
     if (!exists) return
 
     this.inflight--
-    this.replicator._inflight.remove(id)
+    this.replicator._removeInflight(id)
 
     this.wireCancel.send({ request: id })
   }
@@ -660,7 +660,7 @@ class Peer {
     if (req !== null) {
       if (req.peer !== this) return
       this.inflight--
-      this.replicator._inflight.remove(req.id)
+      this.replicator._removeInflight(req.id)
     }
 
     if (reorg === true) return this.replicator._onreorgdata(this, req, data)
@@ -674,6 +674,8 @@ class Peer {
       }
     } catch (err) {
       safetyCatch(err)
+      if (this.core.closed && !isCriticalError(err)) return
+
       // might be a fork, verify
       this._checkIfConflict(err)
       this.replicator._onnodata(this, req)
@@ -695,7 +697,7 @@ class Peer {
     if (req === null || req.peer !== this) return
 
     this.inflight--
-    this.replicator._inflight.remove(req.id)
+    this.replicator._removeInflight(req.id)
     this.replicator._onnodata(this, req)
   }
 
@@ -1072,10 +1074,15 @@ module.exports = class Replicator {
     }
   }
 
+  isDownloading () {
+    return this.downloading || !this._inflight.idle
+  }
+
   setDownloading (downloading) {
     if (this.downloading === downloading) return
     this.downloading = downloading
-    for (const peer of this.peers) peer.sendSync()
+    if (!downloading && this.isDownloading()) return
+    for (const peer of this.peers) peer.signalUpgrade()
   }
 
   cork () {
@@ -1319,6 +1326,13 @@ module.exports = class Replicator {
     this.onpeerupdate(true, peer)
   }
 
+  _removeInflight (id) {
+    this._inflight.remove(id)
+    if (this.isDownloading() === false) {
+      for (const peer of this.peers) peer.signalUpgrade()
+    }
+  }
+
   _removePeer (peer) {
     this.peers.splice(this.peers.indexOf(peer), 1)
 
@@ -1904,6 +1918,11 @@ function destroyRequestTimeout (req) {
   }
 }
 
+function isCriticalError (err) {
+  // TODO: expose .critical or similar on the hypercore errors that are critical (if all not are)
+  return err.name === 'HypercoreError'
+}
+
 function onwireopen (m, c) {
   return c.userData.onopen(m)
 }

package/package.json

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