[pull] main from nodejs:main

doc/api/quic.md

@@ -529,6 +529,21 @@ with either a `QuicEndpoint` or `EndpointOptions` as the argument.
 At most, any single `QuicEndpoint` can only be configured to listen as
 a server once.
 
+## `quic.listEndpoints([options])`
+
+<!-- YAML
+added: REPLACEME
+-->
+
+* `options` {object}
+  * `active` {boolean} If `true` (the default), only returns endpoints that are
+    active (not destroyed, not closing, and not busy). If `false` returns all
+    endpoints.
+* Returns: {quic.QuicEndpoint\[]}
+
+Returns the list of all `QuicEndpoint` instances. By default, only active
+endpoints are returned.
+
 ## `quic.constants`
 
 <!-- YAML

lib/dns.js

@@ -157,7 +157,8 @@ function lookup(hostname, options, callback) {
     validateFunction(callback, 'callback');
 
     validateOneOf(options, 'family', validFamilies);
-    family = options;
+    // Coerce -0 to +0.
+    family = options + 0;
   } else if (options !== undefined && typeof options !== 'object') {
     validateFunction(arguments.length === 2 ? options : callback, 'callback');
     throw new ERR_INVALID_ARG_TYPE('options', ['integer', 'object'], options);
@@ -179,7 +180,8 @@ function lookup(hostname, options, callback) {
           break;
         default:
           validateOneOf(options.family, 'options.family', validFamilies);
-          family = options.family;
+          // Coerce -0 to +0.
+          family = options.family + 0;
           break;
       }
     }
@@ -274,7 +276,8 @@ function lookupService(address, port, callback) {
 
   validateFunction(callback, 'callback');
 
-  port = +port;
+  // Coerce -0 to +0.
+  port = +port + 0;
 
   const req = new GetNameInfoReqWrap();
   req.callback = callback;

lib/dtls.js

@@ -1,10 +1,5 @@
 'use strict';
 
-const {
-  ObjectCreate,
-  ObjectSeal,
-} = primordials;
-
 const {
   emitExperimentalWarning,
 } = require('internal/util');
@@ -17,20 +12,9 @@ const {
   DTLSSession,
 } = require('internal/dtls/dtls');
 
-function getEnumerableConstant(value) {
-  return {
-    __proto__: null,
-    value,
-    enumerable: true,
-    configurable: false,
-    writable: false,
-  };
-}
-
-module.exports = ObjectSeal(ObjectCreate(null, {
-  __proto__: null,
-  connect: getEnumerableConstant(connect),
-  listen: getEnumerableConstant(listen),
-  DTLSEndpoint: getEnumerableConstant(DTLSEndpoint),
-  DTLSSession: getEnumerableConstant(DTLSSession),
-}));
+module.exports = {
+  connect,
+  listen,
+  DTLSEndpoint,
+  DTLSSession,
+};

lib/internal/blocklist.js

@@ -123,6 +123,8 @@ class BlockList {
         validateInt32(prefix, 'prefix', 0, 128);
         break;
     }
+    // Coerce -0 to +0.
+    prefix += 0;
     this[kHandle].addSubnet(network[kSocketAddressHandle], prefix);
   }
 

lib/internal/crypto/cipher.js

@@ -108,7 +108,8 @@ function getUIntOption(options, key) {
   if (options && (value = options[key]) != null) {
     if (value >>> 0 !== value)
       throw new ERR_INVALID_ARG_VALUE(`options.${key}`, value);
-    return value;
+    // Coerce -0 to +0.
+    return value + 0;
   }
   return -1;
 }
@@ -256,12 +257,16 @@ const kMinNid = 1;
 const kMaxNid = 2_147_483_647;
 function getCipherInfo(nameOrNid, options = {}) {
   validateObject(options, 'options');
-  const { keyLength, ivLength } = options;
+  let { keyLength, ivLength } = options;
   if (keyLength !== undefined) {
     validateUint32(keyLength, 'options.keyLength');
+    // Coerce -0 to +0.
+    keyLength += 0;
   }
   if (ivLength !== undefined) {
     validateUint32(ivLength, 'options.ivLength');
+    // Coerce -0 to +0.
+    ivLength += 0;
   }
 
   const type = typeof nameOrNid;

lib/internal/crypto/diffiehellman.js

@@ -92,8 +92,11 @@ function DiffieHellman(sizeOrKey, keyEncoding, generator, genEncoding) {
   // rejected with ERR_OSSL_BN_BITS_TOO_SMALL) by OpenSSL. The glue code
   // in node_crypto.cc accepts values that are IsInt32() for that reason
   // and that's why we do that here too.
-  if (typeof sizeOrKey === 'number')
+  if (typeof sizeOrKey === 'number') {
     validateInt32(sizeOrKey, 'sizeOrKey');
+    // Coerce -0 to +0.
+    sizeOrKey += 0;
+  }
 
   if (keyEncoding && !Buffer.isEncoding(keyEncoding) &&
       keyEncoding !== 'buffer') {

lib/internal/crypto/hash.js

@@ -93,10 +93,13 @@ function Hash(algorithm, options) {
   const isCopy = algorithm instanceof _Hash;
   if (!isCopy)
     validateString(algorithm, 'algorithm');
-  const xofLen = typeof options === 'object' && options !== null ?
+  let xofLen = typeof options === 'object' && options !== null ?
     options.outputLength : undefined;
-  if (xofLen !== undefined)
+  if (xofLen !== undefined) {
     validateUint32(xofLen, 'options.outputLength');
+    // Coerce -0 to +0.
+    xofLen += 0;
+  }
   // Lookup the cached ID from JS land because it's faster than decoding
   // the string in C++ land.
   const algorithmId = isCopy ? -1 : getCachedHashId(algorithm);
@@ -285,6 +288,8 @@ function hash(algorithm, input, options) {
 
   if (outputLength !== undefined) {
     validateUint32(outputLength, 'outputLength');
+    // Coerce -0 to +0.
+    outputLength += 0;
   }
 
   if (outputLength === undefined) {

lib/internal/crypto/hkdf.js

@@ -58,6 +58,8 @@ const validateParameters = hideStackFrames((hash, key, salt, info, length) => {
   info = validateByteSource.withoutStackTrace(info, 'info');
 
   validateInteger.withoutStackTrace(length, 'length', 0, kMaxLength);
+  // Coerce -0 to +0.
+  length += 0;
 
   if (info.byteLength > 1024) {
     throw new ERR_OUT_OF_RANGE.HideStackFramesError(

lib/internal/crypto/keygen.js

@@ -219,14 +219,18 @@ function createJob(mode, type, options) {
     case 'rsa-pss':
     {
       validateObject(options, 'options');
-      const { modulusLength } = options;
+      let { modulusLength } = options;
       validateUint32(modulusLength, 'options.modulusLength');
+      // Coerce -0 to +0.
+      modulusLength += 0;
 
       let { publicExponent } = options;
       if (publicExponent == null) {
         publicExponent = 0x10001;
       } else {
         validateUint32(publicExponent, 'options.publicExponent');
+        // Coerce -0 to +0.
+        publicExponent += 0;
       }
 
       if (type === 'rsa') {
@@ -238,12 +242,14 @@ function createJob(mode, type, options) {
           ...encoding);
       }
 
-      const {
-        hashAlgorithm, mgf1HashAlgorithm, saltLength,
-      } = options;
+      const { hashAlgorithm, mgf1HashAlgorithm } = options;
+      let { saltLength } = options;
 
-      if (saltLength !== undefined)
+      if (saltLength !== undefined) {
         validateInt32(saltLength, 'options.saltLength', 0);
+        // Coerce -0 to +0.
+        saltLength += 0;
+      }
       if (hashAlgorithm !== undefined)
         validateString(hashAlgorithm, 'options.hashAlgorithm');
       if (mgf1HashAlgorithm !== undefined)
@@ -284,14 +290,19 @@ function createJob(mode, type, options) {
     case 'dsa':
     {
       validateObject(options, 'options');
-      const { modulusLength } = options;
+      let { modulusLength } = options;
       validateUint32(modulusLength, 'options.modulusLength');
+      // Coerce -0 to +0.
+      modulusLength += 0;
 
       let { divisorLength } = options;
       if (divisorLength == null) {
         divisorLength = -1;
-      } else
+      } else {
         validateInt32(divisorLength, 'options.divisorLength', 0);
+        // Coerce -0 to +0.
+        divisorLength += 0;
+      }
 
       return new DsaKeyPairGenJob(
         mode,
@@ -321,7 +332,8 @@ function createJob(mode, type, options) {
     case 'dh':
     {
       validateObject(options, 'options');
-      const { group, primeLength, prime, generator } = options;
+      const { group, prime } = options;
+      let { primeLength, generator } = options;
       if (group != null) {
         if (prime != null)
           throw new ERR_INCOMPATIBLE_OPTION_PAIR('group', 'prime');
@@ -342,13 +354,17 @@ function createJob(mode, type, options) {
         validateBuffer(prime, 'options.prime');
       } else if (primeLength != null) {
         validateInt32(primeLength, 'options.primeLength', 0);
+        // Coerce -0 to +0.
+        primeLength += 0;
       } else {
         throw new ERR_MISSING_OPTION(
           'At least one of the group, prime, or primeLength options');
       }
 
       if (generator != null) {
         validateInt32(generator, 'options.generator', 0);
+        // Coerce -0 to +0.
+        generator += 0;
       }
       return new DhKeyPairGenJob(
         mode,

lib/internal/crypto/random.js

@@ -603,12 +603,14 @@ function checkPrime(candidate, options = kEmptyObject, callback) {
   }
   validateFunction(callback, 'callback');
   validateObject(options, 'options');
-  const {
+  let {
     checks = 0,
   } = options;
 
   // The checks option is unsigned but must fit into a signed C int for OpenSSL.
   validateInt32(checks, 'options.checks', 0);
+  // Coerce -0 to +0.
+  checks += 0;
 
   const job = new CheckPrimeJob(kCryptoJobAsync, candidate, checks);
   job.ondone = callback;
@@ -632,12 +634,14 @@ function checkPrimeSync(candidate, options = kEmptyObject) {
     );
   }
   validateObject(options, 'options');
-  const {
+  let {
     checks = 0,
   } = options;
 
   // The checks option is unsigned but must fit into a signed C int for OpenSSL.
   validateInt32(checks, 'options.checks', 0);
+  // Coerce -0 to +0.
+  checks += 0;
 
   const job = new CheckPrimeJob(kCryptoJobSync, candidate, checks);
   const { 0: err, 1: result } = job.run();

lib/internal/dns/promises.js

@@ -205,7 +205,8 @@ function lookup(hostname, options) {
 
   if (typeof options === 'number') {
     validateOneOf(options, 'family', validFamilies);
-    family = options;
+    // Coerce -0 to +0.
+    family = options + 0;
   } else if (options !== undefined && typeof options !== 'object') {
     throw new ERR_INVALID_ARG_TYPE('options', ['integer', 'object'], options);
   } else {
@@ -216,7 +217,8 @@ function lookup(hostname, options) {
     }
     if (options?.family != null) {
       validateOneOf(options.family, 'options.family', validFamilies);
-      family = options.family;
+      // Coerce -0 to +0.
+      family = options.family + 0;
     }
     if (options?.all != null) {
       validateBoolean(options.all, 'options.all');

lib/internal/dns/utils.js

@@ -45,14 +45,18 @@ const {
 } = require('internal/v8/startup_snapshot');
 
 function validateTimeout(options) {
-  const { timeout = -1 } = { ...options };
+  let { timeout = -1 } = { ...options };
   validateInt32(timeout, 'options.timeout', -1);
+  // Coerce -0 to +0.
+  timeout += 0;
   return timeout;
 }
 
 function validateMaxTimeout(options) {
-  const { maxTimeout = 0 } = { ...options };
+  let { maxTimeout = 0 } = { ...options };
   validateUint32(maxTimeout, 'options.maxTimeout');
+  // Coerce -0 to +0.
+  maxTimeout += 0;
   return maxTimeout;
 }
 

lib/internal/fs/utils.js

@@ -724,7 +724,8 @@ function getStatFsFromBinding(stats) {
 function stringToFlags(flags, name = 'flags') {
   if (typeof flags === 'number') {
     validateInt32(flags, name);
-    return flags;
+    // Coerce -0 to +0.
+    return flags + 0;
   }
 
   if (flags == null) {

lib/internal/fs/watchers.js

@@ -176,6 +176,8 @@ StatWatcher.prototype[kFSStatWatcherStart] = function(filename,
 
   filename = getValidatedPath(filename, 'filename');
   validateUint32(interval, 'interval');
+  // Coerce -0 to +0.
+  interval += 0;
   const err = this._handle.start(toNamespacedPath(filename), interval);
   if (err) {
     const error = new UVException({

lib/internal/quic/quic.js

@@ -5,6 +5,7 @@
 /* c8 ignore start */
 
 const {
+  ArrayFrom,
   ArrayIsArray,
   ArrayPrototypePush,
   BigInt,
@@ -4737,6 +4738,24 @@ function findSuitableEndpoint(targetAddress) {
   return undefined;
 }
 
+/**
+ * Returns a list of all active endpoints.
+ * @param {object} [options]
+ * @param {boolean} [options.active] When true, only return endpoints that are not destroyed, closing, or busy.
+ * @returns {QuicEndpoint[]}
+ */
+function listEndpoints(options = kEmptyObject) {
+  validateObject(options, 'options');
+  const { active = true } = options;
+  validateBoolean(active, 'options.active');
+  if (!active) {
+    return ArrayFrom(endpointRegistry);
+  }
+  return ArrayFrom(endpointRegistry).filter((endpoint) => {
+    return !endpoint.destroyed && !endpoint.closing && !endpoint.busy;
+  });
+}
+
 /**
  * @param {EndpointOptions|QuicEndpoint|undefined} endpoint
  * @param {boolean} reuseEndpoint
@@ -5340,6 +5359,7 @@ module.exports = {
   getQuicStreamState,
   getQuicSessionState,
   getQuicEndpointState,
+  listEndpoints,
 };
 
 /* c8 ignore stop */