hypercore 10.30.3 → 10.30.5

package/index.js

@@ -391,7 +391,8 @@ module.exports = class Hypercore extends EventEmitter {
       eagerUpgrade: true,
       allowFork: opts.allowFork !== false,
       onpeerupdate: this._onpeerupdate.bind(this),
-      onupload: this._onupload.bind(this)
+      onupload: this._onupload.bind(this),
+      oninvalid: this._oninvalid.bind(this)
     })
 
     this.replicator.findingPeers += this._findingPeers
@@ -624,6 +625,12 @@ module.exports = class Hypercore extends EventEmitter {
     }
   }
 
+  _oninvalid (err, req, res, from) {
+    for (let i = 0; i < this.sessions.length; i++) {
+      this.sessions[i].emit('verification-error', err, req, res, from)
+    }
+  }
+
   async _oncoreconflict (proof, from) {
     await this.replicator.onconflict(from)
 

package/lib/batch.js

@@ -317,6 +317,15 @@ module.exports = class HypercoreBatch extends EventEmitter {
     const flushingLength = Math.min(length - this._sessionLength, this._appends.length)
     if (flushingLength <= 0) return true
 
+    if (this.session.replicator._upgrade) {
+      for (const req of this.session.replicator._upgrade.inflight) {
+        // yield to the remote inflight upgrade, TODO: if the remote upgrade fails, retry flushing...
+        if (req.upgrade && (req.upgrade.start + req.upgrade.length) > length) {
+          return false
+        }
+      }
+    }
+
     const batch = this.createTreeBatch(this._sessionLength + flushingLength)
     if (batch === null) return false
 

package/lib/replicator.js

@@ -636,11 +636,11 @@ class Peer {
     this.wireCancel.send({ request: id })
   }
 
-  _checkIfConflict (err) {
+  _checkIfConflict () {
     this.paused = true
 
     const length = Math.min(this.core.tree.length, this.remoteLength)
-    if (length === 0) throw err
+    if (length === 0) return // pause and ignore
 
     this.wireRequest.send({
       id: 0, // TODO: use an more explicit id for this eventually...
@@ -675,7 +675,14 @@ class Peer {
       this.replicator._removeInflight(req.id)
     }
 
-    if (reorg === true) return this.replicator._onreorgdata(this, req, data)
+    try {
+      if (reorg === true) return await this.replicator._onreorgdata(this, req, data)
+    } catch (err) {
+      safetyCatch(err)
+      this.paused = true
+      this.replicator.oninvalid(err, req, data, this)
+      return
+    }
 
     this.dataProcessing++
 
@@ -688,9 +695,12 @@ class Peer {
       safetyCatch(err)
       if (this.core.closed && !isCriticalError(err)) return
 
-      // might be a fork, verify
-      this._checkIfConflict(err)
+      if (err.code !== 'INVALID_OPERATION') {
+        // might be a fork, verify
+        this._checkIfConflict()
+      }
       this.replicator._onnodata(this, req)
+      this.replicator.oninvalid(err, req, data, this)
       return
     } finally {
       this.dataProcessing--
@@ -1102,7 +1112,7 @@ class Peer {
 }
 
 module.exports = class Replicator {
-  constructor (core, key, { eagerUpgrade = true, allowFork = true, onpeerupdate = noop, onupload = noop } = {}) {
+  constructor (core, key, { eagerUpgrade = true, allowFork = true, onpeerupdate = noop, onupload = noop, oninvalid = noop } = {}) {
     this.key = key
     this.discoveryKey = core.crypto.discoveryKey(key)
     this.core = core
@@ -1110,6 +1120,7 @@ module.exports = class Replicator {
     this.allowFork = allowFork
     this.onpeerupdate = onpeerupdate
     this.onupload = onupload
+    this.oninvalid = oninvalid
     this.ondownloading = null // optional external hook for monitoring downloading status
     this.peers = []
     this.findingPeers = 0 // updateable from the outside

package/package.json

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