happy-dom 10.0.5 → 10.0.6

package/src/nodes/html-iframe-element/HTMLIFrameElement.ts

@@ -1,13 +1,12 @@
-import { URL } from 'url';
 import Event from '../../event/Event.js';
-import ErrorEvent from '../../event/events/ErrorEvent.js';
 import IWindow from '../../window/IWindow.js';
-import Window from '../../window/Window.js';
 import IDocument from '../document/IDocument.js';
 import HTMLElement from '../html-element/HTMLElement.js';
 import INode from '../node/INode.js';
 import IFrameCrossOriginWindow from './IFrameCrossOriginWindow.js';
 import IHTMLIFrameElement from './IHTMLIFrameElement.js';
+import HTMLIFrameUtility from './HTMLIFrameUtility.js';
+import IAttr from '../attr/IAttr.js';
 
 /**
  * HTML Iframe Element.
@@ -20,8 +19,8 @@ export default class HTMLIFrameElement extends HTMLElement implements IHTMLIFram
 	public onload: (event: Event) => void | null = null;
 	public onerror: (event: Event) => void | null = null;
 
-	// Private
-	#contentWindow: IWindow | IFrameCrossOriginWindow | null = null;
+	// Internal properties
+	public _contentWindow: IWindow | IFrameCrossOriginWindow | null = null;
 
 	/**
 	 * Returns source.
@@ -155,7 +154,7 @@ export default class HTMLIFrameElement extends HTMLElement implements IHTMLIFram
 	 * @returns Content document.
 	 */
 	public get contentDocument(): IDocument | null {
-		return (<IWindow>this.#contentWindow)?.document || null;
+		return (<IWindow>this._contentWindow)?.document || null;
 	}
 
 	/**
@@ -164,7 +163,7 @@ export default class HTMLIFrameElement extends HTMLElement implements IHTMLIFram
 	 * @returns Content window.
 	 */
 	public get contentWindow(): IWindow | IFrameCrossOriginWindow | null {
-		return this.#contentWindow || null;
+		return this._contentWindow;
 	}
 
 	/**
@@ -176,81 +175,26 @@ export default class HTMLIFrameElement extends HTMLElement implements IHTMLIFram
 
 		super._connectToNode(parentNode);
 
-		if (
-			isParentConnected &&
-			isConnected !== isParentConnected &&
-			!this.ownerDocument.defaultView.happyDOM.settings.disableIframePageLoading
-		) {
-			const src = this.src;
-
-			if (src !== null) {
-				const contentWindow = new (<typeof Window>this.ownerDocument.defaultView.constructor)({
-					url: src,
-					settings: {
-						...this.ownerDocument.defaultView.happyDOM.settings
-					}
-				});
-
-				(<IWindow>contentWindow.parent) = this.ownerDocument.defaultView;
-				(<IWindow>contentWindow.top) = this.ownerDocument.defaultView;
-
-				if (src === 'about:blank') {
-					this.#contentWindow = contentWindow;
-					return;
-				}
-
-				if (src.startsWith('javascript:')) {
-					this.#contentWindow = contentWindow;
-					this.#contentWindow.eval(src.replace('javascript:', ''));
-					return;
-				}
-
-				const originURL = this.ownerDocument.defaultView.location;
-				const targetURL = new URL(src, originURL);
-				const isCORS =
-					(originURL.hostname !== targetURL.hostname &&
-						!originURL.hostname.endsWith(targetURL.hostname)) ||
-					originURL.protocol !== targetURL.protocol;
+		if (isParentConnected && isConnected !== isParentConnected) {
+			HTMLIFrameUtility.loadPage(this);
+		}
+	}
 
-				const onError = (error): void => {
-					this.dispatchEvent(
-						new ErrorEvent('error', {
-							message: error.message,
-							error
-						})
-					);
-					this.ownerDocument.defaultView.dispatchEvent(
-						new ErrorEvent('error', {
-							message: error.message,
-							error
-						})
-					);
-					if (
-						!this['_listeners']['error'] &&
-						!this.ownerDocument.defaultView['_listeners']['error']
-					) {
-						this.ownerDocument.defaultView.console.error(error);
-					}
-				};
+	/**
+	 * @override
+	 */
+	public override setAttributeNode(attribute: IAttr): IAttr | null {
+		const replacedAttribute = super.setAttributeNode(attribute);
 
-				this.#contentWindow = null;
-				this.ownerDocument.defaultView
-					.fetch(src)
-					.then((response) => {
-						response
-							.text()
-							.then((text) => {
-								this.#contentWindow = isCORS
-									? new IFrameCrossOriginWindow(this.ownerDocument.defaultView, contentWindow)
-									: contentWindow;
-								contentWindow.document.write(text);
-								this.dispatchEvent(new Event('load'));
-							})
-							.catch(onError);
-					})
-					.catch(onError);
-			}
+		if (
+			attribute.name === 'src' &&
+			attribute.value &&
+			attribute.value !== replacedAttribute?.value
+		) {
+			HTMLIFrameUtility.loadPage(this);
 		}
+
+		return replacedAttribute;
 	}
 
 	/**

package/src/nodes/html-iframe-element/HTMLIFrameUtility.ts

@@ -0,0 +1,86 @@
+import { URL } from 'url';
+import Event from '../../event/Event.js';
+import ErrorEvent from '../../event/events/ErrorEvent.js';
+import IWindow from '../../window/IWindow.js';
+import Window from '../../window/Window.js';
+import IFrameCrossOriginWindow from './IFrameCrossOriginWindow.js';
+import HTMLIFrameElement from './HTMLIFrameElement.js';
+
+/**
+ * HTML Iframe Utility.
+ */
+export default class HTMLIFrameUtility {
+	/**
+	 * Loads an iframe page.
+	 *
+	 * @param element
+	 */
+	public static async loadPage(element: HTMLIFrameElement): Promise<void> {
+		if (
+			element.isConnected &&
+			!element.ownerDocument.defaultView.happyDOM.settings.disableIframePageLoading
+		) {
+			const src = element.src;
+
+			if (src) {
+				const contentWindow = new (<typeof Window>element.ownerDocument.defaultView.constructor)({
+					url: src,
+					settings: {
+						...element.ownerDocument.defaultView.happyDOM.settings
+					}
+				});
+
+				(<IWindow>contentWindow.parent) = element.ownerDocument.defaultView;
+				(<IWindow>contentWindow.top) = element.ownerDocument.defaultView;
+
+				if (src === 'about:blank') {
+					element._contentWindow = contentWindow;
+					return;
+				}
+
+				if (src.startsWith('javascript:')) {
+					element._contentWindow = contentWindow;
+					element._contentWindow.eval(src.replace('javascript:', ''));
+					return;
+				}
+
+				const originURL = element.ownerDocument.defaultView.location;
+				const targetURL = new URL(src, originURL);
+				const isCORS =
+					(originURL.hostname !== targetURL.hostname &&
+						!originURL.hostname.endsWith(targetURL.hostname)) ||
+					originURL.protocol !== targetURL.protocol;
+
+				let responseText: string;
+
+				element._contentWindow = null;
+
+				try {
+					const response = await element.ownerDocument.defaultView.fetch(src);
+					responseText = await response.text();
+				} catch (error) {
+					element.dispatchEvent(
+						new ErrorEvent('error', {
+							message: error.message,
+							error
+						})
+					);
+					element.ownerDocument.defaultView.dispatchEvent(
+						new ErrorEvent('error', {
+							message: error.message,
+							error
+						})
+					);
+					element.ownerDocument.defaultView.console.error(error);
+					return;
+				}
+
+				element._contentWindow = isCORS
+					? new IFrameCrossOriginWindow(element.ownerDocument.defaultView, contentWindow)
+					: contentWindow;
+				contentWindow.document.write(responseText);
+				element.dispatchEvent(new Event('load'));
+			}
+		}
+	}
+}

package/src/nodes/html-input-element/HTMLInputElement.ts

@@ -1074,7 +1074,7 @@ export default class HTMLInputElement extends HTMLElement implements IHTMLInputE
 	/**
 	 * @override
 	 */
-	public override setAttributeNode(attribute: IAttr): IAttr {
+	public override setAttributeNode(attribute: IAttr): IAttr | null {
 		const replacedAttribute = super.setAttributeNode(attribute);
 		const oldValue = replacedAttribute ? replacedAttribute.value : null;
 

package/src/nodes/html-link-element/HTMLLinkElement.ts

@@ -181,7 +181,7 @@ export default class HTMLLinkElement extends HTMLElement implements IHTMLLinkEle
 	/**
 	 * @override
 	 */
-	public override setAttributeNode(attribute: IAttr): IAttr {
+	public override setAttributeNode(attribute: IAttr): IAttr | null {
 		const replacedAttribute = super.setAttributeNode(attribute);
 
 		if (attribute.name === 'rel' && this._relList) {

package/src/nodes/html-link-element/HTMLLinkElementUtility.ts

@@ -72,11 +72,6 @@ export default class HTMLLinkElementUtility {
 			})
 		);
 		(<Document>element.ownerDocument)._readyStateManager.endTask();
-		if (
-			!element['_listeners']['error'] &&
-			!element.ownerDocument.defaultView['_listeners']['error']
-		) {
-			element.ownerDocument.defaultView.console.error(error);
-		}
+		element.ownerDocument.defaultView.console.error(error);
 	}
 }

package/src/nodes/html-option-element/HTMLOptionElement.ts

@@ -120,7 +120,7 @@ export default class HTMLOptionElement extends HTMLElement implements IHTMLOptio
 	/**
 	 * @override
 	 */
-	public setAttributeNode(attribute: IAttr): IAttr {
+	public setAttributeNode(attribute: IAttr): IAttr | null {
 		const replacedAttribute = super.setAttributeNode(attribute);
 
 		if (

package/src/nodes/html-script-element/HTMLScriptElement.ts

@@ -158,7 +158,7 @@ export default class HTMLScriptElement extends HTMLElement implements IHTMLScrip
 	 * @param attribute Attribute.
 	 * @returns Replaced attribute.
 	 */
-	public setAttributeNode(attribute: IAttr): IAttr {
+	public setAttributeNode(attribute: IAttr): IAttr | null {
 		const replacedAttribute = super.setAttributeNode(attribute);
 
 		if (attribute.name === 'src' && attribute.value !== null && this.isConnected) {

package/src/nodes/html-script-element/HTMLScriptElementUtility.ts

@@ -104,11 +104,6 @@ export default class HTMLScriptElementUtility {
 				error
 			})
 		);
-		if (
-			!element['_listeners']['error'] &&
-			!element.ownerDocument.defaultView['_listeners']['error']
-		) {
-			element.ownerDocument.defaultView.console.error(error);
-		}
+		element.ownerDocument.defaultView.console.error(error);
 	}
 }

package/src/nodes/html-select-element/HTMLSelectElement.ts

@@ -405,7 +405,7 @@ export default class HTMLSelectElement extends HTMLElement implements IHTMLSelec
 	/**
 	 * @override
 	 */
-	public override setAttributeNode(attribute: IAttr): IAttr {
+	public override setAttributeNode(attribute: IAttr): IAttr | null {
 		const replacedAttribute = super.setAttributeNode(attribute);
 		const oldValue = replacedAttribute ? replacedAttribute.value : null;
 

package/src/nodes/html-text-area-element/HTMLTextAreaElement.ts

@@ -591,7 +591,7 @@ export default class HTMLTextAreaElement extends HTMLElement implements IHTMLTex
 	/**
 	 * @override
 	 */
-	public override setAttributeNode(attribute: IAttr): IAttr {
+	public override setAttributeNode(attribute: IAttr): IAttr | null {
 		const replacedAttribute = super.setAttributeNode(attribute);
 		const oldValue = replacedAttribute ? replacedAttribute.value : null;
 

package/src/nodes/svg-element/SVGElement.ts

@@ -113,7 +113,7 @@ export default class SVGElement extends Element implements ISVGElement {
 	/**
 	 * @override
 	 */
-	public setAttributeNode(attribute: IAttr): IAttr {
+	public setAttributeNode(attribute: IAttr): IAttr | null {
 		const replacedAttribute = super.setAttributeNode(attribute);
 
 		if (attribute.name === 'style' && this._style) {

package/src/window/Window.ts

@@ -845,13 +845,15 @@ export default class Window extends EventTarget implements IWindow {
 			);
 		}
 
-		this.dispatchEvent(
-			new MessageEvent('message', {
-				data: message,
-				origin: this.parent.location.origin,
-				source: this.parent,
-				lastEventId: ''
-			})
+		this.window.setTimeout(() =>
+			this.dispatchEvent(
+				new MessageEvent('message', {
+					data: message,
+					origin: this.parent.location.origin,
+					source: this.parent,
+					lastEventId: ''
+				})
+			)
 		);
 	}