commit 1e9be2c7c2ac24e7b40e18dd4062d72e62213dfa Author: william Date: Thu Nov 24 21:50:51 2022 -0500 Init / started adding modules diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..c426c32 --- /dev/null +++ b/.gitignore @@ -0,0 +1,36 @@ +.gradle +build/ +!gradle/wrapper/gradle-wrapper.jar +!**/src/main/**/build/ +!**/src/test/**/build/ + +### STS ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache +bin/ +!**/src/main/**/bin/ +!**/src/test/**/bin/ + +### IntelliJ IDEA ### +.idea +*.iws +*.iml +*.ipr +out/ +!**/src/main/**/out/ +!**/src/test/**/out/ + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ + +### VS Code ### +.vscode/ \ No newline at end of file diff --git a/build.gradle.kts b/build.gradle.kts new file mode 100644 index 0000000..b2b17dc --- /dev/null +++ b/build.gradle.kts @@ -0,0 +1,45 @@ +val ktor_version: String by project +val kotlin_version: String by project +val logback_version: String by project +val koin_version: String by project + +plugins { + application + kotlin("jvm") version "1.7.21" + id("io.ktor.plugin") version "2.1.3" + id("org.jetbrains.kotlin.plugin.serialization") version "1.7.21" +} + +group = "dev.fyloz.musicplayer" +version = "0.0.1" +application { + mainClass.set("dev.fyloz.musicplayer.core.ApplicationKt") + + val isDevelopment: Boolean = project.ext.has("development") + applicationDefaultJvmArgs = listOf("-Dio.ktor.development=$isDevelopment") +} + +repositories { + mavenCentral() +} + +dependencies { + implementation("io.ktor:ktor-server-core-jvm:$ktor_version") + implementation("io.ktor:ktor-server-content-negotiation:$ktor_version") + implementation("io.ktor:ktor-client-content-negotiation:$ktor_version") + implementation("io.ktor:ktor-server-call-logging-jvm:$ktor_version") + implementation("io.ktor:ktor-serialization-kotlinx-json-jvm:$ktor_version") + implementation("io.ktor:ktor-server-netty-jvm:$ktor_version") + implementation("io.ktor:ktor-client-core:$ktor_version") + implementation("io.ktor:ktor-server-auth:$ktor_version") + implementation("io.insert-koin:koin-ktor:$koin_version") + implementation("io.insert-koin:koin-logger-slf4j:$koin_version") + implementation("ch.qos.logback:logback-classic:$logback_version") + implementation("io.ktor:ktor-server-auth-jvm:2.1.3") + implementation("io.ktor:ktor-server-locations-jvm:2.1.3") + implementation("io.ktor:ktor-client-core-jvm:2.1.3") + implementation("io.ktor:ktor-client-apache-jvm:2.1.3") + + testImplementation("io.ktor:ktor-server-tests-jvm:$ktor_version") + testImplementation("org.jetbrains.kotlin:kotlin-test-junit:$kotlin_version") +} diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 0000000..21d4e14 --- /dev/null +++ b/gradle.properties @@ -0,0 +1,5 @@ +ktor_version=2.1.3 +kotlin_version=1.7.21 +logback_version=1.4.4 +koin_version=3.2.0 +kotlin.code.style=official diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..7454180 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..ae04661 --- /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-7.5.1-bin.zip +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100755 index 0000000..1b6c787 --- /dev/null +++ b/gradlew @@ -0,0 +1,234 @@ +#!/bin/sh + +# +# Copyright © 2015-2021 the original authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +############################################################################## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# +############################################################################## + +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit + +APP_NAME="Gradle" +APP_BASE_NAME=${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='"-Xmx64m" "-Xms64m"' + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# 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 ;; #( + MSYS* | 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" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + +# Collect all arguments for the java command; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..107acd3 --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,89 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@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 Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@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="-Xmx64m" "-Xms64m" + +@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 execute + +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 execute + +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 + +: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 %* + +: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/settings.gradle.kts b/settings.gradle.kts new file mode 100644 index 0000000..d172da7 --- /dev/null +++ b/settings.gradle.kts @@ -0,0 +1 @@ +rootProject.name = "music-player-backend" \ No newline at end of file diff --git a/src/main/kotlin/dev/fyloz/musicplayer/core/Application.kt b/src/main/kotlin/dev/fyloz/musicplayer/core/Application.kt new file mode 100644 index 0000000..e04eecd --- /dev/null +++ b/src/main/kotlin/dev/fyloz/musicplayer/core/Application.kt @@ -0,0 +1,69 @@ +package dev.fyloz.musicplayer.core + +import dev.fyloz.musicplayer.core.data.RepositoryInjection +import dev.fyloz.musicplayer.core.factory.TrackFactoryProxy +import dev.fyloz.musicplayer.core.http.configureTrackRoutes +import dev.fyloz.musicplayer.core.logic.TrackLogic +import dev.fyloz.musicplayer.modules.spotify.SpotifyInjection +import dev.fyloz.musicplayer.modules.spotify.SpotifyModule +import dev.fyloz.musicplayer.modules.spotify.SpotifyTrackFactory +import io.ktor.client.* +import io.ktor.client.engine.apache.* +import io.ktor.http.* +import io.ktor.serialization.kotlinx.json.* +import io.ktor.server.application.* +import io.ktor.server.auth.* +import io.ktor.server.engine.* +import io.ktor.server.netty.* +import io.ktor.server.plugins.callloging.* +import io.ktor.server.plugins.contentnegotiation.* +import io.ktor.server.response.* +import io.ktor.server.routing.* +import kotlinx.serialization.json.Json +import org.koin.dsl.module +import org.koin.ktor.ext.inject +import org.koin.ktor.plugin.Koin +import org.koin.logger.slf4jLogger +import org.slf4j.event.Level + +fun main() { + embeddedServer(Netty, port = 8080, host = "0.0.0.0", module = Application::module) + .start(wait = true) +} + +fun Application.module() { + install(CallLogging) { + level = Level.DEBUG +// filter { call -> call.request.path().startsWith("/") } + } + + install(ContentNegotiation) { + json() + } + + module { + install(Koin) { + slf4jLogger() + modules( + RepositoryInjection.koinBeans, + SpotifyInjection.koinBeans, + + module { + single { TrackFactoryProxy() } + single { TrackLogic() } + } + ) + } + } + + val spotifyModule = SpotifyModule() + spotifyModule.configure(this) + + install(Routing) { + spotifyModule.configureRoutes(this) + + route("/api/v1") { + configureTrackRoutes() + } + } +} diff --git a/src/main/kotlin/dev/fyloz/musicplayer/core/data/Repository.kt b/src/main/kotlin/dev/fyloz/musicplayer/core/data/Repository.kt new file mode 100644 index 0000000..efd4092 --- /dev/null +++ b/src/main/kotlin/dev/fyloz/musicplayer/core/data/Repository.kt @@ -0,0 +1,9 @@ +package dev.fyloz.musicplayer.core.data + +interface Repository { + fun findAll(): Collection + fun findById(id: String): T? + fun existsById(id: String): Boolean + fun save(t: T) + fun deleteById(id: String) +} diff --git a/src/main/kotlin/dev/fyloz/musicplayer/core/data/RepositoryInjection.kt b/src/main/kotlin/dev/fyloz/musicplayer/core/data/RepositoryInjection.kt new file mode 100644 index 0000000..50ae9e2 --- /dev/null +++ b/src/main/kotlin/dev/fyloz/musicplayer/core/data/RepositoryInjection.kt @@ -0,0 +1,10 @@ +package dev.fyloz.musicplayer.core.data + +import dev.fyloz.musicplayer.core.data.memory.TrackMemoryRepository +import org.koin.dsl.module + +object RepositoryInjection { + val koinBeans = module { + single { TrackMemoryRepository() } + } +} diff --git a/src/main/kotlin/dev/fyloz/musicplayer/core/data/TrackRepository.kt b/src/main/kotlin/dev/fyloz/musicplayer/core/data/TrackRepository.kt new file mode 100644 index 0000000..86141a7 --- /dev/null +++ b/src/main/kotlin/dev/fyloz/musicplayer/core/data/TrackRepository.kt @@ -0,0 +1,5 @@ +package dev.fyloz.musicplayer.core.data + +import dev.fyloz.musicplayer.core.model.Track + +interface TrackRepository : Repository diff --git a/src/main/kotlin/dev/fyloz/musicplayer/core/data/memory/BaseMemoryRepository.kt b/src/main/kotlin/dev/fyloz/musicplayer/core/data/memory/BaseMemoryRepository.kt new file mode 100644 index 0000000..f28cbc7 --- /dev/null +++ b/src/main/kotlin/dev/fyloz/musicplayer/core/data/memory/BaseMemoryRepository.kt @@ -0,0 +1,22 @@ +package dev.fyloz.musicplayer.core.data.memory + +import dev.fyloz.musicplayer.core.data.Repository + +abstract class BaseMemoryRepository : Repository { + private val memoryCache = mutableMapOf() + + override fun findAll() = memoryCache.values + override fun findById(id: String) = memoryCache[id] + override fun existsById(id: String) = findById(id) == true + + override fun save(t: T) { + val id = getId(t) + memoryCache[id] = t + } + + override fun deleteById(id: String) { + memoryCache.remove(id) + } + + protected abstract fun getId(t: T): String; +} diff --git a/src/main/kotlin/dev/fyloz/musicplayer/core/data/memory/TrackMemoryRepository.kt b/src/main/kotlin/dev/fyloz/musicplayer/core/data/memory/TrackMemoryRepository.kt new file mode 100644 index 0000000..be81fb4 --- /dev/null +++ b/src/main/kotlin/dev/fyloz/musicplayer/core/data/memory/TrackMemoryRepository.kt @@ -0,0 +1,8 @@ +package dev.fyloz.musicplayer.core.data.memory + +import dev.fyloz.musicplayer.core.data.TrackRepository +import dev.fyloz.musicplayer.core.model.Track + +class TrackMemoryRepository : BaseMemoryRepository(), TrackRepository { + override fun getId(t: Track) = t.id +} diff --git a/src/main/kotlin/dev/fyloz/musicplayer/core/factory/TrackFactory.kt b/src/main/kotlin/dev/fyloz/musicplayer/core/factory/TrackFactory.kt new file mode 100644 index 0000000..fae0676 --- /dev/null +++ b/src/main/kotlin/dev/fyloz/musicplayer/core/factory/TrackFactory.kt @@ -0,0 +1,7 @@ +package dev.fyloz.musicplayer.core.factory + +import dev.fyloz.musicplayer.core.model.Track + +interface TrackFactory { + suspend fun createTrack(id: String, trackId: String): Track +} diff --git a/src/main/kotlin/dev/fyloz/musicplayer/core/factory/TrackFactoryProxy.kt b/src/main/kotlin/dev/fyloz/musicplayer/core/factory/TrackFactoryProxy.kt new file mode 100644 index 0000000..213296c --- /dev/null +++ b/src/main/kotlin/dev/fyloz/musicplayer/core/factory/TrackFactoryProxy.kt @@ -0,0 +1,17 @@ +package dev.fyloz.musicplayer.core.factory + +import dev.fyloz.musicplayer.core.model.Track + +class TrackFactoryProxy { + private val factories = mutableMapOf() + + fun registerFactory(type: String, factory: TrackFactory) { + factories[type] = factory; + } + + suspend fun createTrack(type: String, id: String, trackId: String): Track { + return getFactory(type).createTrack(id, trackId) + } + + private fun getFactory(type: String) = factories[type]!!; +} diff --git a/src/main/kotlin/dev/fyloz/musicplayer/core/http/TrackRoutes.kt b/src/main/kotlin/dev/fyloz/musicplayer/core/http/TrackRoutes.kt new file mode 100644 index 0000000..7c07059 --- /dev/null +++ b/src/main/kotlin/dev/fyloz/musicplayer/core/http/TrackRoutes.kt @@ -0,0 +1,25 @@ +package dev.fyloz.musicplayer.core.http + +import dev.fyloz.musicplayer.core.http.requests.CreateTrackRequest +import dev.fyloz.musicplayer.core.logic.TrackLogic +import io.ktor.server.application.* +import io.ktor.server.request.* +import io.ktor.server.response.* +import io.ktor.server.routing.* +import org.koin.ktor.ext.inject + +fun Route.configureTrackRoutes() { + val logic by inject() + + route("/track") { + get("/") { + call.respond(logic.getAll().toList()) + } + + post { + val request = call.receive() + val track = logic.save(request.type, request.trackId) + call.respond(track) + } + } +} diff --git a/src/main/kotlin/dev/fyloz/musicplayer/core/http/requests/CreateTrackRequest.kt b/src/main/kotlin/dev/fyloz/musicplayer/core/http/requests/CreateTrackRequest.kt new file mode 100644 index 0000000..315c746 --- /dev/null +++ b/src/main/kotlin/dev/fyloz/musicplayer/core/http/requests/CreateTrackRequest.kt @@ -0,0 +1,6 @@ +package dev.fyloz.musicplayer.core.http.requests + +import kotlinx.serialization.Serializable + +@Serializable +data class CreateTrackRequest(val type: String, val trackId: String) diff --git a/src/main/kotlin/dev/fyloz/musicplayer/core/logic/TrackLogic.kt b/src/main/kotlin/dev/fyloz/musicplayer/core/logic/TrackLogic.kt new file mode 100644 index 0000000..710cf66 --- /dev/null +++ b/src/main/kotlin/dev/fyloz/musicplayer/core/logic/TrackLogic.kt @@ -0,0 +1,26 @@ +package dev.fyloz.musicplayer.core.logic + +import dev.fyloz.musicplayer.core.data.TrackRepository +import dev.fyloz.musicplayer.core.factory.TrackFactoryProxy +import dev.fyloz.musicplayer.core.model.Track +import dev.fyloz.musicplayer.modules.spotify.SpotifyTrackFactory +import org.koin.core.component.KoinComponent +import org.koin.core.component.inject +import java.util.UUID + +class TrackLogic : KoinComponent { + private val repository by inject() + private val trackFactory by inject() + + fun getAll() = repository.findAll() + fun getById(id: String) = repository.findById(id) + + suspend fun save(type: String, trackId: String): Track { + val id = generateId() + val track = trackFactory.createTrack(type, id, trackId) + repository.save(track) + return track + } + + private fun generateId() = UUID.randomUUID().toString() +} diff --git a/src/main/kotlin/dev/fyloz/musicplayer/core/model/Track.kt b/src/main/kotlin/dev/fyloz/musicplayer/core/model/Track.kt new file mode 100644 index 0000000..f9e742a --- /dev/null +++ b/src/main/kotlin/dev/fyloz/musicplayer/core/model/Track.kt @@ -0,0 +1,15 @@ +package dev.fyloz.musicplayer.core.model + +/** + * A generic track. + */ +abstract class Track { + /** The id of the track in the local system. **/ + abstract val id: String + + /** The id of the track in the remote service. **/ + abstract val trackId: String + + /** The name of the track. **/ + abstract val name: String +} diff --git a/src/main/kotlin/dev/fyloz/musicplayer/core/plugins/Monitoring.kt b/src/main/kotlin/dev/fyloz/musicplayer/core/plugins/Monitoring.kt new file mode 100644 index 0000000..26be9d2 --- /dev/null +++ b/src/main/kotlin/dev/fyloz/musicplayer/core/plugins/Monitoring.kt @@ -0,0 +1,13 @@ +package dev.fyloz.musicplayer.core.plugins + +import io.ktor.server.plugins.callloging.* +import org.slf4j.event.* +import io.ktor.server.request.* +import io.ktor.server.application.* + +fun Application.configureMonitoring() { + install(CallLogging) { + level = Level.INFO + filter { call -> call.request.path().startsWith("/") } + } +} diff --git a/src/main/kotlin/dev/fyloz/musicplayer/modules/Module.kt b/src/main/kotlin/dev/fyloz/musicplayer/modules/Module.kt new file mode 100644 index 0000000..98d0c9d --- /dev/null +++ b/src/main/kotlin/dev/fyloz/musicplayer/modules/Module.kt @@ -0,0 +1,36 @@ +package dev.fyloz.musicplayer.modules + +import dev.fyloz.musicplayer.core.factory.TrackFactory +import dev.fyloz.musicplayer.core.factory.TrackFactoryProxy +import io.ktor.server.application.* +import io.ktor.server.routing.* +import org.koin.ktor.ext.inject + +abstract class Module(private val moduleName: String) { + open fun configure(app: Application) { + with(app) { + val trackFactoryProxy by inject() + trackFactoryProxy.registerFactory(moduleName, getTrackFactory()) + } + } + + fun configureRoutes(routing: Routing) { + with(routing) { + route("/api/v1/$moduleName") { + configureApiRoutes() + } + + route("/module/$moduleName") { + configureModuleRoutes() + } + } + } + + protected open fun Route.configureApiRoutes() { + } + + protected open fun Route.configureModuleRoutes() { + } + + protected abstract fun getTrackFactory(): TrackFactory +} diff --git a/src/main/kotlin/dev/fyloz/musicplayer/modules/spotify/SpotifyHttpProvider.kt b/src/main/kotlin/dev/fyloz/musicplayer/modules/spotify/SpotifyHttpProvider.kt new file mode 100644 index 0000000..03dbea8 --- /dev/null +++ b/src/main/kotlin/dev/fyloz/musicplayer/modules/spotify/SpotifyHttpProvider.kt @@ -0,0 +1,34 @@ +package dev.fyloz.musicplayer.modules.spotify + +import dev.fyloz.musicplayer.modules.spotify.api.Track +import io.ktor.client.* +import io.ktor.client.call.* +import io.ktor.client.plugins.contentnegotiation.* +import io.ktor.client.request.* +import io.ktor.http.* +import io.ktor.serialization.kotlinx.json.* +import kotlinx.serialization.json.Json + +class SpotifyHttpProvider { + private val client = HttpClient { + install(ContentNegotiation) { + json(Json { + ignoreUnknownKeys = true + }) + } + } + + suspend fun getTrackById(trackId: String, token: String): Track { + val tmpToken = + "Bearer BQAtodg3W_kHLVJhGLFD0YEOh5AFfxSsrvhk1n9c0ELrlQdoEkbyOXYncN1k3umPfqqR3sesLI8qpJMxJ6-98nc4Z7KenedLBGyHfvBPzWg_U8OtwWy6jEWl7MbeFJYO50GNj-XRLPv6EAA1hPrrSIOhJBvOygs6hcDAYfD-_moA" + + val response = client.get("https://api.spotify.com/v1/tracks/$trackId") { + accept(ContentType.Application.Json) + headers { + append(HttpHeaders.Authorization, tmpToken) + } + } + + return response.body() + } +} diff --git a/src/main/kotlin/dev/fyloz/musicplayer/modules/spotify/SpotifyInjection.kt b/src/main/kotlin/dev/fyloz/musicplayer/modules/spotify/SpotifyInjection.kt new file mode 100644 index 0000000..eba679a --- /dev/null +++ b/src/main/kotlin/dev/fyloz/musicplayer/modules/spotify/SpotifyInjection.kt @@ -0,0 +1,9 @@ +package dev.fyloz.musicplayer.modules.spotify + +import org.koin.dsl.module + +object SpotifyInjection { + val koinBeans = module { + single { SpotifyTrackFactory() } + } +} diff --git a/src/main/kotlin/dev/fyloz/musicplayer/modules/spotify/SpotifyModule.kt b/src/main/kotlin/dev/fyloz/musicplayer/modules/spotify/SpotifyModule.kt new file mode 100644 index 0000000..70e2da7 --- /dev/null +++ b/src/main/kotlin/dev/fyloz/musicplayer/modules/spotify/SpotifyModule.kt @@ -0,0 +1,58 @@ +package dev.fyloz.musicplayer.modules.spotify + +import dev.fyloz.musicplayer.modules.Module +import io.ktor.client.* +import io.ktor.http.* +import io.ktor.server.application.* +import io.ktor.server.auth.* +import io.ktor.server.response.* +import io.ktor.server.routing.* + +class SpotifyModule : Module("spotify") { + override fun configure(app: Application) { + super.configure(app) + with(app) { + authentication { + oauth("auth-oauth-spotify") { + urlProvider = { "http://localhost:8080/module/spotify/login-callback" } + providerLookup = { + OAuthServerSettings.OAuth2ServerSettings( + name = "spotify", + authorizeUrl = "https://accounts.spotify.com/authorize", + accessTokenUrl = "https://accounts.spotify.com/api/token", + requestMethod = HttpMethod.Post, + clientId = "1372bd3ebcad4f889994f9a3f675472b", + clientSecret = "26ac249dc5ca4a309aa08f8cfcec9a60" + ) + } + client = HttpClient() + } + } + } + } + + override fun Route.configureModuleRoutes() { + authenticate("auth-oauth-spotify") { + get("/login") { + call.respondRedirect("https://accounts.spotify.com/authorize") + } + + get("/login-callback") { + val principal: OAuthAccessTokenResponse.OAuth2? = call.principal() + if (principal != null) { + call.response.cookies.append("Spotify-Access-Token", principal.accessToken) + + if (principal.refreshToken != null) { + call.response.cookies.append("Spotify-Refresh-Token", principal.refreshToken!!) + } + +// SpotifyTokenLogic(http) + } else { + call.respond(HttpStatusCode.Unauthorized) + } + } + } + } + + override fun getTrackFactory() = SpotifyTrackFactory() +} diff --git a/src/main/kotlin/dev/fyloz/musicplayer/modules/spotify/SpotifyTokenLogic.kt b/src/main/kotlin/dev/fyloz/musicplayer/modules/spotify/SpotifyTokenLogic.kt new file mode 100644 index 0000000..562f598 --- /dev/null +++ b/src/main/kotlin/dev/fyloz/musicplayer/modules/spotify/SpotifyTokenLogic.kt @@ -0,0 +1,29 @@ +package dev.fyloz.musicplayer.modules.spotify + +import dev.fyloz.musicplayer.modules.spotify.api.AccessTokenRequest +import dev.fyloz.musicplayer.modules.spotify.api.AccessTokenResponse +import io.ktor.client.* +import io.ktor.client.call.* +import io.ktor.client.request.* +import io.ktor.http.* +import io.ktor.util.* +import org.koin.core.component.KoinComponent +import org.koin.core.component.inject + +class SpotifyTokenLogic : KoinComponent { + private val httpClient by inject() + + suspend fun getAccessToken(authorizationCode: String) { + val authorizationHeader = "1372bd3ebcad4f889994f9a3f675472b:26ac249dc5ca4a309aa08f8cfcec9a60".encodeBase64() + + val call = httpClient.post("https://accounts.spotify.com/api/token") { + contentType(ContentType.Application.FormUrlEncoded) + accept(ContentType.Application.Json) + setBody(AccessTokenRequest(authorizationCode, "http://localhost:8080/module/spotify/login-callback")) + header("Authorization", "Basic $authorizationHeader") + } + + val response = call.body() + println(response.accessToken) + } +} diff --git a/src/main/kotlin/dev/fyloz/musicplayer/modules/spotify/SpotifyTrack.kt b/src/main/kotlin/dev/fyloz/musicplayer/modules/spotify/SpotifyTrack.kt new file mode 100644 index 0000000..65a8d16 --- /dev/null +++ b/src/main/kotlin/dev/fyloz/musicplayer/modules/spotify/SpotifyTrack.kt @@ -0,0 +1,11 @@ +package dev.fyloz.musicplayer.modules.spotify + +import dev.fyloz.musicplayer.core.model.Track +import kotlinx.serialization.Serializable + +@Serializable +data class SpotifyTrack( + override val id: String, + override val trackId: String, + override val name: String +) : Track() diff --git a/src/main/kotlin/dev/fyloz/musicplayer/modules/spotify/SpotifyTrackFactory.kt b/src/main/kotlin/dev/fyloz/musicplayer/modules/spotify/SpotifyTrackFactory.kt new file mode 100644 index 0000000..0901372 --- /dev/null +++ b/src/main/kotlin/dev/fyloz/musicplayer/modules/spotify/SpotifyTrackFactory.kt @@ -0,0 +1,14 @@ +package dev.fyloz.musicplayer.modules.spotify + +import dev.fyloz.musicplayer.core.factory.TrackFactory +import dev.fyloz.musicplayer.core.model.Track + +class SpotifyTrackFactory : TrackFactory { + private val httpProvider = SpotifyHttpProvider() + + override suspend fun createTrack(id: String, trackId: String): Track { + val spotifyApiTrack = httpProvider.getTrackById(trackId, "bla"); + + return SpotifyTrack(id, trackId, spotifyApiTrack.name) + } +} diff --git a/src/main/kotlin/dev/fyloz/musicplayer/modules/spotify/api/AccessTokenRequest.kt b/src/main/kotlin/dev/fyloz/musicplayer/modules/spotify/api/AccessTokenRequest.kt new file mode 100644 index 0000000..3a97aad --- /dev/null +++ b/src/main/kotlin/dev/fyloz/musicplayer/modules/spotify/api/AccessTokenRequest.kt @@ -0,0 +1,15 @@ +package dev.fyloz.musicplayer.modules.spotify.api + +import kotlinx.serialization.SerialName +import kotlinx.serialization.Serializable + +@Serializable +data class AccessTokenRequest( + val code: String, + + @SerialName("redirect_uri") + val redirectUri: String +) { + @SerialName("grant_type") + val grantType = "authorization_code" +} diff --git a/src/main/kotlin/dev/fyloz/musicplayer/modules/spotify/api/AccessTokenResponse.kt b/src/main/kotlin/dev/fyloz/musicplayer/modules/spotify/api/AccessTokenResponse.kt new file mode 100644 index 0000000..ae1f58b --- /dev/null +++ b/src/main/kotlin/dev/fyloz/musicplayer/modules/spotify/api/AccessTokenResponse.kt @@ -0,0 +1,21 @@ +package dev.fyloz.musicplayer.modules.spotify.api + +import kotlinx.serialization.SerialName +import kotlinx.serialization.Serializable + +@Serializable +data class AccessTokenResponse( + @SerialName("access_token") + val accessToken: String, + + @SerialName("token_type") + val tokenType: String, + + val scope: String, + + @SerialName("expires_in") + val expiresIn: Int, + + @SerialName("refresh_token") + val refreshToken: String +) diff --git a/src/main/kotlin/dev/fyloz/musicplayer/modules/spotify/api/Album.kt b/src/main/kotlin/dev/fyloz/musicplayer/modules/spotify/api/Album.kt new file mode 100644 index 0000000..04d22d0 --- /dev/null +++ b/src/main/kotlin/dev/fyloz/musicplayer/modules/spotify/api/Album.kt @@ -0,0 +1,26 @@ +package dev.fyloz.musicplayer.modules.spotify.api + +import kotlinx.serialization.SerialName +import kotlinx.serialization.Serializable + +@Serializable +data class Album( + @SerialName("album_type") + val albumType: String, + val href: String, + val id: String, + val name: String, + + @SerialName("release_date") + val releaseDate: String, + + @SerialName("release_date_precision") + val releaseDatePrecision: String, + val type: String, + val uri: String, + val images: Collection, + val artists: Collection, + + @SerialName("external_urls") + val externalUrls: ExternalUrls +) diff --git a/src/main/kotlin/dev/fyloz/musicplayer/modules/spotify/api/Artist.kt b/src/main/kotlin/dev/fyloz/musicplayer/modules/spotify/api/Artist.kt new file mode 100644 index 0000000..b5067d4 --- /dev/null +++ b/src/main/kotlin/dev/fyloz/musicplayer/modules/spotify/api/Artist.kt @@ -0,0 +1,16 @@ +package dev.fyloz.musicplayer.modules.spotify.api + +import kotlinx.serialization.SerialName +import kotlinx.serialization.Serializable + +@Serializable +data class Artist( + val href: String, + val id: String, + val name: String, + val type: String, + val uri: String, + + @SerialName("external_urls") + val externalUrls: ExternalUrls +) diff --git a/src/main/kotlin/dev/fyloz/musicplayer/modules/spotify/api/ExternalIds.kt b/src/main/kotlin/dev/fyloz/musicplayer/modules/spotify/api/ExternalIds.kt new file mode 100644 index 0000000..8b8c147 --- /dev/null +++ b/src/main/kotlin/dev/fyloz/musicplayer/modules/spotify/api/ExternalIds.kt @@ -0,0 +1,6 @@ +package dev.fyloz.musicplayer.modules.spotify.api + +import kotlinx.serialization.Serializable + +@Serializable +data class ExternalIds(val isrc: String) diff --git a/src/main/kotlin/dev/fyloz/musicplayer/modules/spotify/api/ExternalUrls.kt b/src/main/kotlin/dev/fyloz/musicplayer/modules/spotify/api/ExternalUrls.kt new file mode 100644 index 0000000..9e34ab4 --- /dev/null +++ b/src/main/kotlin/dev/fyloz/musicplayer/modules/spotify/api/ExternalUrls.kt @@ -0,0 +1,6 @@ +package dev.fyloz.musicplayer.modules.spotify.api + +import kotlinx.serialization.Serializable + +@Serializable +data class ExternalUrls(val spotify: String) diff --git a/src/main/kotlin/dev/fyloz/musicplayer/modules/spotify/api/Image.kt b/src/main/kotlin/dev/fyloz/musicplayer/modules/spotify/api/Image.kt new file mode 100644 index 0000000..136f581 --- /dev/null +++ b/src/main/kotlin/dev/fyloz/musicplayer/modules/spotify/api/Image.kt @@ -0,0 +1,10 @@ +package dev.fyloz.musicplayer.modules.spotify.api + +import kotlinx.serialization.Serializable + +@Serializable +data class Image( + val url: String, + val width: Int, + val height: Int +) diff --git a/src/main/kotlin/dev/fyloz/musicplayer/modules/spotify/api/Track.kt b/src/main/kotlin/dev/fyloz/musicplayer/modules/spotify/api/Track.kt new file mode 100644 index 0000000..3c45657 --- /dev/null +++ b/src/main/kotlin/dev/fyloz/musicplayer/modules/spotify/api/Track.kt @@ -0,0 +1,38 @@ +package dev.fyloz.musicplayer.modules.spotify.api + +import kotlinx.serialization.SerialName +import kotlinx.serialization.Serializable + +@Serializable +data class Track( + val album: Album, + val artists: Collection, + + @SerialName("disc_number") + val discNumber: Int, + + @SerialName("duration_ms") + val durationMs: Long, + val explicit: Boolean, + + @SerialName("external_ids") + val externalIds: ExternalIds, + + @SerialName("external_urls") + val externalUrls: ExternalUrls, + val href: String, + val id: String, + + @SerialName("is_local") + val isLocal: Boolean, + val name: String, + val popularity: Int, + + @SerialName("preview_url") + val previewUrl: String, + + @SerialName("track_number") + val trackNumber: Int, + val type: String, + val uri: String +) diff --git a/src/main/resources/logback.xml b/src/main/resources/logback.xml new file mode 100644 index 0000000..bdbb64e --- /dev/null +++ b/src/main/resources/logback.xml @@ -0,0 +1,12 @@ + + + + %d{YYYY-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n + + + + + + + + diff --git a/src/test/kotlin/dev/fyloz/ApplicationTest.kt b/src/test/kotlin/dev/fyloz/ApplicationTest.kt new file mode 100644 index 0000000..6d3934e --- /dev/null +++ b/src/test/kotlin/dev/fyloz/ApplicationTest.kt @@ -0,0 +1,29 @@ +package dev.fyloz + +import io.ktor.server.routing.* +import io.ktor.http.* +import io.ktor.server.plugins.callloging.* +import org.slf4j.event.* +import io.ktor.server.request.* +import io.ktor.serialization.kotlinx.json.* +import io.ktor.server.plugins.contentnegotiation.* +import io.ktor.server.application.* +import io.ktor.server.response.* +import io.ktor.client.request.* +import io.ktor.client.statement.* +import kotlin.test.* +import io.ktor.server.testing.* +import dev.fyloz.plugins.* + +class ApplicationTest { + @Test + fun testRoot() = testApplication { + application { + configureRouting() + } + client.get("/").apply { + assertEquals(HttpStatusCode.OK, status) + assertEquals("Hello World!", bodyAsText()) + } + } +} \ No newline at end of file