浏览代码

Update Real IP / DNS Mapping

SukkaW 1 周之前
父节点
当前提交
baa08e25e4

+ 2 - 3
Build/build-domestic-direct-lan-ruleset-dns-mapping-module.ts

@@ -12,8 +12,7 @@ import { once } from 'foxts/once';
 import * as yaml from 'yaml';
 import { appendArrayInPlace } from 'foxts/append-array-in-place';
 import { OUTPUT_INTERNAL_DIR, OUTPUT_MODULES_DIR, OUTPUT_MODULES_RULES_DIR, SOURCE_DIR } from './constants/dir';
-import { MihomoNameserverPolicyOutput, RulesetOutput } from './lib/rules/ruleset';
-import { SurgeOnlyRulesetOutput } from './lib/rules/ruleset';
+import { MihomoNameserverPolicyOutput, RulesetOutput, SurgeOnlyRulesetOutput } from './lib/rules/ruleset';
 import { $$fetch } from './lib/fetch-retry';
 
 export function createGetDnsMappingRule(allowWildcard: boolean) {
@@ -300,8 +299,8 @@ export const buildDomesticRuleset = task(require.main === module, __filename)(as
       span,
       [
         '# Local DNS Mapping for AdGuard Home',
-        'tls://dot.pub',
         'https://doh.pub/dns-query',
+        'https://dns.alidns.com/dns-query',
         '[//]udp://10.10.1.1:53',
         ...(([DOMESTICS, DIRECTS, LAN, HOSTS] as const).flatMap(Object.values) as DNSMapping[]).flatMap(({ domains, dns: _dns }) => domains.flatMap((domain) => {
           if (!_dns) {

+ 2 - 1
Build/build-sgmodule-always-realip.ts

@@ -52,7 +52,8 @@ const HOSTNAMES = [
   '127.*.*.*.nip.io',
   '127-*-*-*.nip.io',
   '*.127.*.*.*.nip.io',
-  '*-127-*-*-*.nip.io'
+  '*-127-*-*-*.nip.io',
+  '127.atlas.skk.moe'
 ];
 
 export const buildAlwaysRealIPModule = task(require.main === module, __filename)(async (span) => {

+ 3 - 10
Source/non_ip/direct.ts

@@ -61,10 +61,7 @@ export const LAN = {
   },
   LAN_WITHOUT_REAL_IP: {
     dns: 'system',
-    hosts: {
-      '127.0.0.1.sslip.io': ['127.0.0.1'],
-      '127.atlas.skk.moe': ['127.0.0.1']
-    },
+    hosts: {},
     realip: false,
     ruleset: true,
     domains: [
@@ -144,9 +141,7 @@ export const LAN = {
   },
   LAN_WITH_REALIP: {
     dns: 'system',
-    hosts: {
-      // localhost: ['127.0.0.1']
-    },
+    hosts: {},
     realip: true,
     ruleset: true,
     domains: [
@@ -159,9 +154,7 @@ export const LAN = {
       // 'amplifi.lan',
       // '$localhost',
       '+localdomain',
-      'home.arpa',
-      '127.0.0.1.sslip.io',
-      '127.atlas.skk.moe'
+      'home.arpa'
     ]
   }
 } as const satisfies Record<string, DNSMapping>;

+ 4 - 4
Source/non_ip/domestic.ts

@@ -3,7 +3,7 @@ import type { DNSMapping } from './direct';
 export const DOMESTICS: Record<string, DNSMapping> = {
   ALIBABA: {
     hosts: {},
-    dns: 'quic://dns.alidns.com:853',
+    dns: 'https://dns.alidns.com/dns-query',
     realip: false,
     ruleset: true,
     domains: [
@@ -458,9 +458,9 @@ export const DOH_BOOTSTRAP: Record<string, DNSMapping> = {
 
 export const AdGuardHomeDNSMapping = {
   system: ['udp://10.10.1.1:53'],
-  'https://doh.pub/dns-query': ['tls://dot.pub', 'https://doh.pub/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'],
+  'https://doh.pub/dns-query': ['https://doh.pub/dns-query'],
+  'https://dns.alidns.com/dns-query': ['https://dns.alidns.com/dns-query'],
+  'https://doh.360.cn/dns-query': ['https://doh.360.cn/dns-query'],
   '180.76.76.76': ['udp://180.76.76.76'],
   '180.184.2.2': ['udp://180.184.2.2', 'udp://180.184.1.1']
 };