deps: update undici to 7.6.0

nodejs-github-bot · RafaelGSS · commit c377394657e3 · 2025-05-02T17:05:48.000-03:00
PR-URL: #57685 Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com> Reviewed-By: Rafael Gonzaga <rafael.nunu@hotmail.com> Reviewed-By: Marco Ippolito <marcoippolito54@gmail.com>
diff --git a/deps/undici/src/docs/docs/api/Agent.md b/deps/undici/src/docs/docs/api/Agent.md
@@ -2,7 +2,7 @@
 
 Extends: `undici.Dispatcher`
 
-Agent allow dispatching requests against multiple different origins.
+Agent allows dispatching requests against multiple different origins.
 
 Requests are not guaranteed to be dispatched in order of invocation.
 
diff --git a/deps/undici/src/lib/core/util.js b/deps/undici/src/lib/core/util.js
@@ -13,7 +13,7 @@ const { InvalidArgumentError } = require('./errors')
 const { headerNameLowerCasedRecord } = require('./constants')
 const { tree } = require('./tree')
 
-const [nodeMajor, nodeMinor] = process.versions.node.split('.').map(v => Number(v))
+const [nodeMajor, nodeMinor] = process.versions.node.split('.', 2).map(v => Number(v))
 
 class BodyAsyncIterable {
   constructor (body) {
diff --git a/deps/undici/src/lib/handler/cache-revalidation-handler.js b/deps/undici/src/lib/handler/cache-revalidation-handler.js
@@ -9,7 +9,7 @@ const assert = require('node:assert')
  *  here, which we then just pass on to the next handler (most likely a
  *  CacheHandler). Note that this assumes the proper headers were already
  *  included in the request to tell the origin that we want to revalidate the
- *  response (i.e. if-modified-since).
+ *  response (i.e. if-modified-since or if-none-match).
  *
  * @see https://www.rfc-editor.org/rfc/rfc9111.html#name-validation
  *
diff --git a/deps/undici/src/lib/interceptor/cache.js b/deps/undici/src/lib/interceptor/cache.js
@@ -6,7 +6,7 @@ const util = require('../core/util')
 const CacheHandler = require('../handler/cache-handler')
 const MemoryCacheStore = require('../cache/memory-cache-store')
 const CacheRevalidationHandler = require('../handler/cache-revalidation-handler')
-const { assertCacheStore, assertCacheMethods, makeCacheKey, parseCacheControlHeader } = require('../util/cache.js')
+const { assertCacheStore, assertCacheMethods, makeCacheKey, normaliseHeaders, parseCacheControlHeader } = require('../util/cache.js')
 const { AbortError } = require('../core/errors.js')
 
 /**
@@ -221,7 +221,7 @@ function handleResult (
   // Check if the response is stale
   if (needsRevalidation(result, reqCacheControl)) {
     if (util.isStream(opts.body) && util.bodyLength(opts.body) !== 0) {
-      // If body is is stream we can't revalidate...
+      // If body is a stream we can't revalidate...
       // TODO (fix): This could be less strict...
       return dispatch(opts, new CacheHandler(globalOpts, cacheKey, handler))
     }
@@ -233,7 +233,7 @@ function handleResult (
     }
 
     let headers = {
-      ...opts.headers,
+      ...normaliseHeaders(opts),
       'if-modified-since': new Date(result.cachedAt).toUTCString()
     }
 
diff --git a/deps/undici/src/lib/llhttp/wasm_build_env.txt b/deps/undici/src/lib/llhttp/wasm_build_env.txt
@@ -1,5 +1,5 @@
 
-> undici@7.5.0 build:wasm
+> undici@7.6.0 build:wasm
 > node build/wasm.js --docker
 
 > docker run --rm --platform=linux/x86_64  --user 1001:118 --mount type=bind,source=/home/runner/work/node/node/deps/undici/src/lib/llhttp,target=/home/node/build/lib/llhttp            --mount type=bind,source=/home/runner/work/node/node/deps/undici/src/build,target=/home/node/build/build            --mount type=bind,source=/home/runner/work/node/node/deps/undici/src/deps,target=/home/node/build/deps            -t ghcr.io/nodejs/wasm-builder@sha256:975f391d907e42a75b8c72eb77c782181e941608687d4d8694c3e9df415a0970 node build/wasm.js
diff --git a/deps/undici/src/lib/mock/mock-utils.js b/deps/undici/src/lib/mock/mock-utils.js
@@ -97,7 +97,7 @@ function safeUrl (path) {
     return path
   }
 
-  const pathSegments = path.split('?')
+  const pathSegments = path.split('?', 3)
 
   if (pathSegments.length !== 2) {
     return path
diff --git a/deps/undici/src/lib/util/cache.js b/deps/undici/src/lib/util/cache.js
@@ -12,7 +12,21 @@ function makeCacheKey (opts) {
     throw new Error('opts.origin is undefined')
   }
 
-  /** @type {Record<string, string[] | string>} */
+  const headers = normaliseHeaders(opts)
+
+  return {
+    origin: opts.origin.toString(),
+    method: opts.method,
+    path: opts.path,
+    headers
+  }
+}
+
+/**
+ * @param {Record<string, string[] | string>}
+ * @return {Record<string, string[] | string>}
+ */
+function normaliseHeaders (opts) {
   let headers
   if (opts.headers == null) {
     headers = {}
@@ -38,12 +52,7 @@ function makeCacheKey (opts) {
     throw new Error('opts.headers is not an object')
   }
 
-  return {
-    origin: opts.origin.toString(),
-    method: opts.method,
-    path: opts.path,
-    headers
-  }
+  return headers
 }
 
 /**
@@ -350,6 +359,7 @@ function assertCacheMethods (methods, name = 'CacheMethods') {
 
 module.exports = {
   makeCacheKey,
+  normaliseHeaders,
   assertCacheKey,
   assertCacheValue,
   parseCacheControlHeader,
diff --git a/deps/undici/src/lib/web/fetch/index.js b/deps/undici/src/lib/web/fetch/index.js
@@ -309,7 +309,9 @@ function finalizeAndReportTiming (response, initiatorType = 'other') {
     originalURL.href,
     initiatorType,
     globalThis,
-    cacheState
+    cacheState,
+    '', // bodyType
+    response.status
   )
 }
 
@@ -994,7 +996,7 @@ function fetchFinale (fetchParams, response) {
     // 3. Set fetchParams’s controller’s report timing steps to the following steps given a global object global:
     fetchParams.controller.reportTimingSteps = () => {
       // 1. If fetchParams’s request’s URL’s scheme is not an HTTP(S) scheme, then return.
-      if (fetchParams.request.url.protocol !== 'https:') {
+      if (!urlIsHttpHttpsScheme(fetchParams.request.url)) {
         return
       }
 
@@ -1036,7 +1038,6 @@ function fetchFinale (fetchParams, response) {
       //    fetchParams’s request’s URL, fetchParams’s request’s initiator type, global, cacheState, bodyInfo,
       //    and responseStatus.
       if (fetchParams.request.initiatorType != null) {
-        // TODO: update markresourcetiming
         markResourceTiming(timingInfo, fetchParams.request.url.href, fetchParams.request.initiatorType, globalThis, cacheState, bodyInfo, responseStatus)
       }
     }
diff --git a/deps/undici/src/lib/web/websocket/util.js b/deps/undici/src/lib/web/websocket/util.js
@@ -206,7 +206,7 @@ function parseExtensions (extensions) {
 
   while (position.position < extensions.length) {
     const pair = collectASequenceOfCodePointsFast(';', extensions, position)
-    const [name, value = ''] = pair.split('=')
+    const [name, value = ''] = pair.split('=', 2)
 
     extensionList.set(
       removeHTTPWhitespace(name, true, false),
diff --git a/deps/undici/src/package-lock.json b/deps/undici/src/package-lock.json
diff --git a/deps/undici/src/package.json b/deps/undici/src/package.json
diff --git a/deps/undici/undici.js b/deps/undici/undici.js
diff --git a/src/undici_version.h b/src/undici_version.h

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ const assert = require('node:assert')`
`9`	`9`	`* here, which we then just pass on to the next handler (most likely a`
`10`	`10`	`* CacheHandler). Note that this assumes the proper headers were already`
`11`	`11`	`* included in the request to tell the origin that we want to revalidate the`
`12`		`- * response (i.e. if-modified-since).`
	`12`	`+ * response (i.e. if-modified-since or if-none-match).`
`13`	`13`	`*`
`14`	`14`	`* @see https://www.rfc-editor.org/rfc/rfc9111.html#name-validation`
`15`	`15`	`*`
Original file line number	Diff line number	Diff line change
`@@ -97,7 +97,7 @@ function safeUrl (path) {`
`97`	`97`	`return path`
`98`	`98`	`}`
`99`	`99`
`100`		`- const pathSegments = path.split('?')`
	`100`	`+ const pathSegments = path.split('?', 3)`
`101`	`101`
`102`	`102`	`if (pathSegments.length !== 2) {`
`103`	`103`	`return path`
Original file line number	Diff line number	Diff line change
`@@ -309,7 +309,9 @@ function finalizeAndReportTiming (response, initiatorType = 'other') {`
`309`	`309`	`originalURL.href,`
`310`	`310`	`initiatorType,`
`311`	`311`	`globalThis,`
`312`		`- cacheState`
	`312`	`+ cacheState,`
	`313`	`+ '', // bodyType`
	`314`	`+ response.status`
`313`	`315`	`)`
`314`	`316`	`}`
`315`	`317`
`@@ -994,7 +996,7 @@ function fetchFinale (fetchParams, response) {`
`994`	`996`	`// 3. Set fetchParams’s controller’s report timing steps to the following steps given a global object global:`
`995`	`997`	`fetchParams.controller.reportTimingSteps = () => {`
`996`	`998`	`// 1. If fetchParams’s request’s URL’s scheme is not an HTTP(S) scheme, then return.`
`997`		`- if (fetchParams.request.url.protocol !== 'https:') {`
	`999`	`+ if (!urlIsHttpHttpsScheme(fetchParams.request.url)) {`
`998`	`1000`	`return`
`999`	`1001`	`}`
`1000`	`1002`
`@@ -1036,7 +1038,6 @@ function fetchFinale (fetchParams, response) {`
`1036`	`1038`	`// fetchParams’s request’s URL, fetchParams’s request’s initiator type, global, cacheState, bodyInfo,`
`1037`	`1039`	`// and responseStatus.`
`1038`	`1040`	`if (fetchParams.request.initiatorType != null) {`
`1039`		`- // TODO: update markresourcetiming`
`1040`	`1041`	`markResourceTiming(timingInfo, fetchParams.request.url.href, fetchParams.request.initiatorType, globalThis, cacheState, bodyInfo, responseStatus)`
`1041`	`1042`	`}`
`1042`	`1043`	`}`