Support new hysteria2 stream settings

Author: DHR60

V2rayNG/app/src/main/java/com/v2ray/ang/dto/V2rayConfig.kt

@@ -292,16 +292,8 @@ data class V2rayConfig(
 
             data class HysteriaSettingsBean(
                 var version: Int,
-                var auth: String? = null,
-                var up: String? = null,
-                var down: String? = null,
-                var udphop: HysteriaUdpHopBean? = null
-            ) {
-                data class HysteriaUdpHopBean(
-                    var port: String? = null,
-                    var interval: Int? = null
-                )
-            }
+                var auth: String? = null
+            )
 
             //https://xtls.github.io/config/transport.html#finalmaskobject
             data class FinalMaskBean(
@@ -320,19 +312,9 @@ data class V2rayConfig(
                 }
                 data class QuicParamsBean(
                     var congestion: String? = null,
-                    var debug: Boolean? = null,
                     var brutalUp: String? = null,
-                    var brutalDown: Int? = null,
+                    var brutalDown: String? = null,
                     var udpHop: UdpHopBean? = null,
-                    // Using Long for large memory/window size values
-                    var initStreamReceiveWindow: Long? = null,
-                    var maxStreamReceiveWindow: Long? = null,
-                    var initConnectionReceiveWindow: Long? = null,
-                    var maxConnectionReceiveWindow: Long? = null,
-                    var maxIdleTimeout: Int? = null,
-                    var keepAlivePeriod: Int? = null,
-                    var disablePathMTUDiscovery: Boolean? = null,
-                    var maxIncomingStreams: Int? = null
                 ) {
                     // Nested data class for the udpHop JSON object
                     data class UdpHopBean(

V2rayNG/app/src/main/java/com/v2ray/ang/fmt/Hysteria2Fmt.kt

@@ -3,7 +3,6 @@ package com.v2ray.ang.fmt
 import com.v2ray.ang.AppConfig
 import com.v2ray.ang.dto.ProfileItem
 import com.v2ray.ang.dto.V2rayConfig.OutboundBean
-import com.v2ray.ang.dto.V2rayConfig.OutboundBean.StreamSettingsBean.FinalMaskBean
 import com.v2ray.ang.enums.EConfigType
 import com.v2ray.ang.enums.NetworkType
 import com.v2ray.ang.extension.idnHost
@@ -73,7 +72,12 @@ object Hysteria2Fmt : FmtBase() {
             dicQuery["mport"] = config.portHopping.orEmpty()
         }
         if (config.portHoppingInterval.isNotNullEmpty()) {
-            dicQuery["mportHopInt"] = config.portHoppingInterval.orEmpty()
+            var portHoppingInterval = config.portHoppingInterval.orEmpty()
+            if (portHoppingInterval.contains('-')) {
+                // interval range
+                portHoppingInterval = portHoppingInterval.substringBefore('-')
+            }
+            dicQuery["mportHopInt"] = portHoppingInterval
         }
         if (config.pinnedCA256.isNotNullEmpty()) {
             dicQuery["pinSHA256"] = config.pinnedCA256.orEmpty()
@@ -107,18 +111,6 @@ object Hysteria2Fmt : FmtBase() {
             V2rayConfigManager.populateTlsSettings(it, profileItem, sni)
         }
 
-        if (profileItem.obfsPassword.isNotNullEmpty()) {
-            outboundBean.streamSettings?.finalmask = FinalMaskBean(
-                udp = listOf(
-                    FinalMaskBean.MaskBean(
-                        type = "salamander",
-                        settings = FinalMaskBean.MaskBean.MaskSettingsBean(
-                            password = profileItem.obfsPassword
-                        )
-                    )
-                )
-            )
-        }
         return outboundBean
     }
 }

V2rayNG/app/src/main/java/com/v2ray/ang/handler/V2rayConfigManager.kt

@@ -1177,9 +1177,6 @@ object V2rayConfigManager {
         val finalMask = profileItem.finalMask
         var sni: String? = null
         streamSettings.network = transport.ifEmpty { NetworkType.TCP.type }
-        finalMask?.let {
-            streamSettings.finalmask = JsonUtil.parseString(finalMask)
-        }
         when (streamSettings.network) {
             NetworkType.TCP.type -> {
                 val tcpSetting = StreamSettingsBean.TcpSettingsBean()
@@ -1293,23 +1290,41 @@ object V2rayConfigManager {
                 val hysteriaSetting = StreamSettingsBean.HysteriaSettingsBean(
                     version = 2,
                     auth = profileItem.password.orEmpty(),
-                    up = profileItem.bandwidthUp?.ifEmpty { "0" }.orEmpty(),
-                    down = profileItem.bandwidthDown?.ifEmpty { "0" }.orEmpty(),
-                    udphop = null
                 )
+                val quicParams = StreamSettingsBean.FinalMaskBean.QuicParamsBean(
+                    brutalUp = profileItem.bandwidthUp?.nullIfBlank(),
+                    brutalDown = profileItem.bandwidthDown?.nullIfBlank(),
+                )
+                quicParams.congestion = if (quicParams.brutalUp != null || quicParams.brutalDown != null) "brutal" else null
                 if (profileItem.portHopping.isNotNullEmpty()) {
-                    hysteriaSetting.udphop = StreamSettingsBean.HysteriaSettingsBean.HysteriaUdpHopBean(
-                        port = profileItem.portHopping,
-                        interval = profileItem.portHoppingInterval
-                            ?.trim()
-                            ?.toIntOrNull()
-                            ?.takeIf { it >= 5 }
-                            ?: 30
+                    val rawInterval = profileItem.portHoppingInterval?.trim()
+                    quicParams.udpHop = StreamSettingsBean.FinalMaskBean.QuicParamsBean.UdpHopBean(
+                        ports = profileItem.portHopping,
+                        interval = if (rawInterval.isNullOrEmpty()) rawInterval?.toIntOrNull()
+                            ?.takeIf { it >= 5 }?.toString() ?: "30" else rawInterval
+                    )
+                }
+                val finalmask = StreamSettingsBean.FinalMaskBean(
+                    quicParams = quicParams
+                )
+                if (profileItem.obfsPassword.isNotNullEmpty()) {
+                    val finalmaskUdp: List<StreamSettingsBean.FinalMaskBean.MaskBean> = listOf(
+                        StreamSettingsBean.FinalMaskBean.MaskBean(
+                            type = "salamander",
+                            settings = StreamSettingsBean.FinalMaskBean.MaskBean.MaskSettingsBean(
+                                password = profileItem.obfsPassword.orEmpty()
+                            )
+                        )
                     )
+                    finalmask.udp = finalmaskUdp
                 }
                 streamSettings.hysteriaSettings = hysteriaSetting
+                streamSettings.finalmask = finalmask
             }
         }
+        finalMask?.let {
+            streamSettings.finalmask = JsonUtil.parseString(finalMask)
+        }
         return sni
     }