Use own Rust dll to avoid admin requirement

Author: DRSchlaubi

.github/workflows/client.yaml

@@ -12,6 +12,9 @@ jobs:
         with:
           distribution: "temurin"
           java-version: "23"
+      - uses: actions-rust-lang/setup-rust-toolchain@v1
+        with:
+          cache-workspaces: windows_helper
       - uses: gradle/actions/setup-gradle@v4
       - run: ./gradlew client:packageReleaseDistributionForCurrentOS
       - run: mv 'GTA Killer-*.msi' client.msi

.gitignore

@@ -118,4 +118,9 @@ gradle-app.setting
 
 # End of https://www.toptal.com/developers/gitignore/api/intellij+all,gradle
 
-store/
+store/
+
+# Added by cargo
+
+/target
+windows_helper/target

client/build.gradle.kts

@@ -7,7 +7,7 @@ plugins {
     alias(libs.plugins.compose)
 }
 
-version = "1.2.0"
+version = "1.3.0"
 
 repositories {
     mavenCentral()
@@ -17,8 +17,8 @@ repositories {
 
 dependencies {
     implementation(projects.common)
+    implementation(projects.windowsHelper)
     implementation(libs.kotlinx.serialization.json)
-    implementation(libs.jnativehook)
     implementation(libs.ktor.serialization.kotlinx.json)
     implementation(libs.ktor.client.okhttp)
     implementation(libs.ktor.client.websockets)
@@ -40,15 +40,34 @@ dependencies {
     implementation(libs.androidx.lifecycle.viewmodel.compose)
 }
 
+tasks {
+    val copyDll by registering(Copy::class) {
+        dependsOn(":windows_helper:compileRust",":windows_helper:generateHeaders")
+        from(project(":windows_helper").layout.projectDirectory.dir("target/release/windows_helper.dll"))
+        include("*.dll")
+        into(layout.buildDirectory.dir("dll/common"))
+    }
+
+    afterEvaluate {
+        named("prepareAppResources") {
+            dependsOn(copyDll)
+        }
+    }
+}
+
 compose.desktop {
     application {
         mainClass = "dev.schlaubi.mastermind.LauncherKt"
+        jvmArgs("--enable-native-access=ALL-UNNAMED")
+
         nativeDistributions {
             modules(
                 "java.naming" // required by logback
             )
             targetFormats(TargetFormat.Msi)
 
+            appResourcesRootDir.set(layout.buildDirectory.dir("dll"))
+
             licenseFile = rootProject.file("LICENSE")
             vendor = "Schlaubi"
             description = "GTA kill script"

client/rules.pro

@@ -36,7 +36,8 @@
 -dontwarn io.ktor.**
 
 # hotkeys
--keep class com.github.kwhat.jnativehook.** { *; } # Preserve all native hook classes and their methods
+-dontwarn dev.schlaubi.mastermind.windows_helper.**
+-keep class dev.schlaubi.mastermind.windows_helper.** { *; }
 
 # compose
 -dontoptimize

client/src/main/kotlin/Launcher.kt

@@ -1,12 +1,12 @@
 package dev.schlaubi.mastermind
 
 import androidx.compose.ui.window.singleWindowApplication
-import com.github.kwhat.jnativehook.GlobalScreen
 import dev.schlaubi.mastermind.core.registerKeyBoardListener
 import dev.schlaubi.mastermind.ui.GTAKiller
+import dev.schlaubi.mastermind.windows_helper.WindowsAPI
 
 fun main() {
-    GlobalScreen.registerNativeHook()
+    WindowsAPI.registerKeyboardHook()
     registerKeyBoardListener()
 
     singleWindowApplication(title = "GTA Killer") {

client/src/main/kotlin/Main.kt

@@ -1,22 +1,18 @@
 package dev.schlaubi.mastermind.core
 
-import com.github.kwhat.jnativehook.GlobalScreen
-import com.github.kwhat.jnativehook.keyboard.NativeKeyEvent
-import com.github.kwhat.jnativehook.keyboard.NativeKeyListener
 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
 
-fun registerKeyBoardListener() = GlobalScreen.addNativeKeyListener(object : NativeKeyListener {
-    override fun nativeKeyPressed(nativeEvent: NativeKeyEvent) {
-        if (nativeEvent.keyCode == settings.hotkey) {
-            runBlocking(Dispatchers.Loom) {
-                reportAndKill()
-            }
+fun registerKeyBoardListener() = WindowsAPI.registerKeyboardListener { keyCode ->
+    if (keyCode == settings.hotkey) {
+        runBlocking(Dispatchers.Loom) {
+            reportAndKill()
         }
     }
-})
+}
 
 suspend fun reportAndKill() {
     safeApi.killGta()

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

@@ -1,15 +1,16 @@
 package dev.schlaubi.mastermind.core.settings
 
-import com.github.kwhat.jnativehook.keyboard.NativeKeyEvent
-import io.ktor.http.Url
+import io.ktor.http.*
 import kotlinx.serialization.Serializable
 
+const val F3_KEY = 113
+
 @Serializable
 data class Settings(
     val currentUrl: Url?,
     val pastUrls: Set<Url>,
     val userName: String,
-    val hotkey: Int = NativeKeyEvent.VC_F3,
+    val hotkey: Int = F3_KEY,
     val tokens: Map<String, String> = emptyMap()
 )
 

client/src/main/kotlin/core/settings/Settings.kt

@@ -5,7 +5,6 @@ package dev.schlaubi.mastermind.core.settings
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.setValue
-import com.github.kwhat.jnativehook.keyboard.NativeKeyEvent
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
 import kotlinx.io.buffered
@@ -30,7 +29,7 @@ private fun readSettings(): Settings {
     if (!fs.exists(file)) {
         return Settings(
             null, emptySet(), System.getProperty("user.name"),
-            NativeKeyEvent.VC_F3
+            F3_KEY
         )
     }
 

client/src/main/kotlin/core/settings/Storage.kt

@@ -4,4 +4,4 @@ org.gradle.caching=true
 # Enable the configuration cache to reuse the build configuration and enable parallel task execution.
 # (Note that some plugins may not yet be compatible with the configuration cache.)
 # https://docs.gradle.org/current/userguide/configuration_cache.html
-org.gradle.configuration-cache=true
+org.gradle.configuration-cache=false