Clean up timeout in waitForOnline

Co-authored-by: Evan Hahn <69474926+EvanHahn-Signal@users.noreply.github.com>
signalapp · Nov 1, 2021 · 63fd366 · 63fd366
1 parent 3dd3a0f
commit 63fd366
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/ts/util/waitForOnline.ts b/ts/util/waitForOnline.ts
@@ -14,19 +14,24 @@ export function waitForOnline(
       return;
     }
 
+    let timeoutId: undefined | ReturnType<typeof setTimeout>;
+
     const listener = () => {
       cleanup();
       resolve();
     };
 
     const cleanup = () => {
       onlineEventTarget.removeEventListener('online', listener);
+      if (typeof timeoutId === 'number') {
+        clearTimeout(timeoutId);
+      }
     };
 
     onlineEventTarget.addEventListener('online', listener);
 
     if (timeout !== undefined) {
-      setTimeout(() => {
+      timeoutId = setTimeout(() => {
         cleanup();
         reject(new Error('waitForOnline: did not come online in time'));
       }, timeout);