quic: move HTTP/3 APIs back inside node:quic

Author: pimterry

doc/api/http3.md

@@ -159,19 +159,5 @@
   "ZipEntry": "zlib.html#class-zlibzipentry",
   "ZipFile": "zlib.html#class-zlibzipfile",
   "zlib options": "zlib.html#class-options",
-  "zstd options": "zlib.html#class-zstdoptions",
-  "Http3Session": "http3.html#class-http3session",
-  "Http3Stream": "http3.html#class-http3stream",
-  "Http3Settings": "http3.html#type-http3settings",
-  "http3.OnSessionCallback": "http3.html#callback-onsessioncallback",
-  "http3.OnStreamCallback": "http3.html#callback-onstreamcallback",
-  "http3.OnGoawayCallback": "http3.html#callback-ongoawaycallback",
-  "http3.OnOriginCallback": "http3.html#callback-onorigincallback",
-  "http3.OnSettingsCallback": "http3.html#callback-onsettingscallback",
-  "http3.OnHeadersCallback": "http3.html#callback-onheaderscallback",
-  "http3.OnInfoCallback": "http3.html#callback-oninfocallback",
-  "http3.OnTrailersCallback": "http3.html#callback-ontrailerscallback",
-  "http3.OnWantTrailersCallback": "http3.html#callback-onwanttrailerscallback",
-  "http3.OnResetCallback": "http3.html#callback-onresetcallback",
-  "http3.OnErrorCallback": "http3.html#callback-onerrorcallback"
+  "zstd options": "zlib.html#class-zstdoptions"
 }

doc/api/quic.md

@@ -126,7 +126,6 @@ const legacyWrapperList = new SafeSet([
 const schemelessBlockList = new SafeSet([
   'dtls',
   'ffi',
-  'http3',
   'sea',
   'sqlite',
   'quic',
@@ -138,7 +137,6 @@ const schemelessBlockList = new SafeSet([
 const experimentalModuleList = new SafeSet([
   'dtls',
   'ffi',
-  'http3',
   'quic',
   'sqlite',
   'stream/iter',

doc/type-map.json

@@ -497,7 +497,7 @@ function initializeCJS() {
     modules = modules.filter((i) => i !== 'node:dtls');
   }
   if (!getOptionValue('--experimental-quic')) {
-    modules = modules.filter((i) => i !== 'node:quic' && i !== 'node:http3');
+    modules = modules.filter((i) => i !== 'node:quic');
   }
   if (!getOptionValue('--experimental-ffi')) {
     modules = modules.filter((i) => i !== 'node:ffi');

lib/http3.js

@@ -438,7 +438,6 @@ function setupQuic() {
 
   const { BuiltinModule } = require('internal/bootstrap/realm');
   BuiltinModule.allowRequireByUsers('quic');
-  BuiltinModule.allowRequireByUsers('http3');
 }
 
 function setupVfs() {

lib/internal/bootstrap/realm.js

@@ -252,7 +252,7 @@ const kNilDatagramId = 0n;
 // session. This is a private API for configuring native integrations, not a
 // public option: installing an application without its consumer layer on top
 // breaks the session, as applications integrate natively with their matching
-// consumer (e.g. node:http3).
+// consumer (e.g. the HTTP/3 layer in internal/quic/http3).
 const kApplication = Symbol('kApplication');
 
 // Constructor option symbol carrying the application-specific settings for
@@ -262,7 +262,7 @@ const kApplication = Symbol('kApplication');
 const kApplicationSettings = Symbol('kApplicationSettings');
 
 // Internal symbols to allow a protocol application's consumer layer (e.g.
-// node:http3) to reach the binding handles of a stream or session:
+// the HTTP/3 layer) to reach the binding handles of a stream or session:
 const kStreamHandle = Symbol('kStreamHandle');
 const kSessionHandle = Symbol('kSessionHandle');
 // Brands a C++ handle object with its application-layer owner (e.g. the
@@ -4676,7 +4676,7 @@ function processSessionOptions(options, config = kEmptyObject) {
   } = config;
 
   // The protocol application to install (internal-only; set by the
-  // application's consumer layer, e.g. node:http3). Bad values are core
+  // application's consumer layer, e.g. the HTTP/3 layer). Bad values are core
   // bugs, not user errors, so this is an internal assert.
   const application = options[kApplication];
   assert(application === undefined || typeof application === 'string',
@@ -4908,7 +4908,7 @@ module.exports = {
   DEFAULT_CIPHERS,
   DEFAULT_GROUPS,
   // Internal-only, protocol-neutral hooks for a protocol application's
-  // consumer layer (e.g. node:http3). Never exported from node:quic.
+  // consumer layer (e.g. the HTTP/3 layer). Never exported to users.
   kApplication,
   kApplicationSettings,
   kStreamHandle,

lib/internal/modules/cjs/loader.js

@@ -20,6 +20,13 @@ const {
   DEFAULT_GROUPS,
 } = require('internal/quic/quic');
 
+const {
+  connect: connectHttp3,
+  listen: listenHttp3,
+  Http3Session,
+  Http3Stream,
+} = require('internal/quic/http3');
+
 const cc = {
   get RENO() { return CC_ALGO_RENO; },
   get CUBIC() { return CC_ALGO_CUBIC; },
@@ -35,7 +42,11 @@ const constants = {
 module.exports = {
   connect,
   listen,
+  connectHttp3,
+  listenHttp3,
   listEndpoints,
+  Http3Session,
+  Http3Stream,
   QuicEndpoint,
   QuicError,
   QuicSession,

lib/internal/process/pre_execution.js

@@ -150,7 +150,6 @@ BuiltinLoader::BuiltinCategories BuiltinLoader::GetBuiltinCategories() const {
 #endif                  // !HAVE_FFI
         "dtls",         // Experimental.
         "ffi",          // Experimental.
-        "http3",        // Experimental.
         "quic",         // Experimental.
         "sqlite",       // Experimental.
         "stream/iter",  // Experimental.