cli: remove --no-experimental-global-webcrypto flag

Author: panva

doc/api/cli.md

@@ -402,14 +402,6 @@ added: v18.0.0
 
 Disable experimental support for the [Fetch API][].
 
-### `--no-experimental-global-webcrypto`
-
-<!-- YAML
-added: v19.0.0
--->
-
-Disable exposition of [Web Crypto API][] on the global scope.
-
 ### `--no-experimental-global-customevent`
 
 <!-- YAML
@@ -1915,7 +1907,6 @@ Node.js options that are allowed are:
 * `--no-deprecation`
 * `--no-experimental-fetch`
 * `--no-experimental-global-customevent`
-* `--no-experimental-global-webcrypto`
 * `--no-experimental-repl-await`
 * `--no-extra-info-on-fatal-exception`
 * `--no-force-async-hooks-checks`
@@ -2329,7 +2320,6 @@ done
 [Source Map]: https://sourcemaps.info/spec.html
 [Subresource Integrity]: https://developer.mozilla.org/en-US/docs/Web/Security/Subresource_Integrity
 [V8 JavaScript code coverage]: https://v8project.blogspot.com/2017/12/javascript-code-coverage.html
-[Web Crypto API]: webcrypto.md
 [`"type"`]: packages.md#type
 [`--cpu-prof-dir`]: #--cpu-prof-dir
 [`--diagnostic-dir`]: #--diagnostic-dirdirectory

doc/api/globals.md

@@ -351,9 +351,6 @@ changes:
     description: No longer behind `--experimental-global-webcrypto` CLI flag.
 -->
 
-> Stability: 1 - Experimental. Disable this API with the
-> [`--no-experimental-global-webcrypto`][] CLI flag.
-
 A browser-compatible implementation of {Crypto}. This global is available
 only if the Node.js binary was compiled with including support for the
 `node:crypto` module.
@@ -370,9 +367,6 @@ changes:
     description: No longer behind `--experimental-global-webcrypto` CLI flag.
 -->
 
-> Stability: 1 - Experimental. Disable this API with the
-> [`--no-experimental-global-webcrypto`][] CLI flag.
-
 A browser-compatible implementation of the [Web Crypto API][].
 
 ## `CryptoKey`
@@ -387,9 +381,6 @@ changes:
     description: No longer behind `--experimental-global-webcrypto` CLI flag.
 -->
 
-> Stability: 1 - Experimental. Disable this API with the
-> [`--no-experimental-global-webcrypto`][] CLI flag.
-
 A browser-compatible implementation of {CryptoKey}. This global is available
 only if the Node.js binary was compiled with including support for the
 `node:crypto` module.
@@ -829,9 +820,6 @@ changes:
     description: No longer behind `--experimental-global-webcrypto` CLI flag.
 -->
 
-> Stability: 1 - Experimental. Disable this API with the
-> [`--no-experimental-global-webcrypto`][] CLI flag.
-
 A browser-compatible implementation of {SubtleCrypto}. This global is available
 only if the Node.js binary was compiled with including support for the
 `node:crypto` module.
@@ -973,7 +961,6 @@ A browser-compatible implementation of [`WritableStreamDefaultWriter`][].
 [Web Crypto API]: webcrypto.md
 [`--no-experimental-fetch`]: cli.md#--no-experimental-fetch
 [`--no-experimental-global-customevent`]: cli.md#--no-experimental-global-customevent
-[`--no-experimental-global-webcrypto`]: cli.md#--no-experimental-global-webcrypto
 [`AbortController`]: https://developer.mozilla.org/en-US/docs/Web/API/AbortController
 [`ByteLengthQueuingStrategy`]: webstreams.md#class-bytelengthqueuingstrategy
 [`CompressionStream`]: webstreams.md#class-compressionstream

doc/node.1

@@ -140,9 +140,6 @@ Requires Node.js to be built with
 .It Fl -enable-source-maps
 Enable Source Map V3 support for stack traces.
 .
-.It Fl -experimental-global-webcrypto
-Expose the Web Crypto API on the global scope.
-.
 .It Fl -experimental-import-meta-resolve
 Enable experimental ES modules support for import.meta.resolve().
 .
@@ -166,9 +163,6 @@ Disable experimental support for the Fetch API.
 .It Fl -no-experimental-global-customevent
 Disable exposition of the CustomEvent on the global scope.
 .
-.It Fl -no-experimental-global-webcrypto
-Disable exposition of the Web Crypto API on the global scope.
-.
 .It Fl -no-experimental-repl-await
 Disable top-level await keyword support in REPL.
 .

lib/internal/bootstrap/browser.js

@@ -2,6 +2,7 @@
 
 const {
   ObjectDefineProperty,
+  ObjectGetOwnPropertyDescriptor,
   globalThis,
 } = primordials;
 
@@ -13,6 +14,10 @@ const {
   defineReplaceableLazyAttribute,
   exposeLazyInterfaces,
 } = require('internal/util');
+const {
+  ERR_INVALID_THIS,
+  ERR_NO_CRYPTO,
+} = require('internal/errors').codes;
 const config = internalBinding('config');
 
 // https://console.spec.whatwg.org/#console-namespace
@@ -143,3 +148,30 @@ exposeLazyInterfaces(
   [
     'CompressionStream', 'DecompressionStream',
   ]);
+
+// Web Crypto API
+if (config.hasOpenSSL) {
+  defineReplaceableLazyAttribute(
+    globalThis,
+    'internal/crypto/webcrypto',
+    ['crypto'],
+    false,
+    function cryptoThisCheck() {
+      if (this !== globalThis && this != null)
+        throw new ERR_INVALID_THIS(
+          'nullish or must be the global object');
+    }
+  );
+  exposeLazyInterfaces(
+    globalThis, 'internal/crypto/webcrypto',
+    ['Crypto', 'CryptoKey', 'SubtleCrypto']
+  );
+} else {
+  ObjectDefineProperty(globalThis, 'crypto',
+                        { __proto__: null, ...ObjectGetOwnPropertyDescriptor({
+                          get crypto() {
+                            throw new ERR_NO_CRYPTO();
+                          }
+                        }, 'crypto') });
+
+}

lib/internal/crypto/webcrypto.js

@@ -5,7 +5,6 @@ const {
   JSONParse,
   JSONStringify,
   ObjectDefineProperties,
-  ObjectDefineProperty,
   ReflectApply,
   ReflectConstruct,
   SafeSet,
@@ -29,10 +28,6 @@ const {
   validateString,
 } = require('internal/validators');
 
-const {
-  getOptionValue,
-} = require('internal/options');
-
 const { TextDecoder, TextEncoder } = require('internal/encoding');
 
 const {
@@ -790,18 +785,6 @@ ObjectDefineProperties(
     },
   });
 
-if (getOptionValue('--no-experimental-global-webcrypto')) {
-  // For backward compatibility, keep exposing CryptoKey in the Crypto prototype
-  // when using the flag.
-  ObjectDefineProperty(Crypto.prototype, 'CryptoKey', {
-    __proto__: null,
-    enumerable: true,
-    configurable: true,
-    writable: true,
-    value: CryptoKey,
-  });
-}
-
 ObjectDefineProperties(
   SubtleCrypto.prototype, {
     [SymbolToStringTag]: {

lib/internal/main/eval_string.js

@@ -31,9 +31,9 @@ else {
   // For backward compatibility, we want the identifier crypto to be the
   // `node:crypto` module rather than WebCrypto.
   const isUsingCryptoIdentifier =
-                             getOptionValue('--experimental-global-webcrypto') &&
-                             RegExpPrototypeExec(/\bcrypto\b/, source) !== null;
-  const shouldDefineCrypto = isUsingCryptoIdentifier && internalBinding('config').hasOpenSSL;
+    RegExpPrototypeExec(/\bcrypto\b/, source) !== null;
+  const shouldDefineCrypto = isUsingCryptoIdentifier &&
+    internalBinding('config').hasOpenSSL;
 
   if (isUsingCryptoIdentifier && !shouldDefineCrypto) {
     // This is taken from `addBuiltinLibsToObject`.

lib/internal/process/pre_execution.js

@@ -4,7 +4,6 @@ const {
   NumberParseInt,
   ObjectDefineProperties,
   ObjectDefineProperty,
-  ObjectGetOwnPropertyDescriptor,
   SafeMap,
   StringPrototypeStartsWith,
   globalThis,
@@ -18,14 +17,10 @@ const { reconnectZeroFillToggle } = require('internal/buffer');
 const {
   defineOperation,
   exposeInterface,
-  exposeLazyInterfaces,
-  defineReplaceableLazyAttribute,
 } = require('internal/util');
 
 const {
-  ERR_INVALID_THIS,
   ERR_MANIFEST_ASSERT_INTEGRITY,
-  ERR_NO_CRYPTO,
 } = require('internal/errors').codes;
 const assert = require('internal/assert');
 const {
@@ -64,7 +59,6 @@ function prepareExecution(options) {
   setupInspectorHooks();
   setupWarningHandler();
   setupFetch();
-  setupWebCrypto();
   setupCustomEvent();
 
   // Resolve the coverage directory to an absolute path, and
@@ -269,41 +263,6 @@ function setupFetch() {
   });
 }
 
-// TODO(aduh95): move this to internal/bootstrap/browser when the CLI flag is
-//               removed.
-function setupWebCrypto() {
-  if (process.config.variables.node_no_browser_globals ||
-      getOptionValue('--no-experimental-global-webcrypto')) {
-    return;
-  }
-
-  if (internalBinding('config').hasOpenSSL) {
-    defineReplaceableLazyAttribute(
-      globalThis,
-      'internal/crypto/webcrypto',
-      ['crypto'],
-      false,
-      function cryptoThisCheck() {
-        if (this !== globalThis && this != null)
-          throw new ERR_INVALID_THIS(
-            'nullish or must be the global object');
-      }
-    );
-    exposeLazyInterfaces(
-      globalThis, 'internal/crypto/webcrypto',
-      ['Crypto', 'CryptoKey', 'SubtleCrypto']
-    );
-  } else {
-    ObjectDefineProperty(globalThis, 'crypto',
-                         { __proto__: null, ...ObjectGetOwnPropertyDescriptor({
-                           get crypto() {
-                             throw new ERR_NO_CRYPTO();
-                           }
-                         }, 'crypto') });
-
-  }
-}
-
 // TODO(daeyeon): move this to internal/bootstrap/browser when the CLI flag is
 //                removed.
 function setupCustomEvent() {

src/node_options.cc

@@ -365,11 +365,6 @@ EnvironmentOptionsParser::EnvironmentOptionsParser() {
             &EnvironmentOptions::experimental_global_customevent,
             kAllowedInEnvvar,
             true);
-  AddOption("--experimental-global-webcrypto",
-            "expose experimental Web Crypto API on the global scope",
-            &EnvironmentOptions::experimental_global_web_crypto,
-            kAllowedInEnvvar,
-            true);
   AddOption("--experimental-json-modules", "", NoOp{}, kAllowedInEnvvar);
   AddOption("--experimental-loader",
             "use the specified module as a custom loader",

src/node_options.h

@@ -112,7 +112,6 @@ class EnvironmentOptions : public Options {
   bool enable_source_maps = false;
   bool experimental_fetch = true;
   bool experimental_global_customevent = true;
-  bool experimental_global_web_crypto = true;
   bool experimental_https_modules = false;
   bool experimental_wasm_modules = false;
   bool experimental_import_meta_resolve = false;

test/parallel/test-cli-eval.js

@@ -348,12 +348,6 @@ child.exec(
   common.mustSucceed((stdout) => {
     assert.match(stdout, /^number/);
   }));
-child.exec(
-  `${nodejs} --no-experimental-global-webcrypto ` +
-    '-p "var crypto = {randomBytes:1};typeof crypto.randomBytes"',
-  common.mustSucceed((stdout) => {
-    assert.match(stdout, /^number/);
-  }));
 
 // Regression test for https://github.com/nodejs/node/issues/45336
 child.execFile(process.execPath,