fix: clear hook timeout (#243)

oclif · Sep 8, 2021 · 0c32c65 · 0c32c65
1 parent bf2ea50
commit 0c32c65
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 4 deletions.
diff --git a/src/config/config.ts b/src/config/config.ts
@@ -212,8 +212,17 @@ export class Config implements IConfig {
     }
 
     const withTimeout = async (ms: number, promise: any) => {
-      const timeout = new Promise((_, reject) => setTimeout(() => reject(new Error(`Timed out after ${ms} ms.`)), ms))
-      return Promise.race([promise, timeout])
+      let id: NodeJS.Timeout
+      const timeout = new Promise((_, reject) => {
+        id = setTimeout(() => {
+          reject(new Error(`Timed out after ${ms} ms.`))
+        }, ms)
+      })
+
+      return Promise.race([promise, timeout]).then(result => {
+        clearTimeout(id)
+        return result
+      })
     }
 
     const successes = []
@@ -254,7 +263,7 @@ export class Config implements IConfig {
 
           debug('done')
         } catch (error) {
-          failures.push({plugin: p, error})
+          failures.push({plugin: p, error: error as Error})
           if (error && error.oclif && error.oclif.exit !== undefined) throw error
           this.warn(error, `runHook ${event}`)
         }

diff --git a/src/interfaces/hooks.ts b/src/interfaces/hooks.ts
@@ -67,7 +67,7 @@ export namespace Hook {
 
   export interface Result<T> {
     successes: Array<{ result: T; plugin: Plugin }>;
-    failures: Array<{ error: typeof Error; plugin: Plugin }>;
+    failures: Array<{ error: Error; plugin: Plugin }>;
   }
 }