hyperswarm-stats 1.3.2 → 1.3.4

package/index.js

@@ -21,7 +21,7 @@ class HyperswarmStats {
         this._packetsReceivedOverClosedSwarmStreams += conn.rawStream?.packetsReceived || 0
         this._retransmitsOfClosedSwarmStreams += conn.rawStream?.retransmits
         this._fastRecoveriesOfClosedSwarmStreams += conn.rawStream?.fastRecoveries
-        this._rtoCountOfClosedSwarmStreams += conn.rawStream?.rtoCount
+        this._rtoCountOfClosedSwarmStreams += conn.rawStream?.lifetimeRtoCount || 0
       })
     }
 
@@ -84,7 +84,7 @@ class HyperswarmStats {
   getRTOCountAcrossAllStreams() {
     let countFromCurrentConns = 0
     for (const conn of this.swarm.connections) {
-      countFromCurrentConns += conn.rawStream?.rtoCount || 0
+      countFromCurrentConns += conn.rawStream?.lifetimeRtoCount || 0
     }
 
     return countFromCurrentConns + this._rtoCountOfClosedSwarmStreams
@@ -130,10 +130,15 @@ class HyperswarmStats {
     return this.swarm.peers.size
   }
 
+  get nrConnections() {
+    return this.swarm.connections.size
+  }
+
   toJson() {
     return {
       dht: this.dhtStats.toJson(),
       nrPeers: this.nrPeers,
+      nrConnections: this.nrConnections,
       connects: JSON.parse(JSON.stringify(this.connects)), // quick-and-dirty deep copy
       bytesTransmittedOverSwarmStreams: this.getBytesTransmittedAcrossAllStreams(),
       bytesReceivedOverSwarmStreams: this.getBytesReceivedAcrossAllStreams(),
@@ -150,6 +155,7 @@ class HyperswarmStats {
   toString() {
     return `Hyperswarm Stats
   - hyperswarm_nr_peers: ${this.nrPeers}
+  - hyperswarm_nr_connections: ${this.nrConnections}
   - hyperswarm_client_connections_opened: ${this.connects.client.opened}
   - hyperswarm_client_connections_closed: ${this.connects.client.closed}
   - hyperswarm_client_connections_attempted: ${this.connects.client.attempted}
@@ -173,11 +179,18 @@ ${this.dhtStats.toString()}`
     const self = this
     new promClient.Gauge({
       name: 'hyperswarm_nr_peers',
-      help: 'Number of peers this swarm is connected to',
+      help: 'Number of swarm peers',
       collect() {
         this.set(self.nrPeers)
       }
     })
+    new promClient.Gauge({
+      name: 'hyperswarm_nr_connections',
+      help: 'Number of current connections of the swarm',
+      collect() {
+        this.set(self.nrConnections)
+      }
+    })
 
     new promClient.Gauge({
       name: 'hyperswarm_client_connections_opened',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hyperswarm-stats",
-  "version": "1.3.2",
+  "version": "1.3.4",
   "description": "Hyperswarm stats with prometheus support",
   "main": "index.js",
   "scripts": {