capricorn86#1158@patch: Conditional import of 'webcrypt' from 'node:c…

…rypt'.
mash-graz · Nov 7, 2023 · 76efd7a · 76efd7a
1 parent 5a5dfc7
commit 76efd7a
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/packages/happy-dom/src/window/IWindow.ts b/packages/happy-dom/src/window/IWindow.ts
@@ -116,7 +116,6 @@ 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';
@@ -133,6 +132,11 @@ import Clipboard from '../clipboard/Clipboard.js';
 import ClipboardItem from '../clipboard/ClipboardItem.js';
 import ClipboardEvent from '../event/events/ClipboardEvent.js';
 
+if (!('crypto' in globalThis)
+	|| (Object.getPrototypeOf(globalThis.crypto) === Object.getPrototypeOf({}))) {
+		globalThis['crypto'] = import('crypto').then(c => c.webcrypto);
+}
+
 /**
  * Browser window.
  */
@@ -414,7 +418,7 @@ export default interface IWindow extends IEventTarget, INodeJSGlobal {
 	readonly pageYOffset: number;
 	readonly scrollX: number;
 	readonly scrollY: number;
-	readonly crypto: typeof webcrypto;
+	readonly crypto: typeof globalThis.crypto;
 
 	/**
 	 * Returns an object containing the values of all CSS properties of an element.

diff --git a/packages/happy-dom/src/window/Window.ts b/packages/happy-dom/src/window/Window.ts
@@ -114,7 +114,6 @@ 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';
@@ -147,6 +146,11 @@ import Clipboard from '../clipboard/Clipboard.js';
 import ClipboardItem from '../clipboard/ClipboardItem.js';
 import ClipboardEvent from '../event/events/ClipboardEvent.js';
 
+if (!('crypto' in globalThis)
+	|| (Object.getPrototypeOf(globalThis.crypto) === Object.getPrototypeOf({}))) {
+		globalThis['crypto'] = import('crypto').then(c => c.webcrypto);
+}
+
 const ORIGINAL_SET_TIMEOUT = setTimeout;
 const ORIGINAL_CLEAR_TIMEOUT = clearTimeout;
 const ORIGINAL_SET_INTERVAL = setInterval;
@@ -483,7 +487,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;
+	public readonly crypto = globalThis.crypto;
 
 	// Node.js Globals
 	public Array: typeof Array;