updates

Author: hacdias

src/core/components/bitswap.js

@@ -1,6 +1,7 @@
 'use strict'
 
 const OFFLINE_ERROR = require('../utils').OFFLINE_ERROR
+const promisify = require('promisify-es6')
 
 function formatWantlist (list) {
   return Array.from(list).map((e) => e[1])
@@ -16,16 +17,25 @@ module.exports = function bitswap (self) {
       const list = self._bitswap.getWantlist()
       return formatWantlist(list)
     },
-    stat: () => {
+    stat: promisify((callback) => {
       if (!self.isOnline()) {
-        throw new Error(OFFLINE_ERROR)
+        callback(new Error(OFFLINE_ERROR))
       }
 
-      return Object.assign({}, self._bitswap.stat().snapshot, {
+      const snapshot = self._bitswap.stat().snapshot
+
+      callback(null, {
+        provideBufLen: snapshot.providesBufferLength,
+        blocksReceived: snapshot.blocksReceived,
         wantlist: formatWantlist(self._bitswap.getWantlist()),
-        peers: self._bitswap.peers().map((id) => id.toB58String())
+        peers: self._bitswap.peers().map((id) => id.toB58String()),
+        dupBlksReceived: snapshot.dupBlksReceived,
+        dupDataReceived: snapshot.dupDataReceived,
+        dataReceived: snapshot.dataReceived,
+        blocksSent: snapshot.blocksSent,
+        dataSent: snapshot.dataSent
       })
-    },
+    }),
     unwant: (key) => {
       if (!self.isOnline()) {
         throw new Error(OFFLINE_ERROR)

src/core/components/index.js

@@ -21,3 +21,4 @@ exports.bitswap = require('./bitswap')
 exports.pubsub = require('./pubsub')
 exports.dht = require('./dht')
 exports.dns = require('./dns')
+exports.stats = require('./stats')

src/core/components/stats.js

@@ -0,0 +1,13 @@
+'use strict'
+
+const OFFLINE_ERROR = require('../utils').OFFLINE_ERROR
+
+function formatWantlist (list) {
+  return Array.from(list).map((e) => e[1])
+}
+
+module.exports = function stats (self) {
+  return {
+    bitswap: require('./bitswap')(self).stat
+  }
+}

src/core/index.js

@@ -95,6 +95,7 @@ class IPFS extends EventEmitter {
     this.pubsub = components.pubsub(this)
     this.dht = components.dht(this)
     this.dns = components.dns(this)
+    this.stats = components.stats(this)
 
     if (this._options.EXPERIMENTAL.pubsub) {
       this.log('EXPERIMENTAL pubsub is enabled')

src/http/api/resources/bitswap.js

@@ -21,23 +21,27 @@ exports.wantlist = (request, reply) => {
 }
 
 exports.stat = (request, reply) => {
-  let stats
-  try {
-    stats = request.server.app.ipfs.bitswap.stat()
-  } catch (err) {
-    return reply(boom.badRequest(err))
-  }
-
-  reply({
-    ProvideBufLen: stats.providesBufferLength,
-    BlocksReceived: stats.blocksReceived,
-    Wantlist: stats.wantlist,
-    Peers: stats.peers,
-    DupBlksReceived: stats.dupBlksReceived,
-    DupDataReceived: stats.dupDataReceived,
-    DataReceived: stats.dataReceived,
-    BlocksSent: stats.blocksSent,
-    DataSent: stats.dataSent
+  const ipfs = request.server.app.ipfs
+
+  ipfs.bitswap.stat((err, stats) => {
+    if (err) {
+      return reply({
+        Message: err.toString(),
+        Code: 0
+      }).code(500)
+    }
+
+    reply({
+      ProvideBufLen: stats.provideBufLen,
+      BlocksReceived: stats.blocksReceived,
+      Wantlist: stats.wantlist,
+      Peers: stats.peers,
+      DupBlksReceived: stats.dupBlksReceived,
+      DupDataReceived: stats.dupDataReceived,
+      DataReceived: stats.dataReceived,
+      BlocksSent: stats.blocksSent,
+      DataSent: stats.dataSent
+    })
   })
 }