2022-09-06 19:47:52 +02:00
|
|
|
|
/*******************************************************************************
|
|
|
|
|
|
2023-12-04 18:10:34 +01:00
|
|
|
|
uBlock Origin - a comprehensive, efficient content blocker
|
2022-09-06 19:47:52 +02:00
|
|
|
|
Copyright (C) 2022-present Raymond Hill
|
|
|
|
|
|
|
|
|
|
This program is free software: you can redistribute it and/or modify
|
|
|
|
|
it under the terms of the GNU General Public License as published by
|
|
|
|
|
the Free Software Foundation, either version 3 of the License, or
|
|
|
|
|
(at your option) any later version.
|
|
|
|
|
|
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
|
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
|
GNU General Public License for more details.
|
|
|
|
|
|
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
|
|
|
along with this program. If not, see {http://www.gnu.org/licenses/}.
|
|
|
|
|
|
|
|
|
|
Home: https://github.com/gorhill/uBlock
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
'use strict';
|
|
|
|
|
|
|
|
|
|
/******************************************************************************/
|
|
|
|
|
|
|
|
|
|
import fs from 'fs/promises';
|
2022-09-06 21:05:01 +02:00
|
|
|
|
import https from 'https';
|
2022-09-15 19:14:08 +02:00
|
|
|
|
import path from 'path';
|
2022-09-06 19:47:52 +02:00
|
|
|
|
import process from 'process';
|
2023-06-23 14:27:07 +02:00
|
|
|
|
import { createHash, randomBytes } from 'crypto';
|
2022-10-16 18:05:24 +02:00
|
|
|
|
import redirectResourcesMap from './js/redirect-resources.js';
|
2022-09-06 19:47:52 +02:00
|
|
|
|
import { dnrRulesetFromRawLists } from './js/static-dnr-filtering.js';
|
2023-01-23 22:53:18 +01:00
|
|
|
|
import * as sfp from './js/static-filtering-parser.js';
|
2023-06-02 23:04:15 +02:00
|
|
|
|
import * as makeScriptlet from './make-scriptlets.js';
|
2023-06-06 02:17:50 +02:00
|
|
|
|
import { safeReplace } from './safe-replace.js';
|
2022-09-06 19:47:52 +02:00
|
|
|
|
|
|
|
|
|
/******************************************************************************/
|
|
|
|
|
|
|
|
|
|
const commandLineArgs = (( ) => {
|
|
|
|
|
const args = new Map();
|
|
|
|
|
let name, value;
|
|
|
|
|
for ( const arg of process.argv.slice(2) ) {
|
|
|
|
|
const pos = arg.indexOf('=');
|
|
|
|
|
if ( pos === -1 ) {
|
|
|
|
|
name = arg;
|
|
|
|
|
value = '';
|
|
|
|
|
} else {
|
|
|
|
|
name = arg.slice(0, pos);
|
|
|
|
|
value = arg.slice(pos+1);
|
|
|
|
|
}
|
|
|
|
|
args.set(name, value);
|
|
|
|
|
}
|
|
|
|
|
return args;
|
|
|
|
|
})();
|
|
|
|
|
|
2023-08-11 19:22:25 +02:00
|
|
|
|
const platform = commandLineArgs.get('platform') || 'chromium';
|
2022-09-16 21:56:35 +02:00
|
|
|
|
const outputDir = commandLineArgs.get('output') || '.';
|
|
|
|
|
const cacheDir = `${outputDir}/../mv3-data`;
|
|
|
|
|
const rulesetDir = `${outputDir}/rulesets`;
|
2022-10-15 19:05:20 +02:00
|
|
|
|
const scriptletDir = `${rulesetDir}/scripting`;
|
2022-09-30 15:18:52 +02:00
|
|
|
|
const env = [
|
2023-08-11 19:22:25 +02:00
|
|
|
|
platform,
|
2022-10-11 18:02:33 +02:00
|
|
|
|
'mv3',
|
2022-09-30 15:18:52 +02:00
|
|
|
|
'ublock',
|
|
|
|
|
'ubol',
|
|
|
|
|
'user_stylesheet',
|
|
|
|
|
];
|
2022-09-16 21:56:35 +02:00
|
|
|
|
|
2023-08-11 19:22:25 +02:00
|
|
|
|
if ( platform !== 'firefox' ) {
|
|
|
|
|
env.push('native_css_has');
|
|
|
|
|
}
|
|
|
|
|
|
2022-09-06 19:47:52 +02:00
|
|
|
|
/******************************************************************************/
|
|
|
|
|
|
2022-09-18 23:07:02 +02:00
|
|
|
|
const jsonSetMapReplacer = (k, v) => {
|
|
|
|
|
if ( v instanceof Set || v instanceof Map ) {
|
|
|
|
|
if ( v.size === 0 ) { return; }
|
|
|
|
|
return Array.from(v);
|
|
|
|
|
}
|
|
|
|
|
return v;
|
|
|
|
|
};
|
|
|
|
|
|
2022-09-20 02:19:55 +02:00
|
|
|
|
const uidint32 = (s) => {
|
|
|
|
|
const h = createHash('sha256').update(s).digest('hex').slice(0,8);
|
|
|
|
|
return parseInt(h,16) & 0x7FFFFFFF;
|
|
|
|
|
};
|
2022-09-18 23:07:02 +02:00
|
|
|
|
|
2022-09-30 01:51:33 +02:00
|
|
|
|
const hnSort = (a, b) =>
|
|
|
|
|
a.split('.').reverse().join('.').localeCompare(
|
|
|
|
|
b.split('.').reverse().join('.')
|
|
|
|
|
);
|
|
|
|
|
|
2022-09-18 23:07:02 +02:00
|
|
|
|
/******************************************************************************/
|
|
|
|
|
|
2022-09-13 23:44:24 +02:00
|
|
|
|
const stdOutput = [];
|
|
|
|
|
|
|
|
|
|
const log = (text, silent = false) => {
|
|
|
|
|
stdOutput.push(text);
|
|
|
|
|
if ( silent === false ) {
|
|
|
|
|
console.log(text);
|
|
|
|
|
}
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
/******************************************************************************/
|
|
|
|
|
|
2022-09-15 19:14:08 +02:00
|
|
|
|
const urlToFileName = url => {
|
|
|
|
|
return url
|
|
|
|
|
.replace(/^https?:\/\//, '')
|
|
|
|
|
.replace(/\//g, '_')
|
|
|
|
|
;
|
|
|
|
|
};
|
|
|
|
|
|
2024-01-21 20:32:14 +01:00
|
|
|
|
const fetchText = (url, cacheDir) => {
|
2022-09-13 23:44:24 +02:00
|
|
|
|
return new Promise((resolve, reject) => {
|
2022-09-15 19:14:08 +02:00
|
|
|
|
const fname = urlToFileName(url);
|
|
|
|
|
fs.readFile(`${cacheDir}/${fname}`, { encoding: 'utf8' }).then(content => {
|
|
|
|
|
log(`\tFetched local ${url}`);
|
|
|
|
|
resolve({ url, content });
|
|
|
|
|
}).catch(( ) => {
|
|
|
|
|
log(`\tFetching remote ${url}`);
|
|
|
|
|
https.get(url, response => {
|
|
|
|
|
const data = [];
|
|
|
|
|
response.on('data', chunk => {
|
|
|
|
|
data.push(chunk.toString());
|
|
|
|
|
});
|
|
|
|
|
response.on('end', ( ) => {
|
|
|
|
|
const content = data.join('');
|
|
|
|
|
try {
|
|
|
|
|
writeFile(`${cacheDir}/${fname}`, content);
|
|
|
|
|
} catch (ex) {
|
|
|
|
|
}
|
|
|
|
|
resolve({ url, content });
|
|
|
|
|
});
|
|
|
|
|
}).on('error', error => {
|
|
|
|
|
reject(error);
|
2022-09-13 23:44:24 +02:00
|
|
|
|
});
|
|
|
|
|
});
|
|
|
|
|
});
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
/******************************************************************************/
|
|
|
|
|
|
2022-09-15 19:14:08 +02:00
|
|
|
|
const writeFile = async (fname, data) => {
|
|
|
|
|
const dir = path.dirname(fname);
|
|
|
|
|
await fs.mkdir(dir, { recursive: true });
|
2022-09-16 21:56:35 +02:00
|
|
|
|
const promise = fs.writeFile(fname, data);
|
|
|
|
|
writeOps.push(promise);
|
|
|
|
|
return promise;
|
2022-09-15 19:14:08 +02:00
|
|
|
|
};
|
|
|
|
|
|
2022-10-16 18:05:24 +02:00
|
|
|
|
const copyFile = async (from, to) => {
|
|
|
|
|
const dir = path.dirname(to);
|
|
|
|
|
await fs.mkdir(dir, { recursive: true });
|
|
|
|
|
const promise = fs.copyFile(from, to);
|
|
|
|
|
writeOps.push(promise);
|
|
|
|
|
return promise;
|
|
|
|
|
};
|
|
|
|
|
|
2022-09-16 21:56:35 +02:00
|
|
|
|
const writeOps = [];
|
2022-09-15 19:14:08 +02:00
|
|
|
|
|
2022-09-16 21:56:35 +02:00
|
|
|
|
/******************************************************************************/
|
2022-09-06 19:47:52 +02:00
|
|
|
|
|
2022-09-16 21:56:35 +02:00
|
|
|
|
const ruleResources = [];
|
|
|
|
|
const rulesetDetails = [];
|
2022-10-15 19:05:20 +02:00
|
|
|
|
const scriptletStats = new Map();
|
|
|
|
|
const genericDetails = new Map();
|
2022-10-16 18:05:24 +02:00
|
|
|
|
const requiredRedirectResources = new Set();
|
2022-09-13 23:44:24 +02:00
|
|
|
|
|
2022-09-16 21:56:35 +02:00
|
|
|
|
/******************************************************************************/
|
2022-09-06 19:47:52 +02:00
|
|
|
|
|
2024-01-21 20:32:14 +01:00
|
|
|
|
async function fetchList(assetDetails) {
|
2022-09-16 21:56:35 +02:00
|
|
|
|
// Remember fetched URLs
|
|
|
|
|
const fetchedURLs = new Set();
|
|
|
|
|
|
|
|
|
|
// Fetch list and expand `!#include` directives
|
|
|
|
|
let parts = assetDetails.urls.map(url => ({ url }));
|
|
|
|
|
while ( parts.every(v => typeof v === 'string') === false ) {
|
|
|
|
|
const newParts = [];
|
|
|
|
|
for ( const part of parts ) {
|
|
|
|
|
if ( typeof part === 'string' ) {
|
|
|
|
|
newParts.push(part);
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
if ( fetchedURLs.has(part.url) ) {
|
|
|
|
|
newParts.push('');
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
fetchedURLs.add(part.url);
|
2023-06-23 14:27:07 +02:00
|
|
|
|
if ( part.url.startsWith('https://ublockorigin.github.io/uAssets/filters/') ) {
|
|
|
|
|
newParts.push(`!#trusted on ${assetDetails.secret}`);
|
|
|
|
|
}
|
2022-09-16 21:56:35 +02:00
|
|
|
|
newParts.push(
|
2024-01-21 20:32:14 +01:00
|
|
|
|
fetchText(part.url, cacheDir).then(details => {
|
2022-09-16 21:56:35 +02:00
|
|
|
|
const { url } = details;
|
|
|
|
|
const content = details.content.trim();
|
|
|
|
|
if ( typeof content === 'string' && content !== '' ) {
|
|
|
|
|
if (
|
|
|
|
|
content.startsWith('<') === false ||
|
|
|
|
|
content.endsWith('>') === false
|
|
|
|
|
) {
|
|
|
|
|
return { url, content };
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
log(`No valid content for ${details.name}`);
|
|
|
|
|
return { url, content: '' };
|
|
|
|
|
})
|
|
|
|
|
);
|
2023-06-23 14:27:07 +02:00
|
|
|
|
newParts.push(`!#trusted off ${assetDetails.secret}`);
|
2022-09-16 21:56:35 +02:00
|
|
|
|
}
|
|
|
|
|
parts = await Promise.all(newParts);
|
2023-01-23 22:53:18 +01:00
|
|
|
|
parts = sfp.utils.preparser.expandIncludes(parts, env);
|
2022-09-16 21:56:35 +02:00
|
|
|
|
}
|
|
|
|
|
const text = parts.join('\n');
|
2022-09-10 20:20:07 +02:00
|
|
|
|
|
2022-09-16 21:56:35 +02:00
|
|
|
|
if ( text === '' ) {
|
|
|
|
|
log('No filterset found');
|
2022-09-10 20:20:07 +02:00
|
|
|
|
}
|
2022-09-16 21:56:35 +02:00
|
|
|
|
return text;
|
|
|
|
|
}
|
2022-09-10 20:20:07 +02:00
|
|
|
|
|
2022-09-16 21:56:35 +02:00
|
|
|
|
/******************************************************************************/
|
2022-09-10 20:20:07 +02:00
|
|
|
|
|
2022-09-27 13:46:24 +02:00
|
|
|
|
const isUnsupported = rule =>
|
|
|
|
|
rule._error !== undefined;
|
|
|
|
|
|
|
|
|
|
const isRegex = rule =>
|
|
|
|
|
rule.condition !== undefined &&
|
|
|
|
|
rule.condition.regexFilter !== undefined;
|
|
|
|
|
|
2024-01-21 20:32:14 +01:00
|
|
|
|
const isRedirect = rule => {
|
|
|
|
|
if ( rule.action === undefined ) { return false; }
|
|
|
|
|
if ( rule.action.type !== 'redirect' ) { return false; }
|
|
|
|
|
if ( rule.action.redirect?.extensionPath !== undefined ) { return true; }
|
|
|
|
|
if ( rule.action.redirect?.transform?.path !== undefined ) { return true; }
|
|
|
|
|
return false;
|
|
|
|
|
};
|
2022-09-27 13:46:24 +02:00
|
|
|
|
|
2023-07-10 17:56:57 +02:00
|
|
|
|
const isModifyHeaders = rule =>
|
2022-09-27 13:46:24 +02:00
|
|
|
|
rule.action !== undefined &&
|
|
|
|
|
rule.action.type === 'modifyHeaders';
|
|
|
|
|
|
|
|
|
|
const isRemoveparam = rule =>
|
|
|
|
|
rule.action !== undefined &&
|
|
|
|
|
rule.action.type === 'redirect' &&
|
|
|
|
|
rule.action.redirect.transform !== undefined;
|
|
|
|
|
|
|
|
|
|
const isGood = rule =>
|
|
|
|
|
isUnsupported(rule) === false &&
|
|
|
|
|
isRedirect(rule) === false &&
|
2023-07-10 17:56:57 +02:00
|
|
|
|
isModifyHeaders(rule) === false &&
|
2022-09-27 13:46:24 +02:00
|
|
|
|
isRemoveparam(rule) === false;
|
|
|
|
|
|
|
|
|
|
/******************************************************************************/
|
|
|
|
|
|
2023-08-12 02:42:03 +02:00
|
|
|
|
// Two distinct hostnames:
|
|
|
|
|
// www.example.com
|
|
|
|
|
// example.com
|
|
|
|
|
// Can be reduced to a single one:
|
|
|
|
|
// example.com
|
|
|
|
|
// Since if example.com matches, then www.example.com (or any other subdomain
|
|
|
|
|
// of example.com) will always match.
|
|
|
|
|
|
|
|
|
|
function pruneHostnameArray(hostnames) {
|
|
|
|
|
const rootMap = new Map();
|
|
|
|
|
for ( const hostname of hostnames ) {
|
|
|
|
|
const labels = hostname.split('.');
|
|
|
|
|
let currentMap = rootMap;
|
|
|
|
|
let i = labels.length;
|
|
|
|
|
while ( i-- ) {
|
|
|
|
|
const label = labels[i];
|
|
|
|
|
let nextMap = currentMap.get(label);
|
|
|
|
|
if ( nextMap === null ) { break; }
|
|
|
|
|
if ( nextMap === undefined ) {
|
|
|
|
|
if ( i === 0 ) {
|
|
|
|
|
currentMap.set(label, (nextMap = null));
|
|
|
|
|
} else {
|
|
|
|
|
currentMap.set(label, (nextMap = new Map()));
|
|
|
|
|
}
|
|
|
|
|
} else if ( i === 0 ) {
|
|
|
|
|
currentMap.set(label, null);
|
|
|
|
|
}
|
|
|
|
|
currentMap = nextMap;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
const assemble = (currentMap, currentHostname, out) => {
|
|
|
|
|
for ( const [ label, nextMap ] of currentMap ) {
|
|
|
|
|
const nextHostname = currentHostname === ''
|
|
|
|
|
? label
|
|
|
|
|
: `${label}.${currentHostname}`;
|
|
|
|
|
if ( nextMap === null ) {
|
|
|
|
|
out.push(nextHostname);
|
|
|
|
|
} else {
|
|
|
|
|
assemble(nextMap, nextHostname, out);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
return out;
|
|
|
|
|
};
|
|
|
|
|
return assemble(rootMap, '', []);
|
|
|
|
|
}
|
|
|
|
|
|
2023-12-09 17:02:20 +01:00
|
|
|
|
/*******************************************************************************
|
|
|
|
|
*
|
2023-12-11 15:29:59 +01:00
|
|
|
|
* For large rulesets, one rule per line for compromise between size and
|
|
|
|
|
* readability. This also means that the number of lines in resulting file
|
|
|
|
|
* representative of the number of rules in the ruleset.
|
2023-12-09 17:02:20 +01:00
|
|
|
|
*
|
|
|
|
|
* */
|
|
|
|
|
|
|
|
|
|
function toJSONRuleset(ruleset) {
|
2022-09-06 19:47:52 +02:00
|
|
|
|
const replacer = (k, v) => {
|
2022-09-27 16:57:43 +02:00
|
|
|
|
if ( k.startsWith('_') ) { return; }
|
2022-09-06 19:47:52 +02:00
|
|
|
|
if ( Array.isArray(v) ) {
|
|
|
|
|
return v.sort();
|
|
|
|
|
}
|
|
|
|
|
if ( v instanceof Object ) {
|
|
|
|
|
const sorted = {};
|
|
|
|
|
for ( const kk of Object.keys(v).sort() ) {
|
|
|
|
|
sorted[kk] = v[kk];
|
|
|
|
|
}
|
|
|
|
|
return sorted;
|
|
|
|
|
}
|
|
|
|
|
return v;
|
|
|
|
|
};
|
2023-12-11 15:29:59 +01:00
|
|
|
|
const indent = ruleset.length > 10 ? undefined : 1;
|
2023-12-09 17:02:20 +01:00
|
|
|
|
const out = [];
|
|
|
|
|
for ( const rule of ruleset ) {
|
2023-12-11 15:29:59 +01:00
|
|
|
|
out.push(JSON.stringify(rule, replacer, indent));
|
2023-12-09 17:02:20 +01:00
|
|
|
|
}
|
|
|
|
|
return `[\n${out.join(',\n')}\n]\n`;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/******************************************************************************/
|
2022-09-06 19:47:52 +02:00
|
|
|
|
|
2023-12-09 17:02:20 +01:00
|
|
|
|
async function processNetworkFilters(assetDetails, network) {
|
2022-09-16 21:56:35 +02:00
|
|
|
|
const { ruleset: rules } = network;
|
|
|
|
|
log(`Input filter count: ${network.filterCount}`);
|
|
|
|
|
log(`\tAccepted filter count: ${network.acceptedFilterCount}`);
|
|
|
|
|
log(`\tRejected filter count: ${network.rejectedFilterCount}`);
|
|
|
|
|
log(`Output rule count: ${rules.length}`);
|
2022-09-06 19:47:52 +02:00
|
|
|
|
|
2023-08-12 02:42:03 +02:00
|
|
|
|
// https://developer.mozilla.org/en-US/docs/Mozilla/Add-ons/WebExtensions/API/declarativeNetRequest/RuleCondition#browser_compatibility
|
2023-08-19 13:48:14 +02:00
|
|
|
|
// isUrlFilterCaseSensitive is true by default in Chromium. It will be
|
2023-08-12 02:42:03 +02:00
|
|
|
|
// false by default in Chromium 118+.
|
2023-08-19 13:48:14 +02:00
|
|
|
|
if ( platform !== 'firefox' ) {
|
2023-08-12 02:42:03 +02:00
|
|
|
|
for ( const rule of rules ) {
|
2023-08-19 13:48:14 +02:00
|
|
|
|
const { condition } = rule;
|
|
|
|
|
if ( condition === undefined ) { continue; }
|
|
|
|
|
if ( condition.urlFilter === undefined ) {
|
|
|
|
|
if ( condition.regexFilter === undefined ) { continue; }
|
2023-08-12 02:42:03 +02:00
|
|
|
|
}
|
2023-08-19 13:48:14 +02:00
|
|
|
|
if ( condition.isUrlFilterCaseSensitive === undefined ) {
|
|
|
|
|
condition.isUrlFilterCaseSensitive = false;
|
|
|
|
|
} else if ( condition.isUrlFilterCaseSensitive === true ) {
|
|
|
|
|
condition.isUrlFilterCaseSensitive = undefined;
|
2023-08-12 02:42:03 +02:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Minimize requestDomains arrays
|
|
|
|
|
for ( const rule of rules ) {
|
|
|
|
|
const condition = rule.condition;
|
|
|
|
|
if ( condition === undefined ) { continue; }
|
|
|
|
|
const requestDomains = condition.requestDomains;
|
|
|
|
|
if ( requestDomains === undefined ) { continue; }
|
|
|
|
|
const beforeCount = requestDomains.length;
|
|
|
|
|
condition.requestDomains = pruneHostnameArray(requestDomains);
|
|
|
|
|
const afterCount = condition.requestDomains.length;
|
|
|
|
|
if ( afterCount !== beforeCount ) {
|
|
|
|
|
log(`\tPruning requestDomains: from ${beforeCount} to ${afterCount}`);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2024-01-21 20:32:14 +01:00
|
|
|
|
// Add native DNR ruleset if present
|
|
|
|
|
if ( assetDetails.dnrURL ) {
|
|
|
|
|
const result = await fetchText(assetDetails.dnrURL, cacheDir);
|
|
|
|
|
for ( const rule of JSON.parse(result.content) ) {
|
|
|
|
|
rules.push(rule);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2022-09-30 01:51:33 +02:00
|
|
|
|
const plainGood = rules.filter(rule => isGood(rule) && isRegex(rule) === false);
|
|
|
|
|
log(`\tPlain good: ${plainGood.length}`);
|
2023-05-26 19:18:20 +02:00
|
|
|
|
log(plainGood
|
|
|
|
|
.filter(rule => Array.isArray(rule._warning))
|
|
|
|
|
.map(rule => rule._warning.map(v => `\t\t${v}`))
|
|
|
|
|
.join('\n'),
|
|
|
|
|
true
|
|
|
|
|
);
|
2022-09-13 23:44:24 +02:00
|
|
|
|
|
2022-09-16 21:56:35 +02:00
|
|
|
|
const regexes = rules.filter(rule => isGood(rule) && isRegex(rule));
|
|
|
|
|
log(`\tMaybe good (regexes): ${regexes.length}`);
|
2022-09-13 23:44:24 +02:00
|
|
|
|
|
2022-09-16 21:56:35 +02:00
|
|
|
|
const redirects = rules.filter(rule =>
|
|
|
|
|
isUnsupported(rule) === false &&
|
|
|
|
|
isRedirect(rule)
|
|
|
|
|
);
|
2022-10-16 18:05:24 +02:00
|
|
|
|
redirects.forEach(rule => {
|
2024-01-21 20:32:14 +01:00
|
|
|
|
if ( rule.action.redirect.extensionPath === undefined ) { return; }
|
2022-10-16 18:05:24 +02:00
|
|
|
|
requiredRedirectResources.add(
|
|
|
|
|
rule.action.redirect.extensionPath.replace(/^\/+/, '')
|
|
|
|
|
);
|
|
|
|
|
});
|
|
|
|
|
log(`\tredirect=: ${redirects.length}`);
|
2022-09-06 19:47:52 +02:00
|
|
|
|
|
2022-09-30 01:51:33 +02:00
|
|
|
|
const removeparamsGood = rules.filter(rule =>
|
|
|
|
|
isUnsupported(rule) === false && isRemoveparam(rule)
|
2022-09-16 21:56:35 +02:00
|
|
|
|
);
|
2022-09-30 01:51:33 +02:00
|
|
|
|
const removeparamsBad = rules.filter(rule =>
|
|
|
|
|
isUnsupported(rule) && isRemoveparam(rule)
|
|
|
|
|
);
|
|
|
|
|
log(`\tremoveparams= (accepted/discarded): ${removeparamsGood.length}/${removeparamsBad.length}`);
|
2022-09-06 19:47:52 +02:00
|
|
|
|
|
2023-07-10 17:56:57 +02:00
|
|
|
|
const modifyHeaders = rules.filter(rule =>
|
2022-11-05 16:09:06 +01:00
|
|
|
|
isUnsupported(rule) === false &&
|
2023-07-10 17:56:57 +02:00
|
|
|
|
isModifyHeaders(rule)
|
2022-11-05 16:09:06 +01:00
|
|
|
|
);
|
2023-07-10 17:56:57 +02:00
|
|
|
|
log(`\tmodifyHeaders=: ${modifyHeaders.length}`);
|
2022-11-05 16:09:06 +01:00
|
|
|
|
|
2022-09-16 21:56:35 +02:00
|
|
|
|
const bad = rules.filter(rule =>
|
|
|
|
|
isUnsupported(rule)
|
|
|
|
|
);
|
|
|
|
|
log(`\tUnsupported: ${bad.length}`);
|
2022-09-30 01:51:33 +02:00
|
|
|
|
log(bad.map(rule => rule._error.map(v => `\t\t${v}`)).join('\n'), true);
|
2022-09-06 19:47:52 +02:00
|
|
|
|
|
2022-09-16 21:56:35 +02:00
|
|
|
|
writeFile(
|
2022-10-15 19:05:20 +02:00
|
|
|
|
`${rulesetDir}/main/${assetDetails.id}.json`,
|
2023-12-09 17:02:20 +01:00
|
|
|
|
toJSONRuleset(plainGood)
|
2022-09-16 21:56:35 +02:00
|
|
|
|
);
|
2022-09-06 19:47:52 +02:00
|
|
|
|
|
2022-09-16 21:56:35 +02:00
|
|
|
|
if ( regexes.length !== 0 ) {
|
|
|
|
|
writeFile(
|
2022-10-16 18:05:24 +02:00
|
|
|
|
`${rulesetDir}/regex/${assetDetails.id}.json`,
|
2023-12-09 17:02:20 +01:00
|
|
|
|
toJSONRuleset(regexes)
|
2022-09-06 19:47:52 +02:00
|
|
|
|
);
|
2022-09-16 21:56:35 +02:00
|
|
|
|
}
|
2022-09-06 19:47:52 +02:00
|
|
|
|
|
2022-09-30 01:51:33 +02:00
|
|
|
|
if ( removeparamsGood.length !== 0 ) {
|
|
|
|
|
writeFile(
|
2022-10-16 18:05:24 +02:00
|
|
|
|
`${rulesetDir}/removeparam/${assetDetails.id}.json`,
|
2023-12-09 17:02:20 +01:00
|
|
|
|
toJSONRuleset(removeparamsGood)
|
2022-09-30 01:51:33 +02:00
|
|
|
|
);
|
|
|
|
|
}
|
|
|
|
|
|
2022-10-16 18:05:24 +02:00
|
|
|
|
if ( redirects.length !== 0 ) {
|
|
|
|
|
writeFile(
|
|
|
|
|
`${rulesetDir}/redirect/${assetDetails.id}.json`,
|
2023-12-09 17:02:20 +01:00
|
|
|
|
toJSONRuleset(redirects)
|
2022-10-16 18:05:24 +02:00
|
|
|
|
);
|
|
|
|
|
}
|
|
|
|
|
|
2023-07-10 17:56:57 +02:00
|
|
|
|
if ( modifyHeaders.length !== 0 ) {
|
2022-11-05 16:09:06 +01:00
|
|
|
|
writeFile(
|
2023-07-10 17:56:57 +02:00
|
|
|
|
`${rulesetDir}/modify-headers/${assetDetails.id}.json`,
|
2023-12-09 17:02:20 +01:00
|
|
|
|
toJSONRuleset(modifyHeaders)
|
2022-11-05 16:09:06 +01:00
|
|
|
|
);
|
|
|
|
|
}
|
|
|
|
|
|
2022-09-16 21:56:35 +02:00
|
|
|
|
return {
|
|
|
|
|
total: rules.length,
|
2022-09-30 01:51:33 +02:00
|
|
|
|
plain: plainGood.length,
|
2022-11-05 16:09:06 +01:00
|
|
|
|
discarded: removeparamsBad.length,
|
2022-09-16 21:56:35 +02:00
|
|
|
|
rejected: bad.length,
|
2022-10-16 18:05:24 +02:00
|
|
|
|
regex: regexes.length,
|
|
|
|
|
removeparam: removeparamsGood.length,
|
|
|
|
|
redirect: redirects.length,
|
2023-07-10 17:56:57 +02:00
|
|
|
|
modifyHeaders: modifyHeaders.length,
|
2022-09-16 21:56:35 +02:00
|
|
|
|
};
|
|
|
|
|
}
|
2022-09-06 19:47:52 +02:00
|
|
|
|
|
2022-09-16 21:56:35 +02:00
|
|
|
|
/******************************************************************************/
|
|
|
|
|
|
2022-09-19 14:55:45 +02:00
|
|
|
|
// TODO: unify css/scriptlet processing code since now css styles are
|
|
|
|
|
// injected using scriptlet injection.
|
|
|
|
|
|
|
|
|
|
// Load all available scriptlets into a key-val map, where the key is the
|
|
|
|
|
// scriptlet token, and val is the whole content of the file.
|
|
|
|
|
|
|
|
|
|
let scriptletsMapPromise;
|
|
|
|
|
|
|
|
|
|
function loadAllSourceScriptlets() {
|
|
|
|
|
if ( scriptletsMapPromise !== undefined ) {
|
|
|
|
|
return scriptletsMapPromise;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
scriptletsMapPromise = fs.readdir('./scriptlets').then(files => {
|
2023-06-04 17:32:55 +02:00
|
|
|
|
const readTemplateFile = file =>
|
|
|
|
|
fs.readFile(`./scriptlets/${file}`, { encoding: 'utf8' })
|
|
|
|
|
.then(text => ({ file, text }));
|
2022-09-19 14:55:45 +02:00
|
|
|
|
const readPromises = [];
|
|
|
|
|
for ( const file of files ) {
|
2023-06-04 17:32:55 +02:00
|
|
|
|
readPromises.push(readTemplateFile(file));
|
2022-09-19 14:55:45 +02:00
|
|
|
|
}
|
|
|
|
|
return Promise.all(readPromises).then(results => {
|
|
|
|
|
const originalScriptletMap = new Map();
|
2023-06-04 17:32:55 +02:00
|
|
|
|
for ( const details of results ) {
|
|
|
|
|
originalScriptletMap.set(
|
2023-07-06 21:45:45 +02:00
|
|
|
|
details.file.replace('.template.js', '')
|
|
|
|
|
.replace('.template.css', ''),
|
2023-06-04 17:32:55 +02:00
|
|
|
|
details.text
|
|
|
|
|
);
|
2022-09-19 14:55:45 +02:00
|
|
|
|
}
|
|
|
|
|
return originalScriptletMap;
|
|
|
|
|
});
|
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
return scriptletsMapPromise;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/******************************************************************************/
|
|
|
|
|
|
2023-07-11 20:38:35 +02:00
|
|
|
|
async function processGenericCosmeticFilters(assetDetails, bucketsMap, exceptionSet) {
|
2023-06-04 03:47:40 +02:00
|
|
|
|
if ( bucketsMap === undefined ) { return 0; }
|
2023-07-11 20:38:35 +02:00
|
|
|
|
if ( exceptionSet ) {
|
|
|
|
|
for ( const [ hash, selectors ] of bucketsMap ) {
|
|
|
|
|
let i = selectors.length;
|
|
|
|
|
while ( i-- ) {
|
|
|
|
|
const selector = selectors[i];
|
|
|
|
|
if ( exceptionSet.has(selector) === false ) { continue; }
|
|
|
|
|
selectors.splice(i, 1);
|
|
|
|
|
//log(`\tRemoving excepted generic filter ##${selector}`);
|
|
|
|
|
}
|
|
|
|
|
if ( selectors.length === 0 ) {
|
|
|
|
|
bucketsMap.delete(hash);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
2023-06-04 03:47:40 +02:00
|
|
|
|
if ( bucketsMap.size === 0 ) { return 0; }
|
2022-10-10 18:28:24 +02:00
|
|
|
|
const bucketsList = Array.from(bucketsMap);
|
|
|
|
|
const count = bucketsList.reduce((a, v) => a += v[1].length, 0);
|
2023-06-04 03:47:40 +02:00
|
|
|
|
if ( count === 0 ) { return 0; }
|
2022-10-10 18:28:24 +02:00
|
|
|
|
const selectorLists = bucketsList.map(v => [ v[0], v[1].join(',') ]);
|
|
|
|
|
const originalScriptletMap = await loadAllSourceScriptlets();
|
|
|
|
|
|
2023-06-06 02:17:50 +02:00
|
|
|
|
let patchedScriptlet = originalScriptletMap.get('css-generic').replace(
|
|
|
|
|
'$rulesetId$',
|
|
|
|
|
assetDetails.id
|
|
|
|
|
);
|
|
|
|
|
patchedScriptlet = safeReplace(patchedScriptlet,
|
|
|
|
|
/\bself\.\$genericSelectorMap\$/,
|
|
|
|
|
`${JSON.stringify(selectorLists, scriptletJsonReplacer)}`
|
|
|
|
|
);
|
2022-10-10 18:28:24 +02:00
|
|
|
|
|
|
|
|
|
writeFile(
|
[mv3] Add ability to handle entity-based CSS and scriptlet injection filters
This commit adds the ability to inject entity-based plain CSS
filters and also a set of the most commonly used entity-based
scriptlet injection filters.
Since the scripting API is not compatible with entity patterns,
the entity-related content scripts are injected in all documents
and the entity-matching is done by the content script themselves.
Given this, entity-based content scripts are enabled only when
working in the Complete filtering mode, there won't be any
entity-based filters injected in lower modes.
Also, since there is no way to reasonably have access to the
Public Suffix List in the content scripts, the entity-matching
algorithm is an approximation, though I expect false positives
to be rare (time will tell). In the event of such false
positive, simply falling back to Optimal mode will fix the
issue.
The following issues have been fixed at the same time:
Fixed the no-filtering mode related rules having lower priority
then redirect rules, i.e. redirect rules would still be applied
despite disabling all filtering on a site.
Fixed improper detection of changes to the generic-related CSS
content script, potentially causing undue delays when for example
trying to access the popup panel while working in Complete mode.
The scripting MV3 can be quite slow when registering/updating
large content scripts, so uBOL does its best to call the API only
if really needed, but there had been a regression in the recent
builds preventing uBO from properly detecting unchanged content
script parameters.
2022-10-20 21:48:06 +02:00
|
|
|
|
`${scriptletDir}/generic/${assetDetails.id}.js`,
|
2022-10-10 18:28:24 +02:00
|
|
|
|
patchedScriptlet
|
|
|
|
|
);
|
|
|
|
|
|
|
|
|
|
log(`CSS-generic: ${count} plain CSS selectors`);
|
|
|
|
|
|
2023-06-04 03:47:40 +02:00
|
|
|
|
return count;
|
2022-10-10 18:28:24 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/******************************************************************************/
|
|
|
|
|
|
2023-07-11 20:38:35 +02:00
|
|
|
|
async function processGenericHighCosmeticFilters(assetDetails, selectorSet, exceptionSet) {
|
2023-07-06 21:45:45 +02:00
|
|
|
|
if ( selectorSet === undefined ) { return 0; }
|
2023-07-11 20:38:35 +02:00
|
|
|
|
if ( exceptionSet ) {
|
|
|
|
|
for ( const selector of selectorSet ) {
|
|
|
|
|
if ( exceptionSet.has(selector) === false ) { continue; }
|
|
|
|
|
selectorSet.delete(selector);
|
|
|
|
|
//log(`\tRemoving excepted generic filter ##${selector}`);
|
|
|
|
|
}
|
|
|
|
|
}
|
2023-07-06 21:45:45 +02:00
|
|
|
|
if ( selectorSet.size === 0 ) { return 0; }
|
|
|
|
|
const selectorLists = Array.from(selectorSet).sort().join(',\n');
|
|
|
|
|
const originalScriptletMap = await loadAllSourceScriptlets();
|
|
|
|
|
|
|
|
|
|
let patchedScriptlet = originalScriptletMap.get('css-generichigh').replace(
|
|
|
|
|
'$rulesetId$',
|
|
|
|
|
assetDetails.id
|
|
|
|
|
);
|
|
|
|
|
patchedScriptlet = safeReplace(patchedScriptlet,
|
|
|
|
|
/\$selectorList\$/,
|
|
|
|
|
selectorLists
|
|
|
|
|
);
|
|
|
|
|
|
|
|
|
|
writeFile(
|
|
|
|
|
`${scriptletDir}/generichigh/${assetDetails.id}.css`,
|
|
|
|
|
patchedScriptlet
|
|
|
|
|
);
|
|
|
|
|
|
|
|
|
|
log(`CSS-generic-high: ${selectorSet.size} plain CSS selectors`);
|
|
|
|
|
|
|
|
|
|
return selectorSet.size;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/******************************************************************************/
|
|
|
|
|
|
2022-09-24 17:33:04 +02:00
|
|
|
|
// This merges selectors which are used by the same hostnames
|
|
|
|
|
|
2022-10-15 19:05:20 +02:00
|
|
|
|
function groupSelectorsByHostnames(mapin) {
|
2022-09-24 17:33:04 +02:00
|
|
|
|
if ( mapin === undefined ) { return []; }
|
|
|
|
|
const merged = new Map();
|
|
|
|
|
for ( const [ selector, details ] of mapin ) {
|
2022-10-15 19:05:20 +02:00
|
|
|
|
if ( details.rejected ) { continue; }
|
2022-09-24 17:33:04 +02:00
|
|
|
|
const json = JSON.stringify(details);
|
|
|
|
|
let entries = merged.get(json);
|
|
|
|
|
if ( entries === undefined ) {
|
|
|
|
|
entries = new Set();
|
|
|
|
|
merged.set(json, entries);
|
2022-09-18 23:07:02 +02:00
|
|
|
|
}
|
2022-09-24 17:33:04 +02:00
|
|
|
|
entries.add(selector);
|
|
|
|
|
}
|
|
|
|
|
const out = [];
|
|
|
|
|
for ( const [ json, entries ] of merged ) {
|
|
|
|
|
const details = JSON.parse(json);
|
|
|
|
|
details.selectors = Array.from(entries).sort();
|
|
|
|
|
out.push(details);
|
|
|
|
|
}
|
|
|
|
|
return out;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// This merges hostnames which have the same set of selectors.
|
|
|
|
|
//
|
|
|
|
|
// Also, we sort the hostnames to increase likelihood that selector with
|
|
|
|
|
// same hostnames will end up in same generated scriptlet.
|
|
|
|
|
|
2022-10-15 19:05:20 +02:00
|
|
|
|
function groupHostnamesBySelectors(arrayin) {
|
2022-09-24 17:33:04 +02:00
|
|
|
|
const contentMap = new Map();
|
|
|
|
|
for ( const entry of arrayin ) {
|
|
|
|
|
const id = uidint32(JSON.stringify(entry.selectors));
|
|
|
|
|
let details = contentMap.get(id);
|
2022-09-19 14:55:45 +02:00
|
|
|
|
if ( details === undefined ) {
|
2022-09-24 17:33:04 +02:00
|
|
|
|
details = { a: entry.selectors };
|
|
|
|
|
contentMap.set(id, details);
|
2022-09-17 14:26:41 +02:00
|
|
|
|
}
|
2022-09-18 15:31:44 +02:00
|
|
|
|
if ( entry.matches !== undefined ) {
|
2022-09-19 14:55:45 +02:00
|
|
|
|
if ( details.y === undefined ) {
|
|
|
|
|
details.y = new Set();
|
2022-09-18 15:31:44 +02:00
|
|
|
|
}
|
2022-09-17 14:26:41 +02:00
|
|
|
|
for ( const hn of entry.matches ) {
|
2022-09-19 14:55:45 +02:00
|
|
|
|
details.y.add(hn);
|
2022-09-17 14:26:41 +02:00
|
|
|
|
}
|
|
|
|
|
}
|
2022-09-18 15:31:44 +02:00
|
|
|
|
if ( entry.excludeMatches !== undefined ) {
|
2022-09-19 14:55:45 +02:00
|
|
|
|
if ( details.n === undefined ) {
|
|
|
|
|
details.n = new Set();
|
2022-09-18 15:31:44 +02:00
|
|
|
|
}
|
2022-09-17 14:26:41 +02:00
|
|
|
|
for ( const hn of entry.excludeMatches ) {
|
2022-09-19 14:55:45 +02:00
|
|
|
|
details.n.add(hn);
|
2022-09-17 14:26:41 +02:00
|
|
|
|
}
|
|
|
|
|
}
|
2022-09-16 21:56:35 +02:00
|
|
|
|
}
|
2022-09-24 17:33:04 +02:00
|
|
|
|
const out = Array.from(contentMap).map(a => [
|
|
|
|
|
a[0], {
|
|
|
|
|
a: a[1].a,
|
2023-06-04 17:32:55 +02:00
|
|
|
|
y: a[1].y ? Array.from(a[1].y).sort(hnSort) : '*',
|
2022-09-24 17:33:04 +02:00
|
|
|
|
n: a[1].n ? Array.from(a[1].n) : undefined,
|
|
|
|
|
}
|
|
|
|
|
]).sort((a, b) => {
|
|
|
|
|
const ha = Array.isArray(a[1].y) ? a[1].y[0] : '*';
|
|
|
|
|
const hb = Array.isArray(b[1].y) ? b[1].y[0] : '*';
|
|
|
|
|
return hnSort(ha, hb);
|
|
|
|
|
});
|
|
|
|
|
return out;
|
|
|
|
|
}
|
2022-09-16 21:56:35 +02:00
|
|
|
|
|
2022-09-24 17:33:04 +02:00
|
|
|
|
const scriptletHostnameToIdMap = (hostnames, id, map) => {
|
|
|
|
|
for ( const hn of hostnames ) {
|
|
|
|
|
const existing = map.get(hn);
|
|
|
|
|
if ( existing === undefined ) {
|
|
|
|
|
map.set(hn, id);
|
|
|
|
|
} else if ( Array.isArray(existing) ) {
|
|
|
|
|
existing.push(id);
|
|
|
|
|
} else {
|
|
|
|
|
map.set(hn, [ existing, id ]);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
const scriptletJsonReplacer = (k, v) => {
|
|
|
|
|
if ( k === 'n' ) {
|
|
|
|
|
if ( v === undefined || v.size === 0 ) { return; }
|
|
|
|
|
return Array.from(v);
|
|
|
|
|
}
|
|
|
|
|
if ( v instanceof Set || v instanceof Map ) {
|
|
|
|
|
if ( v.size === 0 ) { return; }
|
|
|
|
|
return Array.from(v);
|
|
|
|
|
}
|
|
|
|
|
return v;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
/******************************************************************************/
|
|
|
|
|
|
2022-10-15 19:05:20 +02:00
|
|
|
|
function argsMap2List(argsMap, hostnamesMap) {
|
|
|
|
|
const argsList = [];
|
|
|
|
|
const indexMap = new Map();
|
|
|
|
|
for ( const [ id, details ] of argsMap ) {
|
|
|
|
|
indexMap.set(id, argsList.length);
|
|
|
|
|
argsList.push(details);
|
|
|
|
|
}
|
|
|
|
|
for ( const [ hn, ids ] of hostnamesMap ) {
|
|
|
|
|
if ( typeof ids === 'number' ) {
|
|
|
|
|
hostnamesMap.set(hn, indexMap.get(ids));
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
for ( let i = 0; i < ids.length; i++ ) {
|
|
|
|
|
ids[i] = indexMap.get(ids[i]);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
return argsList;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/******************************************************************************/
|
|
|
|
|
|
2022-09-24 17:33:04 +02:00
|
|
|
|
async function processCosmeticFilters(assetDetails, mapin) {
|
2023-06-04 03:47:40 +02:00
|
|
|
|
if ( mapin === undefined ) { return 0; }
|
|
|
|
|
if ( mapin.size === 0 ) { return 0; }
|
2022-09-24 17:33:04 +02:00
|
|
|
|
|
[mv3] Add ability to handle entity-based CSS and scriptlet injection filters
This commit adds the ability to inject entity-based plain CSS
filters and also a set of the most commonly used entity-based
scriptlet injection filters.
Since the scripting API is not compatible with entity patterns,
the entity-related content scripts are injected in all documents
and the entity-matching is done by the content script themselves.
Given this, entity-based content scripts are enabled only when
working in the Complete filtering mode, there won't be any
entity-based filters injected in lower modes.
Also, since there is no way to reasonably have access to the
Public Suffix List in the content scripts, the entity-matching
algorithm is an approximation, though I expect false positives
to be rare (time will tell). In the event of such false
positive, simply falling back to Optimal mode will fix the
issue.
The following issues have been fixed at the same time:
Fixed the no-filtering mode related rules having lower priority
then redirect rules, i.e. redirect rules would still be applied
despite disabling all filtering on a site.
Fixed improper detection of changes to the generic-related CSS
content script, potentially causing undue delays when for example
trying to access the popup panel while working in Complete mode.
The scripting MV3 can be quite slow when registering/updating
large content scripts, so uBOL does its best to call the API only
if really needed, but there had been a regression in the recent
builds preventing uBO from properly detecting unchanged content
script parameters.
2022-10-20 21:48:06 +02:00
|
|
|
|
const domainBasedEntries = groupHostnamesBySelectors(
|
2023-06-04 03:47:40 +02:00
|
|
|
|
groupSelectorsByHostnames(mapin)
|
2022-09-24 17:33:04 +02:00
|
|
|
|
);
|
|
|
|
|
// We do not want more than n CSS files per subscription, so we will
|
2022-09-19 14:55:45 +02:00
|
|
|
|
// group multiple unrelated selectors in the same file, and distinct
|
|
|
|
|
// css declarations will be injected programmatically according to the
|
|
|
|
|
// hostname of the current document.
|
|
|
|
|
//
|
|
|
|
|
// The cosmetic filters will be injected programmatically as content
|
|
|
|
|
// script and the decisions to activate the cosmetic filters will be
|
|
|
|
|
// done at injection time according to the document's hostname.
|
2022-09-24 17:33:04 +02:00
|
|
|
|
const generatedFiles = [];
|
2022-09-19 14:55:45 +02:00
|
|
|
|
|
2023-06-04 03:47:40 +02:00
|
|
|
|
const argsMap = domainBasedEntries.map(entry => [
|
|
|
|
|
entry[0],
|
|
|
|
|
{
|
|
|
|
|
a: entry[1].a ? entry[1].a.join(',\n') : undefined,
|
|
|
|
|
n: entry[1].n
|
2022-09-19 14:55:45 +02:00
|
|
|
|
}
|
2023-06-04 03:47:40 +02:00
|
|
|
|
]);
|
|
|
|
|
const hostnamesMap = new Map();
|
|
|
|
|
for ( const [ id, details ] of domainBasedEntries ) {
|
|
|
|
|
if ( details.y === undefined ) { continue; }
|
|
|
|
|
scriptletHostnameToIdMap(details.y, id, hostnamesMap);
|
|
|
|
|
}
|
|
|
|
|
const argsList = argsMap2List(argsMap, hostnamesMap);
|
|
|
|
|
const entitiesMap = new Map();
|
|
|
|
|
for ( const [ hn, details ] of hostnamesMap ) {
|
|
|
|
|
if ( hn.endsWith('.*') === false ) { continue; }
|
|
|
|
|
hostnamesMap.delete(hn);
|
|
|
|
|
entitiesMap.set(hn.slice(0, -2), details);
|
2022-09-24 17:33:04 +02:00
|
|
|
|
}
|
2022-09-19 14:55:45 +02:00
|
|
|
|
|
2023-06-04 03:47:40 +02:00
|
|
|
|
// Extract exceptions from argsList, simplify argsList entries
|
|
|
|
|
const exceptionsMap = new Map();
|
|
|
|
|
for ( let i = 0; i < argsList.length; i++ ) {
|
|
|
|
|
const details = argsList[i];
|
|
|
|
|
if ( details.n ) {
|
|
|
|
|
for ( const hn of details.n ) {
|
|
|
|
|
if ( exceptionsMap.has(hn) === false ) {
|
|
|
|
|
exceptionsMap.set(hn, []);
|
|
|
|
|
}
|
|
|
|
|
exceptionsMap.get(hn).push(i);
|
[mv3] Add ability to handle entity-based CSS and scriptlet injection filters
This commit adds the ability to inject entity-based plain CSS
filters and also a set of the most commonly used entity-based
scriptlet injection filters.
Since the scripting API is not compatible with entity patterns,
the entity-related content scripts are injected in all documents
and the entity-matching is done by the content script themselves.
Given this, entity-based content scripts are enabled only when
working in the Complete filtering mode, there won't be any
entity-based filters injected in lower modes.
Also, since there is no way to reasonably have access to the
Public Suffix List in the content scripts, the entity-matching
algorithm is an approximation, though I expect false positives
to be rare (time will tell). In the event of such false
positive, simply falling back to Optimal mode will fix the
issue.
The following issues have been fixed at the same time:
Fixed the no-filtering mode related rules having lower priority
then redirect rules, i.e. redirect rules would still be applied
despite disabling all filtering on a site.
Fixed improper detection of changes to the generic-related CSS
content script, potentially causing undue delays when for example
trying to access the popup panel while working in Complete mode.
The scripting MV3 can be quite slow when registering/updating
large content scripts, so uBOL does its best to call the API only
if really needed, but there had been a regression in the recent
builds preventing uBO from properly detecting unchanged content
script parameters.
2022-10-20 21:48:06 +02:00
|
|
|
|
}
|
|
|
|
|
}
|
2023-06-04 03:47:40 +02:00
|
|
|
|
argsList[i] = details.a;
|
[mv3] Add ability to handle entity-based CSS and scriptlet injection filters
This commit adds the ability to inject entity-based plain CSS
filters and also a set of the most commonly used entity-based
scriptlet injection filters.
Since the scripting API is not compatible with entity patterns,
the entity-related content scripts are injected in all documents
and the entity-matching is done by the content script themselves.
Given this, entity-based content scripts are enabled only when
working in the Complete filtering mode, there won't be any
entity-based filters injected in lower modes.
Also, since there is no way to reasonably have access to the
Public Suffix List in the content scripts, the entity-matching
algorithm is an approximation, though I expect false positives
to be rare (time will tell). In the event of such false
positive, simply falling back to Optimal mode will fix the
issue.
The following issues have been fixed at the same time:
Fixed the no-filtering mode related rules having lower priority
then redirect rules, i.e. redirect rules would still be applied
despite disabling all filtering on a site.
Fixed improper detection of changes to the generic-related CSS
content script, potentially causing undue delays when for example
trying to access the popup panel while working in Complete mode.
The scripting MV3 can be quite slow when registering/updating
large content scripts, so uBOL does its best to call the API only
if really needed, but there had been a regression in the recent
builds preventing uBO from properly detecting unchanged content
script parameters.
2022-10-20 21:48:06 +02:00
|
|
|
|
}
|
|
|
|
|
|
2023-06-04 17:32:55 +02:00
|
|
|
|
const originalScriptletMap = await loadAllSourceScriptlets();
|
2023-06-06 02:17:50 +02:00
|
|
|
|
let patchedScriptlet = originalScriptletMap.get('css-specific').replace(
|
|
|
|
|
'$rulesetId$',
|
|
|
|
|
assetDetails.id
|
|
|
|
|
);
|
|
|
|
|
patchedScriptlet = safeReplace(patchedScriptlet,
|
|
|
|
|
/\bself\.\$argsList\$/,
|
|
|
|
|
`${JSON.stringify(argsList, scriptletJsonReplacer)}`
|
|
|
|
|
);
|
|
|
|
|
patchedScriptlet = safeReplace(patchedScriptlet,
|
|
|
|
|
/\bself\.\$hostnamesMap\$/,
|
|
|
|
|
`${JSON.stringify(hostnamesMap, scriptletJsonReplacer)}`
|
|
|
|
|
);
|
|
|
|
|
patchedScriptlet = safeReplace(patchedScriptlet,
|
|
|
|
|
/\bself\.\$entitiesMap\$/,
|
|
|
|
|
`${JSON.stringify(entitiesMap, scriptletJsonReplacer)}`
|
|
|
|
|
);
|
|
|
|
|
patchedScriptlet = safeReplace(patchedScriptlet,
|
|
|
|
|
/\bself\.\$exceptionsMap\$/,
|
|
|
|
|
`${JSON.stringify(exceptionsMap, scriptletJsonReplacer)}`
|
|
|
|
|
);
|
2023-06-04 03:47:40 +02:00
|
|
|
|
writeFile(`${scriptletDir}/specific/${assetDetails.id}.js`, patchedScriptlet);
|
|
|
|
|
generatedFiles.push(`${assetDetails.id}`);
|
|
|
|
|
|
2022-09-24 17:33:04 +02:00
|
|
|
|
if ( generatedFiles.length !== 0 ) {
|
2023-06-04 03:47:40 +02:00
|
|
|
|
log(`CSS-specific: ${mapin.size} distinct filters`);
|
|
|
|
|
log(`\tCombined into ${hostnamesMap.size} distinct hostnames`);
|
|
|
|
|
log(`\tCombined into ${entitiesMap.size} distinct entities`);
|
2022-09-24 17:33:04 +02:00
|
|
|
|
}
|
|
|
|
|
|
2023-06-04 03:47:40 +02:00
|
|
|
|
return hostnamesMap.size + entitiesMap.size;
|
2022-09-24 17:33:04 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/******************************************************************************/
|
|
|
|
|
|
2022-10-15 19:05:20 +02:00
|
|
|
|
async function processDeclarativeCosmeticFilters(assetDetails, mapin) {
|
2022-09-24 17:33:04 +02:00
|
|
|
|
if ( mapin === undefined ) { return 0; }
|
2022-10-15 19:05:20 +02:00
|
|
|
|
if ( mapin.size === 0 ) { return 0; }
|
|
|
|
|
|
|
|
|
|
// Distinguish declarative-compiled-as-procedural from actual procedural.
|
|
|
|
|
const declaratives = new Map();
|
|
|
|
|
mapin.forEach((details, jsonSelector) => {
|
|
|
|
|
const selector = JSON.parse(jsonSelector);
|
|
|
|
|
if ( selector.cssable !== true ) { return; }
|
2023-06-18 20:34:43 +02:00
|
|
|
|
selector.cssable = undefined;
|
|
|
|
|
declaratives.set(JSON.stringify(selector), details);
|
2022-10-15 19:05:20 +02:00
|
|
|
|
});
|
|
|
|
|
if ( declaratives.size === 0 ) { return 0; }
|
2022-09-24 17:33:04 +02:00
|
|
|
|
|
2022-10-15 19:05:20 +02:00
|
|
|
|
const contentArray = groupHostnamesBySelectors(
|
|
|
|
|
groupSelectorsByHostnames(declaratives)
|
2022-09-24 17:33:04 +02:00
|
|
|
|
);
|
|
|
|
|
|
2022-10-15 19:05:20 +02:00
|
|
|
|
const argsMap = contentArray.map(entry => [
|
|
|
|
|
entry[0],
|
|
|
|
|
{
|
|
|
|
|
a: entry[1].a,
|
|
|
|
|
n: entry[1].n,
|
|
|
|
|
}
|
|
|
|
|
]);
|
|
|
|
|
const hostnamesMap = new Map();
|
|
|
|
|
for ( const [ id, details ] of contentArray ) {
|
|
|
|
|
if ( details.y === undefined ) { continue; }
|
|
|
|
|
scriptletHostnameToIdMap(details.y, id, hostnamesMap);
|
|
|
|
|
}
|
|
|
|
|
const argsList = argsMap2List(argsMap, hostnamesMap);
|
2023-06-04 03:47:40 +02:00
|
|
|
|
const entitiesMap = new Map();
|
|
|
|
|
for ( const [ hn, details ] of hostnamesMap ) {
|
|
|
|
|
if ( hn.endsWith('.*') === false ) { continue; }
|
|
|
|
|
hostnamesMap.delete(hn);
|
|
|
|
|
entitiesMap.set(hn.slice(0, -2), details);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Extract exceptions from argsList, simplify argsList entries
|
|
|
|
|
const exceptionsMap = new Map();
|
|
|
|
|
for ( let i = 0; i < argsList.length; i++ ) {
|
|
|
|
|
const details = argsList[i];
|
|
|
|
|
if ( details.n ) {
|
|
|
|
|
for ( const hn of details.n ) {
|
|
|
|
|
if ( exceptionsMap.has(hn) === false ) {
|
|
|
|
|
exceptionsMap.set(hn, []);
|
|
|
|
|
}
|
|
|
|
|
exceptionsMap.get(hn).push(i);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
argsList[i] = details.a;
|
|
|
|
|
}
|
|
|
|
|
|
2022-09-24 17:33:04 +02:00
|
|
|
|
const originalScriptletMap = await loadAllSourceScriptlets();
|
2023-06-06 02:17:50 +02:00
|
|
|
|
let patchedScriptlet = originalScriptletMap.get('css-declarative').replace(
|
|
|
|
|
'$rulesetId$',
|
|
|
|
|
assetDetails.id
|
|
|
|
|
);
|
|
|
|
|
patchedScriptlet = safeReplace(patchedScriptlet,
|
|
|
|
|
/\bself\.\$argsList\$/,
|
|
|
|
|
`${JSON.stringify(argsList, scriptletJsonReplacer)}`
|
|
|
|
|
);
|
|
|
|
|
patchedScriptlet = safeReplace(patchedScriptlet,
|
|
|
|
|
/\bself\.\$hostnamesMap\$/,
|
|
|
|
|
`${JSON.stringify(hostnamesMap, scriptletJsonReplacer)}`
|
|
|
|
|
);
|
|
|
|
|
patchedScriptlet = safeReplace(patchedScriptlet,
|
|
|
|
|
/\bself\.\$entitiesMap\$/,
|
|
|
|
|
`${JSON.stringify(entitiesMap, scriptletJsonReplacer)}`
|
|
|
|
|
);
|
|
|
|
|
patchedScriptlet = safeReplace(patchedScriptlet,
|
|
|
|
|
/\bself\.\$exceptionsMap\$/,
|
|
|
|
|
`${JSON.stringify(exceptionsMap, scriptletJsonReplacer)}`
|
|
|
|
|
);
|
[mv3] Add ability to handle entity-based CSS and scriptlet injection filters
This commit adds the ability to inject entity-based plain CSS
filters and also a set of the most commonly used entity-based
scriptlet injection filters.
Since the scripting API is not compatible with entity patterns,
the entity-related content scripts are injected in all documents
and the entity-matching is done by the content script themselves.
Given this, entity-based content scripts are enabled only when
working in the Complete filtering mode, there won't be any
entity-based filters injected in lower modes.
Also, since there is no way to reasonably have access to the
Public Suffix List in the content scripts, the entity-matching
algorithm is an approximation, though I expect false positives
to be rare (time will tell). In the event of such false
positive, simply falling back to Optimal mode will fix the
issue.
The following issues have been fixed at the same time:
Fixed the no-filtering mode related rules having lower priority
then redirect rules, i.e. redirect rules would still be applied
despite disabling all filtering on a site.
Fixed improper detection of changes to the generic-related CSS
content script, potentially causing undue delays when for example
trying to access the popup panel while working in Complete mode.
The scripting MV3 can be quite slow when registering/updating
large content scripts, so uBOL does its best to call the API only
if really needed, but there had been a regression in the recent
builds preventing uBO from properly detecting unchanged content
script parameters.
2022-10-20 21:48:06 +02:00
|
|
|
|
writeFile(`${scriptletDir}/declarative/${assetDetails.id}.js`, patchedScriptlet);
|
2022-09-18 15:31:44 +02:00
|
|
|
|
|
2022-10-15 19:05:20 +02:00
|
|
|
|
if ( contentArray.length !== 0 ) {
|
2023-06-04 03:47:40 +02:00
|
|
|
|
log(`CSS-declarative: ${declaratives.size} distinct filters`);
|
|
|
|
|
log(`\tCombined into ${hostnamesMap.size} distinct hostnames`);
|
|
|
|
|
log(`\tCombined into ${entitiesMap.size} distinct entities`);
|
2022-10-15 19:05:20 +02:00
|
|
|
|
}
|
|
|
|
|
|
2023-06-04 03:47:40 +02:00
|
|
|
|
return hostnamesMap.size + entitiesMap.size;
|
2022-10-15 19:05:20 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/******************************************************************************/
|
|
|
|
|
|
|
|
|
|
async function processProceduralCosmeticFilters(assetDetails, mapin) {
|
|
|
|
|
if ( mapin === undefined ) { return 0; }
|
|
|
|
|
if ( mapin.size === 0 ) { return 0; }
|
|
|
|
|
|
|
|
|
|
// Distinguish declarative-compiled-as-procedural from actual procedural.
|
|
|
|
|
const procedurals = new Map();
|
|
|
|
|
mapin.forEach((details, jsonSelector) => {
|
|
|
|
|
const selector = JSON.parse(jsonSelector);
|
|
|
|
|
if ( selector.cssable ) { return; }
|
|
|
|
|
procedurals.set(jsonSelector, details);
|
|
|
|
|
});
|
|
|
|
|
if ( procedurals.size === 0 ) { return 0; }
|
|
|
|
|
|
|
|
|
|
const contentArray = groupHostnamesBySelectors(
|
|
|
|
|
groupSelectorsByHostnames(procedurals)
|
|
|
|
|
);
|
|
|
|
|
|
|
|
|
|
const argsMap = contentArray.map(entry => [
|
|
|
|
|
entry[0],
|
|
|
|
|
{
|
|
|
|
|
a: entry[1].a,
|
|
|
|
|
n: entry[1].n,
|
2022-09-19 14:55:45 +02:00
|
|
|
|
}
|
2022-10-15 19:05:20 +02:00
|
|
|
|
]);
|
|
|
|
|
const hostnamesMap = new Map();
|
|
|
|
|
for ( const [ id, details ] of contentArray ) {
|
|
|
|
|
if ( details.y === undefined ) { continue; }
|
|
|
|
|
scriptletHostnameToIdMap(details.y, id, hostnamesMap);
|
2022-09-16 21:56:35 +02:00
|
|
|
|
}
|
2022-10-15 19:05:20 +02:00
|
|
|
|
const argsList = argsMap2List(argsMap, hostnamesMap);
|
2023-06-04 03:47:40 +02:00
|
|
|
|
const entitiesMap = new Map();
|
|
|
|
|
for ( const [ hn, details ] of hostnamesMap ) {
|
|
|
|
|
if ( hn.endsWith('.*') === false ) { continue; }
|
|
|
|
|
hostnamesMap.delete(hn);
|
|
|
|
|
entitiesMap.set(hn.slice(0, -2), details);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Extract exceptions from argsList, simplify argsList entries
|
|
|
|
|
const exceptionsMap = new Map();
|
|
|
|
|
for ( let i = 0; i < argsList.length; i++ ) {
|
|
|
|
|
const details = argsList[i];
|
|
|
|
|
if ( details.n ) {
|
|
|
|
|
for ( const hn of details.n ) {
|
|
|
|
|
if ( exceptionsMap.has(hn) === false ) {
|
|
|
|
|
exceptionsMap.set(hn, []);
|
|
|
|
|
}
|
|
|
|
|
exceptionsMap.get(hn).push(i);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
argsList[i] = details.a;
|
|
|
|
|
}
|
|
|
|
|
|
2022-10-15 19:05:20 +02:00
|
|
|
|
const originalScriptletMap = await loadAllSourceScriptlets();
|
2023-06-06 02:17:50 +02:00
|
|
|
|
let patchedScriptlet = originalScriptletMap.get('css-procedural').replace(
|
|
|
|
|
'$rulesetId$',
|
|
|
|
|
assetDetails.id
|
|
|
|
|
);
|
|
|
|
|
patchedScriptlet = safeReplace(patchedScriptlet,
|
|
|
|
|
/\bself\.\$argsList\$/,
|
|
|
|
|
`${JSON.stringify(argsList, scriptletJsonReplacer)}`
|
|
|
|
|
);
|
|
|
|
|
patchedScriptlet = safeReplace(patchedScriptlet,
|
|
|
|
|
/\bself\.\$hostnamesMap\$/,
|
|
|
|
|
`${JSON.stringify(hostnamesMap, scriptletJsonReplacer)}`
|
|
|
|
|
);
|
|
|
|
|
patchedScriptlet = safeReplace(patchedScriptlet,
|
|
|
|
|
/\bself\.\$entitiesMap\$/,
|
|
|
|
|
`${JSON.stringify(entitiesMap, scriptletJsonReplacer)}`
|
|
|
|
|
);
|
|
|
|
|
patchedScriptlet = safeReplace(patchedScriptlet,
|
|
|
|
|
/\bself\.\$exceptionsMap\$/,
|
|
|
|
|
`${JSON.stringify(exceptionsMap, scriptletJsonReplacer)}`
|
|
|
|
|
);
|
[mv3] Add ability to handle entity-based CSS and scriptlet injection filters
This commit adds the ability to inject entity-based plain CSS
filters and also a set of the most commonly used entity-based
scriptlet injection filters.
Since the scripting API is not compatible with entity patterns,
the entity-related content scripts are injected in all documents
and the entity-matching is done by the content script themselves.
Given this, entity-based content scripts are enabled only when
working in the Complete filtering mode, there won't be any
entity-based filters injected in lower modes.
Also, since there is no way to reasonably have access to the
Public Suffix List in the content scripts, the entity-matching
algorithm is an approximation, though I expect false positives
to be rare (time will tell). In the event of such false
positive, simply falling back to Optimal mode will fix the
issue.
The following issues have been fixed at the same time:
Fixed the no-filtering mode related rules having lower priority
then redirect rules, i.e. redirect rules would still be applied
despite disabling all filtering on a site.
Fixed improper detection of changes to the generic-related CSS
content script, potentially causing undue delays when for example
trying to access the popup panel while working in Complete mode.
The scripting MV3 can be quite slow when registering/updating
large content scripts, so uBOL does its best to call the API only
if really needed, but there had been a regression in the recent
builds preventing uBO from properly detecting unchanged content
script parameters.
2022-10-20 21:48:06 +02:00
|
|
|
|
writeFile(`${scriptletDir}/procedural/${assetDetails.id}.js`, patchedScriptlet);
|
2022-10-15 19:05:20 +02:00
|
|
|
|
|
|
|
|
|
if ( contentArray.length !== 0 ) {
|
2023-06-04 03:47:40 +02:00
|
|
|
|
log(`Procedural-related distinct filters: ${procedurals.size} distinct combined selectors`);
|
|
|
|
|
log(`\tCombined into ${hostnamesMap.size} distinct hostnames`);
|
|
|
|
|
log(`\tCombined into ${entitiesMap.size} distinct entities`);
|
2022-09-19 17:08:34 +02:00
|
|
|
|
}
|
|
|
|
|
|
2023-06-04 03:47:40 +02:00
|
|
|
|
return hostnamesMap.size + entitiesMap.size;
|
2022-09-16 21:56:35 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/******************************************************************************/
|
2022-09-06 19:47:52 +02:00
|
|
|
|
|
2022-09-16 21:56:35 +02:00
|
|
|
|
async function processScriptletFilters(assetDetails, mapin) {
|
2023-06-04 03:47:40 +02:00
|
|
|
|
if ( mapin === undefined ) { return 0; }
|
|
|
|
|
if ( mapin.size === 0 ) { return 0; }
|
[mv3] Add ability to handle entity-based CSS and scriptlet injection filters
This commit adds the ability to inject entity-based plain CSS
filters and also a set of the most commonly used entity-based
scriptlet injection filters.
Since the scripting API is not compatible with entity patterns,
the entity-related content scripts are injected in all documents
and the entity-matching is done by the content script themselves.
Given this, entity-based content scripts are enabled only when
working in the Complete filtering mode, there won't be any
entity-based filters injected in lower modes.
Also, since there is no way to reasonably have access to the
Public Suffix List in the content scripts, the entity-matching
algorithm is an approximation, though I expect false positives
to be rare (time will tell). In the event of such false
positive, simply falling back to Optimal mode will fix the
issue.
The following issues have been fixed at the same time:
Fixed the no-filtering mode related rules having lower priority
then redirect rules, i.e. redirect rules would still be applied
despite disabling all filtering on a site.
Fixed improper detection of changes to the generic-related CSS
content script, potentially causing undue delays when for example
trying to access the popup panel while working in Complete mode.
The scripting MV3 can be quite slow when registering/updating
large content scripts, so uBOL does its best to call the API only
if really needed, but there had been a regression in the recent
builds preventing uBO from properly detecting unchanged content
script parameters.
2022-10-20 21:48:06 +02:00
|
|
|
|
|
2023-06-02 23:04:15 +02:00
|
|
|
|
makeScriptlet.init();
|
[mv3] Add ability to handle entity-based CSS and scriptlet injection filters
This commit adds the ability to inject entity-based plain CSS
filters and also a set of the most commonly used entity-based
scriptlet injection filters.
Since the scripting API is not compatible with entity patterns,
the entity-related content scripts are injected in all documents
and the entity-matching is done by the content script themselves.
Given this, entity-based content scripts are enabled only when
working in the Complete filtering mode, there won't be any
entity-based filters injected in lower modes.
Also, since there is no way to reasonably have access to the
Public Suffix List in the content scripts, the entity-matching
algorithm is an approximation, though I expect false positives
to be rare (time will tell). In the event of such false
positive, simply falling back to Optimal mode will fix the
issue.
The following issues have been fixed at the same time:
Fixed the no-filtering mode related rules having lower priority
then redirect rules, i.e. redirect rules would still be applied
despite disabling all filtering on a site.
Fixed improper detection of changes to the generic-related CSS
content script, potentially causing undue delays when for example
trying to access the popup panel while working in Complete mode.
The scripting MV3 can be quite slow when registering/updating
large content scripts, so uBOL does its best to call the API only
if really needed, but there had been a regression in the recent
builds preventing uBO from properly detecting unchanged content
script parameters.
2022-10-20 21:48:06 +02:00
|
|
|
|
|
2023-06-02 23:04:15 +02:00
|
|
|
|
for ( const details of mapin.values() ) {
|
2023-06-23 14:27:07 +02:00
|
|
|
|
makeScriptlet.compile(details);
|
[mv3] Add ability to handle entity-based CSS and scriptlet injection filters
This commit adds the ability to inject entity-based plain CSS
filters and also a set of the most commonly used entity-based
scriptlet injection filters.
Since the scripting API is not compatible with entity patterns,
the entity-related content scripts are injected in all documents
and the entity-matching is done by the content script themselves.
Given this, entity-based content scripts are enabled only when
working in the Complete filtering mode, there won't be any
entity-based filters injected in lower modes.
Also, since there is no way to reasonably have access to the
Public Suffix List in the content scripts, the entity-matching
algorithm is an approximation, though I expect false positives
to be rare (time will tell). In the event of such false
positive, simply falling back to Optimal mode will fix the
issue.
The following issues have been fixed at the same time:
Fixed the no-filtering mode related rules having lower priority
then redirect rules, i.e. redirect rules would still be applied
despite disabling all filtering on a site.
Fixed improper detection of changes to the generic-related CSS
content script, potentially causing undue delays when for example
trying to access the popup panel while working in Complete mode.
The scripting MV3 can be quite slow when registering/updating
large content scripts, so uBOL does its best to call the API only
if really needed, but there had been a regression in the recent
builds preventing uBO from properly detecting unchanged content
script parameters.
2022-10-20 21:48:06 +02:00
|
|
|
|
}
|
2023-06-02 23:04:15 +02:00
|
|
|
|
const stats = await makeScriptlet.commit(
|
|
|
|
|
assetDetails.id,
|
|
|
|
|
`${scriptletDir}/scriptlet`,
|
|
|
|
|
writeFile
|
|
|
|
|
);
|
|
|
|
|
if ( stats.length !== 0 ) {
|
|
|
|
|
scriptletStats.set(assetDetails.id, stats);
|
[mv3] Add ability to handle entity-based CSS and scriptlet injection filters
This commit adds the ability to inject entity-based plain CSS
filters and also a set of the most commonly used entity-based
scriptlet injection filters.
Since the scripting API is not compatible with entity patterns,
the entity-related content scripts are injected in all documents
and the entity-matching is done by the content script themselves.
Given this, entity-based content scripts are enabled only when
working in the Complete filtering mode, there won't be any
entity-based filters injected in lower modes.
Also, since there is no way to reasonably have access to the
Public Suffix List in the content scripts, the entity-matching
algorithm is an approximation, though I expect false positives
to be rare (time will tell). In the event of such false
positive, simply falling back to Optimal mode will fix the
issue.
The following issues have been fixed at the same time:
Fixed the no-filtering mode related rules having lower priority
then redirect rules, i.e. redirect rules would still be applied
despite disabling all filtering on a site.
Fixed improper detection of changes to the generic-related CSS
content script, potentially causing undue delays when for example
trying to access the popup panel while working in Complete mode.
The scripting MV3 can be quite slow when registering/updating
large content scripts, so uBOL does its best to call the API only
if really needed, but there had been a regression in the recent
builds preventing uBO from properly detecting unchanged content
script parameters.
2022-10-20 21:48:06 +02:00
|
|
|
|
}
|
2023-06-02 23:04:15 +02:00
|
|
|
|
makeScriptlet.reset();
|
2023-06-04 03:47:40 +02:00
|
|
|
|
return stats.length;
|
2022-09-16 21:56:35 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/******************************************************************************/
|
|
|
|
|
|
2022-10-15 19:05:20 +02:00
|
|
|
|
async function rulesetFromURLs(assetDetails) {
|
2022-09-24 17:33:04 +02:00
|
|
|
|
log('============================');
|
|
|
|
|
log(`Listset for '${assetDetails.id}':`);
|
|
|
|
|
|
2022-10-15 19:05:20 +02:00
|
|
|
|
if ( assetDetails.text === undefined ) {
|
2024-01-21 20:32:14 +01:00
|
|
|
|
const text = await fetchList(assetDetails);
|
2022-10-15 19:05:20 +02:00
|
|
|
|
if ( text === '' ) { return; }
|
|
|
|
|
assetDetails.text = text;
|
|
|
|
|
}
|
2022-09-24 17:33:04 +02:00
|
|
|
|
|
2024-02-26 02:39:21 +01:00
|
|
|
|
if ( Array.isArray(assetDetails.filters) ) {
|
|
|
|
|
assetDetails.text += '\n' + assetDetails.filters.join('\n');
|
|
|
|
|
}
|
|
|
|
|
|
2022-10-16 18:05:24 +02:00
|
|
|
|
const extensionPaths = [];
|
|
|
|
|
for ( const [ fname, details ] of redirectResourcesMap ) {
|
|
|
|
|
const path = `/web_accessible_resources/${fname}`;
|
|
|
|
|
extensionPaths.push([ fname, path ]);
|
|
|
|
|
if ( details.alias === undefined ) { continue; }
|
|
|
|
|
if ( typeof details.alias === 'string' ) {
|
|
|
|
|
extensionPaths.push([ details.alias, path ]);
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
if ( Array.isArray(details.alias) === false ) { continue; }
|
|
|
|
|
for ( const alias of details.alias ) {
|
|
|
|
|
extensionPaths.push([ alias, path ]);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2022-09-24 17:33:04 +02:00
|
|
|
|
const results = await dnrRulesetFromRawLists(
|
2022-10-15 19:05:20 +02:00
|
|
|
|
[ { name: assetDetails.id, text: assetDetails.text } ],
|
2023-06-23 14:27:07 +02:00
|
|
|
|
{ env, extensionPaths, secret: assetDetails.secret }
|
2022-09-24 17:33:04 +02:00
|
|
|
|
);
|
|
|
|
|
|
|
|
|
|
const netStats = await processNetworkFilters(
|
|
|
|
|
assetDetails,
|
|
|
|
|
results.network
|
|
|
|
|
);
|
|
|
|
|
|
|
|
|
|
// Split cosmetic filters into two groups: declarative and procedural
|
|
|
|
|
const declarativeCosmetic = new Map();
|
|
|
|
|
const proceduralCosmetic = new Map();
|
|
|
|
|
const rejectedCosmetic = [];
|
2022-10-10 18:28:24 +02:00
|
|
|
|
if ( results.specificCosmetic ) {
|
|
|
|
|
for ( const [ selector, details ] of results.specificCosmetic ) {
|
2022-09-24 17:33:04 +02:00
|
|
|
|
if ( details.rejected ) {
|
|
|
|
|
rejectedCosmetic.push(selector);
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
if ( selector.startsWith('{') === false ) {
|
|
|
|
|
declarativeCosmetic.set(selector, details);
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
const parsed = JSON.parse(selector);
|
|
|
|
|
parsed.raw = undefined;
|
|
|
|
|
proceduralCosmetic.set(JSON.stringify(parsed), details);
|
|
|
|
|
}
|
|
|
|
|
}
|
2022-10-15 19:05:20 +02:00
|
|
|
|
if ( rejectedCosmetic.length !== 0 ) {
|
|
|
|
|
log(`Rejected cosmetic filters: ${rejectedCosmetic.length}`);
|
|
|
|
|
log(rejectedCosmetic.map(line => `\t${line}`).join('\n'), true);
|
|
|
|
|
}
|
|
|
|
|
|
2023-07-06 21:45:45 +02:00
|
|
|
|
if (
|
|
|
|
|
Array.isArray(results.network.generichideExclusions) &&
|
|
|
|
|
results.network.generichideExclusions.length !== 0
|
|
|
|
|
) {
|
|
|
|
|
genericDetails.set(
|
|
|
|
|
assetDetails.id,
|
|
|
|
|
results.network.generichideExclusions.filter(hn => hn.endsWith('.*') === false).sort()
|
|
|
|
|
);
|
|
|
|
|
}
|
|
|
|
|
|
2022-10-10 18:28:24 +02:00
|
|
|
|
const genericCosmeticStats = await processGenericCosmeticFilters(
|
|
|
|
|
assetDetails,
|
2023-07-11 20:38:35 +02:00
|
|
|
|
results.genericCosmetic,
|
|
|
|
|
results.genericCosmeticExceptions
|
2023-07-06 21:45:45 +02:00
|
|
|
|
);
|
|
|
|
|
const genericHighCosmeticStats = await processGenericHighCosmeticFilters(
|
|
|
|
|
assetDetails,
|
2023-07-11 20:38:35 +02:00
|
|
|
|
results.genericHighCosmetic,
|
|
|
|
|
results.genericCosmeticExceptions
|
2022-10-10 18:28:24 +02:00
|
|
|
|
);
|
|
|
|
|
const specificCosmeticStats = await processCosmeticFilters(
|
2022-09-24 17:33:04 +02:00
|
|
|
|
assetDetails,
|
|
|
|
|
declarativeCosmetic
|
|
|
|
|
);
|
2022-10-15 19:05:20 +02:00
|
|
|
|
const declarativeStats = await processDeclarativeCosmeticFilters(
|
|
|
|
|
assetDetails,
|
|
|
|
|
proceduralCosmetic
|
|
|
|
|
);
|
2022-09-24 17:33:04 +02:00
|
|
|
|
const proceduralStats = await processProceduralCosmeticFilters(
|
|
|
|
|
assetDetails,
|
|
|
|
|
proceduralCosmetic
|
|
|
|
|
);
|
|
|
|
|
const scriptletStats = await processScriptletFilters(
|
|
|
|
|
assetDetails,
|
|
|
|
|
results.scriptlet
|
|
|
|
|
);
|
|
|
|
|
|
|
|
|
|
rulesetDetails.push({
|
|
|
|
|
id: assetDetails.id,
|
|
|
|
|
name: assetDetails.name,
|
2023-06-04 03:47:40 +02:00
|
|
|
|
group: assetDetails.group,
|
2022-09-24 17:33:04 +02:00
|
|
|
|
enabled: assetDetails.enabled,
|
|
|
|
|
lang: assetDetails.lang,
|
|
|
|
|
homeURL: assetDetails.homeURL,
|
|
|
|
|
filters: {
|
|
|
|
|
total: results.network.filterCount,
|
|
|
|
|
accepted: results.network.acceptedFilterCount,
|
|
|
|
|
rejected: results.network.rejectedFilterCount,
|
|
|
|
|
},
|
|
|
|
|
rules: {
|
|
|
|
|
total: netStats.total,
|
2022-09-30 01:51:33 +02:00
|
|
|
|
plain: netStats.plain,
|
2022-10-16 18:05:24 +02:00
|
|
|
|
regex: netStats.regex,
|
|
|
|
|
removeparam: netStats.removeparam,
|
|
|
|
|
redirect: netStats.redirect,
|
2023-07-10 17:56:57 +02:00
|
|
|
|
modifyHeaders: netStats.modifyHeaders,
|
2022-09-24 17:33:04 +02:00
|
|
|
|
discarded: netStats.discarded,
|
|
|
|
|
rejected: netStats.rejected,
|
|
|
|
|
},
|
|
|
|
|
css: {
|
2022-10-10 18:28:24 +02:00
|
|
|
|
generic: genericCosmeticStats,
|
2023-07-06 21:45:45 +02:00
|
|
|
|
generichigh: genericHighCosmeticStats,
|
2022-10-10 18:28:24 +02:00
|
|
|
|
specific: specificCosmeticStats,
|
2022-10-15 19:05:20 +02:00
|
|
|
|
declarative: declarativeStats,
|
2022-09-24 17:33:04 +02:00
|
|
|
|
procedural: proceduralStats,
|
|
|
|
|
},
|
[mv3] Add ability to handle entity-based CSS and scriptlet injection filters
This commit adds the ability to inject entity-based plain CSS
filters and also a set of the most commonly used entity-based
scriptlet injection filters.
Since the scripting API is not compatible with entity patterns,
the entity-related content scripts are injected in all documents
and the entity-matching is done by the content script themselves.
Given this, entity-based content scripts are enabled only when
working in the Complete filtering mode, there won't be any
entity-based filters injected in lower modes.
Also, since there is no way to reasonably have access to the
Public Suffix List in the content scripts, the entity-matching
algorithm is an approximation, though I expect false positives
to be rare (time will tell). In the event of such false
positive, simply falling back to Optimal mode will fix the
issue.
The following issues have been fixed at the same time:
Fixed the no-filtering mode related rules having lower priority
then redirect rules, i.e. redirect rules would still be applied
despite disabling all filtering on a site.
Fixed improper detection of changes to the generic-related CSS
content script, potentially causing undue delays when for example
trying to access the popup panel while working in Complete mode.
The scripting MV3 can be quite slow when registering/updating
large content scripts, so uBOL does its best to call the API only
if really needed, but there had been a regression in the recent
builds preventing uBO from properly detecting unchanged content
script parameters.
2022-10-20 21:48:06 +02:00
|
|
|
|
scriptlets: scriptletStats,
|
2022-09-24 17:33:04 +02:00
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
ruleResources.push({
|
|
|
|
|
id: assetDetails.id,
|
|
|
|
|
enabled: assetDetails.enabled,
|
2022-10-15 19:05:20 +02:00
|
|
|
|
path: `/rulesets/main/${assetDetails.id}.json`
|
2022-09-24 17:33:04 +02:00
|
|
|
|
});
|
2022-10-15 19:05:20 +02:00
|
|
|
|
}
|
2022-09-24 17:33:04 +02:00
|
|
|
|
|
|
|
|
|
/******************************************************************************/
|
|
|
|
|
|
2022-09-16 21:56:35 +02:00
|
|
|
|
async function main() {
|
|
|
|
|
|
2023-08-19 13:48:14 +02:00
|
|
|
|
let version = '';
|
2022-09-16 21:56:35 +02:00
|
|
|
|
{
|
|
|
|
|
const now = new Date();
|
2023-08-19 13:48:14 +02:00
|
|
|
|
const yearPart = now.getUTCFullYear();
|
|
|
|
|
const monthPart = now.getUTCMonth() + 1;
|
|
|
|
|
const dayPart = now.getUTCDate();
|
|
|
|
|
const hourPart = Math.floor(now.getUTCHours());
|
|
|
|
|
const minutePart = Math.floor(now.getUTCMinutes());
|
|
|
|
|
version = `${yearPart}.${monthPart}.${dayPart}.${hourPart * 60 + minutePart}`;
|
2022-09-16 21:56:35 +02:00
|
|
|
|
}
|
|
|
|
|
log(`Version: ${version}`);
|
|
|
|
|
|
2022-09-13 23:44:24 +02:00
|
|
|
|
// Get assets.json content
|
|
|
|
|
const assets = await fs.readFile(
|
|
|
|
|
`./assets.json`,
|
|
|
|
|
{ encoding: 'utf8' }
|
|
|
|
|
).then(text =>
|
|
|
|
|
JSON.parse(text)
|
|
|
|
|
);
|
|
|
|
|
|
2023-06-23 14:27:07 +02:00
|
|
|
|
// This will be used to sign our inserted `!#trusted on` directives
|
|
|
|
|
const secret = createHash('sha256').update(randomBytes(16)).digest('hex').slice(0,16);
|
|
|
|
|
log(`Secret: ${secret}`);
|
|
|
|
|
|
2022-09-13 23:44:24 +02:00
|
|
|
|
// Assemble all default lists as the default ruleset
|
2022-09-16 22:36:09 +02:00
|
|
|
|
const contentURLs = [
|
2023-05-19 21:06:15 +02:00
|
|
|
|
'https://ublockorigin.github.io/uAssets/filters/filters.min.txt',
|
2024-02-14 20:27:36 +01:00
|
|
|
|
'https://ublockorigin.github.io/uAssets/filters/badware.min.txt',
|
2023-05-19 21:06:15 +02:00
|
|
|
|
'https://ublockorigin.github.io/uAssets/filters/privacy.min.txt',
|
|
|
|
|
'https://ublockorigin.github.io/uAssets/filters/unbreak.min.txt',
|
2024-02-14 20:27:36 +01:00
|
|
|
|
'https://ublockorigin.github.io/uAssets/filters/quick-fixes.min.txt',
|
2022-10-16 19:27:43 +02:00
|
|
|
|
'https://ublockorigin.github.io/uAssets/filters/ubol-filters.txt',
|
2022-10-27 20:15:57 +02:00
|
|
|
|
'https://ublockorigin.github.io/uAssets/thirdparties/easylist.txt',
|
|
|
|
|
'https://ublockorigin.github.io/uAssets/thirdparties/easyprivacy.txt',
|
2022-09-16 22:36:09 +02:00
|
|
|
|
'https://pgl.yoyo.org/adservers/serverlist.php?hostformat=hosts&showintro=1&mimetype=plaintext',
|
|
|
|
|
];
|
2022-10-15 19:05:20 +02:00
|
|
|
|
await rulesetFromURLs({
|
2022-09-13 23:44:24 +02:00
|
|
|
|
id: 'default',
|
|
|
|
|
name: 'Ads, trackers, miners, and more' ,
|
|
|
|
|
enabled: true,
|
2023-06-23 14:27:07 +02:00
|
|
|
|
secret,
|
2022-09-13 23:44:24 +02:00
|
|
|
|
urls: contentURLs,
|
2024-01-21 20:32:14 +01:00
|
|
|
|
dnrURL: 'https://ublockorigin.github.io/uAssets/dnr/default.json',
|
2022-09-15 19:14:08 +02:00
|
|
|
|
homeURL: 'https://github.com/uBlockOrigin/uAssets',
|
2024-02-26 02:39:21 +01:00
|
|
|
|
filters: [
|
|
|
|
|
],
|
2022-09-13 23:44:24 +02:00
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
// Regional rulesets
|
2022-09-25 00:36:28 +02:00
|
|
|
|
const excludedLists = [
|
|
|
|
|
'ara-0',
|
|
|
|
|
'EST-0',
|
|
|
|
|
];
|
2022-10-10 18:28:24 +02:00
|
|
|
|
// Merge lists which have same target languages
|
|
|
|
|
const langToListsMap = new Map();
|
2022-09-13 23:44:24 +02:00
|
|
|
|
for ( const [ id, asset ] of Object.entries(assets) ) {
|
|
|
|
|
if ( asset.content !== 'filters' ) { continue; }
|
|
|
|
|
if ( asset.off !== true ) { continue; }
|
|
|
|
|
if ( typeof asset.lang !== 'string' ) { continue; }
|
2022-09-25 00:36:28 +02:00
|
|
|
|
if ( excludedLists.includes(id) ) { continue; }
|
2022-10-10 18:28:24 +02:00
|
|
|
|
let ids = langToListsMap.get(asset.lang);
|
|
|
|
|
if ( ids === undefined ) {
|
|
|
|
|
langToListsMap.set(asset.lang, ids = []);
|
|
|
|
|
}
|
|
|
|
|
ids.push(id);
|
|
|
|
|
}
|
|
|
|
|
for ( const ids of langToListsMap.values() ) {
|
|
|
|
|
const urls = [];
|
|
|
|
|
for ( const id of ids ) {
|
|
|
|
|
const asset = assets[id];
|
|
|
|
|
const contentURL = Array.isArray(asset.contentURL)
|
|
|
|
|
? asset.contentURL[0]
|
|
|
|
|
: asset.contentURL;
|
|
|
|
|
urls.push(contentURL);
|
|
|
|
|
}
|
|
|
|
|
const id = ids[0];
|
|
|
|
|
const asset = assets[id];
|
2022-10-15 19:05:20 +02:00
|
|
|
|
await rulesetFromURLs({
|
2022-09-13 23:44:24 +02:00
|
|
|
|
id: id.toLowerCase(),
|
|
|
|
|
lang: asset.lang,
|
|
|
|
|
name: asset.title,
|
|
|
|
|
enabled: false,
|
2022-10-10 18:28:24 +02:00
|
|
|
|
urls,
|
2022-09-15 19:14:08 +02:00
|
|
|
|
homeURL: asset.supportURL,
|
2022-09-13 23:44:24 +02:00
|
|
|
|
});
|
|
|
|
|
}
|
|
|
|
|
|
2022-09-15 19:14:08 +02:00
|
|
|
|
// Handpicked rulesets from assets.json
|
2023-06-04 03:47:40 +02:00
|
|
|
|
const handpicked = [
|
|
|
|
|
'block-lan',
|
|
|
|
|
'dpollock-0',
|
|
|
|
|
'adguard-spyware-url',
|
|
|
|
|
];
|
2022-09-13 23:44:24 +02:00
|
|
|
|
for ( const id of handpicked ) {
|
|
|
|
|
const asset = assets[id];
|
|
|
|
|
if ( asset.content !== 'filters' ) { continue; }
|
|
|
|
|
const contentURL = Array.isArray(asset.contentURL)
|
|
|
|
|
? asset.contentURL[0]
|
|
|
|
|
: asset.contentURL;
|
2022-10-15 19:05:20 +02:00
|
|
|
|
await rulesetFromURLs({
|
2022-09-13 23:44:24 +02:00
|
|
|
|
id: id.toLowerCase(),
|
|
|
|
|
name: asset.title,
|
|
|
|
|
enabled: false,
|
|
|
|
|
urls: [ contentURL ],
|
2022-09-15 19:14:08 +02:00
|
|
|
|
homeURL: asset.supportURL,
|
2022-09-13 23:44:24 +02:00
|
|
|
|
});
|
2022-09-06 19:47:52 +02:00
|
|
|
|
}
|
|
|
|
|
|
2023-06-04 03:47:40 +02:00
|
|
|
|
// Handpicked annoyance rulesets from assets.json
|
|
|
|
|
await rulesetFromURLs({
|
2023-06-11 15:20:10 +02:00
|
|
|
|
id: 'annoyances-cookies',
|
2023-06-21 16:08:28 +02:00
|
|
|
|
name: 'EasyList/uBO – Cookie Notices',
|
2023-06-04 03:47:40 +02:00
|
|
|
|
group: 'annoyances',
|
|
|
|
|
enabled: false,
|
2023-06-23 14:27:07 +02:00
|
|
|
|
secret,
|
2023-06-04 03:47:40 +02:00
|
|
|
|
urls: [
|
2023-06-21 16:08:28 +02:00
|
|
|
|
'https://ublockorigin.github.io/uAssets/thirdparties/easylist-cookies.txt',
|
2023-06-11 15:20:10 +02:00
|
|
|
|
'https://ublockorigin.github.io/uAssets/filters/annoyances-cookies.txt',
|
2023-06-04 03:47:40 +02:00
|
|
|
|
],
|
2023-06-21 16:08:28 +02:00
|
|
|
|
homeURL: 'https://github.com/easylist/easylist#fanboy-lists',
|
2023-06-04 03:47:40 +02:00
|
|
|
|
});
|
|
|
|
|
await rulesetFromURLs({
|
2023-06-11 15:20:10 +02:00
|
|
|
|
id: 'annoyances-overlays',
|
2024-03-07 15:14:30 +01:00
|
|
|
|
name: 'EasyList/uBO – Overlay Notices',
|
2023-06-04 03:47:40 +02:00
|
|
|
|
group: 'annoyances',
|
|
|
|
|
enabled: false,
|
2023-06-23 14:27:07 +02:00
|
|
|
|
secret,
|
2023-06-04 03:47:40 +02:00
|
|
|
|
urls: [
|
2024-03-07 15:14:30 +01:00
|
|
|
|
'https://ublockorigin.github.io/uAssets/thirdparties/easylist-newsletters.txt',
|
2023-06-11 15:20:10 +02:00
|
|
|
|
'https://ublockorigin.github.io/uAssets/filters/annoyances-others.txt',
|
2023-06-04 03:47:40 +02:00
|
|
|
|
],
|
2024-03-07 15:14:30 +01:00
|
|
|
|
homeURL: 'https://github.com/easylist/easylist#fanboy-lists',
|
2023-06-11 15:20:10 +02:00
|
|
|
|
});
|
|
|
|
|
await rulesetFromURLs({
|
|
|
|
|
id: 'annoyances-social',
|
2024-03-07 15:14:30 +01:00
|
|
|
|
name: 'EasyList – Social Widgets',
|
2023-06-11 15:20:10 +02:00
|
|
|
|
group: 'annoyances',
|
|
|
|
|
enabled: false,
|
|
|
|
|
urls: [
|
2024-03-07 15:14:30 +01:00
|
|
|
|
'https://ublockorigin.github.io/uAssets/thirdparties/easylist-social.txt',
|
2023-06-11 15:20:10 +02:00
|
|
|
|
],
|
2024-03-07 15:14:30 +01:00
|
|
|
|
homeURL: 'https://github.com/easylist/easylist#fanboy-lists',
|
2023-06-11 15:20:10 +02:00
|
|
|
|
});
|
|
|
|
|
await rulesetFromURLs({
|
|
|
|
|
id: 'annoyances-widgets',
|
2024-03-07 15:14:30 +01:00
|
|
|
|
name: 'EasyList – Chat Widgets',
|
2023-06-11 15:20:10 +02:00
|
|
|
|
group: 'annoyances',
|
|
|
|
|
enabled: false,
|
|
|
|
|
urls: [
|
2024-03-07 15:14:30 +01:00
|
|
|
|
'https://ublockorigin.github.io/uAssets/thirdparties/easylist-chat.txt',
|
2023-06-11 15:20:10 +02:00
|
|
|
|
],
|
2024-03-07 15:14:30 +01:00
|
|
|
|
homeURL: 'https://github.com/easylist/easylist#fanboy-lists',
|
2023-06-11 15:20:10 +02:00
|
|
|
|
});
|
|
|
|
|
await rulesetFromURLs({
|
|
|
|
|
id: 'annoyances-others',
|
2024-03-07 15:14:30 +01:00
|
|
|
|
name: 'EasyList – Other Annoyances',
|
2023-06-11 15:20:10 +02:00
|
|
|
|
group: 'annoyances',
|
|
|
|
|
enabled: false,
|
|
|
|
|
urls: [
|
2024-03-07 15:14:30 +01:00
|
|
|
|
'https://ublockorigin.github.io/uAssets/thirdparties/easylist-annoyances.txt'
|
2023-06-11 15:20:10 +02:00
|
|
|
|
],
|
2024-03-07 15:14:30 +01:00
|
|
|
|
homeURL: 'https://github.com/easylist/easylist#fanboy-lists',
|
2023-06-04 03:47:40 +02:00
|
|
|
|
});
|
|
|
|
|
|
2022-09-15 19:14:08 +02:00
|
|
|
|
// Handpicked rulesets from abroad
|
2022-10-15 19:05:20 +02:00
|
|
|
|
await rulesetFromURLs({
|
2022-09-15 19:14:08 +02:00
|
|
|
|
id: 'stevenblack-hosts',
|
|
|
|
|
name: 'Steven Black\'s hosts file',
|
|
|
|
|
enabled: false,
|
|
|
|
|
urls: [ 'https://raw.githubusercontent.com/StevenBlack/hosts/master/hosts' ],
|
|
|
|
|
homeURL: 'https://github.com/StevenBlack/hosts#readme',
|
|
|
|
|
});
|
|
|
|
|
|
2022-09-16 21:56:35 +02:00
|
|
|
|
writeFile(
|
|
|
|
|
`${rulesetDir}/ruleset-details.json`,
|
|
|
|
|
`${JSON.stringify(rulesetDetails, null, 1)}\n`
|
2022-09-15 19:14:08 +02:00
|
|
|
|
);
|
|
|
|
|
|
2022-10-15 19:05:20 +02:00
|
|
|
|
writeFile(
|
|
|
|
|
`${rulesetDir}/scriptlet-details.json`,
|
|
|
|
|
`${JSON.stringify(scriptletStats, jsonSetMapReplacer, 1)}\n`
|
|
|
|
|
);
|
|
|
|
|
|
|
|
|
|
writeFile(
|
|
|
|
|
`${rulesetDir}/generic-details.json`,
|
|
|
|
|
`${JSON.stringify(genericDetails, jsonSetMapReplacer, 1)}\n`
|
2022-09-16 21:56:35 +02:00
|
|
|
|
);
|
2022-09-06 19:47:52 +02:00
|
|
|
|
|
2022-10-16 18:05:24 +02:00
|
|
|
|
// Copy required redirect resources
|
|
|
|
|
for ( const path of requiredRedirectResources ) {
|
|
|
|
|
copyFile(`./${path}`, `${outputDir}/${path}`);
|
|
|
|
|
}
|
|
|
|
|
|
2022-09-16 21:56:35 +02:00
|
|
|
|
await Promise.all(writeOps);
|
2022-09-06 19:47:52 +02:00
|
|
|
|
|
|
|
|
|
// Patch manifest
|
2023-08-19 13:48:14 +02:00
|
|
|
|
// Get manifest content
|
|
|
|
|
const manifest = await fs.readFile(
|
|
|
|
|
`${outputDir}/manifest.json`,
|
|
|
|
|
{ encoding: 'utf8' }
|
|
|
|
|
).then(text =>
|
|
|
|
|
JSON.parse(text)
|
|
|
|
|
);
|
2022-10-16 18:05:24 +02:00
|
|
|
|
// Patch declarative_net_request key
|
2022-09-06 19:47:52 +02:00
|
|
|
|
manifest.declarative_net_request = { rule_resources: ruleResources };
|
2022-10-16 18:05:24 +02:00
|
|
|
|
// Patch web_accessible_resources key
|
2023-04-07 16:19:43 +02:00
|
|
|
|
const web_accessible_resources = {
|
2022-10-16 18:05:24 +02:00
|
|
|
|
resources: Array.from(requiredRedirectResources).map(path => `/${path}`),
|
|
|
|
|
matches: [ '<all_urls>' ],
|
2023-04-07 16:19:43 +02:00
|
|
|
|
};
|
2023-08-11 19:22:25 +02:00
|
|
|
|
if ( platform === 'chromium' ) {
|
2023-04-07 16:19:43 +02:00
|
|
|
|
web_accessible_resources.use_dynamic_url = true;
|
|
|
|
|
}
|
|
|
|
|
manifest.web_accessible_resources = [ web_accessible_resources ];
|
|
|
|
|
|
2023-08-19 13:48:14 +02:00
|
|
|
|
// Patch manifest version property
|
|
|
|
|
manifest.version = version;
|
2022-10-16 18:05:24 +02:00
|
|
|
|
// Commit changes
|
2022-09-06 19:47:52 +02:00
|
|
|
|
await fs.writeFile(
|
|
|
|
|
`${outputDir}/manifest.json`,
|
|
|
|
|
JSON.stringify(manifest, null, 2) + '\n'
|
|
|
|
|
);
|
|
|
|
|
|
|
|
|
|
// Log results
|
2022-09-27 13:46:24 +02:00
|
|
|
|
const logContent = stdOutput.join('\n') + '\n';
|
|
|
|
|
await fs.writeFile(`${cacheDir}/log.txt`, logContent);
|
2022-09-06 19:47:52 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
main();
|
|
|
|
|
|
|
|
|
|
/******************************************************************************/
|