happy-dom 11.1.2 → 12.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "happy-dom",
-    "version": "11.1.2",
+    "version": "12.0.0",
     "license": "MIT",
     "homepage": "https://github.com/capricorn86/happy-dom",
     "repository": "https://github.com/capricorn86/happy-dom",
@@ -85,7 +85,7 @@
     },
     "devDependencies": {
         "@types/css.escape": "^1.5.0",
-        "@types/node": "^15.6.0",
+        "@types/node": "^16.11.7",
         "@types/node-fetch": "^2.6.1",
         "@typescript-eslint/eslint-plugin": "^5.16.0",
         "@typescript-eslint/parser": "^5.16.0",

package/src/console/VirtualConsole.ts

@@ -3,6 +3,7 @@ import VirtualConsoleLogLevelEnum from './enums/VirtualConsoleLogLevelEnum.js';
 import VirtualConsoleLogTypeEnum from './enums/VirtualConsoleLogTypeEnum.js';
 import IVirtualConsoleLogGroup from './types/IVirtualConsoleLogGroup.js';
 import * as PerfHooks from 'perf_hooks';
+import { ConsoleConstructor } from 'console';
 
 /**
  * Virtual Console.
@@ -12,7 +13,7 @@ import * as PerfHooks from 'perf_hooks';
 export default class VirtualConsole implements Console {
 	// This is needed as the interface for the NodeJS Console also have a reference to the ConsoleConstructor class as a property for some reason.
 	// This is not part of the browser specs.
-	public Console: NodeJS.ConsoleConstructor;
+	public Console: ConsoleConstructor;
 
 	private _printer: IVirtualConsolePrinter;
 	private _count: { [label: string]: number } = {};

package/src/navigator/Navigator.ts

@@ -1,5 +1,6 @@
 import MimeTypeArray from './MimeTypeArray.js';
 import PluginArray from './PluginArray.js';
+import IWindow from '../window/IWindow.js';
 
 /**
  * Browser Navigator API.
@@ -10,6 +11,16 @@ import PluginArray from './PluginArray.js';
  * https://html.spec.whatwg.org/multipage/system-state.html#dom-navigator.
  */
 export default class Navigator {
+	private _ownerWindow: IWindow;
+
+	/**
+	 *
+	 * @param ownerWindow
+	 */
+	constructor(ownerWindow: IWindow) {
+		this._ownerWindow = ownerWindow;
+	}
+
 	/**
 	 * False if setting a cookie will be ignored and true otherwise.
 	 */
@@ -84,14 +95,19 @@ export default class Navigator {
 	 * Browser app version.
 	 */
 	public get appVersion(): string {
-		return '5.0 (Windows)';
+		const userAgent = this.userAgent;
+		const index = userAgent.indexOf('/');
+		return index > -1 ? userAgent.substring(index + 1) : '';
 	}
 
 	/**
 	 * Browser platform.
 	 */
 	public get platform(): string {
-		return 'Win32';
+		const userAgent = this.userAgent;
+		const indexStart = userAgent.indexOf('(');
+		const indexEnd = userAgent.indexOf(')');
+		return indexStart > -1 && indexEnd > -1 ? userAgent.substring(indexStart + 1, indexEnd) : '';
 	}
 
 	/**
@@ -128,7 +144,7 @@ export default class Navigator {
 	 * "appCodeName/appVersion number (Platform; Security; OS-or-CPU; Localization; rv: revision-version-number) product/productSub Application-Name Application-Name-version".
 	 */
 	public get userAgent(): string {
-		return 'Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:97.0) Gecko/20100101 Firefox/97.0';
+		return this._ownerWindow.happyDOM.settings.navigator.userAgent;
 	}
 
 	/**

package/src/navigator/NavigatorUtility.ts

@@ -0,0 +1,29 @@
+import FS from 'fs';
+import Path from 'path';
+
+/**
+ * Utility for navigator.
+ */
+export default class NavigatorUtility {
+	/**
+	 * Returns the package version.
+	 *
+	 * @returns Package version.
+	 */
+	public static getHappyDOMVersion(): string {
+		const content = FS.readFileSync(Path.join(__dirname, '..', '..', 'package.json')).toString();
+		const json = JSON.parse(content);
+		return json.version;
+	}
+
+	/**
+	 * Returns platform.
+	 *
+	 * @returns Platform.
+	 */
+	public static getPlatform(): string {
+		const platform = process.platform;
+		const platformCapitalized = platform.charAt(0).toUpperCase() + platform.slice(1);
+		return 'X11; ' + platformCapitalized + ' ' + process.arch;
+	}
+}

package/src/window/IHappyDOMOptions.ts

@@ -13,6 +13,9 @@ export default interface IHappyDOMOptions {
 		disableIframePageLoading?: boolean;
 		disableComputedStyleRendering?: boolean;
 		enableFileSystemHttpRequests?: boolean;
+		navigator?: {
+			userAgent?: string;
+		};
 		device?: {
 			prefersColorScheme?: string;
 			mediaType?: string;

package/src/window/IHappyDOMSettings.ts

@@ -8,6 +8,9 @@ export default interface IHappyDOMSettings {
 	disableIframePageLoading: boolean;
 	disableComputedStyleRendering: boolean;
 	enableFileSystemHttpRequests: boolean;
+	navigator: {
+		userAgent: string;
+	};
 	device: {
 		prefersColorScheme: string;
 		mediaType: string;

package/src/window/IWindow.ts

@@ -114,6 +114,7 @@ import IHappyDOMSettings from './IHappyDOMSettings.js';
 import RequestInfo from '../fetch/types/IRequestInfo.js';
 import FileList from '../nodes/html-input-element/FileList.js';
 import Stream from 'stream';
+import { webcrypto } from 'crypto';
 import FormData from '../form-data/FormData.js';
 import AbortController from '../fetch/AbortController.js';
 import AbortSignal from '../fetch/AbortSignal.js';
@@ -295,6 +296,7 @@ export default interface IWindow extends IEventTarget, INodeJSGlobal {
 	readonly pageYOffset: number;
 	readonly scrollX: number;
 	readonly scrollY: number;
+	readonly crypto: typeof webcrypto;
 
 	/**
 	 * Returns an object containing the values of all CSS properties of an element.

package/src/window/Window.ts

@@ -114,6 +114,7 @@ import VMGlobalPropertyScript from './VMGlobalPropertyScript.js';
 import * as PerfHooks from 'perf_hooks';
 import VM from 'vm';
 import { Buffer } from 'buffer';
+import { webcrypto } from 'crypto';
 import XMLHttpRequestImplementation from '../xml-http-request/XMLHttpRequest.js';
 import XMLHttpRequestUpload from '../xml-http-request/XMLHttpRequestUpload.js';
 import XMLHttpRequestEventTarget from '../xml-http-request/XMLHttpRequestEventTarget.js';
@@ -139,6 +140,7 @@ import WindowErrorUtility from './WindowErrorUtility.js';
 import VirtualConsole from '../console/VirtualConsole.js';
 import VirtualConsolePrinter from '../console/VirtualConsolePrinter.js';
 import IHappyDOMSettings from './IHappyDOMSettings.js';
+import NavigatorUtility from '../navigator/NavigatorUtility.js';
 
 const ORIGINAL_SET_TIMEOUT = setTimeout;
 const ORIGINAL_CLEAR_TIMEOUT = clearTimeout;
@@ -209,6 +211,9 @@ export default class Window extends EventTarget implements IWindow {
 			disableIframePageLoading: false,
 			disableComputedStyleRendering: false,
 			enableFileSystemHttpRequests: false,
+			navigator: {
+				userAgent: `Mozilla/5.0 (${NavigatorUtility.getPlatform()}) AppleWebKit/537.36 (KHTML, like Gecko) HappyDOM/${NavigatorUtility.getHappyDOMVersion()}`
+			},
 			device: {
 				prefersColorScheme: 'light',
 				mediaType: 'screen'
@@ -364,6 +369,7 @@ export default class Window extends EventTarget implements IWindow {
 	public readonly innerHeight: number = 768;
 	public readonly outerWidth: number = 1024;
 	public readonly outerHeight: number = 768;
+	public readonly crypto = webcrypto;
 
 	// Node.js Globals
 	public Array: typeof Array;
@@ -455,7 +461,7 @@ export default class Window extends EventTarget implements IWindow {
 
 		this.customElements = new CustomElementRegistry();
 		this.location = new Location();
-		this.navigator = new Navigator();
+		this.navigator = new Navigator(this);
 		this.history = new History();
 		this.screen = new Screen();
 		this.sessionStorage = new Storage();
@@ -486,6 +492,10 @@ export default class Window extends EventTarget implements IWindow {
 				this.happyDOM.settings = {
 					...this.happyDOM.settings,
 					...options.settings,
+					navigator: {
+						...this.happyDOM.settings.navigator,
+						...options.settings.navigator
+					},
 					device: {
 						...this.happyDOM.settings.device,
 						...options.settings.device