hypercore 10.29.1 → 10.30.0

package/lib/replicator.js

@@ -11,6 +11,7 @@ const caps = require('./caps')
 const DEFAULT_MAX_INFLIGHT = [32, 512]
 const SCALE_LATENCY = 50
 const DEFAULT_SEGMENT_SIZE = 256 * 1024 * 8 // 256 KiB in bits
+const BLOCK_TIMEOUT = 5000
 
 const PRIORITY = {
   NORMAL: 0,
@@ -208,6 +209,7 @@ class InflightTracker {
     const id = this._free.length ? this._free.pop() : this._requests.push(null)
 
     req.id = id
+    req.timeout = setTimeout(onblocktimeout, BLOCK_TIMEOUT, req)
     this._requests[id - 1] = req
     return req
   }
@@ -218,6 +220,9 @@ class InflightTracker {
 
   remove (id) {
     if (id <= this._requests.length) {
+      const req = this._requests[id - 1]
+      clearTimeout(req.timeout)
+      req.timeout = null
       this._requests[id - 1] = null
       this._free.push(id)
     }
@@ -785,6 +790,7 @@ class Peer {
     return {
       peer: this,
       id: 0,
+      timeout: null,
       fork: this.remoteFork,
       block: null,
       hash: null,
@@ -1059,12 +1065,22 @@ class Peer {
     }
   }
 
+  isActive () {
+    if (this.paused || this.removed) return false
+    return true
+  }
+
   async _send (req) {
     const fork = this.core.tree.fork
 
     this.inflight++
     this.replicator._inflight.add(req)
 
+    if (req.upgrade !== null && req.fork === fork) {
+      const u = this.replicator._addUpgrade()
+      u.inflight.push(req)
+    }
+
     try {
       if (req.block !== null && req.fork === fork) {
         req.block.nodes = await this.core.tree.missingNodes(2 * req.block.index)
@@ -1084,11 +1100,6 @@ class Peer {
       return
     }
 
-    if (req.upgrade !== null && req.fork === fork) {
-      const u = this.replicator._addUpgrade()
-      u.inflight.push(req)
-    }
-
     this.wireRequest.send(req)
   }
 }
@@ -1414,6 +1425,7 @@ module.exports = class Replicator {
 
   _removePeer (peer) {
     this.peers.splice(this.peers.indexOf(peer), 1)
+    peer.removed = true
 
     if (this._manifestPeer === peer) this._manifestPeer = null
 
@@ -1765,7 +1777,7 @@ module.exports = class Replicator {
   }
 
   _updatePeer (peer) {
-    if (peer.paused || peer.inflight >= peer.getMaxInflight()) {
+    if (!peer.isActive() || peer.inflight >= peer.getMaxInflight()) {
       return false
     }
 
@@ -1797,7 +1809,7 @@ module.exports = class Replicator {
   }
 
   _updatePeerNonPrimary (peer) {
-    if (peer.paused || peer.inflight >= peer.getMaxInflight()) {
+    if (!peer.isActive() || peer.inflight >= peer.getMaxInflight()) {
       return false
     }
 
@@ -2062,3 +2074,7 @@ function onwirerange (m, c) {
 function onwireextension (m, c) {
   return c.userData.onextension(m)
 }
+
+function onblocktimeout (req) {
+  if (req.peer.isActive()) req.peer.stream.destroy(REQUEST_TIMEOUT())
+}

package/package.json

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