hypercore 10.31.7 → 10.31.9

package/index.js

@@ -389,6 +389,7 @@ module.exports = class Hypercore extends EventEmitter {
 
     this.replicator = new Replicator(this.core, this.key, {
       eagerUpgrade: true,
+      notDownloadingLinger: opts.notDownloadingLinger,
       allowFork: opts.allowFork !== false,
       onpeerupdate: this._onpeerupdate.bind(this),
       onupload: this._onupload.bind(this),

package/lib/remote-bitfield.js

@@ -149,6 +149,7 @@ module.exports = class RemoteBitfield {
   constructor () {
     this._pages = new BigSparseArray()
     this._segments = new BigSparseArray()
+    this._maxSegments = 0
   }
 
   getBitfield (index) {
@@ -177,6 +178,7 @@ module.exports = class RemoteBitfield {
     if (!p && val) {
       const k = Math.floor(i / PAGES_PER_SEGMENT)
       const s = this._segments.get(k) || this._segments.set(k, new RemoteBitfieldSegment(k))
+      if (this._maxSegments <= k) this._maxSegments = k + 1
 
       p = this._pages.set(i, new RemoteBitfieldPage(i, new Uint32Array(WORDS_PER_PAGE), s))
     }
@@ -194,6 +196,7 @@ module.exports = class RemoteBitfield {
       if (!p && val) {
         const k = Math.floor(i / PAGES_PER_SEGMENT)
         const s = this._segments.get(k) || this._segments.set(k, new RemoteBitfieldSegment(k))
+        if (this._maxSegments <= k) this._maxSegments = k + 1
 
         p = this._pages.set(i, new RemoteBitfieldPage(i, new Uint32Array(WORDS_PER_PAGE), s))
       }
@@ -213,7 +216,7 @@ module.exports = class RemoteBitfield {
     let j = position & (BITS_PER_SEGMENT - 1)
     let i = (position - j) / BITS_PER_SEGMENT
 
-    while (i < this._segments.maxLength) {
+    while (i < this._maxSegments) {
       const s = this._segments.get(i)
 
       let index = -1
@@ -281,6 +284,7 @@ module.exports = class RemoteBitfield {
       if (!p) {
         const k = Math.floor(i / PAGES_PER_SEGMENT)
         const s = this._segments.get(k) || this._segments.set(k, new RemoteBitfieldSegment(k))
+        if (this._maxSegments <= k) this._maxSegments = k + 1
 
         p = this._pages.set(i, new RemoteBitfieldPage(i, new Uint32Array(WORDS_PER_PAGE), s))
       }
@@ -314,6 +318,7 @@ module.exports = class RemoteBitfield {
       if (!p) {
         const k = Math.floor(i / PAGES_PER_SEGMENT)
         const s = this._segments.get(k) || this._segments.set(k, new RemoteBitfieldSegment(k))
+        if (this._maxSegments <= k) this._maxSegments = k + 1
 
         p = this._pages.set(i, new RemoteBitfieldPage(i, new Uint32Array(WORDS_PER_PAGE), s))
       }

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 NOT_DOWNLOADING_SLACK = 4000 + (Math.random() * 4000) | 0
 
 const PRIORITY = {
   NORMAL: 0,
@@ -1175,7 +1176,14 @@ class Peer {
 }
 
 module.exports = class Replicator {
-  constructor (core, key, { eagerUpgrade = true, allowFork = true, onpeerupdate = noop, onupload = noop, oninvalid = noop } = {}) {
+  constructor (core, key, {
+    notDownloadingLinger = NOT_DOWNLOADING_SLACK,
+    eagerUpgrade = true,
+    allowFork = true,
+    onpeerupdate = noop,
+    onupload = noop,
+    oninvalid = noop
+  } = {}) {
     this.key = key
     this.discoveryKey = core.crypto.discoveryKey(key)
     this.core = core
@@ -1208,6 +1216,8 @@ module.exports = class Replicator {
     this._updatesPending = 0
     this._applyingReorg = null
     this._manifestPeer = null
+    this._notDownloadingLinger = notDownloadingLinger
+    this._downloadingTimer = null
 
     const self = this
     this._onstreamclose = onstreamclose
@@ -1227,6 +1237,19 @@ module.exports = class Replicator {
   }
 
   setDownloading (downloading, session) {
+    clearTimeout(this._downloadingTimer)
+
+    if (this.destroyed) return
+    if (downloading || this._notDownloadingLinger === 0) {
+      this.setDownloadingNow(downloading, session)
+      return
+    }
+
+    this._downloadingTimer = setTimeout(setDownloadingLater, this._notDownloadingLinger, this, downloading, session)
+  }
+
+  setDownloadingNow (downloading, session) {
+    this._downloadingTimer = null
     if (this.downloading === downloading) return
     this.downloading = downloading
     if (!downloading && this.isDownloading()) return
@@ -1983,6 +2006,10 @@ module.exports = class Replicator {
 
   destroy () {
     this.destroyed = true
+    if (this._downloadingTimer) {
+      clearTimeout(this._downloadingTimer)
+      this._downloadingTimer = null
+    }
     for (const peer of this.peers) {
       this.detachFrom(peer.protomux)
       peer.channel.close()
@@ -2147,3 +2174,7 @@ function onwirerange (m, c) {
 function onwireextension (m, c) {
   return c.userData.onextension(m)
 }
+
+function setDownloadingLater (repl, downloading, session) {
+  repl.setDownloadingNow(downloading, session)
+}

package/package.json

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