prehistoric-systems/uBlock
1
0
Fork 0
mirror of https://github.com/gorhill/uBlock.git synced 2026-03-11 09:04:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[mv3] Code review of conversion to DNR ruleset

Browse source 
- Ensure no duplicates in domain collection fields
- Sort rules according to the number of entries in their
  domain collections
This commit is contained in:
Raymond Hill 2025-04-20 12:14:29 -04:00
parent de7a406920
commit 2bd09e6f84
No known key found for this signature in database
GPG key ID: 25E1490B761470C2
1 changed files with 19 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
platform/mv3/make-rulesets.js
View file

@ -405,6 +405,23 @@ function pruneHostnameArray(hostnames) {
* */
function toJSONRuleset(ruleset) {
const nodupProps = [ 'domains', 'excludedDomains', 'requestDomains', 'excludedRequestDomains', 'initiatorDomains', 'excludedInitiatorDomains' ];
for ( const { condition } of ruleset ) {
if ( condition === undefined ) { continue; }
for ( const prop of nodupProps ) {
if ( condition[prop] === undefined ) { continue; }
condition[prop] = Array.from(new Set(condition[prop]));
}
}
const sortProps = [ 'requestDomains', 'initiatorDomains', 'domains' ];
ruleset.sort((a, b) => {
let aLen = 0, bLen = 0;
for ( const prop of sortProps ) {
aLen += a.condition[prop]?.length ?? 0;
bLen += b.condition[prop]?.length ?? 0;
}
return bLen - aLen;
});
const replacer = (k, v) => {
if ( k.startsWith('_') ) { return; }
if ( Array.isArray(v) ) {
@ -421,7 +438,9 @@ function toJSONRuleset(ruleset) {
};
const indent = ruleset.length > 10 ? undefined : 1;
const out = [];
let id = 1;
for ( const rule of ruleset ) {
rule.id = id++;
out.push(JSON.stringify(rule, replacer, indent));
}
return `[\n${out.join(',\n')}\n]\n`;
@ -651,10 +670,6 @@ async function processNetworkFilters(assetDetails, network) {
}
if ( strictBlocked.size !== 0 ) {
mergeRules(strictBlocked, 'requestDomains');
let id = 1;
for ( const rule of strictBlocked.values() ) {
rule.id = id++;
}
writeFile(`${rulesetDir}/strictblock/${assetDetails.id}.json`,
toJSONRuleset(Array.from(strictBlocked.values()))
);