Fix memory leak in waitDevice method

chrvadala · Sep 17, 2024 · bd294ed · bd294ed
1 parent ece3d3e
commit bd294ed
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/src/Adapter.js b/src/Adapter.js
@@ -161,12 +161,14 @@ class Adapter {
       cancellable.push(() => clearTimeout(handler))
     })
 
-    const device = await Promise.race([discoveryHandler, timeoutHandler])
-
-    for (const cancel of cancellable) {
-      cancel()
+    try {
+      const device = await Promise.race([discoveryHandler, timeoutHandler])
+      return device
+    } finally {
+      for (const cancel of cancellable) {
+        cancel()
+      }
     }
-    return device
   }
 
   /**