fix: Use an AbortSignal for per-request timeouts

src/connection/UndiciConnection.ts

@@ -19,7 +19,6 @@
 
 /* eslint-disable @typescript-eslint/restrict-template-expressions */
 
-import { EventEmitter } from 'events'
 import Debug from 'debug'
 import buffer from 'buffer'
 import { TLSSocket } from 'tls'
@@ -41,7 +40,7 @@ import {
   TimeoutError
 } from '../errors'
 import { UndiciAgentOptions } from '../types'
-import { kCaFingerprint, kEmitter } from '../symbols'
+import { kCaFingerprint } from '../symbols'
 
 const debug = Debug('elasticsearch')
 const INVALID_PATH_REGEX = /[^\u0021-\u00ff]/
@@ -50,7 +49,6 @@ const MAX_STRING_LENGTH = buffer.constants.MAX_STRING_LENGTH
 
 export default class Connection extends BaseConnection {
   pool: Pool
-  [kEmitter]: EventEmitter
 
   constructor (opts: ConnectionOptions) {
     super(opts)
@@ -67,8 +65,6 @@ export default class Connection extends BaseConnection {
       throw new ConfigurationError('Bad agent configuration for Undici agent')
     }
 
-    this[kEmitter] = new EventEmitter()
-    this[kEmitter].setMaxListeners(this.maxEventListeners)
     const undiciOptions: Pool.Options = {
       keepAliveTimeout: 600e3,
       keepAliveMaxTimeout: 600e3,
@@ -124,7 +120,7 @@ export default class Connection extends BaseConnection {
       path: params.path + (params.querystring == null || params.querystring === '' ? '' : `?${params.querystring}`),
       headers: Object.assign({}, this.headers, params.headers),
       body: params.body,
-      signal: options.signal ?? this[kEmitter]
+      signal: options.signal ?? new AbortController().signal
     }
 
     if (requestParams.path[0] !== '/') {
@@ -141,11 +137,7 @@ export default class Connection extends BaseConnection {
     if (options.timeout != null && options.timeout !== this.timeout) {
       timeoutId = setTimeout(() => {
         timedout = true
-        if (options.signal != null) {
-          options.signal.dispatchEvent(new Event('abort'))
-        } else {
-          this[kEmitter].emit('abort')
-        }
+        requestParams.signal.dispatchEvent(new Event('abort'))
       }, options.timeout)
     }
 

src/symbols.ts

@@ -38,7 +38,6 @@ export const kNodeFilter = Symbol('node filter')
 export const kNodeSelector = Symbol('node selector')
 export const kJsonOptions = Symbol('secure json parse options')
 export const kStatus = Symbol('status')
-export const kEmitter = Symbol('event emitter')
 export const kProductCheck = Symbol('product check')
 export const kCaFingerprint = Symbol('ca fingerprint')
 export const kMaxResponseSize = Symbol('max response size')

test/unit/undici-connection.test.ts

@@ -1064,26 +1064,6 @@ test('Path without intial slash', async t => {
   server.stop()
 })
 
-test('Should increase number of max event listeners', async t => {
-  t.plan(1)
-
-  function handler (req: http.IncomingMessage, res: http.ServerResponse) {
-    res.end('ok')
-  }
-
-  const [{ port }, server] = await buildServer(handler, { secure: true })
-  const connection = new UndiciConnection({
-    url: new URL(`https://localhost:${port}`),
-    maxEventListeners: 100,
-  })
-  const res = await connection.request({
-    path: '/hello',
-    method: 'GET'
-  }, options)
-  t.equal(res.body, 'ok')
-  server.stop()
-})
-
 test('as stream', async t => {
   t.plan(2)