init

Author: Bruce0203

.github/workflows/release.yml

@@ -30,8 +30,10 @@ jobs:
           path: './gradle.properties'
           property: |
             'version'
+            'server'
           value: |
             'Build ${{github.run_number}}'
+            'https://kotlingames.shop'
 
       - run: git tag ${{github.run_number}}
 

client/src/jsMain/kotlin/main.kt

@@ -1,17 +1,24 @@
 import io.ktor.client.engine.js.*
+import korlibs.io.async.launchUnscopedAndWait
+import korlibs.io.file.std.resourcesVfs
+import korlibs.io.lang.readProperties
 import network.ClientEngineFactory
 import network.URLProvider
 import org.koin.core.context.startKoin
 import org.koin.dsl.bind
 import org.koin.dsl.module
 import org.koin.mp.KoinPlatform
+import util.launchNow
+import kotlin.coroutines.CoroutineContext
 
 suspend fun main() {
+    val url = resourcesVfs["client.properties"].readProperties()
+        .get("server")?: "http://localhost:8080"
     startKoin {}
     KoinPlatform.getKoin().loadModules(listOf(module {
         factory {
             object : URLProvider {
-                override val url: String get() = "https://kotlingames.shop"
+                override val url: String get() = url
             }
         } bind URLProvider::class
         factory {

client/src/jvmMain/kotlin/main.kt

@@ -5,13 +5,17 @@ import org.koin.core.context.startKoin
 import org.koin.dsl.bind
 import org.koin.dsl.module
 import org.koin.mp.KoinPlatform
+import java.io.File
+import java.util.Properties
 
 suspend fun main() {
+    val url = Properties().apply { load(File("client.properties").inputStream()) }
+        .getOrDefault("server", "http://localhost:8080").toString()
     startKoin {}
     KoinPlatform.getKoin().loadModules(listOf(module {
         factory {
             object : URLProvider {
-                override val url: String get() = "http://localhost:8080"
+                override val url: String get() = url
             }
         } bind URLProvider::class
         factory {

gradle.properties

@@ -2,4 +2,3 @@ org.gradle.jvmargs=-Xmx4g
 kotlin.mpp.stability.nowarn=true
 #org.gradle.unsafe.configuration-cache=true
 kotlin.mpp.androidSourceSetLayoutVersion1.nowarn=true
-version=test

server/src/main/kotlin/application/authentication.kt

@@ -33,14 +33,14 @@ fun Application.configureAuthentication() {
         }
     }
     routing {
-        get("login") {
+        post("login") login@{
             val loginRequest = call.receive<LoginRequest>()
             val sessionPlayer = try {
                 newPlayer(loginRequest.username)
             } catch (e: Throwable) {
                 e.printStackTrace()
                 call.respond(HttpStatusCode.NotAcceptable)
-                return@get
+                return@login
             }
             val uuid = newSession(sessionPlayer).id.value
             call.respond(uuid)

shared/src/commonMain/kotlin/network/Login.kt

@@ -17,7 +17,7 @@ lateinit var sessionId: String
 private fun generateUsername() = UUID.generateUUID().toString().substring(0, 4)
 
 suspend fun login() {
-    val response = client.get("$currentUrl/login") {
+    val response = client.post("$currentUrl/login") {
         contentType(ContentType.Application.Json)
         setBody(LoginRequest(username))
     }