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: new sorting for reject hosts

Browse Source
This commit is contained in:
SukkaW
2023-03-12 14:57:40 +08:00
parent bb3d3cfdf1
commit a00f05a989
1 changed files with 20 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -6,6 +6,7 @@ const { processHosts, processFilterRules, preprocessFullDomainSetBeforeUsedAsWor
const cpuCount = require('os').cpus().length;
const { isCI } = require('ci-info');
const threads = isCI ? cpuCount : cpuCount / 2;
const { getDomain } = require('tldts');
const { HOSTS, ADGUARD_FILTERS, PREDEFINED_WHITELIST, PREDEFINED_ENFORCED_BACKLIST } = require('./lib/reject-data-source');
const { withBannerArray } = require('./lib/with-banner');
@@ -249,6 +250,24 @@ const filterRuleWhitelistDomainSets = new Set(PREDEFINED_WHITELIST);
console.time('* Write reject.conf');
const getDomainOpt = { allowPrivateDomains: true };
const sortedDomainSets = [...domainSets]
.map((v) => {
return { v, domain: getDomain(v, getDomainOpt)?.toLowerCase() || v };
})
.sort((a, b) => {
if (a.domain > b.domain) {
return 1;
}
if (a.domain < b.domain) {
return -1;
}
return 0;
})
.map(({ v }) => {
return v;
});
await compareAndWriteFile(
withBannerArray(
'Sukka\'s Surge Rules - Reject Base',
@@ -264,7 +283,7 @@ const filterRuleWhitelistDomainSets = new Set(PREDEFINED_WHITELIST);
...ADGUARD_FILTERS.map(filter => ` - ${Array.isArray(filter) ? filter[0] : filter}`),
],
new Date(),
[...domainSets].sort()
sortedDomainSets
),
pathResolve(__dirname, '../List/domainset/reject.conf')
);