got 9.3.1 → 9.3.2

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "got",
-	"version": "9.3.1",
+	"version": "9.3.2",
 	"description": "Simplified HTTP requests",
 	"license": "MIT",
 	"repository": "sindresorhus/got",

package/readme.md

@@ -264,7 +264,7 @@ An object representing `retries`, `methods`, `statusCodes` and `maxRetryAfter` f
 If `maxRetryAfter` is set to `undefined`, it will use `options.timeout`.<br>
 If [`Retry-After`](https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Retry-After) header is greater than `maxRetryAfter`, it will cancel the request.
 
-Delays between retries counts with function `1000 * Math.pow(2, retry) + Math.random() * 100`, where `retry` is attempt number (starts from 0).
+Delays between retries counts with function `1000 * Math.pow(2, retry) + Math.random() * 100`, where `retry` is attempt number (starts from 1).
 
 The `retries` property can be a `number` or a `function` with `retry` and `error` arguments. The function must return a delay in milliseconds (`0` return value cancels retry).
 

package/source/normalize-arguments.js

@@ -236,7 +236,7 @@ const normalize = (url, options, defaults) => {
 			}
 
 			const noise = Math.random() * 100;
-			return ((1 << iteration) * 1000) + noise;
+			return ((2 ** (iteration - 1)) * 1000) + noise;
 		};
 	}
 

package/source/request-as-event-emitter.js

@@ -27,7 +27,6 @@ module.exports = (options, input) => {
 	let redirectString;
 	let uploadBodySize;
 	let retryCount = 0;
-	let retryTries = 0;
 	let shouldAbort = false;
 
 	const setCookie = options.cookieJar ? util.promisify(options.cookieJar.setCookie.bind(options.cookieJar)) : null;
@@ -227,7 +226,7 @@ module.exports = (options, input) => {
 		let backoff;
 
 		try {
-			backoff = options.retry.retries(++retryTries, error);
+			backoff = options.retry.retries(++retryCount, error);
 		} catch (error2) {
 			emitter.emit('error', error2);
 			return;
@@ -241,7 +240,6 @@ module.exports = (options, input) => {
 						await hook(options, error, retryCount);
 					}
 
-					retryCount++;
 					await get(options);
 				} catch (error) {
 					emitter.emit('error', error);

package/source/utils/timed-out.js

@@ -12,31 +12,7 @@ class TimeoutError extends Error {
 
 const reentry = Symbol('reentry');
 
-function addTimeout(delay, callback, ...args) {
-	// Event loop order is timers, poll, immediates.
-	// The timed event may emit during the current tick poll phase, so
-	// defer calling the handler until the poll phase completes.
-	let immediate;
-	const timeout = setTimeout(() => {
-		immediate = setImmediate(callback, delay, ...args);
-		/* istanbul ignore next: added in node v9.7.0 */
-		if (immediate.unref) {
-			immediate.unref();
-		}
-	}, delay);
-
-	/* istanbul ignore next: in order to support electron renderer */
-	if (timeout.unref) {
-		timeout.unref();
-	}
-
-	const cancel = () => {
-		clearTimeout(timeout);
-		clearImmediate(immediate);
-	};
-
-	return cancel;
-}
+const noop = () => {};
 
 module.exports = (request, delays, options) => {
 	/* istanbul ignore next: this makes sure timed-out isn't called twice */
@@ -45,6 +21,43 @@ module.exports = (request, delays, options) => {
 	}
 
 	request[reentry] = true;
+
+	let stopNewTimeouts = false;
+
+	const addTimeout = (delay, callback, ...args) => {
+		// An error had been thrown before. Going further would result in uncaught errors.
+		// See https://github.com/sindresorhus/got/issues/631#issuecomment-435675051
+		if (stopNewTimeouts) {
+			return noop;
+		}
+
+		// Event loop order is timers, poll, immediates.
+		// The timed event may emit during the current tick poll phase, so
+		// defer calling the handler until the poll phase completes.
+		let immediate;
+		const timeout = setTimeout(() => {
+			immediate = setImmediate(callback, delay, ...args);
+			/* istanbul ignore next: added in node v9.7.0 */
+			if (immediate.unref) {
+				immediate.unref();
+			}
+		}, delay);
+
+		/* istanbul ignore next: in order to support electron renderer */
+		if (timeout.unref) {
+			timeout.unref();
+		}
+
+		const cancel = () => {
+			clearTimeout(timeout);
+			clearImmediate(immediate);
+		};
+
+		cancelers.push(cancel);
+
+		return cancel;
+	};
+
 	const {host, hostname} = options;
 	const timeoutHandler = (delay, event) => {
 		request.emit('error', new TimeoutError(delay, event));
@@ -55,6 +68,7 @@ module.exports = (request, delays, options) => {
 
 	const cancelers = [];
 	const cancelTimeouts = () => {
+		stopNewTimeouts = true;
 		cancelers.forEach(cancelTimeout => cancelTimeout());
 	};
 
@@ -64,8 +78,7 @@ module.exports = (request, delays, options) => {
 	});
 
 	if (delays.request !== undefined) {
-		const cancelTimeout = addTimeout(delays.request, timeoutHandler, 'request');
-		cancelers.push(cancelTimeout);
+		addTimeout(delays.request, timeoutHandler, 'request');
 	}
 
 	if (delays.socket !== undefined) {
@@ -79,7 +92,6 @@ module.exports = (request, delays, options) => {
 			/* istanbul ignore next: hard to test */
 			if (socket.connecting) {
 				const cancelTimeout = addTimeout(delays.lookup, timeoutHandler, 'lookup');
-				cancelers.push(cancelTimeout);
 				socket.once('lookup', cancelTimeout);
 			}
 		});
@@ -89,17 +101,15 @@ module.exports = (request, delays, options) => {
 		request.once('socket', socket => {
 			/* istanbul ignore next: hard to test */
 			if (socket.connecting) {
-				const timeConnect = () => {
-					const cancelTimeout = addTimeout(delays.connect, timeoutHandler, 'connect');
-					cancelers.push(cancelTimeout);
-					return cancelTimeout;
-				};
+				const timeConnect = () => addTimeout(delays.connect, timeoutHandler, 'connect');
 
 				if (request.socketPath || net.isIP(hostname || host)) {
 					socket.once('connect', timeConnect());
 				} else {
-					socket.once('lookup', () => {
-						socket.once('connect', timeConnect());
+					socket.once('lookup', error => {
+						if (error === null) {
+							socket.once('connect', timeConnect());
+						}
 					});
 				}
 			}
@@ -112,7 +122,6 @@ module.exports = (request, delays, options) => {
 			if (socket.connecting) {
 				socket.once('connect', () => {
 					const cancelTimeout = addTimeout(delays.secureConnect, timeoutHandler, 'secureConnect');
-					cancelers.push(cancelTimeout);
 					socket.once('secureConnect', cancelTimeout);
 				});
 			}
@@ -121,11 +130,7 @@ module.exports = (request, delays, options) => {
 
 	if (delays.send !== undefined) {
 		request.once('socket', socket => {
-			const timeRequest = () => {
-				const cancelTimeout = addTimeout(delays.send, timeoutHandler, 'send');
-				cancelers.push(cancelTimeout);
-				return cancelTimeout;
-			};
+			const timeRequest = () => addTimeout(delays.send, timeoutHandler, 'send');
 			/* istanbul ignore next: hard to test */
 			if (socket.connecting) {
 				socket.once('connect', () => {
@@ -140,7 +145,6 @@ module.exports = (request, delays, options) => {
 	if (delays.response !== undefined) {
 		request.once('upload-complete', () => {
 			const cancelTimeout = addTimeout(delays.response, timeoutHandler, 'response');
-			cancelers.push(cancelTimeout);
 			request.once('response', cancelTimeout);
 		});
 	}