feat. 完善服务器点歌功能

GregTaoo · GregTaoo · commit 451697b20ce1 · 2025-03-17T16:33:01.000+08:00
diff --git a/src/main/java/top/gregtao/concerto/config/ClientConfig.java b/src/main/java/top/gregtao/concerto/config/ClientConfig.java
@@ -45,6 +45,7 @@ public static class ClientConfigOptions {
         public boolean printRequestResults = false;
         public int maxCacheSize = 1000 * 1000 * 100;
         public boolean displayLyrics = true;
+        public boolean joinAgentWhenInvited = false;
         public String lyricsPosition = "0.5,1-70";
         public TextAlignment lyricsAlignment = TextAlignment.CENTER;
         public boolean displaySubLyrics = true;
diff --git a/src/main/java/top/gregtao/concerto/config/ServerConfig.java b/src/main/java/top/gregtao/concerto/config/ServerConfig.java
@@ -24,6 +24,8 @@ public void writeOptions() {
 
     public static class ServerConfigOptions {
         public boolean auditionRequired = true;
+        public boolean serverMusicAgent = true;
+        public boolean agentInviteWhenJoin = true;
         public int musicRoomCommandPermission = 2;
     }
 }
diff --git a/src/main/java/top/gregtao/concerto/http/HttpURLInputStream.java b/src/main/java/top/gregtao/concerto/http/HttpURLInputStream.java
@@ -6,6 +6,7 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.HttpURLConnection;
+import java.net.MalformedURLException;
 import java.net.URI;
 import java.net.URL;
 import java.util.function.Supplier;
@@ -45,6 +46,24 @@ public HttpURLInputStream(URL url) throws IOException {
         this(url, 0, null);
     }
 
+    public static int getTotalBytes(URL url) {
+        try(HttpURLInputStream stream = new HttpURLInputStream(url)) {
+            return stream.szBytes;
+        } catch (IOException e) {
+            ConcertoClient.LOGGER.error(e.getMessage());
+            return 0;
+        }
+    }
+
+    public static int getTotalBytes(String url) {
+        try {
+            return getTotalBytes(URI.create(url).toURL());
+        } catch (MalformedURLException e) {
+            ConcertoClient.LOGGER.error(e.getMessage());
+            return 0;
+        }
+    }
+
     private HttpURLConnection openNewConnection() throws IOException {
         HttpURLConnection conn = (HttpURLConnection) this.url.openConnection();
         conn.setConnectTimeout(5000);
diff --git a/src/main/java/top/gregtao/concerto/network/ClientMusicNetworkHandler.java b/src/main/java/top/gregtao/concerto/network/ClientMusicNetworkHandler.java
@@ -6,7 +6,9 @@
 import net.minecraft.client.network.ClientPlayerEntity;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.server.MinecraftServer;
+import net.minecraft.text.Style;
 import net.minecraft.text.Text;
+import net.minecraft.util.Formatting;
 import top.gregtao.concerto.ConcertoClient;
 import top.gregtao.concerto.api.MusicJsonParsers;
 import top.gregtao.concerto.command.ShareMusicCommand;
@@ -161,6 +163,19 @@ public static void playerJoinHandshake(ConcertoPayload payload, ClientPlayNetwor
             if (player != null && playerName.equals(player.getName().getString())) {
                 ConcertoClient.serverAvailable = true;
                 ConcertoClient.LOGGER.info("Concerto has been installed in this server");
+                if (args.length > 3 && args[3].equals("Invite")) {
+                    if (ClientConfig.INSTANCE.options.joinAgentWhenInvited) {
+                        player.networkHandler.sendChatCommand("/musicroom agent join");
+                    } else {
+                        player.sendMessage(TextUtil.PAGE_SPLIT, false);
+                        player.sendMessage(Text.translatable("concerto.agent.invite")
+                                .append(Text.literal("  ["))
+                                .append(Text.translatable("concerto.accept").setStyle(
+                                        TextUtil.getRunCommandStyle("/musicroom agent join").withColor(Formatting.GREEN)))
+                                .append(Text.literal("]")), false);
+                        player.sendMessage(TextUtil.PAGE_SPLIT, false);
+                    }
+                }
             }
         }
     }
diff --git a/src/main/java/top/gregtao/concerto/network/ServerMusicAgent.java b/src/main/java/top/gregtao/concerto/network/ServerMusicAgent.java
@@ -3,7 +3,11 @@
 import net.minecraft.server.network.ServerPlayerEntity;
 import net.minecraft.text.Text;
 import top.gregtao.concerto.ConcertoServer;
+import top.gregtao.concerto.api.DynamicPath;
+import top.gregtao.concerto.http.HttpURLInputStream;
 import top.gregtao.concerto.music.Music;
+import top.gregtao.concerto.music.SharedMusic;
+import top.gregtao.concerto.player.MusicPlayer;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -28,6 +32,9 @@ public class ServerMusicAgent {
     private ScheduledFuture<?> playNextFuture;
     private final ConcurrentLinkedQueue<Music> musicQueue = new ConcurrentLinkedQueue<>();
     private Music currentMusic = null;
+    private Music currentSharedMusic = null;
+    private int totalBytes = 0;
+    private long playTime = 0;
 
     private final AtomicBoolean isPlaying = new AtomicBoolean(false);
 
@@ -84,42 +91,68 @@ private synchronized void endVoting() {
             ConcertoServer.LOGGER.info("Vote: Keep current music");
         }
         Text text = success ? Text.translatable("concerto.agent.vote.success") : Text.translatable("concerto.agent.vote.failed");
-        this.members.forEach(player -> player.sendMessage(text, false));
+        this.broadcast(text);
 
         this.isVoting = false;
     }
 
     private synchronized void playNextMusic() {
         this.currentMusic = this.musicQueue.poll();
+        this.currentSharedMusic = null;
+        this.totalBytes = 0;
+        this.playTime = 0;
         if (this.currentMusic == null) {
             ConcertoServer.LOGGER.info("Music agent paused");
             this.isPlaying.set(false);
         } else {
             ConcertoServer.LOGGER.info("Start playing music {}", this.currentMusic.getMeta().title());
+            if (this.currentMusic instanceof DynamicPath dynamicPath) {
+                String path = dynamicPath.getLastRawPath();
+                if (path != null) this.totalBytes = HttpURLInputStream.getTotalBytes(path);
+                else {
+                    ConcertoServer.LOGGER.warn("Cannot play music {}", this.currentMusic.getMeta().title());
+                    this.broadcast(Text.translatable("concerto.agent.play.failed"));
+                    this.playNextFuture = this.musicScheduler.schedule(this::playNextMusic, 1, TimeUnit.SECONDS);
+                    return;
+                }
+                this.currentSharedMusic = new SharedMusic(path, this.currentMusic.getMeta(),
+                        dynamicPath.getLastLyrics(), dynamicPath.getLastSubLyrics());
+            } else {
+                this.currentSharedMusic = this.currentMusic;
+            }
             this.isPlaying.set(true);
-            ServerMusicNetworkHandler.musicAgentSendMusic(this.members, this.currentMusic, 0);
+            this.playTime = System.currentTimeMillis();
+            ServerMusicNetworkHandler.musicAgentSendMusic(this.members, this.currentSharedMusic, 0);
             this.playNextFuture = this.musicScheduler.schedule(this::playNextMusic,
                     this.currentMusic.getMeta().getDuration().asSeconds(), TimeUnit.SECONDS);
         }
     }
 
+    public void broadcast(Text text) {
+        this.members.forEach(player -> player.sendMessage(text, false));
+    }
+
     public synchronized boolean isMember(ServerPlayerEntity player) {
         return this.members.contains(player);
     }
 
     public synchronized void addMusic(Music music) {
-        ConcertoServer.LOGGER.info("Added music {}", music.getMeta().title());
-        this.musicQueue.offer(music);
-        if (!this.isPlaying.get()) {
-            this.playNextFuture = this.musicScheduler.schedule(this::playNextMusic, 1, TimeUnit.SECONDS);
-        }
+        MusicPlayer.run(() -> {
+            ConcertoServer.LOGGER.info("Added music {}", music.getMeta().title());
+            this.musicQueue.offer(music);
+            if (!this.isPlaying.get()) {
+                this.playNextFuture = this.musicScheduler.schedule(this::playNextMusic, 1, TimeUnit.SECONDS);
+            }
+        });
     }
 
     public synchronized void playerJoin(ServerPlayerEntity player) {
         ConcertoServer.LOGGER.info("Player {} joined music agent", player.getName().getString());
         this.members.add(player);
-        if (this.isPlaying.get() && this.currentMusic != null) {
-            ServerMusicNetworkHandler.musicAgentSendMusic(this.members, this.currentMusic, 0);
+        if (this.isPlaying.get() && this.currentSharedMusic != null) {
+            ServerMusicNetworkHandler.musicAgentSendMusic(player, this.currentSharedMusic,
+                    this.totalBytes * (System.currentTimeMillis() - this.playTime) /
+                            this.currentMusic.getMeta().getDuration().asMilliseconds());
         }
     }
 
@@ -141,7 +174,9 @@ public synchronized void reset() {
             this.playNextFuture.cancel(false);
         }
         this.musicQueue.clear();
-        this.currentMusic = null;
+        this.currentMusic = this.currentSharedMusic = null;
+        this.totalBytes = 0;
+        this.playTime = 0;
         this.isPlaying.set(false);
 
         ConcertoServer.LOGGER.info("Reset server music agent");
diff --git a/src/main/java/top/gregtao/concerto/network/ServerMusicNetworkHandler.java b/src/main/java/top/gregtao/concerto/network/ServerMusicNetworkHandler.java
@@ -204,7 +204,8 @@ public static void musicDataReceiver(ConcertoPayload payload, ServerPlayNetworki
 
     public static void playerJoinHandshake(ServerPlayerEntity player) {
         ConcertoPayload payload = new ConcertoPayload(ConcertoPayload.Channel.HANDSHAKE,
-                ConcertoNetworking.HANDSHAKE_STRING + "CallJoin:" + player.getName().getString());
+                ConcertoNetworking.HANDSHAKE_STRING + "CallJoin:" + player.getName().getString()
+                        + (ServerConfig.INSTANCE.options.agentInviteWhenJoin ? ":Invite" : ""));
         ServerPlayNetworking.send(player, payload);
         sendS2CAllAuditionData(player);
         sendS2CPresetRadiosPacket(player);
@@ -233,6 +234,10 @@ public static void musicAgentSendMusic(List<ServerPlayerEntity> players, Music m
     }
 
     public static void musicAgentReceiver(ConcertoPayload payload, ServerPlayNetworking.Context context) {
+        if (!ServerConfig.INSTANCE.options.serverMusicAgent) {
+            context.player().sendMessage(Text.translatable("concerto.agent.not_available"));
+            return;
+        }
         String[] args = payload.string.split(":");
         if (args[0].equals("Join")) {
             ServerMusicAgent.INSTANCE.playerJoin(context.player());
@@ -243,7 +248,8 @@ public static void musicAgentReceiver(ConcertoPayload payload, ServerPlayNetwork
         } else if (args[0].equals("Query")) {
             List<Music> list = ServerMusicAgent.INSTANCE.getMusicQueue();
             context.player().sendMessage(TextUtil.PAGE_SPLIT);
-            list.forEach(music -> context.player().sendMessage(Text.literal(music.getMeta().title())));
+            list.forEach(music -> context.player().sendMessage(Text.literal(
+                    music.getMeta().title() + " - " + music.getMeta().author())));
             context.player().sendMessage(TextUtil.PAGE_SPLIT);
         } else if (args.length < 2 || !ServerMusicAgent.INSTANCE.isMember(context.player())) {
             context.player().sendMessage(Text.translatable("concerto.agent.error"));
@@ -260,8 +266,8 @@ public static void musicAgentReceiver(ConcertoPayload payload, ServerPlayNetwork
                 context.player().sendMessage(Text.translatable("concerto.agent.error"));
             }
         } else if (args[0].equals("Add")) {
-            Music music = MusicJsonParsers.from(TextUtil.fromBase64(args[1]));
-            if (music != null && music.isLoaded()) {
+            Music music = MusicJsonParsers.from(TextUtil.fromBase64(args[1]), false);
+            if (music != null) {
                 ServerMusicAgent.INSTANCE.addMusic(music);
             } else {
                 context.player().sendMessage(Text.translatable("concerto.agent.error"));
diff --git a/src/main/java/top/gregtao/concerto/player/MusicPlayerHandler.java b/src/main/java/top/gregtao/concerto/player/MusicPlayerHandler.java
@@ -6,7 +6,6 @@
 import top.gregtao.concerto.api.CacheableMusic;
 import top.gregtao.concerto.api.LazyLoadable;
 import top.gregtao.concerto.api.MusicJsonParsers;
-import top.gregtao.concerto.music.SharedMusic;
 import top.gregtao.concerto.music.lyrics.Lyrics;
 import top.gregtao.concerto.music.meta.music.MusicMetaData;
 import top.gregtao.concerto.enums.OrderType;
@@ -154,8 +153,7 @@ private void removeMusic(int size) {
     public void updateDisplayTexts() {
         if (this.currentMeta != null) {
             this.displayTexts[2] = TextUtil.cutIfTooLong(this.currentMeta.title(), 50) + " | " +
-                    TextUtil.cutIfTooLong(this.currentMeta.author(), 40) + " | " + this.currentMeta.getSource() +
-                    (this.currentMusic instanceof SharedMusic ? ", " + Text.translatable("concerto.room").getString() : "");
+                    TextUtil.cutIfTooLong(this.currentMeta.author(), 40) + " | " + this.currentMeta.getSource();
             MusicTimestamp timestamp = this.currentMeta.getDuration();
             this.timeFormat = "%s" + (timestamp == null ? "" : " ".repeat(30) + this.currentMeta.getDuration().toShortString());
         } else {

Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,8 @@ public void writeOptions() {`
`24`	`24`
`25`	`25`	`public static class ServerConfigOptions {`
`26`	`26`	`public boolean auditionRequired = true;`
	`27`	`+ public boolean serverMusicAgent = true;`
	`28`	`+ public boolean agentInviteWhenJoin = true;`
`27`	`29`	`public int musicRoomCommandPermission = 2;`
`28`	`30`	`}`
`29`	`31`	`}`