happy-dom 15.0.0 → 15.1.0

package/src/fetch/AbortSignal.ts

@@ -2,7 +2,7 @@ import EventTarget from '../event/EventTarget.js';
 import * as PropertySymbol from '../PropertySymbol.js';
 import Event from '../event/Event.js';
 import DOMExceptionNameEnum from '../exception/DOMExceptionNameEnum.js';
-import DOMException from '../exception/DOMException.js';
+import BrowserWindow from '../window/BrowserWindow.js';
 
 /**
  * AbortSignal.
@@ -10,10 +10,30 @@ import DOMException from '../exception/DOMException.js';
  * @see https://developer.mozilla.org/en-US/docs/Web/API/AbortSignal
  */
 export default class AbortSignal extends EventTarget {
+	// Injected by WindowClassExtender
+	protected declare static [PropertySymbol.window]: BrowserWindow;
+	protected declare [PropertySymbol.window]: BrowserWindow;
+
+	// Public properties
 	public readonly aborted: boolean = false;
 	public readonly reason: Error | null = null;
+
+	// Events
 	public onabort: ((this: AbortSignal, event: Event) => void) | null = null;
 
+	/**
+	 * Constructor.
+	 */
+	constructor() {
+		super();
+
+		if (!this[PropertySymbol.window]) {
+			throw new TypeError(
+				`Failed to construct '${this.constructor.name}': '${this.constructor.name}' was constructed outside a Window context.`
+			);
+		}
+	}
+
 	/**
 	 * Return a default description for the AbortSignal class.
 	 */
@@ -32,7 +52,10 @@ export default class AbortSignal extends EventTarget {
 		}
 		(<Error>this.reason) =
 			reason ||
-			new DOMException('signal is aborted without reason', DOMExceptionNameEnum.abortError);
+			new this[PropertySymbol.window].DOMException(
+				'signal is aborted without reason',
+				DOMExceptionNameEnum.abortError
+			);
 		(<boolean>this.aborted) = true;
 		this.dispatchEvent(new Event('abort'));
 	}
@@ -53,10 +76,13 @@ export default class AbortSignal extends EventTarget {
 	 * @returns AbortSignal instance.
 	 */
 	public static abort(reason?: Error): AbortSignal {
-		const signal = new AbortSignal();
+		const signal = new this[PropertySymbol.window].AbortSignal();
 		(<Error>signal.reason) =
 			reason ||
-			new DOMException('signal is aborted without reason', DOMExceptionNameEnum.abortError);
+			new this[PropertySymbol.window].DOMException(
+				'signal is aborted without reason',
+				DOMExceptionNameEnum.abortError
+			);
 		(<boolean>signal.aborted) = true;
 		return signal;
 	}

package/src/fetch/Fetch.ts

@@ -3,7 +3,6 @@ import * as PropertySymbol from '../PropertySymbol.js';
 import IRequestInfo from './types/IRequestInfo.js';
 import Headers from './Headers.js';
 import FetchRequestReferrerUtility from './utilities/FetchRequestReferrerUtility.js';
-import DOMException from '../exception/DOMException.js';
 import DOMExceptionNameEnum from '../exception/DOMExceptionNameEnum.js';
 import HTTP, { IncomingMessage } from 'http';
 import HTTPS from 'https';
@@ -85,7 +84,7 @@ export default class Fetch {
 		this.#window = options.window;
 		this.request =
 			typeof options.url === 'string' || options.url instanceof URL
-				? new options.browserFrame.window.Request(options.url, options.init)
+				? new options.window.Request(options.url, options.init)
 				: <Request>options.url;
 		if (options.contentType) {
 			(<string>this.request[PropertySymbol.contentType]) = options.contentType;
@@ -105,7 +104,10 @@ export default class Fetch {
 		FetchRequestValidationUtility.validateSchema(this.request);
 
 		if (this.request.signal.aborted) {
-			throw new DOMException('The operation was aborted.', DOMExceptionNameEnum.abortError);
+			throw new this.#window.DOMException(
+				'The operation was aborted.',
+				DOMExceptionNameEnum.abortError
+			);
 		}
 
 		if (this.request[PropertySymbol.url].protocol === 'data:') {
@@ -121,8 +123,12 @@ export default class Fetch {
 			this.request[PropertySymbol.url].protocol === 'http:' &&
 			this.#window.location.protocol === 'https:'
 		) {
-			throw new DOMException(
-				`Mixed Content: The page at '${this.#window.location.href}' was loaded over HTTPS, but requested an insecure XMLHttpRequest endpoint '${this.request.url}'. This request has been blocked; the content must be served over HTTPS.`,
+			throw new this.#window.DOMException(
+				`Mixed Content: The page at '${
+					this.#window.location.href
+				}' was loaded over HTTPS, but requested an insecure XMLHttpRequest endpoint '${
+					this.request.url
+				}'. This request has been blocked; the content must be served over HTTPS.`,
 				DOMExceptionNameEnum.securityError
 			);
 		}
@@ -142,7 +148,7 @@ export default class Fetch {
 				this.#window.console.warn(
 					`Cross-Origin Request Blocked: The Same Origin Policy dissallows reading the remote resource at "${this.request.url}".`
 				);
-				throw new DOMException(
+				throw new this.#window.DOMException(
 					`Cross-Origin Request Blocked: The Same Origin Policy dissallows reading the remote resource at "${this.request.url}".`,
 					DOMExceptionNameEnum.networkError
 				);
@@ -342,7 +348,7 @@ export default class Fetch {
 			);
 
 			if (this.resolve) {
-				throw new Error('Fetch already sent.');
+				throw new this.#window.Error('Fetch already sent.');
 			}
 
 			this.resolve = (response: Response | Promise<Response>): void => {
@@ -417,7 +423,10 @@ export default class Fetch {
 	private onSocket(socket: Socket): void {
 		const onSocketClose = (): void => {
 			if (this.isChunkedTransfer && !this.isProperLastChunkReceived) {
-				const error = new DOMException('Premature close.', DOMExceptionNameEnum.networkError);
+				const error = new this.#window.DOMException(
+					'Premature close.',
+					DOMExceptionNameEnum.networkError
+				);
 
 				if (this.response && this.response.body) {
 					this.response.body[PropertySymbol.error] = error;
@@ -469,8 +478,8 @@ export default class Fetch {
 		this.finalizeRequest();
 		this.#window.console.error(error);
 		this.reject(
-			new DOMException(
-				`Fetch to "${this.request.url}" failed. Error: ${error.message}`,
+			new this.#window.DOMException(
+				`Failed to execute "fetch()" on "Window" with URL "${this.request.url}": ${error.message}`,
 				DOMExceptionNameEnum.networkError
 			)
 		);
@@ -480,7 +489,20 @@ export default class Fetch {
 	 * Triggered when the async task manager aborts.
 	 */
 	private onAsyncTaskManagerAbort(): void {
-		const error = new DOMException('The operation was aborted.', DOMExceptionNameEnum.abortError);
+		const error = new this.#window.DOMException(
+			'The operation was aborted.',
+			DOMExceptionNameEnum.abortError
+		);
+
+		this.request[PropertySymbol.aborted] = true;
+
+		if (this.request.body) {
+			this.request.body[PropertySymbol.error] = error;
+		}
+
+		if (this.listeners.onSignalAbort) {
+			this.request.signal.removeEventListener('abort', this.listeners.onSignalAbort);
+		}
 
 		if (this.nodeRequest && !this.nodeRequest.destroyed) {
 			this.nodeRequest.destroy(error);
@@ -670,7 +692,7 @@ export default class Fetch {
 			case 'error':
 				this.finalizeRequest();
 				this.reject(
-					new DOMException(
+					new this.#window.DOMException(
 						`URI requested responds with a redirect, redirect mode is set to "error": ${this.request.url}`,
 						DOMExceptionNameEnum.abortError
 					)
@@ -693,7 +715,7 @@ export default class Fetch {
 					} catch {
 						this.finalizeRequest();
 						this.reject(
-							new DOMException(
+							new this.#window.DOMException(
 								`URI requested responds with an invalid redirect URL: ${locationHeader}`,
 								DOMExceptionNameEnum.uriMismatchError
 							)
@@ -709,7 +731,7 @@ export default class Fetch {
 				if (FetchResponseRedirectUtility.isMaxRedirectsReached(this.redirectCount)) {
 					this.finalizeRequest();
 					this.reject(
-						new DOMException(
+						new this.#window.DOMException(
 							`Maximum redirects reached at: ${this.request.url}`,
 							DOMExceptionNameEnum.networkError
 						)
@@ -777,7 +799,7 @@ export default class Fetch {
 			default:
 				this.finalizeRequest();
 				this.reject(
-					new DOMException(
+					new this.#window.DOMException(
 						`Redirect option '${this.request.redirect}' is not a valid value of IRequestRedirect`
 					)
 				);
@@ -799,11 +821,17 @@ export default class Fetch {
 	 * @param reason Reason.
 	 */
 	private abort(reason?: Error): void {
-		const error = new DOMException(
+		const error = new this.#window.DOMException(
 			'The operation was aborted.' + (reason ? ' ' + reason.toString() : ''),
 			DOMExceptionNameEnum.abortError
 		);
 
+		this.request[PropertySymbol.aborted] = true;
+
+		if (this.request.body) {
+			this.request.body[PropertySymbol.error] = error;
+		}
+
 		if (this.nodeRequest && !this.nodeRequest.destroyed) {
 			this.nodeRequest.destroy(error);
 		}

package/src/fetch/Request.ts

@@ -1,8 +1,6 @@
 import * as PropertySymbol from '../PropertySymbol.js';
-import Document from '../nodes/document/Document.js';
 import IRequestInit from './types/IRequestInit.js';
 import URL from '../url/URL.js';
-import DOMException from '../exception/DOMException.js';
 import DOMExceptionNameEnum from '../exception/DOMExceptionNameEnum.js';
 import IRequestInfo from './types/IRequestInfo.js';
 import Headers from './Headers.js';
@@ -18,8 +16,8 @@ import FetchRequestHeaderUtility from './utilities/FetchRequestHeaderUtility.js'
 import IRequestCredentials from './types/IRequestCredentials.js';
 import FormData from '../form-data/FormData.js';
 import MultipartFormDataParser from './multipart/MultipartFormDataParser.js';
-import AsyncTaskManager from '../async-task-manager/AsyncTaskManager.js';
 import BrowserWindow from '../window/BrowserWindow.js';
+import WindowBrowserContext from '../window/WindowBrowserContext.js';
 
 /**
  * Fetch request.
@@ -30,6 +28,9 @@ import BrowserWindow from '../window/BrowserWindow.js';
  * @see https://fetch.spec.whatwg.org/#request-class
  */
 export default class Request implements Request {
+	// Injected by WindowClassExtender
+	protected declare [PropertySymbol.window]: BrowserWindow;
+
 	// Public properties
 	public readonly method: string;
 	public readonly body: ReadableStream | null;
@@ -41,42 +42,39 @@ export default class Request implements Request {
 	public readonly credentials: IRequestCredentials;
 
 	// Internal properties
+	public [PropertySymbol.aborted]: boolean = false;
 	public [PropertySymbol.contentLength]: number | null = null;
 	public [PropertySymbol.contentType]: string | null = null;
 	public [PropertySymbol.referrer]: '' | 'no-referrer' | 'client' | URL = 'client';
 	public [PropertySymbol.url]: URL;
 	public [PropertySymbol.bodyBuffer]: Buffer | null;
 
-	// Private properties
-	readonly #window: BrowserWindow;
-	readonly #asyncTaskManager: AsyncTaskManager;
-
 	/**
 	 * Constructor.
 	 *
-	 * @param injected Injected properties.
-	 * @param injected.window
 	 * @param input Input.
-	 * @param injected.asyncTaskManager
 	 * @param [init] Init.
 	 */
-	constructor(
-		injected: { window: BrowserWindow; asyncTaskManager: AsyncTaskManager },
-		input: IRequestInfo,
-		init?: IRequestInit
-	) {
-		this.#window = injected.window;
-		this.#asyncTaskManager = injected.asyncTaskManager;
+	constructor(input: IRequestInfo, init?: IRequestInit) {
+		const window = this[PropertySymbol.window];
+
+		if (!window) {
+			throw new TypeError(
+				`Failed to construct 'Request': 'Request' was constructed outside a Window context.`
+			);
+		}
 
 		if (!input) {
-			throw new TypeError(`Failed to contruct 'Request': 1 argument required, only 0 present.`);
+			throw new window.TypeError(
+				`Failed to contruct 'Request': 1 argument required, only 0 present.`
+			);
 		}
 
 		this.method = (init?.method || (<Request>input).method || 'GET').toUpperCase();
 
 		const { stream, buffer, contentType, contentLength } = FetchBodyUtility.getBodyStream(
 			input instanceof Request && (input[PropertySymbol.bodyBuffer] || input.body)
-				? input[PropertySymbol.bodyBuffer] || FetchBodyUtility.cloneBodyStream(input)
+				? input[PropertySymbol.bodyBuffer] || FetchBodyUtility.cloneBodyStream(window, input)
 				: init?.body
 		);
 
@@ -106,9 +104,9 @@ export default class Request implements Request {
 		this.referrerPolicy = <IRequestReferrerPolicy>(
 			(init?.referrerPolicy || (<Request>input).referrerPolicy || '').toLowerCase()
 		);
-		this.signal = init?.signal || (<Request>input).signal || new AbortSignal();
+		this.signal = init?.signal || (<Request>input).signal || new window.AbortSignal();
 		this[PropertySymbol.referrer] = FetchRequestReferrerUtility.getInitialReferrer(
-			injected.window,
+			window,
 			init?.referrer !== null && init?.referrer !== undefined
 				? init?.referrer
 				: (<Request>input).referrer
@@ -119,16 +117,16 @@ export default class Request implements Request {
 		} else {
 			try {
 				if (input instanceof Request && input.url) {
-					this[PropertySymbol.url] = new URL(input.url, injected.window.location.href);
+					this[PropertySymbol.url] = new URL(input.url, window.location.href);
 				} else {
-					this[PropertySymbol.url] = new URL(<string>input, injected.window.location.href);
+					this[PropertySymbol.url] = new URL(<string>input, window.location.href);
 				}
 			} catch (error) {
-				throw new DOMException(
-					`Failed to construct 'Request. Invalid URL "${input}" on document location '${
-						injected.window.location
+				throw new window.DOMException(
+					`Failed to construct 'Request': Invalid URL "${input}" on document location '${
+						window.location
 					}'.${
-						injected.window.location.origin === 'null'
+						window.location.origin === 'null'
 							? ' Relative URLs are not permitted on current document location.'
 							: ''
 					}`,
@@ -144,13 +142,6 @@ export default class Request implements Request {
 		FetchRequestValidationUtility.validateRedirect(this.redirect);
 	}
 
-	/**
-	 * Returns owner document.
-	 */
-	protected get [PropertySymbol.ownerDocument](): Document {
-		throw new Error('[PropertySymbol.ownerDocument] getter needs to be implemented by sub-class.');
-	}
-
 	/**
 	 * Returns referrer.
 	 *
@@ -192,26 +183,35 @@ export default class Request implements Request {
 	 * @returns Array buffer.
 	 */
 	public async arrayBuffer(): Promise<ArrayBuffer> {
+		const window = this[PropertySymbol.window];
+
 		if (this.bodyUsed) {
-			throw new DOMException(
+			throw new window.DOMException(
 				`Body has already been used for "${this.url}".`,
 				DOMExceptionNameEnum.invalidStateError
 			);
 		}
 
+		const asyncTaskManager = new WindowBrowserContext(window).getAsyncTaskManager();
+
 		(<boolean>this.bodyUsed) = true;
 
-		const taskID = this.#asyncTaskManager.startTask(() => this.signal[PropertySymbol.abort]());
+		const taskID = asyncTaskManager.startTask(() => {
+			if (this.body) {
+				this.body[PropertySymbol.aborted] = true;
+			}
+			this.signal[PropertySymbol.abort]();
+		});
 		let buffer: Buffer;
 
 		try {
-			buffer = await FetchBodyUtility.consumeBodyStream(this.body);
+			buffer = await FetchBodyUtility.consumeBodyStream(window, this.body);
 		} catch (error) {
-			this.#asyncTaskManager.endTask(taskID);
+			asyncTaskManager.endTask(taskID);
 			throw error;
 		}
 
-		this.#asyncTaskManager.endTask(taskID);
+		asyncTaskManager.endTask(taskID);
 
 		return buffer.buffer.slice(buffer.byteOffset, buffer.byteOffset + buffer.byteLength);
 	}
@@ -234,26 +234,35 @@ export default class Request implements Request {
 	 * @returns Buffer.
 	 */
 	public async buffer(): Promise<Buffer> {
+		const window = this[PropertySymbol.window];
+
 		if (this.bodyUsed) {
-			throw new DOMException(
+			throw new window.DOMException(
 				`Body has already been used for "${this.url}".`,
 				DOMExceptionNameEnum.invalidStateError
 			);
 		}
 
+		const asyncTaskManager = new WindowBrowserContext(window).getAsyncTaskManager();
+
 		(<boolean>this.bodyUsed) = true;
 
-		const taskID = this.#asyncTaskManager.startTask(() => this.signal[PropertySymbol.abort]());
+		const taskID = asyncTaskManager.startTask(() => {
+			if (this.body) {
+				this.body[PropertySymbol.aborted] = true;
+			}
+			this.signal[PropertySymbol.abort]();
+		});
 		let buffer: Buffer;
 
 		try {
-			buffer = await FetchBodyUtility.consumeBodyStream(this.body);
+			buffer = await FetchBodyUtility.consumeBodyStream(window, this.body);
 		} catch (error) {
-			this.#asyncTaskManager.endTask(taskID);
+			asyncTaskManager.endTask(taskID);
 			throw error;
 		}
 
-		this.#asyncTaskManager.endTask(taskID);
+		asyncTaskManager.endTask(taskID);
 
 		return buffer;
 	}
@@ -264,26 +273,35 @@ export default class Request implements Request {
 	 * @returns Text.
 	 */
 	public async text(): Promise<string> {
+		const window = this[PropertySymbol.window];
+
 		if (this.bodyUsed) {
-			throw new DOMException(
+			throw new window.DOMException(
 				`Body has already been used for "${this.url}".`,
 				DOMExceptionNameEnum.invalidStateError
 			);
 		}
 
+		const asyncTaskManager = new WindowBrowserContext(window).getAsyncTaskManager();
+
 		(<boolean>this.bodyUsed) = true;
 
-		const taskID = this.#asyncTaskManager.startTask(() => this.signal[PropertySymbol.abort]());
+		const taskID = asyncTaskManager.startTask(() => {
+			if (this.body) {
+				this.body[PropertySymbol.aborted] = true;
+			}
+			this.signal[PropertySymbol.abort]();
+		});
 		let buffer: Buffer;
 
 		try {
-			buffer = await FetchBodyUtility.consumeBodyStream(this.body);
+			buffer = await FetchBodyUtility.consumeBodyStream(window, this.body);
 		} catch (error) {
-			this.#asyncTaskManager.endTask(taskID);
+			asyncTaskManager.endTask(taskID);
 			throw error;
 		}
 
-		this.#asyncTaskManager.endTask(taskID);
+		asyncTaskManager.endTask(taskID);
 
 		return new TextDecoder().decode(buffer);
 	}
@@ -304,12 +322,13 @@ export default class Request implements Request {
 	 * @returns FormData.
 	 */
 	public async formData(): Promise<FormData> {
+		const window = this[PropertySymbol.window];
+		const asyncTaskManager = new WindowBrowserContext(window).getAsyncTaskManager();
 		const contentType = this[PropertySymbol.contentType];
-		const asyncTaskManager = this.#asyncTaskManager;
 
 		if (/multipart/i.test(contentType)) {
 			if (this.bodyUsed) {
-				throw new DOMException(
+				throw new window.DOMException(
 					`Body has already been used for "${this.url}".`,
 					DOMExceptionNameEnum.invalidStateError
 				);
@@ -317,11 +336,20 @@ export default class Request implements Request {
 
 			(<boolean>this.bodyUsed) = true;
 
-			const taskID = asyncTaskManager.startTask(() => this.signal[PropertySymbol.abort]());
+			const taskID = asyncTaskManager.startTask(() => {
+				if (this.body) {
+					this.body[PropertySymbol.aborted] = true;
+				}
+				this.signal[PropertySymbol.abort]();
+			});
 			let formData: FormData;
 
 			try {
-				const result = await MultipartFormDataParser.streamToFormData(this.body, contentType);
+				const result = await MultipartFormDataParser.streamToFormData(
+					window,
+					this.body,
+					contentType
+				);
 				formData = result.formData;
 			} catch (error) {
 				asyncTaskManager.endTask(taskID);
@@ -344,7 +372,7 @@ export default class Request implements Request {
 			return formData;
 		}
 
-		throw new DOMException(
+		throw new window.DOMException(
 			`Failed to construct FormData object: The "content-type" header is neither "application/x-www-form-urlencoded" nor "multipart/form-data".`,
 			DOMExceptionNameEnum.invalidStateError
 		);
@@ -356,6 +384,6 @@ export default class Request implements Request {
 	 * @returns Clone.
 	 */
 	public clone(): Request {
-		return new this.#window.Request(this);
+		return new this[PropertySymbol.window].Request(this);
 	}
 }

package/src/fetch/ResourceFetch.ts

@@ -1,4 +1,3 @@
-import DOMException from '../exception/DOMException.js';
 import BrowserWindow from '../window/BrowserWindow.js';
 import URL from '../url/URL.js';
 import IBrowserFrame from '../browser/types/IBrowserFrame.js';
@@ -40,7 +39,7 @@ export default class ResourceFetch {
 		const response = await fetch.send();
 
 		if (!response.ok) {
-			throw new DOMException(
+			throw new this.window.DOMException(
 				`Failed to perform request to "${new URL(url, this.window.location.href).href}". Status ${
 					response.status
 				} ${response.statusText}.`
@@ -67,7 +66,7 @@ export default class ResourceFetch {
 		const response = fetch.send();
 
 		if (!response.ok) {
-			throw new DOMException(
+			throw new this.window.DOMException(
 				`Failed to perform request to "${new URL(url, this.window.location.href).href}". Status ${
 					response.status
 				} ${response.statusText}.`