Merge pull request #46 from Flowko/44-would-it-be-possible-to-auto-in…

…stall-plugins-like-ublock-origin-into-the-website-shot-browser feat: added Environment variable for blocking ads
Flowko · Nov 14, 2022 · ac8ded4 · ac8ded4
2 parents 45196f9 + 00c45b2
commit ac8ded4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -24,5 +24,6 @@ ENV PASSWORD_PROTECT 0
 ENV PASSWORD null
 ENV RUNNING_DOCKER 1
 ENV USER_AGENT "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/92.0.4515.159 Safari/537.36"
+ENV BLOCK_ADS 1
 
 CMD [ "yarn", "start" ]
diff --git a/server-middleware/capture.js b/server-middleware/capture.js
@@ -152,10 +152,11 @@ const internalCaptureWebsite = async (input, options) => {
   let browser;
   let page;
   try {
-    browser = options._browser || (await puppeteer.launch(launchOptions));
+    browser = await puppeteer.launch(launchOptions);
+
     page = await browser.newPage();
 
-    if (options.blockAds) {
+    if (options.blockAds || process.env.BLOCK_ADS == "1") {
       const blocker = await PuppeteerBlocker.fromPrebuiltFull(fetch, {
         path: "engine.bin",
         read: fs.readFile,