From c05add501cb724ed6f09120789d94f99f5dad645 Mon Sep 17 00:00:00 2001 From: Sindre Sorhus Date: Mon, 19 Jan 2015 02:58:20 +0800 Subject: [PATCH] minor tweaks --- index.js | 16 +++++++++++++--- package.json | 4 ++-- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/index.js b/index.js index 06bac3e..4154ce3 100644 --- a/index.js +++ b/index.js @@ -6,7 +6,7 @@ var zlib = require('zlib'); var assign = require('object-assign'); var agent = require('infinity-agent'); var duplexify = require('duplexify'); -var isReadableStream = require('isstream').isReadable; +var isStream = require('is-stream'); var read = require('read-all-stream'); var timeout = require('timed-out'); var prependHttp = require('prepend-http'); @@ -103,7 +103,12 @@ function got(url, opts, cb) { } if (!proxy) { - isReadableStream(body) ? body.pipe(req) : req.end(body); + if (isStream.readable(body)) { + body.pipe(req); + } else { + req.end(body); + } + return; } @@ -112,7 +117,12 @@ function got(url, opts, cb) { throw new Error('got\'s stream is not writable when options.body is used'); }; - isReadableStream(body) ? body.pipe(req) : req.end(body); + if (isStream.readable(body)) { + body.pipe(req); + } else { + req.end(body); + } + return; } diff --git a/package.json b/package.json index 8d7ae7c..e69a84d 100644 --- a/package.json +++ b/package.json @@ -39,8 +39,8 @@ ], "dependencies": { "duplexify": "^3.2.0", - "infinity-agent": "^0.2.0", - "isstream": "^0.1.1", + "infinity-agent": "^1.0.0", + "is-stream": "^1.0.0", "object-assign": "^2.0.0", "prepend-http": "^1.0.0", "read-all-stream": "^0.1.0",