Merge pull request #186 from Darkside138/daveProtocol

Dave protocol

Author: Darkside138

.github/workflows/gradle.yml

@@ -18,10 +18,11 @@ jobs:
 
     steps:
     - uses: actions/checkout@v4
-    - name: Set up JDK 17
-      uses: actions/setup-java@v1
+    - name: Set up JDK 25
+      uses: actions/setup-java@v4
       with:
-        java-version: 17
+        java-version: '25'
+        distribution: 'temurin'
     - name: Grant execute permission for gradlew
       run: chmod +x gradlew
     - name: Build with Gradle

.github/workflows/publish.yml

@@ -1,10 +1,11 @@
-name: Master Branch Publish
+name: Docker Publish
 permissions:
   contents: read
 
 on:
   push:
-    branches: [ master ]
+    branches:
+      - '**'
 
 jobs:
   publish-docker-image:
@@ -28,6 +29,7 @@ jobs:
           password: ${{ secrets.SOUNDBOARD_GHCR }}
 
       # Generate tags + labels for BOTH registries
+      # master -> latest, other branches -> branch name
       - name: Extract metadata (tags, labels) for Docker
         id: meta
         uses: docker/metadata-action@v5
@@ -36,7 +38,8 @@ jobs:
             davefurrer/discordsoundboard
             ghcr.io/${{ github.repository }}
           tags: |
-            type=raw,value=latest
+            type=raw,value=latest,enable=${{ github.ref == 'refs/heads/master' }}
+            type=ref,event=branch,enable=${{ github.ref != 'refs/heads/master' }}
 
       # Build & push using metadata
       - name: Build and push Docker images
@@ -47,9 +50,20 @@ jobs:
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
 
+      - name: Get Docker tag and version
+        id: docker_info
+        run: |
+          if [ "${{ github.ref }}" == "refs/heads/master" ]; then
+            echo "tag=latest" >> $GITHUB_OUTPUT
+          else
+            echo "tag=${{ github.ref_name }}" >> $GITHUB_OUTPUT
+          fi
+          VERSION=$(grep '^projectVersion=' gradle.properties | cut -d'=' -f2)
+          echo "version=$VERSION" >> $GITHUB_OUTPUT
+
       - name: Actions for Discord
         uses: Ilshidur/action-discord@0.4.0
         env:
           DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK }}
         with:
-          args: '{{ EVENT_PAYLOAD.repository.full_name }} Unraid/Docker image has been updated.'
+          args: '{{ EVENT_PAYLOAD.repository.full_name }} v${{ steps.docker_info.outputs.version }} Docker image updated: `${{ steps.docker_info.outputs.tag }}`'

.github/workflows/version.yml

@@ -1,10 +1,10 @@
 #This Dockerfile is for general use (Unraid dockerfiles are in the root of the project
-FROM ubuntu:22.04
+FROM ubuntu:24.04
 
 #Install required packages
 RUN apt update && \
     apt upgrade -y && \
-    apt install wget openjdk-17-jdk dos2unix unzip jq curl -y \
+    apt install wget openjdk-25-jdk dos2unix unzip jq curl -y \
 
 #Set working dir
 WORKDIR "/etc"

Docker/Dockerfile

@@ -1,10 +1,9 @@
 # ---- Build Stage ----
-FROM gradle:7.4.2-jdk17 AS builder
+FROM eclipse-temurin:25-jdk AS builder
 
 LABEL org.opencontainers.image.source = https://github.com/Darkside138/DiscordSoundboard
 
-USER root
-RUN apt-get update && apt-get install -y nodejs npm
+RUN apt-get update && apt-get install -y nodejs npm unzip
 
 WORKDIR /app
 
@@ -25,7 +24,8 @@ RUN unzip DiscordSoundboard.zip
 RUN rm DiscordSoundboard.zip
 
 # ---- Runtime Stage ----
-FROM bellsoft/liberica-openjdk-alpine:17.0.2-9
+# Using Debian-based image (not alpine) for glibc compatibility with jDave native libraries
+FROM eclipse-temurin:25-jre
 
 WORKDIR /etc/DiscordSoundboard
 

Dockerfile

@@ -8,18 +8,18 @@
 Simple soundboard for discord. You can trigger sounds by commands typed in discord chat, or you can
 choose the sound from the web UI. You will need to create a bot account that the bot will use to join
 and play sounds. The bot can only play sounds/respond to commands for servers it has been given access to.
-Requires java 8 or higher. This bot uses the [DiscordJDA](https://github.com/DV8FromTheWorld/JDA) library.
+Requires Java 25 or higher. This bot uses the [DiscordJDA](https://github.com/DV8FromTheWorld/JDA) library (version 6.3.0) with DAVE protocol support for Discord audio encryption.
 
 
 [4.1.9.zip](https://github.com/Darkside138/DiscordSoundboard/releases/latest)
 
-## Must have Java 17+ 64bit version installed in order for the soundboard to work properly
+## Must have Java 25+ 64bit version installed in order for the soundboard to work properly
 
 Join the official discord: [https://discord.gg/kZTNtfW](https://discord.gg/kZTNtfW)
 
 ## 4.* Releases
 **If you're updating from any version prior to 4.0 you will need to delete your old DB file.** The release of 4.* updates
-the JDA library to 6.1.1 and some updates to the legacy UI. In 4.1.* and above, I added a new UI available at {BASE_URL}/indexV2.html.
+the JDA library to 6.3.0 with DAVE (Discord Audio Video Encryption) protocol support and some updates to the legacy UI. In 4.1.* and above, I added a new UI available at {BASE_URL}/indexV2.html.
 The new UI allows OAuth through Discord. The UI should work fine without configuring OAuth but will give extra functionality
 if you do configure it for users you grant roles to (Admin, Moderator, or DJ). To configure, you'll need to go to the [Discord
 developer portal](https://discord.com/developers/applications/), click your application, select OAuth2. From this screen

README.md

@@ -47,7 +47,7 @@ test {
 
 java {
     toolchain {
-        languageVersion = JavaLanguageVersion.of(17)
+        languageVersion = JavaLanguageVersion.of(25)
     }
 }
 
@@ -59,12 +59,18 @@ tasks.named("bootJar") {
 }
 
 dependencies {
-    implementation 'net.dv8tion:JDA:6.1.1'
-    //implementation 'com.github.walkyst:lavaplayer-fork:1.4.0'
-    implementation 'com.sedmelluq:lavaplayer:1.3.78'
-    implementation 'com.github.aikaterna:lavaplayer-natives:original-SNAPSHOT'
+    implementation 'net.dv8tion:JDA:6.3.0'
+    // Using Lavalink's actively maintained lavaplayer fork for JDK 25 compatibility
+    implementation 'dev.arbjerg:lavaplayer:2.2.6'
     implementation 'pw.chew:jda-chewtils:1.24.1'
 
+    // JDAVE for Discord Audio Video Encryption (DAVE) protocol - required for JDA 6.3.0+
+    implementation 'club.minnced:jdave-api:0.1.5'
+    runtimeOnly 'club.minnced:jdave-native-linux-x86-64:0.1.5'
+    runtimeOnly 'club.minnced:jdave-native-linux-aarch64:0.1.5'
+    runtimeOnly 'club.minnced:jdave-native-win-x86-64:0.1.5'
+    runtimeOnly 'club.minnced:jdave-native-darwin:0.1.5'
+
     implementation 'commons-io:commons-io:2.14.0'
     compileOnly 'org.projectlombok:lombok'
     annotationProcessor 'org.projectlombok:lombok'
@@ -87,8 +93,8 @@ dependencies {
     testImplementation 'org.springframework.boot:spring-boot-starter-test'
     testImplementation 'org.springframework.restdocs:spring-restdocs-mockmvc'
     testImplementation "org.mockito:mockito-core:4.4.0"
-    testCompileOnly 'org.projectlombok:lombok:1.18.22'
-    testAnnotationProcessor 'org.projectlombok:lombok:1.18.22'
+    testCompileOnly 'org.projectlombok:lombok'
+    testAnnotationProcessor 'org.projectlombok:lombok'
 }
 
 node {

build.gradle

@@ -1,2 +1,2 @@
-projectVersion=4.1.37
+projectVersion=4.1.54
 org.gradle.configuration-cache=false

gradle.properties

@@ -239,6 +239,7 @@ export default function App() {
                   <div className="relative">
                     <Search className={`absolute left-3 top-1/2 -translate-y-1/2 w-5 h-5 ${theme === 'dark' ? 'text-gray-500' : 'text-gray-400'}`} />
                     <input
+                      id="soundSearch"
                       type="text"
                       placeholder="Search sounds..."
                       value={searchQuery}
@@ -263,8 +264,9 @@ export default function App() {
 
                 {/* Category Filter and Playback Info */}
                 <div className="mb-4 flex items-center gap-3 flex-wrap">
-                  <label className={theme === 'dark' ? 'text-gray-300' : 'text-gray-700'}>Category</label>
+                  <label for="categorySelect" className={theme === 'dark' ? 'text-gray-300' : 'text-gray-700'}>Category</label>
                   <select
+                    id="categorySelect"
                     value={selectedCategory}
                     onChange={(e) => {
                       setSelectedCategory(e.target.value);

src/frontend/src/App.tsx

@@ -78,21 +78,17 @@ export function ContextMenu({
 
     // Block if we just sent a request within the last 300ms
     if (now - lastUpdateTimeRef.current < 300) {
-      console.log('Blocked duplicate API call (too soon)');
       return;
     }
 
     // Block if this exact value was already sent
     if (lastSentValueRef.current === newValue) {
-      console.log('Blocked duplicate API call (same value)');
       return;
     }
 
     lastUpdateTimeRef.current = now;
     setIsUpdating(true);
 
-    console.log(`Calling API to update volume offset to ${newValue}%`);
-
     try {
       const url = new URL(`${API_BASE_URL}/api/soundFiles/${soundId}`, window.location.origin);
       url.searchParams.append('volumeOffsetPercentage', newValue.toString());
@@ -107,17 +103,13 @@ export function ContextMenu({
       });
 
       if (!response.ok) {
-        console.error('Failed to update volume offset:', response.status, response.statusText);
-        // Revert to original value on error
         setLocalVolumeOffset(volumeOffset ?? 0);
         toast.error('Failed to update volume offset');
       } else {
         lastSentValueRef.current = newValue;
         toast.success('Volume offset updated');
       }
-    } catch (error) {
-      console.error('Error updating volume offset:', error);
-      // Revert to original value on error
+    } catch {
       setLocalVolumeOffset(volumeOffset ?? 0);
       toast.error('Failed to update volume offset');
     } finally {
@@ -130,20 +122,14 @@ export function ContextMenu({
   };
 
   const handleVolumeRelease = () => {
-    console.log('handleVolumeRelease called');
-
-    // Only update if the value has changed from what we last sent
     if (localVolumeOffset !== lastSentValueRef.current) {
       updateVolumeOffset(localVolumeOffset);
-    } else {
-      console.log('No change in volume, skipping API call');
     }
   };
 
   // Update display name on the backend
   const updateDisplayName = async (newName: string) => {
     setIsUpdatingName(true);
-    console.log(`Calling API to update display name to: ${newName}`);
 
     try {
       const url = new URL(`${API_BASE_URL}/api/soundFiles/${soundId}`, window.location.origin);
@@ -159,18 +145,13 @@ export function ContextMenu({
       });
 
       if (!response.ok) {
-        console.error('Failed to update display name:', response.status, response.statusText);
-        // Revert to original value on error
         setEditedDisplayName(displayName || '');
         toast.error('Failed to update display name');
       } else {
-        console.log('Display name updated successfully');
         setSavedDisplayName(newName);
         toast.success('Display name updated');
       }
-    } catch (error) {
-      console.error('Error updating display name:', error);
-      // Revert to original value on error
+    } catch {
       setEditedDisplayName(displayName || '');
       toast.error('Failed to update display name');
     } finally {