v19.6.0 proposal

.github/workflows/build-windows.yml

@@ -34,7 +34,7 @@ jobs:
     if: github.event.pull_request.draft == false
     strategy:
       matrix:
-        windows: [windows-2019]
+        windows: [windows-2019, windows-2022]
       fail-fast: false
     runs-on: ${{ matrix.windows }}
     steps:

.github/workflows/coverage-windows.yml

@@ -37,7 +37,7 @@ permissions:
 jobs:
   coverage-windows:
     if: github.event.pull_request.draft == false
-    runs-on: windows-2019
+    runs-on: windows-2022
     steps:
       - uses: actions/checkout@v3
         with:

.github/workflows/tools.yml

@@ -78,8 +78,8 @@ jobs:
                 ./tools/update-undici.sh
               fi
           - id: postject
-            subsystem: deps
-            label: dependencies
+            subsystem: test
+            label: test
             run: |
               NEW_VERSION=$(npm view postject dist-tags.latest)
               CURRENT_VERSION=$(node -p "require('./test/fixtures/postject-copy/node_modules/postject/package.json').version")

.mailmap

@@ -4,6 +4,7 @@ Aaron Heckmann <[email protected]> <[email protected]>
 Aayush Ahuja <[email protected]>
 Abe Fettig <[email protected]> <[email protected]>
 Abhimanyu Vashisht <[email protected]>
+Adam Langley <[email protected]> <[email protected]>
 Akhil Marsonya <[email protected]>
 Akhil Marsonya <[email protected]> <[email protected]>
 Akito Ito <[email protected]> <[email protected]>

AUTHORS

@@ -908,7 +908,7 @@ Jeff Harris <[email protected]>
 Alexander Makarenko <[email protected]>
 Drew Folta <[email protected]>
 Dmitriy Lazarev <[email protected]>
-Adam Langley <agl@google.com>
+Adam Langley <agl@imperialviolet.org>
 Kári Tristan Helgason <[email protected]>
 Manuel Valls <[email protected]>
 Prayag Verma <[email protected]>
@@ -3595,5 +3595,15 @@ Aaron Friel <[email protected]>
 Vaishno Chaitanya <[email protected]>
 Jonathan Diaz <[email protected]>
 Mike Roth <[email protected]>
+Almeida <[email protected]>
+Kevin Eady <[email protected]>
+Mordy Tikotzky <[email protected]>
+vitpavlenko <[email protected]>
+Tim Gerk <[email protected]>
+Suyash Nayan <[email protected]>
+0xflotus <[email protected]>
+Alec Mev <[email protected]>
+Miguel Teixeira <[email protected]>
+José Dapena Paz <[email protected]>
 
 # Generated by tools/update-authors.mjs

CHANGELOG.md

@@ -35,7 +35,8 @@ release.
 </tr>
 <tr>
   <td valign="top">
-<b><a href="doc/changelogs/CHANGELOG_V19.md#19.5.0">19.5.0</a></b><br/>
+<b><a href="doc/changelogs/CHANGELOG_V19.md#19.6.0">19.6.0</a></b><br/>
+<a href="doc/changelogs/CHANGELOG_V19.md#19.5.0">19.5.0</a><br/>
 <a href="doc/changelogs/CHANGELOG_V19.md#19.4.0">19.4.0</a><br/>
 <a href="doc/changelogs/CHANGELOG_V19.md#19.3.0">19.3.0</a><br/>
 <a href="doc/changelogs/CHANGELOG_V19.md#19.2.0">19.2.0</a><br/>

README.md

@@ -324,8 +324,6 @@ For information about the governance of the Node.js project, see
   **Adrian Estrada** <<[email protected]>> (he/him)
 * [erickwendel](https://github.com/erickwendel) -
   **Erick Wendel** <<[email protected]>> (he/him)
-* [evanlucas](https://github.com/evanlucas) -
-  **Evan Lucas** <<[email protected]>> (he/him)
 * [fhinkel](https://github.com/fhinkel) -
   **Franziska Hinkelmann** <<[email protected]>> (she/her)
 * [F3n67u](https://github.com/F3n67u) -
@@ -512,6 +510,8 @@ For information about the governance of the Node.js project, see
   **Alexander Makarenko** <<[email protected]>>
 * [eugeneo](https://github.com/eugeneo) -
   **Eugene Ostroukhov** <<[email protected]>>
+* [evanlucas](https://github.com/evanlucas) -
+  **Evan Lucas** <<[email protected]>> (he/him)
 * [firedfox](https://github.com/firedfox) -
   **Daniel Wang** <<[email protected]>>
 * [Fishrock123](https://github.com/Fishrock123) -

benchmark/.eslintrc.yaml

@@ -5,11 +5,29 @@ env:
   es6: true
 
 rules:
-  comma-dangle: [error, {
-    arrays: always-multiline,
-    exports: only-multiline,
-    functions: only-multiline,
-    imports: only-multiline,
-    objects: only-multiline,
-  }]
   prefer-arrow-callback: error
+
+overrides:
+  - files:
+      - async_hooks/*.js
+      - buffers/*.js
+      - buffers-fill/*.js
+      - crypto/*.js
+      - fs/*.js
+      - http/*.js
+      - http2/*.js
+      - misc/*.js
+      - module/*.js
+      - net/*.js
+      - path/*.js
+      - process/*.js
+      - url/*.js
+      - util/*.js
+    rules:
+      comma-dangle: [error, {
+        arrays: always-multiline,
+        exports: always-multiline,
+        functions: only-multiline,
+        imports: always-multiline,
+        objects: only-multiline,
+      }]

benchmark/_http-benchmarkers.js

@@ -106,7 +106,7 @@ class TestDoubleBenchmarker {
     const scheme = options.scheme || 'http';
     const env = {
       test_url: `${scheme}://127.0.0.1:${options.port}${options.path}`,
-      ...process.env
+      ...process.env,
     };
 
     const child = child_process.fork(this.executable,
@@ -203,7 +203,7 @@ exports.run = function(options, callback) {
     connections: 100,
     duration: 5,
     benchmarker: exports.default_http_benchmarker,
-    ...options
+    ...options,
   };
   if (!options.benchmarker) {
     callback(new Error('Could not locate required http benchmarker. See ' +

benchmark/assert/deepequal-map.js

@@ -46,7 +46,7 @@ function main({ n, len, method, strict }) {
     }
     case 'deepEqual_mixed': {
       const values = array.map(
-        (_, i) => [i % 2 ? [`str_${i}`, 1] : `str_${i}`, 123]
+        (_, i) => [i % 2 ? [`str_${i}`, 1] : `str_${i}`, 123],
       );
       benchmark(strict ? deepStrictEqual : deepEqual, n, values);
       break;
@@ -67,7 +67,7 @@ function main({ n, len, method, strict }) {
     }
     case 'notDeepEqual_mixed': {
       const values = array.map(
-        (_, i) => [i % 2 ? [`str_${i}`, 1] : `str_${i}`, 123]
+        (_, i) => [i % 2 ? [`str_${i}`, 1] : `str_${i}`, 123],
       );
       const values2 = values.slice(0);
       values2[0] = ['w00t', 123];

benchmark/blob/blob.js

@@ -5,7 +5,7 @@ const { Blob } = require('buffer');
 const bench = common.createBenchmark(main, {
   bytes: [128, 1024, 1024 ** 2],
   n: [1e6],
-  operation: ['text', 'arrayBuffer']
+  operation: ['text', 'arrayBuffer'],
 });
 
 async function run(n, bytes, operation) {

benchmark/blob/file.js

@@ -5,7 +5,7 @@ const { File } = require('buffer');
 const bench = common.createBenchmark(main, {
   bytes: [128, 1024, 1024 ** 2],
   n: [1e6],
-  operation: ['text', 'arrayBuffer']
+  operation: ['text', 'arrayBuffer'],
 });
 
 const options = {

benchmark/buffers/buffer-copy.js

@@ -5,6 +5,12 @@ const bench = common.createBenchmark(main, {
   bytes: [0, 8, 128, 32 * 1024],
   partial: ['true', 'false'],
   n: [6e6]
+}, {
+  combinationFilter: (p) => {
+    return (p.partial === 'false' && p.bytes === 0) ||
+           (p.partial !== 'false' && p.bytes !== 0);
+  },
+  test: { partial: 'false', bytes: 0 },
 });
 
 function main({ n, bytes, partial }) {

benchmark/buffers/buffer-indexof.js

@@ -19,9 +19,14 @@ const searchStrings = [
 
 const bench = common.createBenchmark(main, {
   search: searchStrings,
-  encoding: ['utf8', 'ucs2'],
+  encoding: ['undefined', 'utf8', 'ucs2'],
   type: ['buffer', 'string'],
   n: [5e4]
+}, {
+  combinationFilter: (p) => {
+    return (p.type === 'buffer' && p.encoding === 'undefined') ||
+           (p.type !== 'buffer' && p.encoding !== 'undefined');
+  },
 });
 
 function main({ n, search, encoding, type }) {

benchmark/buffers/buffer-tostring.js

@@ -3,10 +3,15 @@
 const common = require('../common.js');
 
 const bench = common.createBenchmark(main, {
-  encoding: ['utf8', 'ascii', 'latin1', 'hex', 'UCS-2'],
+  encoding: ['', 'utf8', 'ascii', 'latin1', 'hex', 'UCS-2'],
   args: [0, 1, 3],
   len: [1, 64, 1024],
   n: [1e6]
+}, {
+  combinationFilter: (p) => {
+    return (p.args === 0 && p.encoding === '') ||
+           (p.args !== 0 && p.encoding !== '');
+  },
 });
 
 function main({ encoding, args, len, n }) {

benchmark/child_process/child-process-exec-stdout.js

@@ -9,7 +9,7 @@ if (!isWindows) messagesLength.push(32768);
 
 const bench = common.createBenchmark(childProcessExecStdout, {
   len: messagesLength,
-  dur: [5]
+  dur: [5],
 });
 
 function childProcessExecStdout({ dur, len }) {

benchmark/child_process/child-process-read-ipc.js

@@ -15,7 +15,7 @@ if (process.argv[2] === 'child') {
       64, 256, 1024, 4096, 16384, 65536,
       65536 << 4, 65536 << 6 - 1,
     ],
-    dur: [5]
+    dur: [5],
   });
   const spawn = require('child_process').spawn;
 

benchmark/child_process/child-process-read.js

@@ -14,7 +14,7 @@ if (os.platform() !== 'win32')
 
 const bench = common.createBenchmark(main, {
   len: messagesLength,
-  dur: [5]
+  dur: [5],
 });
 
 function main({ dur, len }) {

benchmark/child_process/spawn-echo.js

@@ -1,7 +1,7 @@
 'use strict';
 const common = require('../common.js');
 const bench = common.createBenchmark(main, {
-  n: [1000]
+  n: [1000],
 });
 
 const spawn = require('child_process').spawn;

benchmark/cluster/echo.js

@@ -8,15 +8,15 @@ if (cluster.isMaster) {
     payload: ['string', 'object'],
     sendsPerBroadcast: [1, 10],
     serialization: ['json', 'advanced'],
-    n: [1e5]
+    n: [1e5],
   });
 
   function main({
     n,
     workers,
     sendsPerBroadcast,
     payload,
-    serialization
+    serialization,
   }) {
     const expectedPerBroadcast = sendsPerBroadcast * workers;
     let readies = 0;

benchmark/common.js

@@ -3,6 +3,10 @@
 const child_process = require('child_process');
 const http_benchmarkers = require('./_http-benchmarkers.js');
 
+function allow() {
+  return true;
+}
+
 class Benchmark {
   constructor(fn, configs, options = {}) {
     // Used to make sure a benchmark only start a timer once
@@ -31,9 +35,17 @@ class Benchmark {
       this.flags = this.flags.concat(options.flags);
     }
 
+    if (typeof options.combinationFilter === 'function')
+      this.combinationFilter = options.combinationFilter;
+    else
+      this.combinationFilter = allow;
+
     // The configuration list as a queue of jobs
     this.queue = this._queue(this.options);
 
+    if (this.queue.length === 0)
+      return;
+
     // The configuration of the current job, head of the queue
     this.config = this.queue[0];
 
@@ -96,7 +108,7 @@ class Benchmark {
           cliOptions[key] = [];
         cliOptions[key].push(
           // Infer the type from the config object and parse accordingly
-          typeof configs[key][0] === 'number' ? +value : value
+          typeof configs[key][0] === 'number' ? +value : value,
         );
       } else {
         extraOptions[key] = value;
@@ -108,6 +120,7 @@ class Benchmark {
   _queue(options) {
     const queue = [];
     const keys = Object.keys(options);
+    const { combinationFilter } = this;
 
     // Perform a depth-first walk through all options to generate a
     // configuration list that contains all combinations.
@@ -131,7 +144,15 @@ class Benchmark {
         if (keyIndex + 1 < keys.length) {
           recursive(keyIndex + 1, currConfig);
         } else {
-          queue.push(currConfig);
+          // Check if we should allow the current combination
+          const allowed = combinationFilter({ ...currConfig });
+          if (typeof allowed !== 'boolean') {
+            throw new TypeError(
+              'Combination filter must always return a boolean',
+            );
+          }
+          if (allowed)
+            queue.push(currConfig);
         }
       }
     }
@@ -162,7 +183,7 @@ class Benchmark {
         }
         this.config.benchmarker = used_benchmarker;
         this.report(result, elapsed);
-      }
+      },
     );
   }
 

benchmark/compare.js

@@ -71,7 +71,7 @@ if (showProgress) {
   const job = queue[i];
 
   const child = fork(path.resolve(__dirname, job.filename), cli.optional.set, {
-    execPath: cli.optional[job.binary]
+    execPath: cli.optional[job.binary],
   });
 
   child.on('message', (data) => {

benchmark/dgram/array-vs-concat.js

@@ -13,7 +13,7 @@ const bench = common.createBenchmark(main, {
   num: [100],
   chunks: [1, 2, 4, 8],
   type: ['concat', 'multi'],
-  dur: [5]
+  dur: [5],
 });
 
 function main({ dur, len, num, type, chunks }) {

benchmark/dgram/multi-buffer.js

@@ -13,7 +13,7 @@ const bench = common.createBenchmark(main, {
   num: [100],
   chunks: [1, 2, 4, 8],
   type: ['send', 'recv'],
-  dur: [5]
+  dur: [5],
 });
 
 function main({ dur, len, num, type, chunks }) {

benchmark/dgram/offset-length.js

@@ -12,7 +12,7 @@ const bench = common.createBenchmark(main, {
   len: [1, 64, 256, 1024],
   num: [100],
   type: ['send', 'recv'],
-  dur: [5]
+  dur: [5],
 });
 
 function main({ dur, len, num, type }) {

benchmark/dgram/single-buffer.js

@@ -12,7 +12,7 @@ const bench = common.createBenchmark(main, {
   len: [1, 64, 256, 1024],
   num: [100],
   type: ['send', 'recv'],
-  dur: [5]
+  dur: [5],
 });
 
 function main({ dur, len, num, type }) {