got 3.3.0 → 3.3.1

package/index.js

@@ -13,7 +13,6 @@ var readAllStream = require('read-all-stream');
 var timedOut = require('timed-out');
 var prependHttp = require('prepend-http');
 var lowercaseKeys = require('lowercase-keys');
-var statuses = require('statuses');
 var isRedirect = require('is-redirect');
 var NestedErrorStacks = require('nested-error-stacks');
 
@@ -138,10 +137,6 @@ function got(url, opts, cb) {
 			var statusCode = response.statusCode;
 			var res = response;
 
-			if (proxy) {
-				proxy.emit('response', res);
-			}
-
 			// auto-redirect only for GET and HEAD methods
 			if (isRedirect(statusCode) && 'location' in res.headers && (opts.method === 'GET' || opts.method === 'HEAD')) {
 				// discard response
@@ -153,7 +148,11 @@ function got(url, opts, cb) {
 				}
 
 				var redirectUrl = urlLib.resolve(url, res.headers.location);
-				var redirectOpts = objectAssign(opts, urlLib.parse(redirectUrl));
+				var redirectOpts = objectAssign({}, opts, urlLib.parse(redirectUrl));
+
+				if (opts.agent === infinityAgent.http.globalAgent && redirectOpts.protocol === 'https:' && opts.protocol === 'http:') {
+					redirectOpts.agent = undefined;
+				}
 
 				if (proxy) {
 					proxy.emit('redirect', res, redirectOpts);
@@ -163,13 +162,17 @@ function got(url, opts, cb) {
 				return;
 			}
 
+			if (proxy) {
+				proxy.emit('response', res);
+			}
+
 			if (['gzip', 'deflate'].indexOf(res.headers['content-encoding']) !== -1) {
 				res = res.pipe(zlib.createUnzip());
 			}
 
 			if (statusCode < 200 || statusCode > 299) {
 				readAllStream(res, encoding, function (err, data) {
-					err = new GotError(opts.method + ' ' + url + ' response code is ' + statusCode + ' (' + statuses[statusCode] + ')', err);
+					err = new GotError(opts.method + ' ' + url + ' response code is ' + statusCode + ' (' + http.STATUS_CODES[statusCode] + ')', err);
 					err.code = statusCode;
 
 					if (data && json) {
@@ -195,7 +198,9 @@ function got(url, opts, cb) {
 			readAllStream(res, encoding, function (err, data) {
 				if (err) {
 					err = new GotError('Reading ' + url + ' response failed', err);
-				} else if (json) {
+				} else if (json && statusCode !== 204) {
+					// only parse json if the option is enabled, and the response
+					// is not a 204 (empty reponse)
 					try {
 						data = JSON.parse(data);
 					} catch (e) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "got",
-  "version": "3.3.0",
+  "version": "3.3.1",
   "description": "Simplified HTTP/HTTPS requests",
   "license": "MIT",
   "repository": "sindresorhus/got",
@@ -48,10 +48,9 @@
     "is-stream": "^1.0.0",
     "lowercase-keys": "^1.0.0",
     "nested-error-stacks": "^1.0.0",
-    "object-assign": "^2.0.0",
+    "object-assign": "^3.0.0",
     "prepend-http": "^1.0.0",
-    "read-all-stream": "^2.0.0",
-    "statuses": "^1.2.1",
+    "read-all-stream": "^3.0.0",
     "timed-out": "^2.0.0"
   },
   "devDependencies": {

package/readme.md

@@ -52,11 +52,11 @@ It's a `GET` request by default, but can be changed in `options`.
 ##### url
 
 *Required*  
-Type: `string`, `Object`
+Type: `string`, `object`
 
 The URL to request or bare [http.request options](https://nodejs.org/api/http.html#http_http_request_options_callback) object.
 
-Properties from `options` will override properties in parsed `url`.
+Properties from `options` will override properties in the parsed `url`.
 
 ##### options
 
@@ -68,33 +68,33 @@ Any of the [`http.request`](http://nodejs.org/api/http.html#http_http_request_op
 
 Type: `string`, `Buffer`, `ReadableStream`  
 
-_This option and stream mode are mutually exclusive._
+*This option and stream mode are mutually exclusive.*
 
-Body, that will be sent with `POST` request. If present in `options` and `options.method` is not set - `options.method` will be set to `POST`.
+Body that will be sent with a `POST` request. If present in `options` and `options.method` is not set - `options.method` will be set to `POST`.
 
-If `content-length` or `transfer-encoding` is not set in `options.headers` and body is String or Buffer - `content-length` will be set to body length.
+If `content-length` or `transfer-encoding` is not set in `options.headers` and `body` is a string or buffer, `content-length` will be set to the body length.
 
 ###### encoding
 
 Type: `string`, `null`  
 Default: `'utf8'`
 
-Encoding to be used on `setEncoding` of the response data. If null, the body is returned as a Buffer.
+Encoding to be used on `setEncoding` of the response data. If `null`, the body is returned as a Buffer.
 
 ###### json
 
-Type: `Boolean`  
+Type: `boolean`  
 Default: `false`
 
-_This option and stream mode are mutually exclusive._
+*This option and stream mode are mutually exclusive.*
 
-If enabled, response body will be parsed with `JSON.parse` and `accept` header will be set to `application/json` by default.
+Parse response body with `JSON.parse` and set `accept` header to `application/json`.
 
 ###### query
 
-Type: `string`, `Object`  
+Type: `string`, `object`  
 
-Query string object, that will be added to request url. This will override query string in `url`.
+Query string object that will be added to the request URL. This will override the query string in `url`.
 
 ###### timeout
 
@@ -106,13 +106,13 @@ Milliseconds after which the request will be aborted and an error event with `ET
 
 [http.Agent](http://nodejs.org/api/http.html#http_class_http_agent) instance.
 
-If `undefined` - [`infinity-agent`](https://github.com/floatdrop/infinity-agent) will be used to backport Agent class from Node core.
+If `undefined` - [`infinity-agent`](https://github.com/floatdrop/infinity-agent) will be used to backport Agent class from Node.js core.
 
-To use default [globalAgent](http://nodejs.org/api/http.html#http_http_globalagent) just pass `null` to this option.
+To use default [globalAgent](http://nodejs.org/api/http.html#http_http_globalagent) just pass `null`.
 
-##### callback(err, data, response)
+##### callback(error, data, response)
 
-###### err
+###### error
 
 `Error` object with HTTP status code as `code` property.
 
@@ -128,15 +128,15 @@ When in stream mode, you can listen for events:
 
 ##### .on('response', response)
 
-`response` event to get the response object.
+`response` event to get the response object of the final request.
 
 ##### .on('redirect', response, nextOptions)
 
-`redirect` event to get the response object of redirect. Second argument is options for next request to the redirect location.
+`redirect` event to get the response object of a redirect. Second argument is options for the next request to the redirect location.
 
 ##### .on('error', error, body, response)
 
-`error` event emitted in case of protocol error (like ENOTFOUND etc.) or status error (4xx or 5xx). Second argument is body of server response in case of status error. Third argument is response object.
+`error` event emitted in case of protocol error (like `ENOTFOUND` etc.) or status error (4xx or 5xx). Second argument is body of server response in case of status error. Third argument is response object.
 
 ###### response
 
@@ -187,8 +187,8 @@ got('todomvc.com', {
 
 ## Related
 
- * [`gh-got`](https://github.com/sindresorhus/gh-got) - Convenience wrapper for interacting with the GitHub API
- * [`got-promise`](https://github.com/floatdrop/got-promise) - Promise wrapper
+- [gh-got](https://github.com/sindresorhus/gh-got) - Convenience wrapper for interacting with the GitHub API
+- [got-promise](https://github.com/floatdrop/got-promise) - Promise wrapper
 
 
 ## Created by

package/license

@@ -1,21 +0,0 @@
-The MIT License (MIT)
-
-Copyright (c) Sindre Sorhus <sindresorhus@gmail.com> (sindresorhus.com)
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.