From af73adeef5c13d9917a49c2ffa0f072b79520ad5 Mon Sep 17 00:00:00 2001
From: SukkaW <isukkaw@gmail.com>
Date: Thu, 7 Nov 2024 20:42:59 +0800
Subject: [PATCH] Update LAN Hosts

---
 ...c-direct-lan-ruleset-dns-mapping-module.ts |  6 ++--
 Build/build-sgmodule-always-realip.ts         |  4 +--
 Source/non_ip/direct.ts                       | 35 ++++++++++---------
 3 files changed, 24 insertions(+), 21 deletions(-)

diff --git a/Build/build-domestic-direct-lan-ruleset-dns-mapping-module.ts b/Build/build-domestic-direct-lan-ruleset-dns-mapping-module.ts
index a8686ee4..c7e00a4d 100644
--- a/Build/build-domestic-direct-lan-ruleset-dns-mapping-module.ts
+++ b/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;
diff --git a/Build/build-sgmodule-always-realip.ts b/Build/build-sgmodule-always-realip.ts
index 0108ad45..9b5cf775 100644
--- a/Build/build-sgmodule-always-realip.ts
+++ b/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);
diff --git a/Source/non_ip/direct.ts b/Source/non_ip/direct.ts
index 088a99f5..456e2294 100644
--- a/Source/non_ip/direct.ts
+++ b/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: {