diff --git a/plugins/adblocker/back.js b/plugins/adblocker/back.js index caf0cc97..25ba5da9 100644 --- a/plugins/adblocker/back.js +++ b/plugins/adblocker/back.js @@ -1,2 +1,2 @@ const { loadAdBlockerEngine } = require("./blocker"); -module.exports = () => loadAdBlockerEngine(true); +module.exports = (win) => loadAdBlockerEngine(win.webContents.session); diff --git a/plugins/adblocker/blocker.js b/plugins/adblocker/blocker.js index 452924f5..e17abbb9 100644 --- a/plugins/adblocker/blocker.js +++ b/plugins/adblocker/blocker.js @@ -2,14 +2,13 @@ const { promises } = require("fs"); // used for caching const path = require("path"); const { ElectronBlocker } = require("@cliqz/adblocker-electron"); -const { session } = require("electron"); const fetch = require("node-fetch"); const SOURCES = [ - "https://raw.githubusercontent.com/kbinani/adblock-youtube-ads/master/signed.txt" + "https://raw.githubusercontent.com/kbinani/adblock-youtube-ads/master/signed.txt", ]; -const loadAdBlockerEngine = (enableBlocking = false) => +const loadAdBlockerEngine = (session = undefined) => ElectronBlocker.fromLists( fetch, SOURCES, @@ -17,17 +16,19 @@ const loadAdBlockerEngine = (enableBlocking = false) => { path: path.resolve(__dirname, "ad-blocker-engine.bin"), read: promises.readFile, - write: promises.writeFile + write: promises.writeFile, } ) - .then(blocker => { - if (enableBlocking) { - blocker.enableBlockingInSession(session.defaultSession); + .then((blocker) => { + if (session) { + blocker.enableBlockingInSession(session); + } else { + console.log("Successfully generated adBlocker engine."); } }) - .catch(err => console.log("Error loading adBlocker engine", err)); + .catch((err) => console.log("Error loading adBlocker engine", err)); module.exports = { loadAdBlockerEngine }; if (require.main === module) { - loadAdBlockerEngine(false); // Generate the engine without enabling it + loadAdBlockerEngine(); // Generate the engine without enabling it }