observe traffic and expose statistics

src/stats/index.js

@@ -28,12 +28,13 @@ module.exports = (observer, _options) => {
   const globalStats = new Stat(initialCounters, options)
   const peerStats = new Map()
   const transportStats = new Map()
+  const protocolStats = new Map()
 
-  observer.on('message', (peerId, transportTag, protocol, direction, bufferLength) => {
+  observer.on('message', (peerId, transportTag, protocolTag, direction, bufferLength) => {
     // if (!peerId) {
     //   throw new Error('message should have peer id')
     // }
-    console.log('m', peerId, transportTag, protocol, direction, bufferLength)
+    console.log('m', peerId, transportTag, protocolTag, direction, bufferLength)
     const event = directionToEvent[direction]
 
     // global stats
@@ -54,6 +55,14 @@ module.exports = (observer, _options) => {
       transportStats.set(transportTag, transport)
     }
     transport.push(event, bufferLength)
+
+    // protocol stats
+    let protocol = protocolStats.get(protocolTag)
+    if (!protocol) {
+      protocol = new Stat(initialCounters, options)
+      protocolStats.set(protocolTag, transport)
+    }
+    protocol.push(event, bufferLength)
   })
 
   observer.on('peer:closed', (peerId) => {
@@ -63,10 +72,12 @@ module.exports = (observer, _options) => {
   return {
     stop: stop,
     global: globalStats,
-    peers: Array.from(peerStats.keys()),
+    peers: () => Array.from(peerStats.keys()),
     forPeer: (peerId) => peerStats.get(peerId),
-    transports: Array.from(transportStats.keys()),
-    forTransport: (transport) => transportStats.get(transport)
+    transports: () => Array.from(transportStats.keys()),
+    forTransport: (transport) => transportStats.get(transport),
+    protocols: () => Array.from(protocolStats.keys()),
+    forProtocol: (protocol) => protocolStats.get(protocol)
   }
 
   function stop () {

test/stats.node.js

@@ -82,19 +82,47 @@ describe('Stats', () => {
     })
   })
 
-  it('waits a bit', (done) => setTimeout(done, 1900))
+  it('waits a bit', (done) => setTimeout(done, 1000))
 
-  it('A has some stats', () => {
-    const snapshot = switchA.stats.global.snapshot
-    console.log('%j', snapshot)
+  it('both nodes have some global stats', () => {
+    let snapshot = switchA.stats.global.snapshot
     expect(snapshot.dataReceived.toFixed()).to.equal('51')
     expect(snapshot.dataSent.toFixed()).to.equal('49')
-  })
 
-  it('B has some stats', () => {
-    const snapshot = switchB.stats.global.snapshot
-    console.log('%j', snapshot)
+    snapshot = switchB.stats.global.snapshot
     expect(snapshot.dataReceived.toFixed()).to.equal('51')
     expect(snapshot.dataSent.toFixed()).to.equal('49')
   })
+
+  it('both nodes know some transports', () => {
+    const expectedTransports = [
+      '/mplex/6.7.0',
+      '/secio/1.0.0'
+    ]
+    expect(switchA.stats.transports().sort()).to.deep.equal(expectedTransports)
+    expect(switchB.stats.transports().sort()).to.deep.equal(expectedTransports)
+  })
+
+  it('both nodes know some protocols', () => {
+    const expectedProtocols = [
+      '/echo/1.0.0',
+      '/mplex/6.7.0'
+    ]
+    expect(switchA.stats.protocols().sort()).to.deep.equal(expectedProtocols)
+    expect(switchB.stats.protocols().sort()).to.deep.equal(expectedProtocols)
+  })
+
+  it('both nodes know about each other', () => {
+    expect(switchA.stats.peers().sort()).to.deep.equal([switchB._peerInfo.id.toB58String()])
+    expect(switchB.stats.peers().sort()).to.deep.equal([switchA._peerInfo.id.toB58String()])
+  })
+
+  it('both have transport-specific stats', () => {
+    let snapshot = switchA.stats.forTransport('/secio/1.0.0').snapshot
+    expect(snapshot.dataReceived.toFixed()).to.equal('92')
+    expect(snapshot.dataSent.toFixed()).to.equal('90')
+    snapshot = switchB.stats.forTransport('/secio/1.0.0').snapshot
+    expect(snapshot.dataReceived.toFixed()).to.equal('92')
+    expect(snapshot.dataSent.toFixed()).to.equal('90')
+  })
 })