GithubFollow/Surge_by_SukkaW
1
0
Fork 0
mirror of https://github.com/SukkaW/Surge.git synced 2026-01-29 01:51:52 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Chore: introduce eslint to build script

Browse Source
This commit is contained in:
SukkaW
2023-07-12 23:14:20 +08:00
parent aeb90e36ca
commit 09961fad44
20 changed files with 299 additions and 190 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Build/build-apple-cdn.js
View File

@@ -34,7 +34,7 @@ const { fetchRemoteTextAndCreateReadlineInterface } = require('./lib/fetch-remot
'This file contains Apple\'s domains using their China mainland CDN servers.',
'',
'Data from:',
' - https://github.com/felixonmars/dnsmasq-china-list',
' - https://github.com/felixonmars/dnsmasq-china-list'
],
new Date(),
res.map(domain => `DOMAIN-SUFFIX,${domain}`)
@@ -52,14 +52,14 @@ const { fetchRemoteTextAndCreateReadlineInterface } = require('./lib/fetch-remot
'This file contains Apple\'s domains using their China mainland CDN servers.',
'',
'Data from:',
' - https://github.com/felixonmars/dnsmasq-china-list',
' - https://github.com/felixonmars/dnsmasq-china-list'
],
new Date(),
res.map(i => `.${i}`)
),
path.resolve(__dirname, '../List/domainset/apple_cdn.conf')
)
])
]);
console.timeEnd('Total Time - build-apple-cdn-conf');
})();

24
Build/build-cdn-conf.js
View File

@@ -20,11 +20,11 @@ const { minifyRules } = require('./lib/minify-rules');
line.endsWith('.amazonaws.com')
|| line.endsWith('.scw.cloud')
)
&& !line.includes('cn-')
&& !line.includes('cn-');
}
return false;
})
});
const filePath = path.resolve(__dirname, '../Source/non_ip/cdn.conf');
const resultPath = path.resolve(__dirname, '../List/non_ip/cdn.conf');
@@ -37,18 +37,18 @@ const { minifyRules } = require('./lib/minify-rules');
await compareAndWriteFile(
withBannerArray(
'Sukka\'s Surge Rules - CDN Domains',
[
'License: AGPL 3.0',
'Homepage: https://ruleset.skk.moe',
'GitHub: https://github.com/SukkaW/Surge',
'',
'This file contains object storage and static assets CDN domains.'
],
new Date(),
minifyRules(content.split('\n'))
[
'License: AGPL 3.0',
'Homepage: https://ruleset.skk.moe',
'GitHub: https://github.com/SukkaW/Surge',
'',
'This file contains object storage and static assets CDN domains.'
],
new Date(),
minifyRules(content.split('\n'))
),
resultPath
)
);
console.timeEnd('Total Time - build-cdn-conf');
})();

6
Build/build-chn-cidr.js
View File

@@ -15,7 +15,7 @@ const { compareAndWriteFile } = require('./lib/string-array-compare');
console.log('Before Merge:', cidr.length);
const filteredCidr = mergeCidrs(cidr.filter(line => {
if (line) {
return !line.startsWith('#')
return !line.startsWith('#');
}
return false;
@@ -30,13 +30,13 @@ const { compareAndWriteFile } = require('./lib/string-array-compare');
'Homepage: https://ruleset.skk.moe',
'GitHub: https://github.com/SukkaW/Surge',
'',
'Data from https://misaka.io (misakaio @ GitHub)',
'Data from https://misaka.io (misakaio @ GitHub)'
],
new Date(),
filteredCidr.map(i => `IP-CIDR,${i}`)
),
pathResolve(__dirname, '../List/ip/china_ip.conf')
)
);
console.timeEnd('Total Time - build-chnroutes-cidr');
})();

8
Build/build-internal-rules.js
View File

@@ -36,7 +36,7 @@ const tldts = require('tldts');
console.warn('[drop line from domainset]', line);
}
}
}
};
/**
* @param {string} ruleSetPath
@@ -49,14 +49,14 @@ const tldts = require('tldts');
})
) {
if (line.startsWith('DOMAIN-SUFFIX,')) {
addApexDomain(line.replace('DOMAIN-SUFFIX,', ''))
addApexDomain(line.replace('DOMAIN-SUFFIX,', ''));
} else if (line.startsWith('DOMAIN,')) {
addApexDomain(line.replace('DOMAIN,', ''));
} else if (!line.startsWith('#') && line.trim() !== '') {
console.warn('[drop line from ruleset]', line);
}
}
}
};
await processLocalRuleSet(path.resolve(__dirname, '../List/non_ip/cdn.conf'));
await processLocalRuleSet(path.resolve(__dirname, '../List/non_ip/global.conf'));
@@ -71,6 +71,6 @@ const tldts = require('tldts');
await fse.ensureDir(path.resolve(__dirname, '../List/internal'));
await fs.promises.writeFile(
path.resolve(__dirname, '../List/internal/cdn.txt'),
Array.from(set).map(i => `SUFFIX,${i}`).join('\n') + '\n'
`${Array.from(set).map(i => `SUFFIX,${i}`).join('\n')}\n`
);
})();

10
Build/build-mitm-hostname.js
View File

@@ -116,7 +116,7 @@ const PRESET_MITM_HOSTNAMES = [
&& !(i !== '*.meituan.net' && i.endsWith('.meituan.net'))
&& !i.startsWith('.')
&& !i.endsWith('.')
&& !i.endsWith('*')
&& !i.endsWith('*');
});
const mitmDomainsRegExpArray = mitmDomains.map(i => {
@@ -124,7 +124,7 @@ const PRESET_MITM_HOSTNAMES = [
escapeRegExp(i)
.replaceAll('{www or not}', '(www.)?')
.replaceAll('\\*', '(.*)')
)
);
});
const parsedDomainsData = [];
@@ -141,7 +141,7 @@ const PRESET_MITM_HOSTNAMES = [
});
console.log('Mitm Hostnames:');
console.log('hostname = %APPEND% ' + mitmDomains.join(', '));
console.log(`hostname = %APPEND% ${mitmDomains.join(', ')}`);
console.log('--------------------');
console.log('Parsed Sucessed:');
console.log(table.table(parsedDomainsData, {
@@ -164,11 +164,11 @@ function parseDomain(input) {
return {
success: true,
hostname: url.hostname
}
};
} catch {
return {
success: false
}
};
}
}

4
Build/build-phishing-domainset.js
View File

@@ -110,7 +110,7 @@ const BLACK_TLD = Array.from(new Set([
if (
count >= 5
) {
results.push('.' + domain);
results.push(`.${domain}`);
}
});
@@ -132,5 +132,5 @@ const BLACK_TLD = Array.from(new Set([
results
),
path.resolve(__dirname, '../List/domainset/reject_phishing.conf')
)
);
})();

2
Build/build-public.js
View File

@@ -69,5 +69,5 @@ function template(urlList) {
</main>
</body>
</html>
`
`;
}

258
Build/build-reject-domainset.js
View File

@@ -1,6 +1,8 @@
// @ts-check
const { promises: fsPromises } = require('fs');
const fs = require('fs');
const fse = require('fs-extra');
const readline = require('readline');
const { resolve: pathResolve } = require('path');
const { processHosts, processFilterRules, preprocessFullDomainSetBeforeUsedAsWorkerData } = require('./lib/parse-filter');
const { getDomain } = require('tldts');
@@ -23,145 +25,148 @@ const domainSuffixSet = new Set();
/** @type Set<string> */
const domainSets = new Set();
console.log('Downloading hosts file...');
console.time('* Download and process Hosts');
// Parse from remote hosts & domain lists
(await Promise.all(HOSTS.map(entry => processHosts(entry[0], entry[1]))))
.forEach(hosts => {
hosts.forEach(host => {
if (host) {
domainSets.add(host);
}
});
});
console.timeEnd('* Download and process Hosts');
let previousSize = domainSets.size;
console.log(`Import ${previousSize} rules from hosts files!`);
// Parse from AdGuard Filters
console.time('* Download and process AdBlock Filter Rules');
console.time('* Download and process Hosts / AdBlock Filter Rules');
let shouldStop = false;
await Promise.all(ADGUARD_FILTERS.map(input => {
const promise = typeof input === 'string'
? processFilterRules(input, undefined, false)
: processFilterRules(input[0], input[1] || undefined, input[2] ?? false)
return promise.then((i) => {
if (i) {
const { white, black, foundDebugDomain } = i;
if (foundDebugDomain) {
shouldStop = true;
}
white.forEach(i => {
if (PREDEFINED_ENFORCED_BACKLIST.some(j => i.endsWith(j))) {
return;
}
filterRuleWhitelistDomainSets.add(i);
});
black.forEach(i => domainSets.add(i));
} else {
process.exit(1);
}
});
}));
await Promise.all([
'https://raw.githubusercontent.com/AdguardTeam/AdGuardSDNSFilter/master/Filters/exceptions.txt',
'https://raw.githubusercontent.com/AdguardTeam/AdGuardSDNSFilter/master/Filters/exclusions.txt'
].map(
input => processFilterRules(input).then((i) => {
if (i) {
const { white, black } = i;
white.forEach(i => {
if (PREDEFINED_ENFORCED_BACKLIST.some(j => i.endsWith(j))) {
return;
// Parse from remote hosts & domain lists
Promise.all(HOSTS.map(entry => processHosts(entry[0], entry[1])))
.then(r => r.forEach(hosts => {
hosts.forEach(host => {
if (host) {
domainSets.add(host);
}
filterRuleWhitelistDomainSets.add(i)
});
black.forEach(i => {
if (PREDEFINED_ENFORCED_BACKLIST.some(j => i.endsWith(j))) {
return;
}
filterRuleWhitelistDomainSets.add(i)
});
} else {
process.exit(1);
}
})
));
})),
Promise.all(ADGUARD_FILTERS.map(input => {
const promise = typeof input === 'string'
? processFilterRules(input, undefined, false)
: processFilterRules(input[0], input[1] || undefined, input[2] ?? false);
console.timeEnd('* Download and process AdBlock Filter Rules');
return promise.then((i) => {
if (i) {
const { white, black, foundDebugDomain } = i;
if (foundDebugDomain) {
shouldStop = true;
}
white.forEach(i => {
// if (PREDEFINED_ENFORCED_BACKLIST.some(j => i.endsWith(j))) {
// return;
// }
filterRuleWhitelistDomainSets.add(i);
});
black.forEach(i => domainSets.add(i));
} else {
process.exit(1);
}
});
})),
Promise.all([
'https://raw.githubusercontent.com/AdguardTeam/AdGuardSDNSFilter/master/Filters/exceptions.txt',
'https://raw.githubusercontent.com/AdguardTeam/AdGuardSDNSFilter/master/Filters/exclusions.txt'
].map(
input => processFilterRules(input).then((i) => {
if (i) {
const { white, black } = i;
white.forEach(i => {
// if (PREDEFINED_ENFORCED_BACKLIST.some(j => i.endsWith(j))) {
// return;
// }
filterRuleWhitelistDomainSets.add(i);
});
black.forEach(i => {
// if (PREDEFINED_ENFORCED_BACKLIST.some(j => i.endsWith(j))) {
// return;
// }
filterRuleWhitelistDomainSets.add(i);
});
} else {
process.exit(1);
}
})
))
]);
const trie0 = Trie.from(Array.from(filterRuleWhitelistDomainSets));
PREDEFINED_ENFORCED_BACKLIST.forEach(enforcedBlack => {
trie0.find(enforcedBlack).forEach(found => filterRuleWhitelistDomainSets.delete(found));
});
console.timeEnd('* Download and process Hosts / AdBlock Filter Rules');
if (shouldStop) {
process.exit(1);
}
previousSize = domainSets.size - previousSize;
console.log(`Import ${previousSize} rules from adguard filters!`);
let previousSize = domainSets.size;
console.log(`Import ${previousSize} rules from Hosts / AdBlock Filter Rules!`);
await fsPromises.readFile(pathResolve(__dirname, '../Source/domainset/reject_sukka.conf'), { encoding: 'utf-8' }).then(data => {
data.split('\n').forEach(line => {
const trimmed = line.trim();
if (
line.startsWith('#')
|| line.startsWith(' ')
|| line.startsWith('\r')
|| line.startsWith('\n')
|| trimmed === ''
) {
return;
}
domainSets.add(trimmed);
});
const rl1 = readline.createInterface({
input: fs.createReadStream(pathResolve(__dirname, '../Source/domainset/reject_sukka.conf'), { encoding: 'utf-8' }),
crlfDelay: Infinity
});
for await (const line of rl1) {
if (
line.startsWith('#')
|| line.startsWith(' ')
|| line.startsWith('\r')
|| line.startsWith('\n')
) {
continue;
}
const trimmed = line.trim();
if (trimmed === '') continue;
domainSets.add(trimmed);
}
previousSize = domainSets.size - previousSize;
console.log(`Import ${previousSize} rules from reject_sukka.conf!`);
await Promise.all([
// Copy reject_sukka.conf for backward compatibility
fse.copy(pathResolve(__dirname, '../Source/domainset/reject_sukka.conf'), pathResolve(__dirname, '../List/domainset/reject_sukka.conf')),
fsPromises.readFile(pathResolve(__dirname, '../List/non_ip/reject.conf'), { encoding: 'utf-8' }).then(data => {
data.split('\n').forEach(line => {
if (line.startsWith('DOMAIN-KEYWORD')) {
const [, ...keywords] = line.split(',');
domainKeywordsSet.add(keywords.join(',').trim());
} else if (line.startsWith('DOMAIN-SUFFIX')) {
const [, ...keywords] = line.split(',');
domainSuffixSet.add(keywords.join(',').trim());
}
});
}),
// Read Special Phishing Suffix list
fsPromises.readFile(pathResolve(__dirname, '../List/domainset/reject_phishing.conf'), { encoding: 'utf-8' }).then(data => {
data.split('\n').forEach(line => {
const trimmed = line.trim();
if (
line.startsWith('#')
|| line.startsWith(' ')
|| line.startsWith('\r')
|| line.startsWith('\n')
|| trimmed === ''
) {
return;
}
const rl2 = readline.createInterface({
input: fs.createReadStream(pathResolve(__dirname, '../List/non_ip/reject.conf'), { encoding: 'utf-8' }),
crlfDelay: Infinity
});
for await (const line of rl2) {
if (line.startsWith('DOMAIN-KEYWORD')) {
const [, ...keywords] = line.split(',');
domainKeywordsSet.add(keywords.join(',').trim());
} else if (line.startsWith('DOMAIN-SUFFIX')) {
const [, ...keywords] = line.split(',');
domainSuffixSet.add(keywords.join(',').trim());
}
}
domainSuffixSet.add(trimmed);
});
})
]);
const rl3 = readline.createInterface({
input: fs.createReadStream(pathResolve(__dirname, '../List/domainset/reject_phishing.conf'), { encoding: 'utf-8' }),
crlfDelay: Infinity
});
for await (const line of rl3) {
if (
line.startsWith('#')
|| line.startsWith(' ')
|| line.startsWith('\r')
|| line.startsWith('\n')
) {
continue;
}
const trimmed = line.trim();
if (trimmed === '') continue;
domainSuffixSet.add(trimmed);
}
console.log(`Import ${domainKeywordsSet.size} black keywords and ${domainSuffixSet.size} black suffixes!`);
previousSize = domainSets.size;
// Dedupe domainSets
console.log(`Start deduping from black keywords/suffixes! (${previousSize})`);
console.time(`* Dedupe from black keywords/suffixes`);
console.time('* Dedupe from black keywords/suffixes');
const trie1 = Trie.from(Array.from(domainSets));
domainSuffixSet.forEach(suffix => {
@@ -174,16 +179,14 @@ const domainSuffixSet = new Set();
// Build whitelist trie, to handle case like removing `g.msn.com` due to white `.g.msn.com` (`@@||g.msn.com`)
const trieWhite = Trie.from(Array.from(filterRuleWhitelistDomainSets));
for (const domain of domainSets) {
if (domain[0] !== '.' && trieWhite.has(`.${domain}`)) {
domainSets.delete(domain);
continue;
}
if (domain[0] === '.') {
const found = trieWhite.find(domain);
if (found.length > 0) {
if (trieWhite.contains(domain)) {
domainSets.delete(domain);
continue;
}
} else if (trieWhite.has(`.${domain}`)) {
domainSets.delete(domain);
continue;
}
// Remove keyword
@@ -192,7 +195,7 @@ const domainSuffixSet = new Set();
}
}
console.timeEnd(`* Dedupe from black keywords/suffixes`);
console.timeEnd('* Dedupe from black keywords/suffixes');
console.log(`Deduped ${previousSize} - ${domainSets.size} = ${previousSize - domainSets.size} from black keywords and suffixes!`);
previousSize = domainSets.size;
@@ -212,7 +215,7 @@ const domainSuffixSet = new Set();
if (found.length) {
found.forEach(f => {
domainSets.delete(f);
})
});
}
const a = domainStartsWithADotAndFromFullSet.slice(1);
@@ -237,12 +240,10 @@ const domainSuffixSet = new Set();
};
const sortedDomainSets = Array.from(domainSets)
.map((v) => {
return { v, domain: getDomain(v.charCodeAt(0) === 46 ? v.slice(1) : v)?.toLowerCase() || v };
return { v, domain: getDomain(v.charCodeAt(0) === 46 ? v.slice(1) : v) || v };
})
.sort(sorter)
.map((i) => {
return i.v;
});
.map((i) => i.v);
await compareAndWriteFile(
withBannerArray(
@@ -256,7 +257,7 @@ const domainSuffixSet = new Set();
'',
'Build from:',
...HOSTS.map(host => ` - ${host[0]}`),
...ADGUARD_FILTERS.map(filter => ` - ${Array.isArray(filter) ? filter[0] : filter}`),
...ADGUARD_FILTERS.map(filter => ` - ${Array.isArray(filter) ? filter[0] : filter}`)
],
new Date(),
sortedDomainSets
@@ -264,6 +265,9 @@ const domainSuffixSet = new Set();
pathResolve(__dirname, '../List/domainset/reject.conf')
);
// Copy reject_sukka.conf for backward compatibility
await fse.copy(pathResolve(__dirname, '../Source/domainset/reject_sukka.conf'), pathResolve(__dirname, '../List/domainset/reject_sukka.conf'));
console.timeEnd('* Write reject.conf');
console.timeEnd('Total Time - build-reject-domain-set');

4
Build/build-telegram-cidr.js
View File

@@ -34,7 +34,7 @@ const { withBanner } = require('./lib/with-banner');
date,
res.map(ip => {
const [subnet] = ip.split('/');
console.log(' - ' + ip + ': ' + subnet);
console.log(` - ${ip}: ${subnet}`);
if (isIPv4(subnet)) {
return `IP-CIDR,${ip},no-resolve`;
}
@@ -44,7 +44,7 @@ const { withBanner } = require('./lib/with-banner');
return '';
})
)
)
);
console.timeEnd('Total Time - build-telegram-cidr');
})();

4
Build/download-previous-build.js
View File

@@ -41,7 +41,7 @@ const fileExists = (path) => {
file: tempFile,
cwd: extractedPath,
filter: (p) => {
return p.split('/')[1] === 'List'
return p.split('/')[1] === 'List';
}
});
@@ -51,7 +51,7 @@ const fileExists = (path) => {
{
overwrite: true
}
)))
)));
await fs.promises.unlink(tempFile).catch(() => { });
await fs.promises.unlink(extractedPath).catch(() => { });

2
Build/lib/fetch-remote-text-by-line.js
View File

@@ -17,4 +17,4 @@ module.exports.fetchRemoteTextAndCreateReadlineInterface = async (url, opt) => {
input: Readable.fromWeb(resp.body),
crlfDelay: Infinity
});
}
};

4
Build/lib/is-domain-loose.js
View File

@@ -23,7 +23,7 @@ module.exports.normalizeDomain = (domain) => {
if (isIcann || isPrivate) {
return hostname;
};
}
return null;
}
};

31
Build/lib/parse-filter.js
View File

@@ -15,7 +15,7 @@ const warnOnce = (url, isWhite, ...message) => {
}
warnOnceUrl.add(key);
console.warn(url, isWhite ? '(white)' : '(black)', ...message);
}
};
/**
* @param {string | URL} domainListsUrl
@@ -99,6 +99,9 @@ async function processHosts(hostsUrl, includeAllSubDomain = false) {
return domainSets;
}
const R_KNOWN_NOT_NETWORK_FILTER_PATTERN = /[#&%~=]/;
const R_KNOWN_NOT_NETWORK_FILTER_PATTERN_2 = /(\$popup|\$removeparam|\$popunder)/;
/**
* @param {string | URL} filterRulesUrl
* @param {readonly (string | URL)[] | undefined} [fallbackUrls]
@@ -130,7 +133,7 @@ async function processFilterRules(filterRulesUrl, fallbackUrls, includeThirdPart
foundDebugDomain = true;
}
whitelistDomainSets.add(domainToBeAddedToWhite);
}
};
let filterRules;
try {
@@ -143,7 +146,7 @@ async function processFilterRules(filterRulesUrl, fallbackUrls, includeThirdPart
)
).split('\n').map(line => line.trim());
} catch (e) {
console.log('Download Rule for [' + filterRulesUrl + '] failed');
console.log(`Download Rule for [${filterRulesUrl}] failed`);
throw e;
}
@@ -154,31 +157,34 @@ async function processFilterRules(filterRulesUrl, fallbackUrls, includeThirdPart
if (
line === ''
|| line.startsWith('/')
|| R_KNOWN_NOT_NETWORK_FILTER_PATTERN.test(line)
// doesn't include
|| !line.includes('.') // rule with out dot can not be a domain
// includes
|| line.includes('#')
// || line.includes('#')
|| line.includes('!')
|| line.includes('?')
|| line.includes('*')
|| line.includes('=')
// || line.includes('=')
|| line.includes('[')
|| line.includes('(')
|| line.includes(']')
|| line.includes(')')
|| line.includes(',')
|| line.includes('~')
|| line.includes('&')
|| line.includes('%')
// || line.includes('~')
// || line.includes('&')
// || line.includes('%')
|| ((line.includes('/') || line.includes(':')) && !line.includes('://'))
// ends with
|| line.endsWith('.')
|| line.endsWith('-')
|| line.endsWith('_')
// special modifier
|| line.includes('$popup')
|| line.includes('$removeparam')
|| line.includes('$popunder')
|| R_KNOWN_NOT_NETWORK_FILTER_PATTERN_2.test(line)
// || line.includes('$popup')
// || line.includes('$removeparam')
// || line.includes('$popunder')
) {
continue;
}
@@ -393,7 +399,7 @@ async function processFilterRules(filterRulesUrl, fallbackUrls, includeThirdPart
}
/**
* @param {string[]} data
* @param {string[]} data
*/
function preprocessFullDomainSetBeforeUsedAsWorkerData(data) {
return data
@@ -401,7 +407,6 @@ function preprocessFullDomainSetBeforeUsedAsWorkerData(data) {
.sort((a, b) => a.length - b.length);
}
module.exports.processDomainLists = processDomainLists;
module.exports.processHosts = processHosts;
module.exports.processFilterRules = processFilterRules;

10
Build/lib/reject-data-source.js
View File

@@ -6,7 +6,7 @@ const HOSTS = [
['https://raw.githubusercontent.com/crazy-max/WindowsSpyBlocker/master/data/hosts/spy.txt', false],
['https://raw.githubusercontent.com/jerryn70/GoodbyeAds/master/Extension/GoodbyeAds-Xiaomi-Extension.txt', false],
['https://raw.githubusercontent.com/jdlingyu/ad-wars/master/hosts', false]
]
];
const ADGUARD_FILTERS = /** @type {const} */([
// Easy List
@@ -142,7 +142,7 @@ const ADGUARD_FILTERS = /** @type {const} */([
[
'https://curbengh.github.io/urlhaus-filter/urlhaus-filter-agh-online.txt',
[
'https://urlhaus-filter.pages.dev/urlhaus-filter-agh-online.txt',
'https://urlhaus-filter.pages.dev/urlhaus-filter-agh-online.txt'
// Prefer mirror, since malware-filter.gitlab.io has not been updated for a while
// 'https://malware-filter.gitlab.io/urlhaus-filter/urlhaus-filter-agh-online.txt'
],
@@ -152,7 +152,7 @@ const ADGUARD_FILTERS = /** @type {const} */([
[
'https://curbengh.github.io/phishing-filter/phishing-filter-agh.txt',
[
'https://phishing-filter.pages.dev/phishing-filter-agh.txt',
'https://phishing-filter.pages.dev/phishing-filter-agh.txt'
// Prefer mirror, since malware-filter.gitlab.io has not been updated for a while
// 'https://malware-filter.gitlab.io/malware-filter/phishing-filter-agh.txt'
],
@@ -162,7 +162,7 @@ const ADGUARD_FILTERS = /** @type {const} */([
[
'https://curbengh.github.io/pup-filter/pup-filter-agh.txt',
[
'https://pup-filter.pages.dev/pup-filter-agh.txt',
'https://pup-filter.pages.dev/pup-filter-agh.txt'
// Prefer mirror, since malware-filter.gitlab.io has not been updated for a while
// 'https://malware-filter.gitlab.io/malware-filter/pup-filter-agh.txt'
],
@@ -241,7 +241,7 @@ const PREDEFINED_ENFORCED_WHITELIST = [
'repl.co',
'w3s.link',
'translate.goog'
]
];
module.exports.HOSTS = HOSTS;
module.exports.ADGUARD_FILTERS = ADGUARD_FILTERS;

4
Build/lib/string-array-compare.js
View File

@@ -13,7 +13,7 @@ async function compareAndWriteFile(linesA, filePath) {
filePath,
linesA.join('\n'),
{ encoding: 'utf-8' }
)
);
} else {
console.log(`Same Content, bail out writing: ${filePath}`);
}
@@ -23,7 +23,7 @@ async function compareAndWriteFile(linesA, filePath) {
* @param {string[]} linesA
* @param {string[]} linesB
*/
function stringArrayCompare (linesA, linesB) {
function stringArrayCompare(linesA, linesB) {
if (linesA.length !== linesB.length) return false;
for (let i = 0; i < linesA.length; i++) {

20
Build/lib/trie.js
View File

@@ -31,6 +31,24 @@ class Trie {
return this;
}
/**
* @param {string} suffix
*/
contains(suffix) {
let node = this.root;
let token;
for (let i = suffix.length - 1; i >= 0; i--) {
token = suffix[i];
node = node[token];
if (node == null) return false;
}
return true;
}
/**
* Method used to retrieve every item in the trie with the given prefix.
*
@@ -42,8 +60,6 @@ class Trie {
let node = this.root;
const matches = [];
let token;
let i;
let l;
for (let i = suffix.length - 1; i >= 0; i--) {
token = suffix[i];

5
Build/validate-domainset.js
View File

@@ -72,10 +72,10 @@ const validateRuleset = async (filePath) => {
}
}
}
}
};
(async () => {
const [domainsetFiles, rulesetFiles] = await Promise.all([
const [domainsetFiles, _rulesetFiles] = await Promise.all([
listDir(path.resolve(__dirname, '../List/domainset')),
listDir(path.resolve(__dirname, '../List/non_ip'))
]);
@@ -84,4 +84,3 @@ const validateRuleset = async (filePath) => {
// rulesetFiles.map(file => validateRuleset(file))
);
})();