Don't continue the request after cancellation (#464)

szmarczak · sindresorhus · commit 9a646a39e676 · 2018-03-09T23:53:18.000+07:00
diff --git a/index.js b/index.js
@@ -160,9 +160,18 @@ function requestAsEventEmitter(opts) {
 		});
 
 		cacheReq.once('request', req => {
+			let aborted = false;
+			req.once('abort', _ => {
+				aborted = true;
+			});
+
 			req.once('error', err => {
 				clearInterval(progressInterval);
 
+				if (aborted) {
+					return;
+				}
+
 				const backoff = opts.retries(++retryCount, err);
 
 				if (backoff) {
diff --git a/test/cancel.js b/test/cancel.js
@@ -21,14 +21,43 @@ async function createAbortServer() {
 				res.end();
 			});
 		});
+
+		s.on('/redirect', (req, res) => {
+			res.writeHead(302, {
+				location: `${s.url}/abort`
+			});
+			res.end();
+
+			ee.emit('sentRedirect');
+
+			setTimeout(resolve, 3000);
+		});
 	});
 
 	await s.listen(s.port);
 	ee.url = `${s.url}/abort`;
+	ee.redirectUrl = `${s.url}/redirect`;
 
 	return ee;
 }
 
+test('cancel do not retry after cancelation', async t => {
+	const helper = await createAbortServer();
+
+	const p = got(helper.redirectUrl, {
+		retries: _ => {
+			t.fail('Makes a new try after cancelation');
+		}
+	});
+
+	helper.on('sentRedirect', () => {
+		p.cancel();
+	});
+
+	await t.throws(p, PCancelable.CancelError);
+	await t.notThrows(helper.aborted, 'Request finished instead of aborting.');
+});
+
 test('cancel in-progress request', async t => {
 	const helper = await createAbortServer();
 	const body = new Readable({
