hypercore 10.37.17 → 10.37.19

package/lib/replicator.js

@@ -358,6 +358,18 @@ class Peer {
     this.wireRange = this.channel.messages[8]
     this.wireExtension = this.channel.messages[9]
 
+    // Same stats as replicator, but for this specific peer
+    this.stats = {
+      wireSync: { tx: 0, rx: 0 },
+      wireRequest: { tx: 0, rx: 0 },
+      wireCancel: { tx: 0, rx: 0 },
+      wireData: { tx: 0, rx: 0 },
+      wireWant: { tx: 0, rx: 0 },
+      wireBitfield: { tx: 0, rx: 0 },
+      wireRange: { tx: 0, rx: 0 },
+      wireExtension: { tx: 0, rx: 0 }
+    }
+
     this.receiverQueue = new ReceiverQueue()
     this.receiverBusy = false
 
@@ -446,10 +458,12 @@ class Peer {
       start,
       length
     })
+    incrementTx(this.stats.wireRange, this.replicator.stats.wireRange)
   }
 
   extension (name, message) {
     this.wireExtension.send({ name: name === this.lastExtensionSent ? '' : name, message })
+    incrementTx(this.stats.wireExtension, this.replicator.stats.wireExtension)
     this.lastExtensionSent = name
   }
 
@@ -481,6 +495,7 @@ class Peer {
       downloading: this.replicator.isDownloading(),
       hasManifest: !!this.core.header.manifest && this.core.compat === false
     })
+    incrementTx(this.stats.wireSync, this.replicator.stats.wireSync)
   }
 
   onopen ({ seeks, capability }) {
@@ -730,6 +745,7 @@ class Peer {
       if (msg.manifest && this.core.header.manifest) {
         const manifest = this.core.header.manifest
         this.wireData.send({ request: msg.id, fork: this.core.tree.fork, block: null, hash: null, seek: null, upgrade: null, manifest })
+        incrementTx(this.stats.wireData, this.replicator.stats.wireData)
         return
       }
 
@@ -750,6 +766,7 @@ class Peer {
       upgrade: proof.upgrade,
       manifest: proof.manifest
     })
+    incrementTx(this.stats.wireData, this.replicator.stats.wireData)
   }
 
   _cancelRequest (req) {
@@ -767,6 +784,7 @@ class Peer {
     if (this.roundtripQueue === null) this.roundtripQueue = new RoundtripQueue()
     this.roundtripQueue.add(req.id)
     this.wireCancel.send({ request: req.id })
+    incrementTx(this.stats.wireCancel, this.replicator.stats.wireCancel)
   }
 
   _checkIfConflict () {
@@ -786,6 +804,8 @@ class Peer {
         length
       }
     })
+
+    incrementTx(this.stats.wireRequest, this.replicator.stats.wireRequest)
   }
 
   async ondata (data) {
@@ -972,8 +992,8 @@ class Peer {
       this._remoteContiguousLength = start
     }
 
-    if (start === 0 && drop === false && length > this._remoteContiguousLength) {
-      this._remoteContiguousLength = length
+    if (start === 0 && drop === false) {
+      if (length > this._remoteContiguousLength) this._remoteContiguousLength = length
     } else if (length === 1) {
       const bitfield = this.core.skipBitfield === null ? this.core.bitfield : this.core.skipBitfield
       this.remoteBitfield.set(start, has)
@@ -1095,7 +1115,7 @@ class Peer {
       let index = off + i
       if (index > s.seeker.end) index -= len
 
-      if (this.remoteBitfield.get(index) === false) continue
+      if (this._remoteHasBlock(index) === false) continue
       if (this.core.bitfield.get(index) === true) continue
       if (!this._hasTreeParent(index)) continue
 
@@ -1328,6 +1348,7 @@ class Peer {
         start: i * DEFAULT_SEGMENT_SIZE,
         length: DEFAULT_SEGMENT_SIZE
       })
+      incrementTx(this.stats.wireWant, this.replicator.stats.wireWant)
     }
   }
 
@@ -1371,6 +1392,7 @@ class Peer {
     this.tracer.trace('send', req)
 
     this.wireRequest.send(req)
+    incrementTx(this.stats.wireRequest, this.replicator.stats.wireRequest)
   }
 }
 
@@ -1404,6 +1426,19 @@ module.exports = class Replicator {
 
     this.inflightRange = inflightRange || DEFAULT_MAX_INFLIGHT
 
+    // Note: nodata and unwant not currently tracked
+    // tx = transmitted, rx = received
+    this.stats = {
+      wireSync: { tx: 0, rx: 0 },
+      wireRequest: { tx: 0, rx: 0 },
+      wireCancel: { tx: 0, rx: 0 },
+      wireData: { tx: 0, rx: 0 },
+      wireWant: { tx: 0, rx: 0 },
+      wireBitfield: { tx: 0, rx: 0 },
+      wireRange: { tx: 0, rx: 0 },
+      wireExtension: { tx: 0, rx: 0 }
+    }
+
     this._attached = new Set()
     this._inflight = new InflightTracker()
     this._blocks = new BlockTracker()
@@ -1997,12 +2032,25 @@ module.exports = class Replicator {
   }
 
   _onwant (peer, start, length) {
+    const contig = Math.min(this.core.tree.length, this.core.header.hints.contiguousLength)
+
+    if (start + length < contig || (this.core.tree.length === contig)) {
+      peer.wireRange.send({
+        drop: false,
+        start: 0,
+        length: contig
+      })
+      incrementTx(peer.stats.wireRange, this.stats.wireRange)
+      return
+    }
+
     length = Math.min(length, this.core.tree.length - start)
 
     peer.protomux.cork()
 
     for (const msg of this.core.bitfield.want(start, length)) {
       peer.wireBitfield.send(msg)
+      incrementTx(peer.stats.wireBitfield, this.stats.wireBitfield)
     }
 
     peer.protomux.uncork()
@@ -2376,18 +2424,22 @@ function onwiredrain (c) {
 }
 
 function onwiresync (m, c) {
+  incrementRx(c.userData.stats.wireSync, c.userData.replicator.stats.wireSync)
   return c.userData.onsync(m)
 }
 
 function onwirerequest (m, c) {
+  incrementRx(c.userData.stats.wireRequest, c.userData.replicator.stats.wireRequest)
   return c.userData.onrequest(m)
 }
 
 function onwirecancel (m, c) {
+  incrementRx(c.userData.stats.wireCancel, c.userData.replicator.stats.wireCancel)
   return c.userData.oncancel(m)
 }
 
 function onwiredata (m, c) {
+  incrementRx(c.userData.stats.wireData, c.userData.replicator.stats.wireData)
   return c.userData.ondata(m)
 }
 
@@ -2396,6 +2448,7 @@ function onwirenodata (m, c) {
 }
 
 function onwirewant (m, c) {
+  incrementRx(c.userData.stats.wireWant, c.userData.replicator.stats.wireWant)
   return c.userData.onwant(m)
 }
 
@@ -2404,14 +2457,17 @@ function onwireunwant (m, c) {
 }
 
 function onwirebitfield (m, c) {
+  incrementRx(c.userData.stats.wireBitfield, c.userData.replicator.stats.wireBitfield)
   return c.userData.onbitfield(m)
 }
 
 function onwirerange (m, c) {
+  incrementRx(c.userData.stats.wireRange, c.userData.replicator.stats.wireRange)
   return c.userData.onrange(m)
 }
 
 function onwireextension (m, c) {
+  incrementRx(c.userData.stats.wireExtension, c.userData.replicator.stats.wireExtension)
   return c.userData.onextension(m)
 }
 
@@ -2426,3 +2482,13 @@ function isBlockRequest (req) {
 function isUpgradeRequest (req) {
   return req !== null && req.upgrade !== null
 }
+
+function incrementTx (stats1, stats2) {
+  stats1.tx++
+  stats2.tx++
+}
+
+function incrementRx (stats1, stats2) {
+  stats1.rx++
+  stats2.rx++
+}

package/package.json

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