Merge pull request #43 from ECLK/dev

Dev

.gitignore

@@ -4,4 +4,5 @@ config.json
 .DS_Store
 package-lock.json
 static/exports
-.env
+.env
+report.*

handlers/generate.js

@@ -47,9 +47,9 @@ module.exports = async function(req, res) {
     }
 
     if (!global.browser) {
-        const browser = await puppeteer.launch({ args: ['--no-sandbox'] })
+        await reGenerateBrowser();
     }
-    const page = await global.browser.newPage();
+    const page = await getNewPageFromBrowser();
     page.setDefaultNavigationTimeout(0);
     if (req.body.url) {
         await page.goto(req.body.url);
@@ -72,6 +72,26 @@ module.exports = async function(req, res) {
     });
 }
 
+async function getNewPageFromBrowser() {
+    const newPage = await global.browser.newPage().catch( (e) => {
+        console.log("Browser instance seems to be dead.")
+    })
+
+    if (newPage) {
+        return newPage;
+    } else {
+        await reGenerateBrowser();
+        console.log("Created a new page instance.");
+        return await global.browser.newPage()
+    }
+
+}
+
+async function reGenerateBrowser() {
+    global.browser = await puppeteer.launch({ args: ['--disable-gpu', '--no-sandbox', '--disable-dev-shm-usage'] });
+    console.log('Browser instance regenerated.')
+}
+
 function revisedRandId() {
      return Math.random().toString(36).replace(/[^a-z]+/g, '').substr(2, 10);
 }

puppeteer.js

@@ -2,7 +2,7 @@ const puppeteer = require('puppeteer');
 const config = require('./config');
 const headlessState = true;
 
-puppeteer.launch({ headless: headlessState, args: ['--no-sandbox', '--disable-dev-shm-usage'] }).then(function(browser) {
+puppeteer.launch({ headless: headlessState, args: ['--disable-gpu', '--no-sandbox', '--disable-dev-shm-usage'] }).then(function(browser) {
     global.browser = browser;
     console.log('browser ready');
 });

purge_expired.js

@@ -28,4 +28,4 @@ function purgeExpired() {
             }
         }
     });
-}
+}