From cbdf386f3701064e293b97824bab6b84670dbc0f Mon Sep 17 00:00:00 2001
From: Xi Xu <i@xi-xu.me>
Date: Wed, 9 Oct 2024 01:53:39 +0800
Subject: [PATCH] Update script.js

---
 script.js | 119 +++++++++++++++++++++++-------------------------------
 1 file changed, 50 insertions(+), 69 deletions(-)

diff --git a/script.js b/script.js
index bbb944b..026cbd9 100644
--- a/script.js
+++ b/script.js
@@ -1,55 +1,5 @@
 // GitHub repository URL: https://github.com/xixu-me/MCG
 
-function generateGeneralConfig(config) {
-    config["global-client-fingerprint"] = "chrome";
-}
-
-const chineseNameservers = [
-    "https://dns.alidns.com/dns-query",
-    "https://doh.pub/dns-query",
-];
-
-const internationalNameservers = [
-    "https://1.1.1.1/dns-query",
-    "https://1.0.0.1/dns-query",
-    "https://208.67.222.222/dns-query",
-    "https://208.67.220.220/dns-query",
-    "https://194.242.2.2/dns-query",
-    "https://194.242.2.3/dns-query",
-];
-
-const dns = {
-    enable: true,
-    listen: "0.0.0.0:1053",
-    ipv6: false,
-    "use-system-hosts": false,
-    "enhanced-mode": "fake-ip",
-    "fake-ip-range": "198.18.0.1/16",
-    "fake-ip-filter": [
-        "*",
-        "+.lan",
-        "+.local",
-        "time.*.com",
-        "ntp.*.com",
-        "+.msftconnecttest.com",
-        "+.msftncsi.com",
-        "localhost.ptlogin2.qq.com",
-        "localhost.sec.qq.com",
-        "localhost.work.weixin.qq.com",
-    ],
-    "default-nameserver": ["223.5.5.5", "119.29.29.29", "1.1.1.1", "8.8.8.8"],
-    nameserver: [...chineseNameservers, ...internationalNameservers],
-    "proxy-server-nameserver": [
-        ...chineseNameservers,
-        ...internationalNameservers,
-    ],
-    "nameserver-policy": {
-        "geosite:private,cn,geolocation-cn": chineseNameservers,
-        "geosite:google,youtube,telegram,gfw,geolocation-!cn":
-            internationalNameservers,
-    },
-};
-
 const services = [
     {
         name: "bilibili",
@@ -156,6 +106,56 @@ const locations = [
     },
 ];
 
+function generateGeneralConfig(config) {
+    config["global-client-fingerprint"] = "chrome";
+}
+
+const chineseNameservers = [
+    "https://dns.alidns.com/dns-query",
+    "https://doh.pub/dns-query",
+];
+
+const internationalNameservers = [
+    "https://1.1.1.1/dns-query",
+    "https://1.0.0.1/dns-query",
+    "https://208.67.222.222/dns-query",
+    "https://208.67.220.220/dns-query",
+    "https://194.242.2.2/dns-query",
+    "https://194.242.2.3/dns-query",
+];
+
+const dns = {
+    enable: true,
+    listen: "0.0.0.0:1053",
+    ipv6: false,
+    "use-system-hosts": false,
+    "enhanced-mode": "fake-ip",
+    "fake-ip-range": "198.18.0.1/16",
+    "fake-ip-filter": [
+        "*",
+        "+.lan",
+        "+.local",
+        "time.*.com",
+        "ntp.*.com",
+        "+.msftconnecttest.com",
+        "+.msftncsi.com",
+        "localhost.ptlogin2.qq.com",
+        "localhost.sec.qq.com",
+        "localhost.work.weixin.qq.com",
+    ],
+    "default-nameserver": ["223.5.5.5", "119.29.29.29", "1.1.1.1", "8.8.8.8"],
+    nameserver: [...chineseNameservers, ...internationalNameservers],
+    "proxy-server-nameserver": [
+        ...chineseNameservers,
+        ...internationalNameservers,
+    ],
+    "nameserver-policy": {
+        "geosite:private,cn,geolocation-cn": chineseNameservers,
+        "geosite:google,youtube,telegram,gfw,geolocation-!cn":
+            internationalNameservers,
+    },
+};
+
 const ruleProviderCommon = {
     type: "http",
     interval: 86400,
@@ -298,25 +298,6 @@ const locationProxyGroupCommon = {
     "include-all": true,
 };
 
-// const locations = [
-//     "Argentina",
-//     "Finland",
-//     "France",
-//     "Germany",
-//     "Hong Kong, China",
-//     "Iraq",
-//     "Japan",
-//     "Korea",
-//     "Russia",
-//     "Singapore",
-//     "Taiwan, China",
-//     "Thailand",
-//     "Türkiye",
-//     "United Kingdom",
-//     "United States",
-//     "Cloudflare",
-// ];
-
 const serviceProxyGroupProxies = [
     "PROXY",
     "AUTO",