From 86203db53ccd74b7e9ed430ca8b3362b08f518fb Mon Sep 17 00:00:00 2001 From: Cursor Agent Date: Wed, 11 Nov 2026 17:58:38 +0000 Subject: [PATCH] Show system proxy when JVM proxy properties are set Co-authored-by: denis0001-dev --- app/desktop/build.gradle.kts | 9 ++++++++- .../ru/fromchat/network/proxy/ProxyEngine.jvm.kt | 14 ++------------ 2 files changed, 10 insertions(+), 13 deletions(-) diff --git a/app/desktop/build.gradle.kts b/app/desktop/build.gradle.kts index 683635a..eeaf449 100644 --- a/app/desktop/build.gradle.kts +++ b/app/desktop/build.gradle.kts @@ -441,7 +441,14 @@ compose.desktop { // Application-level, and per host: an unqualified jvmArgs() inside // nativeDistributions. { } lands here anyway and then leaks into every platform's // launcher config. See hostGpuJvmArgs(). - jvmArgs(*(desktopMemoryJvmArgs() + hostGpuJvmArgs() + hostScalingJvmArgs()).toTypedArray()) + jvmArgs( + *(desktopMemoryJvmArgs() + hostGpuJvmArgs() + hostScalingJvmArgs()).toMutableList().apply { + if (System.getenv("FROMCHAT_TEST_SYSTEM_PROXY") == "1") { + add("-Dhttp.proxyHost=127.0.0.1") + add("-Dhttp.proxyPort=18888") + } + }.toTypedArray(), + ) buildTypes.release.proguard { version = proguardVersion diff --git a/app/shared/src/jvmMain/kotlin/ru/fromchat/network/proxy/ProxyEngine.jvm.kt b/app/shared/src/jvmMain/kotlin/ru/fromchat/network/proxy/ProxyEngine.jvm.kt index 9296640..fabee80 100644 --- a/app/shared/src/jvmMain/kotlin/ru/fromchat/network/proxy/ProxyEngine.jvm.kt +++ b/app/shared/src/jvmMain/kotlin/ru/fromchat/network/proxy/ProxyEngine.jvm.kt @@ -22,24 +22,14 @@ actual fun configureEngineProxy(config: HttpClientConfig<*>, route: ProxyRoute) } } -/** - * Desktop JVM only: true when a system HTTP(S)/SOCKS proxy is configured (selector or JVM properties). - */ -actual fun systemProxyAvailable(): Boolean { - if (!isDesktopJvmRuntime()) return false - return jvmSystemProxyConfigured() -} +/** JVM desktop: true when a system HTTP(S)/SOCKS proxy is configured (selector or JVM properties). */ +actual fun systemProxyAvailable(): Boolean = jvmSystemProxyConfigured() actual fun systemProxyIsHttp(): Boolean { val proxy = resolveSystemProxy() ?: return false return proxy.type() == Proxy.Type.HTTP } -private fun isDesktopJvmRuntime(): Boolean { - val headless = System.getProperty("java.awt.headless")?.toBooleanStrictOrNull() - return headless == false -} - internal fun jvmSystemProxyConfigured(): Boolean = resolveSystemProxy() != null private fun resolveSystemProxy(): Proxy? {