Add Nodes parsing

Reviewed-on: #2

.gitea/workflows/github-mirror.yml

@@ -0,0 +1,17 @@
+name: github-mirror
+on: push
+jobs:
+  push-github:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+      - name: Push to GitHub
+        uses: pixta-dev/repository-mirroring-action@v1
+        with:
+          target_repo_url:
+            git@github.com:EkiciLP/TomatenMusic3.git
+          ssh_private_key:
+            ${{ secrets.MIRROR_SSH_PRIVATE_KEY }}

.gitea/workflows/gradle-build.yml

@@ -0,0 +1,47 @@
+name: Build
+
+on:
+  push:
+
+jobs:
+  Gradle-Build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Checkout code
+      uses: actions/checkout@v4
+
+    - name: Set up JDK
+      uses: actions/setup-java@v4
+      with:
+        java-version: '23'
+        check-latest: true
+        distribution: 'zulu'
+
+    - name: Setup Gradle
+      uses: gradle/actions/setup-gradle@v4
+      with:
+        add-job-summary: always
+        cache-cleanup: on-success
+
+    - name: Cache Gradle dependencies
+      uses: actions/cache@v4
+      with:
+        path: | 
+          ~/.gradle/caches
+        key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
+        restore-keys: |
+          ${{ runner.os }}-gradle-
+
+    - name: Build
+      run: chmod +x gradlew; ./gradlew assemble
+
+    - name: Move artifacts
+      run: mkdir artifacts; mv app/build/libs/*.jar artifacts;
+
+    - name: Upload artifact
+      uses: christopherhx/gitea-upload-artifact@v4
+      with:
+        name: artifacts
+        path: artifacts

.gitea/workflows/gradle-test.yml

@@ -0,0 +1,53 @@
+name: Test
+
+on:
+  push:
+
+jobs:
+  Gradle-Test:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Set up JDK
+        uses: actions/setup-java@v4
+        with:
+          java-version: '23'
+          check-latest: true
+          distribution: 'zulu'
+
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v4
+        with:
+          add-job-summary: always
+          cache-cleanup: on-success
+
+      - name: Cache Gradle dependencies
+        uses: actions/cache@v4
+        with:
+          path: | 
+            ~/.gradle/caches
+          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
+          restore-keys: |
+            ${{ runner.os }}-gradle-
+
+      - name: Test
+        env:
+          DISCORD_TEST_TOKEN: ${{ secrets.DISCORD_TOKEN }}
+        run: chmod +x gradlew; ./gradlew test
+
+      - name: Move Test Results
+        if: always()
+        continue-on-error: true
+        run: |
+          mkdir test-results/;
+          [ -d app/build/test-results/test/ ] && mv app/build/test-results/test/*.xml test-results/ || true
+
+      - name: Upload Test Result
+        uses: christopherhx/gitea-upload-artifact@v4
+        if: always()
+        with:
+          name: test-results
+          path: test-results/

.gitignore

@@ -5,3 +5,4 @@
 build
 .vscode
 .env
+lavanodes.json

app/build.gradle.kts

@@ -14,6 +14,8 @@ plugins {
 repositories {
     // Use Maven Central for resolving dependencies.
     mavenCentral()
+    maven("https://maven.lavalink.dev/releases")
+    maven("https://git.tomatentum.net/api/packages/tueem/maven")
 }
 
 dependencies {
@@ -23,16 +25,24 @@ dependencies {
     testRuntimeOnly("org.junit.platform:junit-platform-launcher")
 
     // This dependency is used by the application.
-    implementation(libs.guava)
     implementation(libs.javacord)
     implementation(libs.dotenv)
-    implementation(libs.log4j)
+    implementation(libs.slf4j)
+    implementation(libs.logback)
+    implementation(libs.log4jtoslf4j)
+    implementation(libs.jultoslf4j)
+    implementation(libs.jackson)
+    implementation(libs.lavalink)
+
+    implementation(libs.marinaralib)
+    implementation(libs.marinarajavacord)
+
 }
 
 // Apply a specific Java toolchain to ease working on different environments.
 java {
     toolchain {
-        languageVersion = JavaLanguageVersion.of(21)
+        languageVersion = JavaLanguageVersion.of(23)
     }
 }
 

app/src/main/java/net/tomatentum/tomatenmusic3/App.java

@@ -1,19 +1,19 @@
 package net.tomatentum.tomatenmusic3;
 
-import org.apache.logging.log4j.Level;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-import org.apache.logging.log4j.core.config.Configurator;
-import org.apache.logging.log4j.core.config.builder.api.AppenderComponentBuilder;
-import org.apache.logging.log4j.core.config.builder.api.ConfigurationBuilder;
-import org.apache.logging.log4j.core.config.builder.api.ConfigurationBuilderFactory;
-import org.apache.logging.log4j.core.config.builder.api.RootLoggerComponentBuilder;
-import org.apache.logging.log4j.core.config.builder.impl.BuiltConfiguration;
 import org.javacord.api.DiscordApi;
 import org.javacord.api.DiscordApiBuilder;
 import org.javacord.api.entity.intent.Intent;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
+import com.fasterxml.jackson.core.JsonFactory;
+
+import ch.qos.logback.classic.Level;
+import ch.qos.logback.classic.LoggerContext;
 import io.github.cdimascio.dotenv.Dotenv;
+import net.tomatentum.marinara.Marinara;
+import net.tomatentum.marinara.wrapper.javacord.JavacordWrapper;
+import net.tomatentum.tomatenmusic3.command.PingCommand;
 
 public class App {
 
@@ -21,34 +21,21 @@ public class App {
         new App().connect();  
     }
 
-    private static String LOGGERPATTERN = "%-22d{dd MMM yyyy HH:mm:ss} (%t) [%c{3}] %p: %m%n";
+    private JsonFactory jsonFactory;
-
     private Config config;
     private DiscordApi client;
-    private Logger logger;
+    private Logger logger = LoggerFactory.getLogger(getClass());
+
+    private Marinara marinara;
 
     private App() {
+        this.jsonFactory = JsonFactory.builder().build();
         Dotenv env = Dotenv.configure().ignoreIfMissing().load();
         this.config = new Config(env);
-        initLogger();
-    }
 
-    private void initLogger() {
+        LoggerContext loggerctx = (LoggerContext) LoggerFactory.getILoggerFactory();
-        ConfigurationBuilder<BuiltConfiguration> builder = ConfigurationBuilderFactory.newConfigurationBuilder();
+        if (config.isDevelopment())
-        AppenderComponentBuilder cbuilder = 
+            loggerctx.getLogger("root").setLevel(Level.DEBUG);
-                builder.newAppender("Console", "Console")
-                .add(builder
-                    .newLayout("PatternLayout")
-                    .addAttribute("pattern", LOGGERPATTERN)
-            );
-        RootLoggerComponentBuilder rlbuilder = 
-            builder.newRootLogger(config.isDevelopment() ? Level.DEBUG : Level.INFO)
-            .add(builder.newAppenderRef("Console"));
-
-        BuiltConfiguration logconf = builder.add(cbuilder).add(rlbuilder).build();
-
-        Configurator.reconfigure(logconf);
-        logger = LogManager.getLogger(this);
     }
 
     public void connect() {
@@ -56,9 +43,16 @@ public class App {
             .setToken(config.token())
             .addIntents(Intent.GUILD_VOICE_STATES)
             .login().join();
-        logger.log(Level.INFO, "connected as {}", client.getYourself().getName());
+        initMarinara();
+        logger.info("connected as {}", client.getYourself().getName());
     }
 
+    private void initMarinara() {
+        this.marinara = Marinara.load(new JavacordWrapper(client));
 
+        marinara.getRegistry().addInteractions(new PingCommand());
+        
+        marinara.getRegistry().registerCommands();
+    }
 
 }

app/src/main/java/net/tomatentum/tomatenmusic3/command/PingCommand.java

@@ -0,0 +1,27 @@
+package net.tomatentum.tomatenmusic3.command;
+
+import java.time.Duration;
+import java.time.Instant;
+
+import org.javacord.api.entity.message.MessageFlag;
+import org.javacord.api.interaction.SlashCommandInteraction;
+
+import net.tomatentum.marinara.interaction.InteractionHandler;
+import net.tomatentum.marinara.interaction.commands.annotation.SlashCommand;
+
+public class PingCommand implements InteractionHandler {
+    
+    @SlashCommand(
+        name = "ping",
+        description = "Tests bot's connection."
+    )
+    public void execPing(SlashCommandInteraction interaction) {
+        Duration ping = Duration.between(interaction.getCreationTimestamp(), Instant.now());
+        interaction.createImmediateResponder()
+            .append("Pong! " + ping.toMillis() + "ms")
+            .setFlags(MessageFlag.EPHEMERAL)
+            .respond().join();
+
+    }
+
+}

app/src/main/java/net/tomatentum/tomatenmusic3/lavalink/IRegionFilterDeserializer.java

@@ -0,0 +1,36 @@
+package net.tomatentum.tomatenmusic3.lavalink;
+
+import java.io.IOException;
+
+import com.fasterxml.jackson.core.JacksonException;
+import com.fasterxml.jackson.core.JsonParser;
+import com.fasterxml.jackson.core.Version;
+import com.fasterxml.jackson.databind.DeserializationContext;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.deser.std.StdDeserializer;
+import com.fasterxml.jackson.databind.module.SimpleModule;
+
+import dev.arbjerg.lavalink.client.loadbalancing.IRegionFilter;
+import dev.arbjerg.lavalink.client.loadbalancing.RegionGroup;
+
+public class IRegionFilterDeserializer extends StdDeserializer<IRegionFilter> {
+
+    public static ObjectMapper register(ObjectMapper mapper) {
+        SimpleModule module =
+            new SimpleModule("IRegionFilterDeserializer", new Version(1, 0, 0, null, null, null));
+            module.addDeserializer(IRegionFilter.class, new IRegionFilterDeserializer());
+        mapper.registerModule(module);
+        return mapper;
+    }
+
+    public IRegionFilterDeserializer() {
+        super(IRegionFilter.class);
+    }
+    
+    @Override
+    public IRegionFilter deserialize(JsonParser parser, DeserializationContext ctxt) throws IOException, JacksonException {
+        String regionString = parser.getValueAsString();
+        return RegionGroup.INSTANCE.valueOf(regionString);
+    }
+    
+}

app/src/main/java/net/tomatentum/tomatenmusic3/lavalink/LavalinkNodeOptions.java

@@ -0,0 +1,16 @@
+package net.tomatentum.tomatenmusic3.lavalink;
+
+import dev.arbjerg.lavalink.client.NodeOptions;
+import dev.arbjerg.lavalink.client.loadbalancing.IRegionFilter;
+
+public record LavalinkNodeOptions(String name, String host, int port, String password, IRegionFilter regionGroup) {
+    
+    public NodeOptions toNodeOptions() {
+        return new NodeOptions.Builder()
+            .setName(name)
+            .setServerUri("ws://{}:{}".formatted(host, port))
+            .setPassword(password)
+            .setRegionFilter(regionGroup)
+            .build();
+    }
+}

app/src/main/java/net/tomatentum/tomatenmusic3/lavalink/LavalinkWrapper.java

@@ -0,0 +1,69 @@
+package net.tomatentum.tomatenmusic3.lavalink;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import org.javacord.api.DiscordApi;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.fasterxml.jackson.core.JsonFactory;
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+import dev.arbjerg.lavalink.client.Helpers;
+import dev.arbjerg.lavalink.client.LavalinkClient;
+import net.tomatentum.tomatenmusic3.Config;
+
+public class LavalinkWrapper {
+
+    private static final String NODES_FILE_NAME = "lavanodes.json";
+    private static final String NODES_INFO_FORMAT = "Node {} info:\n\tURI: {}\n\tRegion: {}";
+
+    private Logger logger = LoggerFactory.getLogger(getClass());
+
+    private DiscordApi client;
+    private JsonFactory jsonFactory;
+
+    private LavalinkClient lavaClient;
+    
+    public LavalinkWrapper(Config config, DiscordApi client, JsonFactory jsonFactory) {
+        this.client = client;
+        this.jsonFactory = jsonFactory;
+
+        this.lavaClient = new LavalinkClient(Helpers.getUserIdFromToken(config.token()));
+        getNodes().forEach(node -> {
+            lavaClient.addNode(node.toNodeOptions());
+            logger.info("Registered node {}", node.name());
+            logger.debug(NODES_INFO_FORMAT, node.name(), node.toNodeOptions().getServerUri(), node.regionGroup());
+        });
+    }
+
+    protected Set<LavalinkNodeOptions> getNodes() {
+        File nodesFile = new File(
+            new File(getClass().getProtectionDomain().getCodeSource().getLocation().getFile()).getParent(),
+            NODES_FILE_NAME);
+        ObjectMapper objectMapper = new ObjectMapper(jsonFactory);
+        IRegionFilterDeserializer.register(objectMapper);
+
+        try {
+            List<LavalinkNodeOptions> nodes = objectMapper.readValue(nodesFile, new TypeReference<List<LavalinkNodeOptions>>(){});
+            return new HashSet<>(nodes);
+        } catch (IOException e) {
+            logger.error("lavanodes.json seems to not exist.", e);
+            return Collections.emptySet();
+        }
+    }
+
+    public LavalinkClient client() {
+        return this.lavaClient;
+    }
+
+    public DiscordApi discordClient() {
+        return this.client;
+    }
+}

app/src/main/resources/logback.xml

@@ -0,0 +1,11 @@
+<configuration>
+  <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+    <encoder>
+      <pattern>%d{STRICT} %-20.-20t %-46([%boldWhite(%logger{30})]) %highlight(%p): %msg%n</pattern>
+    </encoder>
+  </appender>
+
+  <root level="info">
+    <appender-ref ref="STDOUT" />
+  </root>
+</configuration>

build.gradle.kts

@@ -0,0 +1,16 @@
+import java.io.ByteArrayOutputStream
+
+allprojects {
+    group = "net.tomatentum.tomatenmusic3"
+    version = "1.0.0-RC1" + (if (!project.hasProperty("release")) ("-" + getGitHash()) else "")
+    description = "A simple Discord Music Bot written in Java with Javacord"
+}
+
+fun getGitHash(): String {
+    val output = ByteArrayOutputStream()
+    project.exec {
+        commandLine("git", "rev-parse", "--short", "HEAD")
+        standardOutput = output
+    }
+    return output.toString().trim()
+}

gradle/libs.versions.toml

@@ -2,17 +2,27 @@
 # https://docs.gradle.org/current/userguide/platforms.html#sub::toml-dependencies-format
 
 [versions]
-guava = "33.0.0-jre"
 junit-jupiter = "5.10.2"
 javacord = "3.8.0"
 dotenv = "3.0.0"
-log4j = "2.24.1"
+logback = "1.5.15"
+slf4j = "2.0.16"
+log4jtoslf4j = "2.24.3"
+jultoslf4j = "2.0.16"
+jackson = "2.18.2"
+marinara = "1.0.0-RC1-9d88ca9"
+lavalink = "3.1.0"
 
 [libraries]
-guava = { module = "com.google.guava:guava", version.ref = "guava" }
 junit-jupiter = { module = "org.junit.jupiter:junit-jupiter", version.ref = "junit-jupiter" }
 javacord = { module = "org.javacord:javacord", version.ref = "javacord" }
 dotenv = { module = "io.github.cdimascio:dotenv-java", version.ref = "dotenv"}
-log4j = { module = "org.apache.logging.log4j:log4j-core", version.ref = "log4j"}
+logback = { module = "ch.qos.logback:logback-classic", version.ref = "logback"}
-
+slf4j = { module = "org.slf4j:slf4j-api", version.ref = "slf4j"}
+log4jtoslf4j = { module = "org.apache.logging.log4j:log4j-to-slf4j", version.ref = "log4jtoslf4j"}
+jultoslf4j = { module = "org.slf4j:jul-to-slf4j", version.ref = "jultoslf4j"}
+jackson = { module = "com.fasterxml.jackson.core:jackson-databind", version.ref = "jackson"}
+lavalink = { module = "dev.arbjerg:lavalink-client", version.ref = "lavalink"}
 
+marinaralib = { module = "net.tomatentum.Marinara:lib-dev", version.ref = "marinara"}
+marinarajavacord = { module = "net.tomatentum.Marinara:wrapper-javacord-dev", version.ref = "marinara"}

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

lavanodes.example.json

@@ -0,0 +1,9 @@
+[
+    {
+        "name": "node1",
+        "host": "localhost",
+        "port": 2333,
+        "password": "youshallnotpass",
+        "regionGroup": "EUROPE"
+    }
+]