Remaining fixes for distribution

Author: DRSchlaubi

client/build.gradle.kts

@@ -40,7 +40,8 @@ tasks {
     }
 
     register<Tar>("packageDist") {
-        from(jpackage)
+        dependsOn(jpackage)
+        from(jpackage.get().destination + "/" + jpackage.get().appName)
 
         compression = Compression.GZIP
         archiveExtension = "tar.gz"

client/src/main/kotlin/Main.kt

@@ -24,7 +24,7 @@ private val client = HttpClient {
 
 private fun CoroutineScope.connect() {
     launch {
-        session = client.webSocketSession("ws://haxis.me:5000")
+        session = client.webSocketSession("wss://ks.haxis.me")
 
         println("Connection established")
         for (frame in session.incoming) {

gradle/libs.versions.toml

@@ -10,5 +10,6 @@ ktor-client-okhttp = { group = "io.ktor", name = "ktor-client-okhttp", version.r
 ktor-client-websockets = { group = "io.ktor", name = "ktor-client-websockets", version.ref = "ktor" }
 ktor-server-netty = { group = "io.ktor", name = "ktor-server-netty", version.ref = "ktor" }
 ktor-server-websockets = { group = "io.ktor", name = "ktor-server-websockets", version.ref = "ktor" }
+ktor-server-forwarded-header = { group = "io.ktor", name = "ktor-server-forwarded-header", version.ref = "ktor" }
 
 slf4j-simple = { group = "org.slf4j", name = "slf4j-simple", version = "2.0.16" }

server/build.gradle.kts

@@ -6,6 +6,7 @@ plugins {
 dependencies {
     implementation(libs.ktor.server.netty)
     implementation(libs.ktor.server.websockets)
+    implementation(libs.ktor.server.forwarded.header)
     implementation(libs.slf4j.simple)
 }
 

server/src/main/kotlin/Server.kt

@@ -3,6 +3,8 @@ package dev.schlaubi.gtakiller
 import io.ktor.server.application.*
 import io.ktor.server.engine.*
 import io.ktor.server.netty.*
+import io.ktor.server.plugins.*
+import io.ktor.server.plugins.forwardedheaders.*
 import io.ktor.server.routing.*
 import io.ktor.server.websocket.*
 
@@ -12,12 +14,13 @@ fun main() {
 
     embeddedServer(Netty, port = 8080, host = "0.0.0.0") {
         install(WebSockets)
+        install(XForwardedHeaders)
 
         routing {
             webSocket {
                 sessions += this
 
-                println("Got session: $this")
+                println("Got session from: ${call.request.origin.remoteHost}")
 
                 for (frame in incoming) {
                     println("GOT FRAME: $frame")
@@ -31,7 +34,7 @@ fun main() {
 
                 sessions -= this
 
-                println("Lost session: $this")
+                println("Lost session: ${call.request.origin.remoteHost}")
             }
         }
     }.start(wait = true)