hypercore 10.35.0 → 10.35.2

package/index.js

@@ -60,7 +60,6 @@ module.exports = class Hypercore extends EventEmitter {
     this.crypto = opts.crypto || hypercoreCrypto
     this.core = null
     this.replicator = null
-    this.inflightRange = opts.inflightRange || null
     this.encryption = null
     this.extensions = new Map()
     this.cache = createCache(opts.cache)
@@ -405,7 +404,7 @@ module.exports = class Hypercore extends EventEmitter {
       eagerUpgrade: true,
       notDownloadingLinger: opts.notDownloadingLinger,
       allowFork: opts.allowFork !== false,
-      inflightRange: this.inflightRange,
+      inflightRange: opts.inflightRange,
       onpeerupdate: this._onpeerupdate.bind(this),
       onupload: this._onupload.bind(this),
       oninvalid: this._oninvalid.bind(this)

package/lib/core.js

@@ -142,7 +142,7 @@ module.exports = class Core {
     const prologue = header.manifest ? header.manifest.prologue : null
 
     const tree = await MerkleTree.open(treeFile, { crypto, prologue, ...header.tree })
-    const bitfield = await Bitfield.open(bitfieldFile, tree)
+    const bitfield = await Bitfield.open(bitfieldFile)
     const blocks = new BlockStore(dataFile, tree)
 
     if (overwrite) {
@@ -150,9 +150,6 @@ module.exports = class Core {
       await blocks.clear()
       await bitfield.clear()
       entries = []
-    } else if (bitfield.resumed && header.tree.length === 0) {
-      // If this was an old bitfield, reset it since it loads based on disk size atm (TODO: change that)
-      await bitfield.clear()
     }
 
     // compat from earlier version that do not store contig length

package/lib/replicator.js

@@ -33,7 +33,7 @@ const m = require('./messages')
 const caps = require('./caps')
 const { createTracer } = require('hypertrace')
 
-const DEFAULT_MAX_INFLIGHT = [32, 512]
+const DEFAULT_MAX_INFLIGHT = [16, 512]
 const SCALE_LATENCY = 50
 const DEFAULT_SEGMENT_SIZE = 256 * 1024 * 8 // 256 KiB in bits
 const NOT_DOWNLOADING_SLACK = 20000 + (Math.random() * 20000) | 0
@@ -369,8 +369,8 @@ class Peer {
     const stream = this.stream.rawStream
     if (!stream.udx) return Math.min(this.inflightRange[1], this.inflightRange[0] * 3)
 
-    const scale = stream.rtt <= SCALE_LATENCY ? 1 : stream.rtt / SCALE_LATENCY
-    return Math.round(Math.min(this.inflightRange[1], this.inflightRange[0] * scale))
+    const scale = stream.rtt <= SCALE_LATENCY ? 1 : stream.rtt / SCALE_LATENCY * Math.min(1, 2 / this.replicator.peers.length)
+    return Math.max(this.inflightRange[0], Math.round(Math.min(this.inflightRange[1], this.inflightRange[0] * scale)))
   }
 
   signalUpgrade () {

package/package.json

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