http2: make --expose-http2 flag a non-op

Make the `http2` module always available.
The `--expose-http2` cli flag is made a non-op

PR-URL: nodejs/node#15535
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
Reviewed-By: Ali Ijaz Sheikh <ofrobots@google.com>
Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>

benchmark/http2/headers.js

@@ -6,7 +6,7 @@ const PORT = common.PORT;
 const bench = common.createBenchmark(main, {
   n: [1e3],
   nheaders: [0, 10, 100, 1000],
-}, { flags: ['--expose-http2', '--no-warnings'] });
+}, { flags: ['--no-warnings'] });
 
 function main(conf) {
   const n = +conf.n;

benchmark/http2/respond-with-fd.js

@@ -11,7 +11,7 @@ const bench = common.createBenchmark(main, {
   requests: [100, 1000, 10000, 100000, 1000000],
   streams: [100, 200, 1000],
   clients: [1, 2]
-}, { flags: ['--expose-http2', '--no-warnings'] });
+}, { flags: ['--no-warnings'] });
 
 function main(conf) {
 

benchmark/http2/simple.js

@@ -12,7 +12,7 @@ const bench = common.createBenchmark(main, {
   requests: [100, 1000, 10000, 100000],
   streams: [100, 200, 1000],
   clients: [1, 2]
-}, { flags: ['--expose-http2', '--no-warnings'] });
+}, { flags: ['--no-warnings'] });
 
 function main(conf) {
   const n = +conf.requests;

benchmark/http2/write.js

@@ -6,7 +6,7 @@ const PORT = common.PORT;
 const bench = common.createBenchmark(main, {
   streams: [100, 200, 1000],
   length: [64 * 1024, 128 * 1024, 256 * 1024, 1024 * 1024],
-}, { flags: ['--expose-http2', '--no-warnings'] });
+}, { flags: ['--no-warnings'] });
 
 function main(conf) {
   const m = +conf.streams;

doc/api/cli.md

@@ -175,13 +175,6 @@ added: v6.0.0
 
 Silence all process warnings (including deprecations).
 
-### `--expose-http2`
-<!-- YAML
-added: v8.4.0
--->
-
-Enable the experimental `'http2'` module.
-
 ### `--abort-on-uncaught-exception`
 <!-- YAML
 added: v0.10

doc/api/http2.md

@@ -9,9 +9,6 @@ can be accessed using:
 const http2 = require('http2');
 ```
 
-*Note*: Node.js must be launched with the `--expose-http2` command line flag
-in order to use the `'http2'` module.
-
 ## Core API
 
 The Core API provides a low-level interface designed specifically around

doc/ayo.1

@@ -130,10 +130,6 @@ Emit pending deprecation warnings.
 .BR \-\-no\-warnings
 Silence all process warnings (including deprecations).
 
-.TP
-.BR \-\-expose\-http2
-Enable the experimental `'http2'` module.
-
 .TP
 .BR \-\-napi\-modules
 Enable loading native modules compiled with the ABI-stable Node.js API (N-API)

lib/internal/bootstrap_node.js

@@ -509,9 +509,6 @@
 
   const config = process.binding('config');
 
-  if (!config.exposeHTTP2)
-    delete NativeModule._source.http2;
-
   NativeModule.require = function(id) {
     if (id === 'native_module') {
       return NativeModule;

lib/internal/module.js

@@ -78,15 +78,11 @@ function stripShebang(content) {
 
 const builtinLibs = [
   'assert', 'async_hooks', 'buffer', 'child_process', 'cluster', 'crypto',
-  'dgram', 'dns', 'domain', 'events', 'fs', 'http', 'https', 'net',
+  'dgram', 'dns', 'domain', 'events', 'fs', 'http', 'http2', 'https', 'net',
   'os', 'path', 'perf_hooks', 'punycode', 'querystring', 'readline', 'repl',
   'stream', 'string_decoder', 'tls', 'tty', 'url', 'util', 'v8', 'vm', 'zlib'
 ];
 
-const { exposeHTTP2 } = process.binding('config');
-if (exposeHTTP2)
-  builtinLibs.push('http2');
-
 function addBuiltinLibsToObject(object) {
   // Make built-in modules available directly (loaded lazily).
   builtinLibs.forEach((name) => {

src/node.cc

@@ -247,9 +247,6 @@ std::string config_warning_file;  // NOLINT(runtime/string)
 // that is used by lib/internal/bootstrap_node.js
 bool config_expose_internals = false;
 
-// Set in node.cc by ParseArgs when --expose-http2 is used.
-bool config_expose_http2 = false;
-
 bool v8_initialized = false;
 
 bool linux_at_secure = false;
@@ -3829,7 +3826,6 @@ static void PrintHelp() {
          "  --abort-on-uncaught-exception\n"
          "                             aborting instead of exiting causes a\n"
          "                             core file to be generated for analysis\n"
-         "  --expose-http2             enable experimental HTTP2 support\n"
          "  --trace-warnings           show stack traces on process warnings\n"
          "  --redirect-warnings=file\n"
          "                             write warnings to file instead of\n"
@@ -3953,7 +3949,7 @@ static void CheckIfAllowedInEnv(const char* exe, bool is_env,
     "--pending-deprecation",
     "--no-warnings",
     "--napi-modules",
-    "--expose-http2",
+    "--expose-http2",   // keep as a non-op through v9.x
     "--trace-warnings",
     "--redirect-warnings",
     "--trace-sync-io",
@@ -4155,7 +4151,7 @@ static void ParseArgs(int* argc,
       config_expose_internals = true;
     } else if (strcmp(arg, "--expose-http2") == 0 ||
                strcmp(arg, "--expose_http2") == 0) {
-      config_expose_http2 = true;
+      // Keep as a non-op through v9.x
     } else if (strcmp(arg, "-") == 0) {
       break;
     } else if (strcmp(arg, "--") == 0) {

src/node_config.cc

@@ -74,9 +74,6 @@ static void InitConfig(Local<Object> target,
   if (config_expose_internals)
     READONLY_BOOLEAN_PROPERTY("exposeInternals");
 
-  if (config_expose_http2)
-    READONLY_BOOLEAN_PROPERTY("exposeHTTP2");
-
   READONLY_PROPERTY(target,
                     "bits",
                     Number::New(env->isolate(), 8 * sizeof(intptr_t)));

src/node_internals.h

@@ -86,8 +86,6 @@ extern std::string openssl_config;
 // that is used by lib/module.js
 extern bool config_preserve_symlinks;
 
-// Set in node.cc by ParseArgs when --expose-http2 is used.
-extern bool config_expose_http2;
 // Set in node.cc by ParseArgs when --experimental-modules is used.
 // Used in node_config.cc to set a constant on process.binding('config')
 // that is used by lib/module.js

test/parallel/test-http2-binding.js

@@ -1,4 +1,3 @@
-// Flags: --expose-http2
 'use strict';
 
 const common = require('../common');

test/parallel/test-http2-client-data-end.js

@@ -1,4 +1,3 @@
-// Flags: --expose-http2
 'use strict';
 
 const common = require('../common');

test/parallel/test-http2-client-destroy-before-connect.js

@@ -1,4 +1,3 @@
-// Flags: --expose-http2
 'use strict';
 
 const common = require('../common');

test/parallel/test-http2-client-destroy-before-request.js

@@ -1,4 +1,3 @@
-// Flags: --expose-http2
 'use strict';
 
 const common = require('../common');

test/parallel/test-http2-client-destroy-goaway.js

@@ -1,4 +1,3 @@
-// Flags: --expose-http2
 'use strict';
 
 const common = require('../common');

test/parallel/test-http2-client-destroy.js

@@ -1,4 +1,3 @@
-// Flags: --expose-http2
 'use strict';
 
 const common = require('../common');

test/parallel/test-http2-client-onconnect-errors.js

@@ -1,4 +1,3 @@
-// Flags: --expose-http2
 'use strict';
 
 const {

test/parallel/test-http2-client-priority-before-connect.js

@@ -1,4 +1,3 @@
-// Flags: --expose-http2
 'use strict';
 
 const common = require('../common');

test/parallel/test-http2-client-promisify-connect.js

@@ -1,4 +1,3 @@
-// Flags: --expose-http2
 'use strict';
 
 const common = require('../common');

test/parallel/test-http2-client-request-options-errors.js

@@ -1,4 +1,3 @@
-// Flags: --expose-http2
 'use strict';
 
 const common = require('../common');

test/parallel/test-http2-client-rststream-before-connect.js

@@ -1,4 +1,3 @@
-// Flags: --expose-http2
 'use strict';
 
 const common = require('../common');

test/parallel/test-http2-client-set-priority.js

@@ -1,4 +1,3 @@
-// Flags: --expose-http2
 'use strict';
 
 const common = require('../common');

test/parallel/test-http2-client-settings-before-connect.js

@@ -1,4 +1,3 @@
-// Flags: --expose-http2
 'use strict';
 
 const common = require('../common');

test/parallel/test-http2-client-shutdown-before-connect.js

@@ -1,4 +1,3 @@
-// Flags: --expose-http2
 'use strict';
 
 const common = require('../common');

test/parallel/test-http2-client-socket-destroy.js

@@ -1,4 +1,3 @@
-// Flags: --expose-http2
 'use strict';
 
 const common = require('../common');

test/parallel/test-http2-client-stream-destroy-before-connect.js

@@ -1,4 +1,3 @@
-// Flags: --expose-http2
 'use strict';
 
 const common = require('../common');

test/parallel/test-http2-client-unescaped-path.js

@@ -1,4 +1,3 @@
-// Flags: --expose-http2
 'use strict';
 
 const common = require('../common');

test/parallel/test-http2-client-upload.js

@@ -1,4 +1,3 @@
-// Flags: --expose-http2
 'use strict';
 
 // Verifies that uploading data from a client works

test/parallel/test-http2-client-write-before-connect.js

@@ -1,4 +1,3 @@
-// Flags: --expose-http2
 'use strict';
 
 const common = require('../common');

test/parallel/test-http2-compat-errors.js

@@ -1,4 +1,4 @@
-// Flags: --expose-http2 --expose-internals
+// Flags: --expose-internals
 'use strict';
 
 const common = require('../common');

test/parallel/test-http2-compat-expect-continue-check.js

@@ -1,4 +1,3 @@
-// Flags: --expose-http2
 'use strict';
 
 const common = require('../common');

test/parallel/test-http2-compat-expect-continue.js

@@ -1,4 +1,3 @@
-// Flags: --expose-http2
 'use strict';
 
 const common = require('../common');

test/parallel/test-http2-compat-expect-handling.js

@@ -1,4 +1,3 @@
-// Flags: --expose-http2
 'use strict';
 
 const common = require('../common');

test/parallel/test-http2-compat-method-connect.js

@@ -1,4 +1,3 @@
-// Flags: --expose-http2
 'use strict';
 
 const common = require('../common');

test/parallel/test-http2-compat-serverrequest-end.js

@@ -1,4 +1,3 @@
-// Flags: --expose-http2
 'use strict';
 
 const common = require('../common');

test/parallel/test-http2-compat-serverrequest-headers.js

@@ -1,4 +1,3 @@
-// Flags: --expose-http2
 'use strict';
 
 const common = require('../common');

test/parallel/test-http2-compat-serverrequest-pause.js

@@ -1,4 +1,3 @@
-// Flags: --expose-http2
 'use strict';
 
 const common = require('../common');

test/parallel/test-http2-compat-serverrequest-pipe.js

@@ -1,4 +1,3 @@
-// Flags: --expose-http2
 'use strict';
 
 const common = require('../common');

test/parallel/test-http2-compat-serverrequest-settimeout.js

@@ -1,4 +1,3 @@
-// Flags: --expose-http2
 'use strict';
 
 const common = require('../common');

test/parallel/test-http2-compat-serverrequest-trailers.js

@@ -1,4 +1,3 @@
-// Flags: --expose-http2
 'use strict';
 
 const common = require('../common');

test/parallel/test-http2-compat-serverrequest.js

@@ -1,4 +1,3 @@
-// Flags: --expose-http2
 'use strict';
 
 const common = require('../common');

test/parallel/test-http2-compat-serverresponse-close.js

@@ -1,4 +1,4 @@
-// Flags: --expose-http2 --expose-internals
+// Flags: --expose-internals
 'use strict';
 
 const common = require('../common');

test/parallel/test-http2-compat-serverresponse-createpushresponse.js

@@ -1,4 +1,3 @@
-// Flags: --expose-http2
 'use strict';
 
 const common = require('../common');

test/parallel/test-http2-compat-serverresponse-destroy.js

@@ -1,4 +1,3 @@
-// Flags: --expose-http2
 'use strict';
 
 const common = require('../common');

test/parallel/test-http2-compat-serverresponse-drain.js

@@ -1,4 +1,3 @@
-// Flags: --expose-http2
 'use strict';
 
 const common = require('../common');

test/parallel/test-http2-compat-serverresponse-end.js

@@ -1,4 +1,3 @@
-// Flags: --expose-http2
 'use strict';
 
 const { mustCall, mustNotCall, hasCrypto, skip } = require('../common');

test/parallel/test-http2-compat-serverresponse-finished.js

@@ -1,4 +1,3 @@
-// Flags: --expose-http2
 'use strict';
 
 const common = require('../common');

test/parallel/test-http2-compat-serverresponse-flushheaders.js

@@ -1,4 +1,3 @@
-// Flags: --expose-http2
 'use strict';
 
 const common = require('../common');

test/parallel/test-http2-compat-serverresponse-headers.js

@@ -1,4 +1,3 @@
-// Flags: --expose-http2
 'use strict';
 
 const common = require('../common');

test/parallel/test-http2-compat-serverresponse-settimeout.js

@@ -1,4 +1,3 @@
-// Flags: --expose-http2
 'use strict';
 
 const common = require('../common');

test/parallel/test-http2-compat-serverresponse-statuscode.js

@@ -1,4 +1,3 @@
-// Flags: --expose-http2
 'use strict';
 
 const common = require('../common');

test/parallel/test-http2-compat-serverresponse-statusmessage-property-set.js

@@ -1,4 +1,3 @@
-// Flags: --expose-http2
 'use strict';
 
 const common = require('../common');

test/parallel/test-http2-compat-serverresponse-statusmessage-property.js

@@ -1,4 +1,3 @@
-// Flags: --expose-http2
 'use strict';
 
 const common = require('../common');

test/parallel/test-http2-compat-serverresponse-statusmessage.js

@@ -1,4 +1,3 @@
-// Flags: --expose-http2
 'use strict';
 
 const common = require('../common');

test/parallel/test-http2-compat-serverresponse-trailers.js

@@ -1,4 +1,3 @@
-// Flags: --expose-http2
 'use strict';
 
 const common = require('../common');

test/parallel/test-http2-compat-serverresponse-write-no-cb.js

@@ -1,4 +1,3 @@
-// Flags: --expose-http2
 'use strict';
 
 const { mustCall,

test/parallel/test-http2-compat-serverresponse-writehead.js

@@ -1,4 +1,3 @@
-// Flags: --expose-http2
 'use strict';
 
 const common = require('../common');

test/parallel/test-http2-connect-method.js

@@ -1,4 +1,3 @@
-// Flags: --expose-http2
 'use strict';
 
 const common = require('../common');

test/parallel/test-http2-connect.js

@@ -1,4 +1,3 @@
-// Flags: --expose-http2
 'use strict';
 
 const { mustCall, hasCrypto, skip, expectsError } = require('../common');