From a8b26d72c514444e699e5dd99a38405c6a2b738a Mon Sep 17 00:00:00 2001
From: James M Snell <jasnell@gmail.com>
Date: Thu, 4 Jun 2020 11:45:42 -0700
Subject: [PATCH] lib: unflag AbortController

It's still experimental, but make the flag non-op

Signed-off-by: James M Snell <jasnell@gmail.com>

PR-URL: https://github.com/nodejs/node/pull/33527
Reviewed-By: Benjamin Gruenbaum <benjamingr@gmail.com>
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
---
 doc/api/cli.md                          |  7 ++++++-
 doc/api/globals.md                      |  2 --
 doc/node.1                              |  3 ---
 lib/internal/bootstrap/node.js          |  7 +++++++
 lib/internal/bootstrap/pre_execution.js | 27 -------------------------
 lib/internal/main/worker_thread.js      |  2 --
 src/node_options.cc                     |  6 ++----
 src/node_options.h                      |  1 -
 test/parallel/test-abortcontroller.js   |  2 +-
 9 files changed, 16 insertions(+), 41 deletions(-)

diff --git a/doc/api/cli.md b/doc/api/cli.md
index 7e317c10c2518a..2056cbd84961e1 100644
--- a/doc/api/cli.md
+++ b/doc/api/cli.md
@@ -170,9 +170,14 @@ Currently, overriding `Error.prepareStackTrace` is ignored when the
 ### `--experimental-abortcontroller`
 <!-- YAML
 added: REPLACEME
+changes:
+  - version: REPLACEME
+    pr-url: https://github.com/nodejs/node/pull/33527
+    description: --experimental-abortcontroller is no longer required.
 -->
 
-Enable experimental `AbortController` and `AbortSignal` support.
+Experimental `AbortController` and `AbortSignal` support is enabled by default.
+Use of this command line flag is no longer required.
 
 ### `--experimental-import-meta-resolve`
 <!-- YAML
diff --git a/doc/api/globals.md b/doc/api/globals.md
index 78550035cbcfa0..c9383ab9bdd605 100644
--- a/doc/api/globals.md
+++ b/doc/api/globals.md
@@ -29,8 +29,6 @@ added: REPLACEME
 A utility class used to signal cancelation in selected `Promise`-based APIs.
 The API is based on the Web API [`AbortController`][].
 
-To use, launch Node.js using the `--experimental-abortcontroller` flag.
-
 ```js
 const ac = new AbortController();
 
diff --git a/doc/node.1 b/doc/node.1
index 272b53d4892ba1..1a217a8bcf900a 100644
--- a/doc/node.1
+++ b/doc/node.1
@@ -118,9 +118,6 @@ Enable FIPS-compliant crypto at startup.
 Requires Node.js to be built with
 .Sy ./configure --openssl-fips .
 .
-.It Fl -experimental-abortcontroller
-Enable experimental AbortController and AbortSignal support.
-.
 .It Fl -enable-source-maps
 Enable experimental Source Map V3 support for stack traces.
 .
diff --git a/lib/internal/bootstrap/node.js b/lib/internal/bootstrap/node.js
index fbc80389c3985a..522faf779f446b 100644
--- a/lib/internal/bootstrap/node.js
+++ b/lib/internal/bootstrap/node.js
@@ -133,6 +133,13 @@ if (!config.noBrowserGlobals) {
   // https://encoding.spec.whatwg.org/#textdecoder
   exposeInterface(global, 'TextDecoder', TextDecoder);
 
+  const {
+    AbortController,
+    AbortSignal,
+  } = require('internal/abort_controller');
+  exposeInterface(global, 'AbortController', AbortController);
+  exposeInterface(global, 'AbortSignal', AbortSignal);
+
   // https://html.spec.whatwg.org/multipage/webappapis.html#windoworworkerglobalscope
   const timers = require('timers');
   defineOperation(global, 'clearInterval', timers.clearInterval);
diff --git a/lib/internal/bootstrap/pre_execution.js b/lib/internal/bootstrap/pre_execution.js
index 9a0b2c361d3213..f60814d2dc9e28 100644
--- a/lib/internal/bootstrap/pre_execution.js
+++ b/lib/internal/bootstrap/pre_execution.js
@@ -3,7 +3,6 @@
 const {
   Map,
   ObjectDefineProperty,
-  ObjectDefineProperties,
   SafeWeakMap,
 } = primordials;
 
@@ -54,7 +53,6 @@ function prepareMainThreadExecution(expandArgv1 = false) {
   // (including preload modules).
   initializeClusterIPC();
 
-  initializeAbortController();
   initializeDeprecations();
   initializeWASI();
   initializeCJSLoader();
@@ -306,30 +304,6 @@ function initializeDeprecations() {
   });
 }
 
-function initializeAbortController() {
-  const abortController = getOptionValue('--experimental-abortcontroller');
-  if (abortController) {
-    const {
-      AbortController,
-      AbortSignal
-    } = require('internal/abort_controller');
-    ObjectDefineProperties(global, {
-      AbortController: {
-        writable: true,
-        enumerable: false,
-        configurable: true,
-        value: AbortController
-      },
-      AbortSignal: {
-        writable: true,
-        enumerable: false,
-        configurable: true,
-        value: AbortSignal
-      }
-    });
-  }
-}
-
 function setupChildProcessIpcChannel() {
   if (process.env.NODE_CHANNEL_FD) {
     const assert = require('internal/assert');
@@ -464,7 +438,6 @@ module.exports = {
   setupWarningHandler,
   setupDebugEnv,
   prepareMainThreadExecution,
-  initializeAbortController,
   initializeDeprecations,
   initializeESMLoader,
   initializeFrozenIntrinsics,
diff --git a/lib/internal/main/worker_thread.js b/lib/internal/main/worker_thread.js
index 31c23993e80140..61045cf1c08490 100644
--- a/lib/internal/main/worker_thread.js
+++ b/lib/internal/main/worker_thread.js
@@ -13,7 +13,6 @@ const {
   setupInspectorHooks,
   setupWarningHandler,
   setupDebugEnv,
-  initializeAbortController,
   initializeDeprecations,
   initializeWASI,
   initializeCJSLoader,
@@ -113,7 +112,6 @@ port.on('message', (message) => {
     if (manifestSrc) {
       require('internal/process/policy').setup(manifestSrc, manifestURL);
     }
-    initializeAbortController();
     initializeDeprecations();
     initializeWASI();
     initializeCJSLoader();
diff --git a/src/node_options.cc b/src/node_options.cc
index 68bd8757cc71ae..fb94dd661cae31 100644
--- a/src/node_options.cc
+++ b/src/node_options.cc
@@ -274,10 +274,8 @@ EnvironmentOptionsParser::EnvironmentOptionsParser() {
             "experimental Source Map V3 support",
             &EnvironmentOptions::enable_source_maps,
             kAllowedInEnvironment);
-  AddOption("--experimental-abortcontroller",
-            "experimental AbortController support",
-            &EnvironmentOptions::experimental_abortcontroller,
-            kAllowedInEnvironment);
+  AddOption("--experimental-abortcontroller", "",
+            NoOp{}, kAllowedInEnvironment);
   AddOption("--experimental-json-modules",
             "experimental JSON interop support for the ES Module loader",
             &EnvironmentOptions::experimental_json_modules,
diff --git a/src/node_options.h b/src/node_options.h
index b908e639951ecb..54710e487701dd 100644
--- a/src/node_options.h
+++ b/src/node_options.h
@@ -101,7 +101,6 @@ class EnvironmentOptions : public Options {
  public:
   bool abort_on_uncaught_exception = false;
   bool enable_source_maps = false;
-  bool experimental_abortcontroller = false;
   bool experimental_json_modules = false;
   bool experimental_modules = false;
   std::string experimental_specifier_resolution;
diff --git a/test/parallel/test-abortcontroller.js b/test/parallel/test-abortcontroller.js
index c1e28e16146785..19f4eb7b49fa24 100644
--- a/test/parallel/test-abortcontroller.js
+++ b/test/parallel/test-abortcontroller.js
@@ -1,4 +1,4 @@
-// Flags: --no-warnings --experimental-abortcontroller
+// Flags: --no-warnings
 'use strict';
 
 const common = require('../common');