hypercore 10.0.0-alpha.34 → 10.0.0-alpha.37

package/index.js

@@ -124,7 +124,7 @@ module.exports = class Hypercore extends EventEmitter {
       }
       if (opts.keepAlive !== false) {
         noiseStream.setKeepAlive(5000)
-        noiseStream.setTimeout(7000)
+        noiseStream.setTimeout(10000)
       }
       noiseStream.userData = protocol
     }
@@ -329,6 +329,13 @@ module.exports = class Hypercore extends EventEmitter {
     const noiseStream = protocolStream.noiseStream
     const protocol = noiseStream.userData
 
+    // If the user wants to, we can make this replication run in a session
+    // that way the core wont close "under them" during replication
+    if (opts.session) {
+      const s = this.session()
+      protocolStream.on('close', () => s.close().catch(noop))
+    }
+
     if (this.opened) {
       this.replicator.attachTo(protocol)
     } else {

package/lib/merkle-tree.js

@@ -228,6 +228,7 @@ class ReorgBatch extends MerkleTreeBatch {
 
     let diff = null
     const ite = flat.iterator(this.diff.index)
+    const startingDiff = this.diff
 
     while ((ite.index & 1) !== 0) {
       const left = n.get(ite.leftChild())
@@ -243,6 +244,7 @@ class ReorgBatch extends MerkleTreeBatch {
 
     if ((this.diff.index & 1) === 0) return true
     if (diff === null) return false
+    if (startingDiff !== this.diff) return false
 
     return this._updateDiffRoot(diff)
   }
@@ -255,10 +257,6 @@ class ReorgBatch extends MerkleTreeBatch {
     const end = Math.min(this.treeLength, spans[1] / 2 + 1)
     const len = end - start
 
-    if (this.diff !== null && len >= this.want.end - this.want.start) {
-      return false
-    }
-
     this.ancestors = start
     this.diff = diff
 

package/lib/replicator.js

@@ -717,7 +717,7 @@ class Peer {
   }
 
   _requestBlock (b) {
-    if (this.remoteBitfield.get(b.index) === false) return false
+    if (this.remoteBitfield.get(b.index) === false || b.fork !== this.remoteFork) return false
 
     const req = this._makeRequest(b.fork, b.index >= this.core.tree.length)
     if (req === null) return false
@@ -1286,14 +1286,14 @@ module.exports = class Replicator {
 
     if (f.batch) {
       await f.batch.update(data)
-    } else {
+    } else if (data.upgrade) {
       f.batch = await this.core.tree.reorg(data)
 
       // Remove "older" reorgs in progress as we just verified this one.
       this._clearOldReorgs(f.fork)
     }
 
-    if (f.batch.finished) {
+    if (f.batch && f.batch.finished) {
       if (this._addUpgradeMaybe() !== null) {
         await this._applyReorg(f)
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hypercore",
-  "version": "10.0.0-alpha.34",
+  "version": "10.0.0-alpha.37",
   "description": "Hypercore 10",
   "main": "index.js",
   "scripts": {