Fix error handling in NPM/Puppeteer

src/drivers/npm/browsers/puppeteer.js

@@ -55,29 +55,23 @@ class PuppeteerBrowser extends Browser {
     options.maxWait = options.maxWait || 60;
 
     super(options);
-
-    this.browser = async () => puppeteer.launch(chromium ? {
-      args: [...chromium.args, '--ignore-certificate-errors'],
-      defaultViewport: chromium.defaultViewport,
-      executablePath: await chromium.executablePath,
-      headless: chromium.headless,
-    } : {
-      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);
-        }
+  visit(url) {
+    return new Promise(async (resolve, reject) => {
+      let done = false;
+      let browser;
+
+      try {
+        browser = await puppeteer.launch(chromium ? {
+          args: [...chromium.args, '--ignore-certificate-errors'],
+          defaultViewport: chromium.defaultViewport,
+          executablePath: await chromium.executablePath,
+          headless: chromium.headless,
+        } : {
+          args: ['--no-sandbox', '--headless', '--disable-gpu', '--ignore-certificate-errors'],
+          executablePath: CHROME_BIN,
+        });
 
         browser.on('disconnected', () => {
           if (!done) {
@@ -85,14 +79,14 @@ class PuppeteerBrowser extends Browser {
           }
         });
 
-        try {
-          const page = await browser.newPage();
+        const page = await browser.newPage();
 
-          page.setDefaultTimeout(this.options.maxWait);
+        page.setDefaultTimeout(this.options.maxWait);
 
-          page.on('error', reject);
+        page.on('error', reject);
 
-          page.on('response', (response) => {
+        page.on('response', (response) => {
+          try {
             if (response.status() === 301 || response.status() === 302) {
               return;
             }
@@ -110,60 +104,66 @@ class PuppeteerBrowser extends Browser {
 
               this.contentType = headers['content-type'] || null;
             }
-          });
-
-          page.on('console', ({ _type, _text, _location }) => this.log(`${_text} (${_location.url}: ${_location.lineNumber})`, _type));
-
-          await page.setUserAgent(this.options.userAgent);
-
-          await Promise.race([
-            page.goto(url, { waitUntil: 'networkidle2' }),
-            new Promise(_resolve => setTimeout(_resolve, this.options.maxWait)),
-          ]);
-
-          // eslint-disable-next-line no-undef
-          const links = await page.evaluateHandle(() => Array.from(document.getElementsByTagName('a')).map(({
-            hash, hostname, href, pathname, protocol, rel,
-          }) => ({
-            hash,
-            hostname,
-            href,
-            pathname,
-            protocol,
-            rel,
-          })));
-
-          this.links = await links.jsonValue();
-
-          // eslint-disable-next-line no-undef
-          const scripts = await page.evaluateHandle(() => Array.from(document.getElementsByTagName('script')).map(({
-            src,
-          }) => src));
-
-          this.scripts = (await scripts.jsonValue()).filter(script => script);
-
-          this.js = await page.evaluate(getJs);
-
-          this.cookies = (await page.cookies()).map(({
-            name, value, domain, path,
-          }) => ({
-            name, value, domain, path,
-          }));
+          } catch (error) {
+            reject(error);
+          }
+        });
 
-          this.html = await page.content();
-        } catch (error) {
-          return reject(error);
+        page.on('console', ({ _type, _text, _location }) => this.log(`${_text} (${_location.url}: ${_location.lineNumber})`, _type));
+
+        await page.setUserAgent(this.options.userAgent);
+
+        await Promise.race([
+          page.goto(url, { waitUntil: 'networkidle2' }),
+          new Promise(_resolve => setTimeout(_resolve, this.options.maxWait)),
+        ]);
+
+        // eslint-disable-next-line no-undef
+        const links = await page.evaluateHandle(() => Array.from(document.getElementsByTagName('a')).map(({
+          hash, hostname, href, pathname, protocol, rel,
+        }) => ({
+          hash,
+          hostname,
+          href,
+          pathname,
+          protocol,
+          rel,
+        })));
+
+        this.links = await links.jsonValue();
+
+        // eslint-disable-next-line no-undef
+        const scripts = await page.evaluateHandle(() => Array.from(document.getElementsByTagName('script')).map(({
+          src,
+        }) => src));
+
+        this.scripts = (await scripts.jsonValue()).filter(script => script);
+
+        this.js = await page.evaluate(getJs);
+
+        this.cookies = (await page.cookies()).map(({
+          name, value, domain, path,
+        }) => ({
+          name, value, domain, path,
+        }));
+
+        this.html = await page.content();
+
+        resolve();
+      } catch (error) {
+        reject(error);
+      } finally {
+        done = true;
+
+        if (browser) {
+          try {
+            await browser.close();
+          } catch (error) {
+            this.log(error.message || error.toString, 'error');
+          }
         }
-
-        return resolve();
-      });
-    } catch (error) {
-      throw new Error(error.message || error.toString());
-    } finally {
-      done = true;
-
-      await browser.close();
-    }
+      }
+    });
   }
 }
 

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": {