Add missing data fields for config

Make custom config able to parse any config
Fix subscription TODO
Fix some bugs
- vless tls should clear out flow
- trojan tls settings
- import with null rawQuery link
- socks share link username
- remove an item in the middle of server list
This commit is contained in:
yuhan6665
2021-03-26 20:55:00 -04:00
parent 572955dd1e
commit 463f45804f
5 changed files with 102 additions and 41 deletions
@@ -15,7 +15,11 @@ data class V2rayConfig(
val inbounds: ArrayList<InboundBean>,
var outbounds: ArrayList<OutboundBean>,
var dns: DnsBean,
val routing: RoutingBean) {
val routing: RoutingBean,
val api: Any? = null,
val transport: Any? = null,
val reverse: Any? = null,
val fakedns: Any? = null) {
companion object {
const val DEFAULT_PORT = 443
const val DEFAULT_SECURITY = "auto"
@@ -37,8 +41,10 @@ data class V2rayConfig(
var port: Int,
var protocol: String,
var listen: String? = null,
val settings: InSettingsBean,
val sniffing: SniffingBean?) {
val settings: Any? = null,
val sniffing: SniffingBean?,
val streamSettings: Any? = null,
val allocate: Any? = null) {
data class InSettingsBean(val auth: String? = null,
val udp: Boolean? = null,
@@ -48,18 +54,32 @@ data class V2rayConfig(
val network: String? = null)
data class SniffingBean(var enabled: Boolean,
val destOverride: List<String>)
val destOverride: List<String>,
val metadataOnly: Boolean? = null)
}
data class OutboundBean(val tag: String = "proxy",
var protocol: String,
var settings: OutSettingsBean?,
var settings: OutSettingsBean? = null,
var streamSettings: StreamSettingsBean? = null,
val proxySettings: Any? = null,
val sendThrough: String? = null,
val mux: MuxBean? = MuxBean(false)) {
data class OutSettingsBean(var vnext: List<VnextBean>? = null,
var servers: List<ServersBean>? = null,
var response: Response? = null) {
/*Blackhole*/
var response: Response? = null,
/*DNS*/
val network: String? = null,
val address: String? = null,
val port: Int? = null,
/*Freedom*/
val domainStrategy: String? = null,
val redirect: String? = null,
val userLevel: Int? = null,
/*Loopback*/
val inboundTag: String? = null) {
data class VnextBean(var address: String = "",
var port: Int = DEFAULT_PORT,
@@ -98,7 +118,10 @@ data class V2rayConfig(
var httpSettings: HttpSettingsBean? = null,
var tlsSettings: TlsSettingsBean? = null,
var quicSettings: QuicSettingBean? = null,
var xtlsSettings: TlsSettingsBean? = null
var xtlsSettings: TlsSettingsBean? = null,
val grpcSettings: Any? = null,
val dsSettings: Any? = null,
val sockopt: Any? = null
) {
data class TcpSettingsBean(var header: HeaderBean = HeaderBean()) {
@@ -133,7 +156,10 @@ data class V2rayConfig(
var path: String = "")
data class TlsSettingsBean(var allowInsecure: Boolean = false,
var serverName: String = "")
var serverName: String = "",
val alpn: List<String>? = null,
val certificates: List<Any>? = null,
val disableSystemRoot: Boolean? = null)
data class QuicSettingBean(var security: String = "none",
var key: String = "",
@@ -248,14 +274,12 @@ data class V2rayConfig(
}
fun getSecurityEncryption(): String? {
if (protocol.equals(EConfigType.VMESS.name, true)) {
return settings?.vnext?.get(0)?.users?.get(0)?.security
} else if (protocol.equals(EConfigType.VLESS.name, true)) {
return settings?.vnext?.get(0)?.users?.get(0)?.encryption
} else if (protocol.equals(EConfigType.SHADOWSOCKS.name, true)) {
return settings?.servers?.get(0)?.method
return when {
protocol.equals(EConfigType.VMESS.name, true) -> settings?.vnext?.get(0)?.users?.get(0)?.security
protocol.equals(EConfigType.VLESS.name, true) -> settings?.vnext?.get(0)?.users?.get(0)?.encryption
protocol.equals(EConfigType.SHADOWSOCKS.name, true) -> settings?.servers?.get(0)?.method
else -> null
}
return null
}
fun getTransportSettingDetails(): List<String>? {
@@ -300,25 +324,39 @@ data class V2rayConfig(
}
}
//data class DnsBean(var servers: List<String>)
data class DnsBean(var servers: List<Any>? = null,
var hosts: Map<String, String>? = null
var hosts: Map<String, String>? = null,
val clientIp: String? = null,
val disableCache: Boolean? = null,
val tag: String? = null
) {
data class ServersBean(var address: String = "",
var port: Int = 0,
var domains: List<String>?,
var expectIPs: List<String>?)
var expectIPs: List<String>?,
val clientIp: String? = null)
}
data class RoutingBean(var domainStrategy: String,
var rules: ArrayList<RulesBean>) {
val domainMatcher: String? = null,
var rules: ArrayList<RulesBean>,
val balancers: List<Any>? = null) {
data class RulesBean(var type: String = "",
var ip: ArrayList<String>? = null,
var domain: ArrayList<String>? = null,
var outboundTag: String = "",
var balancerTag: String? = null,
var port: String? = null,
var inboundTag: ArrayList<String>? = null)
val sourcePort: String? = null,
val network: String? = null,
val source: List<String>? = null,
val user: List<String>? = null,
var inboundTag: List<String>? = null,
val protocol: List<String>? = null,
val attrs: String? = null,
val domainMatcher: String? = null
)
}
data class PolicyBean(var levels: Map<String, LevelBean>,
@@ -327,7 +365,10 @@ data class V2rayConfig(
var handshake: Int? = null,
var connIdle: Int? = null,
var uplinkOnly: Int? = null,
var downlinkOnly: Int? = null)
var downlinkOnly: Int? = null,
val statsUserUplink: Boolean? = null,
val statsUserDownlink: Boolean? = null,
var bufferSize: Int? = null)
}
fun getProxyOutbound(): OutboundBean? {
@@ -148,7 +148,7 @@ object V2RayServiceManager {
currentConfig = config
v2rayPoint.enableLocalDNS = settingsStorage?.decodeBool(AppConfig.PREF_LOCAL_DNS_ENABLED) ?: false
v2rayPoint.forwardIpv6 = settingsStorage?.decodeBool(AppConfig.PREF_FORWARD_IPV6) ?: false
v2rayPoint.proxyOnly = settingsStorage?.decodeString(AppConfig.PREF_MODE) ?: "VPN" == "VPN"
v2rayPoint.proxyOnly = settingsStorage?.decodeString(AppConfig.PREF_MODE) ?: "VPN" != "VPN"
try {
v2rayPoint.runLoop()
@@ -8,10 +8,12 @@ import android.support.v7.widget.RecyclerView
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import com.google.gson.Gson
import com.tencent.mmkv.MMKV
import com.v2ray.ang.AppConfig
import com.v2ray.ang.R
import com.v2ray.ang.dto.EConfigType
import com.v2ray.ang.dto.SubscriptionItem
import com.v2ray.ang.extension.toast
import com.v2ray.ang.helper.ItemTouchHelperAdapter
import com.v2ray.ang.helper.ItemTouchHelperViewHolder
@@ -34,6 +36,7 @@ class MainRecyclerAdapter(val activity: MainActivity) : RecyclerView.Adapter<Mai
private var mActivity: MainActivity = activity
private val mainStorage by lazy { MMKV.mmkvWithID(MmkvManager.ID_MAIN, MMKV.MULTI_PROCESS_MODE) }
private val subStorage by lazy { MMKV.mmkvWithID(MmkvManager.ID_SUB, MMKV.MULTI_PROCESS_MODE) }
private val share_method: Array<out String> by lazy {
mActivity.resources.getStringArray(R.array.share_method)
}
@@ -58,7 +61,11 @@ class MainRecyclerAdapter(val activity: MainActivity) : RecyclerView.Adapter<Mai
holder.test_result.setTextColor(ContextCompat.getColor(mActivity, R.color.colorPing))
}
holder.subscription.text = ""
// TODO: add sub remarks
val json = subStorage?.decodeString(config.subscriptionId)
if (!json.isNullOrBlank()) {
val sub = Gson().fromJson(json, SubscriptionItem::class.java)
holder.subscription.text = sub.remarks
}
var shareOptions = share_method.asList()
if (config.configType == EConfigType.CUSTOM) {
@@ -113,6 +120,7 @@ class MainRecyclerAdapter(val activity: MainActivity) : RecyclerView.Adapter<Mai
if (guid != mainStorage?.decodeString(MmkvManager.KEY_SELECTED_SERVER)) {
mActivity.mainViewModel.removeServer(guid)
notifyItemRemoved(position)
notifyItemRangeChanged(position, mActivity.mainViewModel.serverList.size)
}
}
@@ -117,7 +117,7 @@ class ServerActivity : BaseActivity() {
val streamSecurity = Utils.arrayFind(streamSecuritys, streamSetting.security)
if (streamSecurity >= 0) {
sp_stream_security?.setSelection(streamSecurity)
streamSetting.tlsSettings?: streamSetting.xtlsSettings?.let { tlsSetting ->
(streamSetting.tlsSettings?: streamSetting.xtlsSettings)?.let { tlsSetting ->
val allowinsecure = Utils.arrayFind(allowinsecures, tlsSetting.allowInsecure.toString())
if (allowinsecure >= 0) {
sp_allow_insecure?.setSelection(allowinsecure)
@@ -198,7 +198,7 @@ class ServerActivity : BaseActivity() {
saveServers(server, port, config)
}
config.outboundBean?.streamSettings?.let {
saveStreamSettings(it)
saveStreamSettings(it, config)
}
MmkvManager.encodeServerConfig(editGuid, config)
@@ -217,8 +217,10 @@ class ServerActivity : BaseActivity() {
} else if (config.configType == EConfigType.VLESS) {
vnext.users[0].encryption = et_security.text.toString().trim()
if (streamSecuritys[sp_stream_security.selectedItemPosition] == XTLS) {
// vnext.users[0].flow = if (flows[sp_flow.selectedItemPosition].isBlank()) DEFAULT_FLOW
// vnext.users[0].flow = if (flows[sp_flow.selectedItemPosition].isBlank()) V2rayConfig.DEFAULT_FLOW
// else flows[sp_flow.selectedItemPosition]
} else {
vnext.users[0].flow = ""
}
}
}
@@ -243,7 +245,7 @@ class ServerActivity : BaseActivity() {
}
}
private fun saveStreamSettings(streamSetting: V2rayConfig.OutboundBean.StreamSettingsBean) {
private fun saveStreamSettings(streamSetting: V2rayConfig.OutboundBean.StreamSettingsBean, config: ServerConfig) {
val requestHost = et_request_host?.text.toString().trim()
val path = et_path?.text.toString().trim()
var sni = streamSetting.populateTransportSettings(
@@ -258,17 +260,14 @@ class ServerActivity : BaseActivity() {
if (sni.isEmpty()) {
sni = requestHost
}
val allowInsecure = if (sp_allow_insecure != null) {
if (allowinsecures[sp_allow_insecure.selectedItemPosition].isBlank()) {
false//settingsStorage?.decodeBool(PREF_ALLOW_INSECURE) ?: false
} else {
allowinsecures[sp_allow_insecure.selectedItemPosition].toBoolean()
}
val allowInsecure = if (sp_allow_insecure == null || allowinsecures[sp_allow_insecure.selectedItemPosition].isBlank()) {
false//settingsStorage?.decodeBool(PREF_ALLOW_INSECURE) ?: false
} else {
false
allowinsecures[sp_allow_insecure.selectedItemPosition].toBoolean()
}
val defaultTls = if (config.configType == EConfigType.TROJAN) V2rayConfig.TLS else ""
streamSetting.populateTlsSettings(
if (sp_stream_security != null) streamSecuritys[sp_stream_security.selectedItemPosition] else "",
if (sp_stream_security != null) streamSecuritys[sp_stream_security.selectedItemPosition] else defaultTls,
allowInsecure,
sni
)
@@ -186,10 +186,14 @@ object AngConfigManager {
server.port = uri.port
server.password = uri.userInfo
}
val queryParam = uri.rawQuery.split("&")
.map { it.split("=").let { (k, v) -> k to URLDecoder.decode(v, "utf-8")!! } }
.toMap()
config.outboundBean?.streamSettings?.populateTlsSettings(TLS, allowInsecure, queryParam["sni"] ?: "")
var sni = ""
uri.rawQuery?.let { rawQuery ->
val queryParam = rawQuery.split("&")
.map { it.split("=").let { (k, v) -> k to URLDecoder.decode(v, "utf-8")!! } }
.toMap()
sni = queryParam["sni"] ?: ""
}
config.outboundBean?.streamSettings?.populateTlsSettings(TLS, allowInsecure, sni)
} else if (str.startsWith(EConfigType.VLESS.protocolScheme)) {
val uri = URI(str)
val queryParam = uri.rawQuery.split("&")
@@ -317,7 +321,7 @@ object AngConfigManager {
Utils.encode(json)
}
EConfigType.CUSTOM -> ""
EConfigType.SHADOWSOCKS, EConfigType.SOCKS -> {
EConfigType.SHADOWSOCKS -> {
val remark = "#" + Utils.urlEncode(config.remarks)
val url = String.format("%s:%s@%s:%s",
outbound.getSecurityEncryption(),
@@ -326,6 +330,15 @@ object AngConfigManager {
outbound.getServerPort())
Utils.encode(url) + remark
}
EConfigType.SOCKS -> {
val remark = "#" + Utils.urlEncode(config.remarks)
val url = String.format("%s:%s@%s:%s",
outbound.settings?.servers?.get(0)?.users?.get(0)?.user,
outbound.getPassword(),
outbound.getServerAddress(),
outbound.getServerPort())
Utils.encode(url) + remark
}
EConfigType.VLESS -> {
val remark = "#" + Utils.urlEncode(config.remarks)
@@ -396,7 +409,7 @@ object AngConfigManager {
EConfigType.TROJAN -> {
val remark = "#" + Utils.urlEncode(config.remarks)
var query = ""
streamSetting.tlsSettings?: streamSetting.xtlsSettings?.let { tlsSetting ->
(streamSetting.tlsSettings?: streamSetting.xtlsSettings)?.let { tlsSetting ->
if (!TextUtils.isEmpty(tlsSetting.serverName)) {
query = "?sni=${tlsSetting.serverName}"
}