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

Move AdGuardSDNSFilter to extra source

Browse Source
This commit is contained in:
SukkaW 2025-01-24 15:43:19 +08:00
parent fe7df4a457
commit 016aee9979
2 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -140,14 +140,6 @@ export const ADGUARD_FILTERS: AdGuardFilterSource[] = [
'https://filters.adtidy.org/extension/ublock/filters/118_optimized.txt' 'https://filters.adtidy.org/extension/ublock/filters/118_optimized.txt'
] ]
], ],
// AdGuard DNS Filter
[
'https://adguardteam.github.io/AdGuardSDNSFilter/Filters/filter.txt',
[
'https://filters.adtidy.org/extension/ublock/filters/15_optimized.txt',
'https://adguardteam.github.io/HostlistsRegistry/assets/filter_1.txt'
]
],
// AdGuard Base Filter // AdGuard Base Filter
[ [
'https://filters.adtidy.org/extension/ublock/filters/2_without_easylist.txt', 'https://filters.adtidy.org/extension/ublock/filters/2_without_easylist.txt',
@ -218,6 +210,16 @@ export const ADGUARD_FILTERS_WHITELIST: AdGuardFilterSource[] = [
]; ];
export const ADGUARD_FILTERS_EXTRA: AdGuardFilterSource[] = [ export const ADGUARD_FILTERS_EXTRA: AdGuardFilterSource[] = [
// AdGuard DNS Filter
// way too many other countries' domains (JP, Spanish, RU, VN, Turkish, Ukarainian, Dutch, etc.)
// EasyList, EasyPrivacy, Chinese and general filters are already included in base data source
[
'https://adguardteam.github.io/AdGuardSDNSFilter/Filters/filter.txt',
[
'https://filters.adtidy.org/extension/ublock/filters/15_optimized.txt',
'https://adguardteam.github.io/HostlistsRegistry/assets/filter_1.txt'
]
],
// no coin list adguard list is more maintained than its hosts // no coin list adguard list is more maintained than its hosts
['https://raw.githubusercontent.com/hoshsadiq/adblock-nocoin-list/master/nocoin.txt', [], true], ['https://raw.githubusercontent.com/hoshsadiq/adblock-nocoin-list/master/nocoin.txt', [], true],
// AdGuard Annoyances filter // AdGuard Annoyances filter

4
Build/lib/parse-dnsmasq.ts
View File

@ -2,7 +2,7 @@ import { createReadlineInterfaceFromResponse } from './fetch-text-by-line';
import type { UndiciResponseData } from './fetch-retry'; import type { UndiciResponseData } from './fetch-retry';
import type { Response } from 'undici'; import type { Response } from 'undici';
import { fastNormalizeDomainIgnoreWww } from './normalize-domain'; import { fastNormalizeDomain } from './normalize-domain';
export function extractDomainsFromFelixDnsmasq(line: string): string | null { export function extractDomainsFromFelixDnsmasq(line: string): string | null {
if (line.startsWith('server=/') && line.endsWith('/114.114.114.114')) { if (line.startsWith('server=/') && line.endsWith('/114.114.114.114')) {
@ -16,7 +16,7 @@ export async function parseFelixDnsmasqFromResp(resp: UndiciResponseData | Respo
for await (const line of createReadlineInterfaceFromResponse(resp, true)) { for await (const line of createReadlineInterfaceFromResponse(resp, true)) {
const domain = extractDomainsFromFelixDnsmasq(line); const domain = extractDomainsFromFelixDnsmasq(line);
if (domain && fastNormalizeDomainIgnoreWww(domain)) { if (domain && fastNormalizeDomain(domain)) {
results.push(domain); results.push(domain);
} }
} }