Keep resolver scan branch isolated

Remove traffic-clarity and field-tested config changes from the resolver scan branch so that work remains owned by the setup readiness branch.

Keep the scan budget tests positioned with the parallel settings coverage so the branch merges cleanly after setup readiness.

Author: AmirrezaFarnamTaheri

app/src/main/java/shop/whitedns/client/model/WhiteDnsAutoTune.kt

@@ -3,57 +3,16 @@ package shop.whitedns.client.model
 data class WhiteDnsAutoTunePreset(
     val id: String,
     val label: String,
-    val listenIp: String? = null,
-    val listenPort: String? = null,
-    val httpProxyEnabled: Boolean? = null,
-    val httpProxyPort: String? = null,
-    val socks5Authentication: Boolean? = null,
-    val socksUsername: String? = null,
-    val socksPassword: String? = null,
-    val localDnsEnabled: Boolean? = null,
-    val localDnsPort: String? = null,
-    val balancingStrategy: Int? = null,
     val minUploadMtu: String,
     val maxUploadMtu: String,
     val minDownloadMtu: String,
     val maxDownloadMtu: String,
     val resolverTimeoutSeconds: String,
-    val resolverRetries: String? = null,
-    val resolverParallelism: String? = null,
-    val logRetries: String? = null,
-    val logTimeoutSeconds: String? = null,
-    val logParallelism: String? = null,
     val dnsResponseFragmentStoreCapacity: String,
     val uploadDuplication: String,
     val downloadDuplication: String,
     val uploadCompression: Int,
     val downloadCompression: Int,
-    val baseEncodeData: Boolean? = null,
-    val rxTxWorkers: String? = null,
-    val tunnelProcessWorkers: String? = null,
-    val tunnelPacketTimeoutSeconds: String? = null,
-    val dispatcherIdlePollIntervalSeconds: String? = null,
-    val txChannelSize: String? = null,
-    val rxChannelSize: String? = null,
-    val resolverUdpConnectionPoolSize: String? = null,
-    val streamQueueInitialCapacity: String? = null,
-    val orphanQueueInitialCapacity: String? = null,
-    val maxActiveStreams: String? = null,
-    val localHandshakeTimeoutSeconds: String? = null,
-    val socksUdpAssociateReadTimeoutSeconds: String? = null,
-    val clientTerminalStreamRetentionSeconds: String? = null,
-    val clientCancelledSetupRetentionSeconds: String? = null,
-    val sessionInitRetryBaseSeconds: String? = null,
-    val sessionInitRetryStepSeconds: String? = null,
-    val sessionInitRetryLinearAfter: String? = null,
-    val sessionInitRetryMaxSeconds: String? = null,
-    val sessionInitBusyRetryIntervalSeconds: String? = null,
-    val startupMode: String? = null,
-    val pingWatchdogSeconds: String? = null,
-    val trafficWarmupEnabled: Boolean? = null,
-    val trafficWarmupProbeCount: String? = null,
-    val trafficKeepaliveIntervalSeconds: String? = null,
-    val logLevel: String? = null,
 )
 
 object WhiteDnsAutoTunePresets {
@@ -156,61 +115,6 @@ object WhiteDnsAutoTunePresets {
             uploadCompression = 2,
             downloadCompression = 2,
         ),
-        WhiteDnsAutoTunePreset(
-            id = "field-milad-telegram",
-            label = "Milad Telegram Proxy",
-            listenIp = "127.0.0.1",
-            listenPort = "10886",
-            httpProxyEnabled = true,
-            httpProxyPort = "10887",
-            socks5Authentication = false,
-            socksUsername = "master_dns_vpn",
-            socksPassword = "master_dns_vpn",
-            localDnsEnabled = false,
-            localDnsPort = "53",
-            balancingStrategy = 3,
-            minUploadMtu = "5",
-            maxUploadMtu = "30",
-            minDownloadMtu = "300",
-            maxDownloadMtu = "300",
-            resolverTimeoutSeconds = "3.0",
-            resolverRetries = "3",
-            resolverParallelism = "100",
-            logRetries = "5",
-            logTimeoutSeconds = "2.0",
-            logParallelism = "32",
-            dnsResponseFragmentStoreCapacity = "64",
-            uploadDuplication = "3",
-            downloadDuplication = "4",
-            uploadCompression = 2,
-            downloadCompression = 2,
-            baseEncodeData = false,
-            rxTxWorkers = "4",
-            tunnelProcessWorkers = "4",
-            tunnelPacketTimeoutSeconds = "10.0",
-            dispatcherIdlePollIntervalSeconds = "0.02",
-            txChannelSize = "2048",
-            rxChannelSize = "2048",
-            resolverUdpConnectionPoolSize = "64",
-            streamQueueInitialCapacity = "128",
-            orphanQueueInitialCapacity = "32",
-            maxActiveStreams = "2048",
-            localHandshakeTimeoutSeconds = "5.0",
-            socksUdpAssociateReadTimeoutSeconds = "30.0",
-            clientTerminalStreamRetentionSeconds = "45.0",
-            clientCancelledSetupRetentionSeconds = "120.0",
-            sessionInitRetryBaseSeconds = "1.0",
-            sessionInitRetryStepSeconds = "1.0",
-            sessionInitRetryLinearAfter = "5",
-            sessionInitRetryMaxSeconds = "60.0",
-            sessionInitBusyRetryIntervalSeconds = "60.0",
-            startupMode = "resolvers",
-            pingWatchdogSeconds = "30",
-            trafficWarmupEnabled = true,
-            trafficWarmupProbeCount = "4",
-            trafficKeepaliveIntervalSeconds = "5",
-            logLevel = "WARN",
-        ),
     )
 }
 
@@ -278,62 +182,17 @@ object WhiteDnsParallelTest {
 
 fun WhiteDnsSettings.applyAutoTunePreset(preset: WhiteDnsAutoTunePreset): WhiteDnsSettings {
     return copy(
-        listenIp = preset.listenIp ?: listenIp,
-        listenPort = preset.listenPort ?: listenPort,
-        httpProxyEnabled = preset.httpProxyEnabled ?: httpProxyEnabled,
-        httpProxyPort = preset.httpProxyPort ?: httpProxyPort,
-        socks5Authentication = preset.socks5Authentication ?: socks5Authentication,
-        socksUsername = preset.socksUsername ?: socksUsername,
-        socksPassword = preset.socksPassword ?: socksPassword,
-        localDnsEnabled = preset.localDnsEnabled ?: localDnsEnabled,
-        localDnsPort = preset.localDnsPort ?: localDnsPort,
-        balancingStrategy = preset.balancingStrategy ?: balancingStrategy,
         minUploadMtu = preset.minUploadMtu,
         maxUploadMtu = preset.maxUploadMtu,
         minDownloadMtu = preset.minDownloadMtu,
         maxDownloadMtu = preset.maxDownloadMtu,
         mtuTestTimeoutResolvers = preset.resolverTimeoutSeconds,
-        mtuTestRetriesResolvers = preset.resolverRetries ?: mtuTestRetriesResolvers,
-        mtuTestParallelismResolvers = preset.resolverParallelism ?: mtuTestParallelismResolvers,
-        mtuTestRetriesLogs = preset.logRetries ?: mtuTestRetriesLogs,
-        mtuTestTimeoutLogs = preset.logTimeoutSeconds ?: preset.resolverTimeoutSeconds,
-        mtuTestParallelismLogs = preset.logParallelism ?: mtuTestParallelismLogs,
+        mtuTestTimeoutLogs = preset.resolverTimeoutSeconds,
         dnsResponseFragmentStoreCapacity = preset.dnsResponseFragmentStoreCapacity,
         uploadDuplication = preset.uploadDuplication,
         downloadDuplication = preset.downloadDuplication,
         uploadCompression = preset.uploadCompression,
         downloadCompression = preset.downloadCompression,
-        baseEncodeData = preset.baseEncodeData ?: baseEncodeData,
-        rxTxWorkers = preset.rxTxWorkers ?: rxTxWorkers,
-        tunnelProcessWorkers = preset.tunnelProcessWorkers ?: tunnelProcessWorkers,
-        tunnelPacketTimeoutSeconds = preset.tunnelPacketTimeoutSeconds ?: tunnelPacketTimeoutSeconds,
-        dispatcherIdlePollIntervalSeconds = preset.dispatcherIdlePollIntervalSeconds ?: dispatcherIdlePollIntervalSeconds,
-        txChannelSize = preset.txChannelSize ?: txChannelSize,
-        rxChannelSize = preset.rxChannelSize ?: rxChannelSize,
-        resolverUdpConnectionPoolSize = preset.resolverUdpConnectionPoolSize ?: resolverUdpConnectionPoolSize,
-        streamQueueInitialCapacity = preset.streamQueueInitialCapacity ?: streamQueueInitialCapacity,
-        orphanQueueInitialCapacity = preset.orphanQueueInitialCapacity ?: orphanQueueInitialCapacity,
-        maxActiveStreams = preset.maxActiveStreams ?: maxActiveStreams,
-        localHandshakeTimeoutSeconds = preset.localHandshakeTimeoutSeconds ?: localHandshakeTimeoutSeconds,
-        socksUdpAssociateReadTimeoutSeconds = preset.socksUdpAssociateReadTimeoutSeconds
-            ?: socksUdpAssociateReadTimeoutSeconds,
-        clientTerminalStreamRetentionSeconds = preset.clientTerminalStreamRetentionSeconds
-            ?: clientTerminalStreamRetentionSeconds,
-        clientCancelledSetupRetentionSeconds = preset.clientCancelledSetupRetentionSeconds
-            ?: clientCancelledSetupRetentionSeconds,
-        sessionInitRetryBaseSeconds = preset.sessionInitRetryBaseSeconds ?: sessionInitRetryBaseSeconds,
-        sessionInitRetryStepSeconds = preset.sessionInitRetryStepSeconds ?: sessionInitRetryStepSeconds,
-        sessionInitRetryLinearAfter = preset.sessionInitRetryLinearAfter ?: sessionInitRetryLinearAfter,
-        sessionInitRetryMaxSeconds = preset.sessionInitRetryMaxSeconds ?: sessionInitRetryMaxSeconds,
-        sessionInitBusyRetryIntervalSeconds = preset.sessionInitBusyRetryIntervalSeconds
-            ?: sessionInitBusyRetryIntervalSeconds,
-        startupMode = preset.startupMode ?: startupMode,
-        pingWatchdogSeconds = preset.pingWatchdogSeconds ?: pingWatchdogSeconds,
-        trafficWarmupEnabled = preset.trafficWarmupEnabled ?: trafficWarmupEnabled,
-        trafficWarmupProbeCount = preset.trafficWarmupProbeCount ?: trafficWarmupProbeCount,
-        trafficKeepaliveIntervalSeconds = preset.trafficKeepaliveIntervalSeconds
-            ?: trafficKeepaliveIntervalSeconds,
-        logLevel = preset.logLevel ?: logLevel,
     ).syncSelectedConnectionProfileFields()
 }
 

app/src/main/java/shop/whitedns/client/model/WhiteDnsModels.kt

@@ -366,12 +366,6 @@ data class ConnectionStats(
     val uploadSpeedBytesPerSecond: Long = 0,
     val peakSpeedBytesPerSecond: Long = 0,
     val connectedApps: Int = 0,
-    val estimatedPayloadDownloadBytes: Long = 0,
-    val estimatedPayloadUploadBytes: Long = 0,
-    val estimatedPayloadTotalBytes: Long = 0,
-    val estimatedPayloadDownloadSpeedBytesPerSecond: Long = 0,
-    val estimatedPayloadUploadSpeedBytesPerSecond: Long = 0,
-    val hasEstimatedPayloadTraffic: Boolean = false,
 )
 
 data class ResolverRuntimeState(

app/src/main/java/shop/whitedns/client/runtime/StormDnsTrafficStats.kt

@@ -10,20 +10,6 @@ data class StormDnsTrafficStats(
     val uploadSpeedBytesPerSecond: Long,
 )
 
-fun StormDnsTrafficStats.estimateDeduplicatedTraffic(
-    uploadDuplication: Int,
-    downloadDuplication: Int,
-): StormDnsTrafficStats {
-    val safeUploadDuplication = uploadDuplication.coerceAtLeast(1).toLong()
-    val safeDownloadDuplication = downloadDuplication.coerceAtLeast(1).toLong()
-    return copy(
-        downloadBytes = downloadBytes.divideRoundedUp(safeDownloadDuplication),
-        uploadBytes = uploadBytes.divideRoundedUp(safeUploadDuplication),
-        downloadSpeedBytesPerSecond = downloadSpeedBytesPerSecond.divideRoundedUp(safeDownloadDuplication),
-        uploadSpeedBytesPerSecond = uploadSpeedBytesPerSecond.divideRoundedUp(safeUploadDuplication),
-    )
-}
-
 class StormDnsTrafficAccounting {
     private var lastRawStats: StormDnsTrafficStats? = null
     private var accumulatedDownloadBytes: Long = 0L
@@ -127,15 +113,6 @@ private fun parseDataAmount(
     return (amount * multiplier).roundToLong().coerceAtLeast(0)
 }
 
-private fun Long.divideRoundedUp(divisor: Long): Long {
-    val safeValue = coerceAtLeast(0)
-    return if (safeValue == 0L) {
-        0L
-    } else {
-        1L + ((safeValue - 1L) / divisor.coerceAtLeast(1L))
-    }
-}
-
 private val AnsiEscapeRegex = Regex("\\u001B\\[[;\\d]*m")
 private val StormDnsTrafficStatsRegex = Regex(
     """([0-9]+(?:\.[0-9]+)?)\s*([KMGT]?B)/s\s*\(Total:\s*([0-9]+(?:\.[0-9]+)?)\s*([KMGT]?B)\)\s*\|\s*[^0-9]*([0-9]+(?:\.[0-9]+)?)\s*([KMGT]?B)/s\s*\(Total:\s*([0-9]+(?:\.[0-9]+)?)\s*([KMGT]?B)\)""",

app/src/main/java/shop/whitedns/client/ui/WhiteDnsScreen.kt

@@ -1040,7 +1040,7 @@ private fun ParallelTestSelectionPanel(
                 )
                 ParallelTestConfigRow(
                     label = "WhiteDNS configs",
-                    detail = "Adds ${whiteDnsConfigIds.size} suggested configs",
+                    detail = "Adds 7 suggested configs",
                     checked = allWhiteDnsSelected,
                     enabled = canAddWhiteDnsConfigs,
                     onToggle = {
@@ -6789,77 +6789,36 @@ private fun ResolverRuntimeDialog(
 private fun LiveSpeedStrip(
     stats: ConnectionStats,
 ) {
-    Column(
+    Row(
         modifier = Modifier
             .fillMaxWidth()
             .clip(RoundedCornerShape(18.dp))
             .background(WhiteDnsPalette.Surface)
             .border(2.dp, WhiteDnsPalette.Border, RoundedCornerShape(18.dp))
             .padding(8.dp),
-        verticalArrangement = Arrangement.spacedBy(8.dp),
+        horizontalArrangement = Arrangement.spacedBy(8.dp),
     ) {
-        Row(
-            modifier = Modifier.fillMaxWidth(),
-            horizontalArrangement = Arrangement.spacedBy(8.dp),
-        ) {
-            SpeedIndicator(
-                icon = Icons.Filled.Download,
-                iconContentDescription = stringResource(R.string.cd_icon_download),
-                label = "Down",
-                value = formatDataSpeed(stats.downloadSpeedBytesPerSecond),
-                modifier = Modifier.weight(1f),
-            )
-            SpeedIndicator(
-                icon = Icons.Filled.Upload,
-                iconContentDescription = stringResource(R.string.cd_icon_upload),
-                label = "Up",
-                value = formatDataSpeed(stats.uploadSpeedBytesPerSecond),
-                modifier = Modifier.weight(1f),
-            )
-            SpeedIndicator(
-                icon = Icons.Filled.DataUsage,
-                iconContentDescription = stringResource(R.string.cd_icon_data_usage),
-                label = if (stats.hasEstimatedPayloadTraffic) "Tunnel Total" else "Total Usage",
-                value = formatDataSize(stats.totalDataUsageBytes),
-                modifier = Modifier.weight(1f),
-            )
-        }
-        if (stats.hasEstimatedPayloadTraffic) {
-            Row(
-                modifier = Modifier.fillMaxWidth(),
-                horizontalArrangement = Arrangement.spacedBy(8.dp),
-            ) {
-                SpeedIndicator(
-                    icon = Icons.Filled.Download,
-                    iconContentDescription = stringResource(R.string.cd_icon_download),
-                    label = "Payload Down",
-                    value = formatDataSpeed(stats.estimatedPayloadDownloadSpeedBytesPerSecond),
-                    modifier = Modifier.weight(1f),
-                )
-                SpeedIndicator(
-                    icon = Icons.Filled.Upload,
-                    iconContentDescription = stringResource(R.string.cd_icon_upload),
-                    label = "Payload Up",
-                    value = formatDataSpeed(stats.estimatedPayloadUploadSpeedBytesPerSecond),
-                    modifier = Modifier.weight(1f),
-                )
-                SpeedIndicator(
-                    icon = Icons.Filled.DataUsage,
-                    iconContentDescription = stringResource(R.string.cd_icon_data_usage),
-                    label = "Payload Est.",
-                    value = formatDataSize(stats.estimatedPayloadTotalBytes),
-                    modifier = Modifier.weight(1f),
-                )
-            }
-            Text(
-                text = "Tunnel usage includes duplicate DNS packets, warmup, retries, and protocol overhead. Payload estimate divides tunnel counters by the configured duplication counts.",
-                style = MaterialTheme.typography.bodySmall.copy(
-                    fontSize = 10.sp,
-                    color = WhiteDnsPalette.Muted,
-                    lineHeight = 14.sp,
-                ),
-            )
-        }
+        SpeedIndicator(
+            icon = Icons.Filled.Download,
+            iconContentDescription = stringResource(R.string.cd_icon_download),
+            label = "Down",
+            value = formatDataSpeed(stats.downloadSpeedBytesPerSecond),
+            modifier = Modifier.weight(1f),
+        )
+        SpeedIndicator(
+            icon = Icons.Filled.Upload,
+            iconContentDescription = stringResource(R.string.cd_icon_upload),
+            label = "Up",
+            value = formatDataSpeed(stats.uploadSpeedBytesPerSecond),
+            modifier = Modifier.weight(1f),
+        )
+        SpeedIndicator(
+            icon = Icons.Filled.DataUsage,
+            iconContentDescription = stringResource(R.string.cd_icon_data_usage),
+            label = "Total Usage",
+            value = formatDataSize(stats.totalDataUsageBytes),
+            modifier = Modifier.weight(1f),
+        )
     }
 }
 
@@ -7683,18 +7642,6 @@ private fun buildDiagnosticsText(
         appendLine("Traffic total: ${formatDataSize(uiState.connectionStats.totalDataUsageBytes)}")
         appendLine("Traffic down: ${formatDataSpeed(uiState.connectionStats.downloadSpeedBytesPerSecond)}")
         appendLine("Traffic up: ${formatDataSpeed(uiState.connectionStats.uploadSpeedBytesPerSecond)}")
-        if (uiState.connectionStats.hasEstimatedPayloadTraffic) {
-            appendLine("Estimated payload total: ${formatDataSize(uiState.connectionStats.estimatedPayloadTotalBytes)}")
-            appendLine(
-                "Estimated payload down: " +
-                    formatDataSpeed(uiState.connectionStats.estimatedPayloadDownloadSpeedBytesPerSecond),
-            )
-            appendLine(
-                "Estimated payload up: " +
-                    formatDataSpeed(uiState.connectionStats.estimatedPayloadUploadSpeedBytesPerSecond),
-            )
-            appendLine("Traffic note: tunnel counters include duplication and DNS/protocol overhead")
-        }
         appendLine("Connected apps: ${uiState.connectionStats.connectedApps}")
         appendLine("Active resolvers: ${uiState.resolverRuntimeState.activeResolvers.size}")
         appendLine("Valid resolvers: ${uiState.resolverRuntimeState.validResolvers.size}")