deps: update undici to 6.21.0

nodejs-github-bot · RafaelGSS · commit dc8aca3692ca · 2024-11-18T11:02:27.000-03:00
PR-URL: #55851 Reviewed-By: Chemi Atlow <chemi@atlow.co.il> Reviewed-By: Marco Ippolito <marcoippolito54@gmail.com> Reviewed-By: Michael Dawson <midawson@redhat.com> Reviewed-By: Rafael Gonzaga <rafael.nunu@hotmail.com> Reviewed-By: Matthew Aitken <maitken033380023@gmail.com>
diff --git a/deps/undici/src/lib/core/connect.js b/deps/undici/src/lib/core/connect.js
@@ -220,6 +220,11 @@ const setupConnectTimeout = process.platform === 'win32'
 * @param {number} opts.port
 */
 function onConnectTimeout (socket, opts) {
+ // The socket could be already garbage collected
+ if (socket == null) {
+ return
+ }
+
 let message = 'Connect Timeout Error'
 if (Array.isArray(socket.autoSelectFamilyAttemptedAddresses)) {
 message += ` (attempted addresses: ${socket.autoSelectFamilyAttemptedAddresses.join(', ')},`
diff --git a/deps/undici/src/lib/handler/retry-handler.js b/deps/undici/src/lib/handler/retry-handler.js
@@ -229,7 +229,7 @@ class RetryHandler {
 return false
 }
 
- const { start, size, end = size } = contentRange
+ const { start, size, end = size - 1 } = contentRange
 
 assert(this.start === start, 'content-range mismatch')
 assert(this.end == null || this.end === end, 'content-range mismatch')
@@ -252,7 +252,7 @@ class RetryHandler {
 )
 }
 
- const { start, size, end = size } = range
+ const { start, size, end = size - 1 } = range
 assert(
 start != null && Number.isFinite(start),
 'content-range mismatch'
@@ -266,7 +266,7 @@ class RetryHandler {
 // We make our best to checkpoint the body for further range headers
 if (this.end == null) {
 const contentLength = headers['content-length']
- this.end = contentLength != null ? Number(contentLength) : null
+ this.end = contentLength != null ? Number(contentLength) - 1 : null
 }
 
 assert(Number.isFinite(this.start))
diff --git a/deps/undici/src/lib/llhttp/wasm_build_env.txt b/deps/undici/src/lib/llhttp/wasm_build_env.txt
@@ -1,12 +1,12 @@
 
-> undici@6.20.1 prebuild:wasm
+> undici@6.21.0 prebuild:wasm
 > node build/wasm.js --prebuild
 
 > docker build --platform=linux/x86_64 -t llhttp_wasm_builder -f /home/runner/work/node/node/deps/undici/src/build/Dockerfile /home/runner/work/node/node/deps/undici/src
 
 
 
-> undici@6.20.1 build:wasm
+> undici@6.21.0 build:wasm
 > node build/wasm.js --docker
 
 > docker run --rm -t --platform=linux/x86_64 --user 1001:127 --mount type=bind,source=/home/runner/work/node/node/deps/undici/src/lib/llhttp,target=/home/node/undici/lib/llhttp llhttp_wasm_builder node build/wasm.js
diff --git a/deps/undici/src/lib/web/cache/cache.js b/deps/undici/src/lib/web/cache/cache.js
@@ -37,6 +37,7 @@ class Cache {
 webidl.illegalConstructor()
 }
 
+ webidl.util.markAsUncloneable(this)
 this.#relevantRequestResponseList = arguments[1]
 }
 
diff --git a/deps/undici/src/lib/web/cache/cachestorage.js b/deps/undici/src/lib/web/cache/cachestorage.js
@@ -16,6 +16,8 @@ class CacheStorage {
 if (arguments[0] !== kConstruct) {
 webidl.illegalConstructor()
 }
+
+ webidl.util.markAsUncloneable(this)
 }
 
 async match (request, options = {}) {
diff --git a/deps/undici/src/lib/web/eventsource/eventsource.js b/deps/undici/src/lib/web/eventsource/eventsource.js
@@ -105,6 +105,8 @@ class EventSource extends EventTarget {
 // 1. Let ev be a new EventSource object.
 super()
 
+ webidl.util.markAsUncloneable(this)
+
 const prefix = 'EventSource constructor'
 webidl.argumentLengthCheck(arguments, 1, prefix)
 
diff --git a/deps/undici/src/lib/web/fetch/formdata.js b/deps/undici/src/lib/web/fetch/formdata.js
@@ -14,6 +14,8 @@ const File = globalThis.File ?? NativeFile
 // https://xhr.spec.whatwg.org/#formdata
 class FormData {
 constructor (form) {
+ webidl.util.markAsUncloneable(this)
+
 if (form !== undefined) {
 throw webidl.errors.conversionFailed({
 prefix: 'FormData constructor',
diff --git a/deps/undici/src/lib/web/fetch/headers.js b/deps/undici/src/lib/web/fetch/headers.js
@@ -359,6 +359,8 @@ class Headers {
 #headersList
 
 constructor (init = undefined) {
+ webidl.util.markAsUncloneable(this)
+
 if (init === kConstruct) {
 return
 }
diff --git a/deps/undici/src/lib/web/fetch/index.js b/deps/undici/src/lib/web/fetch/index.js
@@ -2137,7 +2137,7 @@ async function httpNetworkFetch (
 
 // https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Encoding
 if (codings.length !== 0 && request.method !== 'HEAD' && request.method !== 'CONNECT' && !nullBodyStatus.includes(status) && !willFollow) {
- for (let i = 0; i < codings.length; ++i) {
+ for (let i = codings.length - 1; i >= 0; --i) {
 const coding = codings[i]
 // https://www.rfc-editor.org/rfc/rfc9112.html#section-7.2
 if (coding === 'x-gzip' || coding === 'gzip') {
diff --git a/deps/undici/src/lib/web/fetch/request.js b/deps/undici/src/lib/web/fetch/request.js
@@ -82,6 +82,7 @@ let patchMethodWarning = false
 class Request {
 // https://fetch.spec.whatwg.org/#dom-request
 constructor (input, init = {}) {
+ webidl.util.markAsUncloneable(this)
 if (input === kConstruct) {
 return
 }
diff --git a/deps/undici/src/lib/web/fetch/response.js b/deps/undici/src/lib/web/fetch/response.js
@@ -110,6 +110,7 @@ class Response {
 
 // https://fetch.spec.whatwg.org/#dom-response
 constructor (body = null, init = {}) {
+ webidl.util.markAsUncloneable(this)
 if (body === kConstruct) {
 return
 }
diff --git a/deps/undici/src/lib/web/fetch/webidl.js b/deps/undici/src/lib/web/fetch/webidl.js
@@ -1,6 +1,7 @@
 'use strict'
 
 const { types, inspect } = require('node:util')
+const { markAsUncloneable } = require('node:worker_threads')
 const { toUSVString } = require('../../core/util')
 
 /** @type {import('../../../types/webidl').Webidl} */
@@ -86,6 +87,7 @@ webidl.util.Type = function (V) {
 }
 }
 
+webidl.util.markAsUncloneable = markAsUncloneable || (() => {})
 // https://webidl.spec.whatwg.org/#abstract-opdef-converttoint
 webidl.util.ConvertToInt = function (V, bitLength, signedness, opts) {
 let upperBound
diff --git a/deps/undici/src/lib/web/websocket/events.js b/deps/undici/src/lib/web/websocket/events.js
@@ -14,6 +14,7 @@ class MessageEvent extends Event {
 constructor (type, eventInitDict = {}) {
 if (type === kConstruct) {
 super(arguments[1], arguments[2])
+ webidl.util.markAsUncloneable(this)
 return
 }
 
@@ -26,6 +27,7 @@ class MessageEvent extends Event {
 super(type, eventInitDict)
 
 this.#eventInit = eventInitDict
+ webidl.util.markAsUncloneable(this)
 }
 
 get data () {
@@ -112,6 +114,7 @@ class CloseEvent extends Event {
 super(type, eventInitDict)
 
 this.#eventInit = eventInitDict
+ webidl.util.markAsUncloneable(this)
 }
 
 get wasClean () {
@@ -142,6 +145,7 @@ class ErrorEvent extends Event {
 webidl.argumentLengthCheck(arguments, 1, prefix)
 
 super(type, eventInitDict)
+ webidl.util.markAsUncloneable(this)
 
 type = webidl.converters.DOMString(type, prefix, 'type')
 eventInitDict = webidl.converters.ErrorEventInit(eventInitDict ?? {})
diff --git a/deps/undici/src/lib/web/websocket/websocket.js b/deps/undici/src/lib/web/websocket/websocket.js
@@ -51,6 +51,8 @@ class WebSocket extends EventTarget {
 constructor (url, protocols = []) {
 super()
 
+ webidl.util.markAsUncloneable(this)
+
 const prefix = 'WebSocket constructor'
 webidl.argumentLengthCheck(arguments, 1, prefix)
 
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/src/types/webidl.d.ts b/deps/undici/src/types/webidl.d.ts
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 change
  * @param {number} opts.port
  */
 functiononConnectTimeout(socket,opts){
 +// The socket could be already garbage collected
 +if(socket==null){
 +return
 +}
++
 letmessage='Connect Timeout Error'
 if(Array.isArray(socket.autoSelectFamilyAttemptedAddresses)){
 message+=` (attempted addresses: ${socket.autoSelectFamilyAttemptedAddresses.join(', ')},`
Original file line number	Diff line number	Diff line change
`@@ -229,7 +229,7 @@ class RetryHandler {`
`229`	`229`	`returnfalse`
`230`	`230`	`}`
`231`	`231`
`232`		`-const{ start, size, end =size}=contentRange`
	`232`	`+const{ start, size, end =size-1}=contentRange`
`233`	`233`
`234`	`234`	`assert(this.start===start,'content-range mismatch')`
`235`	`235`	`assert(this.end==null\|\|this.end===end,'content-range mismatch')`
`@@ -252,7 +252,7 @@ class RetryHandler {`
`252`	`252`	`)`
`253`	`253`	`}`
`254`	`254`
`255`		`-const{ start, size, end =size}=range`
	`255`	`+const{ start, size, end =size-1}=range`
`256`	`256`	`assert(`
`257`	`257`	`start!=null&&Number.isFinite(start),`
`258`	`258`	`'content-range mismatch'`
`@@ -266,7 +266,7 @@ class RetryHandler {`
`266`	`266`	`// We make our best to checkpoint the body for further range headers`
`267`	`267`	`if(this.end==null){`
`268`	`268`	`constcontentLength=headers['content-length']`
`269`		`-this.end=contentLength!=null ? Number(contentLength) : null`
	`269`	`+this.end=contentLength!=null ? Number(contentLength)-1: null`
`270`	`270`	`}`
`271`	`271`
`272`	`272`	`assert(Number.isFinite(this.start))`
Original file line number	Diff line number	Diff line change
`@@ -37,6 +37,7 @@ class Cache {`
`37`	`37`	`webidl.illegalConstructor()`
`38`	`38`	`}`
`39`	`39`
	`40`	`+webidl.util.markAsUncloneable(this)`
`40`	`41`	`this.#relevantRequestResponseList =arguments[1]`
`41`	`42`	`}`
`42`	`43`
Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,8 @@ class CacheStorage {`
`16`	`16`	`if(arguments[0]!==kConstruct){`
`17`	`17`	`webidl.illegalConstructor()`
`18`	`18`	`}`
	`19`	`+`
	`20`	`+webidl.util.markAsUncloneable(this)`
`19`	`21`	`}`
`20`	`22`
`21`	`23`	`asyncmatch(request,options={}){`
Original file line number	Diff line number	Diff line change
`@@ -359,6 +359,8 @@ class Headers {`
`359`	`359`	`#headersList`
`360`	`360`
`361`	`361`	`constructor(init=undefined){`
	`362`	`+webidl.util.markAsUncloneable(this)`
	`363`	`+`
`362`	`364`	`if(init===kConstruct){`
`363`	`365`	`return`
`364`	`366`	`}`
-Original file line number
+Diff line change
 // https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Encoding
 if(codings.length!==0&&request.method!=='HEAD'&&request.method!=='CONNECT'&&!nullBodyStatus.includes(status)&&!willFollow){
 -for(leti=0;i<codings.length;++i){
 +for(leti=codings.length-1;i>=0;--i){
 constcoding=codings[i]
 // https://www.rfc-editor.org/rfc/rfc9112.html#section-7.2
 if(coding==='x-gzip'||coding==='gzip'){
Original file line number	Diff line number	Diff line change
`@@ -82,6 +82,7 @@ let patchMethodWarning = false`
`82`	`82`	`classRequest{`
`83`	`83`	`// https://fetch.spec.whatwg.org/#dom-request`
`84`	`84`	`constructor(input,init={}){`
	`85`	`+webidl.util.markAsUncloneable(this)`
`85`	`86`	`if(input===kConstruct){`
`86`	`87`	`return`
`87`	`88`	`}`