Merge pull request #355 from OpenHub-Store/desktop-proxy-fix

Author: rainxchzed

composeApp/src/jvmMain/kotlin/zed/rainxch/githubstore/DesktopApp.kt

@@ -24,6 +24,12 @@ import java.awt.Desktop
 import kotlin.system.exitProcess
 
 fun main(args: Array<String>) {
+    // Reduce JVM DNS cache TTL so network changes (VPN on/off) are picked up quickly.
+    // Default JVM caches positive lookups for 30s and negative lookups forever,
+    // which breaks connectivity when a VPN changes DNS/routing mid-session.
+    java.security.Security.setProperty("networkaddress.cache.ttl", "30")
+    java.security.Security.setProperty("networkaddress.cache.negative.ttl", "5")
+
     initKoin()
 
     val deepLinkArg = args.firstOrNull()

core/data/src/commonMain/kotlin/zed/rainxch/core/data/di/SharedModule.kt

@@ -132,7 +132,7 @@ val networkModule =
                         withTimeout(1_500L) {
                             get<ProxyRepository>().getProxyConfig().first()
                         }
-                    }.getOrDefault(ProxyConfig.None)
+                    }.getOrDefault(ProxyConfig.System)
                 }
 
             when (config) {

core/data/src/commonMain/kotlin/zed/rainxch/core/data/network/HttpClientFactory.kt

@@ -29,7 +29,7 @@ fun createGitHubHttpClient(
     rateLimitRepository: RateLimitRepository,
     authenticationState: AuthenticationState? = null,
     scope: CoroutineScope? = null,
-    proxyConfig: ProxyConfig = ProxyConfig.None,
+    proxyConfig: ProxyConfig = ProxyConfig.System,
 ): HttpClient {
     val json =
         Json {

core/data/src/commonMain/kotlin/zed/rainxch/core/data/network/ProxyManager.kt

@@ -6,7 +6,7 @@ import kotlinx.coroutines.flow.asStateFlow
 import zed.rainxch.core.domain.model.ProxyConfig
 
 object ProxyManager {
-    private val _proxyConfig = MutableStateFlow<ProxyConfig>(ProxyConfig.None)
+    private val _proxyConfig = MutableStateFlow<ProxyConfig>(ProxyConfig.System)
     val currentProxyConfig: StateFlow<ProxyConfig> = _proxyConfig.asStateFlow()
 
     fun setNoProxy() {

core/data/src/commonMain/kotlin/zed/rainxch/core/data/repository/ProxyRepositoryImpl.kt

@@ -58,7 +58,7 @@ class ProxyRepositoryImpl(
                 }
 
                 else -> {
-                    ProxyConfig.None
+                    ProxyConfig.System
                 }
             }
         }

core/data/src/jvmMain/kotlin/zed/rainxch/core/data/network/HttpClientFactory.jvm.kt

@@ -5,56 +5,32 @@ import io.ktor.client.engine.ProxyBuilder
 import io.ktor.client.engine.okhttp.OkHttp
 import io.ktor.http.Url
 import zed.rainxch.core.domain.model.ProxyConfig
+import java.net.Proxy
 import java.net.ProxySelector
-import java.net.URI
 
 actual fun createPlatformHttpClient(proxyConfig: ProxyConfig): HttpClient =
     HttpClient(OkHttp) {
         engine {
-            proxy =
-                when (proxyConfig) {
-                    is ProxyConfig.None -> {
-                        null
+            when (proxyConfig) {
+                is ProxyConfig.None -> {
+                    config {
+                        proxy(Proxy.NO_PROXY)
                     }
+                }
 
-                    is ProxyConfig.System -> {
-                        val systemProxy =
-                            ProxySelector
-                                .getDefault()
-                                ?.select(URI("https://api.github.com"))
-                                ?.firstOrNull { it.type() != java.net.Proxy.Type.DIRECT }
-
-                        if (systemProxy != null) {
-                            val addr = systemProxy.address() as? java.net.InetSocketAddress
-                            if (addr != null) {
-                                when (systemProxy.type()) {
-                                    java.net.Proxy.Type.HTTP -> {
-                                        ProxyBuilder.http(Url("http://${addr.hostString}:${addr.port}"))
-                                    }
-
-                                    java.net.Proxy.Type.SOCKS -> {
-                                        ProxyBuilder.socks(addr.hostString, addr.port)
-                                    }
-
-                                    else -> {
-                                        null
-                                    }
-                                }
-                            } else {
-                                null
-                            }
-                        } else {
-                            null
-                        }
+                is ProxyConfig.System -> {
+                    config {
+                        proxySelector(ProxySelector.getDefault())
                     }
+                }
 
-                    is ProxyConfig.Http -> {
-                        ProxyBuilder.http(Url("http://${proxyConfig.host}:${proxyConfig.port}"))
-                    }
+                is ProxyConfig.Http -> {
+                    proxy = ProxyBuilder.http(Url("http://${proxyConfig.host}:${proxyConfig.port}"))
+                }
 
-                    is ProxyConfig.Socks -> {
-                        ProxyBuilder.socks(proxyConfig.host, proxyConfig.port)
-                    }
+                is ProxyConfig.Socks -> {
+                    proxy = ProxyBuilder.socks(proxyConfig.host, proxyConfig.port)
                 }
+            }
         }
     }