Compare commits

..

7 Commits

Author SHA1 Message Date
HarithaVattikuti
6fed077266 replace EOL versions 2026-11-17 16:03:03 -06:00
Haritha
c36461391e fix old version for pipenv 2026-11-13 23:09:42 +00:00
Haritha
20b81b39f9 pipenv fix 2026-11-13 22:52:02 +00:00
Haritha
cda1b94b69 update numpy 2026-11-13 22:44:30 +00:00
Haritha
6f805ffa48 Fix pip version and format issues 2026-11-12 19:19:38 +00:00
HarithaVattikuti
aa821a9869 Fix failure versions 2026-11-10 10:47:09 -06:00
HarithaVattikuti
a2c534249d Update latest python versions 2026-11-10 10:36:59 -06:00
8 changed files with 75 additions and 284 deletions

View File

@@ -108,10 +108,9 @@ jobs:
macos-15-intel, macos-15-intel,
macos-latest macos-latest
] ]
python-version: ['3.11', 'pypy-3.11-v7.x', '3.12', '3.13', '3.14'] python-version:
['3.11', 'pypy-3.11-v7.x', '3.12', '3.13', '3.14']
exclude: exclude:
- os: ubuntu-22.04
python-version: pypy-3.11-v7.x
- os: windows-11-arm - os: windows-11-arm
python-version: pypy-3.11-v7.x python-version: pypy-3.11-v7.x
steps: steps:

View File

@@ -175,7 +175,7 @@ jobs:
- os: ubuntu-latest - os: ubuntu-latest
python: '3.11.9' python: '3.11.9'
- os: ubuntu-latest - os: ubuntu-latest
python: '==3.12.10' python: '3.12.10'
steps: steps:
- name: Checkout - name: Checkout
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1

View File

@@ -1,6 +1,6 @@
--- ---
name: undici name: undici
version: 6.29.1 version: 6.29.0
type: npm type: npm
summary: An HTTP/1.1 client, written from scratch for Node.js summary: An HTTP/1.1 client, written from scratch for Node.js
homepage: https://undici.nodejs.org homepage: https://undici.nodejs.org

View File

@@ -1,4 +1,4 @@
certifi==2026.10.19 certifi==2024.7.4
chardet==3.0.4 chardet==3.0.4
docutils==0.16 docutils==0.16
idna==3.15 idna==3.15
@@ -8,5 +8,5 @@ packaging==20.7
pdf2image==1.12.1 pdf2image==1.12.1
Pygments==2.20.0 Pygments==2.20.0
requests==2.33.0 requests==2.33.0
urllib3==2.8.0 urllib3==2.7.0
xlrd==1.2.0 xlrd==1.2.0

View File

@@ -1,6 +1,6 @@
altgraph==0.17.2 altgraph==0.17.2
certifi==2026.10.19 certifi==2024.7.4
chardet==3.0.4 chardet==3.0.4
@@ -42,6 +42,6 @@ pywin32-ctypes==0.2.0
requests==2.33.0 requests==2.33.0
urllib3==2.8.0 urllib3==2.7.0
xlrd==1.2.0 xlrd==1.2.0

View File

@@ -16178,7 +16178,7 @@ function defaultFactory (origin, opts) {
} }
class Agent extends DispatcherBase { class Agent extends DispatcherBase {
constructor ({ factory = defaultFactory, maxRedirections = 0, connect, tls, ...options } = {}) { constructor ({ factory = defaultFactory, maxRedirections = 0, connect, ...options } = {}) {
if (typeof factory !== 'function') { if (typeof factory !== 'function') {
throw new InvalidArgumentError('factory must be a function.') throw new InvalidArgumentError('factory must be a function.')
} }
@@ -16197,15 +16197,11 @@ class Agent extends DispatcherBase {
connect = { ...connect } connect = { ...connect }
} }
if (tls && typeof tls !== 'function') {
tls = { ...tls }
}
this[kInterceptors] = options.interceptors?.Agent && Array.isArray(options.interceptors.Agent) this[kInterceptors] = options.interceptors?.Agent && Array.isArray(options.interceptors.Agent)
? options.interceptors.Agent ? options.interceptors.Agent
: [createRedirectInterceptor({ maxRedirections })] : [createRedirectInterceptor({ maxRedirections })]
this[kOptions] = { ...util.deepClone(options), connect, tls } this[kOptions] = { ...util.deepClone(options), connect }
this[kOptions].interceptors = options.interceptors this[kOptions].interceptors = options.interceptors
? { ...options.interceptors } ? { ...options.interceptors }
: undefined : undefined
@@ -17238,6 +17234,8 @@ async function connectH1 (client, socket) {
socket[kParser] = new Parser(client, socket, llhttpInstance) socket[kParser] = new Parser(client, socket, llhttpInstance)
addListener(socket, 'error', function (err) { addListener(socket, 'error', function (err) {
assert(err.code !== 'ERR_TLS_CERT_ALTNAME_INVALID')
const parser = this[kParser] const parser = this[kParser]
// On Mac OS, we get an ECONNRESET even if there is a full body to be forwarded // On Mac OS, we get an ECONNRESET even if there is a full body to be forwarded
@@ -18167,6 +18165,8 @@ async function connectH2 (client, socket) {
socket[kHTTP2Session] = session socket[kHTTP2Session] = session
util.addListener(socket, 'error', function (err) { util.addListener(socket, 'error', function (err) {
assert(err.code !== 'ERR_TLS_CERT_ALTNAME_INVALID')
this[kError] = err this[kError] = err
this[kClient][kOnError](err) this[kClient][kOnError](err)
@@ -18240,6 +18240,8 @@ function resumeH2 (client) {
} }
function onHttp2SessionError (err) { function onHttp2SessionError (err) {
assert(err.code !== 'ERR_TLS_CERT_ALTNAME_INVALID')
this[kSocket][kError] = err this[kSocket][kError] = err
this[kClient][kOnError](err) this[kClient][kOnError](err)
} }
@@ -18937,10 +18939,9 @@ class Client extends DispatcherBase {
// h2 // h2
maxConcurrentStreams, maxConcurrentStreams,
allowH2, allowH2,
webSocket, webSocket
eventSource
} = {}) { } = {}) {
super({ webSocket, eventSource }) super({ webSocket })
if (keepAlive !== undefined) { if (keepAlive !== undefined) {
throw new InvalidArgumentError('unsupported keepAlive, use pipelining=0 instead') throw new InvalidArgumentError('unsupported keepAlive, use pipelining=0 instead')
@@ -19461,7 +19462,6 @@ module.exports = Client
const buffer = __nccwpck_require__(4573)
const Dispatcher = __nccwpck_require__(883) const Dispatcher = __nccwpck_require__(883)
const { const {
ClientDestroyedError, ClientDestroyedError,
@@ -19474,7 +19474,6 @@ const kOnDestroyed = Symbol('onDestroyed')
const kOnClosed = Symbol('onClosed') const kOnClosed = Symbol('onClosed')
const kInterceptedDispatch = Symbol('Intercepted Dispatch') const kInterceptedDispatch = Symbol('Intercepted Dispatch')
const kWebSocketOptions = Symbol('webSocketOptions') const kWebSocketOptions = Symbol('webSocketOptions')
const kEventSourceOptions = Symbol('eventSourceOptions')
class DispatcherBase extends Dispatcher { class DispatcherBase extends Dispatcher {
constructor (opts) { constructor (opts) {
@@ -19485,7 +19484,6 @@ class DispatcherBase extends Dispatcher {
this[kClosed] = false this[kClosed] = false
this[kOnClosed] = [] this[kOnClosed] = []
this[kWebSocketOptions] = opts?.webSocket ?? {} this[kWebSocketOptions] = opts?.webSocket ?? {}
this[kEventSourceOptions] = opts?.eventSource ?? {}
} }
get webSocketOptions () { get webSocketOptions () {
@@ -19495,12 +19493,6 @@ class DispatcherBase extends Dispatcher {
} }
} }
get eventSourceOptions () {
return {
maxEventSize: this[kEventSourceOptions].maxEventSize ?? buffer.kStringMaxLength
}
}
get destroyed () { get destroyed () {
return this[kDestroyed] return this[kDestroyed]
} }
@@ -25859,7 +25851,6 @@ module.exports = {
/***/ ((module, __unused_webpack_exports, __nccwpck_require__) => { /***/ ((module, __unused_webpack_exports, __nccwpck_require__) => {
const buffer = __nccwpck_require__(4573)
const { Transform } = __nccwpck_require__(7075) const { Transform } = __nccwpck_require__(7075)
const { isASCIINumber, isValidLastEventId } = __nccwpck_require__(4811) const { isASCIINumber, isValidLastEventId } = __nccwpck_require__(4811)
@@ -25884,19 +25875,11 @@ const COLON = 0x3A
*/ */
const SPACE = 0x20 const SPACE = 0x20
const defaultMaxEventSize = buffer.kStringMaxLength
const DATA = Buffer.from('data') const DATA = Buffer.from('data')
const EVENT = Buffer.from('event') const EVENT = Buffer.from('event')
const ID = Buffer.from('id') const ID = Buffer.from('id')
const RETRY = Buffer.from('retry') const RETRY = Buffer.from('retry')
// Each data field creates a string node, and each unconsumed input chunk keeps
// a Buffer wrapper. The absolute ceiling protects the large default byte limit.
const minParserItems = 1024
const maxParserItems = 131072
const bytesPerParserItem = 128
function isASCIINumberBytes (buffer, start) { function isASCIINumberBytes (buffer, start) {
if (start >= buffer.length) { if (start >= buffer.length) {
return false return false
@@ -25935,12 +25918,6 @@ function isFieldName (line, length, field) {
return true return true
} }
function createMaxEventSizeExceededError () {
const error = new Error('EventSource message size exceeded')
error.aborted = false
return error
}
/** /**
* @typedef {object} EventSourceStreamEvent * @typedef {object} EventSourceStreamEvent
* @type {object} * @type {object}
@@ -25989,13 +25966,6 @@ class EventSourceStream extends Transform {
pos = 0 pos = 0
lineChunkIndex = 0 lineChunkIndex = 0
linePos = 0 linePos = 0
lineLength = 0
eventSize = 0
eventFieldSizes = { data: 0, event: 0, id: 0, retry: 0 }
dataLineCount = 0
maxEventSize
maxDataLines
maxBufferedChunks
event = { event = {
data: undefined, data: undefined,
@@ -26006,7 +25976,6 @@ class EventSourceStream extends Transform {
/** /**
* @param {object} options * @param {object} options
* @param {number} [options.maxEventSize]
* @param {eventSourceSettings} options.eventSourceSettings * @param {eventSourceSettings} options.eventSourceSettings
* @param {Function} [options.push] * @param {Function} [options.push]
*/ */
@@ -26018,12 +25987,6 @@ class EventSourceStream extends Transform {
super(options) super(options)
this.state = options.eventSourceSettings || {} this.state = options.eventSourceSettings || {}
this.maxEventSize = options.maxEventSize ?? defaultMaxEventSize
const parserItemLimit = this.maxEventSize > 0
? Math.min(maxParserItems, Math.max(minParserItems, Math.floor(this.maxEventSize / bytesPerParserItem)))
: 0
this.maxDataLines = parserItemLimit
this.maxBufferedChunks = parserItemLimit
if (options.push) { if (options.push) {
this.push = options.push this.push = options.push
} }
@@ -26041,14 +26004,6 @@ class EventSourceStream extends Transform {
return return
} }
// A leading line ending can immediately release the currently buffered
// line, even when it uses the final allowed chunk slot.
if (this.maxEventSize > 0 &&
this.chunks.length >= this.maxBufferedChunks &&
chunk[0] !== LF && chunk[0] !== CR) {
callback(createMaxEventSizeExceededError())
return
}
this.chunks.push(chunk) this.chunks.push(chunk)
// Strip leading byte-order-mark if we opened the stream and started // Strip leading byte-order-mark if we opened the stream and started
@@ -26127,12 +26082,7 @@ class EventSourceStream extends Transform {
// In any case, we can process the line as we reached an // In any case, we can process the line as we reached an
// end-of-line character // end-of-line character
try { this.parseLine(this.readLine(), this.event)
this.parseLine(this.readLine(), this.event)
} catch (error) {
callback(error)
return
}
this.consumeCurrentByte() this.consumeCurrentByte()
// A line was processed and this could be the end of the event. We need // A line was processed and this could be the end of the event. We need
// to check if the next line is empty to determine if the event is // to check if the next line is empty to determine if the event is
@@ -26141,28 +26091,15 @@ class EventSourceStream extends Transform {
continue continue
} }
// readLine() is only called after CR or LF. Reject an unfinished line
// before it can retain an unbounded number of decoded chunks. The seven
// extra bytes allow the longest field prefix ("event: " or "retry: ").
if (this.maxEventSize > 0 && ++this.lineLength > this.maxEventSize + 7) {
callback(createMaxEventSizeExceededError())
return
}
this.advanceCursor() this.advanceCursor()
} }
callback() callback()
} }
_destroy (error, callback) {
this.chunks.length = 0
this.clearEvent()
super._destroy(error, callback)
}
/** /**
* @param {Buffer} line * @param {Buffer} line
* @param {EventSourceStreamEvent} event * @param {EventStreamEvent} event
*/ */
parseLine (line, event) { parseLine (line, event) {
// If the line is empty (a blank line) // If the line is empty (a blank line)
@@ -26196,13 +26133,6 @@ class EventSourceStream extends Transform {
} }
if (isFieldName(line, fieldLength, DATA)) { if (isFieldName(line, fieldLength, DATA)) {
if (this.maxEventSize > 0 && this.dataLineCount >= this.maxDataLines) {
throw createMaxEventSizeExceededError()
}
const valueBytes = line.length - valueStart
const dataSize = this.eventFieldSizes.data + (event.data === undefined ? 0 : 1) + valueBytes
this.setEventFieldSize('data', dataSize)
const value = line.toString('utf8', valueStart) const value = line.toString('utf8', valueStart)
if (event.data === undefined) { if (event.data === undefined) {
@@ -26210,13 +26140,11 @@ class EventSourceStream extends Transform {
} else { } else {
event.data += `\n${value}` event.data += `\n${value}`
} }
this.dataLineCount++
return return
} }
if (isFieldName(line, fieldLength, RETRY)) { if (isFieldName(line, fieldLength, RETRY)) {
if (isASCIINumberBytes(line, valueStart)) { if (isASCIINumberBytes(line, valueStart)) {
this.setEventFieldSize('retry', line.length - valueStart)
event.retry = line.toString('utf8', valueStart) event.retry = line.toString('utf8', valueStart)
} }
return return
@@ -26224,29 +26152,20 @@ class EventSourceStream extends Transform {
if (isFieldName(line, fieldLength, ID)) { if (isFieldName(line, fieldLength, ID)) {
if (isValidLastEventIdBytes(line, valueStart)) { if (isValidLastEventIdBytes(line, valueStart)) {
this.setEventFieldSize('id', line.length - valueStart)
event.id = line.toString('utf8', valueStart) event.id = line.toString('utf8', valueStart)
} }
return return
} }
if (isFieldName(line, fieldLength, EVENT)) { if (isFieldName(line, fieldLength, EVENT)) {
if (valueStart < line.length) { const value = line.toString('utf8', valueStart)
this.setEventFieldSize('event', line.length - valueStart)
event.event = line.toString('utf8', valueStart) if (value.length > 0) {
event.event = value
} }
} }
} }
setEventFieldSize (field, size) {
const eventSize = this.eventSize - this.eventFieldSizes[field] + size
if (this.maxEventSize > 0 && eventSize > this.maxEventSize) {
throw createMaxEventSizeExceededError()
}
this.eventSize = eventSize
this.eventFieldSizes[field] = size
}
/** /**
* @param {EventSourceStreamEvent} event * @param {EventSourceStreamEvent} event
*/ */
@@ -26277,12 +26196,6 @@ class EventSourceStream extends Transform {
this.event.event = undefined this.event.event = undefined
this.event.id = undefined this.event.id = undefined
this.event.retry = undefined this.event.retry = undefined
this.eventSize = 0
this.dataLineCount = 0
this.eventFieldSizes.data = 0
this.eventFieldSizes.event = 0
this.eventFieldSizes.id = 0
this.eventFieldSizes.retry = 0
} }
hasPendingEvent () { hasPendingEvent () {
@@ -26318,16 +26231,14 @@ class EventSourceStream extends Transform {
syncLineStartToCursor () { syncLineStartToCursor () {
this.lineChunkIndex = this.chunkIndex this.lineChunkIndex = this.chunkIndex
this.linePos = this.pos this.linePos = this.pos
this.lineLength = 0
this.dropConsumedChunks() this.dropConsumedChunks()
} }
dropConsumedChunks () { dropConsumedChunks () {
if (this.lineChunkIndex > 0) { while (this.lineChunkIndex > 0) {
const consumed = this.lineChunkIndex this.chunks.shift()
this.chunks.splice(0, consumed) this.lineChunkIndex--
this.lineChunkIndex = 0 this.chunkIndex--
this.chunkIndex -= consumed
} }
if (this.chunkIndex === this.chunks.length) { if (this.chunkIndex === this.chunks.length) {
@@ -26452,7 +26363,6 @@ const { isNetworkError } = __nccwpck_require__(9051)
const { delay } = __nccwpck_require__(4811) const { delay } = __nccwpck_require__(4811)
const { kEnumerableProperty } = __nccwpck_require__(3440) const { kEnumerableProperty } = __nccwpck_require__(3440)
const { environmentSettingsObject } = __nccwpck_require__(3168) const { environmentSettingsObject } = __nccwpck_require__(3168)
const { getGlobalDispatcher } = __nccwpck_require__(2581)
let experimentalWarned = false let experimentalWarned = false
@@ -26734,7 +26644,6 @@ class EventSource extends EventTarget {
const eventSourceStream = new EventSourceStream({ const eventSourceStream = new EventSourceStream({
eventSourceSettings: this.#state, eventSourceSettings: this.#state,
maxEventSize: this.#dispatcher.eventSourceOptions?.maxEventSize,
push: (event) => { push: (event) => {
this.dispatchEvent(createFastMessageEvent( this.dispatchEvent(createFastMessageEvent(
event.type, event.type,
@@ -26913,8 +26822,7 @@ webidl.converters.EventSourceInitDict = webidl.dictionaryConverter([
}, },
{ {
key: 'dispatcher', // undici only key: 'dispatcher', // undici only
converter: webidl.converters.any, converter: webidl.converters.any
defaultValue: () => getGlobalDispatcher()
} }
]) ])
@@ -32010,10 +31918,8 @@ async function httpNetworkFetch (
// 19. Run these steps in parallel: // 19. Run these steps in parallel:
// 1. Run these steps, but abort when fetchParams is canceled: // 1. Run these steps, but abort when fetchParams is canceled:
if (!fetchParams.controller.resume) { fetchParams.controller.onAborted = onAborted
fetchParams.controller.on('terminated', onAborted) fetchParams.controller.on('terminated', onAborted)
}
fetchParams.controller.resume = async () => { fetchParams.controller.resume = async () => {
// 1. While true // 1. While true
while (true) { while (true) {
@@ -32182,6 +32088,8 @@ async function httpNetworkFetch (
} }
location = headersList.get('location', true) location = headersList.get('location', true)
this.body = new Readable({ read: resume })
const decoders = [] const decoders = []
const willFollow = location && request.redirect === 'follow' && const willFollow = location && request.redirect === 'follow' &&
@@ -32199,7 +32107,7 @@ async function httpNetworkFetch (
// CVE fix similar to urllib3 (GHSA-gm62-xv2j-4w53) and curl (CVE-2022-32206). // CVE fix similar to urllib3 (GHSA-gm62-xv2j-4w53) and curl (CVE-2022-32206).
const maxContentEncodings = 5 const maxContentEncodings = 5
if (codings.length > maxContentEncodings) { if (codings.length > maxContentEncodings) {
this.abort(new Error(`too many content-encodings in response: ${codings.length}, maximum allowed is ${maxContentEncodings}`)) reject(new Error(`too many content-encodings in response: ${codings.length}, maximum allowed is ${maxContentEncodings}`))
return true return true
} }
@@ -32232,8 +32140,6 @@ async function httpNetworkFetch (
} }
} }
this.body = new Readable({ read: resume })
const onError = this.onError.bind(this) const onError = this.onError.bind(this)
resolve({ resolve({
@@ -32280,6 +32186,10 @@ async function httpNetworkFetch (
fetchParams.controller.off('terminated', this.abort) fetchParams.controller.off('terminated', this.abort)
} }
if (fetchParams.controller.onAborted) {
fetchParams.controller.off('terminated', fetchParams.controller.onAborted)
}
fetchParams.controller.ended = true fetchParams.controller.ended = true
this.body.push(null) this.body.push(null)
@@ -38754,20 +38664,6 @@ class ByteParser extends Writable {
if (isControlFrame(this.#info.opcode)) { if (isControlFrame(this.#info.opcode)) {
this.#loop = this.parseControlFrame(body) this.#loop = this.parseControlFrame(body)
this.#state = parserStates.INFO this.#state = parserStates.INFO
// If the automatic PONG/CLOSE reply filled the socket's write buffer,
// stop parsing and resume on drain so a PING flood cannot grow the
// outbound queue without bound.
const socket = this.ws[kResponse].socket
if (this.#loop && socket.writableNeedDrain) {
this.#loop = false
socket.once('drain', () => {
if (this.destroyed) return
this.#loop = true
this.run(callback)
})
return
}
} else { } else {
if (!this.#info.compressed) { if (!this.#info.compressed) {
if (!this.writeFragments(body)) { if (!this.writeFragments(body)) {

164
dist/setup/index.js vendored
View File

@@ -16178,7 +16178,7 @@ function defaultFactory (origin, opts) {
} }
class Agent extends DispatcherBase { class Agent extends DispatcherBase {
constructor ({ factory = defaultFactory, maxRedirections = 0, connect, tls, ...options } = {}) { constructor ({ factory = defaultFactory, maxRedirections = 0, connect, ...options } = {}) {
if (typeof factory !== 'function') { if (typeof factory !== 'function') {
throw new InvalidArgumentError('factory must be a function.') throw new InvalidArgumentError('factory must be a function.')
} }
@@ -16197,15 +16197,11 @@ class Agent extends DispatcherBase {
connect = { ...connect } connect = { ...connect }
} }
if (tls && typeof tls !== 'function') {
tls = { ...tls }
}
this[kInterceptors] = options.interceptors?.Agent && Array.isArray(options.interceptors.Agent) this[kInterceptors] = options.interceptors?.Agent && Array.isArray(options.interceptors.Agent)
? options.interceptors.Agent ? options.interceptors.Agent
: [createRedirectInterceptor({ maxRedirections })] : [createRedirectInterceptor({ maxRedirections })]
this[kOptions] = { ...util.deepClone(options), connect, tls } this[kOptions] = { ...util.deepClone(options), connect }
this[kOptions].interceptors = options.interceptors this[kOptions].interceptors = options.interceptors
? { ...options.interceptors } ? { ...options.interceptors }
: undefined : undefined
@@ -17238,6 +17234,8 @@ async function connectH1 (client, socket) {
socket[kParser] = new Parser(client, socket, llhttpInstance) socket[kParser] = new Parser(client, socket, llhttpInstance)
addListener(socket, 'error', function (err) { addListener(socket, 'error', function (err) {
assert(err.code !== 'ERR_TLS_CERT_ALTNAME_INVALID')
const parser = this[kParser] const parser = this[kParser]
// On Mac OS, we get an ECONNRESET even if there is a full body to be forwarded // On Mac OS, we get an ECONNRESET even if there is a full body to be forwarded
@@ -18167,6 +18165,8 @@ async function connectH2 (client, socket) {
socket[kHTTP2Session] = session socket[kHTTP2Session] = session
util.addListener(socket, 'error', function (err) { util.addListener(socket, 'error', function (err) {
assert(err.code !== 'ERR_TLS_CERT_ALTNAME_INVALID')
this[kError] = err this[kError] = err
this[kClient][kOnError](err) this[kClient][kOnError](err)
@@ -18240,6 +18240,8 @@ function resumeH2 (client) {
} }
function onHttp2SessionError (err) { function onHttp2SessionError (err) {
assert(err.code !== 'ERR_TLS_CERT_ALTNAME_INVALID')
this[kSocket][kError] = err this[kSocket][kError] = err
this[kClient][kOnError](err) this[kClient][kOnError](err)
} }
@@ -18937,10 +18939,9 @@ class Client extends DispatcherBase {
// h2 // h2
maxConcurrentStreams, maxConcurrentStreams,
allowH2, allowH2,
webSocket, webSocket
eventSource
} = {}) { } = {}) {
super({ webSocket, eventSource }) super({ webSocket })
if (keepAlive !== undefined) { if (keepAlive !== undefined) {
throw new InvalidArgumentError('unsupported keepAlive, use pipelining=0 instead') throw new InvalidArgumentError('unsupported keepAlive, use pipelining=0 instead')
@@ -19461,7 +19462,6 @@ module.exports = Client
const buffer = __nccwpck_require__(4573)
const Dispatcher = __nccwpck_require__(883) const Dispatcher = __nccwpck_require__(883)
const { const {
ClientDestroyedError, ClientDestroyedError,
@@ -19474,7 +19474,6 @@ const kOnDestroyed = Symbol('onDestroyed')
const kOnClosed = Symbol('onClosed') const kOnClosed = Symbol('onClosed')
const kInterceptedDispatch = Symbol('Intercepted Dispatch') const kInterceptedDispatch = Symbol('Intercepted Dispatch')
const kWebSocketOptions = Symbol('webSocketOptions') const kWebSocketOptions = Symbol('webSocketOptions')
const kEventSourceOptions = Symbol('eventSourceOptions')
class DispatcherBase extends Dispatcher { class DispatcherBase extends Dispatcher {
constructor (opts) { constructor (opts) {
@@ -19485,7 +19484,6 @@ class DispatcherBase extends Dispatcher {
this[kClosed] = false this[kClosed] = false
this[kOnClosed] = [] this[kOnClosed] = []
this[kWebSocketOptions] = opts?.webSocket ?? {} this[kWebSocketOptions] = opts?.webSocket ?? {}
this[kEventSourceOptions] = opts?.eventSource ?? {}
} }
get webSocketOptions () { get webSocketOptions () {
@@ -19495,12 +19493,6 @@ class DispatcherBase extends Dispatcher {
} }
} }
get eventSourceOptions () {
return {
maxEventSize: this[kEventSourceOptions].maxEventSize ?? buffer.kStringMaxLength
}
}
get destroyed () { get destroyed () {
return this[kDestroyed] return this[kDestroyed]
} }
@@ -25859,7 +25851,6 @@ module.exports = {
/***/ ((module, __unused_webpack_exports, __nccwpck_require__) => { /***/ ((module, __unused_webpack_exports, __nccwpck_require__) => {
const buffer = __nccwpck_require__(4573)
const { Transform } = __nccwpck_require__(7075) const { Transform } = __nccwpck_require__(7075)
const { isASCIINumber, isValidLastEventId } = __nccwpck_require__(4811) const { isASCIINumber, isValidLastEventId } = __nccwpck_require__(4811)
@@ -25884,19 +25875,11 @@ const COLON = 0x3A
*/ */
const SPACE = 0x20 const SPACE = 0x20
const defaultMaxEventSize = buffer.kStringMaxLength
const DATA = Buffer.from('data') const DATA = Buffer.from('data')
const EVENT = Buffer.from('event') const EVENT = Buffer.from('event')
const ID = Buffer.from('id') const ID = Buffer.from('id')
const RETRY = Buffer.from('retry') const RETRY = Buffer.from('retry')
// Each data field creates a string node, and each unconsumed input chunk keeps
// a Buffer wrapper. The absolute ceiling protects the large default byte limit.
const minParserItems = 1024
const maxParserItems = 131072
const bytesPerParserItem = 128
function isASCIINumberBytes (buffer, start) { function isASCIINumberBytes (buffer, start) {
if (start >= buffer.length) { if (start >= buffer.length) {
return false return false
@@ -25935,12 +25918,6 @@ function isFieldName (line, length, field) {
return true return true
} }
function createMaxEventSizeExceededError () {
const error = new Error('EventSource message size exceeded')
error.aborted = false
return error
}
/** /**
* @typedef {object} EventSourceStreamEvent * @typedef {object} EventSourceStreamEvent
* @type {object} * @type {object}
@@ -25989,13 +25966,6 @@ class EventSourceStream extends Transform {
pos = 0 pos = 0
lineChunkIndex = 0 lineChunkIndex = 0
linePos = 0 linePos = 0
lineLength = 0
eventSize = 0
eventFieldSizes = { data: 0, event: 0, id: 0, retry: 0 }
dataLineCount = 0
maxEventSize
maxDataLines
maxBufferedChunks
event = { event = {
data: undefined, data: undefined,
@@ -26006,7 +25976,6 @@ class EventSourceStream extends Transform {
/** /**
* @param {object} options * @param {object} options
* @param {number} [options.maxEventSize]
* @param {eventSourceSettings} options.eventSourceSettings * @param {eventSourceSettings} options.eventSourceSettings
* @param {Function} [options.push] * @param {Function} [options.push]
*/ */
@@ -26018,12 +25987,6 @@ class EventSourceStream extends Transform {
super(options) super(options)
this.state = options.eventSourceSettings || {} this.state = options.eventSourceSettings || {}
this.maxEventSize = options.maxEventSize ?? defaultMaxEventSize
const parserItemLimit = this.maxEventSize > 0
? Math.min(maxParserItems, Math.max(minParserItems, Math.floor(this.maxEventSize / bytesPerParserItem)))
: 0
this.maxDataLines = parserItemLimit
this.maxBufferedChunks = parserItemLimit
if (options.push) { if (options.push) {
this.push = options.push this.push = options.push
} }
@@ -26041,14 +26004,6 @@ class EventSourceStream extends Transform {
return return
} }
// A leading line ending can immediately release the currently buffered
// line, even when it uses the final allowed chunk slot.
if (this.maxEventSize > 0 &&
this.chunks.length >= this.maxBufferedChunks &&
chunk[0] !== LF && chunk[0] !== CR) {
callback(createMaxEventSizeExceededError())
return
}
this.chunks.push(chunk) this.chunks.push(chunk)
// Strip leading byte-order-mark if we opened the stream and started // Strip leading byte-order-mark if we opened the stream and started
@@ -26127,12 +26082,7 @@ class EventSourceStream extends Transform {
// In any case, we can process the line as we reached an // In any case, we can process the line as we reached an
// end-of-line character // end-of-line character
try { this.parseLine(this.readLine(), this.event)
this.parseLine(this.readLine(), this.event)
} catch (error) {
callback(error)
return
}
this.consumeCurrentByte() this.consumeCurrentByte()
// A line was processed and this could be the end of the event. We need // A line was processed and this could be the end of the event. We need
// to check if the next line is empty to determine if the event is // to check if the next line is empty to determine if the event is
@@ -26141,28 +26091,15 @@ class EventSourceStream extends Transform {
continue continue
} }
// readLine() is only called after CR or LF. Reject an unfinished line
// before it can retain an unbounded number of decoded chunks. The seven
// extra bytes allow the longest field prefix ("event: " or "retry: ").
if (this.maxEventSize > 0 && ++this.lineLength > this.maxEventSize + 7) {
callback(createMaxEventSizeExceededError())
return
}
this.advanceCursor() this.advanceCursor()
} }
callback() callback()
} }
_destroy (error, callback) {
this.chunks.length = 0
this.clearEvent()
super._destroy(error, callback)
}
/** /**
* @param {Buffer} line * @param {Buffer} line
* @param {EventSourceStreamEvent} event * @param {EventStreamEvent} event
*/ */
parseLine (line, event) { parseLine (line, event) {
// If the line is empty (a blank line) // If the line is empty (a blank line)
@@ -26196,13 +26133,6 @@ class EventSourceStream extends Transform {
} }
if (isFieldName(line, fieldLength, DATA)) { if (isFieldName(line, fieldLength, DATA)) {
if (this.maxEventSize > 0 && this.dataLineCount >= this.maxDataLines) {
throw createMaxEventSizeExceededError()
}
const valueBytes = line.length - valueStart
const dataSize = this.eventFieldSizes.data + (event.data === undefined ? 0 : 1) + valueBytes
this.setEventFieldSize('data', dataSize)
const value = line.toString('utf8', valueStart) const value = line.toString('utf8', valueStart)
if (event.data === undefined) { if (event.data === undefined) {
@@ -26210,13 +26140,11 @@ class EventSourceStream extends Transform {
} else { } else {
event.data += `\n${value}` event.data += `\n${value}`
} }
this.dataLineCount++
return return
} }
if (isFieldName(line, fieldLength, RETRY)) { if (isFieldName(line, fieldLength, RETRY)) {
if (isASCIINumberBytes(line, valueStart)) { if (isASCIINumberBytes(line, valueStart)) {
this.setEventFieldSize('retry', line.length - valueStart)
event.retry = line.toString('utf8', valueStart) event.retry = line.toString('utf8', valueStart)
} }
return return
@@ -26224,29 +26152,20 @@ class EventSourceStream extends Transform {
if (isFieldName(line, fieldLength, ID)) { if (isFieldName(line, fieldLength, ID)) {
if (isValidLastEventIdBytes(line, valueStart)) { if (isValidLastEventIdBytes(line, valueStart)) {
this.setEventFieldSize('id', line.length - valueStart)
event.id = line.toString('utf8', valueStart) event.id = line.toString('utf8', valueStart)
} }
return return
} }
if (isFieldName(line, fieldLength, EVENT)) { if (isFieldName(line, fieldLength, EVENT)) {
if (valueStart < line.length) { const value = line.toString('utf8', valueStart)
this.setEventFieldSize('event', line.length - valueStart)
event.event = line.toString('utf8', valueStart) if (value.length > 0) {
event.event = value
} }
} }
} }
setEventFieldSize (field, size) {
const eventSize = this.eventSize - this.eventFieldSizes[field] + size
if (this.maxEventSize > 0 && eventSize > this.maxEventSize) {
throw createMaxEventSizeExceededError()
}
this.eventSize = eventSize
this.eventFieldSizes[field] = size
}
/** /**
* @param {EventSourceStreamEvent} event * @param {EventSourceStreamEvent} event
*/ */
@@ -26277,12 +26196,6 @@ class EventSourceStream extends Transform {
this.event.event = undefined this.event.event = undefined
this.event.id = undefined this.event.id = undefined
this.event.retry = undefined this.event.retry = undefined
this.eventSize = 0
this.dataLineCount = 0
this.eventFieldSizes.data = 0
this.eventFieldSizes.event = 0
this.eventFieldSizes.id = 0
this.eventFieldSizes.retry = 0
} }
hasPendingEvent () { hasPendingEvent () {
@@ -26318,16 +26231,14 @@ class EventSourceStream extends Transform {
syncLineStartToCursor () { syncLineStartToCursor () {
this.lineChunkIndex = this.chunkIndex this.lineChunkIndex = this.chunkIndex
this.linePos = this.pos this.linePos = this.pos
this.lineLength = 0
this.dropConsumedChunks() this.dropConsumedChunks()
} }
dropConsumedChunks () { dropConsumedChunks () {
if (this.lineChunkIndex > 0) { while (this.lineChunkIndex > 0) {
const consumed = this.lineChunkIndex this.chunks.shift()
this.chunks.splice(0, consumed) this.lineChunkIndex--
this.lineChunkIndex = 0 this.chunkIndex--
this.chunkIndex -= consumed
} }
if (this.chunkIndex === this.chunks.length) { if (this.chunkIndex === this.chunks.length) {
@@ -26452,7 +26363,6 @@ const { isNetworkError } = __nccwpck_require__(9051)
const { delay } = __nccwpck_require__(4811) const { delay } = __nccwpck_require__(4811)
const { kEnumerableProperty } = __nccwpck_require__(3440) const { kEnumerableProperty } = __nccwpck_require__(3440)
const { environmentSettingsObject } = __nccwpck_require__(3168) const { environmentSettingsObject } = __nccwpck_require__(3168)
const { getGlobalDispatcher } = __nccwpck_require__(2581)
let experimentalWarned = false let experimentalWarned = false
@@ -26734,7 +26644,6 @@ class EventSource extends EventTarget {
const eventSourceStream = new EventSourceStream({ const eventSourceStream = new EventSourceStream({
eventSourceSettings: this.#state, eventSourceSettings: this.#state,
maxEventSize: this.#dispatcher.eventSourceOptions?.maxEventSize,
push: (event) => { push: (event) => {
this.dispatchEvent(createFastMessageEvent( this.dispatchEvent(createFastMessageEvent(
event.type, event.type,
@@ -26913,8 +26822,7 @@ webidl.converters.EventSourceInitDict = webidl.dictionaryConverter([
}, },
{ {
key: 'dispatcher', // undici only key: 'dispatcher', // undici only
converter: webidl.converters.any, converter: webidl.converters.any
defaultValue: () => getGlobalDispatcher()
} }
]) ])
@@ -32010,10 +31918,8 @@ async function httpNetworkFetch (
// 19. Run these steps in parallel: // 19. Run these steps in parallel:
// 1. Run these steps, but abort when fetchParams is canceled: // 1. Run these steps, but abort when fetchParams is canceled:
if (!fetchParams.controller.resume) { fetchParams.controller.onAborted = onAborted
fetchParams.controller.on('terminated', onAborted) fetchParams.controller.on('terminated', onAborted)
}
fetchParams.controller.resume = async () => { fetchParams.controller.resume = async () => {
// 1. While true // 1. While true
while (true) { while (true) {
@@ -32182,6 +32088,8 @@ async function httpNetworkFetch (
} }
location = headersList.get('location', true) location = headersList.get('location', true)
this.body = new Readable({ read: resume })
const decoders = [] const decoders = []
const willFollow = location && request.redirect === 'follow' && const willFollow = location && request.redirect === 'follow' &&
@@ -32199,7 +32107,7 @@ async function httpNetworkFetch (
// CVE fix similar to urllib3 (GHSA-gm62-xv2j-4w53) and curl (CVE-2022-32206). // CVE fix similar to urllib3 (GHSA-gm62-xv2j-4w53) and curl (CVE-2022-32206).
const maxContentEncodings = 5 const maxContentEncodings = 5
if (codings.length > maxContentEncodings) { if (codings.length > maxContentEncodings) {
this.abort(new Error(`too many content-encodings in response: ${codings.length}, maximum allowed is ${maxContentEncodings}`)) reject(new Error(`too many content-encodings in response: ${codings.length}, maximum allowed is ${maxContentEncodings}`))
return true return true
} }
@@ -32232,8 +32140,6 @@ async function httpNetworkFetch (
} }
} }
this.body = new Readable({ read: resume })
const onError = this.onError.bind(this) const onError = this.onError.bind(this)
resolve({ resolve({
@@ -32280,6 +32186,10 @@ async function httpNetworkFetch (
fetchParams.controller.off('terminated', this.abort) fetchParams.controller.off('terminated', this.abort)
} }
if (fetchParams.controller.onAborted) {
fetchParams.controller.off('terminated', fetchParams.controller.onAborted)
}
fetchParams.controller.ended = true fetchParams.controller.ended = true
this.body.push(null) this.body.push(null)
@@ -38754,20 +38664,6 @@ class ByteParser extends Writable {
if (isControlFrame(this.#info.opcode)) { if (isControlFrame(this.#info.opcode)) {
this.#loop = this.parseControlFrame(body) this.#loop = this.parseControlFrame(body)
this.#state = parserStates.INFO this.#state = parserStates.INFO
// If the automatic PONG/CLOSE reply filled the socket's write buffer,
// stop parsing and resume on drain so a PING flood cannot grow the
// outbound queue without bound.
const socket = this.ws[kResponse].socket
if (this.#loop && socket.writableNeedDrain) {
this.#loop = false
socket.once('drain', () => {
if (this.destroyed) return
this.#loop = true
this.run(callback)
})
return
}
} else { } else {
if (!this.#info.compressed) { if (!this.#info.compressed) {
if (!this.writeFragments(body)) { if (!this.writeFragments(body)) {

14
package-lock.json generated
View File

@@ -3832,13 +3832,13 @@
"license": "ISC" "license": "ISC"
}, },
"node_modules/handlebars": { "node_modules/handlebars": {
"version": "4.7.10", "version": "4.7.9",
"resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.7.10.tgz", "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.7.9.tgz",
"integrity": "sha512-P5VJMVM7qgBn6vjXMw8WG9uVI+ncf2pi72j4de4yz5ZULLj2RGqLYaKOYGsgyrViQ0tePOVlN1tDCCXXtFqXKg==", "integrity": "sha512-4E71E0rpOaQuJR2A3xDZ+GM1HyWYv1clR58tC8emQNeQe3RH7MAzSbat+V0wG78LQBo6m6bzSG/L4pBuCsgnUQ==",
"dev": true, "dev": true,
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"minimist": "^1.2.8", "minimist": "^1.2.5",
"neo-async": "^2.6.2", "neo-async": "^2.6.2",
"source-map": "^0.6.1", "source-map": "^0.6.1",
"wordwrap": "^1.0.0" "wordwrap": "^1.0.0"
@@ -6019,9 +6019,9 @@
} }
}, },
"node_modules/undici": { "node_modules/undici": {
"version": "6.29.1", "version": "6.29.0",
"resolved": "https://registry.npmjs.org/undici/-/undici-6.29.1.tgz", "resolved": "https://registry.npmjs.org/undici/-/undici-6.29.0.tgz",
"integrity": "sha512-EvRlUt/QqAEvXdQeRMYUfwOQsfzpDztykrG2owGEE/rBOBoYv9uF39ZzsNDh4lTFHhTr2XOZjKkYgueD12ZmGA==", "integrity": "sha512-R+RODBqp6i2pPflGdq+xIOUkl+RNfGgHwoinecKu/JCuf2uO06cOKoDbI2P7Dn6KcswdKwrczbU6IYJ6K8X+wg==",
"license": "MIT", "license": "MIT",
"engines": { "engines": {
"node": ">=18.17" "node": ">=18.17"