Merge remote-tracking branch 'upstream/main' into feature/add-proxy-support

# Conflicts:
#	webview-compose/src/commonMain/kotlin/io/github/kdroidfilter/webview/setting/PlatformWebSettings.kt
#	webview-compose/src/jvmMain/kotlin/io/github/kdroidfilter/webview/web/WebViewDesktop.kt
#	wrywebview/Cargo.toml
#	wrywebview/src/main/kotlin/io/github/kdroidfilter/webview/wry/WryWebViewPanel.kt
#	wrywebview/src/main/rust/lib.rs

Author: bommbomm34

README.md

@@ -222,7 +222,13 @@ Commands:
 state.webSettings.customUserAgentString = "MyApp/1.2.3"
 ```
 
+Desktop note on user-agent:
 
+* applied at creation time
+* changing it **recreates** the WebView (debounced)
+* JS context/history may be lostd
+
+👉 Set it early.
 
 ### Proxy (desktop only)
 
@@ -235,13 +241,7 @@ state.webSettings.desktopWebSettings.proxyConfig = ProxyConfig.Socks5("proxy.tld
 
 Proxy is only supported on Windows, macOS 14.0+ and Linux.
 
-Desktop note on both user-agent and proxy:
-
-* applied at creation time
-* changing it **recreates** the WebView (debounced)
-* JS context/history may be lost
-
-👉 Set them early.
+**NOTE:** You need to set the proxy **before** the WebView gets created.
 
 ---
 

demo-shared/src/commonMain/kotlin/io/github/kdroidfilter/webview/demo/DemoToolsPanel.kt

@@ -1,9 +1,21 @@
 package io.github.kdroidfilter.webview.demo
 
-import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.ColumnScope
+import androidx.compose.foundation.layout.ExperimentalLayoutApi
+import androidx.compose.foundation.layout.FlowRow
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.heightIn
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.items
-import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.verticalScroll
 import androidx.compose.material3.Button
 import androidx.compose.material3.Card
@@ -19,17 +31,12 @@ import androidx.compose.material3.Switch
 import androidx.compose.material3.Text
 import androidx.compose.material3.TextButton
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
-import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
 import composewebview.demo_shared.generated.resources.Res
 import io.github.kdroidfilter.webview.cookie.Cookie
-import io.github.kdroidfilter.webview.setting.ProxyConfig
 import io.github.kdroidfilter.webview.util.KLogSeverity
 import io.github.kdroidfilter.webview.web.WebViewNavigator
 import io.github.kdroidfilter.webview.web.WebViewState
@@ -80,9 +87,6 @@ internal fun DemoToolsPanel(
     onSetLogSeverity: (KLogSeverity) -> Unit,
 ) {
     val scope = rememberCoroutineScope()
-    val desktopWebSettings = webViewState.webSettings.desktopWebSettings
-    var proxyType by remember { mutableStateOf("None") }
-    var proxyText by remember { mutableStateOf(desktopWebSettings.proxyConfig?.toString() ?: "") }
     Surface(modifier = modifier, color = MaterialTheme.colorScheme.surface) {
         Column(
             modifier = Modifier.fillMaxSize().verticalScroll(rememberScrollState()).padding(12.dp),
@@ -371,29 +375,6 @@ internal fun DemoToolsPanel(
                     singleLine = true,
                     label = { Text("Custom User-Agent") },
                 )
-                Spacer(Modifier.height(8.dp))
-                OutlinedTextField(
-                    value = proxyText,
-                    onValueChange = { proxyText = it },
-                    singleLine = true,
-                    label = { Text("Proxy (desktop only)") },
-                )
-                FlowRow(horizontalArrangement = Arrangement.spacedBy(8.dp), verticalArrangement = Arrangement.spacedBy(8.dp)) {
-                    listOf("None", "HTTP", "SOCKS5").forEach { type ->
-                        FilterChip(
-                            selected = proxyType == type,
-                            onClick = { proxyType = type },
-                            label = { Text(type) },
-                        )
-                    }
-                }
-                Button(
-                    onClick = {
-                        desktopWebSettings.proxyConfig = proxyText.ifBlank { null }?.parseProxyConfig(proxyType)
-                    }
-                ){
-                    Text("Set proxy")
-                }
             }
 
             SectionCard(title = "Logs") {
@@ -472,15 +453,4 @@ private fun inlineHtml(): String =
       </script>
     </body>
     </html>
-    """.trimIndent()
-
-private fun String.parseProxyConfig(proxyType: String): ProxyConfig? {
-    val host = substringBefore(":").ifBlank { null } ?: return null
-    val port = substringAfter(":").toIntOrNull() ?: return null
-    return when (proxyType) {
-        "None" -> null
-        "HTTP" -> ProxyConfig.Http(host, port)
-        "SOCKS5" -> ProxyConfig.Socks5(host, port)
-        else -> error("Invalid proxy type: $proxyType")
-    }
-}
+    """.trimIndent()

webview-compose/src/androidMain/kotlin/io/github/kdroidfilter/webview/web/AndroidWebView.kt

@@ -8,20 +8,20 @@ import io.github.kdroidfilter.webview.util.KLogger
 import kotlinx.coroutines.CoroutineScope
 
 internal class AndroidWebView(
-    override val webView: WebView,
+    override val nativeWebView: WebView,
     override val scope: CoroutineScope,
     override val webViewJsBridge: WebViewJsBridge?,
 ) : IWebView {
     init {
         initWebView()
     }
 
-    override fun canGoBack(): Boolean = webView.canGoBack()
+    override fun canGoBack(): Boolean = nativeWebView.canGoBack()
 
-    override fun canGoForward(): Boolean = webView.canGoForward()
+    override fun canGoForward(): Boolean = nativeWebView.canGoForward()
 
     override fun loadUrl(url: String, additionalHttpHeaders: Map<String, String>) {
-        webView.loadUrl(url, additionalHttpHeaders)
+        nativeWebView.loadUrl(url, additionalHttpHeaders)
     }
 
     override suspend fun loadHtml(
@@ -32,7 +32,7 @@ internal class AndroidWebView(
         historyUrl: String?,
     ) {
         if (html == null) return
-        webView.loadDataWithBaseURL(baseUrl, html, mimeType, encoding, historyUrl)
+        nativeWebView.loadDataWithBaseURL(baseUrl, html, mimeType, encoding, historyUrl)
     }
 
     override suspend fun loadHtmlFile(fileName: String, readType: WebViewFileReadType) {
@@ -52,34 +52,35 @@ internal class AndroidWebView(
                 val selected =
                     candidates.firstOrNull { path ->
                         try {
-                            webView.context.assets.open(path).close()
+                            nativeWebView.context.assets.open(path).close()
                             true
                         } catch (_: Exception) {
                             false
                         }
                     } ?: candidates.first()
                 val url = "file:///android_asset/$selected"
-                webView.loadUrl(url)
+                nativeWebView.loadUrl(url)
                 KLogger.d(tag = "AndroidWebView") { "loadUrl $url (candidates: ${candidates.joinToString()})" }
             }
-            WebViewFileReadType.COMPOSE_RESOURCE_FILES -> webView.loadUrl(fileName)
+
+            WebViewFileReadType.COMPOSE_RESOURCE_FILES -> nativeWebView.loadUrl(fileName)
         }
     }
 
-    override fun goBack() = webView.goBack()
+    override fun goBack() = nativeWebView.goBack()
 
-    override fun goForward() = webView.goForward()
+    override fun goForward() = nativeWebView.goForward()
 
-    override fun reload() = webView.reload()
+    override fun reload() = nativeWebView.reload()
 
-    override fun stopLoading() = webView.stopLoading()
+    override fun stopLoading() = nativeWebView.stopLoading()
 
     override fun evaluateJavaScript(script: String, callback: ((String) -> Unit)?) {
         val androidScript = "javascript:$script"
         KLogger.d {
             "evaluateJavaScript: $androidScript"
         }
-        webView.evaluateJavascript(androidScript, callback)
+        nativeWebView.evaluateJavascript(androidScript, callback)
     }
 
     override fun injectJsBridge() {
@@ -97,7 +98,7 @@ internal class AndroidWebView(
     }
 
     override fun initJsBridge(webViewJsBridge: WebViewJsBridge) {
-        webView.addJavascriptInterface(this, "androidJsBridge")
+        nativeWebView.addJavascriptInterface(this, "androidJsBridge")
     }
 
     @JavascriptInterface

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

@@ -1,8 +1,5 @@
 package io.github.kdroidfilter.webview.setting
 
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.setValue
 import androidx.compose.ui.graphics.Color
 
 /**
@@ -16,10 +13,17 @@ sealed class PlatformWebSettings {
     ) : PlatformWebSettings()
 
     data class DesktopWebSettings(
-        var transparent: Boolean = true
-    ) : PlatformWebSettings() {
-        var proxyConfig: ProxyConfig? by mutableStateOf(null)
-    }
+        var transparent: Boolean = true,
+        var dataDirectory: String? = null,
+        var initScript: String? = null,
+        var enableClipboard: Boolean = true,
+        var enableDevtools: Boolean = false,
+        var enableNavigationGestures: Boolean = true,
+        var incognito: Boolean = false,
+        var autoplayWithoutUserInteraction: Boolean = false,
+        var focused: Boolean = true,
+        var proxyConfig: ProxyConfig? = null,
+    ) : PlatformWebSettings()
 
     data class IOSWebSettings(
         var opaque: Boolean = false,

webview-compose/src/commonMain/kotlin/io/github/kdroidfilter/webview/web/IWebView.kt

@@ -9,7 +9,7 @@ expect class NativeWebView
  * Platform WebView abstraction.
  */
 interface IWebView {
-    val webView: NativeWebView
+    val nativeWebView: NativeWebView
 
     val scope: CoroutineScope
 

webview-compose/src/commonMain/kotlin/io/github/kdroidfilter/webview/web/WebViewState.kt

@@ -1,12 +1,6 @@
 package io.github.kdroidfilter.webview.web
 
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.Stable
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateListOf
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.setValue
+import androidx.compose.runtime.*
 import androidx.compose.runtime.snapshots.SnapshotStateList
 import io.github.kdroidfilter.webview.cookie.CookieManager
 import io.github.kdroidfilter.webview.cookie.WebViewCookieManager
@@ -34,10 +28,8 @@ class WebViewState(
 
     val webSettings: WebSettings by mutableStateOf(WebSettings())
 
-    internal var webView by mutableStateOf<IWebView?>(null)
-
-    val nativeWebView: NativeWebView
-        get() = webView?.webView ?: error("WebView is not initialized")
+    var webView: IWebView? by mutableStateOf(null)
+        internal set
 
     val cookieManager: CookieManager by mutableStateOf(WebViewCookieManager())
 }

webview-compose/src/iosMain/kotlin/io/github/kdroidfilter/webview/web/IOSWebView.kt

@@ -5,33 +5,23 @@ import io.github.kdroidfilter.webview.jsbridge.WebViewJsBridge
 import io.github.kdroidfilter.webview.util.KLogger
 import kotlinx.cinterop.ExperimentalForeignApi
 import kotlinx.coroutines.CoroutineScope
-import platform.Foundation.NSArray
-import platform.Foundation.NSBundle
-import platform.Foundation.NSDocumentDirectory
-import platform.Foundation.NSFileManager
-import platform.Foundation.NSMutableURLRequest
-import platform.Foundation.NSSearchPathForDirectoriesInDomains
-import platform.Foundation.NSString
-import platform.Foundation.NSURL
-import platform.Foundation.NSUserDomainMask
-import platform.Foundation.setValue
-import platform.Foundation.stringByDeletingLastPathComponent
+import platform.Foundation.*
 import platform.WebKit.WKWebView
 
 internal const val IOS_JS_BRIDGE_HANDLER_NAME: String = "iosJsBridge"
 
 internal class IOSWebView(
-    override val webView: WKWebView,
+    override val nativeWebView: WKWebView,
     override val scope: CoroutineScope,
     override val webViewJsBridge: WebViewJsBridge?,
 ) : IWebView {
     init {
         initWebView()
     }
 
-    override fun canGoBack(): Boolean = webView.canGoBack
+    override fun canGoBack(): Boolean = nativeWebView.canGoBack
 
-    override fun canGoForward(): Boolean = webView.canGoForward
+    override fun canGoForward(): Boolean = nativeWebView.canGoForward
 
     override fun loadUrl(url: String, additionalHttpHeaders: Map<String, String>) {
         if (url.startsWith("file://")) {
@@ -52,7 +42,7 @@ internal class IOSWebView(
                     }
 
                 if (readAccessURL != null) {
-                    webView.loadFileURL(fileURL, readAccessURL)
+                    nativeWebView.loadFileURL(fileURL, readAccessURL)
                     return
                 }
             }
@@ -66,7 +56,7 @@ internal class IOSWebView(
                 forHTTPHeaderField = key,
             )
         }
-        webView.loadRequest(request = request)
+        nativeWebView.loadRequest(request = request)
     }
 
     override suspend fun loadHtml(
@@ -77,7 +67,7 @@ internal class IOSWebView(
         historyUrl: String?,
     ) {
         if (html == null) return
-        webView.loadHTMLString(
+        nativeWebView.loadHTMLString(
             string = html,
             baseURL = baseUrl?.let { NSURL.URLWithString(it) },
         )
@@ -154,7 +144,7 @@ internal class IOSWebView(
                 return
             }
 
-            webView.loadFileURL(fileURL, readAccessURL!!)
+            nativeWebView.loadFileURL(fileURL, readAccessURL!!)
         } catch (e: Exception) {
             KLogger.e(e, tag = "IOSWebView") { "Error loading HTML file: $fileName (readType: $readType)" }
             val errorHtml =
@@ -172,24 +162,24 @@ internal class IOSWebView(
     }
 
     override fun goBack() {
-        webView.goBack()
+        nativeWebView.goBack()
     }
 
     override fun goForward() {
-        webView.goForward()
+        nativeWebView.goForward()
     }
 
     override fun reload() {
-        webView.reload()
+        nativeWebView.reload()
     }
 
     override fun stopLoading() {
-        webView.stopLoading()
+        nativeWebView.stopLoading()
     }
 
     @OptIn(ExperimentalForeignApi::class)
     override fun evaluateJavaScript(script: String, callback: ((String) -> Unit)?) {
-        webView.evaluateJavaScript(script) { result, error ->
+        nativeWebView.evaluateJavaScript(script) { result, error ->
             if (callback == null) return@evaluateJavaScript
             if (error != null) {
                 KLogger.e { "evaluateJavaScript error: $error" }
@@ -217,6 +207,9 @@ internal class IOSWebView(
 
     override fun initJsBridge(webViewJsBridge: WebViewJsBridge) {
         val jsMessageHandler = WKJsMessageHandler(webViewJsBridge)
-        webView.configuration.userContentController.addScriptMessageHandler(jsMessageHandler, IOS_JS_BRIDGE_HANDLER_NAME)
+        nativeWebView.configuration.userContentController.addScriptMessageHandler(
+            scriptMessageHandler = jsMessageHandler,
+            name = IOS_JS_BRIDGE_HANDLER_NAME
+        )
     }
 }