Merge pull request #741 from freyacodes/dev

release v3.5.1

Author: topi314

.github/workflows/build.yml

@@ -6,15 +6,19 @@ on:
     paths-ignore: [ '**.md' ]
   workflow_call:
     secrets:
-      DOCKERHUB_USERNAME:
-      DOCKERHUB_TOKEN:
+      DOCKER_USERNAME:
+      DOCKER_TOKEN:
+      DOCKER_REGISTRY:
+      DOCKER_IMAGE:
 
 jobs:
   build:
     runs-on: ubuntu-latest
     env:
-      DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
-      DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
+      DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
+      DOCKER_TOKEN: ${{ secrets.DOCKER_TOKEN }}
+      DOCKER_REGISTRY: ${{ secrets.DOCKER_REGISTRY }}
+      DOCKER_IMAGE: ${{ secrets.DOCKER_IMAGE }}
     steps:
       - name: Checkout
         uses: actions/checkout@v3
@@ -39,35 +43,35 @@ jobs:
           path: LavalinkServer/build/libs/Lavalink.jar
 
       - name: Docker Meta
-        if: env.DOCKERHUB_USERNAME && env.DOCKERHUB_TOKEN
+        if: env.DOCKER_USERNAME && env.DOCKER_TOKEN && env.DOCKER_REGISTRY && env.DOCKER_IMAGE
         id: meta
         uses: docker/metadata-action@v4
         with:
-          images: |
-            fredboat/lavalink
+          images: ${{ env.DOCKER_IMAGE }}
           tags: |
             type=ref,event=branch
             type=ref,event=tag
             type=ref,event=pr
             type=sha,prefix=
 
       - name: Set up QEMU
-        if: env.DOCKERHUB_USERNAME && env.DOCKERHUB_TOKEN
+        if: env.DOCKER_USERNAME && env.DOCKER_TOKEN && env.DOCKER_REGISTRY && env.DOCKER_IMAGE
         uses: docker/setup-qemu-action@v2
 
       - name: Set up Docker Buildx
-        if: env.DOCKERHUB_USERNAME && env.DOCKERHUB_TOKEN
+        if: env.DOCKER_USERNAME && env.DOCKER_TOKEN && env.DOCKER_REGISTRY && env.DOCKER_IMAGE
         uses: docker/setup-buildx-action@v2
 
-      - name: Login to DockerHub
-        if: env.DOCKERHUB_USERNAME && env.DOCKERHUB_TOKEN
+      - name: Log in to docker registry
+        if: env.DOCKER_USERNAME && env.DOCKER_TOKEN && env.DOCKER_REGISTRY && env.DOCKER_IMAGE
         uses: docker/login-action@v2
         with:
-          username: ${{ env.DOCKERHUB_USERNAME }}
-          password: ${{ env.DOCKERHUB_TOKEN }}
+          registry: ${{ env.DOCKER_REGISTRY }}
+          username: ${{ env.DOCKER_USERNAME }}
+          password: ${{ env.DOCKER_TOKEN }}
 
       - name: Build and Push
-        if: env.DOCKERHUB_USERNAME && env.DOCKERHUB_TOKEN
+        if: env.DOCKER_USERNAME && env.DOCKER_TOKEN && env.DOCKER_REGISTRY && env.DOCKER_IMAGE
         uses: docker/build-push-action@v3
         with:
           file: LavalinkServer/docker/Dockerfile

.github/workflows/release.yml

@@ -8,8 +8,10 @@ jobs:
   build:
     uses: ./.github/workflows/build.yml
     secrets:
-      DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
-      DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
+      DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
+      DOCKER_TOKEN: ${{ secrets.DOCKER_TOKEN }}
+      DOCKER_REGISTRY: ${{ secrets.DOCKER_REGISTRY }}
+      DOCKER_IMAGE: ${{ secrets.DOCKER_IMAGE }}
 
   release:
     needs: build

IMPLEMENTATION.md

@@ -251,14 +251,16 @@ This event includes:
 * Unix timestamp in milliseconds.
 * Track position in milliseconds. Omitted if not playing anything.
 * `connected` is true when connected to the voice gateway.
+* `ping` represents the number of milliseconds between heartbeat and ack. Could be `-1` if not connected.
 ```json
 {
     "op": "playerUpdate",
     "guildId": "...",
     "state": {
         "time": 1500467109,
         "position": 60000,
-        "connected": true
+        "connected": true,
+        "ping": 0
     }
 }
 ```

LavalinkServer/src/main/java/lavalink/server/io/SocketServer.kt

@@ -61,8 +61,9 @@ class SocketServer(
             val json = JSONObject()
 
             val state = player.state
-            val connected = socketContext.getMediaConnection(player).gatewayConnection?.isOpen == true
-            state.put("connected", connected)
+            val connection = socketContext.getMediaConnection(player).gatewayConnection
+            state.put("connected", connection?.isOpen == true)
+            state.put("ping", connection?.ping ?: -1)
 
             json.put("op", "playerUpdate")
             json.put("guildId", player.guildId.toString())

LavalinkServer/src/main/java/lavalink/server/player/Player.java

@@ -103,7 +103,7 @@ public long getGuildId() {
 
     @Override
     public ISocketContext getSocketContext() {
-        return null;
+        return socketContext;
     }
 
     public void seekTo(long position) {

settings.gradle.kts

@@ -45,7 +45,7 @@ fun VersionCatalogBuilder.voice() {
     library("koe",          "moe.kyokobot.koe", "core").version("2.0.0-rc1")
     library("koe-udpqueue", "moe.kyokobot.koe", "ext-udpqueue").version("2.0.0-rc1")
 
-    version("udpqueue", "0.2.4")
+    version("udpqueue", "0.2.5")
     val platforms = listOf("linux-x86-64", "linux-x86", "linux-aarch64", "linux-arm", "win-x86-64", "win-x86", "darwin")
     platforms.forEach {
         library("udpqueue-native-$it", "club.minnced", "udpqueue-native-$it").versionRef("udpqueue")