From a532f7969fb1f49105facec60bba469d78771d47 Mon Sep 17 00:00:00 2001
From: Seyed Mahdi <39972836+SeyedHashtag@users.noreply.github.com>
Date: Tue, 27 May 2025 15:00:14 +0330
Subject: [PATCH] refactor: reorganize DNS configuration and enhance routing
 rules in singbox.json

---
 core/scripts/normalsub/singbox.json | 203 ++++++++++++++--------------
 1 file changed, 101 insertions(+), 102 deletions(-)

diff --git a/core/scripts/normalsub/singbox.json b/core/scripts/normalsub/singbox.json
index 8a3e050..2bb7ea3 100644
--- a/core/scripts/normalsub/singbox.json
+++ b/core/scripts/normalsub/singbox.json
@@ -1,159 +1,158 @@
 {
-  "log": {
-    "level": "warn",
-    "timestamp": true
-  },
   "dns": {
-    "servers": [
-      {
-        "tag": "proxyDns",
-        "address": "https://1.1.1.1/dns-query",
-        "detour": "Proxy"
-      },
-      {
-        "tag": "localDns",
-        "address": "local",
-        "detour": "direct"
-      }
-    ],
+    "final": "local-dns",
     "rules": [
       {
-        "rule_set": "geosite-ir",
-        "server": "localDns"
+        "action": "route",
+        "clash_mode": "Global",
+        "server": "proxy-dns",
+        "source_ip_cidr": [
+          "172.19.0.0/30",
+          "fdfe:dcba:9876::1/126"
+        ]
       },
       {
-        "clash_mode": "direct",
-        "server": "localDns"
-      },
-      {
-        "clash_mode": "global",
-        "server": "proxyDns"
+        "action": "route",
+        "server": "proxy-dns",
+        "source_ip_cidr": [
+          "172.19.0.0/30",
+          "fdfe:dcba:9876::1/126"
+        ]
+      }
+    ],
+    "servers": [
+      {
+        "address": "https://1.1.1.1/dns-query",
+        "address_resolver": "local-dns",
+        "detour": "proxy",
+        "tag": "proxy-dns"
+      },
+      {
+        "address": "local",
+        "detour": "direct",
+        "tag": "local-dns"
       }
     ],
-    "final": "proxyDns",
     "strategy": "prefer_ipv4"
   },
   "inbounds": [
     {
-      "tag": "tun-in",
-      "type": "tun",
       "address": [
-        "172.19.0.0/30",
+        "172.19.0.1/30",
         "fdfe:dcba:9876::1/126"
       ],
-      "mtu": 9000,
       "auto_route": true,
-      "strict_route": false,
-      "stack": "system",
+      "endpoint_independent_nat": false,
+      "mtu": 9000,
       "platform": {
         "http_proxy": {
           "enabled": true,
           "server": "127.0.0.1",
           "server_port": 2080
         }
-      }
+      },
+      "stack": "system",
+      "strict_route": false,
+      "type": "tun"
     },
     {
-      "tag": "mixed-in",
-      "type": "mixed",
       "listen": "127.0.0.1",
-      "listen_port": 2080
+      "listen_port": 2080,
+      "type": "mixed",
+      "users": []
     }
   ],
+  "log": {
+    "level": "warn",
+    "timestamp": true
+  },
   "outbounds": [
     {
-      "tag": "Proxy",
-      "type": "selector",
       "outbounds": [
         "auto",
         "direct"
-      ]
-    },
-    {
-      "tag": "Global",
-      "type": "selector",
-      "outbounds": [
-        "direct"
-      ]
-    },
-    {
-      "tag": "auto",
-      "type": "urltest",
-      "outbounds": [
-        "Proxy"
       ],
-      "url": "http://www.gstatic.com/generate_204",
+      "tag": "proxy",
+      "type": "selector"
+    },
+    {
       "interval": "10m",
-      "tolerance": 50
+      "outbounds": [],
+      "tag": "auto",
+      "tolerance": 50,
+      "type": "urltest",
+      "url": "http://www.gstatic.com/generate_204"
     },
     {
-      "type": "direct",
-      "tag": "direct"
-    },
-    {
-      "type": "direct",
-      "tag": "local"
+      "tag": "direct",
+      "type": "direct"
     }
   ],
   "route": {
     "auto_detect_interface": true,
-    "final": "Proxy",
+    "final": "proxy",
+    "rule_set": [
+      {
+        "download_detour": "direct",
+        "format": "binary",
+        "tag": "geosite-ads",
+        "type": "remote",
+        "url": "https://testingcf.jsdelivr.net/gh/MetaCubeX/meta-rules-dat@sing/geo/geosite/category-ads-all.srs"
+      },
+      {
+        "download_detour": "direct",
+        "format": "binary",
+        "tag": "geosite-private",
+        "type": "remote",
+        "url": "https://testingcf.jsdelivr.net/gh/MetaCubeX/meta-rules-dat@sing/geo/geosite/private.srs"
+      },
+      {
+        "download_detour": "direct",
+        "format": "binary",
+        "tag": "geosite-ir",
+        "type": "remote",
+        "url": "https://testingcf.jsdelivr.net/gh/MetaCubeX/meta-rules-dat@sing/geo/geosite/category-ir.srs"
+      },
+      {
+        "download_detour": "direct",
+        "format": "binary",
+        "tag": "geoip-ir",
+        "type": "remote",
+        "url": "https://testingcf.jsdelivr.net/gh/MetaCubeX/meta-rules-dat@sing/geo/geoip/ir.srs"
+      }
+    ],
     "rules": [
       {
-        "inbound": [
-          "tun-in",
-          "mixed-in"
-        ],
         "action": "sniff"
       },
       {
-        "protocol": "dns",
-        "action": "hijack-dns"
-      },
-      {
-        "rule_set": "geosite-category-ads-all",
-        "action": "reject"
-      },
-      {
-        "rule_set": "geosite-category-ads-all",
-        "outbound": "Proxy"
-      },
-      {
-        "ip_is_private": true,
+        "action": "route",
+        "clash_mode": "Direct",
         "outbound": "direct"
       },
       {
         "action": "route",
-        "rule_set": "geosite-ir",
-        "outbound": "direct"
+        "clash_mode": "Global",
+        "outbound": "proxy"
+      },
+      {
+        "action": "hijack-dns",
+        "protocol": "dns"
       },
       {
         "action": "route",
-        "rule_set": "geoip-ir",
-        "outbound": "direct"
-      }
-    ],
-    "rule_set": [
-      {
-        "tag": "geosite-category-ads-all",
-        "type": "remote",
-        "format": "binary",
-        "url": "https://raw.githubusercontent.com/Chocolate4U/Iran-sing-box-rules/rule-set/geosite-category-ads-all.srs",
-        "download_detour": "direct"
+        "outbound": "direct",
+        "rule_set": [
+          "geosite-ir",
+          "geoip-ir",
+          "geosite-private"
+        ]
       },
       {
-        "type": "remote",
-        "tag": "geoip-ir",
-        "format": "binary",
-        "url": "https://raw.githubusercontent.com/Chocolate4U/Iran-sing-box-rules/rule-set/geoip-ir.srs",
-        "update_interval": "120h0m0s"
-      },
-      {
-        "type": "remote",
-        "tag": "geosite-ir",
-        "format": "binary",
-        "url": "https://raw.githubusercontent.com/Chocolate4U/Iran-sing-box-rules/rule-set/geosite-ir.srs",
-        "update_interval": "120h0m0s"
+        "action": "reject",
+        "rule_set": [
+          "geosite-ads"
+        ]
       }
     ]
   }