quic: handle quic constants better

Author: jasnell

lib/internal/quic/quic.js

@@ -36,9 +36,9 @@ const {
   setCallbacks,
 
   // The constants to be exposed to end users for various options.
-  CC_ALGO_RENO_STR,
-  CC_ALGO_CUBIC_STR,
-  CC_ALGO_BBR_STR,
+  CC_ALGO_RENO_STR: CC_ALGO_RENO,
+  CC_ALGO_CUBIC_STR: CC_ALGO_CUBIC,
+  CC_ALGO_BBR_STR: CC_ALGO_BBR,
   DEFAULT_CIPHERS,
   DEFAULT_GROUPS,
 
@@ -2073,16 +2073,6 @@ class QuicEndpoint {
   async [SymbolAsyncDispose]() { await this.close(); }
 };
 
-function readOnlyConstant(value) {
-  return {
-    __proto__: null,
-    value,
-    writable: false,
-    configurable: false,
-    enumerable: true,
-  };
-}
-
 /**
  * @param {EndpointOptions} endpoint
  * @returns {{ endpoint: Endpoint_, created: boolean }}
@@ -2263,10 +2253,7 @@ function processSessionOptions(options, forServer = false) {
   }
 
   if (cc !== undefined) {
-    validateString(cc, 'options.cc');
-    if (cc !== 'reno' || cc !== 'bbr' || cc !== 'cubic') {
-      throw new ERR_INVALID_ARG_VALUE('options.cc', cc);
-    }
+    validateOneOf(cc, 'options.cc', [CC_ALGO_RENO, CC_ALGO_BBR, CC_ALGO_CUBIC]);
   }
 
   const {
@@ -2393,19 +2380,15 @@ module.exports = {
   QuicSession,
   QuicStream,
   Http3,
+  CC_ALGO_RENO,
+  CC_ALGO_CUBIC,
+  CC_ALGO_BBR,
+  DEFAULT_CIPHERS,
+  DEFAULT_GROUPS,
   // These are exported only for internal testing purposes.
   getQuicStreamState,
   getQuicSessionState,
   getQuicEndpointState,
 };
 
-ObjectDefineProperties(module.exports, {
-  CC_ALGO_RENO: readOnlyConstant(CC_ALGO_RENO_STR),
-  CC_ALGO_CUBIC: readOnlyConstant(CC_ALGO_CUBIC_STR),
-  CC_ALGO_BBR: readOnlyConstant(CC_ALGO_BBR_STR),
-  DEFAULT_CIPHERS: readOnlyConstant(DEFAULT_CIPHERS),
-  DEFAULT_GROUPS: readOnlyConstant(DEFAULT_GROUPS),
-});
-
-
 /* c8 ignore stop */

lib/quic.js

@@ -1,5 +1,10 @@
 'use strict';
 
+const {
+  ObjectCreate,
+  ObjectSeal,
+} = primordials;
+
 const {
   emitExperimentalWarning,
 } = require('internal/util');
@@ -18,15 +23,36 @@ const {
   DEFAULT_GROUPS,
 } = require('internal/quic/quic');
 
-module.exports = {
-  connect,
-  listen,
-  QuicEndpoint,
-  QuicSession,
-  QuicStream,
-  CC_ALGO_RENO,
-  CC_ALGO_CUBIC,
-  CC_ALGO_BBR,
-  DEFAULT_CIPHERS,
-  DEFAULT_GROUPS,
-};
+function getEnumerableConstant(value) {
+  return {
+    __proto__: null,
+    value,
+    enumerable: true,
+    configurable: false,
+    writable: false,
+  };
+}
+
+const cc = ObjectSeal(ObjectCreate(null, {
+  __proto__: null,
+  RENO: getEnumerableConstant(CC_ALGO_RENO),
+  CUBIC: getEnumerableConstant(CC_ALGO_CUBIC),
+  BBR: getEnumerableConstant(CC_ALGO_BBR),
+}));
+
+const constants = ObjectSeal(ObjectCreate(null, {
+  __proto__: null,
+  cc: getEnumerableConstant(cc),
+  DEFAULT_CIPHERS: getEnumerableConstant(DEFAULT_CIPHERS),
+  DEFAULT_GROUPS: getEnumerableConstant(DEFAULT_GROUPS),
+}));
+
+module.exports = ObjectSeal(ObjectCreate(null, {
+  __proto__: null,
+  connect: getEnumerableConstant(connect),
+  listen: getEnumerableConstant(listen),
+  QuicEndpoint: getEnumerableConstant(QuicEndpoint),
+  QuicSession: getEnumerableConstant(QuicSession),
+  QuicStream: getEnumerableConstant(QuicStream),
+  constants: getEnumerableConstant(constants),
+}));

test/parallel/test-quic-exports.mjs

@@ -0,0 +1,43 @@
+// Flags: --experimental-quic --no-warnings
+import { hasQuic, skip } from '../common/index.mjs';
+import { strictEqual, throws } from 'node:assert';
+
+if (!hasQuic) {
+  skip('QUIC is not enabled');
+}
+
+const quic = await import('node:quic');
+
+// Test that the main exports exist and are of the correct type.
+strictEqual(typeof quic.connect, 'function');
+strictEqual(typeof quic.listen, 'function');
+strictEqual(typeof quic.QuicEndpoint, 'function');
+strictEqual(typeof quic.QuicSession, 'function');
+strictEqual(typeof quic.QuicStream, 'function');
+strictEqual(typeof quic.QuicEndpoint.Stats, 'function');
+strictEqual(typeof quic.QuicSession.Stats, 'function');
+strictEqual(typeof quic.QuicStream.Stats, 'function');
+strictEqual(typeof quic.constants, 'object');
+strictEqual(typeof quic.constants.cc, 'object');
+
+// Test that the constants exist and are of the correct type.
+strictEqual(quic.constants.cc.RENO, 'reno');
+strictEqual(quic.constants.cc.CUBIC, 'cubic');
+strictEqual(quic.constants.cc.BBR, 'bbr');
+strictEqual(quic.constants.DEFAULT_CIPHERS,
+            'TLS_AES_128_GCM_SHA256:TLS_AES_256_GCM_SHA384:' +
+            'TLS_CHACHA20_POLY1305_SHA256:TLS_AES_128_CCM_SHA256');
+strictEqual(quic.constants.DEFAULT_GROUPS, 'X25519:P-256:P-384:P-521');
+
+// Ensure the constants are.. well, constant.
+throws(() => { quic.constants.cc.RENO = 'foo'; }, TypeError);
+strictEqual(quic.constants.cc.RENO, 'reno');
+
+throws(() => { quic.constants.cc.NEW_CONSTANT = 'bar'; }, TypeError);
+strictEqual(quic.constants.cc.NEW_CONSTANT, undefined);
+
+throws(() => { quic.constants.DEFAULT_CIPHERS = 123; }, TypeError);
+strictEqual(typeof quic.constants.DEFAULT_CIPHERS, 'string');
+
+throws(() => { quic.constants.NEW_CONSTANT = 456; }, TypeError);
+strictEqual(quic.constants.NEW_CONSTANT, undefined);