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

Fix Reject Process

Browse Source
This commit is contained in:
SukkaW 2024-08-05 11:28:21 +08:00
parent 7905ec447f
commit dc4d978c8a
4 changed files with 36 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -46,7 +46,7 @@ export const buildRejectDomainSet = task(require.main === module, __filename)(as
DOMAIN_LISTS_EXTRA.map(entry => processDomainLists(childSpan, ...entry).then(appendArrayToDomainSetsExtra)),
ADGUARD_FILTERS.map(
input => processFilterRules(childSpan, ...input)
entry => processFilterRules(childSpan, ...entry)
.then(({ white, black, foundDebugDomain }) => {
if (foundDebugDomain) {
// eslint-disable-next-line sukka/no-single-return -- not single return
@ -58,7 +58,7 @@ export const buildRejectDomainSet = task(require.main === module, __filename)(as
})
),
ADGUARD_FILTERS_EXTRA.map(
input => processFilterRules(childSpan, ...input)
entry => processFilterRules(childSpan, ...entry)
.then(({ white, black, foundDebugDomain }) => {
if (foundDebugDomain) {
// eslint-disable-next-line sukka/no-single-return -- not single return

4
Build/constants/reject-data-source.ts
View File

@ -56,8 +56,6 @@ export const DOMAIN_LISTS_EXTRA: HostsSource[] = [
['https://raw.githubusercontent.com/AdguardTeam/cname-trackers/master/data/combined_disguised_clickthroughs_justdomains.txt', [], true, TTL.THREE_DAYS()],
['https://raw.githubusercontent.com/AdguardTeam/cname-trackers/master/data/combined_disguised_microsites_justdomains.txt', [], true, TTL.THREE_DAYS()],
['https://raw.githubusercontent.com/AdguardTeam/cname-trackers/master/data/combined_disguised_mail_trackers_justdomains.txt', [], true, TTL.THREE_DAYS()],
// AdGuard Cookie Notices
['https://filters.adtidy.org/extension/ublock/filters/18_optimized.txt', [], true, TTL.THREE_HOURS()],
// Curben's PUP Domains Blocklist
// 'https://curbengh.github.io/pup-filter/pup-filter-agh.txt'
// 'https://pup-filter.pages.dev/pup-filter-agh.txt'
@ -154,6 +152,8 @@ export const ADGUARD_FILTERS: AdGuardFilterSource[] = [
export const ADGUARD_FILTERS_EXTRA: AdGuardFilterSource[] = [
// AdGuard Annoyances filter
['https://filters.adtidy.org/android/filters/14_optimized.txt', null, TTL.THREE_HOURS()],
// AdGuard Cookie Notices
['https://filters.adtidy.org/extension/ublock/filters/18_optimized.txt', null, TTL.THREE_HOURS()],
// EasyList Germany filter
[
'https://easylist.to/easylistgermany/easylistgermany.txt',

18
Build/lib/parse-filter.test.ts Normal file
View File

@ -0,0 +1,18 @@
import { describe, it } from 'mocha';
import { processFilterRules } from './parse-filter';
import { createCacheKey } from './cache-filesystem';
import { createSpan } from '../trace';
const cacheKey = createCacheKey(__filename);
describe('processFilterRules', () => {
it('https://filters.adtidy.org/extension/ublock/filters/18_optimized.txt', () => {
console.log(processFilterRules(
createSpan('noop'),
cacheKey('https://filters.adtidy.org/extension/ublock/filters/18_optimized.txt'),
[],
7_200_000
));
});
});

17
Build/lib/parse-filter.ts
View File

@ -14,14 +14,25 @@ import { looseTldtsOpt } from '../constants/loose-tldts-opt';
const DEBUG_DOMAIN_TO_FIND: string | null = null; // example.com | null
let foundDebugDomain = false;
const temporaryBypass = true;
const temporaryBypass = typeof DEBUG_DOMAIN_TO_FIND === 'string';
const domainListLineCb = (l: string, set: string[], includeAllSubDomain: boolean, meta: string) => {
let line = processLine(l);
if (!line) return;
line = line.toLowerCase();
line = normalizeDomain(line);
if (!line) return;
const domain = normalizeDomain(line);
if (!domain) return;
if (domain !== line) {
console.log(
picocolors.red('[process domain list]'),
picocolors.gray(`line: ${line}`),
picocolors.gray(`domain: ${domain}`),
picocolors.gray(meta)
);
return;
}
if (DEBUG_DOMAIN_TO_FIND && line.includes(DEBUG_DOMAIN_TO_FIND)) {
console.warn(picocolors.red(meta), '(black)', line.replaceAll(DEBUG_DOMAIN_TO_FIND, picocolors.bold(DEBUG_DOMAIN_TO_FIND)));