Skip to content

Commit

Permalink
Generate the adblocker engine only once (by using built-in caching)
Browse files Browse the repository at this point in the history
  • Loading branch information
th-ch committed Apr 12, 2020
1 parent 6e45e7b commit f25eb48
Show file tree
Hide file tree
Showing 4 changed files with 38 additions and 13 deletions.
3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,8 @@
"build": "yarn run clean && build --win --mac --linux",
"build:mac": "yarn run clean && build --mac",
"build:win": "yarn run clean && build --win",
"plugins": "yarn run plugin:autoconfirm",
"plugins": "yarn run plugin:adblocker && yarn run plugin:autoconfirm",
"plugin:adblocker": "rimraf plugins/adblocker/ad-blocker-engine.bin && node plugins/adblocker/blocker.js",
"plugin:autoconfirm": "yarn run generate:package YoutubeNonStop",
"release:linux": "yarn run clean && build --linux -p always",
"release:mac": "yarn run clean && build --mac -p always",
Expand Down
1 change: 1 addition & 0 deletions plugins/adblocker/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/ad-blocker-engine.bin
14 changes: 2 additions & 12 deletions plugins/adblocker/back.js
Original file line number Diff line number Diff line change
@@ -1,12 +1,2 @@
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"
];

module.exports = () =>
ElectronBlocker.fromLists(fetch, SOURCES)
.then(blocker => blocker.enableBlockingInSession(session.defaultSession))
.catch(err => console.log("Error loading adBlocker", err));
const { loadAdBlockerEngine } = require("./blocker");
module.exports = () => loadAdBlockerEngine(true);
33 changes: 33 additions & 0 deletions plugins/adblocker/blocker.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
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"
];

const loadAdBlockerEngine = (enableBlocking = false) =>
ElectronBlocker.fromLists(
fetch,
SOURCES,
{},
{
path: path.resolve(__dirname, "ad-blocker-engine.bin"),
read: promises.readFile,
write: promises.writeFile
}
)
.then(blocker => {
if (enableBlocking) {
blocker.enableBlockingInSession(session.defaultSession);
}
})
.catch(err => console.log("Error loading adBlocker engine", err));

module.exports = { loadAdBlockerEngine };
if (require.main === module) {
loadAdBlockerEngine(false); // Generate the engine without enabling it
}

0 comments on commit f25eb48

Please sign in to comment.