refactor: add missing log cmds and modularize log api(ipfs-inactive#544)

README.md

@@ -224,7 +224,12 @@ This means:
 - [`ipfs.id([callback])`](https://github.com/ipfs/interface-ipfs-core/tree/master/API/generic#id)
 - [`ipfs.version([callback])`](https://github.com/ipfs/interface-ipfs-core/tree/master/API/generic#version)
 - [`ipfs.ping()`](https://github.com/ipfs/interface-ipfs-core/tree/master/API/generic#ping)
-- [`ipfs.log()`](https://github.com/ipfs/interface-ipfs-core/tree/master/API/generic#log)
+
+#### [log](https://github.com/ipfs/interface-ipfs-core/tree/master/API/generic)
+
+- [`ipfs.log.ls([callback])`](https://github.com/ipfs/interface-ipfs-core/tree/master/API/generic)
+- [`ipfs.log.tail([callback])`](https://github.com/ipfs/interface-ipfs-core/tree/master/API/generic)
+- [`ipfs.log.level(subsystem, level, [options, callback])`](https://github.com/ipfs/interface-ipfs-core/tree/master/API/generic)
 
 #### [key](https://github.com/ipfs/interface-ipfs-core/tree/master/API/key)
 

src/api/log/index.js

@@ -0,0 +1,9 @@
+'use strict'
+
+module.exports = (arg) => {
+  return {
+    tail: require('./tail')(arg),
+    ls: require('./ls')(arg),
+    level: require('./level')(arg)
+  }
+}

src/api/log/level.js

@@ -0,0 +1,30 @@
+'use strict'
+
+const promisify = require('promisify-es6')
+const moduleConfig = require('../../module-config')
+
+module.exports = (arg) => {
+  const send = moduleConfig(arg)
+
+  return promisify((subsystem, level, opts, callback) => {
+    if (typeof opts === 'function') {
+      callback = opts
+      opts = {}
+    }
+    if (typeof subsystem !== 'string') {
+      return callback(new Error('Invalid subsystem type'))
+    }
+
+    if (typeof level !== 'string') {
+      return callback(new Error('Invalid level type'))
+    }
+
+    send({
+      path: 'log/level',
+      args: [subsystem, level],
+      qs: opts,
+      files: undefined,
+      buffer: true
+    }, callback)
+  })
+}

src/api/log/ls.js

@@ -0,0 +1,20 @@
+'use strict'
+
+const promisify = require('promisify-es6')
+const moduleConfig = require('../../module-config')
+
+module.exports = (arg) => {
+  const send = moduleConfig(arg)
+
+  return promisify((callback) => {
+    send({
+      path: 'log/ls'
+    }, (err, result) => {
+      if (err) {
+        return callback(err)
+      }
+
+      callback(null, result.Strings)
+    })
+  })
+}

src/api/log/tail.js

@@ -0,0 +1,22 @@
+'use strict'
+
+const promisify = require('promisify-es6')
+const pump = require('pump')
+const ndjson = require('ndjson')
+const moduleConfig = require('../../module-config')
+
+module.exports = (arg) => {
+  const send = moduleConfig(arg)
+
+  return promisify((callback) => {
+    return send({
+      path: 'log/tail'
+    }, (err, response) => {
+      if (err) {
+        return callback(err)
+      }
+      const outputStream = pump(response, ndjson.parse())
+      callback(null, outputStream)
+    })
+  })
+}

test/log.spec.js

@@ -36,6 +36,30 @@ describe('.log', () => {
         })
       })
     })
+
+    it('.log.ls', (done) => {
+      ipfs.log.ls((err, res) => {
+        expect(err).to.not.exist()
+        expect(res).to.exist()
+
+        expect(res).to.be.an('array')
+
+        done()
+      })
+    })
+
+    it('.log.level', (done) => {
+      ipfs.log.level('all', 'error', (err, res) => {
+        expect(err).to.not.exist()
+        expect(res).to.exist()
+
+        expect(res).to.be.an('object')
+        expect(res).to.not.have.property('Error')
+        expect(res).to.have.property('Message')
+
+        done()
+      })
+    })
   })
 
   describe('Promise API', () => {
@@ -47,5 +71,25 @@ describe('.log', () => {
           })
         })
     })
+
+    it('.log.ls', () => {
+      return ipfs.log.ls()
+        .then((res) => {
+          expect(res).to.exist()
+
+          expect(res).to.be.an('array')
+        })
+    })
+
+    it('.log.level', () => {
+      return ipfs.log.level('all', 'error')
+        .then((res) => {
+          expect(res).to.exist()
+
+          expect(res).to.be.an('object')
+          expect(res).to.not.have.property('Error')
+          expect(res).to.have.property('Message')
+        })
+    })
   })
 })

test/sub-modules.spec.js

@@ -127,4 +127,21 @@ describe('submodules', () => {
       expect(ping).to.be.a('function')
     })
   })
+
+  describe('log', () => {
+    it('.ls', () => {
+      const ls = require('../src/api/log/ls')
+      expect(ls).to.be.a('function')
+    })
+
+    it('.tail', () => {
+      const tail = require('../src/api/log/tail')
+      expect(tail).to.be.a('function')
+    })
+
+    it('.level', () => {
+      const level = require('../src/api/log/level')
+      expect(level).to.be.a('function')
+    })
+  })
 })