Release v1.3

Foso · Sep 26, 2021 · 952dcf5 · 952dcf5
1 parent dcfc0a9
commit 952dcf5
Show file tree

Hide file tree

Showing 9 changed files with 24 additions and 114 deletions.
diff --git a/docs/Changelog.md b/docs/Changelog.md
@@ -1,6 +1,15 @@
+v1.3
+==============================
+
+* you can add your name as an url parameter with "uname", example:
+  http://shwdwn.herokuapp.com/#/room/Testroom?uname=MyName
+
+* When the connection to server was lost, the client now automatically tries to reconnect
+
 v1.1
 ========================================
-* added password for rooms 
+
+* added password for rooms
 * add auto reveal mode
 
 
diff --git a/server/build.gradle b/server/build.gradle
@@ -2,7 +2,7 @@ buildscript {
     apply from: './constants.gradle'
 }
 buildscript {
-    ext.kotlin_version = '1.5.21'
+    ext.kotlin_version = '1.5.31'
     ext.ktor_version = '1.6.3'
 
     repositories {

diff --git a/server/src/main/kotlin/de/jensklingenberg/showdown/server/game/ServerGame.kt b/server/src/main/kotlin/de/jensklingenberg/showdown/server/game/ServerGame.kt
@@ -245,7 +245,6 @@ class ServerGame(private val server: GameServer, var gameConfig: ServerConfig) {
 
     private fun sendBroadcast(json: String) {
         playerList.forEach {
-            println("sendBroadcast: ${it.name} $json")
             server.sendData(it.sessionId, json)
         }
     }

diff --git a/server/src/main/kotlin/de/jensklingenberg/showdown/server/server/ShowdownApplication.kt b/server/src/main/kotlin/de/jensklingenberg/showdown/server/server/ShowdownApplication.kt
@@ -72,7 +72,6 @@ class ShowdownApplication {
 
                 get("room/{roomName}/{param...}") {
                     val roomName = call.parameters["roomName"]?.substringBeforeLast("?") ?: ""
-                    println("ROOMM: $roomName")
                     if (!call.request.uri.endsWith("/")) {
                         call.respondRedirect("/room/$roomName/")
                     }
@@ -89,7 +88,7 @@ class ShowdownApplication {
                     val roomName = call.parameters["room"]?.substringBeforeLast("?") ?: ""
                     val password = call.parameters["pw"] ?: ""
                     val session = call.sessions.get<Session>()
-                    println("Web $roomName")
+
                     // We check that we actually have a session. We should always have one,
                     // since we have defined an interceptor before to set one.
                     if (session == null) {

diff --git a/server/src/main/kotlin/de/jensklingenberg/showdown/server/server/ShowdownServer.kt b/server/src/main/kotlin/de/jensklingenberg/showdown/server/server/ShowdownServer.kt
@@ -53,7 +53,6 @@ class ShowdownServer : GameServer {
         val socketList = members.computeIfAbsent(memberId) { CopyOnWriteArrayList<WebSocketSession>() }
 
         socketList.add(socket)
-        println("JOINED: $memberId ${socketList.size}")
 
     }
 
@@ -135,7 +134,6 @@ class ShowdownServer : GameServer {
                     ?.let { joinGame ->
                         if (gameMap.none { it.key == room.name }) {
                             gameSource = createNewRoom(room.name)
-                            println("Create new Room" + room.name)
 
                         }
 
@@ -184,7 +182,6 @@ class ShowdownServer : GameServer {
     }
 
     override fun closeRoom(roomName: String) {
-        println("Close Room $roomName")
         gameMap.remove(roomName)
     }
 
@@ -198,7 +195,6 @@ class ShowdownServer : GameServer {
     }
 
     suspend fun sendMessage(recipient: String, message: String) {
-        println("sendMessageToClient: $message")
         members[recipient]?.send(Frame.Text(message))
     }
 

diff --git a/server/src/main/resources/web/web.js b/server/src/main/resources/web/web.js
diff --git a/web/src/main/kotlin/showdown.web/network/GameApiClient.kt b/web/src/main/kotlin/showdown.web/network/GameApiClient.kt
@@ -54,19 +54,17 @@ class GameApiClient {
     private inline fun <reified T> decodeFromString(json: String): T? = try {
         Json.decodeFromString<T>(json)
     } catch (ex: Exception) {
-        println("TT" + ex + "     " + json)
         null
     }
 
     private fun onMessage(messageEvent: MessageEvent) {
 
         val json = messageEvent.data.toString()
-        println("onMessage $json")
         var response: Response? = null
         try {
             response = Json.decodeFromString<Response>(json)
         } catch (ex: Exception) {
-            println("TT" + ex + "     " + json)
+            println("onMessage" + ex + "     " + json)
         }
 
         response?.let { it ->
@@ -84,12 +82,8 @@ class GameApiClient {
 
                 PATHS.MESSAGE -> {
                     observer.onMessageEvent(response.body)
-                    // console.log("RESPONSE"+response.body)
                 }
 
-                PATHS.SETROOMPASSSWORDPATH, PATHS.EMPTY -> {
-                    println("PATH: $path $json")
-                }
                 PATHS.ERROR -> {
                     decodeFromString<ShowdownError>(it.body)?.let {
                         observer.onError(it)
@@ -103,7 +97,7 @@ class GameApiClient {
                     }
                 }
                 else -> {
-                    println("DOnt Care about $path")
+                    // println("DOnt Care about $path")
                 }
             }
         }
@@ -112,7 +106,6 @@ class GameApiClient {
     }
 
     fun sendMessage(message: String) {
-        println("sendMessageToServer: " + message)
         socket?.send(message)
     }
 }
diff --git a/web/src/main/kotlin/showdown.web/ui/game/GameViewmodel.kt b/web/src/main/kotlin/showdown.web/ui/game/GameViewmodel.kt
@@ -64,7 +64,6 @@ class GameViewmodel(
                     }
                 }
                 ShowdownError.NoConnectionError -> {
-                    println("observeErrors")
                     connectToServer()
                     view.newState {
                         this.showConnectionError = true
@@ -87,7 +86,6 @@ class GameViewmodel(
                 wasConnected = true
             },
             onError = {
-                println("HIER: ${it.message}")
 
                 view.newState {
                     this.showConnectionError = true

diff --git a/web/src/main/kotlin/showdown.web/ui/game/field/GameFieldComponent.kt b/web/src/main/kotlin/showdown.web/ui/game/field/GameFieldComponent.kt
@@ -78,14 +78,14 @@ class GameFieldComponent : RComponent<Props, GameFieldState>() {
     override fun RBuilder.render() {
 
         //OPTIONS
-        if (!state.isSpectator) {
-            optionsList(state.selectedOptionId, state.options, onOptionClicked = { index: Int ->
-                setState {
-                    this.selectedOptionId = index
-                }
-                viewmodel.onSelectedVote(index)
-            })
-        }
+
+        optionsList(state.selectedOptionId, state.options, onOptionClicked = { index: Int ->
+            setState {
+                this.selectedOptionId = index
+            }
+            viewmodel.onSelectedVote(index)
+        })
+
         spectatorCheckbox()