GithubFollow/Surge_by_SukkaW
1
0
Fork 0
mirror of https://github.com/SukkaW/Surge.git synced 2025-12-14 02:00:37 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Feat: AdGuard Home blocklist

Browse Source
This commit is contained in:
SukkaW 2024-10-12 11:19:39 +08:00
parent c987b33ee2
commit dc221f5269
2 changed files with 42 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
Build/build-reject-domainset.ts
View File

@ -18,20 +18,23 @@ import { setAddFromArray } from './lib/set-add-from-array';
import { appendArrayInPlace } from './lib/append-array-in-place'; import { appendArrayInPlace } from './lib/append-array-in-place';
import { OUTPUT_INTERNAL_DIR, SOURCE_DIR } from './constants/dir'; import { OUTPUT_INTERNAL_DIR, SOURCE_DIR } from './constants/dir';
import { DomainsetOutput } from './lib/create-file'; import { DomainsetOutput } from './lib/create-file';
import { withBannerArray } from './lib/misc';
export const buildRejectDomainSet = task(require.main === module, __filename)(async (span) => { export const buildRejectDomainSet = task(require.main === module, __filename)(async (span) => {
const rejectBaseDescription = [
...SHARED_DESCRIPTION,
'',
'The domainset supports AD blocking, tracking protection, privacy protection, anti-phishing, anti-mining',
'',
'Build from:',
...HOSTS.map(host => ` - ${host[0]}`),
...DOMAIN_LISTS.map(domainList => ` - ${domainList[0]}`),
...ADGUARD_FILTERS.map(filter => ` - ${Array.isArray(filter) ? filter[0] : filter}`)
];
const rejectOutput = new DomainsetOutput(span, 'reject') const rejectOutput = new DomainsetOutput(span, 'reject')
.withTitle('Sukka\'s Ruleset - Reject Base') .withTitle('Sukka\'s Ruleset - Reject Base')
.withDescription([ .withDescription(rejectBaseDescription);
...SHARED_DESCRIPTION,
'',
'The domainset supports AD blocking, tracking protection, privacy protection, anti-phishing, anti-mining',
'',
'Build from:',
...HOSTS.map(host => ` - ${host[0]}`),
...DOMAIN_LISTS.map(domainList => ` - ${domainList[0]}`),
...ADGUARD_FILTERS.map(filter => ` - ${Array.isArray(filter) ? filter[0] : filter}`)
]);
const rejectExtraOutput = new DomainsetOutput(span, 'reject_extra') const rejectExtraOutput = new DomainsetOutput(span, 'reject_extra')
.withTitle('Sukka\'s Ruleset - Reject Extra') .withTitle('Sukka\'s Ruleset - Reject Extra')
@ -156,6 +159,16 @@ export const buildRejectDomainSet = task(require.main === module, __filename)(as
span, span,
rejectDomainsStats, rejectDomainsStats,
path.join(OUTPUT_INTERNAL_DIR, 'reject-stats.txt') path.join(OUTPUT_INTERNAL_DIR, 'reject-stats.txt')
),
compareAndWriteFile(
span,
withBannerArray(
'Sukka\'s Ruleset - Blocklist for AdGuardHome',
rejectBaseDescription,
new Date(),
rejectOutput.adguardhome(filterRuleWhitelistDomainSets)
),
path.join(OUTPUT_INTERNAL_DIR, 'reject-adguardhome.txt')
) )
]); ]);
}); });

19
Build/lib/rules/domainset.ts
View File

@ -3,6 +3,7 @@ import createKeywordFilter from '../aho-corasick';
import { buildParseDomainMap, sortDomains } from '../stable-sort-domain'; import { buildParseDomainMap, sortDomains } from '../stable-sort-domain';
import { RuleOutput } from './base'; import { RuleOutput } from './base';
import type { SingboxSourceFormat } from '../singbox'; import type { SingboxSourceFormat } from '../singbox';
import { appendArrayFromSet } from '../misc';
type Preprocessed = string[]; type Preprocessed = string[];
@ -86,4 +87,22 @@ export class DomainsetOutput extends RuleOutput<Preprocessed> {
} }
mitmSgmodule = undefined; mitmSgmodule = undefined;
adguardhome(whitelist: Set<string | `.${string}`>): string[] {
const results: string[] = [];
// whitelist
appendArrayFromSet(results, whitelist, i => (i[0] === '.' ? '@@||' + i.slice(1) + '^' : '@@|' + i + '^'));
for (let i = 0, len = this.$preprocessed.length; i < len; i++) {
const domain = this.$preprocessed[i];
if (domain[0] === '.') {
results.push(`||${domain.slice(1)}^`);
} else {
results.push(`|${domain}^`);
}
}
return results;
}
} }