From 83fd6efc170e991b3af92e62c422e48f61b630b1 Mon Sep 17 00:00:00 2001
From: 2dust <31833384+2dust@users.noreply.github.com>
Date: Thu, 17 Apr 2025 14:08:45 +0800
Subject: [PATCH] Resolve remote host names in the configuration file to IP
 addresses

---
 .../main/java/com/v2ray/ang/fmt/FmtBase.kt    |  7 ++++
 .../main/java/com/v2ray/ang/fmt/HttpFmt.kt    |  2 +-
 .../java/com/v2ray/ang/fmt/ShadowsocksFmt.kt  |  2 +-
 .../main/java/com/v2ray/ang/fmt/SocksFmt.kt   |  2 +-
 .../main/java/com/v2ray/ang/fmt/TrojanFmt.kt  |  2 +-
 .../main/java/com/v2ray/ang/fmt/VlessFmt.kt   |  2 +-
 .../main/java/com/v2ray/ang/fmt/VmessFmt.kt   |  2 +-
 .../java/com/v2ray/ang/fmt/WireguardFmt.kt    |  2 +-
 .../com/v2ray/ang/ui/MainRecyclerAdapter.kt   | 14 +++++--
 .../main/java/com/v2ray/ang/util/HttpUtil.kt  | 40 ++++++++++++++++++-
 10 files changed, 63 insertions(+), 12 deletions(-)

diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/fmt/FmtBase.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/fmt/FmtBase.kt
index 407e5c37..f8bc82fb 100644
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/fmt/FmtBase.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/fmt/FmtBase.kt
@@ -4,6 +4,8 @@ import com.v2ray.ang.AppConfig
 import com.v2ray.ang.dto.NetworkType
 import com.v2ray.ang.dto.ProfileItem
 import com.v2ray.ang.extension.isNotNullEmpty
+import com.v2ray.ang.handler.MmkvManager
+import com.v2ray.ang.util.HttpUtil
 import com.v2ray.ang.util.Utils
 import java.net.URI
 
@@ -148,4 +150,9 @@ open class FmtBase {
 
         return dicQuery
     }
+
+    fun resolveHostToIP(server: String?): String {
+        return HttpUtil.resolveHostToIP(server.orEmpty(), MmkvManager.decodeSettingsBool(AppConfig.PREF_PREFER_IPV6) == true)
+    }
+
 }
diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/fmt/HttpFmt.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/fmt/HttpFmt.kt
index faac0230..2ff28d8c 100644
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/fmt/HttpFmt.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/fmt/HttpFmt.kt
@@ -16,7 +16,7 @@ object HttpFmt : FmtBase() {
         val outboundBean = OutboundBean.create(EConfigType.HTTP)
 
         outboundBean?.settings?.servers?.first()?.let { server ->
-            server.address = profileItem.server.orEmpty()
+            server.address = resolveHostToIP(profileItem.server)
             server.port = profileItem.serverPort.orEmpty().toInt()
             if (profileItem.username.isNotNullEmpty()) {
                 val socksUsersBean = OutboundBean.OutSettingsBean.ServersBean.SocksUsersBean()
diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/fmt/ShadowsocksFmt.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/fmt/ShadowsocksFmt.kt
index fb383d25..69588c2c 100644
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/fmt/ShadowsocksFmt.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/fmt/ShadowsocksFmt.kt
@@ -134,7 +134,7 @@ object ShadowsocksFmt : FmtBase() {
         val outboundBean = OutboundBean.create(EConfigType.SHADOWSOCKS)
 
         outboundBean?.settings?.servers?.first()?.let { server ->
-            server.address = profileItem.server.orEmpty()
+            server.address = resolveHostToIP(profileItem.server)
             server.port = profileItem.serverPort.orEmpty().toInt()
             server.password = profileItem.password
             server.method = profileItem.method
diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/fmt/SocksFmt.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/fmt/SocksFmt.kt
index f37030c2..fad0bb4c 100644
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/fmt/SocksFmt.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/fmt/SocksFmt.kt
@@ -63,7 +63,7 @@ object SocksFmt : FmtBase() {
         val outboundBean = OutboundBean.create(EConfigType.SOCKS)
 
         outboundBean?.settings?.servers?.first()?.let { server ->
-            server.address = profileItem.server.orEmpty()
+            server.address = resolveHostToIP(profileItem.server)
             server.port = profileItem.serverPort.orEmpty().toInt()
             if (profileItem.username.isNotNullEmpty()) {
                 val socksUsersBean = OutboundBean.OutSettingsBean.ServersBean.SocksUsersBean()
diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/fmt/TrojanFmt.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/fmt/TrojanFmt.kt
index 56883cd8..7ed00a21 100644
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/fmt/TrojanFmt.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/fmt/TrojanFmt.kt
@@ -63,7 +63,7 @@ object TrojanFmt : FmtBase() {
         val outboundBean = OutboundBean.create(EConfigType.TROJAN)
 
         outboundBean?.settings?.servers?.first()?.let { server ->
-            server.address = profileItem.server.orEmpty()
+            server.address = resolveHostToIP(profileItem.server)
             server.port = profileItem.serverPort.orEmpty().toInt()
             server.password = profileItem.password
             server.flow = profileItem.flow
diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/fmt/VlessFmt.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/fmt/VlessFmt.kt
index 77d2f2a3..d6df582c 100644
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/fmt/VlessFmt.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/fmt/VlessFmt.kt
@@ -60,7 +60,7 @@ object VlessFmt : FmtBase() {
         val outboundBean = OutboundBean.create(EConfigType.VLESS)
 
         outboundBean?.settings?.vnext?.first()?.let { vnext ->
-            vnext.address = profileItem.server.orEmpty()
+            vnext.address = resolveHostToIP(profileItem.server)
             vnext.port = profileItem.serverPort.orEmpty().toInt()
             vnext.users[0].id = profileItem.password.orEmpty()
             vnext.users[0].encryption = profileItem.method
diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/fmt/VmessFmt.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/fmt/VmessFmt.kt
index bbc913d3..eac159eb 100644
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/fmt/VmessFmt.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/fmt/VmessFmt.kt
@@ -171,7 +171,7 @@ object VmessFmt : FmtBase() {
         val outboundBean = OutboundBean.create(EConfigType.VMESS)
 
         outboundBean?.settings?.vnext?.first()?.let { vnext ->
-            vnext.address = profileItem.server.orEmpty()
+            vnext.address = resolveHostToIP(profileItem.server)
             vnext.port = profileItem.serverPort.orEmpty().toInt()
             vnext.users[0].id = profileItem.password.orEmpty()
             vnext.users[0].security = profileItem.method
diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/fmt/WireguardFmt.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/fmt/WireguardFmt.kt
index e2bc5f90..44ce1a04 100644
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/fmt/WireguardFmt.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/fmt/WireguardFmt.kt
@@ -113,7 +113,7 @@ object WireguardFmt : FmtBase() {
             wireguard.peers?.firstOrNull()?.let { peer ->
                 peer.publicKey = profileItem.publicKey.orEmpty()
                 peer.preSharedKey = profileItem.preSharedKey?.takeIf { it.isNotEmpty() }
-                peer.endpoint = Utils.getIpv6Address(profileItem.server) + ":${profileItem.serverPort}"
+                peer.endpoint = Utils.getIpv6Address(resolveHostToIP(profileItem.server)) + ":${profileItem.serverPort}"
             }
             wireguard.mtu = profileItem.mtu
             wireguard.reserved = profileItem.reserved?.takeIf { it.isNotBlank() }?.split(",")?.filter { it.isNotBlank() }?.map { it.trim().toInt() }
diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/MainRecyclerAdapter.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/MainRecyclerAdapter.kt
index 179f70ae..e7ea6211 100644
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/MainRecyclerAdapter.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/MainRecyclerAdapter.kt
@@ -27,6 +27,7 @@ import com.v2ray.ang.handler.MmkvManager
 import com.v2ray.ang.helper.ItemTouchHelperAdapter
 import com.v2ray.ang.helper.ItemTouchHelperViewHolder
 import com.v2ray.ang.service.V2RayServiceManager
+import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 
@@ -220,10 +221,15 @@ class MainRecyclerAdapter(val activity: MainActivity) : RecyclerView.Adapter<Mai
      * @param guid The server unique identifier
      */
     private fun shareFullContent(guid: String) {
-        if (AngConfigManager.shareFullContent2Clipboard(mActivity, guid) == 0) {
-            mActivity.toastSuccess(R.string.toast_success)
-        } else {
-            mActivity.toastError(R.string.toast_failure)
+        mActivity.lifecycleScope.launch(Dispatchers.IO) {
+            val result = AngConfigManager.shareFullContent2Clipboard(mActivity, guid)
+            launch(Dispatchers.Main) {
+                if (result == 0) {
+                    mActivity.toastSuccess(R.string.toast_success)
+                } else {
+                    mActivity.toastError(R.string.toast_failure)
+                }
+            }
         }
     }
 
diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/util/HttpUtil.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/util/HttpUtil.kt
index 202af8be..b7caa4e4 100644
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/util/HttpUtil.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/util/HttpUtil.kt
@@ -9,13 +9,13 @@ import com.v2ray.ang.util.Utils.urlDecode
 import java.io.IOException
 import java.net.HttpURLConnection
 import java.net.IDN
+import java.net.InetAddress
 import java.net.InetSocketAddress
 import java.net.Proxy
 import java.net.URL
 
 object HttpUtil {
 
-
     /**
      * Converts a URL string to its ASCII representation.
      *
@@ -33,6 +33,44 @@ object HttpUtil {
         }
     }
 
+    /**
+     * Resolves a hostname to an IP address, returns original input if it's already an IP
+     *
+     * @param host The hostname or IP address to resolve
+     * @param ipv6Preferred Whether to prefer IPv6 addresses, defaults to false
+     * @return The resolved IP address or the original input (if it's already an IP or resolution fails)
+     */
+    fun resolveHostToIP(host: String, ipv6Preferred: Boolean = false): String {
+        try {
+            // If it's already an IP address, return it directly
+            if (Utils.isPureIpAddress(host)) {
+                return host
+            }
+
+            // Get all IP addresses
+            val addresses = InetAddress.getAllByName(host)
+            if (addresses.isEmpty()) {
+                return host
+            }
+
+            // Sort addresses based on preference
+            val sortedAddresses = if (ipv6Preferred) {
+                // IPv6 preferred (size 16 first, then size 4)
+                addresses.sortedByDescending { it.address.size }
+            } else {
+                // IPv4 preferred (size 4 first, then size 16)
+                addresses.sortedBy { it.address.size }
+            }
+            Log.i(AppConfig.TAG, "Resolved IPs for $host: ${sortedAddresses.joinToString { it.hostAddress ?: "unknown" }}")
+
+            // Return the first address after sorting
+            return sortedAddresses.first().hostAddress ?: host
+        } catch (e: Exception) {
+            Log.e(AppConfig.TAG, "Failed to resolve host to IP", e)
+            return host
+        }
+    }
+
     /**
      * Retrieves the content of a URL as a string.
      *