From b6e5270668a29c0ab7af5d60ef91fed4e0df7c98 Mon Sep 17 00:00:00 2001 From: dignifiedquire Date: Sat, 26 Dec 2015 21:59:50 +0100 Subject: [PATCH] fix: Always return the underlying request object --- src/api/add.js | 6 ++---- src/api/log.js | 2 +- src/api/pin.js | 4 ++-- src/request-api.js | 2 +- test/api/log.spec.js | 4 +++- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/api/add.js b/src/api/add.js index c87598c4e..0083458eb 100644 --- a/src/api/add.js +++ b/src/api/add.js @@ -8,15 +8,13 @@ module.exports = send => { } if (typeof files === 'string' && files.startsWith('http')) { - Wreck.request('GET', files, null, (err, res) => { + return Wreck.request('GET', files, null, (err, res) => { if (err) return cb(err) send('add', null, opts, res, cb) }) - - return } - send('add', null, opts, files, cb) + return send('add', null, opts, files, cb) } } diff --git a/src/api/log.js b/src/api/log.js index d78a88135..3e3c515be 100644 --- a/src/api/log.js +++ b/src/api/log.js @@ -5,7 +5,7 @@ const ndjson = require('ndjson') module.exports = send => { return { tail (cb) { - send('log/tail', null, {}, null, false, (err, res) => { + return send('log/tail', null, {}, null, false, (err, res) => { if (err) return cb(err) cb(null, res.pipe(ndjson.parse())) }) diff --git a/src/api/pin.js b/src/api/pin.js index 9bc95df29..00655c6d5 100644 --- a/src/api/pin.js +++ b/src/api/pin.js @@ -8,7 +8,7 @@ module.exports = send => { opts = null } - send('pin/add', hash, opts, null, cb) + return send('pin/add', hash, opts, null, cb) }, remove (hash, opts, cb) { if (typeof opts === 'function') { @@ -16,7 +16,7 @@ module.exports = send => { opts = null } - send('pin/rm', hash, opts, null, cb) + return send('pin/rm', hash, opts, null, cb) }, list (type, cb) { if (typeof type === 'function') { diff --git a/src/request-api.js b/src/request-api.js index 7cb7fb932..23d39408e 100644 --- a/src/request-api.js +++ b/src/request-api.js @@ -110,7 +110,7 @@ function requestAPI (config, path, args, qs, files, buffer, cb) { opts.payload = stream } - Wreck.request(opts.method, opts.uri, opts, onRes(buffer, cb)) + return Wreck.request(opts.method, opts.uri, opts, onRes(buffer, cb)) } // -- Interface diff --git a/test/api/log.spec.js b/test/api/log.spec.js index ed1d32a2f..651b9a5b2 100644 --- a/test/api/log.spec.js +++ b/test/api/log.spec.js @@ -2,9 +2,11 @@ describe('.log', () => { it('.log.tail', done => { - apiClients['a'].log.tail((err, res) => { + const req = apiClients['a'].log.tail((err, res) => { expect(err).to.not.exist + expect(req).to.exist + res.once('data', obj => { expect(obj).to.be.an('object') done()