浏览代码

Update LAN Hosts

SukkaW 1 年之前
父节点
当前提交
af73adeef5

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

@@ -1,7 +1,7 @@
 // @ts-check
 import path from 'node:path';
 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 { readFileIntoProcessedArray } from './lib/fetch-text-by-line';
 import { compareAndWriteFile } from './lib/create-file';
@@ -68,8 +68,8 @@ export const getDomesticAndDirectDomainsRulesetPromise = createMemoizedPromise(a
     appendArrayInPlace(directs, domains.flatMap(getDnsMappingRuleWithWildcard));
   });
 
-  DIRECTS.LAN.domains.forEach((domain) => {
-    appendArrayInPlace(lans, getDnsMappingRuleWithWildcard(domain));
+  Object.values(LAN).forEach(({ domains }) => {
+    appendArrayInPlace(directs, domains.flatMap(getDnsMappingRuleWithWildcard));
   });
 
   return [domestics, directs, lans] as const;

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

@@ -1,7 +1,7 @@
 import path from 'node:path';
 import { task } from './trace';
 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 { DOMESTICS, DOH_BOOTSTRAP } from '../Source/non_ip/domestic';
 import * as yaml from 'yaml';
@@ -47,7 +47,7 @@ export const buildAlwaysRealIPModule = task(require.main === module, __filename)
     ]);
 
   // 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) => {
       if (i.realip) {
         acc.push(i);

+ 19 - 16
Source/non_ip/direct.ts

@@ -26,6 +26,25 @@ export const DIRECTS = {
       '$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: {
     dns: 'system',
     hosts: {},
@@ -83,22 +102,6 @@ export const DIRECTS = {
       // '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: {
     dns: 'system',
     hosts: {