Cleanup abort listener (#42)

src/connection/HttpConnection.ts

@@ -113,11 +113,15 @@ export default class HttpConnection extends BaseConnection {
         return reject(err)
       }
 
+      const abortListener = (): void => {
+        request.abort()
+      }
+
       this._openRequests++
       if (options.signal != null) {
         options.signal.addEventListener(
           'abort',
-          () => request.abort(),
+          abortListener,
           { once: true }
         )
       }
@@ -276,6 +280,13 @@ export default class HttpConnection extends BaseConnection {
         request.removeListener('error', onError)
         request.removeListener('abort', onAbort)
         request.removeListener('socket', onSocket)
+        if (options.signal != null) {
+          if ('removeEventListener' in options.signal) {
+            options.signal.removeEventListener('abort', abortListener)
+          } else {
+            options.signal.removeListener('abort', abortListener)
+          }
+        }
         cleanedListeners = true
       }
     })

test/unit/http-connection.test.ts

@@ -1172,3 +1172,30 @@ test('as stream', async t => {
   server.stop()
 })
 
+test('Cleanup abort listener', async t => {
+  t.plan(2)
+
+  const controller = new AbortController()
+
+  function handler (req: http.IncomingMessage, res: http.ServerResponse) {
+    // @ts-expect-error
+    t.equal(controller.signal.eventEmitter.listeners('abort').length, 1)
+    res.end('ok')
+  }
+
+  const [{ port }, server] = await buildServer(handler)
+  const connection = new HttpConnection({
+    url: new URL(`http://localhost:${port}`)
+  })
+
+  await connection.request({
+    path: '/hello',
+    method: 'GET',
+  }, {
+    ...options,
+    signal: controller.signal
+  })
+  // @ts-expect-error
+  t.equal(controller.signal.eventEmitter.listeners('abort').length, 0)
+  server.stop()
+})