Merge DNS Mapping Ruleset / Update DNS Bootstrap

Source/non_ip/direct.ts

@@ -22,7 +22,7 @@ export const DIRECTS = {
     dns: 'system',
     hosts: {},
     realip: false,
-    ruleset: false,
+    ruleset: true,
     domains: [
       'securelogin.com.cn',
       '$captive.apple.com',
@@ -37,7 +37,7 @@ export const DIRECTS = {
     domains: [
       '+m2m',
       // '+ts.net', // TailScale Magic DNS
-      // AdGuard
+      // AdGuard -- needs to be real ip otherwise AdGuard App will not recognize it, mustn't be fake ip
       '$injections.adguard.org',
       '$local.adguard.org',
       // Auto Discovery
@@ -47,13 +47,16 @@ export const DIRECTS = {
 } as const satisfies Record<string, DNSMapping>;
 
 export const LAN = {
-  ROUTER: {
+  LAN_WITHOUT_REAL_IP: {
     dns: 'system',
-    hosts: {},
+    hosts: {
+      '127.0.0.1.sslip.io': ['127.0.0.1'],
+      '127.atlas.skk.moe': ['127.0.0.1']
+    },
     realip: false,
     ruleset: true,
     domains: [
-      '+home',
+      // Common Router
       // 'zte.home', // ZTE CPE
       // 'airbox.home',
       // 'bthub.home',
@@ -101,20 +104,10 @@ export const LAN = {
       '$mobile.hotspot', // T-Mobile Hotspot
       '$ntt.setup',
       '$pi.hole',
-      '+plex.direct'
+      '+plex.direct',
       // 'web.setup'
-    ]
-  },
-  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']
-    },
-    realip: false,
-    ruleset: true,
-    domains: [
       // AS112
+      '+home',
       '10.in-addr.arpa',
       '16.172.in-addr.arpa',
       '17.172.in-addr.arpa',
@@ -161,12 +154,12 @@ export const LAN = {
 export const HOSTS = {
   HOSTS: {
     // not actually used, only for a placeholder
-    dns: 'quic://dns.alidns.com:853',
+    dns: '',
     hosts: {
       'cdn.jsdelivr.net': ['cdn.jsdelivr.net.cdn.cloudflare.net']
     },
     realip: false,
     ruleset: false,
-    domains: []
+    domains: [] as never[]
   }
 } as const satisfies Record<string, DNSMapping>;

Source/non_ip/domestic.ts

@@ -402,16 +402,16 @@ export const DOH_BOOTSTRAP: Record<string, DNSMapping> = {
   DNSPOD: {
     hosts: {
       // 'dot.pub': ['120.53.53.53', '1.12.12.12'],
-      'doh.pub': ['120.53.53.53', '1.12.12.12']
+      // 'doh.pub': ['120.53.53.53', '1.12.12.12']
       // 'dns.pub': ['120.53.53.53', '1.12.12.12']
     },
     realip: false,
     ruleset: false,
-    dns: 'https://1.12.12.12/dns-query',
+    dns: '119.29.29.29',
     domains: [
-      // '$dot.pub',
-      '$doh.pub'
-      // '$dns.pub'
+      '$dot.pub',
+      '$doh.pub',
+      '$dns.pub'
     ]
   },
   QIHOO360: {