From 4406a8ce23bb51601e410801b96318b2b8fbdcc4 Mon Sep 17 00:00:00 2001 From: David Dias Date: Thu, 30 Jun 2016 16:29:48 +0100 Subject: [PATCH] follow interface-ipfs-core config spec --- package.json | 3 +- src/api/config.js | 59 +++++++++++++---- src/get-files-stream.js | 4 +- src/request-api.js | 6 +- test/api/config.spec.js | 142 ++++------------------------------------ 5 files changed, 66 insertions(+), 148 deletions(-) diff --git a/package.json b/package.json index 039ccacc5..fe631da3e 100644 --- a/package.json +++ b/package.json @@ -32,6 +32,7 @@ "ndjson": "^1.4.3", "promisify-es6": "^1.0.1", "qs": "^6.1.0", + "streamifier": "^0.1.1", "wreck": "^7.0.2" }, "engines": { @@ -45,7 +46,7 @@ "aegir": "^3.2.0", "chai": "^3.5.0", "gulp": "^3.9.1", - "interface-ipfs-core": "^0.3.0", + "interface-ipfs-core": "^0.4.2", "ipfsd-ctl": "^0.14.0", "pre-commit": "^1.1.2", "stream-equal": "^0.1.8", diff --git a/src/api/config.js b/src/api/config.js index 582362bb6..670a3265e 100644 --- a/src/api/config.js +++ b/src/api/config.js @@ -1,31 +1,64 @@ 'use strict' -const argCommand = require('../cmd-helpers').argCommand +const streamifier = require('streamifier') module.exports = (send) => { return { - get: argCommand(send, 'config'), - set (key, value, opts, cb) { - if (typeof (opts) === 'function') { - cb = opts + get (key, callback) { + if (typeof key === 'function') { + callback = key + key = undefined + } + + if (!key) { + return send('config/show', null, null, null, true, callback) + } + + return send('config', key, null, null, (err, result) => { + if (err) { + return callback(err) + } + callback(null, result.Value) + }) + }, + set (key, value, opts, callback) { + if (typeof opts === 'function') { + callback = opts opts = {} } + if (typeof key !== 'string') { + return callback(new Error('Invalid key type')) + } + + if (typeof value !== 'object' && + typeof value !== 'boolean' && + typeof value !== 'string') { + return callback(new Error('Invalid value type')) + } - if (typeof (value) === 'object') { + if (typeof value === 'object') { value = JSON.stringify(value) opts = { json: true } - } else if (typeof (value) === 'boolean') { + } + + if (typeof value === 'boolean') { value = value.toString() opts = { bool: true } } - return send('config', [key, value], opts, null, cb) - }, - show (cb) { - return send('config/show', null, null, null, true, cb) + return send('config', [key, value], opts, null, callback) }, - replace (file, cb) { - return send('config/replace', null, null, file, cb) + replace (config, callback) { + // Its a path + if (typeof config === 'string') { + return send('config/replace', null, null, config, callback) + } + + // Its a config obj + if (typeof config === 'object') { + config = streamifier.createReadStream(new Buffer(JSON.stringify(config))) + return send('config/replace', null, null, config, callback) + } } } } diff --git a/src/get-files-stream.js b/src/get-files-stream.js index f723b34fd..485e06cce 100644 --- a/src/get-files-stream.js +++ b/src/get-files-stream.js @@ -93,7 +93,9 @@ function loadPaths (opts, file) { } function getFilesStream (files, opts) { - if (!files) return null + if (!files) { + return null + } const mp = new Multipart() diff --git a/src/request-api.js b/src/request-api.js index bef4fafcf..e3d173a43 100644 --- a/src/request-api.js +++ b/src/request-api.js @@ -25,7 +25,8 @@ function onRes (buffer, cb) { const stream = Boolean(res.headers['x-stream-output']) const chunkedObjects = Boolean(res.headers['x-chunked-output']) - const isJson = res.headers['content-type'] && res.headers['content-type'].indexOf('application/json') === 0 + const isJson = res.headers['content-type'] && + res.headers['content-type'].indexOf('application/json') === 0 if (res.statusCode >= 400 || !res.statusCode) { const error = new Error(`Server responded with ${res.statusCode}`) @@ -84,7 +85,7 @@ function requestAPI (config, path, args, qs, files, buffer, cb) { const port = config.port ? `:${config.port}` : '' const opts = { - method: files ? 'POST' : 'GET', + method: 'POST', uri: `${config.protocol}://${config.host}${port}${config['api-path']}${path}?${Qs.stringify(qs, {arrayFormat: 'repeat'})}`, headers: {} } @@ -100,7 +101,6 @@ function requestAPI (config, path, args, qs, files, buffer, cb) { } opts.headers['Content-Type'] = `multipart/form-data; boundary=${stream.boundary}` - opts.downstreamRes = stream opts.payload = stream } diff --git a/test/api/config.spec.js b/test/api/config.spec.js index 21ca82d8e..af096e6ae 100644 --- a/test/api/config.spec.js +++ b/test/api/config.spec.js @@ -2,133 +2,15 @@ /* globals apiClients */ 'use strict' -const expect = require('chai').expect -const isNode = require('detect-node') -const path = require('path') - -describe('.config', () => { - describe('.config.{set, get}', () => { - it('string', (done) => { - const confKey = 'arbitraryKey' - const confVal = 'arbitraryVal' - - apiClients.a.config.set(confKey, confVal, (err, res) => { - expect(err).to.not.exist - apiClients.a.config.get(confKey, (err, res) => { - expect(err).to.not.exist - expect(res).to.have.a.property('Value', confVal) - done() - }) - }) - }) - - it('bool', (done) => { - const confKey = 'otherKey' - const confVal = true - - apiClients.a.config.set(confKey, confVal, (err, res) => { - expect(err).to.not.exist - apiClients.a.config.get(confKey, (err, res) => { - expect(err).to.not.exist - expect(res.Value).to.deep.equal(confVal) - done() - }) - }) - }) - - it('json', (done) => { - const confKey = 'API.HTTPHeaders.Access-Control-Allow-Origin' - const confVal = ['http://example.io'] - - apiClients.a.config.set(confKey, confVal, (err, res) => { - expect(err).to.not.exist - apiClients.a.config.get(confKey, (err, res) => { - expect(err).to.not.exist - expect(res.Value).to.deep.equal(confVal) - done() - }) - }) - }) - }) - - it('.config.show', (done) => { - apiClients.c.config.show((err, res) => { - expect(err).to.not.exist - expect(res).to.exist - done() - }) - }) - - it('.config.replace', (done) => { - if (!isNode) { - return done() - } - - apiClients.c.config.replace(path.join(__dirname, '/../r-config.json'), (err, res) => { - expect(err).to.not.exist - expect(res).to.be.equal(null) - done() - }) - }) - - describe('promise', () => { - describe('.config.{set, get}', () => { - it('string', () => { - const confKey = 'arbitraryKey' - const confVal = 'arbitraryVal' - - return apiClients.a.config.set(confKey, confVal) - .then((res) => { - return apiClients.a.config.get(confKey) - }) - .then((res) => { - expect(res).to.have.a.property('Value', confVal) - }) - }) - - it('bool', () => { - const confKey = 'otherKey' - const confVal = true - - return apiClients.a.config.set(confKey, confVal) - .then((res) => { - return apiClients.a.config.get(confKey) - }) - .then((res) => { - expect(res.Value).to.deep.equal(confVal) - }) - }) - - it('json', () => { - const confKey = 'API.HTTPHeaders.Access-Control-Allow-Origin' - const confVal = ['http://example.com'] - - return apiClients.a.config.set(confKey, confVal) - .then((res) => { - return apiClients.a.config.get(confKey) - }) - .then((res) => { - expect(res.Value).to.deep.equal(confVal) - }) - }) - }) - - it('.config.show', () => { - return apiClients.c.config.show() - .then((res) => { - expect(res).to.exist - }) - }) - - it('.config.replace', () => { - if (!isNode) { - return - } - - return apiClients.c.config.replace(path.join(__dirname, '/../r-config.json')) - .then((res) => { - expect(res).to.be.equal(null) - }) - }) - }) -}) +const test = require('interface-ipfs-core') + +const common = { + setup: function (cb) { + cb(null, apiClients.a) + }, + teardown: function (cb) { + cb() + } +} + +test.config(common)