yenru0/EhViewer
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move builtInHosts to Standalone EhHostsConfig

Browse Source
This commit is contained in:
tarsin committed 2023-05-30 20:35:32 +08:00
1 parent 4f1615b736
commit 46655e3326
2 files changed
+60 -52
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

app/src/main/java/com/hippo/ehviewer/EhHostsConfig.kt
+54
View File
@@ -0,0 +1,54 @@
package com.hippo.ehviewer
import com.hippo.ehviewer.client.hosts
import com.hippo.ehviewer.client.hostsDsl
// TODO: Documentation
val builtInHosts = hostsDsl {
hosts("ehgt.org", "gt0.ehgt.org", "gt1.ehgt.org", "gt2.ehgt.org", "gt3.ehgt.org") {
"37.48.89.44" blockedInCN false
"81.171.10.48" blockedInCN false
"178.162.139.24" blockedInCN false
"178.162.140.212" blockedInCN false
"2001:1af8:4700:a062:8::47de" blockedInCN false
"2001:1af8:4700:a062:9::47de" blockedInCN true
"2001:1af8:4700:a0c9:4::47de" blockedInCN false
"2001:1af8:4700:a0c9:3::47de" blockedInCN true
}
hosts("e-hentai.org") {
"104.20.134.21" blockedInCN false
"104.20.135.21" blockedInCN false
"172.67.0.127" blockedInCN false
}
hosts("exhentai.org") {
"178.175.128.252" blockedInCN false
"178.175.129.252" blockedInCN false
"178.175.129.254" blockedInCN false
"178.175.128.254" blockedInCN false
"178.175.132.20" blockedInCN false
"178.175.132.22" blockedInCN false
}
hosts("s.exhentai.org") {
"178.175.129.254" blockedInCN false
"178.175.128.254" blockedInCN false
"178.175.132.22" blockedInCN false
}
hosts("repo.e-hentai.org") {
"94.100.28.57" blockedInCN true
"94.100.29.73" blockedInCN true
}
hosts("forums.e-hentai.org") {
"94.100.18.243" blockedInCN false
}
hosts("ul.ehgt.org") {
"94.100.24.82" blockedInCN true
"94.100.24.72" blockedInCN true
}
hosts("raw.githubusercontent.com") {
"151.101.0.133" blockedInCN true
"151.101.64.133" blockedInCN false
"151.101.128.133" blockedInCN false
"151.101.192.133" blockedInCN false
}
}
app/src/main/java/com/hippo/ehviewer/client/EhDns.kt
+6 -52
View File
@@ -2,6 +2,7 @@ package com.hippo.ehviewer.client
import android.os.Build
import com.hippo.ehviewer.Settings
import com.hippo.ehviewer.builtInHosts
import com.hippo.ehviewer.preference.EhDoH
import okhttp3.AsyncDns
import okhttp3.Dns
@@ -9,12 +10,14 @@ import okhttp3.android.AndroidAsyncDns
import java.net.InetAddress
private typealias HostsMap = MutableMap<String, List<InetAddress>>
private fun hostsDsl(builder: HostsMap.() -> Unit): HostsMap = mutableMapOf<String, List<InetAddress>>().apply(builder)
private fun interface HostMapBuilder {
fun hostsDsl(builder: HostsMap.() -> Unit): HostsMap = mutableMapOf<String, List<InetAddress>>().apply(builder)
fun interface HostMapBuilder {
infix fun String.blockedInCN(boolean: Boolean)
}
private fun HostsMap.hosts(vararg hosts: String, builder: HostMapBuilder.() -> Unit) = apply {
fun HostsMap.hosts(vararg hosts: String, builder: HostMapBuilder.() -> Unit) = apply {
hosts.forEach { host ->
fun String.toInetAddress() = InetAddress.getByName(this).let { InetAddress.getByAddress(host, it.address) }
mutableListOf<InetAddress>().apply {
@@ -29,52 +32,3 @@ val systemDns = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) AsyncDns.toD
object EhDns : Dns {
override fun lookup(hostname: String): List<InetAddress> = builtInHosts[hostname].takeIf { Settings.builtInHosts } ?: EhDoH.lookup(hostname) ?: systemDns.lookup(hostname)
}
val builtInHosts = hostsDsl {
// ip: String!, blockedByCCP: Boolean!
hosts("ehgt.org", "gt0.ehgt.org", "gt1.ehgt.org", "gt2.ehgt.org", "gt3.ehgt.org") {
"37.48.89.44" blockedInCN false
"81.171.10.48" blockedInCN false
"178.162.139.24" blockedInCN false
"178.162.140.212" blockedInCN false
"2001:1af8:4700:a062:8::47de" blockedInCN false
"2001:1af8:4700:a062:9::47de" blockedInCN true
"2001:1af8:4700:a0c9:4::47de" blockedInCN false
"2001:1af8:4700:a0c9:3::47de" blockedInCN true
}
hosts("e-hentai.org") {
"104.20.134.21" blockedInCN false
"104.20.135.21" blockedInCN false
"172.67.0.127" blockedInCN false
}
hosts("exhentai.org") {
"178.175.128.252" blockedInCN false
"178.175.129.252" blockedInCN false
"178.175.129.254" blockedInCN false
"178.175.128.254" blockedInCN false
"178.175.132.20" blockedInCN false
"178.175.132.22" blockedInCN false
}
hosts("s.exhentai.org") {
"178.175.129.254" blockedInCN false
"178.175.128.254" blockedInCN false
"178.175.132.22" blockedInCN false
}
hosts("repo.e-hentai.org") {
"94.100.28.57" blockedInCN true
"94.100.29.73" blockedInCN true
}
hosts("forums.e-hentai.org") {
"94.100.18.243" blockedInCN false
}
hosts("ul.ehgt.org") {
"94.100.24.82" blockedInCN true
"94.100.24.72" blockedInCN true
}
hosts("raw.githubusercontent.com") {
"151.101.0.133" blockedInCN true
"151.101.64.133" blockedInCN false
"151.101.128.133" blockedInCN false
"151.101.192.133" blockedInCN false
}
}