Fix error handling in NPM/Puppeteer

src/drivers/npm/browsers/puppeteer.js

@@ -55,8 +55,15 @@ class PuppeteerBrowser extends Browser {
     options.maxWait = options.maxWait || 60;
 
     super(options);
+  }
+
+  visit(url) {
+    return new Promise(async (resolve, reject) => {
+      let done = false;
+      let browser;
 
-    this.browser = async () => puppeteer.launch(chromium ? {
+      try {
+        browser = await puppeteer.launch(chromium ? {
           args: [...chromium.args, '--ignore-certificate-errors'],
           defaultViewport: chromium.defaultViewport,
           executablePath: await chromium.executablePath,
@@ -65,19 +72,6 @@ class PuppeteerBrowser extends Browser {
           args: ['--no-sandbox', '--headless', '--disable-gpu', '--ignore-certificate-errors'],
           executablePath: CHROME_BIN,
         });
-  }
-
-  async visit(url) {
-    let done = false;
-    let browser;
-
-    try {
-      await new Promise(async (resolve, reject) => {
-        try {
-          browser = await this.browser();
-        } catch (error) {
-          return reject(error);
-        }
 
         browser.on('disconnected', () => {
           if (!done) {
@@ -85,7 +79,6 @@ class PuppeteerBrowser extends Browser {
           }
         });
 
-        try {
         const page = await browser.newPage();
 
         page.setDefaultTimeout(this.options.maxWait);
@@ -93,6 +86,7 @@ class PuppeteerBrowser extends Browser {
         page.on('error', reject);
 
         page.on('response', (response) => {
+          try {
             if (response.status() === 301 || response.status() === 302) {
               return;
             }
@@ -110,6 +104,9 @@ class PuppeteerBrowser extends Browser {
 
               this.contentType = headers['content-type'] || null;
             }
+          } catch (error) {
+            reject(error);
+          }
         });
 
         page.on('console', ({ _type, _text, _location }) => this.log(`${_text} (${_location.url}: ${_location.lineNumber})`, _type));
@@ -151,20 +148,23 @@ class PuppeteerBrowser extends Browser {
         }));
 
         this.html = await page.content();
-        } catch (error) {
-          return reject(error);
-        }
 
-        return resolve();
+        resolve();
-      });
       } catch (error) {
-      throw new Error(error.message || error.toString());
+        reject(error);
       } finally {
         done = true;
 
+        if (browser) {
+          try {
             await browser.close();
+          } catch (error) {
+            this.log(error.message || error.toString, 'error');
           }
         }
       }
+    });
+  }
+}
 
 module.exports = PuppeteerBrowser;

src/drivers/npm/package.json

@@ -2,7 +2,7 @@
   "name": "wappalyzer",
   "description": "Uncovers the technologies used on websites",
   "homepage": "https://github.com/AliasIO/Wappalyzer",
-  "version": "5.9.17",
+  "version": "5.9.18",
   "author": "Elbert Alias",
   "license": "GPL-3.0",
   "repository": {