Fix dependencies. No scrollbars, add headers, fix second load.

Author: sdsantos

composeApp/build.gradle.kts

@@ -1,4 +1,5 @@
 import com.android.build.api.variant.FilterConfiguration.FilterType.ABI
+import org.gradle.internal.os.OperatingSystem
 import org.jetbrains.compose.ExperimentalComposeLibrary
 import org.jetbrains.compose.desktop.application.dsl.TargetFormat
 import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
@@ -15,7 +16,6 @@ plugins {
     alias(libs.plugins.ktlint)
     alias(libs.plugins.sqldelight)
     alias(libs.plugins.conveyor)
-    id("org.openjfx.javafxplugin").version("0.1.0")
 }
 
 val organization: String? by project
@@ -44,11 +44,6 @@ val appConfig = mapOf(
 
 val config = appConfig[organization] ?: appConfig["ooni"]!!
 
-javafx {
-    version = "17"
-    modules = listOf("javafx.base", "javafx.graphics", "javafx.controls", "javafx.media", "javafx.web", "javafx.swing")
-}
-
 kotlin {
     androidTarget {
         @OptIn(ExperimentalKotlinGradlePluginApi::class)
@@ -129,12 +124,14 @@ kotlin {
                 implementation(files("./src/desktopMain/libs/oonimkall.jar"))
                 implementation(compose.desktop.currentOs)
                 implementation(libs.bundles.desktop)
-                implementation("org.openjfx:javafx-base:17:mac-aarch64")
-                implementation("org.openjfx:javafx-graphics:17:mac-aarch64")
-                implementation("org.openjfx:javafx-controls:17:mac-aarch64")
-                implementation("org.openjfx:javafx-media:17:mac-aarch64")
-                implementation("org.openjfx:javafx-web:17:mac-aarch64")
-                implementation("org.openjfx:javafx-swing:17:mac-aarch64")
+
+                // As JavaFX have platform-specific dependencies, we need to add them manually
+                val fxParts = listOf("base", "graphics", "controls", "media", "web", "swing")
+                val jvmVersion = 17
+                val fxSuffix = getJavaFxSuffix()
+                fxParts.forEach {
+                    implementation("org.openjfx:javafx-$it:$jvmVersion:$fxSuffix")
+                }
             }
         }
         // Testing
@@ -554,3 +551,14 @@ fun isFdroidTaskRequested(): Boolean {
 fun isDebugTaskRequested(): Boolean {
     return gradle.startParameter.taskRequests.flatMap { it.args }.any { it.contains("Debug") }
 }
+
+fun getJavaFxSuffix(): String {
+    val os = OperatingSystem.current()
+    val arch = System.getProperty("os.arch")
+    return when {
+        os.isMacOsX -> if (arch == "aarch64") "mac-aarch64" else "mac"
+        os.isWindows -> "win"
+        os.isLinux -> if (arch == "aarch64") "linux-aarch64" else "linux"
+        else -> throw IllegalStateException("Unknown OS: $os")
+    }
+}

composeApp/src/androidMain/kotlin/org/ooni/probe/ui/shared/OoniWebView.kt renamed to composeApp/src/androidMain/kotlin/org/ooni/probe/ui/shared/OoniWebView.android.kt

@@ -12,7 +12,6 @@ import android.webkit.WebView
 import android.webkit.WebViewClient
 import androidx.activity.compose.BackHandler
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.getValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.viewinterop.AndroidView
 

composeApp/src/desktopMain/kotlin/org/ooni/probe/ui/shared/OoniWebView.desktop.kt

@@ -1,9 +1,6 @@
 package org.ooni.probe.ui.shared
 
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.DisposableEffect
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.rememberUpdatedState
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.awt.SwingPanel
 import javafx.application.Platform
@@ -13,24 +10,29 @@ import javafx.scene.Scene
 import javafx.scene.layout.StackPane
 import javafx.scene.web.WebView
 import java.net.URL
+import kotlin.io.encoding.Base64
 
 @Composable
 actual fun OoniWebView(
     controller: OoniWebViewController,
     modifier: Modifier,
     allowedDomains: List<String>,
 ) {
-    val onCreated = {}
-    val onDispose = {}
-    val currentOnDispose by rememberUpdatedState(onDispose)
     val event = controller.rememberNextEvent()
 
     SwingPanel(
         factory = {
+            controller.state = OoniWebViewController.State.Initializing
+
+            println("webview: factory")
             JFXPanel().apply {
+                Platform.setImplicitExit(false) // Otherwise, webView will not show the second time
                 Platform.runLater {
+                    println("webview: factory runLater")
+
                     val webView = WebView().apply {
                         isVisible = true
+                        @Suppress("SetJavaScriptEnabled")
                         engine.isJavaScriptEnabled = true
 
                         // Set up load listeners
@@ -39,18 +41,23 @@ actual fun OoniWebView(
                                 Worker.State.SCHEDULED -> {
                                     controller.state = OoniWebViewController.State.Loading(0f)
                                 }
+
                                 Worker.State.RUNNING -> {
                                     val progress = engine.loadWorker.progress
-                                    controller.state = OoniWebViewController.State.Loading(progress.toFloat())
+                                    controller.state =
+                                        OoniWebViewController.State.Loading(progress.toFloat())
                                 }
+
                                 Worker.State.SUCCEEDED -> {
                                     controller.state = OoniWebViewController.State.Successful
                                     controller.canGoBack = engine.history.currentIndex > 0
                                 }
+
                                 Worker.State.FAILED -> {
                                     controller.state = OoniWebViewController.State.Failure
                                     controller.canGoBack = engine.history.currentIndex > 0
                                 }
+
                                 else -> {}
                             }
                         }
@@ -71,45 +78,59 @@ actual fun OoniWebView(
                             }
                             controller.canGoBack = engine.history.currentIndex > 0
                         }
+
+                        val css = """
+                            body {
+                                -ms-overflow-style: none;  /* Internet Explorer 10+ */
+                                scrollbar-width: none;  /* Firefox */
+                            }
+                            body::-webkit-scrollbar {
+                                display: none;  /* Safari and Chrome */
+                            }
+                        """.trimIndent()
+                        val cssData = Base64.encode(css.encodeToByteArray())
+                        engine.userStyleSheetLocation =
+                            "data:text/css;charset=utf-8;base64,$cssData"
                     }
 
                     val root = StackPane()
                     root.children.add(webView)
                     this.scene = Scene(root)
-                    onCreated()
                 }
             }
         },
         modifier = modifier,
         update = { jfxPanel ->
+            println("webview: update")
             Platform.runLater {
-                val scene = jfxPanel.scene
-                val root = scene?.root as? StackPane
-                val webView = root?.children?.get(0) as? WebView
-                webView?.let {
-                    when (event) {
-                        is OoniWebViewController.Event.Load -> {
-                            webView.engine.load(event.url)
+                println("webview: update runLater")
+                val root = jfxPanel.scene?.root as? StackPane
+                val webView = (root?.children?.get(0) as? WebView) ?: return@runLater
+                when (event) {
+                    is OoniWebViewController.Event.Load -> {
+                        val headers = event.additionalHttpHeaders.entries.joinToString {
+                            "\n${it.key}: it.value"
                         }
-                        OoniWebViewController.Event.Reload -> {
-                            webView.engine.reload()
-                        }
-                        OoniWebViewController.Event.Back -> {
-                            if (webView.engine.history.currentIndex > 0) {
-                                webView.engine.history.go(-1)
-                            }
+                        // Hack to send HTTP headers by taking advantage of userAgent
+                        webView.engine.userAgent = "ooni$headers"
+                        println("webview: Loading: ${event.url}")
+                        webView.engine.load(event.url)
+                    }
+
+                    OoniWebViewController.Event.Reload -> {
+                        webView.engine.reload()
+                    }
+
+                    OoniWebViewController.Event.Back -> {
+                        if (webView.engine.history.currentIndex > 0) {
+                            webView.engine.history.go(-1)
                         }
-                        null -> Unit
                     }
+
+                    null -> Unit
                 }
+                event?.let(controller::onEventHandled)
             }
-            event?.let(controller::onEventHandled)
         },
     )
-
-    DisposableEffect(Unit) {
-        onDispose {
-            currentOnDispose()
-        }
-    }
 }