From 5b50964680dff85a16e9ac1ee760754c9c03ed48 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 15 May 2025 16:31:27 +0000
Subject: [PATCH 1/4] Bump undici from 5.28.5 to 5.29.0
Bumps [undici](https://github.com/nodejs/undici) from 5.28.5 to 5.29.0.
- [Release notes](https://github.com/nodejs/undici/releases)
- [Commits](https://github.com/nodejs/undici/compare/v5.28.5...v5.29.0)
---
updated-dependencies:
- dependency-name: undici
dependency-version: 5.29.0
dependency-type: indirect
...
Signed-off-by: dependabot[bot] <support@github.com>
---
package-lock.json | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/package-lock.json b/package-lock.json
index f17717a5f..88d207327 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -5330,9 +5330,9 @@
}
},
"node_modules/undici": {
- "version": "5.28.5",
- "resolved": "https://registry.npmjs.org/undici/-/undici-5.28.5.tgz",
- "integrity": "sha512-zICwjrDrcrUE0pyyJc1I2QzBkLM8FINsgOrt6WjA+BgajVq9Nxu2PbFFXUrAggLfDXlZGZBVZYw7WNV5KiBiBA==",
+ "version": "5.29.0",
+ "resolved": "https://registry.npmjs.org/undici/-/undici-5.29.0.tgz",
+ "integrity": "sha512-raqeBD6NQK4SkWhQzeYKd1KmIG6dllBOTt55Rmkt4HtI9mwdWtJljnrXjAFUBLTSN67HWrOIZ3EPF4kjUw80Bg==",
"license": "MIT",
"dependencies": {
"@fastify/busboy": "^2.0.0"
From 3d2d4beeaa4a152c7cae821506f70d1b8c0e904f Mon Sep 17 00:00:00 2001
From: Aparna Jyothi <aparnajyothi-y@github.com>
Date: Wed, 16 Jul 2025 18:35:58 +0530
Subject: [PATCH 2/4] check failures fix
---
.licenses/npm/undici.dep.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.licenses/npm/undici.dep.yml b/.licenses/npm/undici.dep.yml
index 961089c65..fadecf4a7 100644
--- a/.licenses/npm/undici.dep.yml
+++ b/.licenses/npm/undici.dep.yml
@@ -1,6 +1,6 @@
---
name: undici
-version: 5.28.5
+version: 5.29.0
type: npm
summary: An HTTP/1.1 client, written from scratch for Node.js
homepage: https://undici.nodejs.org
From d61f34163440350fb429006b41fc424217eb2b0a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Cgowridurgad=E2=80=9D?= <“hgowridurgad@github.com>
Date: Thu, 17 Jul 2025 11:39:37 +0530
Subject: [PATCH 3/4] check-failures fix
---
dist/cache-save/index.js | 64 ++++++++++++++++++++--------------------
dist/setup/index.js | 64 ++++++++++++++++++++--------------------
2 files changed, 64 insertions(+), 64 deletions(-)
diff --git a/dist/cache-save/index.js b/dist/cache-save/index.js
index b12e8abb8..de26f2f17 100644
--- a/dist/cache-save/index.js
+++ b/dist/cache-save/index.js
@@ -52855,7 +52855,7 @@ function expand(str, isTop) {
var isOptions = m.body.indexOf(',') >= 0;
if (!isSequence && !isOptions) {
// {a},b}
- if (m.post.match(/,.*\}/)) {
+ if (m.post.match(/,(?!,).*\}/)) {
str = m.pre + '{' + m.body + escClose + m.post;
return expand(str);
}
@@ -64080,7 +64080,7 @@ module.exports = {
const { parseSetCookie } = __nccwpck_require__(8915)
-const { stringify, getHeadersList } = __nccwpck_require__(3834)
+const { stringify } = __nccwpck_require__(3834)
const { webidl } = __nccwpck_require__(4222)
const { Headers } = __nccwpck_require__(6349)
@@ -64156,14 +64156,13 @@ function getSetCookies (headers) {
webidl.brandCheck(headers, Headers, { strict: false })
- const cookies = getHeadersList(headers).cookies
+ const cookies = headers.getSetCookie()
if (!cookies) {
return []
}
- // In older versions of undici, cookies is a list of name:value.
- return cookies.map((pair) => parseSetCookie(Array.isArray(pair) ? pair[1] : pair))
+ return cookies.map((pair) => parseSetCookie(pair))
}
/**
@@ -64591,14 +64590,15 @@ module.exports = {
/***/ }),
/***/ 3834:
-/***/ ((module, __unused_webpack_exports, __nccwpck_require__) => {
+/***/ ((module) => {
"use strict";
-const assert = __nccwpck_require__(2613)
-const { kHeadersList } = __nccwpck_require__(6443)
-
+/**
+ * @param {string} value
+ * @returns {boolean}
+ */
function isCTLExcludingHtab (value) {
if (value.length === 0) {
return false
@@ -64859,31 +64859,13 @@ function stringify (cookie) {
return out.join('; ')
}
-let kHeadersListNode
-
-function getHeadersList (headers) {
- if (headers[kHeadersList]) {
- return headers[kHeadersList]
- }
-
- if (!kHeadersListNode) {
- kHeadersListNode = Object.getOwnPropertySymbols(headers).find(
- (symbol) => symbol.description === 'headers list'
- )
-
- assert(kHeadersListNode, 'Headers cannot be parsed')
- }
-
- const headersList = headers[kHeadersListNode]
- assert(headersList)
-
- return headersList
-}
-
module.exports = {
isCTLExcludingHtab,
- stringify,
- getHeadersList
+ validateCookieName,
+ validateCookiePath,
+ validateCookieValue,
+ toIMFDate,
+ stringify
}
@@ -68887,6 +68869,7 @@ const {
isValidHeaderName,
isValidHeaderValue
} = __nccwpck_require__(5523)
+const util = __nccwpck_require__(9023)
const { webidl } = __nccwpck_require__(4222)
const assert = __nccwpck_require__(2613)
@@ -69440,6 +69423,9 @@ Object.defineProperties(Headers.prototype, {
[Symbol.toStringTag]: {
value: 'Headers',
configurable: true
+ },
+ [util.inspect.custom]: {
+ enumerable: false
}
})
@@ -78616,6 +78602,20 @@ class Pool extends PoolBase {
? { ...options.interceptors }
: undefined
this[kFactory] = factory
+
+ this.on('connectionError', (origin, targets, error) => {
+ // If a connection error occurs, we remove the client from the pool,
+ // and emit a connectionError event. They will not be re-used.
+ // Fixes https://github.com/nodejs/undici/issues/3895
+ for (const target of targets) {
+ // Do not use kRemoveClient here, as it will close the client,
+ // but the client cannot be closed in this state.
+ const idx = this[kClients].indexOf(target)
+ if (idx !== -1) {
+ this[kClients].splice(idx, 1)
+ }
+ }
+ })
}
[kGetDispatcher] () {
diff --git a/dist/setup/index.js b/dist/setup/index.js
index 81bbe3faf..fd03fd71b 100644
--- a/dist/setup/index.js
+++ b/dist/setup/index.js
@@ -58171,7 +58171,7 @@ function expand(str, isTop) {
var isOptions = m.body.indexOf(',') >= 0;
if (!isSequence && !isOptions) {
// {a},b}
- if (m.post.match(/,.*\}/)) {
+ if (m.post.match(/,(?!,).*\}/)) {
str = m.pre + '{' + m.body + escClose + m.post;
return expand(str);
}
@@ -72068,7 +72068,7 @@ module.exports = {
const { parseSetCookie } = __nccwpck_require__(8915)
-const { stringify, getHeadersList } = __nccwpck_require__(3834)
+const { stringify } = __nccwpck_require__(3834)
const { webidl } = __nccwpck_require__(4222)
const { Headers } = __nccwpck_require__(6349)
@@ -72144,14 +72144,13 @@ function getSetCookies (headers) {
webidl.brandCheck(headers, Headers, { strict: false })
- const cookies = getHeadersList(headers).cookies
+ const cookies = headers.getSetCookie()
if (!cookies) {
return []
}
- // In older versions of undici, cookies is a list of name:value.
- return cookies.map((pair) => parseSetCookie(Array.isArray(pair) ? pair[1] : pair))
+ return cookies.map((pair) => parseSetCookie(pair))
}
/**
@@ -72579,14 +72578,15 @@ module.exports = {
/***/ }),
/***/ 3834:
-/***/ ((module, __unused_webpack_exports, __nccwpck_require__) => {
+/***/ ((module) => {
"use strict";
-const assert = __nccwpck_require__(2613)
-const { kHeadersList } = __nccwpck_require__(6443)
-
+/**
+ * @param {string} value
+ * @returns {boolean}
+ */
function isCTLExcludingHtab (value) {
if (value.length === 0) {
return false
@@ -72847,31 +72847,13 @@ function stringify (cookie) {
return out.join('; ')
}
-let kHeadersListNode
-
-function getHeadersList (headers) {
- if (headers[kHeadersList]) {
- return headers[kHeadersList]
- }
-
- if (!kHeadersListNode) {
- kHeadersListNode = Object.getOwnPropertySymbols(headers).find(
- (symbol) => symbol.description === 'headers list'
- )
-
- assert(kHeadersListNode, 'Headers cannot be parsed')
- }
-
- const headersList = headers[kHeadersListNode]
- assert(headersList)
-
- return headersList
-}
-
module.exports = {
isCTLExcludingHtab,
- stringify,
- getHeadersList
+ validateCookieName,
+ validateCookiePath,
+ validateCookieValue,
+ toIMFDate,
+ stringify
}
@@ -76875,6 +76857,7 @@ const {
isValidHeaderName,
isValidHeaderValue
} = __nccwpck_require__(5523)
+const util = __nccwpck_require__(9023)
const { webidl } = __nccwpck_require__(4222)
const assert = __nccwpck_require__(2613)
@@ -77428,6 +77411,9 @@ Object.defineProperties(Headers.prototype, {
[Symbol.toStringTag]: {
value: 'Headers',
configurable: true
+ },
+ [util.inspect.custom]: {
+ enumerable: false
}
})
@@ -86604,6 +86590,20 @@ class Pool extends PoolBase {
? { ...options.interceptors }
: undefined
this[kFactory] = factory
+
+ this.on('connectionError', (origin, targets, error) => {
+ // If a connection error occurs, we remove the client from the pool,
+ // and emit a connectionError event. They will not be re-used.
+ // Fixes https://github.com/nodejs/undici/issues/3895
+ for (const target of targets) {
+ // Do not use kRemoveClient here, as it will close the client,
+ // but the client cannot be closed in this state.
+ const idx = this[kClients].indexOf(target)
+ if (idx !== -1) {
+ this[kClients].splice(idx, 1)
+ }
+ }
+ })
}
[kGetDispatcher] () {
From a1870902404dd118174a6c1d97d3bdc57008251d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Cgowridurgad=E2=80=9D?= <“hgowridurgad@github.com>
Date: Thu, 17 Jul 2025 12:08:45 +0530
Subject: [PATCH 4/4] check failures fix
---
dist/cache-save/index.js | 2 +-
dist/setup/index.js | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/dist/cache-save/index.js b/dist/cache-save/index.js
index de26f2f17..d763cfbc8 100644
--- a/dist/cache-save/index.js
+++ b/dist/cache-save/index.js
@@ -52855,7 +52855,7 @@ function expand(str, isTop) {
var isOptions = m.body.indexOf(',') >= 0;
if (!isSequence && !isOptions) {
// {a},b}
- if (m.post.match(/,(?!,).*\}/)) {
+ if (m.post.match(/,.*\}/)) {
str = m.pre + '{' + m.body + escClose + m.post;
return expand(str);
}
diff --git a/dist/setup/index.js b/dist/setup/index.js
index fd03fd71b..b31624934 100644
--- a/dist/setup/index.js
+++ b/dist/setup/index.js
@@ -58171,7 +58171,7 @@ function expand(str, isTop) {
var isOptions = m.body.indexOf(',') >= 0;
if (!isSequence && !isOptions) {
// {a},b}
- if (m.post.match(/,(?!,).*\}/)) {
+ if (m.post.match(/,.*\}/)) {
str = m.pre + '{' + m.body + escClose + m.post;
return expand(str);
}