hypercore 11.9.0 → 11.10.0

package/README.md

@@ -165,7 +165,7 @@ Make a read stream to read a range of data out at once.
 // read the full core
 const fullStream = core.createReadStream()
 
-// read from block 10-15
+// read from block 10-14
 const partialStream = core.createReadStream({ start: 10, end: 15 })
 
 // pipe the stream somewhere using the .pipe method on Node.js or consume it as

package/lib/core.js

@@ -469,8 +469,8 @@ module.exports = class Core {
       for (let i = 0; i < verifies.length; i++) {
         const bitfield = verifies[i] && verifies[i].bitfield
         if (bitfield) {
-          this.replicator.onhave(bitfield.start, bitfield.length, bitfield.drop)
           this.updateContiguousLength(bitfield)
+          this.replicator.onhave(bitfield.start, bitfield.length, bitfield.drop)
         }
       }
     } finally {

package/lib/replicator.js

@@ -39,6 +39,8 @@ const SCALE_LATENCY = 50
 const DEFAULT_SEGMENT_SIZE = 256 * 1024 * 8 // 256 KiB in bits
 const NOT_DOWNLOADING_SLACK = 20000 + (Math.random() * 20000) | 0
 const MAX_PEERS_UPGRADE = 3
+const LAST_BLOCKS = 256
+const MAX_REMOTE_SEGMENTS = 2048
 
 const MAX_RANGES = 64
 
@@ -371,6 +373,7 @@ class Peer {
     this.remotePublicKey = this.stream.remotePublicKey
     this.remoteSupportsSeeks = false
     this.inflightRange = inflightRange
+    this.remoteSegmentsWanted = new Set()
 
     this.paused = false
     this.removed = false
@@ -480,6 +483,16 @@ class Peer {
     if (drop) this._unclearLocalRange(start, length)
     else this._clearLocalRange(start, length)
 
+    const i = Math.floor(start / DEFAULT_SEGMENT_SIZE)
+    const contig = this.core.header.hints.contiguousLength === this.core.state.length
+
+    if (start + LAST_BLOCKS < this.core.state.length && !this.remoteSegmentsWanted.has(i) && !drop && !contig) return
+
+    if (contig && !drop) {
+      start = 0
+      length = this.core.state.length
+    }
+
     // TODO: consider also adding early-returns on the drop===true case
     if (!drop) {
       // No need to broadcast if the remote already has this range
@@ -952,6 +965,9 @@ class Peer {
   }
 
   onwant ({ start, length }) {
+    const i = Math.floor(start / DEFAULT_SEGMENT_SIZE)
+    if (this.remoteSegmentsWanted.size >= MAX_REMOTE_SEGMENTS) this.remoteSegmentsWanted.clear() // just in case of abuse
+    this.remoteSegmentsWanted.add(i)
     this.replicator._onwant(this, start, length)
   }
 

package/lib/session-state.js

@@ -509,7 +509,7 @@ module.exports = class SessionState {
     await this.mutex.lock()
 
     try {
-      if (maxLength >= 0 && (this.length + values.length) >= maxLength) {
+      if (maxLength >= 0 && (this.length + values.length) > maxLength) {
         return { length: this.length, byteLength: this.byteLength }
       }
 

package/package.json

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