Update LAN Hosts

This commit is contained in:
SukkaW 2024-11-07 20:42:59 +08:00
parent 000c2b402f
commit af73adeef5
3 changed files with 24 additions and 21 deletions

View File

@ -1,7 +1,7 @@
// @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 } from '../Source/non_ip/domestic';
import { DIRECTS } 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';
import { compareAndWriteFile } from './lib/create-file'; import { compareAndWriteFile } from './lib/create-file';
@ -68,8 +68,8 @@ export const getDomesticAndDirectDomainsRulesetPromise = createMemoizedPromise(a
appendArrayInPlace(directs, domains.flatMap(getDnsMappingRuleWithWildcard)); appendArrayInPlace(directs, domains.flatMap(getDnsMappingRuleWithWildcard));
}); });
DIRECTS.LAN.domains.forEach((domain) => { Object.values(LAN).forEach(({ domains }) => {
appendArrayInPlace(lans, getDnsMappingRuleWithWildcard(domain)); appendArrayInPlace(directs, domains.flatMap(getDnsMappingRuleWithWildcard));
}); });
return [domestics, directs, lans] as const; return [domestics, directs, lans] as const;

View File

@ -1,7 +1,7 @@
import path from 'node:path'; import path from 'node:path';
import { task } from './trace'; import { task } from './trace';
import { compareAndWriteFile, DomainsetOutput } from './lib/create-file'; import { compareAndWriteFile, DomainsetOutput } from './lib/create-file';
import { DIRECTS } 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 { DOMESTICS, DOH_BOOTSTRAP } from '../Source/non_ip/domestic'; import { DOMESTICS, DOH_BOOTSTRAP } from '../Source/non_ip/domestic';
import * as yaml from 'yaml'; import * as yaml from 'yaml';
@ -47,7 +47,7 @@ export const buildAlwaysRealIPModule = task(require.main === module, __filename)
]); ]);
// Intranet, Router Setup, and mant more // Intranet, Router Setup, and mant more
const dataset = [DIRECTS, DOMESTICS, DOH_BOOTSTRAP].reduce<DNSMapping[]>((acc, item) => { const dataset = [DIRECTS, LAN, DOMESTICS, DOH_BOOTSTRAP].reduce<DNSMapping[]>((acc, item) => {
Object.values(item).forEach((i: DNSMapping) => { Object.values(item).forEach((i: DNSMapping) => {
if (i.realip) { if (i.realip) {
acc.push(i); acc.push(i);

View File

@ -26,6 +26,25 @@ export const DIRECTS = {
'$hotspot.cslwifi.com' '$hotspot.cslwifi.com'
] ]
}, },
SYSTEM: {
dns: 'system',
hosts: {},
realip: true,
domains: [
'+m2m',
// '+ts.net', // TailScale Magic DNS
// AdGuard
'$injections.adguard.org',
'$local.adguard.org',
// Auto Discovery
'+_tcp',
'+bogon',
'+_msdcs'
]
}
} as const satisfies Record<string, DNSMapping>;
export const LAN = {
ROUTER: { ROUTER: {
dns: 'system', dns: 'system',
hosts: {}, hosts: {},
@ -83,22 +102,6 @@ export const DIRECTS = {
// 'web.setup' // 'web.setup'
] ]
}, },
SYSTEM: {
dns: 'system',
hosts: {},
realip: true,
domains: [
'+m2m',
// '+ts.net', // TailScale Magic DNS
// AdGuard
'$injections.adguard.org',
'$local.adguard.org',
// Auto Discovery
'+_tcp',
'+bogon',
'+_msdcs'
]
},
LAN: { LAN: {
dns: 'system', dns: 'system',
hosts: { hosts: {