Merge branch 'nodejs:main' into headers-request-timers-fix

Author: franciszek-koltuniuk-red

CHANGELOG.md

@@ -3,7 +3,7 @@
 Select a Node.js version below to view the changelog history:
 
 * [Node.js 20](doc/changelogs/CHANGELOG_V20.md) **Current**
-* [Node.js 19](doc/changelogs/CHANGELOG_V19.md) **Current**
+* [Node.js 19](doc/changelogs/CHANGELOG_V19.md) End-of-Life
 * [Node.js 18](doc/changelogs/CHANGELOG_V18.md) **Long Term Support**
 * [Node.js 17](doc/changelogs/CHANGELOG_V17.md) End-of-Life
 * [Node.js 16](doc/changelogs/CHANGELOG_V16.md) **Long Term Support**
@@ -30,7 +30,6 @@ release.
 <table>
 <tr>
   <th title="Current"><a href="doc/changelogs/CHANGELOG_V20.md">20</a> (Current)</th>
-  <th title="Current"><a href="doc/changelogs/CHANGELOG_V19.md">19</a> (Current)</th>
   <th title="LTS Until 2025-04"><a href="doc/changelogs/CHANGELOG_V18.md">18</a> (LTS)</th>
   <th title="LTS Until 2023-09"><a href="doc/changelogs/CHANGELOG_V16.md">16</a> (LTS)</th>
 </tr>
@@ -41,21 +40,6 @@ release.
 <a href="doc/changelogs/CHANGELOG_V20.md#20.0.0">20.0.0</a><br/>
   </td>
   <td valign="top">
-<b><a href="doc/changelogs/CHANGELOG_V19.md#19.9.0">19.9.0</a></b><br/>
-<a href="doc/changelogs/CHANGELOG_V19.md#19.8.1">19.8.1</a><br/>
-<a href="doc/changelogs/CHANGELOG_V19.md#19.8.0">19.8.0</a><br/>
-<a href="doc/changelogs/CHANGELOG_V19.md#19.7.0">19.7.0</a><br/>
-<a href="doc/changelogs/CHANGELOG_V19.md#19.6.1">19.6.1</a><br/>
-<a href="doc/changelogs/CHANGELOG_V19.md#19.6.0">19.6.0</a><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/>
-<a href="doc/changelogs/CHANGELOG_V19.md#19.1.0">19.1.0</a><br/>
-<a href="doc/changelogs/CHANGELOG_V19.md#19.0.1">19.0.1</a><br/>
-<a href="doc/changelogs/CHANGELOG_V19.md#19.0.0">19.0.0</a><br/>
-  </td>
-  <td valign="top">
 <b><a href="doc/changelogs/CHANGELOG_V18.md#18.16.0">18.16.0</a></b><br/>
 <a href="doc/changelogs/CHANGELOG_V18.md#18.15.0">18.15.0</a><br/>
 <a href="doc/changelogs/CHANGELOG_V18.md#18.14.2">18.14.2</a><br/>

configure.py

@@ -1471,7 +1471,7 @@ def configure_library(lib, output, pkgname=None):
 
 
 def configure_v8(o):
-  o['variables']['v8_enable_webassembly'] = 1
+  o['variables']['v8_enable_webassembly'] = 0 if options.v8_lite_mode else 1
   o['variables']['v8_enable_javascript_promise_hooks'] = 1
   o['variables']['v8_enable_lite_mode'] = 1 if options.v8_lite_mode else 0
   o['variables']['v8_enable_gdbjit'] = 1 if options.gdb else 0

doc/api/test.md

@@ -744,25 +744,26 @@ changes:
     **Default:** `false`.
   * `files`: {Array} An array containing the list of files to run.
     **Default** matching files from [test runner execution model][].
-  * `setup` {Function} A function that accepts the `TestsStream` instance
-    and can be used to setup listeners before any tests are run.
-    **Default:** `undefined`.
-  * `signal` {AbortSignal} Allows aborting an in-progress test execution.
-  * `timeout` {number} A number of milliseconds the test execution will
-    fail after.
-    If unspecified, subtests inherit this value from their parent.
-    **Default:** `Infinity`.
   * `inspectPort` {number|Function} Sets inspector port of test child process.
     This can be a number, or a function that takes no arguments and returns a
     number. If a nullish value is provided, each process gets its own port,
     incremented from the primary's `process.debugPort`.
     **Default:** `undefined`.
+  * `setup` {Function} A function that accepts the `TestsStream` instance
+    and can be used to setup listeners before any tests are run.
+    **Default:** `undefined`.
+  * `signal` {AbortSignal} Allows aborting an in-progress test execution.
   * `testNamePatterns` {string|RegExp|Array} A String, RegExp or a RegExp Array,
     that can be used to only run tests whose name matches the provided pattern.
     Test name patterns are interpreted as JavaScript regular expressions.
     For each test that is executed, any corresponding test hooks, such as
     `beforeEach()`, are also run.
     **Default:** `undefined`.
+  * `timeout` {number} A number of milliseconds the test execution will
+    fail after.
+    If unspecified, subtests inherit this value from their parent.
+    **Default:** `Infinity`.
+  * `watch` {boolean} Whether to run in watch mode or not. **Default:** `false`.
 * Returns: {TestsStream}
 
 ```mjs
@@ -1539,6 +1540,10 @@ This event is only emitted if `--test` flag is passed.
 Emitted when a running test writes to `stdout`.
 This event is only emitted if `--test` flag is passed.
 
+### Event: `'test:watch:drained'`
+
+Emitted when no more tests are queued for execution in watch mode.
+
 ## Class: `TestContext`
 
 <!-- YAML

lib/_tls_wrap.js

@@ -634,8 +634,8 @@ TLSSocket.prototype._wrapHandle = function(wrap, handle) {
 };
 
 TLSSocket.prototype[kReinitializeHandle] = function reinitializeHandle(handle) {
-  const originalServername = this._handle.getServername();
-  const originalSession = this._handle.getSession();
+  const originalServername = this.ssl ? this._handle.getServername() : null;
+  const originalSession = this.ssl ? this._handle.getSession() : null;
 
   this.handle = this._wrapHandle(null, handle);
   this.ssl = this._handle;
@@ -832,6 +832,14 @@ TLSSocket.prototype._init = function(socket, wrap) {
     }
   }
 
+  // We can only come here via [kWrapConnectedHandle]() call that happens
+  // if the connection is established with `autoSelectFamily` set to `true`.
+  const connectOptions = this[kConnectOptions];
+  if (!options.isServer && connectOptions) {
+    if (connectOptions.servername) {
+      this.setServername(connectOptions.servername);
+    }
+  }
 
   if (options.handshakeTimeout > 0)
     this.setTimeout(options.handshakeTimeout, this._handleTimeout);

lib/internal/modules/esm/hooks.js

@@ -169,7 +169,7 @@ class Hooks {
         port: insideLoader,
       });
 
-      if (preloaded == null) { return; }
+      if (preloaded == null) { continue; }
 
       if (typeof preloaded !== 'string') { // [2]
         throw new ERR_INVALID_RETURN_VALUE(
@@ -590,16 +590,17 @@ class HooksProxy {
     if (response.message.status === 'never-settle') {
       return new Promise(() => {});
     }
-    if (response.message.status === 'error') {
-      if (response.message.body == null) throw response.message.body;
-      if (response.message.body.serializationFailed || response.message.body.serialized == null) {
+    const { status, body } = response.message;
+    if (status === 'error') {
+      if (body == null || typeof body !== 'object') throw body;
+      if (body.serializationFailed || body.serialized == null) {
         throw ERR_WORKER_UNSERIALIZABLE_ERROR();
       }
 
       // eslint-disable-next-line no-restricted-syntax
-      throw deserializeError(response.message.body.serialized);
+      throw deserializeError(body.serialized);
     } else {
-      return response.message.body;
+      return body;
     }
   }
 

lib/internal/modules/esm/worker.js

@@ -48,7 +48,10 @@ function transferArrayBuffer(hasError, source) {
 }
 
 function wrapMessage(status, body) {
-  if (status === 'success' || body === null || typeof body !== 'object') {
+  if (status === 'success' || body === null ||
+     (typeof body !== 'object' &&
+      typeof body !== 'function' &&
+      typeof body !== 'symbol')) {
     return { status, body };
   }
 

lib/internal/test_runner/harness.js

@@ -140,8 +140,8 @@ function setup(root) {
   const rejectionHandler =
     createProcessEventHandler('unhandledRejection', root);
   const coverage = configureCoverage(root, globalOptions);
-  const exitHandler = () => {
-    root.postRun(new ERR_TEST_FAILURE(
+  const exitHandler = async () => {
+    await root.run(new ERR_TEST_FAILURE(
       'Promise resolution is still pending but the event loop has already resolved',
       kCancelledByParent));
 
@@ -150,8 +150,8 @@ function setup(root) {
     process.removeListener('uncaughtException', exceptionHandler);
   };
 
-  const terminationHandler = () => {
-    exitHandler();
+  const terminationHandler = async () => {
+    await exitHandler();
     process.exit();
   };
 

lib/internal/test_runner/runner.js

@@ -335,15 +335,13 @@ class FileTest extends Test {
   }
 }
 
-const runningProcesses = new SafeMap();
-const runningSubtests = new SafeMap();
-
 function runTestFile(path, root, inspectPort, filesWatcher, testNamePatterns) {
+  const watchMode = filesWatcher != null;
   const subtest = root.createSubtest(FileTest, path, async (t) => {
     const args = getRunArgs({ path, inspectPort, testNamePatterns });
     const stdio = ['pipe', 'pipe', 'pipe'];
     const env = { ...process.env, NODE_TEST_CONTEXT: 'child-v8' };
-    if (filesWatcher) {
+    if (watchMode) {
       stdio.push('ipc');
       env.WATCH_REPORT_DEPENDENCIES = '1';
     }
@@ -352,11 +350,13 @@ function runTestFile(path, root, inspectPort, filesWatcher, testNamePatterns) {
     }
 
     const child = spawn(process.execPath, args, { signal: t.signal, encoding: 'utf8', env, stdio });
-    runningProcesses.set(path, child);
+    if (watchMode) {
+      filesWatcher.runningProcesses.set(path, child);
+      filesWatcher.watcher.watchChildProcessModules(child, path);
+    }
 
     let err;
 
-    filesWatcher?.watchChildProcessModules(child, path);
 
     child.on('error', (error) => {
       err = error;
@@ -388,8 +388,14 @@ function runTestFile(path, root, inspectPort, filesWatcher, testNamePatterns) {
       finished(child.stdout, { signal: t.signal }),
     ]);
 
-    runningProcesses.delete(path);
-    runningSubtests.delete(path);
+    if (watchMode) {
+      filesWatcher.runningProcesses.delete(path);
+      filesWatcher.runningSubtests.delete(path);
+      if (filesWatcher.runningSubtests.size === 0) {
+        root.reporter[kEmitMessage]('test:watch:drained');
+      }
+    }
+
     if (code !== 0 || signal !== null) {
       if (!err) {
         const failureType = subtest.failedSubtests ? kSubtestsFailed : kTestCodeFailure;
@@ -409,10 +415,14 @@ function runTestFile(path, root, inspectPort, filesWatcher, testNamePatterns) {
   return subtest.start();
 }
 
-function watchFiles(testFiles, root, inspectPort, testNamePatterns) {
-  const filesWatcher = new FilesWatcher({ throttle: 500, mode: 'filter' });
-  filesWatcher.on('changed', ({ owners }) => {
-    filesWatcher.unfilterFilesOwnedBy(owners);
+function watchFiles(testFiles, root, inspectPort, signal, testNamePatterns) {
+  const runningProcesses = new SafeMap();
+  const runningSubtests = new SafeMap();
+  const watcher = new FilesWatcher({ throttle: 500, mode: 'filter', signal });
+  const filesWatcher = { __proto__: null, watcher, runningProcesses, runningSubtests };
+
+  watcher.on('changed', ({ owners }) => {
+    watcher.unfilterFilesOwnedBy(owners);
     PromisePrototypeThen(SafePromiseAllReturnVoid(testFiles, async (file) => {
       if (!owners.has(file)) {
         return;
@@ -432,6 +442,8 @@ function watchFiles(testFiles, root, inspectPort, testNamePatterns) {
       triggerUncaughtException(error, true /* fromPromise */);
     }));
   });
+  signal?.addEventListener('abort', () => root.postRun(), { __proto__: null, once: true });
+
   return filesWatcher;
 }
 
@@ -474,14 +486,14 @@ function run(options) {
   let postRun = () => root.postRun();
   let filesWatcher;
   if (watch) {
-    filesWatcher = watchFiles(testFiles, root, inspectPort, testNamePatterns);
+    filesWatcher = watchFiles(testFiles, root, inspectPort, signal, testNamePatterns);
     postRun = undefined;
   }
   const runFiles = () => {
     root.harness.bootstrapComplete = true;
     return SafePromiseAllSettledReturnVoid(testFiles, (path) => {
       const subtest = runTestFile(path, root, inspectPort, filesWatcher, testNamePatterns);
-      runningSubtests.set(path, subtest);
+      filesWatcher?.runningSubtests.set(path, subtest);
       return subtest;
     });
   };

lib/internal/test_runner/test.js

@@ -427,7 +427,7 @@ class Test extends AsyncResource {
     validateOneOf(name, 'hook name', kHookNames);
     // eslint-disable-next-line no-use-before-define
     const hook = new TestHook(fn, options);
-    if (name === 'before') {
+    if (name === 'before' || name === 'after') {
       hook.run = runOnce(hook.run);
     }
     ArrayPrototypePush(this.hooks[name], hook);
@@ -514,7 +514,7 @@ class Test extends AsyncResource {
     }
   }
 
-  async run() {
+  async run(pendingSubtestsError) {
     if (this.parent !== null) {
       this.parent.activeSubtests++;
     }
@@ -526,11 +526,11 @@ class Test extends AsyncResource {
     }
 
     const { args, ctx } = this.getRunArgs();
-    const after = runOnce(async () => {
+    const after = async () => {
       if (this.hooks.after.length > 0) {
         await this.runHook('after', { args, ctx });
       }
-    });
+    };
     const afterEach = runOnce(async () => {
       if (this.parent?.hooks.afterEach.length > 0) {
         await this.parent.runHook('afterEach', { args, ctx });
@@ -579,8 +579,8 @@ class Test extends AsyncResource {
       await after();
       this.pass();
     } catch (err) {
-      try { await after(); } catch { /* Ignore error. */ }
       try { await afterEach(); } catch { /* test is already failing, let's ignore the error */ }
+      try { await after(); } catch { /* Ignore error. */ }
       if (isTestFailureError(err)) {
         if (err.failureType === kTestTimeoutFailure) {
           this.#cancel(err);
@@ -594,7 +594,7 @@ class Test extends AsyncResource {
 
     // Clean up the test. Then, try to report the results and execute any
     // tests that were pending due to available concurrency.
-    this.postRun();
+    this.postRun(pendingSubtestsError);
   }
 
   postRun(pendingSubtestsError) {

lib/internal/watch_mode/files_watcher.js

@@ -30,14 +30,18 @@ class FilesWatcher extends EventEmitter {
   #ownerDependencies = new SafeMap();
   #throttle;
   #mode;
+  #signal;
 
-  constructor({ throttle = 500, mode = 'filter' } = kEmptyObject) {
+  constructor({ throttle = 500, mode = 'filter', signal } = kEmptyObject) {
     super();
 
     validateNumber(throttle, 'options.throttle', 0, TIMEOUT_MAX);
     validateOneOf(mode, 'options.mode', ['filter', 'all']);
     this.#throttle = throttle;
     this.#mode = mode;
+    this.#signal = signal;
+
+    signal?.addEventListener('abort', () => this.clear(), { __proto__: null, once: true });
   }
 
   #isPathWatched(path) {
@@ -89,7 +93,7 @@ class FilesWatcher extends EventEmitter {
     if (this.#isPathWatched(path)) {
       return;
     }
-    const watcher = watch(path, { recursive });
+    const watcher = watch(path, { recursive, signal: this.#signal });
     watcher.on('change', (eventType, fileName) => this
       .#onChange(recursive ? resolve(path, fileName) : path));
     this.#watchers.set(path, { handle: watcher, recursive });