inspector: add undici http tracking support

lib/internal/inspector/network.js

@@ -8,6 +8,28 @@ const {
 const { now } = require('internal/perf/utils');
 const kInspectorRequestId = Symbol('kInspectorRequestId');
 
+// https://chromedevtools.github.io/devtools-protocol/1-3/Network/#type-ResourceType
+const kResourceType = {
+  Document: 'Document',
+  Stylesheet: 'Stylesheet',
+  Image: 'Image',
+  Media: 'Media',
+  Font: 'Font',
+  Script: 'Script',
+  TextTrack: 'TextTrack',
+  XHR: 'XHR',
+  Fetch: 'Fetch',
+  Prefetch: 'Prefetch',
+  EventSource: 'EventSource',
+  WebSocket: 'WebSocket',
+  Manifest: 'Manifest',
+  SignedExchange: 'SignedExchange',
+  Ping: 'Ping',
+  CSPViolationReport: 'CSPViolationReport',
+  Preflight: 'Preflight',
+  Other: 'Other',
+};
+
 /**
  * Return a monotonically increasing time in seconds since an arbitrary point in the past.
  * @returns {number}
@@ -26,6 +48,7 @@ function getNextRequestId() {
 
 module.exports = {
   kInspectorRequestId,
+  kResourceType,
   getMonotonicTime,
   getNextRequestId,
 };

lib/internal/inspector/network_http.js

@@ -10,13 +10,13 @@ const {
 
 const {
   kInspectorRequestId,
+  kResourceType,
   getMonotonicTime,
   getNextRequestId,
 } = require('internal/inspector/network');
 const dc = require('diagnostics_channel');
 const { Network } = require('inspector');
 
-const kResourceType = 'Other';
 const kRequestUrl = Symbol('kRequestUrl');
 
 // Convert a Headers object (Map<string, number | string | string[]>) to a plain object (Map<string, string>)
@@ -79,7 +79,7 @@ function onClientRequestError({ request, error }) {
   Network.loadingFailed({
     requestId: request[kInspectorRequestId],
     timestamp: getMonotonicTime(),
-    type: kResourceType,
+    type: kResourceType.Other,
     errorText: error.message,
   });
 }
@@ -96,7 +96,7 @@ function onClientResponseFinish({ request, response }) {
   Network.responseReceived({
     requestId: request[kInspectorRequestId],
     timestamp: getMonotonicTime(),
-    type: kResourceType,
+    type: kResourceType.Other,
     response: {
       url: request[kRequestUrl],
       status: response.statusCode,

lib/internal/inspector/network_undici.js

@@ -0,0 +1,141 @@
+'use strict';
+
+const {
+  DateNow,
+} = primordials;
+
+const {
+  kInspectorRequestId,
+  kResourceType,
+  getMonotonicTime,
+  getNextRequestId,
+} = require('internal/inspector/network');
+const dc = require('diagnostics_channel');
+const { Network } = require('inspector');
+
+// Convert an undici request headers array to a plain object (Map<string, string>)
+function requestHeadersArrayToDictionary(headers) {
+  const dict = {};
+  for (let idx = 0; idx < headers.length; idx += 2) {
+    const key = `${headers[idx]}`;
+    const value = `${headers[idx + 1]}`;
+    dict[key] = value;
+  }
+  return dict;
+};
+
+// Convert an undici response headers array to a plain object (Map<string, string>)
+function responseHeadersArrayToDictionary(headers) {
+  const dict = {};
+  for (let idx = 0; idx < headers.length; idx += 2) {
+    const key = `${headers[idx]}`;
+    const value = `${headers[idx + 1]}`;
+    const prevValue = dict[key];
+
+    if (typeof prevValue === 'string') {
+      // ChromeDevTools frontend treats 'set-cookie' as a special case
+      // https://github.com/ChromeDevTools/devtools-frontend/blob/4275917f84266ef40613db3c1784a25f902ea74e/front_end/core/sdk/NetworkRequest.ts#L1368
+      if (key.toLowerCase() === 'set-cookie') dict[key] = `${prevValue}\n${value}`;
+      else dict[key] = `${prevValue}, ${value}`;
+    } else {
+      dict[key] = value;
+    }
+  }
+  return dict;
+};
+
+/**
+ * When a client request starts, emit Network.requestWillBeSent event.
+ * https://chromedevtools.github.io/devtools-protocol/1-3/Network/#event-requestWillBeSent
+ * @param {{ request: undici.Request }} event
+ */
+function onClientRequestStart({ request }) {
+  const url = `${request.origin}${request.path}`;
+  request[kInspectorRequestId] = getNextRequestId();
+  Network.requestWillBeSent({
+    requestId: request[kInspectorRequestId],
+    timestamp: getMonotonicTime(),
+    wallTime: DateNow(),
+    request: {
+      url,
+      method: request.method,
+      headers: requestHeadersArrayToDictionary(request.headers),
+    },
+  });
+}
+
+/**
+ * When a client request errors, emit Network.loadingFailed event.
+ * https://chromedevtools.github.io/devtools-protocol/1-3/Network/#event-loadingFailed
+ * @param {{ request: undici.Request, error: any }} event
+ */
+function onClientRequestError({ request, error }) {
+  if (typeof request[kInspectorRequestId] !== 'string') {
+    return;
+  }
+  Network.loadingFailed({
+    requestId: request[kInspectorRequestId],
+    timestamp: getMonotonicTime(),
+    // TODO(legendecas): distinguish between `undici.request` and `undici.fetch`.
+    type: kResourceType.Fetch,
+    errorText: error.message,
+  });
+}
+
+/**
+ * When response headers are received, emit Network.responseReceived event.
+ * https://chromedevtools.github.io/devtools-protocol/1-3/Network/#event-responseReceived
+ * @param {{ request: undici.Request, response: undici.Response }} event
+ */
+function onClientResponseHeaders({ request, response }) {
+  if (typeof request[kInspectorRequestId] !== 'string') {
+    return;
+  }
+  const url = `${request.origin}${request.path}`;
+  Network.responseReceived({
+    requestId: request[kInspectorRequestId],
+    timestamp: getMonotonicTime(),
+    // TODO(legendecas): distinguish between `undici.request` and `undici.fetch`.
+    type: kResourceType.Fetch,
+    response: {
+      url,
+      status: response.statusCode,
+      statusText: response.statusText,
+      headers: responseHeadersArrayToDictionary(response.headers),
+    },
+  });
+}
+
+/**
+ * When a response is completed, emit Network.loadingFinished event.
+ * https://chromedevtools.github.io/devtools-protocol/1-3/Network/#event-loadingFinished
+ * @param {{ request: undici.Request, response: undici.Response }} event
+ */
+function onClientResponseFinish({ request }) {
+  if (typeof request[kInspectorRequestId] !== 'string') {
+    return;
+  }
+  Network.loadingFinished({
+    requestId: request[kInspectorRequestId],
+    timestamp: getMonotonicTime(),
+  });
+}
+
+function enable() {
+  dc.subscribe('undici:request:create', onClientRequestStart);
+  dc.subscribe('undici:request:error', onClientRequestError);
+  dc.subscribe('undici:request:headers', onClientResponseHeaders);
+  dc.subscribe('undici:request:trailers', onClientResponseFinish);
+}
+
+function disable() {
+  dc.subscribe('undici:request:create', onClientRequestStart);
+  dc.subscribe('undici:request:error', onClientRequestError);
+  dc.subscribe('undici:request:headers', onClientResponseHeaders);
+  dc.subscribe('undici:request:trailers', onClientResponseFinish);
+}
+
+module.exports = {
+  enable,
+  disable,
+};

lib/internal/inspector_network_tracking.js

@@ -2,14 +2,12 @@
 
 function enable() {
   require('internal/inspector/network_http').enable();
-  // TODO: add undici request/websocket tracking.
-  // https://github.com/nodejs/node/issues/53946
+  require('internal/inspector/network_undici').enable();
 }
 
 function disable() {
   require('internal/inspector/network_http').disable();
-  // TODO: add undici request/websocket tracking.
-  // https://github.com/nodejs/node/issues/53946
+  require('internal/inspector/network_undici').disable();
 }
 
 module.exports = {

src/node_builtins.cc

@@ -120,7 +120,8 @@ BuiltinLoader::BuiltinCategories BuiltinLoader::GetBuiltinCategories() const {
 #if !HAVE_INSPECTOR
     "inspector", "inspector/promises", "internal/util/inspector",
         "internal/inspector/network", "internal/inspector/network_http",
-        "internal/inspector_async_hook", "internal/inspector_network_tracking",
+        "internal/inspector/network_undici", "internal/inspector_async_hook",
+        "internal/inspector_network_tracking",
 #endif  // !HAVE_INSPECTOR
 
 #if !NODE_USE_V8_PLATFORM || !defined(NODE_HAVE_I18N_SUPPORT)