Fix promise timeouts in NPM driver

src/drivers/npm/driver.js

@@ -225,27 +225,26 @@ class Site {
     }
   }
 
-  /**
+  promiseTimeout(
-   * @param {Promise} promise
+    promise,
-   * @param {string} [errorMessage]
+    errorMessage = 'The website took too long to respond'
-   *
+  ) {
-   * @return {Promise}
+    let timeout = null
-   */
-  async promiseTimeout(promise, errorMessage = 'The website took too long to respond') {
-    let timerId = null;
 
     return Promise.race([
       new Promise((resolve, reject) => {
-        timerId = setTimeout(() => {
+        timeout = setTimeout(() => {
-          clearTimeout(timerId);
+          clearTimeout(timeout)
-          reject(new Error(errorMessage));
+
-        }, this.options.maxWait);
+          reject(new Error(errorMessage))
+        }, this.options.maxWait)
       }),
       promise.then((value) => {
-        clearTimeout(timerId);
+        clearTimeout(timeout)
-        return value;
+
+        return value
       }),
-    ]);
+    ])
   }
 
   async goto(url) {
@@ -352,11 +351,15 @@ class Site {
     )
 
     try {
-      await this.promiseTimeout(page.goto(url.href, { waitUntil: 'domcontentloaded' }))
+      await this.promiseTimeout(
+        page.goto(url.href, { waitUntil: 'domcontentloaded' })
+      )
+
       await sleep(1000)
 
       // Links
-      const links = await (
+      const links = await this.promiseTimeout(
+        (
           await this.promiseTimeout(
             page.evaluateHandle(() =>
               Array.from(document.getElementsByTagName('a')).map(
@@ -369,12 +372,14 @@ class Site {
                   rel,
                 })
               )
-          ),
+            )
           )
         ).jsonValue()
+      )
 
       // CSS
-      const css = await (
+      const css = await this.promiseTimeout(
+        (
           await this.promiseTimeout(
             page.evaluateHandle((maxRows) => {
               const css = []
@@ -398,23 +403,27 @@ class Site {
               }
 
               return css.join('\n')
-          }, this.options.htmlMaxRows),
+            }, this.options.htmlMaxRows)
           )
         ).jsonValue()
+      )
 
       // Script tags
-      const scripts = await (
+      const scripts = await this.promiseTimeout(
+        (
           await this.promiseTimeout(
             page.evaluateHandle(() =>
               Array.from(document.getElementsByTagName('script'))
                 .map(({ src }) => src)
                 .filter((src) => src)
-          ),
+            )
           )
         ).jsonValue()
+      )
 
       // Meta tags
-      const meta = await (
+      const meta = await this.promiseTimeout(
+        (
           await this.promiseTimeout(
             page.evaluateHandle(() =>
               Array.from(document.querySelectorAll('meta')).reduce(
@@ -430,9 +439,10 @@ class Site {
                 },
                 {}
               )
-          ),
+            )
           )
         ).jsonValue()
+      )
 
       // JavaScript
       const js = await this.promiseTimeout(
@@ -467,7 +477,7 @@ class Site {
           Wappalyzer.technologies
             .filter(({ js }) => Object.keys(js).length)
             .map(({ name, js }) => ({ name, chains: Object.keys(js) }))
-        ),
+        )
       )
 
       // Cookies
@@ -565,7 +575,11 @@ class Site {
 
       return reducedLinks
     } catch (error) {
-      this.error(error)
+      if (error.constructor.name === 'TimeoutError') {
+        throw new Error('The website took too long to respond')
+      }
+
+      throw new Error(error.message)
     }
   }