commit aaa95cc784dfba229535547133e5480bc9629823 Author: Araozu Date: Mon Sep 21 16:25:21 2020 -0500 Commit inicial. diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..fae6b74 --- /dev/null +++ b/.gitignore @@ -0,0 +1,7 @@ +/.gradle +/.idea +/out +/build +*.iml +*.ipr +*.iws diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..10dd5bb --- /dev/null +++ b/build.gradle @@ -0,0 +1,43 @@ +buildscript { + repositories { + jcenter() + } + + dependencies { + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" + } +} + +apply plugin: 'kotlin' +apply plugin: 'application' + +group 'dev.araozu' +version '0.0.1' +mainClassName = "io.ktor.server.netty.EngineMain" + +sourceSets { + main.kotlin.srcDirs = main.java.srcDirs = ['src'] + test.kotlin.srcDirs = test.java.srcDirs = ['test'] + main.resources.srcDirs = ['resources'] + test.resources.srcDirs = ['testresources'] +} + +repositories { + mavenLocal() + jcenter() + maven { url 'https://kotlin.bintray.com/ktor' } +} + +dependencies { + compile("org.jetbrains.exposed:exposed-core:0.24.1") + compile("org.jetbrains.exposed:exposed-dao:0.24.1") + compile("org.jetbrains.exposed:exposed-jdbc:0.24.1") + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" + implementation "io.ktor:ktor-server-netty:$ktor_version" + implementation "ch.qos.logback:logback-classic:$logback_version" + implementation "io.ktor:ktor-server-core:$ktor_version" + implementation "io.ktor:ktor-websockets:$ktor_version" + implementation "io.ktor:ktor-gson:$ktor_version" + implementation 'com.google.code.gson:gson:2.8.5' + testImplementation "io.ktor:ktor-server-tests:$ktor_version" +} diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 0000000..c378215 --- /dev/null +++ b/gradle.properties @@ -0,0 +1,4 @@ +ktor_version=1.3.2 +kotlin.code.style=official +kotlin_version=1.3.70 +logback_version=1.2.1 diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..28861d2 Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..7c4388a --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,5 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-bin.zip +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100755 index 0000000..cccdd3d --- /dev/null +++ b/gradlew @@ -0,0 +1,172 @@ +#!/usr/bin/env sh + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS="" + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn () { + echo "$*" +} + +die () { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; + NONSTOP* ) + nonstop=true + ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD="java" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin, switch paths to Windows format before running java +if $cygwin ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + JAVACMD=`cygpath --unix "$JAVACMD"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=$((i+1)) + done + case $i in + (0) set -- ;; + (1) set -- "$args0" ;; + (2) set -- "$args0" "$args1" ;; + (3) set -- "$args0" "$args1" "$args2" ;; + (4) set -- "$args0" "$args1" "$args2" "$args3" ;; + (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Escape application args +save () { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done + echo " " +} +APP_ARGS=$(save "$@") + +# Collect all arguments for the java command, following the shell quoting and substitution rules +eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" + +# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong +if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then + cd "$(dirname "$0")" +fi + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..f955316 --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,84 @@ +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS= + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto init + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto init + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:init +@rem Get command-line arguments, handling Windows variants + +if not "%OS%" == "Windows_NT" goto win9xME_args + +:win9xME_args +@rem Slurp the command line arguments. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +if "x%~1" == "x" goto execute + +set CMD_LINE_ARGS=%* + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/resources/application.conf b/resources/application.conf new file mode 100644 index 0000000..bee192e --- /dev/null +++ b/resources/application.conf @@ -0,0 +1,9 @@ +ktor { + deployment { + port = 8080 + port = ${?PORT} + } + application { + modules = [ dev.araozu.ApplicationKt.module ] + } +} diff --git a/resources/logback.xml b/resources/logback.xml new file mode 100644 index 0000000..bdbb64e --- /dev/null +++ b/resources/logback.xml @@ -0,0 +1,12 @@ + + + + %d{YYYY-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n + + + + + + + + diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 0000000..3a9b8d3 --- /dev/null +++ b/settings.gradle @@ -0,0 +1 @@ +rootProject.name = "rimajon" diff --git a/src/Application.kt b/src/Application.kt new file mode 100644 index 0000000..c19879c --- /dev/null +++ b/src/Application.kt @@ -0,0 +1,56 @@ +package dev.araozu + +import io.ktor.application.* +import io.ktor.features.* +import io.ktor.gson.* +import io.ktor.http.* +import io.ktor.http.cio.websocket.* +import io.ktor.response.* +import io.ktor.routing.* +import io.ktor.websocket.* +import java.text.DateFormat +import java.time.Duration + +fun main(args: Array): Unit = io.ktor.server.netty.EngineMain.main(args) + +@Suppress("unused") // Referenced in application.conf +@kotlin.jvm.JvmOverloads +fun Application.module(testing: Boolean = false) { + install(CORS) { + method(HttpMethod.Options) + method(HttpMethod.Post) + method(HttpMethod.Put) + method(HttpMethod.Delete) + method(HttpMethod.Patch) + header(HttpHeaders.Authorization) + header(HttpHeaders.Accept) + header(HttpHeaders.ContentType) + allowCredentials = true + anyHost() // @TODO: Don't do this in production if possible. Try to limit it. + } + + install(WebSockets) { + pingPeriod = Duration.ofSeconds(15) + timeout = Duration.ofSeconds(15) + maxFrameSize = Long.MAX_VALUE + masking = false + } + + install(ContentNegotiation) { + gson { + setDateFormat(DateFormat.LONG) + setPrettyPrinting() + } + } + + routing { + get("/json/gson") { + call.respond(mapOf("hello" to "world")) + } + + this.crearJuego() + this.wsjuego() + this.usuarios() + } +} + diff --git a/src/GestorJuegos.kt b/src/GestorJuegos.kt new file mode 100644 index 0000000..046bee9 --- /dev/null +++ b/src/GestorJuegos.kt @@ -0,0 +1,84 @@ +package dev.araozu + +import io.ktor.http.cio.websocket.* + +data class Juego(val usuarios: ArrayList>) { + + private val cartas: Array = GestorJuegos.generarCartas() + val conexiones: ArrayList = arrayListOf() + + fun agregarConexion(conexion: WebSocketSession) { + conexiones.add(conexion) + } + + fun agregarUsuario(idUsuario: String) { + usuarios.add(Pair(idUsuario, true)) + } + +} + +object GestorJuegos { + + private val todasCartas = arrayOf( + 34, 34, 2, 2, 35, 35, 3, 3, 36, 36, 4, 4, 37, 37, 5, 5, 38, 38, 6, 6, 39, 39, 7, 7, 40, 40, 8, 8, 41, + 41, 9, 9, 42, 42, 10, 10, 43, 43, 11, 11, 44, 44, 12, 12, 45, 45, 13, 13, 46, 46, 14, 14, 47, 47, 15, 15, 48, + 48, 16, 16, 49, 49, 17, 17, 50, 50, 18, 18, 51, 51, 19, 19, 52, 52, 20, 20, 53, 53, 21, 21, 64, 64, 64, 64, 96, + 96, 96, 96, 128, 128, 128, 128, 160, 160, 160, 160, 192, 224, 256, 192, 224, 256, 192, 224, 256, 192, 224, 256 + ) + + private val letras = arrayOf( + 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', + 'U', 'V', 'W', 'X', 'Y', 'Z', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9' + ) + + val juegos = HashMap() + + fun generarId(): String { + var str = "" + for (i in 0 until 6) { + str += letras[(Math.random() * letras.size).toInt()] + } + return str + } + + fun generarCartas(): Array { + val cartasR = todasCartas.clone() + + var max = cartasR.size - 1 + while (max > 0) { + val indice = (Math.random() * max).toInt() + val elemR = cartasR[indice] + cartasR[indice] = cartasR[max] + cartasR[max] = elemR + max -= 1 + } + + return cartasR + } + + private suspend fun broadcast(juego: Juego, mensaje: String) { + juego.conexiones.forEach { socket -> + socket.send(Frame.Text(mensaje)) + } + } + + suspend fun conectarASala(idJuego: String, idUsuario: String, ws: WebSocketSession) { + val juego = juegos[idJuego]!! + val nombreUsuario = GestorUsuarios.obtenerNombreUsuario(idUsuario) + val mensaje = "{\"operacion\": \"usuario_conectado\", \"idUsuario\": \"$idUsuario\", \"nombreUsuario\": \"${nombreUsuario}\"}" + + broadcast(juego, mensaje) + + var str = "[" + for ((idUsuarioAct, _) in juego.usuarios) { + val nombreUsuarioAct = GestorUsuarios.obtenerNombreUsuario(idUsuarioAct) + if (str.length != 1) str += "," + str += "{\"idUsuario\": \"$idUsuarioAct\", \"nombreUsuario\": \"$nombreUsuarioAct\"}" + } + str += "]" + juego.agregarConexion(ws) + juego.agregarUsuario(idUsuario) + ws.send(Frame.Text("{\"operacion\": \"conexion_exitosa\", \"jugadores\": $str}")) + } + +} diff --git a/src/GestorUsuarios.kt b/src/GestorUsuarios.kt new file mode 100644 index 0000000..ccbe5c1 --- /dev/null +++ b/src/GestorUsuarios.kt @@ -0,0 +1,39 @@ +package dev.araozu + +import io.ktor.http.cio.websocket.* + +object GestorUsuarios { + + private val usuarios: HashMap = HashMap() + + private val letras = arrayOf( + 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', + 'U', 'V', 'W', 'X', 'Y', 'Z', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9' + ) + + private fun generarId(): String { + var str = "" + for (i in 0 until 15) { + str += letras[(Math.random() * letras.size).toInt()] + } + return str + } + + fun crearUsuario(nombreUsuario: String): String { + var idUsuario = generarId() + while (usuarios.containsKey(idUsuario)) { + idUsuario = generarId() + } + usuarios[idUsuario] = nombreUsuario + return idUsuario + } + + fun validarUsuario(idUsuario: String): String? { + return usuarios[idUsuario] + } + + fun obtenerNombreUsuario(idUsuario: String): String { + return usuarios[idUsuario]!! + } + +} diff --git a/src/Juego.kt b/src/Juego.kt new file mode 100644 index 0000000..84951a3 --- /dev/null +++ b/src/Juego.kt @@ -0,0 +1,41 @@ +package dev.araozu + +import io.ktor.application.* +import io.ktor.http.* +import io.ktor.request.* +import io.ktor.response.* +import io.ktor.routing.* + +data class InfoJuego(val id: String) +data class DataCrearJuego(val idUsuario: String) + +fun Routing.crearJuego() { + + post("/partida") { + val dataUsuario = call.receive() + + var sigId = GestorJuegos.generarId() + while (GestorJuegos.juegos.containsKey(sigId)) { + sigId = GestorJuegos.generarId() + } + + val juego = Juego(arrayListOf()) + GestorJuegos.juegos[sigId] = juego + + call.respondText("{\"id\": \"$sigId\"}", contentType = ContentType.Application.Json) + } + + post("/partida-join") { + val infoJuego = call.receive() + if (infoJuego.id.length != 6) { + call.respondText("{\"error\": \"ID invalido.\"}", contentType = ContentType.Application.Json) + } + + if (GestorJuegos.juegos.containsKey(infoJuego.id)) { + call.respondText("{\"ok\": true}", contentType = ContentType.Application.Json) + } else { + call.respondText("{\"error\": \"El juego no existe\"}", contentType = ContentType.Application.Json) + } + } + +} diff --git a/src/Usuarios.kt b/src/Usuarios.kt new file mode 100644 index 0000000..6ff7fb8 --- /dev/null +++ b/src/Usuarios.kt @@ -0,0 +1,37 @@ +package dev.araozu + +import io.ktor.application.* +import io.ktor.http.* +import io.ktor.request.* +import io.ktor.response.* +import io.ktor.routing.* + +data class Usuario(val nombreUsuario: String) +data class UsuarioValidar(val nombreUsuario: String, val idUsuario: String) + +fun Routing.usuarios() { + + post("/usuario/crear") { + val nombreUsuario = call.receive().nombreUsuario + val idUsuario = GestorUsuarios.crearUsuario(nombreUsuario) + call.respondText("{\"id\": \"$idUsuario\"}", contentType = ContentType.Application.Json) + } + + post("/usuario/validar") { + val datos = call.receive() + val nombreUsuarioValidado = GestorUsuarios.validarUsuario(datos.idUsuario) + if (nombreUsuarioValidado != null) { + if (nombreUsuarioValidado == datos.nombreUsuario) { + call.respondText("{\"estado\": \"ok\"}", contentType = ContentType.Application.Json) + } else { + call.respondText( + "{\"estado\": \"nombreUsuarioInvalido\", \"nombreUsuario\": \"$nombreUsuarioValidado\"}", + contentType = ContentType.Application.Json + ) + } + } else { + call.respondText("{\"estado\": \"idInvalido\"}", contentType = ContentType.Application.Json) + } + } + +} \ No newline at end of file diff --git a/src/WSJuego.kt b/src/WSJuego.kt new file mode 100644 index 0000000..da03a62 --- /dev/null +++ b/src/WSJuego.kt @@ -0,0 +1,31 @@ +package dev.araozu + +import com.google.gson.Gson +import io.ktor.http.cio.websocket.* +import io.ktor.routing.* +import io.ktor.websocket.* + +data class Conexion(val operacion: String, val datos: String) + +data class ConexionNueva(val idJuego: String, val idUsuario: String) + +fun Routing.wsjuego() { + val gson = Gson() + webSocket("/socket") { + + for (frame in incoming) { + when (frame) { + is Frame.Text -> { + val datos = gson.fromJson(frame.readText(), Conexion::class.java) + when (datos.operacion) { + "conectar" -> { + val datos2 = gson.fromJson(datos.datos, ConexionNueva::class.java) + GestorJuegos.conectarASala(datos2.idJuego, datos2.idUsuario, this) + } + } + } + } + } + + } +} diff --git a/test/ApplicationTest.kt b/test/ApplicationTest.kt new file mode 100644 index 0000000..d4c5ebc --- /dev/null +++ b/test/ApplicationTest.kt @@ -0,0 +1,26 @@ +package dev.araozu + +import io.ktor.application.* +import io.ktor.response.* +import io.ktor.request.* +import io.ktor.features.* +import io.ktor.routing.* +import io.ktor.http.* +import io.ktor.websocket.* +import io.ktor.http.cio.websocket.* +import java.time.* +import io.ktor.gson.* +import kotlin.test.* +import io.ktor.server.testing.* + +class ApplicationTest { + @Test + fun testRoot() { + withTestApplication({ module(testing = true) }) { + handleRequest(HttpMethod.Get, "/").apply { + assertEquals(HttpStatusCode.OK, response.status()) + assertEquals("HELLO WORLD!", response.content) + } + } + } +}