@nxtedition/nxt-undici 1.4.4 → 2.0.1

package/lib/index.js

@@ -1,8 +1,9 @@
-const assert = require('assert')
-const createError = require('http-errors')
-const undici = require('undici')
-const stream = require('stream')
-const { parseHeaders, AbortError } = require('./utils')
+import assert from 'node:assert'
+import stream from 'node:stream'
+import createError from 'http-errors'
+import undici from 'undici'
+import { parseHeaders, AbortError } from './utils.js'
+import CacheableLookup from 'cacheable-lookup'
 
 const dispatcherCache = new WeakMap()
 
@@ -126,24 +127,31 @@ class Readable extends stream.Readable {
 }
 
 const dispatchers = {
-  requestBody: require('./interceptor/request-body.js'),
-  requestBodyFactory: require('./interceptor/request-body-factory.js'),
-  abort: require('./interceptor/abort.js'),
-  catch: require('./interceptor/catch.js'),
-  responseContent: require('./interceptor/response-content.js'),
-  requestContent: require('./interceptor/request-content.js'),
-  log: require('./interceptor/log.js'),
-  redirect: require('./interceptor/redirect.js'),
-  responseBodyRetry: require('./interceptor/response-body-retry.js'),
-  responseStatusRetry: require('./interceptor/response-status-retry.js'),
-  responseRetry: require('./interceptor/response-retry.js'),
-  signal: require('./interceptor/signal.js'),
-  proxy: require('./interceptor/proxy.js'),
-  cache: require('./interceptor/cache.js'),
-  requestId: require('./interceptor/request-id.js'),
+  requestBody: (await import('./interceptor/request-body.js')).default,
+  requestBodyFactory: (await import('./interceptor/request-body-factory.js')).default,
+  abort: (await import('./interceptor/abort.js')).default,
+  catch: (await import('./interceptor/catch.js')).default,
+  responseContent: (await import('./interceptor/response-content.js')).default,
+  requestContent: (await import('./interceptor/request-content.js')).default,
+  log: (await import('./interceptor/log.js')).default,
+  redirect: (await import('./interceptor/redirect.js')).default,
+  responseBodyRetry: (await import('./interceptor/response-body-retry.js')).default,
+  responseStatusRetry: (await import('./interceptor/response-status-retry.js')).default,
+  responseRetry: (await import('./interceptor/response-retry.js')).default,
+  signal: (await import('./interceptor/signal.js')).default,
+  proxy: (await import('./interceptor/proxy.js')).default,
+  cache: (await import('./interceptor/cache.js')).default,
+  requestId: (await import('./interceptor/request-id.js')).default,
 }
 
-async function request(url, opts) {
+const dnsCache = new CacheableLookup()
+const defaultDispatcher = new undici.Agent({
+  connect: {
+    lookup: dnsCache.lookup,
+  },
+})
+
+export async function request(url, opts) {
   // TODO (fix): More argument validation...
 
   if (typeof url === 'string') {
@@ -211,7 +219,7 @@ async function request(url, opts) {
     delete headers['content-length']
   }
 
-  const dispatcher = opts.dispatcher ?? undici.getGlobalDispatcher()
+  const dispatcher = opts.dispatcher ?? defaultDispatcher
 
   let dispatch = dispatcherCache.get(dispatcher)
   if (dispatch == null) {
@@ -325,5 +333,3 @@ async function request(url, opts) {
     ),
   )
 }
-
-module.exports = { request }

package/lib/interceptor/abort.js

@@ -1,4 +1,4 @@
-const { AbortError } = require('../utils')
+import { AbortError } from '../utils.js'
 
 class Handler {
   constructor(opts, { handler }) {
@@ -69,4 +69,4 @@ class Handler {
   }
 }
 
-module.exports = (dispatch) => (opts, handler) => dispatch(opts, new Handler(opts, { handler }))
+export default (dispatch) => (opts, handler) => dispatch(opts, new Handler(opts, { handler }))

package/lib/interceptor/cache.js

@@ -1,6 +1,6 @@
-const assert = require('node:assert')
-const { LRUCache } = require('lru-cache')
-const cacheControlParser = require('cache-control-parser')
+import assert from 'node:assert'
+import { LRUCache } from 'lru-cache'
+import cacheControlParser from 'cache-control-parser'
 
 class CacheHandler {
   constructor({ key, handler, store }) {
@@ -128,7 +128,7 @@ function makeKey(opts) {
 
 const DEFAULT_CACHE_STORE = new CacheStore({ maxSize: 128 * 1024, maxEntrySize: 1024 })
 
-module.exports = (dispatch) => (opts, handler) => {
+export default (dispatch) => (opts, handler) => {
   if (!opts.cache || opts.upgrade) {
     return dispatch(opts, handler)
   }

package/lib/interceptor/catch.js

@@ -68,4 +68,4 @@ class Handler {
   }
 }
 
-module.exports = (dispatch) => (opts, handler) => dispatch(opts, new Handler(opts, { handler }))
+export default (dispatch) => (opts, handler) => dispatch(opts, new Handler(opts, { handler }))

package/lib/interceptor/log.js

@@ -1,5 +1,5 @@
-const { parseHeaders } = require('../utils')
-const { performance } = require('perf_hooks')
+import { performance } from 'node:perf_hooks'
+import { parseHeaders } from '../utils.js'
 
 class Handler {
   constructor(opts, { handler }) {
@@ -67,7 +67,7 @@ class Handler {
 
   onData(chunk) {
     if (this.stats.firstBodyReceived === -1) {
-      this.stats.firstBodyReceived = this.stats.start - performance.now()
+      this.stats.firstBodyReceived = performance.now() - this.stats.start
     }
 
     this.pos += chunk.length
@@ -75,7 +75,7 @@ class Handler {
   }
 
   onComplete(rawTrailers) {
-    this.stats.lastBodyReceived = this.stats.start - performance.now()
+    this.stats.lastBodyReceived = performance.now() - this.stats.start
     this.stats.end = this.stats.lastBodyReceived
 
     this.logger.debug(
@@ -86,7 +86,7 @@ class Handler {
   }
 
   onError(err) {
-    this.stats.end = this.stats.start - performance.now()
+    this.stats.end = performance.now() - this.stats.start
 
     if (this.aborted) {
       this.logger.debug(
@@ -103,5 +103,5 @@ class Handler {
   }
 }
 
-module.exports = (dispatch) => (opts, handler) =>
+export default (dispatch) => (opts, handler) =>
   opts.logger ? dispatch(opts, new Handler(opts, { handler })) : dispatch(opts, handler)

package/lib/interceptor/proxy.js

@@ -1,5 +1,5 @@
-const createError = require('http-errors')
-const net = require('net')
+import net from 'node:net'
+import createError from 'http-errors'
 
 class Handler {
   constructor(opts, { handler }) {
@@ -73,7 +73,7 @@ class Handler {
   }
 }
 
-module.exports = (dispatch) => (opts, handler) => {
+export default (dispatch) => (opts, handler) => {
   if (!opts.proxy) {
     return dispatch(opts, handler)
   }

package/lib/interceptor/redirect.js

@@ -1,5 +1,5 @@
-const assert = require('assert')
-const { findHeader, isDisturbed, parseURL } = require('../utils')
+import assert from 'node:assert'
+import { findHeader, isDisturbed, parseURL } from '../utils.js'
 
 const redirectableStatusCodes = [300, 301, 302, 303, 307, 308]
 
@@ -176,7 +176,7 @@ function cleanRequestHeaders(headers, removeContent, unknownOrigin) {
   return ret
 }
 
-module.exports = (dispatch) => (opts, handler) =>
+export default (dispatch) => (opts, handler) =>
   opts.follow != null
     ? dispatch(opts, new Handler(opts, { handler, dispatch }))
     : dispatch(opts, handler)

package/lib/interceptor/request-body-factory.js

@@ -1,4 +1,4 @@
-module.exports = (dispatch) => (opts, handler) =>
+export default (dispatch) => (opts, handler) =>
   typeof opts.body === 'function'
     ? Promise.resolve(opts.body({ signal: opts.signal })).then(
         (body) => dispatch({ ...opts, body }, handler),

package/lib/interceptor/request-body.js

@@ -1,4 +1,4 @@
-const { isStream } = require('../utils')
+import { isStream } from '../utils.js'
 
 class Handler {
   constructor(opts, { handler }) {
@@ -58,7 +58,7 @@ class Handler {
   }
 }
 
-module.exports = (dispatch) => (opts, handler) => {
+export default (dispatch) => (opts, handler) => {
   if (isStream(opts.body)) {
     if (opts.method === 'GET' || opts.method === 'HEAD') {
       opts.body.resume() // dump

package/lib/interceptor/request-content.js

@@ -1,4 +1,4 @@
-const crypto = require('node:crypto')
+import crypto from 'node:crypto'
 
 class Handler {
   constructor(opts, { handler, md5, length }) {
@@ -61,7 +61,7 @@ class Handler {
   }
 }
 
-module.exports = (dispatch) => (opts, handler) => {
+export default (dispatch) => (opts, handler) => {
   if (opts.upgrade) {
     return dispatch(opts, handler)
   }

package/lib/interceptor/request-id.js

@@ -11,7 +11,7 @@ function genReqId() {
   return `req-${nextReqId.toString(36)}`
 }
 
-module.exports = (dispatch) => (opts, handler) => {
+export default (dispatch) => (opts, handler) => {
   let id = opts.id ?? opts.headers?.['request-id'] ?? opts.headers?.['Request-Id']
   id = id ? `${id},${genReqId()}` : genReqId()
 

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

@@ -1,5 +1,5 @@
-const assert = require('node:assert')
-const { parseContentRange, isDisturbed, findHeader, retry: retryFn } = require('../utils.js')
+import assert from 'node:assert'
+import { parseContentRange, isDisturbed, findHeader, retry as retryFn } from '../utils.js'
 
 class Handler {
   constructor(opts, { dispatch, handler }) {
@@ -155,7 +155,7 @@ class Handler {
   }
 }
 
-module.exports = (dispatch) => (opts, handler) => {
+export default (dispatch) => (opts, handler) => {
   return opts.idempotent && opts.retry && opts.method === 'GET' && !opts.upgrade
     ? dispatch(opts, new Handler(opts, { handler, dispatch }))
     : dispatch(opts, handler)

package/lib/interceptor/response-content.js

@@ -1,5 +1,5 @@
-const crypto = require('node:crypto')
-const { findHeader } = require('../utils')
+import crypto from 'node:crypto'
+import { findHeader } from '../utils.js'
 
 class Handler {
   constructor(opts, { handler }) {
@@ -65,5 +65,5 @@ class Handler {
   }
 }
 
-module.exports = (dispatch) => (opts, handler) =>
+export default (dispatch) => (opts, handler) =>
   !opts.upgrade ? dispatch(opts, new Handler(opts, { handler })) : dispatch(opts, handler)

package/lib/interceptor/response-retry.js

@@ -1,4 +1,4 @@
-const { isDisturbed, retry: retryFn } = require('../utils.js')
+import { isDisturbed, retry as retryFn } from '../utils.js'
 
 class Handler {
   constructor(opts, { dispatch, handler }) {
@@ -86,7 +86,7 @@ class Handler {
   }
 }
 
-module.exports = (dispatch) => (opts, handler) =>
+export default (dispatch) => (opts, handler) =>
   opts.idempotent && opts.retry && !opts.upgrade
     ? dispatch(opts, new Handler(opts, { handler, dispatch }))
     : dispatch(opts, handler)

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

@@ -1,5 +1,5 @@
-const { parseHeaders, isDisturbed, retry: retryFn } = require('../utils')
-const createError = require('http-errors')
+import { parseHeaders, isDisturbed, retry as retryFn } from '../utils.js'
+import createError from 'http-errors'
 
 class Handler {
   constructor(opts, { dispatch, handler }) {
@@ -98,7 +98,7 @@ class Handler {
   }
 }
 
-module.exports = (dispatch) => (opts, handler) =>
+export default (dispatch) => (opts, handler) =>
   opts.idempotent && opts.retry
     ? dispatch(opts, new Handler(opts, { handler, dispatch }))
     : dispatch(opts, handler)

package/lib/interceptor/signal.js

@@ -52,5 +52,5 @@ class Handler {
   }
 }
 
-module.exports = (dispatch) => (opts, handler) =>
+export default (dispatch) => (opts, handler) =>
   opts.signal ? dispatch(opts, new Handler(opts, { handler })) : dispatch(opts, handler)

package/lib/utils.js

@@ -1,6 +1,6 @@
-const tp = require('node:timers/promises')
+import tp from 'node:timers/promises'
 
-function isDisturbed(body) {
+export function isDisturbed(body) {
   if (
     body == null ||
     typeof body === 'string' ||
@@ -17,7 +17,7 @@ function isDisturbed(body) {
   return true
 }
 
-function parseContentRange(range) {
+export function parseContentRange(range) {
   if (typeof range !== 'string') {
     return null
   }
@@ -45,7 +45,7 @@ function parseContentRange(range) {
   return { start, end: end ? end + 1 : size, size }
 }
 
-function findHeader(rawHeaders, name) {
+export function findHeader(rawHeaders, name) {
   const len = name.length
 
   for (let i = 0; i < rawHeaders.length; i += 2) {
@@ -57,7 +57,7 @@ function findHeader(rawHeaders, name) {
   return null
 }
 
-function retry(err, retryCount, opts) {
+export function retry(err, retryCount, opts) {
   if (opts.retry === null || opts.retry === false) {
     return null
   }
@@ -105,7 +105,7 @@ function retry(err, retryCount, opts) {
   return null
 }
 
-function parseURL(url) {
+export function parseURL(url) {
   if (typeof url === 'string') {
     url = new URL(url)
 
@@ -168,7 +168,7 @@ function parseURL(url) {
   return url
 }
 
-function parseOrigin(url) {
+export function parseOrigin(url) {
   url = module.exports.parseURL(url)
 
   if (url.pathname !== '/' || url.search || url.hash) {
@@ -178,7 +178,7 @@ function parseOrigin(url) {
   return url
 }
 
-function parseHeaders(rawHeaders, obj = {}) {
+export function parseHeaders(rawHeaders, obj = {}) {
   for (let i = 0; i < rawHeaders.length; i += 2) {
     const key = rawHeaders[i].toString().toLowerCase()
     let val = obj[key]
@@ -195,7 +195,7 @@ function parseHeaders(rawHeaders, obj = {}) {
   return obj
 }
 
-class AbortError extends Error {
+export class AbortError extends Error {
   constructor(message) {
     super(message ?? 'The operation was aborted')
     this.code = 'ABORT_ERR'
@@ -203,14 +203,14 @@ class AbortError extends Error {
   }
 }
 
-function isStream(obj) {
+export function isStream(obj) {
   return (
     obj && typeof obj === 'object' && typeof obj.pipe === 'function' && typeof obj.on === 'function'
   )
 }
 
 // based on https://github.com/node-fetch/fetch-blob/blob/8ab587d34080de94140b54f07168451e7d0b655e/index.js#L229-L241 (MIT License)
-function isBlobLike(object) {
+export function isBlobLike(object) {
   return (
     (Blob && object instanceof Blob) ||
     (object &&
@@ -220,12 +220,12 @@ function isBlobLike(object) {
   )
 }
 
-function isBuffer(buffer) {
+export function isBuffer(buffer) {
   // See, https://github.com/mcollina/undici/pull/319
   return buffer instanceof Uint8Array || Buffer.isBuffer(buffer)
 }
 
-function bodyLength(body) {
+export function bodyLength(body) {
   if (body == null) {
     return 0
   } else if (isStream(body)) {
@@ -239,18 +239,3 @@ function bodyLength(body) {
 
   return null
 }
-
-module.exports = {
-  isStream,
-  isBuffer,
-  isBlobLike,
-  AbortError,
-  bodyLength,
-  parseHeaders,
-  isDisturbed,
-  parseContentRange,
-  findHeader,
-  retry,
-  parseURL,
-  parseOrigin,
-}

package/package.json

@@ -1,14 +1,16 @@
 {
   "name": "@nxtedition/nxt-undici",
-  "version": "1.4.4",
+  "version": "2.0.1",
   "license": "MIT",
   "author": "Robert Nagy <robert.nagy@boffins.se>",
   "main": "lib/index.js",
+  "type": "module",
   "files": [
     "lib/*"
   ],
   "dependencies": {
     "cache-control-parser": "^2.0.4",
+    "cacheable-lookup": "^7.0.0",
     "http-errors": "^2.0.0",
     "lru-cache": "^10.0.1",
     "undici": "^5.27.0"