re-enable proguard optimizations

Author: DRSchlaubi

client/build.gradle.kts

@@ -21,7 +21,7 @@ dependencies {
     implementation(projects.windowsHelper)
     implementation(libs.kotlinx.serialization.json)
     implementation(libs.ktor.serialization.kotlinx.json)
-    implementation(libs.ktor.client.okhttp)
+    implementation(libs.ktor.client.java)
     implementation(libs.ktor.client.websockets)
     implementation(libs.ktor.client.resources)
     implementation(libs.ktor.client.content.negotiation)
@@ -42,6 +42,21 @@ dependencies {
     implementation(libs.androidx.lifecycle.viewmodel.compose)
 }
 
+val collectProguardConfigs by tasks.registering(Copy::class) {
+    dependsOn(":windows_helper:jar", ":common:jar")
+    into(layout.buildDirectory.dir("proguard-files"))
+    include("META-INF/proguard/*.pro")
+    eachFile { path = name }
+
+    from({
+        configurations.runtimeClasspath.get().map {
+            zipTree(it).matching {
+                include("META-INF/proguard/*.pro")
+            }
+        }
+    })
+}
+
 tasks {
     val copyDll by registering(Copy::class) {
         dependsOn(":windows_helper:compileRust",":windows_helper:generateHeaders")
@@ -54,9 +69,13 @@ tasks {
         named("prepareAppResources") {
             dependsOn(copyDll)
         }
+        named("proguardReleaseJars") {
+            dependsOn(collectProguardConfigs)
+        }
     }
 }
 
+
 compose {
     resources {
         packageOfResClass = "dev.schlaubi.mastermind.resources"
@@ -67,10 +86,13 @@ compose {
         application {
             mainClass = "dev.schlaubi.mastermind.LauncherKt"
             jvmArgs("--enable-native-access=ALL-UNNAMED")
+//            jvmArgs("-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=*:5005")
 
             nativeDistributions {
                 modules(
-                    "java.naming" // required by logback
+                    "java.naming", // required by logback
+                    "java.net.http", // HTTP Client
+                    "jdk.jdi"
                 )
                 targetFormats(TargetFormat.Msi)
 
@@ -93,7 +115,13 @@ compose {
                 release {
                     proguard {
                         version = libs.versions.proguard
-                        configurationFiles.from(project.file("rules.pro"))
+                        obfuscate = false
+                        configurationFiles.from(
+                            fileTree(collectProguardConfigs.map { it.destinationDir }) {
+                                include("*.pro")
+                            },
+                            project.file("rules.pro")
+                        )
                     }
                 }
             }

client/rules.pro

@@ -1,17 +1,18 @@
-# Ktor
--keepclassmembers class io.ktor.** { volatile <fields>; }
--keep class io.ktor.client.engine.okhttp.OkHttpEngineContainer
--keep class io.ktor.serialization.kotlinx.json.KotlinxSerializationJsonExtensionProvider
+# References to classes only used if needed
+-dontwarn ch.qos.logback.**
+-dontwarn io.ktor.network.sockets.**
 
-# SLF4j
--keep class org.slf4j.simple.SimpleServiceProvider
--dontwarn io.github.oshai.kotlinlogging.logback.**
+-keep,allowshrinking,allowobfuscation class androidx.compose.runtime.* { *; }
 
-# serialization
-# For some reason if we don't do this, we get a VerifyError at runtime
-# Serializer for classes with named companion objects are retrieved using `getDeclaredClasses`.
-# If you have any, replace classes with those containing named companion objects.
--keepattributes InnerClasses # Needed for `getDeclaredClasses`.
+# ktor
+-keep class io.ktor.client.HttpClientEngineContainer
+-keep class io.ktor.serialization.kotlinx.json.KotlinxSerializationJsonExtensionProvider
+
+# Hotkeys
+-dontwarn dev.schlaubi.mastermind.windows_helper.**
+-keep class dev.schlaubi.mastermind.windows_helper.register_keyboard_handler$cb$Function {
+    void apply(int);
+}
 
 # Kotlin serialization looks up the generated serializer classes through a function on companion
 # objects. The companions are looked up reflectively so we need to explicitly keep these functions.
@@ -27,17 +28,8 @@
   <1>.<2>$Companion Companion;
 }
 
--dontwarn kotlinx.atomicfu.**
--dontwarn io.netty.**
--dontwarn com.typesafe.**
--dontwarn org.slf4j.**
--dontwarn ch.qos.logback.**
--dontwarn okhttp3.**
--dontwarn io.ktor.**
-
-# hotkeys
--dontwarn dev.schlaubi.mastermind.windows_helper.**
--keep class dev.schlaubi.mastermind.windows_helper.** { *; }
+# Logback
+-keep class org.slf4j.spi.SLF4JServiceProvider
+-keep class ch.qos.logback.classic.spi.LogbackServiceProvider
 
-# compose
--dontoptimize
+-optimizations !method/specialization/parametertype

client/src/main/kotlin/Launcher.kt

@@ -7,29 +7,28 @@ import androidx.compose.material3.CircularProgressIndicator
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Text
-import androidx.compose.runtime.*
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.window.Window
 import androidx.compose.ui.window.application
+import dev.schlaubi.mastermind.core.KeyBoardListener
 import dev.schlaubi.mastermind.core.Updater
-import dev.schlaubi.mastermind.core.registerKeyBoardListener
 import dev.schlaubi.mastermind.resources.Res
 import dev.schlaubi.mastermind.resources.icon
 import dev.schlaubi.mastermind.theme.AppTheme
 import dev.schlaubi.mastermind.ui.GTAKiller
-import dev.schlaubi.mastermind.windows_helper.WindowsAPI
 import org.jetbrains.compose.resources.painterResource
 
 fun main() = application {
     Updater()
     Window(title = "GTA Killer", icon = painterResource(Res.drawable.icon), onCloseRequest = ::exitApplication) {
         var loading by remember { mutableStateOf(true) }
+        KeyBoardListener()
         if (loading) {
-            SideEffect {
-                WindowsAPI.registerKeyboardHook()
-                registerKeyBoardListener()
-            }
 
             AppTheme {
                 Scaffold {

client/src/main/kotlin/core/KeyBoardListener.kt

@@ -1,15 +1,31 @@
 package dev.schlaubi.mastermind.core
 
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.DisposableEffect
+import androidx.compose.runtime.SideEffect
 import dev.schlaubi.mastermind.core.settings.settings
 import dev.schlaubi.mastermind.util.Loom
 import dev.schlaubi.mastermind.windows_helper.WindowsAPI
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.runBlocking
+import java.lang.foreign.Arena
 
-fun registerKeyBoardListener() = WindowsAPI.registerKeyboardListener { keyCode ->
-    if (keyCode == settings.hotkey) {
-        runBlocking(Dispatchers.Loom) {
-            reportAndKill()
+@Composable
+fun KeyBoardListener() {
+    SideEffect { WindowsAPI.registerKeyboardHook() }
+    DisposableEffect(Unit) {
+        val arena = Arena.ofConfined()
+
+        WindowsAPI.registerKeyboardListener(arena) { keyCode ->
+            if (keyCode == settings.hotkey) {
+                runBlocking(Dispatchers.Loom) {
+                    reportAndKill()
+                }
+            }
+        }
+
+        onDispose {
+            arena.close()
         }
     }
 }

gradle/libs.versions.toml

@@ -7,17 +7,16 @@ proguard = "7.6.1"
 
 [libraries]
 kotlinGradlePlugin = { group = "org.jetbrains.kotlin", name = "kotlin-gradle-plugin", version.ref = "kotlin" }
-jnativehook = { group = "com.github.kwhat", name = "jnativehook", version = "2.2.2" }
 
 kotlinx-serialization-json = { group = "org.jetbrains.kotlinx", name = "kotlinx-serialization-json", version.ref = "kotlinx-serialization" }
 kotlinx-serialization-json-io = { group = "org.jetbrains.kotlinx", name = "kotlinx-serialization-json-io", version.ref = "kotlinx-serialization" }
 kotlinx-datetime = { group = "org.jetbrains.kotlinx", name = "kotlinx-datetime", version = "0.6.2" }
-kotlinx-io-core = { group = "org.jetbrains.kotlinx", name = "kotlinx-io-core", version = "0.6.0" }
+kotlinx-io-core = { group = "org.jetbrains.kotlinx", name = "kotlinx-io-core", version = "0.7.0" }
 
 ktor-resources = { group = "io.ktor", name = "ktor-resources", version.ref = "ktor" }
 ktor-http = { group = "io.ktor", name = "ktor-http", version.ref = "ktor" }
 ktor-serialization-kotlinx-json = { group = "io.ktor", name = "ktor-serialization-kotlinx-json", version.ref = "ktor" }
-ktor-client-okhttp = { group = "io.ktor", name = "ktor-client-okhttp", version.ref = "ktor" }
+ktor-client-java = { group = "io.ktor", name = "ktor-client-java", version.ref = "ktor" }
 ktor-client-resources = { group = "io.ktor", name = "ktor-client-resources", version.ref = "ktor" }
 ktor-client-websockets = { group = "io.ktor", name = "ktor-client-websockets", version.ref = "ktor" }
 ktor-client-content-negotiation = { group = "io.ktor", name = "ktor-client-content-negotiation", version.ref = "ktor" }
@@ -32,7 +31,7 @@ androidx-lifecycle-viewmodel-compose = { group = "org.jetbrains.androidx.lifecyc
 compose-navigation = { group = "org.jetbrains.androidx.navigation", name = "navigation-compose", version = "2.8.0-alpha13" }
 
 kotlin-logging = { group = "io.github.oshai", name = "kotlin-logging", version = "7.0.4" }
-logback-classic = { group = "ch.qos.logback", name = "logback-classic", version = "1.5.16" }
+logback-classic = { group = "ch.qos.logback", name = "logback-classic", version = "1.5.17" }
 
 kord-gateway = { group = "dev.kord", name = "kord-gateway", version = "0.15.0" }
 

windows_helper/src/main/kotlin/Extensions.kt

@@ -48,13 +48,13 @@ private fun SegmentAllocator.allocateCStrings(vararg values: String) = slice_ref
     slice_ref_Vec_uint8.ptr(it, array)
 }
 
-object WindowsAPI : Arena by Arena.ofConfined() {
+object WindowsAPI {
     fun readGtaLocation() = Path(readString(WindowsHelper::read_gta_location))
 
     fun registerKeyboardHook() = WindowsHelper.register_keyboard_hook()
 
-    fun registerKeyboardListener(callback: (Int) -> Unit) {
-        val lambda = `register_keyboard_handler$cb`.allocate({ callback(it) }, this)
+    fun registerKeyboardListener(arena: Arena, callback: (Int) -> Unit) {
+        val lambda = `register_keyboard_handler$cb`.allocate({ callback(it) }, arena)
         WindowsHelper.register_keyboard_handler(lambda)
     }