got 5.1.0 → 5.3.1

package/index.js

@@ -5,7 +5,8 @@ var https = require('https');
 var urlLib = require('url');
 var querystring = require('querystring');
 var objectAssign = require('object-assign');
-var duplexify = require('duplexify');
+var PassThrough = require('readable-stream').PassThrough;
+var duplexer2 = require('duplexer2');
 var isStream = require('is-stream');
 var readAllStream = require('read-all-stream');
 var timedOut = require('timed-out');
@@ -19,11 +20,6 @@ var nodeStatusCodes = require('node-status-codes');
 var isPlainObj = require('is-plain-obj');
 var parseJson = require('parse-json');
 
-function backoff(iter) {
-	var noise = Math.random() * 1000;
-	return (1 << iter) * 1000 + noise;
-}
-
 function requestAsEventEmitter(opts) {
 	opts = opts || {};
 
@@ -56,13 +52,14 @@ function requestAsEventEmitter(opts) {
 
 			// do not write ee.bind(...) instead of function - it will break gzip in Node.js 0.10
 			setImmediate(function () {
-				ee.emit('response', typeof unzipResponse === 'function' ? unzipResponse(res) : res);
+				ee.emit('response', typeof unzipResponse === 'function' && req.method !== 'HEAD' ? unzipResponse(res) : res);
 			});
 		});
 
 		req.once('error', function (err) {
-			if (retryCount < opts.retries) {
-				setTimeout(get, backoff(retryCount++), opts);
+			var backoff = opts.retries(++retryCount, err);
+			if (backoff) {
+				setTimeout(get, backoff, opts);
 				return;
 			}
 
@@ -144,7 +141,9 @@ function asPromise(opts) {
 }
 
 function asStream(opts) {
-	var proxy = duplexify();
+	var input = new PassThrough();
+	var output = new PassThrough();
+	var proxy = duplexer2(input, output);
 
 	if (opts.json) {
 		throw new Error('got can not be used as stream when options.json is used');
@@ -172,7 +171,7 @@ function asStream(opts) {
 		}
 
 		if (opts.method === 'POST' || opts.method === 'PUT' || opts.method === 'PATCH') {
-			proxy.setWritable(req);
+			input.pipe(req);
 			return;
 		}
 
@@ -182,7 +181,7 @@ function asStream(opts) {
 	ee.on('response', function (res) {
 		var statusCode = res.statusCode;
 
-		proxy.setReadable(res);
+		res.pipe(output);
 
 		if (statusCode < 200 || statusCode > 299) {
 			proxy.emit('error', new got.HTTPError(statusCode, opts), null, res);
@@ -270,6 +269,18 @@ function normalizeArguments(url, opts) {
 		}
 	}
 
+	if (typeof opts.retries !== 'function') {
+		var retries = opts.retries;
+		opts.retries = function backoff(iter) {
+			if (iter > retries) {
+				return 0;
+			}
+
+			var noise = Math.random() * 100;
+			return (1 << iter) * 1000 + noise;
+		};
+	}
+
 	return opts;
 }
 
@@ -320,8 +331,13 @@ got.stream = function (url, opts, cb) {
 };
 
 helpers.forEach(function (el) {
-	got.stream[el] = function (url, opts) {
-		return got.stream(url, objectAssign({}, opts, {method: el.toUpperCase()}));
+	got.stream[el] = function (url, opts, cb) {
+		if (typeof opts === 'function') {
+			cb = opts;
+			opts = {};
+		}
+
+		return got.stream(url, objectAssign({}, opts, {method: el.toUpperCase()}), cb);
 	};
 });
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "got",
-  "version": "5.1.0",
+  "version": "5.3.1",
   "description": "Simplified HTTP/HTTPS requests",
   "license": "MIT",
   "repository": "sindresorhus/got",
@@ -46,7 +46,7 @@
   ],
   "dependencies": {
     "create-error-class": "^2.0.0",
-    "duplexify": "^3.2.0",
+    "duplexer2": "^0.1.4",
     "is-plain-obj": "^1.0.0",
     "is-redirect": "^1.0.0",
     "is-stream": "^1.0.0",
@@ -54,14 +54,15 @@
     "node-status-codes": "^1.0.0",
     "object-assign": "^4.0.1",
     "parse-json": "^2.1.0",
-    "pinkie-promise": "^1.0.0",
+    "pinkie-promise": "^2.0.0",
     "read-all-stream": "^3.0.0",
+    "readable-stream": "^2.0.5",
     "timed-out": "^2.0.0",
     "unzip-response": "^1.0.0",
     "url-parse-lax": "^1.0.0"
   },
   "devDependencies": {
-    "ava": "^0.3.0",
+    "ava": "^0.5.0",
     "coveralls": "^2.11.4",
     "get-port": "^2.0.0",
     "into-stream": "^2.0.0",

package/readme.md

@@ -8,7 +8,7 @@
 
 > Simplified HTTP/HTTPS requests
 
-[![Build Status](https://travis-ci.org/sindresorhus/got.svg?branch=master)](https://travis-ci.org/sindresorhus/got) [![Coverage Status](https://coveralls.io/repos/sindresorhus/got/badge.svg?service=github&branch=master)](https://coveralls.io/github/sindresorhus/got?branch=master)
+[![Build Status](https://travis-ci.org/sindresorhus/got.svg?branch=master)](https://travis-ci.org/sindresorhus/got) [![Coverage Status](https://coveralls.io/repos/sindresorhus/got/badge.svg?service=github&branch=master)](https://coveralls.io/github/sindresorhus/got?branch=master) [![Downloads](https://img.shields.io/npm/dm/got.svg?style=flat)](https://npmjs.com/got)
 
 A nicer interface to the built-in [`http`](http://nodejs.org/api/http.html) module.
 
@@ -76,7 +76,7 @@ Any of the [`http.request`](http://nodejs.org/api/http.html#http_http_request_op
 
 ###### body
 
-Type: `string`, `Buffer`, `ReadableStream`, `Object`  
+Type: `string`, `buffer`, `readableStream`, `object`  
 
 *This is mutually exclusive with stream mode.*
 
@@ -118,11 +118,12 @@ Milliseconds after which the request will be aborted and an error event with `ET
 
 ###### retries
 
-Type: `number`  
+Type: `number`, `function`  
 Default: `5`
 
-Number of request retries when network errors happens.
+Number of request retries when network errors happens. Delays between retries counts with function `Math.pow(2, retry) + Math.random() * 100`, where `retry` is attempt number (starts from 0).
 
+Option accepts `function` with `retry` and `error` arguments. Function must return delay in milliseconds (`0` return value cancels retry).
 
 ##### callback(error, data, response)
 
@@ -146,6 +147,13 @@ When in stream mode, you can listen for events:
 
 `request` event to get the request object of the request.
 
+__Tip__: You can use `request` event to abort request:
+
+```js
+got.stream('github.com')
+	.on('request', req => setTimeout(() => req.abort(), 50));
+```
+
 ##### .on('response', response)
 
 `response` event to get the response object of the final request.
@@ -158,7 +166,6 @@ When in stream mode, you can listen for events:
 
 `error` event emitted in case of protocol error (like `ENOTFOUND` etc.) or status error (4xx or 5xx). The second argument is the body of the server response in case of status error. The third argument is response object.
 
-
 #### got.get(url, [options], [callback])
 #### got.post(url, [options], [callback])
 #### got.put(url, [options], [callback])
@@ -275,6 +282,7 @@ This should only ever be done if you have Node version 0.10.x and at the top-lev
 ## Related
 
 - [gh-got](https://github.com/sindresorhus/gh-got) - Convenience wrapper for interacting with the GitHub API
+- [travis-got](https://github.com/samverschueren/travis-got) - Convenience wrapper for interacting with the Travis API
 
 
 ## Created by