diff --git a/package.json b/package.json index f906e438a..7fd78e5f6 100644 --- a/package.json +++ b/package.json @@ -136,4 +136,4 @@ "url": "https://github.com/ipfs/js-ipfs-api/issues" }, "homepage": "https://github.com/ipfs/js-ipfs-api" -} \ No newline at end of file +} diff --git a/src/files/create-add-stream.js b/src/files/create-add-stream.js index 16b3a3a15..47c178459 100644 --- a/src/files/create-add-stream.js +++ b/src/files/create-add-stream.js @@ -25,14 +25,8 @@ module.exports = (send) => { ds.end = () => { add(tuples, options, (err, res) => { - if (err) { - return ds.emit('error', err) - } - - res.forEach((tuple) => { - ds.push(tuple) - }) - + if (err) { return ds.emit('error', err) } + res.forEach((tuple) => ds.push(tuple)) ds.push(null) }) } diff --git a/src/object/new.js b/src/object/new.js index 2d48e0464..c9a08ad02 100644 --- a/src/object/new.js +++ b/src/object/new.js @@ -36,8 +36,6 @@ module.exports = (send) => { } if (node.toJSON().multihash !== result.Hash) { - console.log(node.toJSON()) - console.log(result) return callback(new Error('multihashes do not match')) } diff --git a/src/utils/get-files-stream.js b/src/utils/get-files-stream.js index f047e9415..f931fb5c0 100644 --- a/src/utils/get-files-stream.js +++ b/src/utils/get-files-stream.js @@ -6,10 +6,11 @@ const flatmap = require('flatmap') const escape = require('glob-escape') function headers (file) { - const name = encodeURIComponent(file.path) || '' - const header = { - 'Content-Disposition': `file; filename="${name}"` - } + const name = file.path + ? encodeURIComponent(file.path) + : '' + + const header = { 'Content-Disposition': `file; filename="${name}"` } if (file.dir || !file.content) { header['Content-Type'] = 'application/x-directory' @@ -49,7 +50,7 @@ function loadPaths (opts, file) { const mg = new glob.sync.GlobSync(`${globEscapedDir}` + '**/*', { follow: followSymlinks, dot: opts.hidden, - ignore: (opts.ignore || []).map(function (ignoreGlob) { + ignore: (opts.ignore || []).map((ignoreGlob) => { return globEscapedDir + ignoreGlob }) }) diff --git a/src/utils/request-api.js b/src/utils/request-api.js index 179dd447b..5f78b1e07 100644 --- a/src/utils/request-api.js +++ b/src/utils/request-api.js @@ -15,6 +15,7 @@ const request = require('./request') function parseError (res, cb) { const error = new Error(`Server responded with ${res.statusCode}`) + streamToJsonValue(res, (err, payload) => { if (err) { return cb(err) @@ -61,8 +62,8 @@ function onRes (buffer, cb) { } function requestAPI (config, options, callback) { - options.qs = options.qs || {} callback = once(callback) + options.qs = options.qs || {} if (Array.isArray(options.files)) { options.qs.recursive = true