Generate the adblocker engine only once (by using built-in caching)

This commit is contained in:
TC
2020-04-12 14:17:38 +02:00
parent 6e45e7b2cb
commit f25eb48f79
4 changed files with 38 additions and 13 deletions

View File

@ -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",

1
plugins/adblocker/.gitignore vendored Normal file
View File

@ -0,0 +1 @@
/ad-blocker-engine.bin

View File

@ -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);

View File

@ -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
}