Northern_Lights/NekoBoxForAndroid
1
0
Fork 0
mirror of https://github.com/MatsuriDayo/NekoBoxForAndroid.git synced 2025-12-20 07:00:05 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

update fmt

Browse Source
This commit is contained in:
arm64v8a 2023-06-14 14:36:15 +09:00
parent 4525fa90b5
commit 373509d932
2 changed files with 61 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/java/io/nekohasekai/sagernet/fmt/ConfigBuilder.kt
View File

@ -748,11 +748,6 @@ fun buildConfig(
source_ip_cidr = listOf("224.0.0.0/3", "ff00::/8") source_ip_cidr = listOf("224.0.0.0/3", "ff00::/8")
outbound = TAG_BLOCK outbound = TAG_BLOCK
}) })
dns.rules.add(DNSRule_DefaultOptions().apply {
domain_suffix = listOf(".arpa.", ".arpa")
server = "dns-block"
disable_cache = true
})
// FakeDNS obj // FakeDNS obj
if (useFakeDns) { if (useFakeDns) {
dns.servers.add(DNSServerOptions().apply { dns.servers.add(DNSServerOptions().apply {

65
app/src/main/java/io/nekohasekai/sagernet/group/RawUpdater.kt
View File

@ -13,6 +13,8 @@ import io.nekohasekai.sagernet.fmt.shadowsocks.parseShadowsocks
import io.nekohasekai.sagernet.fmt.socks.SOCKSBean import io.nekohasekai.sagernet.fmt.socks.SOCKSBean
import io.nekohasekai.sagernet.fmt.trojan.TrojanBean import io.nekohasekai.sagernet.fmt.trojan.TrojanBean
import io.nekohasekai.sagernet.fmt.trojan_go.parseTrojanGo import io.nekohasekai.sagernet.fmt.trojan_go.parseTrojanGo
import io.nekohasekai.sagernet.fmt.tuic.TuicBean
import io.nekohasekai.sagernet.fmt.v2ray.StandardV2RayBean
import io.nekohasekai.sagernet.fmt.v2ray.VMessBean import io.nekohasekai.sagernet.fmt.v2ray.VMessBean
import io.nekohasekai.sagernet.fmt.v2ray.isTLS import io.nekohasekai.sagernet.fmt.v2ray.isTLS
import io.nekohasekai.sagernet.fmt.v2ray.setTLS import io.nekohasekai.sagernet.fmt.v2ray.setTLS
@ -208,12 +210,17 @@ object RawUpdater : GroupUpdater() {
if (text.contains("proxies:")) { if (text.contains("proxies:")) {
// clash & meta
try { try {
// clash val yaml = Yaml().apply {
for (proxy in (Yaml().apply {
addTypeDescription(TypeDescription(String::class.java, "str")) addTypeDescription(TypeDescription(String::class.java, "str"))
}.loadAs(text, Map::class.java)["proxies"] as? (List<Map<String, Any?>>) ?: error( }.loadAs(text, Map::class.java)
val globalClientFingerprint = yaml["global-client-fingerprint"]?.toString() ?: ""
for (proxy in (yaml["proxies"] as? (List<Map<String, Any?>>) ?: error(
app.getString(R.string.no_proxies_found_in_file) app.getString(R.string.no_proxies_found_in_file)
))) { ))) {
// Note: YAML numbers parsed as "Long" // Note: YAML numbers parsed as "Long"
@ -476,9 +483,59 @@ object RawUpdater : GroupUpdater() {
} }
proxies.add(bean) proxies.add(bean)
} }
"tuic" -> {
val bean = TuicBean()
for (opt in proxy) {
when (opt.key.replace("_", "-")) {
"name" -> bean.name = opt.value?.toString()
"server" -> bean.serverAddress = opt.value as String
"port" -> bean.serverPort = opt.value.toString().toInt()
"token" -> {
bean.protocolVersion = 4
bean.token = opt.value.toString()
}
"uuid" -> bean.uuid = opt.value.toString()
"password" -> bean.token = opt.value.toString()
"skip-cert-verify" -> bean.allowInsecure =
opt.value?.toString() == "true"
"disable-sni" -> bean.disableSNI =
opt.value?.toString() == "true"
"reduce-rtt" -> bean.reduceRTT =
opt.value?.toString() == "true"
"sni" -> bean.sni = opt.value.toString()
"alpn" -> {
val alpn = (opt.value as? (List<String>))
bean.alpn = alpn?.joinToString("\n")
}
"congestion-controller" -> bean.congestionController =
opt.value.toString()
}
}
proxies.add(bean)
}
}
}
// Fix ent
proxies.forEach {
it.initializeDefaultValues()
if (it is StandardV2RayBean) {
if (it.realityPubKey.isNotBlank() && it.utlsFingerprint.isBlank()) {
it.utlsFingerprint = globalClientFingerprint
}
} }
} }
proxies.forEach { it.initializeDefaultValues() }
return proxies return proxies
} catch (e: YAMLException) { } catch (e: YAMLException) {
Logs.w(e) Logs.w(e)