happy-dom 17.6.3 → 18.0.0

package/src/fetch/SyncFetch.ts

@@ -43,7 +43,7 @@ export default class SyncFetch {
 	private redirectCount = 0;
 	private disableCache: boolean;
 	private disableSameOriginPolicy: boolean;
-	private interceptor?: IFetchInterceptor;
+	private interceptor?: IFetchInterceptor | null;
 	#browserFrame: IBrowserFrame;
 	#window: BrowserWindow;
 	#unfilteredHeaders: Headers | null = null;
@@ -68,7 +68,7 @@ export default class SyncFetch {
 		url: IRequestInfo;
 		init?: IRequestInit;
 		redirectCount?: number;
-		contentType?: string;
+		contentType?: string | null;
 		disableCache?: boolean;
 		disableSameOriginPolicy?: boolean;
 		unfilteredHeaders?: Headers;
@@ -117,7 +117,7 @@ export default class SyncFetch {
 			if (this.request.signal[PropertySymbol.reason] !== undefined) {
 				throw this.request.signal[PropertySymbol.reason];
 			}
-			throw new this[PropertySymbol.window].DOMException(
+			throw new this.#window.DOMException(
 				'signal is aborted without reason',
 				DOMExceptionNameEnum.abortError
 			);
@@ -284,10 +284,10 @@ export default class SyncFetch {
 		}
 
 		if (this.request.method !== 'GET') {
-			this.#browserFrame?.page?.console.error(
+			this.#browserFrame.page.console.error(
 				`${this.request.method} ${this.request.url} 404 (Not Found)`
 			);
-			const response = VirtualServerUtility.getNotFoundSyncResponse(this.#window);
+			const response = VirtualServerUtility.getNotFoundSyncResponse(this.#window, this.request.url);
 			const interceptedResponse = this.interceptor?.afterSyncResponse
 				? this.interceptor.afterSyncResponse({
 						window: this.#window,
@@ -303,10 +303,10 @@ export default class SyncFetch {
 			const stat = FS.statSync(filePath);
 			buffer = FS.readFileSync(stat.isDirectory() ? Path.join(filePath, 'index.html') : filePath);
 		} catch {
-			this.#browserFrame?.page?.console.error(
+			this.#browserFrame.page.console.error(
 				`${this.request.method} ${this.request.url} 404 (Not Found)`
 			);
-			const response = VirtualServerUtility.getNotFoundSyncResponse(this.#window);
+			const response = VirtualServerUtility.getNotFoundSyncResponse(this.#window, this.request.url);
 			const interceptedResponse = this.interceptor?.afterSyncResponse
 				? this.interceptor.afterSyncResponse({
 						window: this.#window,
@@ -425,7 +425,7 @@ export default class SyncFetch {
 		const allowMethods: string[] = [];
 
 		if (response.headers.has('Access-Control-Allow-Methods')) {
-			const allowMethodsHeader = response.headers.get('Access-Control-Allow-Methods');
+			const allowMethodsHeader = response.headers.get('Access-Control-Allow-Methods')!;
 			if (allowMethodsHeader !== '*') {
 				for (const method of allowMethodsHeader.split(',')) {
 					allowMethods.push(method.trim().toUpperCase());
@@ -534,7 +534,7 @@ export default class SyncFetch {
 		const returnResponse =
 			typeof interceptedResponse === 'object' ? interceptedResponse : redirectedResponse;
 		if (!returnResponse.ok) {
-			this.#browserFrame?.page?.console.error(
+			this.#browserFrame.page.console.error(
 				`${this.request.method} ${this.request.url} ${returnResponse.status} (${returnResponse.statusText})`
 			);
 		}
@@ -585,7 +585,7 @@ export default class SyncFetch {
 			}
 		} catch (error) {
 			throw new this.#window.DOMException(
-				`Failed to read response body. Error: ${error.message}.`,
+				`Failed to read response body. Error: ${(<Error>error).message}.`,
 				DOMExceptionNameEnum.encodingError
 			);
 		}
@@ -617,7 +617,7 @@ export default class SyncFetch {
 				const shouldBecomeGetRequest =
 					response.status === 303 ||
 					((response.status === 301 || response.status === 302) && this.request.method === 'POST');
-				let locationURL: URL = null;
+				let locationURL: URL | null = null;
 
 				if (locationHeader !== null) {
 					try {
@@ -682,9 +682,7 @@ export default class SyncFetch {
 					url: locationURL,
 					init: requestInit,
 					redirectCount: this.redirectCount + 1,
-					contentType: !shouldBecomeGetRequest
-						? this.request[PropertySymbol.contentType]
-						: undefined
+					contentType: !shouldBecomeGetRequest ? this.request[PropertySymbol.contentType] : null
 				});
 
 				return fetch.send();

package/src/fetch/cache/preflight/PreflightResponseCache.ts

@@ -41,7 +41,7 @@ export default class PreflightResponseCache implements IPreflightResponseCache {
 	public add(
 		request: ICachablePreflightRequest,
 		response: ICachablePreflightResponse
-	): ICachedPreflightResponse {
+	): ICachedPreflightResponse | null {
 		delete this.#entries[request.url];
 
 		if (request.headers.get('Cache-Control')?.includes('no-cache')) {
@@ -64,7 +64,7 @@ export default class PreflightResponseCache implements IPreflightResponseCache {
 		if (response.headers.has('Access-Control-Allow-Methods')) {
 			const allowMethodsHeader = response.headers.get('Access-Control-Allow-Methods');
 			if (allowMethodsHeader !== '*') {
-				for (const method of response.headers.get('Access-Control-Allow-Methods').split(',')) {
+				for (const method of response.headers.get('Access-Control-Allow-Methods')!.split(',')) {
 					allowMethods.push(method.trim().toUpperCase());
 				}
 			}

package/src/fetch/cache/response/ResponseCache.ts

@@ -65,7 +65,7 @@ export default class ResponseCache implements IResponseCache {
 	 * @param response Response.
 	 * @returns Cached response.
 	 */
-	public add(request: ICachableRequest, response: ICachableResponse): ICachedResponse {
+	public add(request: ICachableRequest, response: ICachableResponse): ICachedResponse | null {
 		// We should only cache GET and HEAD requests.
 		if (
 			(request.method !== 'GET' && request.method !== 'HEAD') ||
@@ -84,7 +84,7 @@ export default class ResponseCache implements IResponseCache {
 
 			for (const name of UPDATE_RESPONSE_HEADERS) {
 				if (response.headers.has(name)) {
-					cachedResponse.response.headers.set(name, response.headers.get(name));
+					cachedResponse.response.headers.set(name, response.headers.get(name)!);
 				}
 			}
 
@@ -129,7 +129,7 @@ export default class ResponseCache implements IResponseCache {
 		if (response.headers.has('Cache-Control')) {
 			const age = response.headers.get('Age');
 
-			for (const part of response.headers.get('Cache-Control').split(',')) {
+			for (const part of response.headers.get('Cache-Control')!.split(',')) {
 				const [key, value] = part.trim().split('=');
 				switch (key) {
 					case 'max-age':
@@ -154,11 +154,11 @@ export default class ResponseCache implements IResponseCache {
 		}
 
 		if (response.headers.has('Last-Modified')) {
-			cachedResponse.lastModified = Date.parse(response.headers.get('Last-Modified'));
+			cachedResponse.lastModified = Date.parse(response.headers.get('Last-Modified')!);
 		}
 
 		if (response.headers.has('Vary')) {
-			for (const header of response.headers.get('Vary').split(',')) {
+			for (const header of response.headers.get('Vary')!.split(',')) {
 				const name = header.trim();
 				const value = request.headers.get(name);
 				if (value) {

package/src/fetch/multipart/MultipartFormDataParser.ts

@@ -17,13 +17,20 @@ export default class MultipartFormDataParser {
 	 * Returns form data.
 	 *
 	 * @param window Window.
-	 * @param body Body.
+	 * @param response Response object containing a body stream.
+	 * @param response.body Body stream.
+	 * @param requestOrResponse
+	 * @param requestOrResponse.body
 	 * @param contentType Content type header value.
 	 * @returns Form data.
 	 */
 	public static async streamToFormData(
 		window: BrowserWindow,
-		body: ReadableStream,
+		requestOrResponse: {
+			body: ReadableStream<Uint8Array> | null;
+			[PropertySymbol.error]: Error | null;
+			[PropertySymbol.aborted]: boolean;
+		},
 		contentType: string
 	): Promise<{ formData: FormData; buffer: Buffer }> {
 		if (!/multipart/i.test(contentType)) {
@@ -33,6 +40,15 @@ export default class MultipartFormDataParser {
 			);
 		}
 
+		const body = requestOrResponse.body;
+
+		if (!body) {
+			throw new window.DOMException(
+				'Failed to build FormData object: The response body is null.',
+				DOMExceptionNameEnum.invalidStateError
+			);
+		}
+
 		const match = contentType.match(/boundary=(?:"([^"]+)"|([^;]+))/i);
 
 		if (!match) {
@@ -44,17 +60,17 @@ export default class MultipartFormDataParser {
 
 		const bodyReader = body.getReader();
 		const reader = new MultipartReader(window, match[1] || match[2]);
-		const chunks = [];
+		const chunks: any[] = [];
 		let buffer: Buffer;
 		const bytes = 0;
 
 		let readResult = await bodyReader.read();
 
 		while (!readResult.done) {
-			if (body[PropertySymbol.error]) {
-				throw body[PropertySymbol.error];
+			if (requestOrResponse[PropertySymbol.error]) {
+				throw requestOrResponse[PropertySymbol.error];
 			}
-			if (body[PropertySymbol.aborted]) {
+			if (requestOrResponse[PropertySymbol.aborted]) {
 				throw new window.DOMException(
 					'Failed to read response body: The stream was aborted.',
 					DOMExceptionNameEnum.abortError
@@ -69,7 +85,7 @@ export default class MultipartFormDataParser {
 				typeof chunks[0] === 'string' ? Buffer.from(chunks.join('')) : Buffer.concat(chunks, bytes);
 		} catch (error) {
 			throw new window.DOMException(
-				`Could not create Buffer from response body. Error: ${error.message}.`,
+				`Could not create Buffer from response body. Error: ${(<Error>error).message}.`,
 				DOMExceptionNameEnum.invalidStateError
 			);
 		}

package/src/fetch/multipart/MultipartReader.ts

@@ -131,10 +131,10 @@ export default class MultipartReader {
 
 						if (this.data.value.length) {
 							this.appendFormData(
-								this.data.contentDisposition.name,
+								this.data.contentDisposition!.name,
 								Buffer.from(this.data.value.slice(0, -(this.boundary.length + 1))),
-								this.data.contentDisposition.filename,
-								this.data.contentType
+								this.data.contentDisposition!.filename,
+								this.data.contentType!
 							);
 
 							this.data.value = [];
@@ -164,7 +164,7 @@ export default class MultipartReader {
 				this.data.contentDisposition.name,
 				Buffer.from(this.data.value.slice(0, -2)),
 				this.data.contentDisposition.filename,
-				this.data.contentType
+				this.data.contentType!
 			);
 		}
 
@@ -205,7 +205,7 @@ export default class MultipartReader {
 	private getContentDisposition(headerValue: string): { [key: string]: string } {
 		const regex = /([a-z]+) *= *"([^"]+)"/g;
 		const contentDisposition: { [key: string]: string } = {};
-		let match: RegExpExecArray;
+		let match: RegExpExecArray | null;
 
 		while ((match = regex.exec(headerValue))) {
 			contentDisposition[match[1]] = match[2];

package/src/fetch/preload/PreloadEntry.ts

@@ -9,8 +9,10 @@ export default class PreloadEntry {
 	public integrityMetadata: string | null = null;
 	public response: Response | null = null;
 	public error: Error | null = null;
-	#callback: { resolve: (response: Response) => void; reject: (error: Error) => void } | null =
-		null;
+	#callback: {
+		resolve: (response: Response) => void;
+		reject: (error: Error) => void;
+	} | null = null;
 
 	/**
 	 * On response available.
@@ -29,7 +31,7 @@ export default class PreloadEntry {
 	 * @param error
 	 * @param response
 	 */
-	public responseAvailable(error: Error | null, response: Response): void {
+	public responseAvailable(error: Error | null, response: Response | null): void {
 		this.response = response;
 		this.error = error;
 
@@ -39,6 +41,8 @@ export default class PreloadEntry {
 
 		if (error) {
 			this.#callback.reject(error);
+		} else if (!response) {
+			this.#callback.reject(new Error('Response is null'));
 		} else {
 			this.#callback.resolve(response);
 		}

package/src/fetch/types/ISyncResponse.ts

@@ -12,5 +12,5 @@ export default interface ISyncResponse {
 	url: string;
 	redirected: boolean;
 	headers: Headers;
-	body: Buffer;
+	body: Buffer | null;
 }

package/src/fetch/utilities/FetchBodyUtility.ts

@@ -26,7 +26,7 @@ export default class FetchBodyUtility {
 	 * @returns Stream and type.
 	 */
 	public static getBodyStream(body: IRequestBody | IResponseBody): {
-		contentType: string;
+		contentType: string | null;
 		contentLength: number | null;
 		stream: ReadableStream | null;
 		buffer: Buffer | null;
@@ -107,10 +107,11 @@ export default class FetchBodyUtility {
 	public static cloneBodyStream(
 		window: BrowserWindow,
 		requestOrResponse: {
+			[PropertySymbol.buffer]?: Buffer | null;
 			body: ReadableStream | null;
 			bodyUsed: boolean;
 		}
-	): ReadableStream {
+	): ReadableStream | null {
 		if (requestOrResponse.bodyUsed) {
 			throw new window.DOMException(
 				`Failed to clone body stream of request: Request body is already used.`,
@@ -128,11 +129,11 @@ export default class FetchBodyUtility {
 		}
 
 		// Pipe underlying node stream if it exists.
-		if (requestOrResponse.body[PropertySymbol.nodeStream]) {
+		if ((<any>requestOrResponse.body)[PropertySymbol.nodeStream]) {
 			const stream1 = new Stream.PassThrough();
 			const stream2 = new Stream.PassThrough();
-			requestOrResponse.body[PropertySymbol.nodeStream].pipe(stream1);
-			requestOrResponse.body[PropertySymbol.nodeStream].pipe(stream2);
+			(<any>requestOrResponse.body)[PropertySymbol.nodeStream].pipe(stream1);
+			(<any>requestOrResponse.body)[PropertySymbol.nodeStream].pipe(stream2);
 			// Sets the body of the cloned request/response to the first pass through stream.
 			requestOrResponse.body = this.nodeToWebStream(stream1);
 			// Returns the clone.
@@ -159,19 +160,27 @@ export default class FetchBodyUtility {
 	 *
 	 * @see https://fetch.spec.whatwg.org/#concept-body-consume-body
 	 * @param window Window.
+	 * @param requestOrResponse
+	 * @param requestOrResponse.body
 	 * @param body Body stream.
 	 * @returns Promise.
 	 */
 	public static async consumeBodyStream(
 		window: BrowserWindow,
-		body: ReadableStream | null
+		requestOrResponse: {
+			body: ReadableStream | null;
+			[PropertySymbol.aborted]: boolean;
+			[PropertySymbol.error]: Error | null;
+		}
 	): Promise<Buffer> {
+		const body = requestOrResponse.body;
+
 		if (body === null || !(body instanceof ReadableStream)) {
 			return Buffer.alloc(0);
 		}
 
-		if (body[PropertySymbol.error]) {
-			throw body[PropertySymbol.error];
+		if (requestOrResponse[PropertySymbol.error]) {
+			throw requestOrResponse[PropertySymbol.error];
 		}
 
 		const reader = body.getReader();
@@ -181,10 +190,10 @@ export default class FetchBodyUtility {
 		try {
 			let readResult = await reader.read();
 			while (!readResult.done) {
-				if (body[PropertySymbol.error]) {
-					throw body[PropertySymbol.error];
+				if (requestOrResponse[PropertySymbol.error]) {
+					throw requestOrResponse[PropertySymbol.error];
 				}
-				if (body[PropertySymbol.aborted]) {
+				if (requestOrResponse[PropertySymbol.aborted]) {
 					throw new window.DOMException(
 						'Failed to read response body: The stream was aborted.',
 						DOMExceptionNameEnum.abortError
@@ -200,7 +209,7 @@ export default class FetchBodyUtility {
 				throw error;
 			}
 			throw new window.DOMException(
-				`Failed to read response body. Error: ${error.message}.`,
+				`Failed to read response body. Error: ${(<Error>error).message}.`,
 				DOMExceptionNameEnum.encodingError
 			);
 		}
@@ -213,7 +222,7 @@ export default class FetchBodyUtility {
 			return Buffer.concat(chunks, bytes);
 		} catch (error) {
 			throw new window.DOMException(
-				`Could not create Buffer from response body. Error: ${error.message}.`,
+				`Could not create Buffer from response body. Error: ${(<Error>error).message}.`,
 				DOMExceptionNameEnum.invalidStateError
 			);
 		}
@@ -227,7 +236,7 @@ export default class FetchBodyUtility {
 	 * @param value The value to be wrapped in a ReadableStream.
 	 * @returns ReadableStream
 	 */
-	public static toReadableStream(value): ReadableStream {
+	public static toReadableStream(value: any): ReadableStream {
 		return new ReadableStream({
 			start(controller) {
 				controller.enqueue(value);
@@ -261,7 +270,7 @@ export default class FetchBodyUtility {
 				});
 			}
 		});
-		readableStream[PropertySymbol.nodeStream] = nodeStream;
+		(<any>readableStream)[PropertySymbol.nodeStream] = nodeStream;
 		return readableStream;
 	}
 }

package/src/fetch/utilities/FetchRequestHeaderUtility.ts

@@ -76,7 +76,7 @@ export default class FetchRequestHeaderUtility {
 		browserFrame: IBrowserFrame;
 		window: BrowserWindow;
 		request: Request;
-		baseHeaders?: Headers;
+		baseHeaders?: Headers | null;
 	}): { [key: string]: string } {
 		const headers = new Headers(options.baseHeaders);
 		options.request.headers.forEach((value, key) => {
@@ -136,7 +136,7 @@ export default class FetchRequestHeaderUtility {
 		}
 
 		// We need to convert the headers to Node request headers.
-		const httpRequestHeaders = {};
+		const httpRequestHeaders: { [name: string]: string } = {};
 
 		for (const header of Object.values(headers[PropertySymbol.entries])) {
 			httpRequestHeaders[header.name] = header.value.join(', ');

package/src/fetch/utilities/FetchResponseHeaderUtility.ts

@@ -32,9 +32,10 @@ export default class FetchResponseHeaderUtility {
 				// Handles setting cookie headers to the document.
 				// "Set-Cookie" and "Set-Cookie2" are not allowed in response headers according to spec.
 				if (lowerName === 'set-cookie' || lowerName === 'set-cookie2') {
-					options.browserFrame.page.context.cookieContainer.addCookies([
-						CookieStringUtility.stringToCookie(options.requestURL, header)
-					]);
+					const cookie = CookieStringUtility.stringToCookie(options.requestURL, header);
+					if (cookie) {
+						options.browserFrame.page.context.cookieContainer.addCookies([cookie]);
+					}
 				} else {
 					headers.append(key, header);
 				}

package/src/fetch/utilities/SyncFetchScriptBuilder.ts

@@ -23,7 +23,7 @@ export default class SyncFetchScriptBuilder {
 		disableStrictSSL?: boolean;
 		body?: Buffer | null;
 	}): string {
-		const sortedHeaders = {};
+		const sortedHeaders: { [name: string]: string } = {};
 		const headerNames = Object.keys(request.headers).sort();
 
 		for (const name of headerNames) {

package/src/fetch/utilities/VirtualServerUtility.ts

@@ -23,7 +23,7 @@ export default class VirtualServerUtility {
 			return null;
 		}
 		for (const virtualServer of browserSettings.fetch.virtualServers) {
-			let baseURL: URL;
+			let baseURL: URL | null = null;
 			if (typeof virtualServer.url === 'string') {
 				const url = new URL(
 					virtualServer.url[virtualServer.url.length - 1] === '/'
@@ -71,14 +71,15 @@ export default class VirtualServerUtility {
 	 * Returns a 404 response.
 	 *
 	 * @param window Window.
+	 * @param requestURL Request URL.
 	 * @returns 404 response.
 	 */
-	public static getNotFoundSyncResponse(window: BrowserWindow): ISyncResponse {
+	public static getNotFoundSyncResponse(window: BrowserWindow, requestURL: string): ISyncResponse {
 		return <ISyncResponse>{
 			status: 404,
 			statusText: 'Not Found',
 			ok: false,
-			url: null,
+			url: requestURL,
 			redirected: false,
 			headers: new window.Headers({
 				'Content-Type': 'text/html'

package/src/file/Blob.ts

@@ -11,7 +11,7 @@ import * as PropertySymbol from '../PropertySymbol.js';
  */
 export default class Blob {
 	public readonly type: string = '';
-	public [PropertySymbol.buffer]: Buffer = null;
+	public [PropertySymbol.buffer]: Buffer;
 
 	/**
 	 * Constructor.
@@ -70,7 +70,7 @@ export default class Blob {
 	 * @param contentType Content type.
 	 * @returns New Blob.
 	 */
-	public slice(start = 0, end: number = null, contentType = ''): Blob {
+	public slice(start = 0, end: number | null = null, contentType = ''): Blob {
 		const size = this.size;
 
 		let relativeStart;

package/src/file/File.ts

@@ -9,8 +9,8 @@ import { Buffer } from 'buffer';
  * https://github.com/jsdom/jsdom/blob/master/lib/jsdom/living/file-api/File-impl.js (MIT licensed).
  */
 export default class File extends Blob {
-	public readonly lastModified: number = null;
-	public readonly name: string = null;
+	public readonly lastModified: number;
+	public readonly name: string;
 
 	/**
 	 * Constructor.

package/src/file/FileReader.ts

@@ -17,15 +17,15 @@ import { Buffer } from 'buffer';
  * https://github.com/jsdom/jsdom/blob/master/lib/jsdom/living/file-api/FileReader-impl.js (MIT licensed).
  */
 export default class FileReader extends EventTarget {
-	public readonly error: Error = null;
-	public readonly result: Buffer | ArrayBuffer | string = null;
+	public readonly error: Error | null = null;
+	public readonly result: Buffer | ArrayBuffer | string | null = null;
 	public readonly readyState: number = FileReaderReadyStateEnum.empty;
-	public readonly onabort: (event: ProgressEvent) => void = null;
-	public readonly onerror: (event: ProgressEvent) => void = null;
-	public readonly onload: (event: ProgressEvent) => void = null;
-	public readonly onloadstart: (event: ProgressEvent) => void = null;
-	public readonly onloadend: (event: ProgressEvent) => void = null;
-	public readonly onprogress: (event: ProgressEvent) => void = null;
+	public readonly onabort: ((event: ProgressEvent) => void) | null = null;
+	public readonly onerror: ((event: ProgressEvent) => void) | null = null;
+	public readonly onload: ((event: ProgressEvent) => void) | null = null;
+	public readonly onloadstart: ((event: ProgressEvent) => void) | null = null;
+	public readonly onloadend: ((event: ProgressEvent) => void) | null = null;
+	public readonly onprogress: ((event: ProgressEvent) => void) | null = null;
 	#isTerminated = false;
 	#loadTimeout: NodeJS.Timeout | null = null;
 	#parseTimeout: NodeJS.Timeout | null = null;
@@ -106,20 +106,25 @@ export default class FileReader extends EventTarget {
 	public abort(): void {
 		const window = this[PropertySymbol.window];
 
-		window.clearTimeout(this.#loadTimeout);
-		window.clearTimeout(this.#parseTimeout);
+		if (this.#loadTimeout) {
+			window.clearTimeout(this.#loadTimeout);
+		}
+
+		if (this.#parseTimeout) {
+			window.clearTimeout(this.#parseTimeout);
+		}
 
 		if (
 			this.readyState === FileReaderReadyStateEnum.empty ||
 			this.readyState === FileReaderReadyStateEnum.done
 		) {
-			(<Buffer | ArrayBuffer | string>this.result) = null;
+			(<Buffer | ArrayBuffer | string | null>this.result) = null;
 			return;
 		}
 
 		if (this.readyState === FileReaderReadyStateEnum.loading) {
 			(<number>this.readyState) = FileReaderReadyStateEnum.done;
-			(<Buffer | ArrayBuffer | string>this.result) = null;
+			(<Buffer | ArrayBuffer | string | null>this.result) = null;
 		}
 
 		this.#isTerminated = true;

package/src/history/History.ts

@@ -13,7 +13,7 @@ import BrowserWindow from '../window/BrowserWindow.js';
  * https://developer.mozilla.org/en-US/docs/Web/API/History.
  */
 export default class History {
-	#browserFrame: IBrowserFrame;
+	#browserFrame: IBrowserFrame | null;
 	#window: BrowserWindow;
 	#currentHistoryItem: IHistoryItem;
 
@@ -32,13 +32,20 @@ export default class History {
 		this.#window = window;
 
 		const history = browserFrame[PropertySymbol.history];
+		let currentHistoryItem: IHistoryItem | null = null;
 
 		for (let i = history.length - 1; i >= 0; i--) {
 			if (history[i].isCurrent) {
-				this.#currentHistoryItem = history[i];
+				currentHistoryItem = history[i];
 				break;
 			}
 		}
+
+		if (!currentHistoryItem) {
+			throw new Error('No current history item found.');
+		}
+
+		this.#currentHistoryItem = currentHistoryItem;
 	}
 
 	/**
@@ -116,11 +123,11 @@ export default class History {
 	 * Pushes the given data onto the session history stack.
 	 *
 	 * @param state State.
-	 * @param title Title.
+	 * @param _unused Unused.
 	 * @param [url] URL.
 	 */
-	public pushState(state: object, title, url?: string | URL): void {
-		if (this.#window.closed) {
+	public pushState(state: object, _unused: any, url?: string | URL): void {
+		if (this.#window.closed || !this.#browserFrame) {
 			return;
 		}
 
@@ -154,7 +161,7 @@ export default class History {
 		}
 
 		const newHistoryItem: IHistoryItem = {
-			title: title || this.#window.document.title,
+			title: this.#window.document.title,
 			href: newURL.href,
 			state: JSON.parse(JSON.stringify(state)),
 			scrollRestoration: this.#currentHistoryItem.scrollRestoration,
@@ -174,11 +181,11 @@ export default class History {
 	 * This method modifies the current history entry, replacing it with a new state.
 	 *
 	 * @param state State.
-	 * @param title Title.
+	 * @param _unused Unused.
 	 * @param [url] URL.
 	 */
-	public replaceState(state: object, title, url?: string | URL): void {
-		if (this.#window.closed) {
+	public replaceState(state: object, _unused: any, url?: string | URL): void {
+		if (!this.#browserFrame || this.#window.closed) {
 			return;
 		}
 
@@ -201,7 +208,7 @@ export default class History {
 		for (let i = history.length - 1; i >= 0; i--) {
 			if (history[i].isCurrent) {
 				const newHistoryItem = {
-					title: title || this.#window.document.title,
+					title: this.#window.document.title,
 					href: newURL.href,
 					state: JSON.parse(JSON.stringify(state)),
 					scrollRestoration: history[i].scrollRestoration,