[pull] main from nodejs:main

doc/api/crypto.md

@@ -1930,8 +1930,8 @@ added: v15.0.0
 Example: Converting a `CryptoKey` instance to a `KeyObject`:
 
 ```mjs
-const { webcrypto, KeyObject } = await import('node:crypto');
-const { subtle } = webcrypto;
+const { KeyObject } = await import('node:crypto');
+const { subtle } = globalThis.crypto;
 
 const key = await subtle.generateKey({
   name: 'HMAC',
@@ -1945,12 +1945,8 @@ console.log(keyObject.symmetricKeySize);
 ```
 
 ```cjs
-const {
-  webcrypto: {
-    subtle,
-  },
-  KeyObject,
-} = require('node:crypto');
+const { KeyObject } = require('node:crypto');
+const { subtle } = globalThis.crypto;
 
 (async function() {
   const key = await subtle.generateKey({

src/crypto/README.md

@@ -310,12 +310,12 @@ crypto.randomFill(buf, (err, buf) => {
 For the legacy Node.js crypto API, asynchronous single-call
 operations use the traditional Node.js callback pattern, as
 illustrated in the previous `randomFill()` example. In the
-Web Crypto API (accessible via `require('node:crypto').webcrypto`),
+Web Crypto API (accessible via `globalThis.crypto`),
 all asynchronous single-call operations are Promise-based.
 
 ```js
 // Example Web Crypto API asynchronous single-call operation
-const { subtle } = require('node:crypto').webcrypto;
+const { subtle } = globalThis.crypto;
 
 subtle.generateKeys({ name: 'HMAC', length: 256 }, true, ['sign'])
   .then((key) => {

test/wpt/status/WebCryptoAPI.json

@@ -6,6 +6,18 @@
     "skip": "Not relevant in Node.js context"
   },
   "idlharness.https.any.js": {
-    "skip": "Various non-IDL-compliant things"
+    "fail": {
+      "expected": [
+        "Crypto interface: existence and properties of interface object",
+        "Crypto interface: calling getRandomValues(ArrayBufferView) on crypto with too few arguments must throw TypeError",
+        "CryptoKey interface: existence and properties of interface object",
+        "CryptoKey interface: existence and properties of interface prototype object",
+        "CryptoKey interface: attribute type",
+        "CryptoKey interface: attribute extractable",
+        "CryptoKey interface: attribute algorithm",
+        "CryptoKey interface: attribute usages",
+        "Window interface: attribute crypto"
+      ]
+    }
   }
 }

test/wpt/test-webcrypto.js

@@ -12,4 +12,6 @@ runner.setInitScript(`
   global.location = {};
 `);
 
+runner.pretendGlobalThisAs('Window');
+
 runner.runJsTests();