Fix HttpClient event handler leak (#4107)

Fix leak in signalGlobal event listeners
ChainSafe · Jun 3, 2022 · 9bb9127 · 9bb9127
1 parent 82d23e0
commit 9bb9127
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/packages/api/src/client/utils/httpClient.ts b/packages/api/src/client/utils/httpClient.ts
@@ -80,9 +80,10 @@ export class HttpClient implements IHttpClient {
     const timeout = setTimeout(() => controller.abort(), this.timeoutMs);
 
     // Attach global signal to this request's controller
-    const signalGlobal = this.getAbortSignal && this.getAbortSignal();
+    const onGlobalSignalAbort = controller.abort.bind(controller);
+    const signalGlobal = this.getAbortSignal?.();
     if (signalGlobal) {
-      signalGlobal.addEventListener("abort", () => controller.abort());
+      signalGlobal.addEventListener("abort", onGlobalSignalAbort);
     }
 
     const routeId = opts.routeId; // TODO: Should default to "unknown"?
@@ -130,7 +131,7 @@ export class HttpClient implements IHttpClient {
 
       clearTimeout(timeout);
       if (signalGlobal) {
-        signalGlobal.removeEventListener("abort", controller.abort);
+        signalGlobal.removeEventListener("abort", onGlobalSignalAbort);
       }
     }
   }