Add proxy support to Compose side

Currently, the proxy won't be updated if it's changed after webview creation.

Author: bommbomm34

webview-compose/src/commonMain/kotlin/io/github/kdroidfilter/webview/setting/PlatformWebSettings.kt

@@ -14,6 +14,7 @@ sealed class PlatformWebSettings {
 
     data class DesktopWebSettings(
         var transparent: Boolean = true,
+        var proxyConfig: ProxyConfig? = null
     ) : PlatformWebSettings()
 
     data class IOSWebSettings(

webview-compose/src/commonMain/kotlin/io/github/kdroidfilter/webview/setting/ProxyConfig.kt

@@ -0,0 +1,16 @@
+package io.github.kdroidfilter.webview.setting
+
+sealed class ProxyConfig {
+    abstract val host: String
+    abstract val port: Int
+
+    data class Http(
+        override val host: String,
+        override val port: Int
+    ) : ProxyConfig()
+
+    data class Socks5(
+        override val host: String,
+        override val port: Int
+    ) : ProxyConfig()
+}

webview-compose/src/jvmMain/kotlin/io/github/kdroidfilter/webview/web/WebViewDesktop.kt

@@ -17,18 +17,20 @@ import io.github.kdroidfilter.webview.jsbridge.WebViewJsBridge
 import io.github.kdroidfilter.webview.jsbridge.parseJsMessage
 import io.github.kdroidfilter.webview.request.WebRequest
 import io.github.kdroidfilter.webview.request.WebRequestInterceptResult
+import io.github.kdroidfilter.webview.setting.ProxyConfig
 import kotlinx.coroutines.delay
 
 actual class WebViewFactoryParam(
     val state: WebViewState,
     val fileContent: String = "",
     val userAgent: String? = null,
+    val proxyConfig: ProxyConfig? = null
 )
 
 actual fun defaultWebViewFactory(param: WebViewFactoryParam): NativeWebView =
     when (val content = param.state.content) {
-        is WebContent.Url -> NativeWebView(content.url, param.userAgent ?: param.state.webSettings.customUserAgentString)
-        else -> NativeWebView("about:blank", param.userAgent ?: param.state.webSettings.customUserAgentString)
+        is WebContent.Url -> NativeWebView(content.url, param.userAgent ?: param.state.webSettings.customUserAgentString, param.proxyConfig?.toJvmProxyConfig())
+        else -> NativeWebView("about:blank", param.userAgent ?: param.state.webSettings.customUserAgentString, param.proxyConfig?.toJvmProxyConfig())
     }
 
 @Composable
@@ -44,6 +46,7 @@ actual fun ActualWebView(
     val currentOnDispose by rememberUpdatedState(onDispose)
     val scope = rememberCoroutineScope()
 
+    val proxyConfig = remember { state.webSettings.desktopWebSettings.proxyConfig }
     val desiredUserAgent = state.webSettings.customUserAgentString?.trim()?.takeIf { it.isNotEmpty() }
     var effectiveUserAgent by remember { mutableStateOf(desiredUserAgent) }
 
@@ -55,7 +58,7 @@ actual fun ActualWebView(
     }
 
     key(effectiveUserAgent) {
-        val nativeWebView = remember(state, factory) { factory(WebViewFactoryParam(state, userAgent = effectiveUserAgent)) }
+        val nativeWebView = remember(state, factory) { factory(WebViewFactoryParam(state, userAgent = effectiveUserAgent, proxyConfig = proxyConfig)) }
 
         val desktopWebView =
             remember(nativeWebView, scope, webViewJsBridge) {
@@ -174,3 +177,8 @@ actual fun ActualWebView(
         }
     }
 }
+
+internal fun ProxyConfig.toJvmProxyConfig(): io.github.kdroidfilter.webview.wry.JvmProxyConfig = when (this) {
+    is ProxyConfig.Http -> io.github.kdroidfilter.webview.wry.JvmProxyConfig.Http(host, port)
+    is ProxyConfig.Socks5 -> io.github.kdroidfilter.webview.wry.JvmProxyConfig.Socks5(host, port)
+}

…github/kdroidfilter/webview/wry/Proxy.kt …roidfilter/webview/wry/JvmProxyConfig.ktwrywebview/src/main/kotlin/io/github/kdroidfilter/webview/wry/Proxy.kt renamed to wrywebview/src/main/kotlin/io/github/kdroidfilter/webview/wry/JvmProxyConfig.kt wrywebview/src/main/kotlin/io/github/kdroidfilter/webview/wry/Proxy.kt renamed to wrywebview/src/main/kotlin/io/github/kdroidfilter/webview/wry/JvmProxyConfig.kt

@@ -1,20 +1,23 @@
 package io.github.kdroidfilter.webview.wry
 
-sealed class ProxyConfig {
+/**
+ * JVM-specific proxy config
+ */
+sealed class JvmProxyConfig {
     abstract val host: String
     abstract val port: Int
 
     data class Http(
         override val host: String,
         override val port: Int
-    ) : ProxyConfig() {
+    ) : JvmProxyConfig() {
         override fun toProxy(): Proxy.Http = Proxy.Http(Address(host, port.toUShort()))
     }
 
     data class Socks5(
         override val host: String,
         override val port: Int
-    ) : ProxyConfig() {
+    ) : JvmProxyConfig() {
         override fun toProxy(): Proxy.Socks5 = Proxy.Socks5(Address(host, port.toUShort()))
     }
 

wrywebview/src/main/kotlin/io/github/kdroidfilter/webview/wry/WryWebViewPanel.kt

@@ -14,7 +14,7 @@ import kotlin.concurrent.thread
 class WryWebViewPanel(
     initialUrl: String,
     customUserAgent: String? = null,
-    proxyConfig: ProxyConfig? = null,
+    jvmProxyConfig: JvmProxyConfig? = null,
     private val bridgeLogger: (String) -> Unit = { System.err.println(it) }
 ) : JPanel() {
     private val host = SkikoInterop.createHost()
@@ -23,7 +23,7 @@ class WryWebViewPanel(
     private var parentIsWindow: Boolean = false
     private var pendingUrl: String = initialUrl
     private val customUserAgent: String? = customUserAgent?.trim()?.takeIf { it.isNotEmpty() }
-    private val proxy: Proxy? = proxyConfig?.toProxy()
+    private val proxy: Proxy? = jvmProxyConfig?.toProxy()
     private var pendingUrlWithHeaders: String? = null
     private var pendingHeaders: Map<String, String> = emptyMap()
     private var pendingHtml: String? = null