@nxtedition/lib 15.0.34 → 15.0.36

package/lib/undici/interceptor/response-body-retry.js

@@ -1,163 +0,0 @@
-const assert = require('node:assert')
-const { parseContentRange, isDisturbed, findHeader, retry: retryFn } = require('../utils.js')
-
-class Handler {
-  constructor(opts, { dispatch, handler }) {
-    this.dispatch = dispatch
-    this.handler = handler
-    this.opts = opts
-    this.abort = null
-    this.aborted = false
-    this.reason = null
-
-    this.count = 0
-    this.pos = 0
-    this.end = null
-    this.error = null
-    this.etag = null
-
-    this.handler.onConnect?.((reason) => {
-      this.aborted = true
-      if (this.abort) {
-        this.abort(reason)
-      } else {
-        this.reason = reason
-      }
-    })
-  }
-
-  onConnect(abort) {
-    if (this.aborted) {
-      abort(this.reason)
-    } else {
-      this.abort = abort
-    }
-  }
-
-  onUpgrade(statusCode, rawHeaders, socket) {
-    return this.handler.onUpgrade?.(statusCode, rawHeaders, socket)
-  }
-
-  onBodySent(chunk) {
-    return this.handler.onBodySent?.(chunk)
-  }
-
-  onHeaders(statusCode, rawHeaders, resume, statusMessage) {
-    const etag = findHeader(rawHeaders, 'etag')
-
-    if (this.resume) {
-      this.resume = null
-
-      // TODO (fix): Support other statusCode with skip?
-      if (statusCode !== 206) {
-        throw this.error
-      }
-
-      // TODO (fix): strict vs weak etag?
-      if (this.etag == null || this.etag !== etag) {
-        throw this.error
-      }
-
-      const contentRange = parseContentRange(findHeader(rawHeaders, 'content-range'))
-      if (!contentRange) {
-        throw this.error
-      }
-
-      const { start, size, end = size } = contentRange
-
-      assert(this.pos === start, 'content-range mismatch')
-      assert(this.end == null || this.end === end, 'content-range mismatch')
-
-      this.resume = resume
-      return true
-    }
-
-    if (this.end == null) {
-      if (statusCode === 206) {
-        const contentRange = parseContentRange(findHeader(rawHeaders, 'content-range'))
-        if (!contentRange) {
-          return this.handler.onHeaders?.(
-            statusCode,
-            rawHeaders,
-            () => this.resume(),
-            statusMessage,
-          )
-        }
-
-        const { start, size, end = size } = contentRange
-
-        this.end = end
-        this.pos = Number(start)
-      } else {
-        const contentLength = findHeader(rawHeaders, 'content-length')
-        if (contentLength) {
-          this.end = Number(contentLength)
-        }
-      }
-
-      assert(Number.isFinite(this.pos))
-      assert(this.end == null || Number.isFinite(this.end), 'invalid content-length')
-    }
-
-    this.etag = etag
-    this.resume = resume
-    return this.handler.onHeaders?.(statusCode, rawHeaders, () => this.resume(), statusMessage)
-  }
-
-  onData(chunk) {
-    this.pos += chunk.length
-    this.count = 0
-    return this.handler.onData?.(chunk)
-  }
-
-  onComplete(rawTrailers) {
-    return this.handler.onComplete?.(rawTrailers)
-  }
-
-  onError(err) {
-    if (this.timeout) {
-      clearTimeout(this.timeout)
-      this.timeout = null
-    }
-
-    if (!this.resume || this.aborted || !this.etag || isDisturbed(this.opts.body)) {
-      return this.handler.onError?.(err)
-    }
-
-    const retryPromise = retryFn(err, this.count++, this.opts)
-    if (retryPromise == null) {
-      return this.handler.onError?.(err)
-    }
-
-    retryPromise
-      .then(() => {
-        this.timeout = null
-        try {
-          this.dispatch(this.opts, this)
-        } catch (err2) {
-          this.handler.onError?.(err)
-        }
-      })
-      .catch((err) => {
-        this.handler.onError?.(err)
-      })
-
-    this.error = err
-    this.opts = {
-      ...this.opts,
-      headers: {
-        ...this.opts.headers,
-        'if-match': this.etag,
-        range: `bytes=${this.pos}-${this.end ?? ''}`,
-      },
-    }
-
-    this.opts.logger?.debug('retrying response body')
-  }
-}
-
-module.exports = (dispatch) => (opts, handler) => {
-  return opts.idempotent && opts.retry && opts.method === 'GET'
-    ? dispatch(opts, new Handler(opts, { handler, dispatch }))
-    : dispatch(opts, handler)
-}

package/lib/undici/interceptor/response-retry.js

@@ -1,89 +0,0 @@
-const { isDisturbed, retry: retryFn } = require('../utils.js')
-
-class Handler {
-  constructor(opts, { dispatch, handler }) {
-    this.dispatch = dispatch
-    this.handler = handler
-    this.opts = opts
-    this.abort = null
-    this.aborted = false
-    this.reason = null
-    this.timeout = null
-    this.count = 0
-    this.retryAfter = null
-
-    this.handler.onConnect?.((reason) => {
-      this.aborted = true
-      if (this.abort) {
-        this.abort(reason)
-      } else {
-        this.reason = reason
-      }
-    })
-  }
-
-  onConnect(abort) {
-    if (this.aborted) {
-      abort(this.reason)
-    } else {
-      this.abort = abort
-    }
-  }
-
-  onUpgrade(statusCode, rawHeaders, socket) {
-    return this.handler.onUpgrade?.(statusCode, rawHeaders, socket)
-  }
-
-  onBodySent(chunk) {
-    return this.handler.onBodySent?.(chunk)
-  }
-
-  onHeaders(statusCode, rawHeaders, resume, statusMessage) {
-    this.aborted = true
-    return this.handler.onHeaders?.(statusCode, rawHeaders, resume, statusMessage)
-  }
-
-  onData(chunk) {
-    return this.handler.onData?.(chunk)
-  }
-
-  onComplete(rawTrailers) {
-    return this.handler.onComplete?.(rawTrailers)
-  }
-
-  onError(err) {
-    if (this.timeout) {
-      clearTimeout(this.timeout)
-      this.timeout = null
-    }
-
-    if (this.aborted || isDisturbed(this.opts.body)) {
-      return this.handler.onError?.(err)
-    }
-
-    const retryPromise = retryFn(err, this.count++, this.opts)
-    if (retryPromise == null) {
-      return this.handler.onError?.(err)
-    }
-
-    retryPromise
-      .then(() => {
-        this.timeout = null
-        try {
-          this.dispatch(this.opts, this)
-        } catch (err2) {
-          this.handler.onError?.(err)
-        }
-      })
-      .catch((err) => {
-        this.handler.onError?.(err)
-      })
-
-    this.opts.logger?.debug('retrying response')
-  }
-}
-
-module.exports = (dispatch) => (opts, handler) =>
-  opts.idempotent && opts.retry
-    ? dispatch(opts, new Handler(opts, { handler, dispatch }))
-    : dispatch(opts, handler)

package/lib/undici/interceptor/response-status-retry.js

@@ -1,104 +0,0 @@
-const { isDisturbed, retry: retryFn } = require('../utils')
-const createError = require('http-errors')
-const { parseHeaders } = require('../../../http')
-
-class Handler {
-  constructor(opts, { dispatch, handler }) {
-    this.dispatch = dispatch
-    this.handler = handler
-    this.opts = opts
-    this.abort = null
-    this.aborted = false
-    this.reason = null
-
-    this.timeout = null
-    this.count = 0
-    this.retryPromise = null
-
-    this.handler.onConnect?.((reason) => {
-      this.aborted = true
-      if (this.abort) {
-        this.abort(reason)
-      } else {
-        this.reason = reason
-      }
-    })
-  }
-
-  onConnect(abort) {
-    if (this.aborted) {
-      abort(this.reason)
-    } else {
-      this.abort = abort
-    }
-  }
-
-  onUpgrade(statusCode, rawHeaders, socket) {
-    return this.handler.onUpgrade?.(statusCode, rawHeaders, socket)
-  }
-
-  onBodySent(chunk) {
-    return this.handler.onBodySent?.(chunk)
-  }
-
-  onHeaders(statusCode, rawHeaders, resume, statusMessage) {
-    if (statusCode < 400) {
-      return this.handler.onHeaders?.(statusCode, rawHeaders, resume, statusMessage)
-    }
-
-    const err = createError(statusCode, { headers: parseHeaders(rawHeaders) })
-
-    const retryPromise = retryFn(err, this.count++, this.opts)
-    if (retryPromise == null) {
-      return this.handler.onHeaders?.(statusCode, rawHeaders, resume, statusMessage)
-    }
-
-    retryPromise.catch(() => {})
-
-    this.retryPromise = retryPromise
-
-    this.abort(err)
-
-    return false
-  }
-
-  onData(chunk) {
-    return this.handler.onData?.(chunk)
-  }
-
-  onComplete(rawTrailers) {
-    return this.handler.onComplete?.(rawTrailers)
-  }
-
-  onError(err) {
-    if (this.timeout) {
-      clearTimeout(this.timeout)
-      this.timeout = null
-    }
-
-    if (this.retryPromise == null || this.aborted || isDisturbed(this.opts.body)) {
-      return this.handler.onError?.(err)
-    }
-
-    this.retryPromise
-      .then(() => {
-        this.timeout = null
-        try {
-          this.dispatch(this.opts, this)
-        } catch (err) {
-          this.handler.onError?.(err)
-        }
-      })
-      .catch((err) => {
-        this.handler.onError?.(err)
-      })
-    this.retryPromise = null
-
-    this.opts.logger?.debug('retrying response status')
-  }
-}
-
-module.exports = (dispatch) => (opts, handler) =>
-  opts.idempotent && opts.retry
-    ? dispatch(opts, new Handler(opts, { handler, dispatch }))
-    : dispatch(opts, handler)

package/lib/undici/interceptor/signal.js

@@ -1,51 +0,0 @@
-class Handler {
-  constructor(opts, signal, { handler }) {
-    this.handler = handler
-    this.signal = signal
-    this.abort = null
-  }
-
-  onConnect(abort) {
-    this.abort = () => {
-      abort(this.signal.reason)
-    }
-    this.signal.addEventListener('abort', this.abort)
-
-    if (this.signal.aborted) {
-      abort(this.signal.reason)
-    } else {
-      this.handler.onConnect?.(abort)
-    }
-  }
-
-  onUpgrade(statusCode, rawHeaders, socket) {
-    return this.handler.onUpgrade?.(statusCode, rawHeaders, socket)
-  }
-
-  onBodySent(chunk) {
-    return this.handler.onBodySent?.(chunk)
-  }
-
-  onHeaders(statusCode, rawHeaders, resume, statusMessage) {
-    return this.handler.onHeaders?.(statusCode, rawHeaders, resume, statusMessage)
-  }
-
-  onData(chunk) {
-    return this.handler.onData?.(chunk)
-  }
-
-  onComplete(rawTrailers) {
-    this.signal.removeEventListener('abort', this.abort)
-    return this.handler.onComplete?.(rawTrailers)
-  }
-
-  onError(err) {
-    this.signal.removeEventListener('abort', this.abort)
-    return this.handler.onError?.(err)
-  }
-}
-
-module.exports =
-  (dispatch) =>
-  ({ signal, ...opts }, handler) =>
-    signal ? dispatch(opts, new Handler(opts, signal, { handler })) : dispatch(opts, handler)

package/lib/undici/utils.js

@@ -1,183 +0,0 @@
-const tp = require('node:timers/promises')
-
-function isDisturbed(body) {
-  if (body == null || typeof body === 'string' || Buffer.isBuffer(body)) {
-    return false
-  }
-
-  if (body.readableDidRead === false) {
-    return false
-  }
-
-  return true
-}
-
-function parseContentRange(range) {
-  if (typeof range !== 'string') {
-    return null
-  }
-
-  const m = range.match(/^bytes (\d+)-(\d+)?\/(\d+|\*)$/)
-  if (!m) {
-    return null
-  }
-
-  const start = m[1] == null ? null : Number(m[1])
-  if (!Number.isFinite(start)) {
-    return null
-  }
-
-  const end = m[2] == null ? null : Number(m[2])
-  if (end !== null && !Number.isFinite(end)) {
-    return null
-  }
-
-  const size = m[2] === '*' ? null : Number(m[2])
-  if (size !== null && !Number.isFinite(size)) {
-    return null
-  }
-
-  return { start, end: end ? end + 1 : size, size }
-}
-
-function findHeader(rawHeaders, name) {
-  const len = name.length
-
-  for (let i = 0; i < rawHeaders.length; i += 2) {
-    const key = rawHeaders[i + 0]
-    if (key.length === len && key.toString().toLowerCase() === name) {
-      return rawHeaders[i + 1].toString()
-    }
-  }
-  return null
-}
-
-function retry(err, retryCount, opts) {
-  if (opts.retry === null || opts.retry === false) {
-    return null
-  }
-
-  if (typeof opts.retry === 'function') {
-    return opts.retry(err, retryCount, opts)
-  }
-
-  const retryMax = opts.retry?.count ?? opts.maxRetries ?? 8
-
-  if (retryCount > retryMax) {
-    return null
-  }
-
-  if (err.statusCode && [420, 429, 502, 503, 504].includes(err.statusCode)) {
-    let retryAfter = err.headers['retry-after'] ? err.headers['retry-after'] * 1e3 : null
-    retryAfter = Number.isFinite(retryAfter) ? retryAfter : Math.min(10e3, retryCount * 1e3)
-    if (retryAfter != null && Number.isFinite(retryAfter)) {
-      return tp.setTimeout(retryAfter, undefined, { signal: opts.signal })
-    } else {
-      return null
-    }
-  }
-
-  if (
-    err.code &&
-    [
-      'ECONNRESET',
-      'ECONNREFUSED',
-      'ENOTFOUND',
-      'ENETDOWN',
-      'ENETUNREACH',
-      'EHOSTDOWN',
-      'EHOSTUNREACH',
-      'EPIPE',
-    ].includes(err.code)
-  ) {
-    return tp.setTimeout(Math.min(10e3, retryCount * 1e3), undefined, { signal: opts.signal })
-  }
-
-  if (err.message && ['other side closed'].includes(err.message)) {
-    return tp.setTimeout(Math.min(10e3, retryCount * 1e3), undefined, { signal: opts.signal })
-  }
-
-  return null
-}
-
-function parseURL(url) {
-  if (typeof url === 'string') {
-    url = new URL(url)
-
-    if (!/^https?:/.test(url.origin || url.protocol)) {
-      throw new Error('Invalid URL protocol: the URL must start with `http:` or `https:`.')
-    }
-
-    return url
-  }
-
-  if (!url || typeof url !== 'object') {
-    throw new Error('Invalid URL: The URL argument must be a non-null object.')
-  }
-
-  if (url.port != null && url.port !== '' && !Number.isFinite(parseInt(url.port))) {
-    throw new Error(
-      'Invalid URL: port must be a valid integer or a string representation of an integer.',
-    )
-  }
-
-  if (url.path != null && typeof url.path !== 'string') {
-    throw new Error('Invalid URL path: the path must be a string or null/undefined.')
-  }
-
-  if (url.pathname != null && typeof url.pathname !== 'string') {
-    throw new Error('Invalid URL pathname: the pathname must be a string or null/undefined.')
-  }
-
-  if (url.hostname != null && typeof url.hostname !== 'string') {
-    throw new Error('Invalid URL hostname: the hostname must be a string or null/undefined.')
-  }
-
-  if (url.origin != null && typeof url.origin !== 'string') {
-    throw new Error('Invalid URL origin: the origin must be a string or null/undefined.')
-  }
-
-  if (!/^https?:/.test(url.origin || url.protocol)) {
-    throw new Error('Invalid URL protocol: the URL must start with `http:` or `https:`.')
-  }
-
-  if (!(url instanceof URL)) {
-    const port = url.port != null ? url.port : url.protocol === 'https:' ? 443 : 80
-    let origin = url.origin != null ? url.origin : `${url.protocol}//${url.hostname}:${port}`
-    let path = url.path != null ? url.path : `${url.pathname || ''}${url.search || ''}`
-
-    if (origin.endsWith('/')) {
-      origin = origin.substring(0, origin.length - 1)
-    }
-
-    if (path && !path.startsWith('/')) {
-      path = `/${path}`
-    }
-    // new URL(path, origin) is unsafe when `path` contains an absolute URL
-    // From https://developer.mozilla.org/en-US/docs/Web/API/URL/URL:
-    // If first parameter is a relative URL, second param is required, and will be used as the base URL.
-    // If first parameter is an absolute URL, a given second param will be ignored.
-    url = new URL(origin + path)
-  }
-
-  return url
-}
-
-function parseOrigin(url) {
-  url = module.exports.parseURL(url)
-
-  if (url.pathname !== '/' || url.search || url.hash) {
-    throw new Error('invalid url')
-  }
-
-  return url
-}
-
-module.exports = {
-  isDisturbed,
-  parseContentRange,
-  findHeader,
-  retry,
-  parseURL,
-  parseOrigin,
-}

package/proxy.js

@@ -1,106 +0,0 @@
-const createError = require('http-errors')
-const net = require('net')
-
-// This expression matches hop-by-hop headers.
-// These headers are meaningful only for a single transport-level connection,
-// and must not be retransmitted by proxies or cached.
-const HOP_EXPR =
-  /^(te|host|upgrade|trailers|connection|keep-alive|http2-settings|transfer-encoding|proxy-connection|proxy-authenticate|proxy-authorization)$/i
-
-// Removes hop-by-hop and pseudo headers.
-// Updates via and forwarded headers.
-// Only hop-by-hop headers may be set using the Connection general header.
-module.exports.reduceHeaders = function reduceHeaders(
-  { id, headers, proxyName, httpVersion, socket },
-  fn,
-  acc,
-) {
-  let via
-  let forwarded
-  let host
-  let authority
-  let connection
-
-  const entries = Object.entries(headers)
-
-  for (const [key, val] of entries) {
-    const len = key.length
-    if (len === 3 && !via && key.toLowerCase() === 'via') {
-      via = val
-    } else if (len === 4 && !host && key.toLowerCase() === 'host') {
-      host = val
-    } else if (len === 9 && !forwarded && key.toLowerCase() === 'forwarded') {
-      forwarded = val
-    } else if (len === 10 && !connection && key.toLowerCase() === 'connection') {
-      connection = val
-    } else if (len === 10 && !authority && key.toLowerCase() === ':authority') {
-      authority = val
-    }
-  }
-
-  let remove
-  if (connection && !HOP_EXPR.test(connection)) {
-    remove = connection.split(/,\s*/)
-  }
-
-  for (const [key, val] of entries) {
-    if (key.charAt(0) !== ':' && !remove?.includes(key) && !HOP_EXPR.test(key)) {
-      acc = fn(acc, key, val)
-    }
-  }
-
-  if (socket) {
-    const forwardedHost = authority || host
-    acc = fn(
-      acc,
-      'forwarded',
-      (forwarded ? forwarded + ', ' : '') +
-        [
-          socket.localAddress && `by=${printIp(socket.localAddress, socket.localPort)}`,
-          socket.remoteAddress && `for=${printIp(socket.remoteAddress, socket.remotePort)}`,
-          `proto=${socket.encrypted ? 'https' : 'http'}`,
-          forwardedHost && `host="${forwardedHost}"`,
-        ].join(';'),
-    )
-  } else if (forwarded) {
-    // The forwarded header should not be included in response.
-    throw new createError.BadGateway()
-  }
-
-  if (proxyName) {
-    if (via) {
-      if (via.split(',').some((name) => name.endsWith(proxyName))) {
-        throw new createError.LoopDetected()
-      }
-      via += ', '
-    } else {
-      via = ''
-    }
-    via += `${httpVersion} ${proxyName}`
-  }
-
-  if (via) {
-    acc = fn(acc, 'via', via)
-  }
-
-  if (id) {
-    acc = fn(acc, 'request-id', id)
-  }
-
-  return acc
-}
-
-function printIp(address, port) {
-  const isIPv6 = net.isIPv6(address)
-  let str = `${address}`
-  if (isIPv6) {
-    str = `[${str}]`
-  }
-  if (port) {
-    str = `${str}:${port}`
-  }
-  if (isIPv6 || port) {
-    str = `"${str}"`
-  }
-  return str
-}

package/undici.js

@@ -1 +0,0 @@
-module.exports = require('./lib/undici/index.js')