Skip to content
This repository has been archived by the owner on Nov 14, 2024. It is now read-only.

Commit

Permalink
Adding pre-proxy to group
Browse files Browse the repository at this point in the history
  • Loading branch information
@2dust @AnGgIt86
2dust authored and AnGgIt86 committed Sep 23, 2024
1 parent 72a8636 commit 8f340f0
Show file tree
Hide file tree
Showing 2 changed files with 108 additions and 58 deletions.
19 changes: 19 additions & 0 deletions app/src/main/kotlin/com/neko/v2ray/util/MmkvManager.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -171,6 +171,11 @@ object MmkvManager {
removeServerViaSubid(subid)
}

fun decodeSubscription(subscriptionId: String): SubscriptionItem? {
val json = subStorage.decodeString(subscriptionId) ?: return null
return Gson().fromJson(json, SubscriptionItem::class.java)
}

fun decodeAssetUrls(): List<Pair<String, AssetUrlItem>> {
val assetUrlItems = mutableListOf<Pair<String, AssetUrlItem>>()
assetStorage?.allKeys()?.forEach { key ->
Expand Down Expand Up @@ -229,4 +234,18 @@ object MmkvManager {

mainStorage?.encode(KEY_ANG_CONFIGS, Gson().toJson(serverList))
}

fun getServerViaRemarks(remarks: String?): ServerConfig? {
if (remarks == null) {
return null
}
val serverList = decodeServerList()
for (guid in serverList) {
val profile = decodeProfileConfig(guid)
if (profile != null && profile.remarks == remarks) {
return decodeServerConfig(guid)
}
}
return null
}
}
147 changes: 89 additions & 58 deletions app/src/main/kotlin/com/neko/v2ray/util/V2rayConfigUtil.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,29 +16,17 @@ import com.neko.v2ray.AppConfig.WIREGUARD_LOCAL_ADDRESS_V4
import com.neko.v2ray.AppConfig.WIREGUARD_LOCAL_ADDRESS_V6
import com.neko.v2ray.dto.EConfigType
import com.neko.v2ray.dto.ERoutingMode
import com.neko.v2ray.dto.ServerConfig
import com.neko.v2ray.dto.V2rayConfig
import com.neko.v2ray.dto.V2rayConfig.Companion.DEFAULT_NETWORK
import com.neko.v2ray.dto.V2rayConfig.Companion.HTTP

object V2rayConfigUtil {
private val serverRawStorage by lazy {
MMKV.mmkvWithID(
MmkvManager.ID_SERVER_RAW,
MMKV.MULTI_PROCESS_MODE
)
}
private val settingsStorage by lazy {
MMKV.mmkvWithID(
MmkvManager.ID_SETTING,
MMKV.MULTI_PROCESS_MODE
)
}
private val serverRawStorage by lazy { MMKV.mmkvWithID(MmkvManager.ID_SERVER_RAW, MMKV.MULTI_PROCESS_MODE) }
private val settingsStorage by lazy { MMKV.mmkvWithID(MmkvManager.ID_SETTING, MMKV.MULTI_PROCESS_MODE) }

data class Result(var status: Boolean, var content: String)

/**
* 生成v2ray的客户端配置文件
*/
fun getV2rayConfig(context: Context, guid: String): Result {
try {
val config = MmkvManager.decodeServerConfig(guid) ?: return Result(false, "")
Expand All @@ -52,16 +40,8 @@ object V2rayConfigUtil {
//Log.d(ANG_PACKAGE, customConfig)
return Result(true, customConfig)
}
val outbound = config.getProxyOutbound() ?: return Result(false, "")
val address = outbound.getServerAddress() ?: return Result(false, "")
if (!Utils.isIpAddress(address)) {
if (!Utils.isValidUrl(address)) {
Log.d(ANG_PACKAGE, "$address is an invalid ip or domain")
return Result(false, "")
}
}

val result = getV2rayNonCustomConfig(context, outbound, config.remarks)
val result = getV2rayNonCustomConfig(context, config)
//Log.d(ANG_PACKAGE, result.content)
return result
} catch (e: Exception) {
Expand All @@ -70,33 +50,32 @@ object V2rayConfigUtil {
}
}

/**
* 生成v2ray的客户端配置文件
*/
private fun getV2rayNonCustomConfig(
context: Context,
outbound: V2rayConfig.OutboundBean,
remarks: String,
): Result {
private fun getV2rayNonCustomConfig(context: Context, config: ServerConfig): Result {
val result = Result(false, "")

val outbound = config.getProxyOutbound() ?: return result
val address = outbound.getServerAddress() ?: return result
if (!Utils.isIpAddress(address)) {
if (!Utils.isValidUrl(address)) {
Log.d(ANG_PACKAGE, "$address is an invalid ip or domain")
return result
}
}

//取得默认配置
val assets = Utils.readTextFromAssets(context, "v2ray_config.json")
if (TextUtils.isEmpty(assets)) {
return result
}

//转成Json
val v2rayConfig = Gson().fromJson(assets, V2rayConfig::class.java) ?: return result

v2rayConfig.log.loglevel = settingsStorage?.decodeString(AppConfig.PREF_LOGLEVEL)
?: "warning"
v2rayConfig.log.loglevel = settingsStorage?.decodeString(AppConfig.PREF_LOGLEVEL) ?: "warning"
v2rayConfig.remarks = config.remarks

inbounds(v2rayConfig)

updateOutboundWithGlobalSettings(outbound)
v2rayConfig.outbounds[0] = outbound
outbounds(v2rayConfig, outbound)

updateOutboundFragment(v2rayConfig)
moreOutbounds(v2rayConfig, config.subscriptionId)

routing(v2rayConfig)

Expand All @@ -112,16 +91,11 @@ object V2rayConfigUtil {
v2rayConfig.policy = null
}

v2rayConfig.remarks = remarks

result.status = true
result.content = v2rayConfig.toPrettyPrinting()
return result
}

/**
*
*/
private fun inbounds(v2rayConfig: V2rayConfig): Boolean {
try {
val socksPort = Utils.parseInt(
Expand Down Expand Up @@ -170,6 +144,20 @@ object V2rayConfigUtil {
return true
}

private fun outbounds(v2rayConfig: V2rayConfig, outbound: V2rayConfig.OutboundBean): Boolean {
val ret = updateOutboundWithGlobalSettings(outbound)
if (!ret) return false

if (v2rayConfig.outbounds.isNotEmpty()) {
v2rayConfig.outbounds[0] = outbound
} else {
v2rayConfig.outbounds.add(outbound)
}

updateOutboundFragment(v2rayConfig)
return true
}

private fun fakedns(v2rayConfig: V2rayConfig) {
if (settingsStorage?.decodeBool(AppConfig.PREF_LOCAL_DNS_ENABLED) == true
&& settingsStorage?.decodeBool(AppConfig.PREF_FAKE_DNS_ENABLED) == true
Expand All @@ -178,9 +166,6 @@ object V2rayConfigUtil {
}
}

/**
* routing
*/
private fun routing(v2rayConfig: V2rayConfig): Boolean {
try {
val routingMode = settingsStorage?.decodeString(AppConfig.PREF_ROUTING_MODE)
Expand Down Expand Up @@ -268,12 +253,7 @@ object V2rayConfigUtil {
return true
}

private fun routingGeo(
ipOrDomain: String,
code: String,
tag: String,
v2rayConfig: V2rayConfig
) {
private fun routingGeo(ipOrDomain: String, code: String, tag: String, v2rayConfig: V2rayConfig) {
try {
if (!TextUtils.isEmpty(code)) {
//IP
Expand Down Expand Up @@ -343,9 +323,6 @@ object V2rayConfigUtil {
return domain
}

/**
* Custom Dns
*/
private fun customLocalDns(v2rayConfig: V2rayConfig): Boolean {
try {
if (settingsStorage?.decodeBool(AppConfig.PREF_FAKE_DNS_ENABLED) == true) {
Expand Down Expand Up @@ -668,4 +645,58 @@ object V2rayConfigUtil {
}
return true
}
}

private fun moreOutbounds(v2rayConfig: V2rayConfig, subscriptionId: String): Boolean {
//fragment proxy
if (settingsStorage?.decodeBool(AppConfig.PREF_FRAGMENT_ENABLED, false) == true) {
return true
}

if (subscriptionId.isNullOrEmpty()) {
return true
}
try {
val subItem = MmkvManager.decodeSubscription(subscriptionId) ?: return false

//current proxy
val outbound = v2rayConfig.outbounds[0]

//Previous proxy
val prevNode = MmkvManager.getServerViaRemarks(subItem.prevProfile)
if (prevNode != null) {
val prevOutbound = prevNode.getProxyOutbound()
if (prevOutbound != null) {
updateOutboundWithGlobalSettings(prevOutbound)
prevOutbound.tag = TAG_PROXY + "2"
v2rayConfig.outbounds.add(prevOutbound)
outbound.streamSettings?.sockopt =
V2rayConfig.OutboundBean.StreamSettingsBean.SockoptBean(
dialerProxy = prevOutbound.tag
)
}
}

//Next proxy
val nextNode = MmkvManager.getServerViaRemarks(subItem.nextProfile)
if (nextNode != null) {
val nextOutbound = nextNode.getProxyOutbound()
if (nextOutbound != null) {
updateOutboundWithGlobalSettings(nextOutbound)
nextOutbound.tag = TAG_PROXY
v2rayConfig.outbounds.add(0, nextOutbound)

outbound.tag = TAG_PROXY + "1"
nextOutbound.streamSettings?.sockopt =
V2rayConfig.OutboundBean.StreamSettingsBean.SockoptBean(
dialerProxy = outbound.tag
)
}
}
} catch (e: Exception) {
e.printStackTrace()
return false
}

return true
}
}

0 comments on commit 8f340f0

Please sign in to comment.