got 6.6.1 → 6.7.1

package/index.js

@@ -1,5 +1,5 @@
 'use strict';
-const EventEmitter = require('events').EventEmitter;
+const EventEmitter = require('events');
 const http = require('http');
 const https = require('https');
 const PassThrough = require('stream').PassThrough;
@@ -14,9 +14,9 @@ const lowercaseKeys = require('lowercase-keys');
 const isRedirect = require('is-redirect');
 const unzipResponse = require('unzip-response');
 const createErrorClass = require('create-error-class');
-const nodeStatusCodes = require('node-status-codes');
 const isRetryAllowed = require('is-retry-allowed');
-const pkg = require('./package.json');
+const Buffer = require('safe-buffer').Buffer;
+const pkg = require('./package');
 
 function requestAsEventEmitter(opts) {
 	opts = opts || {};
@@ -41,7 +41,9 @@ function requestAsEventEmitter(opts) {
 					return;
 				}
 
-				redirectUrl = urlLib.resolve(urlLib.format(opts), Buffer.from(res.headers.location, 'binary').toString());
+				const bufferString = Buffer.from(res.headers.location, 'binary').toString();
+
+				redirectUrl = urlLib.resolve(urlLib.format(opts), bufferString);
 				const redirectOpts = Object.assign({}, opts, urlLib.parse(redirectUrl));
 
 				ee.emit('redirect', res, redirectOpts);
@@ -71,11 +73,13 @@ function requestAsEventEmitter(opts) {
 			ee.emit('error', new got.RequestError(err, opts));
 		});
 
-		if (opts.timeout) {
-			timedOut(req, opts.timeout);
+		if (opts.gotTimeout) {
+			timedOut(req, opts.gotTimeout);
 		}
 
-		setImmediate(() => ee.emit('request', req));
+		setImmediate(() => {
+			ee.emit('request', req);
+		});
 	};
 
 	get(opts);
@@ -285,6 +289,11 @@ function normalizeArguments(url, opts) {
 		opts.followRedirect = true;
 	}
 
+	if (opts.timeout) {
+		opts.gotTimeout = opts.timeout;
+		delete opts.timeout;
+	}
+
 	return opts;
 }
 
@@ -311,9 +320,9 @@ helpers.forEach(el => {
 
 got.stream = (url, opts) => asStream(normalizeArguments(url, opts));
 
-helpers.forEach(el => {
+for (const el of helpers) {
 	got.stream[el] = (url, opts) => got.stream(url, Object.assign({}, opts, {method: el}));
-});
+}
 
 function stdError(error, opts) {
 	if (error.code !== undefined) {
@@ -334,21 +343,21 @@ got.ReadError = createErrorClass('ReadError', stdError);
 got.ParseError = createErrorClass('ParseError', function (e, statusCode, opts, data) {
 	stdError.call(this, e, opts);
 	this.statusCode = statusCode;
-	this.statusMessage = nodeStatusCodes[this.statusCode];
+	this.statusMessage = http.STATUS_CODES[this.statusCode];
 	this.message = `${e.message} in "${urlLib.format(opts)}": \n${data.slice(0, 77)}...`;
 });
 
 got.HTTPError = createErrorClass('HTTPError', function (statusCode, opts) {
 	stdError.call(this, {}, opts);
 	this.statusCode = statusCode;
-	this.statusMessage = nodeStatusCodes[this.statusCode];
+	this.statusMessage = http.STATUS_CODES[this.statusCode];
 	this.message = `Response code ${this.statusCode} (${this.statusMessage})`;
 });
 
 got.MaxRedirectsError = createErrorClass('MaxRedirectsError', function (statusCode, opts) {
 	stdError.call(this, {}, opts);
 	this.statusCode = statusCode;
-	this.statusMessage = nodeStatusCodes[this.statusCode];
+	this.statusMessage = http.STATUS_CODES[this.statusCode];
 	this.message = 'Redirected 10 times. Aborting.';
 });
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "got",
-  "version": "6.6.1",
+  "version": "6.7.1",
   "description": "Simplified HTTP requests",
   "license": "MIT",
   "repository": "sindresorhus/got",
@@ -47,24 +47,23 @@
   "dependencies": {
     "create-error-class": "^3.0.0",
     "duplexer3": "^0.1.4",
-    "get-stream": "^2.3.0",
+    "get-stream": "^3.0.0",
     "is-redirect": "^1.0.0",
     "is-retry-allowed": "^1.0.0",
     "is-stream": "^1.0.0",
     "lowercase-keys": "^1.0.0",
-    "node-status-codes": "^2.0.0",
-    "timed-out": "^3.0.0",
+    "safe-buffer": "^5.0.1",
+    "timed-out": "^4.0.0",
     "unzip-response": "^2.0.1",
     "url-parse-lax": "^1.0.0"
   },
   "devDependencies": {
-    "ava": "^0.16.0",
+    "ava": "^0.17.0",
     "coveralls": "^2.11.4",
     "form-data": "^2.1.1",
     "get-port": "^2.0.0",
-    "get-stream": "^2.3.0",
     "into-stream": "^3.0.0",
-    "nyc": "^8.1.0",
+    "nyc": "^10.0.0",
     "pem": "^1.4.4",
     "pify": "^2.3.0",
     "tempfile": "^1.1.1",
@@ -72,5 +71,8 @@
   },
   "xo": {
     "esnext": true
+  },
+  "ava": {
+    "concurrency": 4
   }
 }

package/readme.md

@@ -110,10 +110,12 @@ Query string object that will be added to the request URL. This will override th
 
 ###### timeout
 
-Type: `number`
+Type: `number`, `object`
 
 Milliseconds to wait for a server to send response headers before aborting request with `ETIMEDOUT` error.
 
+Option accepts `object` with separate `connect` and `socket` fields for connection and socket inactivity timeouts.
+
 ###### retries
 
 Type: `number`, `function`<br>