Merge branch 'nodejs:main' into main

Author: igor-shevelenkov

lib/internal/inspector/network.js

@@ -10,15 +10,8 @@ const {
 const dc = require('diagnostics_channel');
 const { now } = require('internal/perf/utils');
 const { MIMEType } = require('internal/mime');
-const {
-  createGunzip,
-  createInflate,
-  createBrotliDecompress,
-  createZstdDecompress,
-} = require('zlib');
 
 const kInspectorRequestId = Symbol('kInspectorRequestId');
-const kContentEncoding = Symbol('kContentEncoding');
 
 // https://chromedevtools.github.io/devtools-protocol/1-3/Network/#type-ResourceType
 const kResourceType = {
@@ -77,27 +70,6 @@ function sniffMimeType(contentType) {
   };
 }
 
-/**
- * Creates a decompression stream based on the content encoding.
- * @param {string} encoding - The content encoding (e.g., 'gzip', 'deflate', 'br', 'zstd').
- * @returns {import('stream').Transform|null} - A decompression stream or null if encoding is not supported.
- */
-function createDecompressor(encoding) {
-  switch (encoding) {
-    case 'gzip':
-    case 'x-gzip':
-      return createGunzip();
-    case 'deflate':
-      return createInflate();
-    case 'br':
-      return createBrotliDecompress();
-    case 'zstd':
-      return createZstdDecompress();
-    default:
-      return null;
-  }
-}
-
 function registerDiagnosticChannels(listenerPairs) {
   function enable() {
     ArrayPrototypeForEach(listenerPairs, ({ 0: channel, 1: listener }) => {
@@ -119,11 +91,9 @@ function registerDiagnosticChannels(listenerPairs) {
 
 module.exports = {
   kInspectorRequestId,
-  kContentEncoding,
   kResourceType,
   getMonotonicTime,
   getNextRequestId,
   registerDiagnosticChannels,
   sniffMimeType,
-  createDecompressor,
 };

lib/internal/inspector/network_http.js

@@ -10,13 +10,11 @@ const {
 
 const {
   kInspectorRequestId,
-  kContentEncoding,
   kResourceType,
   getMonotonicTime,
   getNextRequestId,
   registerDiagnosticChannels,
   sniffMimeType,
-  createDecompressor,
 } = require('internal/inspector/network');
 const { Network } = require('inspector');
 const EventEmitter = require('events');
@@ -29,7 +27,6 @@ const convertHeaderObject = (headers = {}) => {
   let host;
   let charset;
   let mimeType;
-  let contentEncoding;
   const dict = {};
   for (const { 0: key, 1: value } of ObjectEntries(headers)) {
     const lowerCasedKey = key.toLowerCase();
@@ -41,9 +38,6 @@ const convertHeaderObject = (headers = {}) => {
       charset = result.charset;
       mimeType = result.mimeType;
     }
-    if (lowerCasedKey === 'content-encoding') {
-      contentEncoding = typeof value === 'string' ? value.toLowerCase() : undefined;
-    }
     if (typeof value === 'string') {
       dict[key] = value;
     } else if (ArrayIsArray(value)) {
@@ -56,7 +50,7 @@ const convertHeaderObject = (headers = {}) => {
       dict[key] = String(value);
     }
   }
-  return [dict, host, charset, mimeType, contentEncoding];
+  return [dict, host, charset, mimeType];
 };
 
 /**
@@ -111,10 +105,7 @@ function onClientResponseFinish({ request, response }) {
     return;
   }
 
-  const { 0: headers, 2: charset, 3: mimeType, 4: contentEncoding } = convertHeaderObject(response.headers);
-
-  // Store content encoding on the request for later use
-  request[kContentEncoding] = contentEncoding;
+  const { 0: headers, 2: charset, 3: mimeType } = convertHeaderObject(response.headers);
 
   Network.responseReceived({
     requestId: request[kInspectorRequestId],
@@ -130,64 +121,24 @@ function onClientResponseFinish({ request, response }) {
     },
   });
 
-  // Create a decompressor if the response is compressed
-  const decompressor = createDecompressor(contentEncoding);
-
-  if (decompressor) {
-    // Pipe decompressed data to DevTools
-    decompressor.on('data', (decompressedChunk) => {
-      Network.dataReceived({
-        requestId: request[kInspectorRequestId],
-        timestamp: getMonotonicTime(),
-        dataLength: decompressedChunk.byteLength,
-        encodedDataLength: decompressedChunk.byteLength,
-        data: decompressedChunk,
-      });
-    });
-
-    // Handle decompression errors gracefully - fall back to raw data
-    decompressor.on('error', () => {
-      // If decompression fails, the raw data has already been sent via the fallback
-    });
-
-    // Unlike response.on('data', ...), this does not put the stream into flowing mode.
-    EventEmitter.prototype.on.call(response, 'data', (chunk) => {
-      // Feed the chunk into the decompressor
-      decompressor.write(chunk);
-    });
-
-    // Wait until the response body is consumed by user code.
-    response.once('end', () => {
-      // End the decompressor stream
-      decompressor.end();
-      decompressor.once('end', () => {
-        Network.loadingFinished({
-          requestId: request[kInspectorRequestId],
-          timestamp: getMonotonicTime(),
-        });
-      });
-    });
-  } else {
-    // No decompression needed, send data directly
-    // Unlike response.on('data', ...), this does not put the stream into flowing mode.
-    EventEmitter.prototype.on.call(response, 'data', (chunk) => {
-      Network.dataReceived({
-        requestId: request[kInspectorRequestId],
-        timestamp: getMonotonicTime(),
-        dataLength: chunk.byteLength,
-        encodedDataLength: chunk.byteLength,
-        data: chunk,
-      });
+  // Unlike response.on('data', ...), this does not put the stream into flowing mode.
+  EventEmitter.prototype.on.call(response, 'data', (chunk) => {
+    Network.dataReceived({
+      requestId: request[kInspectorRequestId],
+      timestamp: getMonotonicTime(),
+      dataLength: chunk.byteLength,
+      encodedDataLength: chunk.byteLength,
+      data: chunk,
     });
+  });
 
-    // Wait until the response body is consumed by user code.
-    response.once('end', () => {
-      Network.loadingFinished({
-        requestId: request[kInspectorRequestId],
-        timestamp: getMonotonicTime(),
-      });
+  // Wait until the response body is consumed by user code.
+  response.once('end', () => {
+    Network.loadingFinished({
+      requestId: request[kInspectorRequestId],
+      timestamp: getMonotonicTime(),
     });
-  }
+  });
 }
 
 module.exports = registerDiagnosticChannels([

lib/internal/inspector/network_http2.js

@@ -10,18 +10,15 @@ const {
 
 const {
   kInspectorRequestId,
-  kContentEncoding,
   kResourceType,
   getMonotonicTime,
   getNextRequestId,
   registerDiagnosticChannels,
   sniffMimeType,
-  createDecompressor,
 } = require('internal/inspector/network');
 const { Network } = require('inspector');
 const {
   HTTP2_HEADER_AUTHORITY,
-  HTTP2_HEADER_CONTENT_ENCODING,
   HTTP2_HEADER_CONTENT_TYPE,
   HTTP2_HEADER_COOKIE,
   HTTP2_HEADER_METHOD,
@@ -45,7 +42,6 @@ function convertHeaderObject(headers = {}) {
   let statusCode;
   let charset;
   let mimeType;
-  let contentEncoding;
   const dict = {};
 
   for (const { 0: key, 1: value } of ObjectEntries(headers)) {
@@ -65,8 +61,6 @@ function convertHeaderObject(headers = {}) {
       const result = sniffMimeType(value);
       charset = result.charset;
       mimeType = result.mimeType;
-    } else if (lowerCasedKey === HTTP2_HEADER_CONTENT_ENCODING) {
-      contentEncoding = typeof value === 'string' ? value.toLowerCase() : undefined;
     }
 
     if (typeof value === 'string') {
@@ -84,7 +78,7 @@ function convertHeaderObject(headers = {}) {
 
   const url = `${scheme}://${authority}${path}`;
 
-  return [dict, url, method, statusCode, charset, mimeType, contentEncoding];
+  return [dict, url, method, statusCode, charset, mimeType];
 }
 
 /**
@@ -200,16 +194,7 @@ function onClientStreamFinish({ stream, headers }) {
     return;
   }
 
-  const {
-    0: convertedHeaderObject,
-    3: statusCode,
-    4: charset,
-    5: mimeType,
-    6: contentEncoding,
-  } = convertHeaderObject(headers);
-
-  // Store content encoding on the stream for later use
-  stream[kContentEncoding] = contentEncoding;
+  const { 0: convertedHeaderObject, 3: statusCode, 4: charset, 5: mimeType } = convertHeaderObject(headers);
 
   Network.responseReceived({
     requestId: stream[kInspectorRequestId],
@@ -225,56 +210,23 @@ function onClientStreamFinish({ stream, headers }) {
     },
   });
 
-  // Create a decompressor if the response is compressed
-  const decompressor = createDecompressor(contentEncoding);
-
-  if (decompressor) {
-    // Pipe decompressed data to DevTools
-    decompressor.on('data', (decompressedChunk) => {
-      Network.dataReceived({
-        requestId: stream[kInspectorRequestId],
-        timestamp: getMonotonicTime(),
-        dataLength: decompressedChunk.byteLength,
-        encodedDataLength: decompressedChunk.byteLength,
-        data: decompressedChunk,
-      });
-    });
-
-    // Handle decompression errors gracefully
-    decompressor.on('error', () => {
-      // If decompression fails, the raw data has already been sent via the fallback
+  // Unlike stream.on('data', ...), this does not put the stream into flowing mode.
+  EventEmitter.prototype.on.call(stream, 'data', (chunk) => {
+    /**
+     * When a chunk of the response body has been received, cache it until `getResponseBody` request
+     * https://chromedevtools.github.io/devtools-protocol/1-3/Network/#method-getResponseBody or
+     * stream it with `streamResourceContent` request.
+     * https://chromedevtools.github.io/devtools-protocol/tot/Network/#method-streamResourceContent
+     */
+
+    Network.dataReceived({
+      requestId: stream[kInspectorRequestId],
+      timestamp: getMonotonicTime(),
+      dataLength: chunk.byteLength,
+      encodedDataLength: chunk.byteLength,
+      data: chunk,
     });
-
-    // Unlike stream.on('data', ...), this does not put the stream into flowing mode.
-    EventEmitter.prototype.on.call(stream, 'data', (chunk) => {
-      // Feed the chunk into the decompressor
-      decompressor.write(chunk);
-    });
-
-    // End the decompressor when the stream closes
-    stream.once('end', () => {
-      decompressor.end();
-    });
-  } else {
-    // No decompression needed, send data directly
-    // Unlike stream.on('data', ...), this does not put the stream into flowing mode.
-    EventEmitter.prototype.on.call(stream, 'data', (chunk) => {
-      /**
-       * When a chunk of the response body has been received, cache it until `getResponseBody` request
-       * https://chromedevtools.github.io/devtools-protocol/1-3/Network/#method-getResponseBody or
-       * stream it with `streamResourceContent` request.
-       * https://chromedevtools.github.io/devtools-protocol/tot/Network/#method-streamResourceContent
-       */
-
-      Network.dataReceived({
-        requestId: stream[kInspectorRequestId],
-        timestamp: getMonotonicTime(),
-        dataLength: chunk.byteLength,
-        encodedDataLength: chunk.byteLength,
-        data: chunk,
-      });
-    });
-  }
+  });
 }
 
 /**

lib/internal/modules/cjs/loader.js

@@ -238,15 +238,21 @@ let statCache = null;
 function wrapModuleLoad(request, parent, isMain) {
   const logLabel = `[${parent?.id || ''}] [${request}]`;
   const traceLabel = `require('${request}')`;
+  const channel = onRequire();
 
   startTimer(logLabel, traceLabel);
 
   try {
-    return onRequire().traceSync(Module._load, {
-      __proto__: null,
-      parentFilename: parent?.filename,
-      id: request,
-    }, Module, request, parent, isMain);
+    if (channel.hasSubscribers) {
+      return onRequire().traceSync(Module._load, {
+        __proto__: null,
+        parentFilename: parent?.filename,
+        id: request,
+      }, Module, request, parent, isMain);
+    }
+    // No subscribers, skip the wrapping to avoid clobbering stack traces
+    // and debugging steps.
+    return Module._load(request, parent, isMain);
   } finally {
     endTimer(logLabel, traceLabel);
   }

test/fixtures/console/console.snapshot

@@ -7,4 +7,3 @@ Trace: foo
     at *
     at *
     at *
-    at *

test/fixtures/errors/force_colors.snapshot

@@ -11,6 +11,5 @@ Error: Should include grayed stack trace
     at *
     at *
     at *
-    at *
 
 Node.js *

test/fixtures/errors/promise_unhandled_warn_with_error.snapshot

@@ -7,6 +7,5 @@
     at *
     at *
     at *
-    at *
 (Use `* --trace-warnings ...` to show where the warning was created)
 (node:*) UnhandledPromiseRejectionWarning: Unhandled promise rejection. This error originated either by throwing inside of an async function without a catch block, or by rejecting a promise which was not handled with .catch(). To terminate the node process on unhandled promise rejection, use the CLI flag `--unhandled-rejections=strict` (see https:*nodejs.org*api*cli.html#cli_unhandled_rejections_mode). (rejection id: 1)

test/fixtures/errors/unhandled_promise_trace_warnings.snapshot

@@ -11,7 +11,6 @@
     at *
     at *
     at *
-    at *
 (node:*) Error: This was rejected
     at *
     at *
@@ -21,7 +20,6 @@
     at *
     at *
     at *
-    at *
 (node:*) PromiseRejectionHandledWarning: Promise rejection was handled asynchronously (rejection id: 1)
     at *
     at *

test/fixtures/source-map/output/source_map_assert_source_line.snapshot

@@ -10,7 +10,6 @@ AssertionError [ERR_ASSERTION]: The expression evaluated to a falsy value:
     *
     *
     *
-    *
   generatedMessage: true,
   code: 'ERR_ASSERTION',
   actual: false,