Merge pull request #1031 from nodejs/main

Create a new pull request by comparing changes across two branches

Author: GulajavaMinistudio

.github/CODEOWNERS

@@ -68,6 +68,7 @@
 /lib/tls.js @nodejs/crypto @nodejs/net
 /src/crypto/* @nodejs/crypto
 /src/node_crypto* @nodejs/crypto
+/deps/ncrypto/* @nodejs/crypto
 
 # http
 

.github/workflows/notify-on-review-wanted.yml

@@ -32,7 +32,7 @@ jobs:
       - name: Slack Notification
         uses: rtCamp/action-slack-notify@4e5fb42d249be6a45a298f3c9543b111b02f7907  # 2.3.0
         env:
-          SLACK_COLOR: '#DE512A'
+          SLACK_COLOR: '#3d85c6'
           SLACK_ICON: https://github.com/nodejs.png?size=48
           SLACK_TITLE: ${{ steps.define-message.outputs.title }}
           SLACK_MESSAGE: ${{ steps.define-message.outputs.message }}

README.md

@@ -770,12 +770,6 @@ Primary GPG keys for Node.js Releasers (some Releasers sign with subkeys):
 
 * **Antoine du Hamel** <<[email protected]>>
   `C0D6248439F1D5604AAFFB4021D900FFDB233756`
-* **Beth Griggs** <<[email protected]>>
-  `4ED778F539E3634C779C87C6D7062848A1AB005C`
-* **Bryan English** <<[email protected]>>
-  `141F07595B7B3FFE74309A937405533BE57C7D57`
-* **Danielle Adams** <<[email protected]>>
-  `74F12602B6F1C4E913FAA37AD3A89613643B6201`
 * **Juan José Arboleda** <<[email protected]>>
   `DD792F5973C6DE52C432CBDAC77ABFA00DDBF2B7`
 * **Marco Ippolito** <<[email protected]>>
@@ -796,9 +790,6 @@ to sign releases):
 
 ```bash
 gpg --keyserver hkps://keys.openpgp.org --recv-keys C0D6248439F1D5604AAFFB4021D900FFDB233756 # Antoine du Hamel
-gpg --keyserver hkps://keys.openpgp.org --recv-keys 4ED778F539E3634C779C87C6D7062848A1AB005C # Beth Griggs
-gpg --keyserver hkps://keys.openpgp.org --recv-keys 141F07595B7B3FFE74309A937405533BE57C7D57 # Bryan English
-gpg --keyserver hkps://keys.openpgp.org --recv-keys 74F12602B6F1C4E913FAA37AD3A89613643B6201 # Danielle Adams
 gpg --keyserver hkps://keys.openpgp.org --recv-keys DD792F5973C6DE52C432CBDAC77ABFA00DDBF2B7 # Juan José Arboleda
 gpg --keyserver hkps://keys.openpgp.org --recv-keys CC68F5A3106FF448322E48ED27F5E38D5B0A215F # Marco Ippolito
 gpg --keyserver hkps://keys.openpgp.org --recv-keys 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 # Michaël Zasso
@@ -815,12 +806,17 @@ verify a downloaded file.
 
 <summary>Other keys used to sign some previous releases</summary>
 
+* **Beth Griggs** <<[email protected]>>
+  `4ED778F539E3634C779C87C6D7062848A1AB005C`
+* **Bryan English** <<[email protected]>>
+  `141F07595B7B3FFE74309A937405533BE57C7D57`
 * **Chris Dickinson** <<[email protected]>>
   `9554F04D7259F04124DE6B476D5A82AC7E37093B`
 * **Colin Ihrig** <<[email protected]>>
   `94AE36675C464D64BAFA68DD7434390BDBE9B9C5`
 * **Danielle Adams** <<[email protected]>>
   `1C050899334244A8AF75E53792EF661D867B9DFA`
+  `74F12602B6F1C4E913FAA37AD3A89613643B6201`
 * **Evan Lucas** <<[email protected]>>
   `B9AE9905FFD7803F25714661B63B535A4C206CA9`
 * **Gibson Fahnestock** <<[email protected]>>

benchmark/run.js

@@ -12,6 +12,8 @@ const cli = new CLI(`usage: ./node run.js [options] [--] <category> ...
                             (can be repeated)
   --exclude  pattern        excludes scripts matching <pattern> (can be
                             repeated)
+  --runs   variable=value   set the amount of benchmark suite execution.
+                            Default: 1
   --set    variable=value   set benchmark variable (can be repeated)
   --format [simple|csv]     optional value that specifies the output format
   test                      only run a single configuration from the options
@@ -45,8 +47,7 @@ if (format === 'csv') {
   console.log('"filename", "configuration", "rate", "time"');
 }
 
-(function recursive(i) {
-  const filename = benchmarks[i];
+function runBenchmark(filename) {
   const scriptPath = path.resolve(__dirname, filename);
 
   const args = cli.test ? ['--test'] : cli.optional.set;
@@ -63,42 +64,52 @@ if (format === 'csv') {
     );
   }
 
-  if (format !== 'csv') {
-    console.log();
-    console.log(filename);
-  }
-
-  child.on('message', (data) => {
-    if (data.type !== 'report') {
-      return;
-    }
-    // Construct configuration string, " A=a, B=b, ..."
-    let conf = '';
-    for (const key of Object.keys(data.conf)) {
-      if (conf !== '')
-        conf += ' ';
-      conf += `${key}=${JSON.stringify(data.conf[key])}`;
-    }
-    if (format === 'csv') {
-      // Escape quotes (") for correct csv formatting
-      conf = conf.replace(/"/g, '""');
-      console.log(`"${data.name}", "${conf}", ${data.rate}, ${data.time}`);
-    } else {
-      let rate = data.rate.toString().split('.');
-      rate[0] = rate[0].replace(/(\d)(?=(?:\d\d\d)+(?!\d))/g, '$1,');
-      rate = (rate[1] ? rate.join('.') : rate[0]);
-      console.log(`${data.name} ${conf}: ${rate}`);
-    }
+  return new Promise((resolve, reject) => {
+    child.on('message', (data) => {
+      if (data.type !== 'report') {
+        return;
+      }
+      // Construct configuration string, " A=a, B=b, ..."
+      let conf = '';
+      for (const key of Object.keys(data.conf)) {
+        if (conf !== '')
+          conf += ' ';
+        conf += `${key}=${JSON.stringify(data.conf[key])}`;
+      }
+      if (format === 'csv') {
+        // Escape quotes (") for correct csv formatting
+        conf = conf.replace(/"/g, '""');
+        console.log(`"${data.name}", "${conf}", ${data.rate}, ${data.time}`);
+      } else {
+        let rate = data.rate.toString().split('.');
+        rate[0] = rate[0].replace(/(\d)(?=(?:\d\d\d)+(?!\d))/g, '$1,');
+        rate = (rate[1] ? rate.join('.') : rate[0]);
+        console.log(`${data.name} ${conf}: ${rate}`);
+      }
+    });
+    child.once('close', (code) => {
+      if (code) {
+        reject(code);
+      } else {
+        resolve(code);
+      }
+    });
   });
+}
 
-  child.once('close', (code) => {
-    if (code) {
-      process.exit(code);
+async function run() {
+  for (let i = 0; i < benchmarks.length; ++i) {
+    let runs = cli.optional.runs ?? 1;
+    const filename = benchmarks[i];
+    if (format !== 'csv') {
+      console.log();
+      console.log(filename);
     }
 
-    // If there are more benchmarks execute the next
-    if (i + 1 < benchmarks.length) {
-      recursive(i + 1);
+    while (runs-- > 0) {
+      await runBenchmark(filename);
     }
-  });
-})(0);
+  }
+}
+
+run();

configure.py

@@ -1356,7 +1356,7 @@ def configure_zos(o):
   o['variables']['node_static_zoslib'] = b(True)
   if options.static_zoslib_gyp:
     # Apply to all Node.js components for now
-    o['variables']['zoslib_include_dir'] = Path(options.static_zoslib_gyp).parent + '/include'
+    o['variables']['zoslib_include_dir'] = Path(options.static_zoslib_gyp).parent / 'include'
     o['include_dirs'] += [o['variables']['zoslib_include_dir']]
   else:
     raise Exception('--static-zoslib-gyp=<path to zoslib.gyp file> is required.')

deps/cares/cares.gyp

@@ -1,7 +1,9 @@
 {
   'variables': {
+    # This list is generated by `tools/dep_updaters/update-c-ares.mjs`.
     'cares_sources_common': [
       'include/ares.h',
+      'include/ares_build.h',
       'include/ares_dns.h',
       'include/ares_dns_record.h',
       'include/ares_nameser.h',
@@ -49,6 +51,8 @@
       'src/lib/ares_strerror.c',
       'src/lib/ares_sysconfig.c',
       'src/lib/ares_sysconfig_files.c',
+      'src/lib/ares_sysconfig_mac.c',
+      'src/lib/ares_sysconfig_win.c',
       'src/lib/ares_timeout.c',
       'src/lib/ares_update_servers.c',
       'src/lib/ares_version.c',
@@ -111,11 +115,11 @@
       'src/lib/record/ares_dns_private.h',
       'src/lib/record/ares_dns_record.c',
       'src/lib/record/ares_dns_write.c',
-      'src/lib/str/ares__buf.h',
       'src/lib/str/ares_buf.c',
       'src/lib/str/ares_str.c',
       'src/lib/str/ares_strsplit.c',
       'src/lib/str/ares_strsplit.h',
+      'src/lib/thirdparty/apple/dnsinfo.h',
       'src/lib/util/ares_iface_ips.c',
       'src/lib/util/ares_iface_ips.h',
       'src/lib/util/ares_math.c',
@@ -128,18 +132,10 @@
       'src/lib/util/ares_timeval.c',
       'src/lib/util/ares_uri.c',
       'src/lib/util/ares_uri.h',
-      'src/tools/ares_getopt.c',
-      'src/tools/ares_getopt.h',
+      'src/lib/windows_port.c',
     ],
     'cares_sources_mac': [
       'config/darwin/ares_config.h',
-      'src/lib/ares_sysconfig_mac.c',
-      'src/lib/thirdparty/apple/dnsinfo.h',
-    ],
-    'cares_sources_win': [
-      'src/lib/ares_sysconfig_win.c',
-      'src/lib/config-win32.h',
-      'src/lib/windows_port.c',
     ],
   },
 
@@ -201,9 +197,6 @@
             '_WINSOCK_DEPRECATED_NO_WARNINGS',
           ],
           'include_dirs': [ 'config/win32' ],
-          'sources': [
-            '<@(cares_sources_win)',
-          ],
           'libraries': [
             '-lws2_32.lib',
             '-liphlpapi.lib'

deps/ncrypto/ncrypto.cc

@@ -5,6 +5,7 @@
 #include <openssl/bn.h>
 #include <openssl/evp.h>
 #include <openssl/hmac.h>
+#include <openssl/rand.h>
 #include <openssl/pkcs12.h>
 #include <openssl/x509v3.h>
 #if OPENSSL_VERSION_MAJOR >= 3

doc/api/cli.md

@@ -3076,6 +3076,10 @@ one is included in the list below.
 * `--force-fips`
 * `--force-node-api-uncaught-exceptions-policy`
 * `--frozen-intrinsics`
+* `--heap-prof-dir`
+* `--heap-prof-interval`
+* `--heap-prof-name`
+* `--heap-prof`
 * `--heapsnapshot-near-heap-limit`
 * `--heapsnapshot-signal`
 * `--http-parser`

doc/api/deprecations.md

@@ -3453,6 +3453,10 @@ Node-API callbacks.
 
 <!-- YAML
 changes:
+  - version:
+      - REPLACEME
+    pr-url: https://github.com/nodejs/node/pull/55017
+    description: Application deprecation.
   - version:
       - v19.9.0
       - v18.17.0
@@ -3465,7 +3469,7 @@ changes:
     description: Documentation-only deprecation.
 -->
 
-Type: Documentation-only (supports [`--pending-deprecation`][])
+Type: Application (non-`node_modules` code only)
 
 [`url.parse()`][] behavior is not standardized and prone to errors that
 have security implications. Use the [WHATWG URL API][] instead. CVEs are not

doc/api/net.md

@@ -603,12 +603,25 @@ changes:
 
 * {integer}
 
-Set this property to reject connections when the server's connection count gets
-high.
+When the number of connections reaches the `server.maxConnections` threshold:
+
+1. If the process is not running in cluster mode, Node.js will close the connection.
+
+2. If the process is running in cluster mode, Node.js will, by default, route the connection to another worker process. To close the connection instead, set \[`server.dropMaxConnection`]\[] to `true`.
 
 It is not recommended to use this option once a socket has been sent to a child
 with [`child_process.fork()`][].
 
+### `server.dropMaxConnection`
+
+<!-- YAML
+added: REPLACEME
+-->
+
+* {boolean}
+
+Set this property to `true` to begin closing connections once the number of connections reaches the \[`server.maxConnections`]\[] threshold. This setting is only effective in cluster mode.
+
 ### `server.ref()`
 
 <!-- YAML