Revert "Restore logic and fix tests"

This reverts commit 723b960.
sindresorhus · May 13, 2022 · 63f7b08 · 63f7b08
1 parent 723b960
commit 63f7b08
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 58 deletions.
diff --git a/source/as-promise/index.ts b/source/as-promise/index.ts
@@ -5,7 +5,6 @@ import {
 	RequestError,
 	HTTPError,
 	RetryError,
-	AbortError,
 } from '../core/errors.js';
 import Request from '../core/index.js';
 import {parseBody, isResponseOk} from '../core/response.js';
@@ -23,37 +22,13 @@ const proxiedRequestEvents = [
 	'downloadProgress',
 ];
 
-// eslint-disable-next-line @typescript-eslint/naming-convention
-const getDOMException = (errorMessage: string) => globalThis.DOMException === undefined
-	? new AbortError(errorMessage)
-	: new DOMException(errorMessage);
-
-const getAbortedReason = (signal: AbortSignal) => {
-	// To do: Remove below any castings when '@types/node' targets 18
-	const reason = (signal as any).reason === undefined
-		? getDOMException('This operation was aborted.')
-		: (signal as any).reason;
-
-	return reason instanceof Error ? reason : getDOMException(reason);
-};
-
-export default function asPromise<T>(firstRequest?: Request, signal?: AbortSignal): CancelableRequest<T> {
+export default function asPromise<T>(firstRequest?: Request): CancelableRequest<T> {
 	let globalRequest: Request;
 	let globalResponse: Response;
 	let normalizedOptions: Options;
 	const emitter = new EventEmitter();
 
 	const promise = new PCancelable<T>((resolve, reject, onCancel) => {
-		if (signal) {
-			if (signal.aborted) {
-				reject(getAbortedReason(signal));
-			}
-
-			signal.addEventListener('abort', () => {
-				reject(getAbortedReason(signal));
-			});
-		}
-
 		onCancel(() => {
 			globalRequest.destroy();
 		});

diff --git a/source/core/errors.ts b/source/core/errors.ts
@@ -170,15 +170,3 @@ export class RetryError extends RequestError {
 		this.code = 'ERR_RETRYING';
 	}
 }
-
-/**
-An error to be thrown when the request is aborted by AbortController.
-DOMException is thrown instead of this Error when DOMException is available.
-*/
-export class AbortError extends Error {
-	constructor(message: string) {
-		super();
-		this.name = 'AbortError';
-		this.message = message;
-	}
-}
diff --git a/source/core/index.ts b/source/core/index.ts
@@ -31,7 +31,6 @@ import {
 	TimeoutError,
 	UploadError,
 	CacheError,
-	AbortError,
 } from './errors.js';
 import type {PlainResponse} from './response.js';
 import type {PromiseCookieJar, NativeRequestOptions, RetryOptions} from './options.js';
@@ -237,7 +236,7 @@ export default class Request extends Duplex implements RequestEvents<Request> {
 		}
 
 		this.options.signal?.addEventListener('abort', () => {
-			this.destroy(new AbortError('This operation was aborted.'));
+			this.destroy(new Error('This operation was aborted.'));
 		});
 
 		// Important! If you replace `body` in a handler with another stream, make sure it's readable first.

diff --git a/source/create.ts b/source/create.ts
@@ -25,20 +25,6 @@ const delay = async (ms: number) => new Promise(resolve => {
 
 const isGotInstance = (value: Got | ExtendOptions): value is Got => is.function_(value);
 
-const getSignal = (url: string | URL | OptionsInit | undefined, options?: OptionsInit): AbortSignal | undefined => {
-	let signal;
-
-	if (typeof url === 'object' && 'signal' in (url as OptionsInit)) {
-		signal = (url as OptionsInit).signal;
-	}
-
-	if (options?.signal) {
-		signal = options.signal;
-	}
-
-	return signal;
-};
-
 const aliases: readonly HTTPAlias[] = [
 	'get',
 	'post',
@@ -66,8 +52,6 @@ const create = (defaults: InstanceDefaults): Got => {
 		const request = new Request(url, options, defaultOptions);
 		let promise: CancelableRequest | undefined;
 
-		const signal = getSignal(url, options);
-
 		const lastHandler = (normalized: Options): GotReturn => {
 			// Note: `options` is `undefined` when `new Options(...)` fails
 			request.options = normalized;
@@ -79,7 +63,7 @@ const create = (defaults: InstanceDefaults): Got => {
 			}
 
 			if (!promise) {
-				promise = asPromise(request, signal);
+				promise = asPromise(request);
 			}
 
 			return promise;
@@ -93,7 +77,7 @@ const create = (defaults: InstanceDefaults): Got => {
 
 			if (is.promise(result) && !request.options.isStream) {
 				if (!promise) {
-					promise = asPromise(request, signal);
+					promise = asPromise(request);
 				}
 
 				if (result !== promise) {