quic: reduce boilerplate and other minor cleanups

While I get that macros aren't the most loved thing in
the world, they do help reduce boilerplate, and there's
a lot of boilerplate in the QUIC code. This commit cleans
up some of that boilerplate, particularly around the
use of v8 APIs.

PR-URL: #59342
Reviewed-By: Stephen Belanger <admin@stephenbelanger.com>
Reviewed-By: Ethan Arrowood <ethan@arrowood.dev>

Author: jasnell

doc/api/cli.md

@@ -1822,16 +1822,6 @@ added: v21.2.0
 
 Disable exposition of [Navigator API][] on the global scope.
 
-### `--no-experimental-quic`
-
-<!-- YAML
-added: REPLACEME
--->
-
-> Stability: 1.1 - Active Development
-
-Use this flag to disable QUIC.
-
 ### `--no-experimental-repl-await`
 
 <!-- YAML
@@ -3499,6 +3489,7 @@ one is included in the list below.
 * `--experimental-loader`
 * `--experimental-modules`
 * `--experimental-print-required-tla`
+* `--experimental-quic`
 * `--experimental-require-module`
 * `--experimental-shadow-realm`
 * `--experimental-specifier-resolution`

doc/node.1

@@ -229,9 +229,6 @@ flag is no longer required as WASI is enabled by default.
 .It Fl -experimental-quic
 Enable the experimental QUIC support.
 .
-.It Fl -no-experimental-quic
-Disable the experimental QUIC support.
-.
 .It Fl -experimental-inspector-network-resource
 Enable experimental support for inspector network resources.
 .

lib/internal/quic/quic.js

@@ -15,11 +15,14 @@ const {
   Uint8Array,
 } = primordials;
 
-// QUIC requires that Node.js be compiled with crypto support.
 const {
-  assertCrypto,
-} = require('internal/util');
-assertCrypto();
+  getOptionValue,
+} = require('internal/options');
+
+// QUIC requires that Node.js be compiled with crypto support.
+if (!process.features.quic || !getOptionValue('--experimental-quic')) {
+  return;
+}
 
 const { inspect } = require('internal/util/inspect');
 

lib/internal/quic/state.js

@@ -10,6 +10,14 @@ const {
   JSONStringify,
 } = primordials;
 
+const {
+  getOptionValue,
+} = require('internal/options');
+
+if (!process.features.quic || !getOptionValue('--experimental-quic')) {
+  return;
+}
+
 const {
   codes: {
     ERR_ILLEGAL_CONSTRUCTOR,

lib/internal/quic/stats.js

@@ -5,6 +5,14 @@ const {
   JSONStringify,
 } = primordials;
 
+const {
+  getOptionValue,
+} = require('internal/options');
+
+if (!process.features.quic || !getOptionValue('--experimental-quic')) {
+  return;
+}
+
 const {
   isArrayBuffer,
 } = require('util/types');

lib/internal/quic/symbols.js

@@ -4,6 +4,14 @@ const {
   Symbol,
 } = primordials;
 
+const {
+  getOptionValue,
+} = require('internal/options');
+
+if (!process.features.quic || !getOptionValue('--experimental-quic')) {
+  return;
+}
+
 const {
   customInspectSymbol: kInspect,
 } = require('internal/util');

src/node_metadata.h

@@ -60,6 +60,8 @@ namespace node {
   V(simdutf)                                                                   \
   V(ada)                                                                       \
   V(nbytes)                                                                    \
+  V(ngtcp2)                                                                    \
+  V(nghttp3)                                                                   \
   NODE_VERSIONS_KEY_AMARO(V)                                                   \
   NODE_VERSIONS_KEY_UNDICI(V)                                                  \
   V(merve)
@@ -80,14 +82,6 @@ namespace node {
 #define NODE_VERSIONS_KEY_INTL(V)
 #endif  // NODE_HAVE_I18N_SUPPORT
 
-#ifndef OPENSSL_NO_QUIC
-#define NODE_VERSIONS_KEY_QUIC(V)                                             \
-  V(ngtcp2)                                                                   \
-  V(nghttp3)
-#else
-#define NODE_VERSIONS_KEY_QUIC(V)
-#endif
-
 #if HAVE_SQLITE
 #define NODE_VERSIONS_KEY_SQLITE(V) V(sqlite)
 #else
@@ -98,7 +92,6 @@ namespace node {
   NODE_VERSIONS_KEYS_BASE(V)                                                   \
   NODE_VERSIONS_KEY_CRYPTO(V)                                                  \
   NODE_VERSIONS_KEY_INTL(V)                                                    \
-  NODE_VERSIONS_KEY_QUIC(V)                                                    \
   NODE_VERSIONS_KEY_SQLITE(V)
 
 #define V(key) +1

src/node_options.cc

@@ -565,10 +565,11 @@ EnvironmentOptionsParser::EnvironmentOptionsParser() {
             kAllowedInEnvvar,
             true);
   AddOption("--experimental-quic",
-            "" /* undocumented until its development */,
 #ifndef OPENSSL_NO_QUIC
+            "experimental QUIC support",
             &EnvironmentOptions::experimental_quic,
 #else
+            "" /* undocumented when no-op */,
             NoOp{},
 #endif
             kAllowedInEnvvar);

src/quic/bindingdata.cc

@@ -17,7 +17,6 @@
 namespace node {
 
 using v8::Function;
-using v8::FunctionCallbackInfo;
 using v8::FunctionTemplate;
 using v8::Local;
 using v8::Object;
@@ -144,7 +143,7 @@ QUIC_JS_CALLBACKS(V)
 
 #undef V
 
-void BindingData::SetCallbacks(const FunctionCallbackInfo<Value>& args) {
+JS_METHOD_IMPL(BindingData::SetCallbacks) {
   auto env = Environment::GetCurrent(args);
   auto isolate = env->isolate();
   auto& state = Get(env);
@@ -166,7 +165,7 @@ void BindingData::SetCallbacks(const FunctionCallbackInfo<Value>& args) {
 #undef V
 }
 
-void BindingData::FlushPacketFreelist(const FunctionCallbackInfo<Value>& args) {
+JS_METHOD_IMPL(BindingData::FlushPacketFreelist) {
   auto env = Environment::GetCurrent(args);
   auto& state = Get(env);
   state.packet_freelist.clear();
@@ -217,7 +216,7 @@ CallbackScopeBase::~CallbackScopeBase() {
   }
 }
 
-void IllegalConstructor(const FunctionCallbackInfo<Value>& args) {
+JS_METHOD_IMPL(IllegalConstructor) {
   THROW_ERR_ILLEGAL_CONSTRUCTOR(Environment::GetCurrent(args));
 }
 

src/quic/bindingdata.h

@@ -167,16 +167,15 @@ class BindingData final
 
   // Installs the set of JavaScript callback functions that are used to
   // bridge out to the JS API.
-  static void SetCallbacks(const v8::FunctionCallbackInfo<v8::Value>& args);
+  JS_METHOD(SetCallbacks);
+
+  // Purge the packet free list to free up memory.
+  JS_METHOD(FlushPacketFreelist);
 
   std::vector<BaseObjectPtr<BaseObject>> packet_freelist;
 
   std::unordered_map<Endpoint*, BaseObjectPtr<BaseObject>> listening_endpoints;
 
-  // Purge the packet free list to free up memory.
-  static void FlushPacketFreelist(
-      const v8::FunctionCallbackInfo<v8::Value>& args);
-
   bool in_ngtcp2_callback_scope = false;
   bool in_nghttp3_callback_scope = false;
   size_t current_ngtcp2_memory_ = 0;
@@ -223,7 +222,7 @@ class BindingData final
 #undef V
 };
 
-void IllegalConstructor(const v8::FunctionCallbackInfo<v8::Value>& args);
+JS_METHOD_IMPL(IllegalConstructor);
 
 // The ngtcp2 and nghttp3 callbacks have certain restrictions
 // that forbid re-entry. We provide the following scopes for