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

Chore: minor changes AdGuardHome Mapping

Browse Source
This commit is contained in:
SukkaW 2024-12-19 22:30:14 +08:00
parent 412ac53ef2
commit cba19c462e
2 changed files with 30 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
Build/build-domestic-direct-lan-ruleset-dns-mapping-module.ts
View File

@ -1,6 +1,6 @@
// @ts-check // @ts-check
import path from 'node:path'; import path from 'node:path';
import { DOMESTICS, DOH_BOOTSTRAP } from '../Source/non_ip/domestic'; import { DOMESTICS, DOH_BOOTSTRAP, AdGuardHomeDNSMapping } from '../Source/non_ip/domestic';
import { DIRECTS, LAN } from '../Source/non_ip/direct'; import { DIRECTS, LAN } from '../Source/non_ip/direct';
import type { DNSMapping } from '../Source/non_ip/direct'; import type { DNSMapping } from '../Source/non_ip/direct';
import { readFileIntoProcessedArray } from './lib/fetch-text-by-line'; import { readFileIntoProcessedArray } from './lib/fetch-text-by-line';
@ -186,20 +186,28 @@ export const buildDomesticRuleset = task(require.main === module, __filename)(as
span, span,
[ [
'# Local DNS Mapping for AdGuard Home', '# Local DNS Mapping for AdGuard Home',
'', 'tls://1.12.12.12',
'tls://120.53.53.53',
'https://1.12.12.12/dns-query',
'https://120.53.53.53/dns-query',
'[//]udp://10.10.1.1:53', '[//]udp://10.10.1.1:53',
...dataset.flatMap(({ domains, dns: _dns }) => domains.flatMap((domain) => { ...(([DOMESTICS, DIRECTS, LAN] as const).flatMap(Object.values) as DNSMapping[]).flatMap(({ domains, dns: _dns }) => domains.flatMap((domain) => {
const dns = _dns === 'system' let dns;
? 'udp://10.10.1.1:53' if (_dns in AdGuardHomeDNSMapping) {
: _dns; dns = AdGuardHomeDNSMapping[_dns as keyof typeof AdGuardHomeDNSMapping].join(' ');
if ( } else {
// AdGuard Home has built-in AS112 / private PTR handling console.warn(`Unknown DNS "${_dns}" not in AdGuardHomeDNSMapping`);
domain.endsWith('.arpa') dns = _dns;
// Ignore simple hostname
|| !domain.includes('.')
) {
return [];
} }
// if (
// // AdGuard Home has built-in AS112 / private PTR handling
// domain.endsWith('.arpa')
// // Ignore simple hostname
// || !domain.includes('.')
// ) {
// return [];
// }
if (domain[0] === '$') { if (domain[0] === '$') {
return [ return [
`[/${domain.slice(1)}/]${dns}` `[/${domain.slice(1)}/]${dns}`

9
Source/non_ip/domestic.ts
View File

@ -392,3 +392,12 @@ export const DOH_BOOTSTRAP: Record<string, DNSMapping> = {
] ]
} }
}; };
export const AdGuardHomeDNSMapping = {
system: ['udp://10.10.1.1:53'],
'https://doh.pub/dns-query': ['tls://1.12.12.12', 'tls://120.53.53.53', 'https://1.12.12.12/dns-query', 'https://120.53.53.53/dns-query'],
'quic://dns.alidns.com:853': ['quic://223.5.5.5', 'quic://223.6.6.6', 'h3://223.5.5.5/dns-query', 'h3://223.6.6.6/dns-query'],
'https://doh.360.cn/dns-query': ['https://doh.360.cn/dns-query', 'tls://dot.360.cn'],
'180.76.76.76': ['udp://180.76.76.76'],
'180.184.2.2': ['udp://180.184.2.2', 'udp://180.184.1.1']
};