From 11ef1d95518079a4184fad557d0edcec3ddb3b7f Mon Sep 17 00:00:00 2001 From: Pedro Santos Date: Thu, 21 Nov 2019 10:36:54 +0000 Subject: [PATCH 1/3] feat: add human flag to bitswap stat cli command --- src/cli/commands/bitswap/stat.js | 39 ++++++++++++++++++++++++-------- 1 file changed, 29 insertions(+), 10 deletions(-) diff --git a/src/cli/commands/bitswap/stat.js b/src/cli/commands/bitswap/stat.js index bcc5356117..e333e6b137 100644 --- a/src/cli/commands/bitswap/stat.js +++ b/src/cli/commands/bitswap/stat.js @@ -2,6 +2,7 @@ const multibase = require('multibase') const { cidToString } = require('../../../utils/cid') +const prettyBytes = require('pretty-bytes') module.exports = { command: 'stat', @@ -13,24 +14,42 @@ module.exports = { describe: 'Number base to display CIDs in. Note: specifying a CID base for v0 CIDs will have no effect.', type: 'string', choices: multibase.names + }, + human: { + type: 'boolean', + default: false } }, - handler ({ getIpfs, print, cidBase, resolve }) { + handler ({ getIpfs, print, cidBase, resolve, human }) { resolve((async () => { const ipfs = await getIpfs() const stats = await ipfs.bitswap.stat() - stats.wantlist = stats.wantlist.map(k => cidToString(k['/'], { base: cidBase, upgrade: false })) - stats.peers = stats.peers || [] + + if (human) { + stats.blocksReceived = stats.blocksReceived.toNumber() + stats.blocksSent = stats.blocksSent.toNumber() + stats.dataReceived = prettyBytes(stats.dataReceived.toNumber()).toUpperCase() + stats.dataSent = prettyBytes(stats.dataSent.toNumber()).toUpperCase() + stats.dupBlksReceived = stats.dupBlksReceived.toNumber() + stats.dupDataReceived = prettyBytes(stats.dupDataReceived.toNumber()).toUpperCase() + stats.wantlist = `[${stats.wantlist.length} keys]` + } else { + const wantlist = stats.wantlist.map((elem) => cidToString(elem['/'], { base: cidBase, upgrade: false })) + stats.wantlist = `[${wantlist.length} keys] + ${wantlist.join('\n ')}` + } print(`bitswap status - blocks received: ${stats.blocksReceived} - dup blocks received: ${stats.dupBlksReceived} - dup data received: ${stats.dupDataReceived}B - wantlist [${stats.wantlist.length} keys] - ${stats.wantlist.join('\n ')} - partners [${stats.peers.length}] - ${stats.peers.join('\n ')}`) + provides buffer: ${stats.provideBufLen} + blocks received: ${stats.blocksReceived} + blocks sent: ${stats.blocksSent} + data received: ${stats.dataReceived} + data sent: ${stats.dataSent} + dup blocks received: ${stats.dupBlksReceived} + dup data received: ${stats.dupDataReceived} + wantlist ${stats.wantlist} + partners [${stats.peers.length}]`) })()) } } From 1a14dd400d0b85037ac3695820d9533c97cfa9e6 Mon Sep 17 00:00:00 2001 From: Pedro Santos Date: Thu, 21 Nov 2019 10:39:06 +0000 Subject: [PATCH 2/3] test: add human flag cli test to bitswap stat command --- test/cli/bitswap.js | 39 ++++++++++++++++++++++++++++++--------- 1 file changed, 30 insertions(+), 9 deletions(-) diff --git a/test/cli/bitswap.js b/test/cli/bitswap.js index c22cefe81c..75165811b2 100644 --- a/test/cli/bitswap.js +++ b/test/cli/bitswap.js @@ -67,17 +67,38 @@ describe('bitswap', () => runOn((thing) => { this.timeout(20 * 1000) const out = await ipfs('bitswap stat') - expect(out).to.include([ - 'bitswap status', - ' blocks received: 0', - ' dup blocks received: 0', - ' dup data received: 0B', - // We sometimes pick up partners while the tests run and the order of - // wanted keys is not defined so our assertion ends here. - ' wantlist [2 keys]' - ].join('\n')) + + expect(out).to.include('bitswap status') + expect(out).to.match(/provides buffer:\s\d+$/m) + expect(out).to.match(/blocks received:\s\d+$/m) + expect(out).to.match(/blocks sent:\s\d+$/m) + expect(out).to.match(/data received:\s\d+$/m) + expect(out).to.match(/data sent:\s\d+$/m) + expect(out).to.match(/dup blocks received:\s\d+$/m) + expect(out).to.match(/dup data received:\s\d+$/m) + expect(out).to.match(/wantlist\s\[\d+\skeys\]$/m) expect(out).to.include(key0) expect(out).to.include(key1) + expect(out).to.match(/partners\s\[\d+\]$/m) + }) + + it('stat --human', async function () { + this.timeout(20 * 1000) + + const out = await ipfs('bitswap stat --human') + + expect(out).to.include('bitswap status') + expect(out).to.match(/provides buffer:\s\d+$/m) + expect(out).to.match(/blocks received:\s\d+$/m) + expect(out).to.match(/blocks sent:\s\d+$/m) + expect(out).to.match(/data received:\s+[\d.]+\s[PTGMK]?B$/m) + expect(out).to.match(/data sent:\s+[\d.]+\s[PTGMK]?B$/m) + expect(out).to.match(/dup blocks received:\s\d+$/m) + expect(out).to.match(/dup data received:\s+[\d.]+\s[PTGMK]?B$/m) + expect(out).to.match(/wantlist\s\[\d+\skeys\]$/m) + expect(out).to.not.include(key0) + expect(out).to.not.include(key1) + expect(out).to.match(/partners\s\[\d+\]$/m) }) it('should get stats with wantlist CIDs encoded in specified base', async function () { From 40cf9f00e467449928c0605ac2a36233dcb9a87f Mon Sep 17 00:00:00 2001 From: Pedro Santos Date: Thu, 21 Nov 2019 11:04:48 +0000 Subject: [PATCH 3/3] chore: add pretty-bytes dep --- package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/package.json b/package.json index 18a7f1be85..e57dcd1e99 100644 --- a/package.json +++ b/package.json @@ -164,6 +164,7 @@ "peer-book": "^0.9.1", "peer-id": "^0.12.2", "peer-info": "~0.15.1", + "pretty-bytes": "^5.3.0", "progress": "^2.0.1", "promise-nodeify": "^3.0.1", "promisify-es6": "^1.0.3",