feat(dns): improve VPN DNS configuration and filtering

V2rayNG/app/src/main/java/xyz/zarazaex/olc/AppConfig.kt

@@ -125,7 +125,7 @@ object AppConfig {
 
     const val DNS_PROXY = "https://1.1.1.1/dns-query"
     const val DNS_DIRECT = "223.5.5.5"
-    const val DNS_VPN = "https://1.1.1.1/dns-query"
+    const val DNS_VPN = "1.1.1.1"
     const val GEOSITE_PRIVATE = "geosite:private"
     const val GEOSITE_CN = "geosite:cn"
     const val GEOIP_PRIVATE = "geoip:private"

V2rayNG/app/src/main/java/xyz/zarazaex/olc/handler/AngConfigManager.kt

@@ -273,26 +273,35 @@ object AngConfigManager {
     private fun batchSaveConfigs(configs: List<ProfileItem>, subid: String): Map<String, ProfileItem> {
         val keyToProfile = mutableMapOf<String, ProfileItem>()
 
-        // Read serverList once
         val serverList = MmkvManager.decodeServerList(subid)
         var needSetSelected = MmkvManager.getSelectServer().isNullOrBlank()
 
-        configs.forEach { config ->
-            val key = Utils.getUuid()
-            // Save profile directly without updating serverList
-            MmkvManager.encodeProfileDirect(key, JsonUtil.toJson(config))
+        val existingProfiles = serverList.mapNotNull { guid ->
+            MmkvManager.decodeServerConfig(guid)?.let { guid to it }
+        }.toMap()
 
-            if (!serverList.contains(key)) {
-                serverList.add(0, key)
-                if (needSetSelected) {
-                    MmkvManager.setSelectServer(key)
-                    needSetSelected = false
+        configs.forEach { config ->
+            val existingKey = existingProfiles.entries.firstOrNull { (_, existing) ->
+                existing == config
+            }?.key
+
+            if (existingKey != null) {
+                keyToProfile[existingKey] = config
+            } else {
+                val key = Utils.getUuid()
+                MmkvManager.encodeProfileDirect(key, JsonUtil.toJson(config))
+
+                if (!serverList.contains(key)) {
+                    serverList.add(0, key)
+                    if (needSetSelected) {
+                        MmkvManager.setSelectServer(key)
+                        needSetSelected = false
+                    }
                 }
+                keyToProfile[key] = config
             }
-            keyToProfile[key] = config
         }
 
-        // Write serverList once
         MmkvManager.encodeServerList(serverList, subid)
         return keyToProfile
     }

V2rayNG/app/src/main/java/xyz/zarazaex/olc/handler/SettingsManager.kt

@@ -346,7 +346,7 @@ object SettingsManager {
      */
     fun getVpnDnsServers(): List<String> {
         val vpnDns = MmkvManager.decodeSettingsString(AppConfig.PREF_VPN_DNS) ?: AppConfig.DNS_VPN
-        return vpnDns.split(",").filter { Utils.isPureIpAddress(it) }
+        return vpnDns.split(",").filter { it.isNotBlank() }
     }
 
     /**

V2rayNG/app/src/main/java/xyz/zarazaex/olc/handler/V2rayConfigManager.kt

@@ -594,6 +594,7 @@ object V2rayConfigManager {
 
             val remoteDns = SettingsManager.getRemoteDnsServers()
             val domesticDns = SettingsManager.getDomesticDnsServers()
+            val vpnDns = if (SettingsManager.isVpnMode()) SettingsManager.getVpnDnsServers() else emptyList()
             val proxyDomain = getUserRule2Domain(AppConfig.TAG_PROXY)
             val directDomain = getUserRule2Domain(AppConfig.TAG_DIRECT)
             val isCnRoutingMode = directDomain.contains(AppConfig.GEOSITE_CN)
@@ -620,8 +621,14 @@ object V2rayConfigManager {
                 )
             }
 
-            remoteDns.forEach {
-                servers.add(it)
+            if (vpnDns.isNotEmpty()) {
+                vpnDns.forEach {
+                    servers.add(it)
+                }
+            } else {
+                remoteDns.forEach {
+                    servers.add(it)
+                }
             }
 
             val blkDomain = getUserRule2Domain(AppConfig.TAG_BLOCKED)

V2rayNG/app/src/main/java/xyz/zarazaex/olc/service/V2RayVpnService.kt

@@ -228,13 +228,13 @@ class V2RayVpnService : VpnService(), ServiceControl {
             }
         }
 
-        // Configure DNS servers
-        //if (MmkvManager.decodeSettingsBool(AppConfig.PREF_LOCAL_DNS_ENABLED) == true) {
-        //  builder.addDnsServer(PRIVATE_VLAN4_ROUTER)
-        //} else {
-        SettingsManager.getVpnDnsServers().forEach {
-            if (Utils.isPureIpAddress(it)) {
-                builder.addDnsServer(it)
+        if (MmkvManager.decodeSettingsBool(AppConfig.PREF_LOCAL_DNS_ENABLED) == true) {
+            builder.addDnsServer(vpnConfig.ipv4Router)
+        } else {
+            SettingsManager.getVpnDnsServers().forEach {
+                if (Utils.isPureIpAddress(it)) {
+                    builder.addDnsServer(it)
+                }
             }
         }
 

src/main/kotlin/AddSubscription.kt

@@ -136,9 +136,17 @@ fun main() {
     )
     println("Добавлена подписка БЕЛЫЕ W: $guid2")
     
+    val guid3 = manager.addSubscription(
+        remarks = "KEY",
+        url = "https://key.zarazaex.xyz/sub",
+        autoUpdate = true
+    )
+    println("Добавлена подписка KEY: $guid3")
+    
     println("\nОбновление подписок...")
     manager.updateSubscription(guid1, "https://raw.githubusercontent.com/zieng2/wl/refs/heads/main/vless_universal.txt")
     manager.updateSubscription(guid2, "https://raw.githubusercontent.com/whoahaow/rjsxrd/refs/heads/main/githubmirror/bypass/bypass-all.txt")
+    manager.updateSubscription(guid3, "https://key.zarazaex.xyz/sub")
     
     println("\nПодписки успешно добавлены и обновлены в $mmkvPath")
 }

списокнищих

@@ -1 +0,0 @@
-ТЫ