From c0c290d3dc6ebda0eec44b89d0858b8dcbfc5a10 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Elias=20M=C3=BCller?= Date: Sun, 18 Oct 2026 12:46:59 +0200 Subject: [PATCH] Voice-Bridge: Plugin, Bridge-Dienst und Protokoll --- .gitignore | 8 + .gitmodules | 3 + bridge/build.gradle | 44 +++ bridge/config.example.yml | 50 +++ .../eu/mhsl/voicebridge/bridge/Bridge.java | 128 ++++++++ .../mhsl/voicebridge/bridge/BridgeConfig.java | 98 ++++++ .../java/eu/mhsl/voicebridge/bridge/Main.java | 25 ++ .../mhsl/voicebridge/bridge/PluginLink.java | 114 +++++++ .../java/eu/mhsl/voicebridge/bridge/Room.java | 131 ++++++++ .../bridge/audio/FrameSplitter.java | 26 ++ .../mhsl/voicebridge/bridge/audio/Mixer.java | 72 +++++ .../mhsl/voicebridge/bridge/audio/Opus.java | 67 ++++ .../bridge/discord/DiscordRoomBot.java | 190 ++++++++++++ .../bridge/teamspeak/TeamspeakRoomClient.java | 112 +++++++ .../bridge/teamspeak/TeamspeakSide.java | 289 ++++++++++++++++++ .../voicebridge/bridge/audio/MixerTest.java | 70 +++++ build.gradle | 23 ++ gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 43462 bytes gradle/wrapper/gradle-wrapper.properties | 7 + gradlew | 249 +++++++++++++++ gradlew.bat | 92 ++++++ plugin/build.gradle | 31 ++ .../mhsl/voicebridge/plugin/BridgeLink.java | 91 ++++++ .../voicebridge/plugin/BridgeVoicechat.java | 234 ++++++++++++++ .../voicebridge/plugin/CrosstalkRoom.java | 97 ++++++ .../voicebridge/plugin/VoiceBridgePlugin.java | 33 ++ plugin/src/main/resources/config.yml | 4 + plugin/src/main/resources/plugin.yml | 8 + protocol/build.gradle | 9 + .../eu/mhsl/voicebridge/protocol/Message.java | 25 ++ .../mhsl/voicebridge/protocol/Protocol.java | 98 ++++++ .../voicebridge/protocol/ProtocolTest.java | 46 +++ settings.gradle | 3 + third_party/ts3j | 1 + ts3j/build.gradle | 19 ++ 35 files changed, 2497 insertions(+) create mode 100644 .gitignore create mode 100644 .gitmodules create mode 100644 bridge/build.gradle create mode 100644 bridge/config.example.yml create mode 100644 bridge/src/main/java/eu/mhsl/voicebridge/bridge/Bridge.java create mode 100644 bridge/src/main/java/eu/mhsl/voicebridge/bridge/BridgeConfig.java create mode 100644 bridge/src/main/java/eu/mhsl/voicebridge/bridge/Main.java create mode 100644 bridge/src/main/java/eu/mhsl/voicebridge/bridge/PluginLink.java create mode 100644 bridge/src/main/java/eu/mhsl/voicebridge/bridge/Room.java create mode 100644 bridge/src/main/java/eu/mhsl/voicebridge/bridge/audio/FrameSplitter.java create mode 100644 bridge/src/main/java/eu/mhsl/voicebridge/bridge/audio/Mixer.java create mode 100644 bridge/src/main/java/eu/mhsl/voicebridge/bridge/audio/Opus.java create mode 100644 bridge/src/main/java/eu/mhsl/voicebridge/bridge/discord/DiscordRoomBot.java create mode 100644 bridge/src/main/java/eu/mhsl/voicebridge/bridge/teamspeak/TeamspeakRoomClient.java create mode 100644 bridge/src/main/java/eu/mhsl/voicebridge/bridge/teamspeak/TeamspeakSide.java create mode 100644 bridge/src/test/java/eu/mhsl/voicebridge/bridge/audio/MixerTest.java create mode 100644 build.gradle create mode 100644 gradle/wrapper/gradle-wrapper.jar create mode 100644 gradle/wrapper/gradle-wrapper.properties create mode 100755 gradlew create mode 100644 gradlew.bat create mode 100644 plugin/build.gradle create mode 100644 plugin/src/main/java/eu/mhsl/voicebridge/plugin/BridgeLink.java create mode 100644 plugin/src/main/java/eu/mhsl/voicebridge/plugin/BridgeVoicechat.java create mode 100644 plugin/src/main/java/eu/mhsl/voicebridge/plugin/CrosstalkRoom.java create mode 100644 plugin/src/main/java/eu/mhsl/voicebridge/plugin/VoiceBridgePlugin.java create mode 100644 plugin/src/main/resources/config.yml create mode 100644 plugin/src/main/resources/plugin.yml create mode 100644 protocol/build.gradle create mode 100644 protocol/src/main/java/eu/mhsl/voicebridge/protocol/Message.java create mode 100644 protocol/src/main/java/eu/mhsl/voicebridge/protocol/Protocol.java create mode 100644 protocol/src/test/java/eu/mhsl/voicebridge/protocol/ProtocolTest.java create mode 100644 settings.gradle create mode 160000 third_party/ts3j create mode 100644 ts3j/build.gradle diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..961f872 --- /dev/null +++ b/.gitignore @@ -0,0 +1,8 @@ +.gradle/ +build/ +*.iml +.idea/ +run/ +config.yml +!plugin/src/main/resources/config.yml +data/ diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..d685fcf --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "third_party/ts3j"] + path = third_party/ts3j + url = https://github.com/Manevolent/ts3j.git diff --git a/bridge/build.gradle b/bridge/build.gradle new file mode 100644 index 0000000..dff7198 --- /dev/null +++ b/bridge/build.gradle @@ -0,0 +1,44 @@ +apply plugin: 'application' +apply plugin: 'com.gradleup.shadow' + +dependencies { + implementation project(':protocol') + implementation project(':ts3j') + + implementation 'net.dv8tion:JDA:6.7.0' + // DAVE (Ende-zu-Ende-Verschlüsselung für Discord-Voice), braucht Java 25 + implementation 'club.minnced:jdave-api:0.1.8' + implementation 'club.minnced:jdave-native-linux-x86-64:0.1.8' + // Opus in reinem Java fürs Mischen + implementation 'io.github.jaredmdobson:concentus:1.0.2' + implementation 'org.yaml:snakeyaml:2.7' + implementation 'org.slf4j:slf4j-simple:2.0.17' + + testImplementation platform('org.junit:junit-bom:5.13.4') + testImplementation 'org.junit.jupiter:junit-jupiter' + testRuntimeOnly 'org.junit.platform:junit-platform-launcher' +} + +application { + mainClass = 'eu.mhsl.voicebridge.bridge.Main' + applicationDefaultJvmArgs = ['--enable-native-access=ALL-UNNAMED'] +} + +tasks.named('test') { + useJUnitPlatform() +} + +shadowJar { + archiveFileName = 'voice-bridge.jar' + mergeServiceFiles() + // Signaturen von BouncyCastle passen nach dem Zusammenfügen nicht mehr + exclude 'META-INF/*.SF', 'META-INF/*.DSA', 'META-INF/*.RSA' + manifest { + attributes 'Enable-Native-Access': 'ALL-UNNAMED' + } +} + +tasks.named('run') { + workingDir = rootProject.file('run/bridge') + doFirst { workingDir.mkdirs() } +} diff --git a/bridge/config.example.yml b/bridge/config.example.yml new file mode 100644 index 0000000..8c4354c --- /dev/null +++ b/bridge/config.example.yml @@ -0,0 +1,50 @@ +# Config des Bridge-Dienstes. Die echte config.yml enthält Bot-Tokens und Passwörter: +# niemals ins Repo (steht in .gitignore). + +plugin: + # Hier lauscht die Bridge auf das Paper-Plugin (UDP). + bind: 127.0.0.1 + port: 24470 + +# Ordner für die TeamSpeak-Identitäten (werden beim ersten Start erzeugt). +dataDir: data + +# Wie lange ein Raum bzw. ein Bot noch verbunden bleibt, nachdem er nicht mehr gebraucht wird. +lingerSeconds: 15 + +teamspeak: + # Leer lassen, um TeamSpeak abzuschalten. + host: ts.example.org + port: 9987 + password: "" + # Unter diesem Channel legt die Bridge fehlende Raum-Channels an (Channel-ID, 0 = oberste Ebene). + parentChannel: 0 + # Name des Beobachter-Clients, der die Channels im Blick behält. + nickname: "Crosstalk" + # Name der Raum-Clients; %room% wird durch den Raumnamen ersetzt. + roomNickname: "%room% (Minecraft/Discord)" + securityLevel: 8 + # Optional, falls der Server eine bestimmte Client-Version verlangt: + # clientVersion: + # platform: "Linux" + # version: "3.6.2 [Build: ...]" + # sign: "..." + +discord: + guild: "000000000000000000" + # In dieser Kategorie legt die Bridge fehlende Raum-Channels an (leer = ohne Kategorie). + category: "000000000000000000" + # Server-Nickname der Bots; %room% wird durch den Raumnamen ersetzt. + nickname: "%room% (Minecraft/TS)" + +rooms: + - key: crosstalk-1 + name: Crosstalk 1 + # Ein eigener Bot pro Raum (Discord erlaubt pro Bot nur einen Voice-Channel). Leer = ohne Discord. + discordToken: "" + # Optional feste Channels statt automatisch anlegen: + # discordChannel: "000000000000000000" + # teamspeakChannel: 0 + - key: crosstalk-2 + name: Crosstalk 2 + discordToken: "" diff --git a/bridge/src/main/java/eu/mhsl/voicebridge/bridge/Bridge.java b/bridge/src/main/java/eu/mhsl/voicebridge/bridge/Bridge.java new file mode 100644 index 0000000..1ce8192 --- /dev/null +++ b/bridge/src/main/java/eu/mhsl/voicebridge/bridge/Bridge.java @@ -0,0 +1,128 @@ +package eu.mhsl.voicebridge.bridge; + +import eu.mhsl.voicebridge.bridge.discord.DiscordRoomBot; +import eu.mhsl.voicebridge.bridge.teamspeak.TeamspeakSide; +import eu.mhsl.voicebridge.protocol.Message; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.io.IOException; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import java.util.concurrent.Executors; +import java.util.concurrent.ScheduledExecutorService; +import java.util.concurrent.TimeUnit; + +/** + * Steuert die Räume: jede Sekunde wird gezählt, wer auf welcher Seite ist. Ein Raum ist aktiv, sobald + * auf mindestens zwei Seiten jemand ist. Die Bots einer Seite verbinden sich nur, wenn der Raum aktiv + * ist und auf ihrer Seite jemand sitzt; danach bleiben sie noch {@code lingerSeconds} verbunden. + */ +public final class Bridge { + private static final Logger LOG = LoggerFactory.getLogger(Bridge.class); + + private final BridgeConfig config; + private final Map rooms = new LinkedHashMap<>(); + private final Map discordBots = new HashMap<>(); + private final Map presence = new HashMap<>(); + private final PluginLink plugin; + private final TeamspeakSide teamspeak; + private final ScheduledExecutorService ticker = Executors.newSingleThreadScheduledExecutor( + Thread.ofPlatform().name("bridge-tick").factory()); + + private volatile List roomInfos = List.of(); + + /** Zeitpunkte, bis zu denen Raum bzw. Bot noch gebraucht werden (für das Nachlaufen). */ + private static final class Presence { + long roomWanted, teamspeakWanted, discordWanted; + boolean teamspeakConnected, discordConnected; + } + + public Bridge(BridgeConfig config) throws IOException { + this.config = config; + for (BridgeConfig.RoomConfig roomConfig : config.rooms()) { + Room room = new Room(roomConfig); + rooms.put(room.key(), room); + presence.put(room.key(), new Presence()); + if (roomConfig.discordEnabled()) discordBots.put(room.key(), new DiscordRoomBot(config.discord(), room)); + } + this.plugin = new PluginLink(config.pluginBind(), config.pluginPort(), rooms, () -> roomInfos); + for (Room room : rooms.values()) room.setMinecraftSink(plugin::sendAudio); + this.teamspeak = config.teamspeak().enabled() + ? new TeamspeakSide(config.teamspeak(), config.dataDir(), List.copyOf(rooms.values())) + : null; + roomInfos = buildInfos(); + } + + public void start() { + LOG.info("Starte Bridge mit {} Räumen (TeamSpeak {}, Discord-Bots {})", rooms.size(), + teamspeak != null ? "an" : "aus", discordBots.size()); + plugin.start(); + if (teamspeak != null) teamspeak.start(); + discordBots.values().forEach(DiscordRoomBot::start); + ticker.scheduleAtFixedRate(this::safeTick, 1, 1, TimeUnit.SECONDS); + } + + private void safeTick() { + try { + tick(); + } catch (RuntimeException e) { + LOG.error("Fehler im Bridge-Takt", e); + } + } + + private void tick() { + long now = System.currentTimeMillis(); + long linger = config.lingerMillis(); + + for (Room room : rooms.values()) { + Presence p = presence.get(room.key()); + DiscordRoomBot bot = discordBots.get(room.key()); + int mc = plugin.minecraftMembers(room.key()); + int ts = teamspeak != null ? teamspeak.humansIn(room) : 0; + int dc = bot != null ? bot.humans() : 0; + int sides = (mc > 0 ? 1 : 0) + (ts > 0 ? 1 : 0) + (dc > 0 ? 1 : 0); + + if (sides >= 2) p.roomWanted = now; + boolean active = now - p.roomWanted < linger; + room.setActive(active); + + if (active && ts > 0) p.teamspeakWanted = now; + boolean tsConnect = active && now - p.teamspeakWanted < linger; + if (teamspeak != null && (tsConnect || p.teamspeakConnected)) { + teamspeak.setRoomConnected(room, tsConnect); + } + p.teamspeakConnected = tsConnect; + + if (active && dc > 0) p.discordWanted = now; + boolean dcConnect = active && now - p.discordWanted < linger; + if (bot != null && dcConnect != p.discordConnected) bot.setConnected(dcConnect); + p.discordConnected = dcConnect; + + room.dropIdleSources(); + } + roomInfos = buildInfos(); + } + + private List buildInfos() { + List infos = new ArrayList<>(rooms.size()); + for (Room room : rooms.values()) { + DiscordRoomBot bot = discordBots.get(room.key()); + infos.add(new Message.RoomInfo(room.key(), room.name(), room.groupId(), + teamspeak != null ? teamspeak.humansIn(room) : 0, + bot != null ? bot.humans() : 0, + room.active())); + } + return infos; + } + + public void stop() { + ticker.shutdownNow(); + plugin.close(); + if (teamspeak != null) teamspeak.stop(); + discordBots.values().forEach(DiscordRoomBot::stop); + } +} diff --git a/bridge/src/main/java/eu/mhsl/voicebridge/bridge/BridgeConfig.java b/bridge/src/main/java/eu/mhsl/voicebridge/bridge/BridgeConfig.java new file mode 100644 index 0000000..79bd649 --- /dev/null +++ b/bridge/src/main/java/eu/mhsl/voicebridge/bridge/BridgeConfig.java @@ -0,0 +1,98 @@ +package eu.mhsl.voicebridge.bridge; + +import org.yaml.snakeyaml.Yaml; + +import java.io.IOException; +import java.io.Reader; +import java.nio.file.Files; +import java.nio.file.Path; +import java.util.ArrayList; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; + +public record BridgeConfig( + String pluginBind, + int pluginPort, + Path dataDir, + long lingerMillis, + Teamspeak teamspeak, + Discord discord, + List rooms +) { + public record Teamspeak(String host, int port, String password, int parentChannel, String nickname, + String roomNickname, int securityLevel, ClientVersion clientVersion) { + public boolean enabled() { return !host.isBlank(); } + } + + public record ClientVersion(String platform, String version, String sign) {} + + public record Discord(String guild, String category, String nickname) {} + + public record RoomConfig(String key, String name, String discordToken, String discordChannel, + int teamspeakChannel) { + public boolean discordEnabled() { return !discordToken.isBlank(); } + } + + public static BridgeConfig load(Path file) throws IOException { + Map root; + try (Reader reader = Files.newBufferedReader(file)) { + root = new Yaml().load(reader); + } + if (root == null) throw new IOException(file + " ist leer"); + + Map plugin = section(root, "plugin"); + Map ts = section(root, "teamspeak"); + Map dc = section(root, "discord"); + + ClientVersion version = null; + if (ts.get("clientVersion") instanceof Map v) { + @SuppressWarnings("unchecked") Map cv = (Map) v; + version = new ClientVersion(string(cv, "platform", ""), string(cv, "version", ""), string(cv, "sign", "")); + } + + List rooms = new ArrayList<>(); + Set keys = new HashSet<>(); + if (root.get("rooms") instanceof List list) { + for (Object entry : list) { + if (!(entry instanceof Map raw)) continue; + @SuppressWarnings("unchecked") Map room = (Map) raw; + String key = string(room, "key", ""); + if (key.isBlank()) throw new IOException("Raum ohne key in " + file); + if (!keys.add(key)) throw new IOException("Raum-key doppelt: " + key); + rooms.add(new RoomConfig(key, string(room, "name", key), string(room, "discordToken", ""), + string(room, "discordChannel", ""), integer(room, "teamspeakChannel", 0))); + } + } + + return new BridgeConfig( + string(plugin, "bind", "127.0.0.1"), + integer(plugin, "port", 24470), + Path.of(string(root, "dataDir", "data")), + integer(root, "lingerSeconds", 15) * 1000L, + new Teamspeak(string(ts, "host", ""), integer(ts, "port", 9987), string(ts, "password", ""), + integer(ts, "parentChannel", 0), string(ts, "nickname", "Crosstalk"), + string(ts, "roomNickname", "%room% (Minecraft/Discord)"), integer(ts, "securityLevel", 8), version), + new Discord(string(dc, "guild", ""), string(dc, "category", ""), + string(dc, "nickname", "%room% (Minecraft/TS)")), + List.copyOf(rooms)); + } + + @SuppressWarnings("unchecked") + private static Map section(Map map, String key) { + return map.get(key) instanceof Map m ? (Map) m : Map.of(); + } + + private static String string(Map map, String key, String def) { + Object value = map.get(key); + return value == null ? def : value.toString().trim(); + } + + private static int integer(Map map, String key, int def) { + Object value = map.get(key); + if (value == null) return def; + if (value instanceof Number n) return n.intValue(); + return Integer.parseInt(value.toString().trim()); + } +} diff --git a/bridge/src/main/java/eu/mhsl/voicebridge/bridge/Main.java b/bridge/src/main/java/eu/mhsl/voicebridge/bridge/Main.java new file mode 100644 index 0000000..1b3316a --- /dev/null +++ b/bridge/src/main/java/eu/mhsl/voicebridge/bridge/Main.java @@ -0,0 +1,25 @@ +package eu.mhsl.voicebridge.bridge; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.nio.file.Files; +import java.nio.file.Path; + +public final class Main { + private static final Logger LOG = LoggerFactory.getLogger(Main.class); + + private Main() {} + + public static void main(String[] args) throws Exception { + Path configFile = Path.of(args.length > 0 ? args[0] : "config.yml"); + if (!Files.exists(configFile)) { + LOG.error("{} fehlt. Vorlage: bridge/config.example.yml", configFile.toAbsolutePath()); + System.exit(1); + } + + Bridge bridge = new Bridge(BridgeConfig.load(configFile)); + Runtime.getRuntime().addShutdownHook(new Thread(bridge::stop, "shutdown")); + bridge.start(); + } +} diff --git a/bridge/src/main/java/eu/mhsl/voicebridge/bridge/PluginLink.java b/bridge/src/main/java/eu/mhsl/voicebridge/bridge/PluginLink.java new file mode 100644 index 0000000..845eeff --- /dev/null +++ b/bridge/src/main/java/eu/mhsl/voicebridge/bridge/PluginLink.java @@ -0,0 +1,114 @@ +package eu.mhsl.voicebridge.bridge; + +import eu.mhsl.voicebridge.protocol.Message; +import eu.mhsl.voicebridge.protocol.Protocol; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.io.IOException; +import java.net.DatagramPacket; +import java.net.DatagramSocket; +import java.net.InetSocketAddress; +import java.net.SocketAddress; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.UUID; +import java.util.concurrent.ConcurrentHashMap; +import java.util.function.Supplier; + +/** UDP-Gegenstelle zum Paper-Plugin. Das Plugin meldet sich jede Sekunde mit einem Hello. */ +final class PluginLink { + private static final Logger LOG = LoggerFactory.getLogger(PluginLink.class); + private static final long ALIVE_MILLIS = 5000; + + private final DatagramSocket socket; + private final Map rooms; + private final Supplier> roomInfos; + private final Map minecraftMembers = new ConcurrentHashMap<>(); + + private volatile SocketAddress plugin; + private volatile long lastHello; + private boolean warnedVersion; + + PluginLink(String bind, int port, Map rooms, Supplier> roomInfos) + throws IOException { + this.socket = new DatagramSocket(new InetSocketAddress(bind, port)); + this.rooms = rooms; + this.roomInfos = roomInfos; + } + + void start() { + Thread.ofPlatform().daemon().name("plugin-link").start(this::receiveLoop); + LOG.info("Warte auf das Paper-Plugin auf {}", socket.getLocalSocketAddress()); + } + + boolean alive() { + return System.currentTimeMillis() - lastHello < ALIVE_MILLIS; + } + + int minecraftMembers(String room) { + return alive() ? minecraftMembers.getOrDefault(room, 0) : 0; + } + + void sendAudio(String room, UUID source, byte[] opus) { + SocketAddress target = plugin; + if (target == null || !alive()) return; + send(new Message.Audio(room, source, opus), target); + } + + private void send(Message message, SocketAddress target) { + byte[] data = Protocol.encode(message); + try { + socket.send(new DatagramPacket(data, data.length, target)); + } catch (IOException e) { + if (!socket.isClosed()) LOG.debug("Senden ans Plugin fehlgeschlagen: {}", e.getMessage()); + } + } + + private void receiveLoop() { + byte[] buffer = new byte[Protocol.MAX_DATAGRAM]; + DatagramPacket packet = new DatagramPacket(buffer, buffer.length); + while (!socket.isClosed()) { + try { + packet.setLength(buffer.length); + socket.receive(packet); + handle(Protocol.decode(packet.getData(), packet.getOffset(), packet.getLength()), + packet.getSocketAddress()); + } catch (IOException e) { + if (!socket.isClosed()) LOG.warn("Ungültiges Paket vom Plugin: {}", e.getMessage()); + } catch (RuntimeException e) { + LOG.warn("Fehler beim Verarbeiten eines Plugin-Pakets", e); + } + } + } + + private void handle(Message message, SocketAddress from) { + switch (message) { + case Message.Hello hello -> { + if (hello.version() != Protocol.VERSION) { + if (!warnedVersion) LOG.error("Plugin spricht Protokoll {}, Bridge {}: bitte beide aktualisieren", + hello.version(), Protocol.VERSION); + warnedVersion = true; + return; + } + if (!alive() || !from.equals(plugin)) LOG.info("Paper-Plugin verbunden von {}", from); + plugin = from; + lastHello = System.currentTimeMillis(); + minecraftMembers.clear(); + minecraftMembers.putAll(hello.members()); + send(new Message.Rooms(new ArrayList<>(roomInfos.get())), from); + } + case Message.Audio audio -> { + if (!from.equals(plugin)) return; + Room room = rooms.get(audio.room()); + if (room != null) room.fromMinecraft(audio.source(), audio.opus()); + } + case Message.Rooms ignored -> {} + } + } + + void close() { + socket.close(); + } +} diff --git a/bridge/src/main/java/eu/mhsl/voicebridge/bridge/Room.java b/bridge/src/main/java/eu/mhsl/voicebridge/bridge/Room.java new file mode 100644 index 0000000..f29997f --- /dev/null +++ b/bridge/src/main/java/eu/mhsl/voicebridge/bridge/Room.java @@ -0,0 +1,131 @@ +package eu.mhsl.voicebridge.bridge; + +import eu.mhsl.voicebridge.bridge.audio.FrameSplitter; +import eu.mhsl.voicebridge.bridge.audio.Mixer; +import eu.mhsl.voicebridge.bridge.audio.Opus; +import io.github.jaredmdobson.concentus.OpusDecoder; +import io.github.jaredmdobson.concentus.OpusEncoder; +import io.github.jaredmdobson.concentus.OpusException; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.nio.charset.StandardCharsets; +import java.util.List; +import java.util.Map; +import java.util.UUID; +import java.util.concurrent.ConcurrentHashMap; + +/** + * Ein Crosstalk-Raum aus drei Seiten. Jede Seite bekommt das Audio der beiden anderen: + * Discord und TeamSpeak je einen gemischten Stream, Minecraft jeden Sprecher einzeln. + */ +public final class Room { + private static final Logger LOG = LoggerFactory.getLogger(Room.class); + private static final long SOURCE_IDLE_MILLIS = 5000; + + public enum Side { MINECRAFT, TEAMSPEAK, DISCORD } + + private final BridgeConfig.RoomConfig config; + private final UUID groupId; + private final Mixer toTeamspeak = new Mixer(); + private final Mixer toDiscord = new Mixer(); + private final Map sources = new ConcurrentHashMap<>(); + + /** Wohin Frames für Minecraft gehen (Plugin-Verbindung). */ + private volatile MinecraftSink minecraft = (room, source, opus) -> {}; + + private volatile boolean active; + + public interface MinecraftSink { + void send(String room, UUID source, byte[] opus); + } + + /** Ein Sprecher: eigener Decoder (Opus ist zustandsbehaftet) und für Minecraft ein eigener Encoder. */ + private final class Source { + final Side side; + final String key; + final UUID uuid; + final OpusDecoder decoder = Opus.decoder(); + final FrameSplitter splitter = new FrameSplitter(); + OpusEncoder minecraftEncoder; + volatile long lastSeen; + + Source(Side side, String key) { + this.side = side; + this.key = key; + this.uuid = UUID.nameUUIDFromBytes(("voicebridge:" + config.key() + ":" + key).getBytes(StandardCharsets.UTF_8)); + } + } + + public Room(BridgeConfig.RoomConfig config) { + this.config = config; + this.groupId = UUID.nameUUIDFromBytes(("voicebridge-group:" + config.key()).getBytes(StandardCharsets.UTF_8)); + } + + public BridgeConfig.RoomConfig config() { return config; } + public String key() { return config.key(); } + public String name() { return config.name(); } + public UUID groupId() { return groupId; } + public boolean active() { return active; } + public Mixer toTeamspeak() { return toTeamspeak; } + public Mixer toDiscord() { return toDiscord; } + + public void setMinecraftSink(MinecraftSink sink) { this.minecraft = sink; } + + void setActive(boolean active) { + if (this.active == active) return; + this.active = active; + if (!active) { + toTeamspeak.clear(); + toDiscord.clear(); + sources.clear(); + } + LOG.info("{}: {}", name(), active ? "aktiv" : "inaktiv"); + } + + public void fromMinecraft(UUID player, byte[] opus) { + receive(Side.MINECRAFT, "mc:" + player, opus); + } + + public void fromTeamspeak(int clientId, byte[] opus) { + receive(Side.TEAMSPEAK, "ts:" + clientId, opus); + } + + public void fromDiscord(long userId, byte[] opus) { + receive(Side.DISCORD, "dc:" + userId, opus); + } + + private void receive(Side side, String key, byte[] opus) { + if (!active || opus.length == 0) return; + Source source = sources.computeIfAbsent(key, k -> new Source(side, k)); + source.lastSeen = System.currentTimeMillis(); + + List frames; + try { + frames = source.splitter.push(Opus.decode(source.decoder, opus)); + } catch (OpusException e) { + LOG.debug("{}: Opus-Paket von {} nicht dekodierbar: {}", name(), key, e.getMessage()); + return; + } + + for (short[] frame : frames) { + if (side != Side.TEAMSPEAK) toTeamspeak.push(key, frame); + if (side != Side.DISCORD) toDiscord.push(key, frame); + if (side != Side.MINECRAFT) sendToMinecraft(source, frame); + } + } + + private void sendToMinecraft(Source source, short[] frame) { + try { + if (source.minecraftEncoder == null) source.minecraftEncoder = Opus.encoder(1, 48000); + minecraft.send(key(), source.uuid, Opus.encodeMono(source.minecraftEncoder, frame)); + } catch (OpusException e) { + LOG.debug("{}: Kodieren für Minecraft fehlgeschlagen: {}", name(), e.getMessage()); + } + } + + void dropIdleSources() { + long now = System.currentTimeMillis(); + sources.values().removeIf(source -> now - source.lastSeen > SOURCE_IDLE_MILLIS); + } +} diff --git a/bridge/src/main/java/eu/mhsl/voicebridge/bridge/audio/FrameSplitter.java b/bridge/src/main/java/eu/mhsl/voicebridge/bridge/audio/FrameSplitter.java new file mode 100644 index 0000000..7f24218 --- /dev/null +++ b/bridge/src/main/java/eu/mhsl/voicebridge/bridge/audio/FrameSplitter.java @@ -0,0 +1,26 @@ +package eu.mhsl.voicebridge.bridge.audio; + +import java.util.ArrayList; +import java.util.List; + +/** Zerlegt dekodiertes PCM beliebiger Länge in Frames zu genau 20 ms. */ +public final class FrameSplitter { + private final short[] pending = new short[Opus.FRAME_SAMPLES]; + private int filled; + + public List push(short[] pcm) { + List frames = new ArrayList<>(pcm.length / Opus.FRAME_SAMPLES + 1); + int offset = 0; + while (offset < pcm.length) { + int take = Math.min(Opus.FRAME_SAMPLES - filled, pcm.length - offset); + System.arraycopy(pcm, offset, pending, filled, take); + filled += take; + offset += take; + if (filled == Opus.FRAME_SAMPLES) { + frames.add(pending.clone()); + filled = 0; + } + } + return frames; + } +} diff --git a/bridge/src/main/java/eu/mhsl/voicebridge/bridge/audio/Mixer.java b/bridge/src/main/java/eu/mhsl/voicebridge/bridge/audio/Mixer.java new file mode 100644 index 0000000..e00e187 --- /dev/null +++ b/bridge/src/main/java/eu/mhsl/voicebridge/bridge/audio/Mixer.java @@ -0,0 +1,72 @@ +package eu.mhsl.voicebridge.bridge.audio; + +import java.util.ArrayDeque; +import java.util.HashMap; +import java.util.Iterator; +import java.util.Map; + +/** + * Mischt die Sprecher für eine Ausgabe (Discord- oder TS-Bot), die alle 20 ms einen Frame abholt. + * Jeder Sprecher hat einen kleinen Jitter-Puffer: abgespielt wird erst ab {@link #PRIME} Frames, + * über {@link #MAX} Frames werden die ältesten verworfen, damit die Verzögerung nicht wächst. + */ +public final class Mixer { + static final int PRIME = 2; + static final int MAX = 8; + private static final long IDLE_MILLIS = 2000; + + private static final class Queue { + final ArrayDeque frames = new ArrayDeque<>(); + boolean playing; + long lastPush; + } + + private final Map queues = new HashMap<>(); + + public synchronized void push(String source, short[] frame) { + Queue queue = queues.computeIfAbsent(source, k -> new Queue()); + queue.frames.addLast(frame); + while (queue.frames.size() > MAX) queue.frames.removeFirst(); + queue.lastPush = System.currentTimeMillis(); + } + + public synchronized boolean ready() { + for (Queue queue : queues.values()) { + if (queue.playing ? !queue.frames.isEmpty() : queue.frames.size() >= PRIME) return true; + } + return false; + } + + /** Nächster gemischter Frame, oder {@code null}, wenn gerade niemand spricht. */ + public synchronized short[] pull() { + int[] sum = null; + long now = System.currentTimeMillis(); + Iterator it = queues.values().iterator(); + while (it.hasNext()) { + Queue queue = it.next(); + if (!queue.playing && queue.frames.size() >= PRIME) queue.playing = true; + if (!queue.playing) { + if (queue.frames.isEmpty() && now - queue.lastPush > IDLE_MILLIS) it.remove(); + continue; + } + short[] frame = queue.frames.pollFirst(); + if (frame == null) { + queue.playing = false; + continue; + } + if (sum == null) sum = new int[Opus.FRAME_SAMPLES]; + for (int i = 0; i < Opus.FRAME_SAMPLES; i++) sum[i] += frame[i]; + } + if (sum == null) return null; + + short[] out = new short[Opus.FRAME_SAMPLES]; + for (int i = 0; i < Opus.FRAME_SAMPLES; i++) { + out[i] = (short) Math.max(Short.MIN_VALUE, Math.min(Short.MAX_VALUE, sum[i])); + } + return out; + } + + public synchronized void clear() { + queues.clear(); + } +} diff --git a/bridge/src/main/java/eu/mhsl/voicebridge/bridge/audio/Opus.java b/bridge/src/main/java/eu/mhsl/voicebridge/bridge/audio/Opus.java new file mode 100644 index 0000000..978172d --- /dev/null +++ b/bridge/src/main/java/eu/mhsl/voicebridge/bridge/audio/Opus.java @@ -0,0 +1,67 @@ +package eu.mhsl.voicebridge.bridge.audio; + +import io.github.jaredmdobson.concentus.OpusApplication; +import io.github.jaredmdobson.concentus.OpusDecoder; +import io.github.jaredmdobson.concentus.OpusEncoder; +import io.github.jaredmdobson.concentus.OpusException; +import io.github.jaredmdobson.concentus.OpusSignal; + +import java.util.Arrays; + +/** Alles läuft intern mit 48 kHz mono in Frames zu 20 ms. */ +public final class Opus { + public static final int SAMPLE_RATE = 48000; + public static final int FRAME_SAMPLES = 960; + /** Längstes Opus-Paket: 120 ms. */ + private static final int MAX_PACKET_SAMPLES = 5760; + private static final int MAX_PACKET_BYTES = 1275; + + private Opus() {} + + public static OpusDecoder decoder() { + try { + return new OpusDecoder(SAMPLE_RATE, 1); + } catch (OpusException e) { + throw new IllegalStateException(e); + } + } + + /** Encoder für Sprache, mono oder stereo. */ + public static OpusEncoder encoder(int channels, int bitrate) { + try { + OpusEncoder encoder = new OpusEncoder(SAMPLE_RATE, channels, OpusApplication.OPUS_APPLICATION_VOIP); + encoder.setBitrate(bitrate); + encoder.setSignalType(OpusSignal.OPUS_SIGNAL_VOICE); + encoder.setComplexity(5); + return encoder; + } catch (OpusException e) { + throw new IllegalStateException(e); + } + } + + /** Dekodiert ein Paket zu PCM (mono); leere Pakete ergeben ein leeres Array. */ + public static short[] decode(OpusDecoder decoder, byte[] packet) throws OpusException { + if (packet.length == 0) return new short[0]; + short[] pcm = new short[MAX_PACKET_SAMPLES]; + int samples = decoder.decode(packet, 0, packet.length, pcm, 0, MAX_PACKET_SAMPLES, false); + return Arrays.copyOf(pcm, samples); + } + + public static byte[] encodeMono(OpusEncoder encoder, short[] frame) throws OpusException { + byte[] out = new byte[MAX_PACKET_BYTES]; + int length = encoder.encode(frame, 0, FRAME_SAMPLES, out, 0, out.length); + return Arrays.copyOf(out, length); + } + + /** Für Discord: mono auf beide Kanäle verteilen. */ + public static byte[] encodeStereo(OpusEncoder encoder, short[] frame) throws OpusException { + short[] stereo = new short[FRAME_SAMPLES * 2]; + for (int i = 0; i < FRAME_SAMPLES; i++) { + stereo[2 * i] = frame[i]; + stereo[2 * i + 1] = frame[i]; + } + byte[] out = new byte[MAX_PACKET_BYTES]; + int length = encoder.encode(stereo, 0, FRAME_SAMPLES, out, 0, out.length); + return Arrays.copyOf(out, length); + } +} diff --git a/bridge/src/main/java/eu/mhsl/voicebridge/bridge/discord/DiscordRoomBot.java b/bridge/src/main/java/eu/mhsl/voicebridge/bridge/discord/DiscordRoomBot.java new file mode 100644 index 0000000..53fffa9 --- /dev/null +++ b/bridge/src/main/java/eu/mhsl/voicebridge/bridge/discord/DiscordRoomBot.java @@ -0,0 +1,190 @@ +package eu.mhsl.voicebridge.bridge.discord; + +import club.minnced.discord.jdave.interop.JDaveSessionFactory; +import eu.mhsl.voicebridge.bridge.BridgeConfig; +import eu.mhsl.voicebridge.bridge.Room; +import eu.mhsl.voicebridge.bridge.audio.Opus; +import io.github.jaredmdobson.concentus.OpusEncoder; +import io.github.jaredmdobson.concentus.OpusException; +import net.dv8tion.jda.api.JDA; +import net.dv8tion.jda.api.JDABuilder; +import net.dv8tion.jda.api.audio.AudioModuleConfig; +import net.dv8tion.jda.api.audio.AudioReceiveHandler; +import net.dv8tion.jda.api.audio.AudioSendHandler; +import net.dv8tion.jda.api.audio.OpusPacket; +import net.dv8tion.jda.api.entities.Guild; +import net.dv8tion.jda.api.entities.Member; +import net.dv8tion.jda.api.entities.channel.concrete.Category; +import net.dv8tion.jda.api.entities.channel.concrete.VoiceChannel; +import net.dv8tion.jda.api.managers.AudioManager; +import net.dv8tion.jda.api.requests.GatewayIntent; +import net.dv8tion.jda.api.utils.MemberCachePolicy; +import net.dv8tion.jda.api.utils.cache.CacheFlag; +import org.jetbrains.annotations.NotNull; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.nio.ByteBuffer; +import java.util.concurrent.CompletableFuture; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; + +/** + * Ein Discord-Bot pro Raum (ein Bot kann pro Server nur in einem Voice-Channel sein). + * Der Bot ist dauerhaft am Gateway, sieht so wer im Channel ist, und tritt nur bei Bedarf bei. + */ +public final class DiscordRoomBot implements AudioSendHandler, AudioReceiveHandler { + private static final Logger LOG = LoggerFactory.getLogger(DiscordRoomBot.class); + + private final BridgeConfig.Discord config; + private final Room room; + private final OpusEncoder encoder = Opus.encoder(2, 64000); + private final ExecutorService executor; + + private volatile JDA jda; + private volatile Guild guild; + private volatile long channelId; + private volatile boolean joined; + + public DiscordRoomBot(BridgeConfig.Discord config, Room room) { + this.config = config; + this.room = room; + this.executor = Executors.newSingleThreadExecutor( + Thread.ofPlatform().daemon().name("discord-" + room.key()).factory()); + } + + public void start() { + CompletableFuture.runAsync(this::login, executor).exceptionally(e -> { + LOG.error("{}: Discord-Bot konnte nicht starten: {}", room.name(), e.toString()); + return null; + }); + } + + private void login() { + try { + jda = JDABuilder.createLight(room.config().discordToken(), GatewayIntent.GUILD_VOICE_STATES) + .enableCache(CacheFlag.VOICE_STATE) + .setMemberCachePolicy(MemberCachePolicy.VOICE) + .setAudioModuleConfig(new AudioModuleConfig().withDaveSessionFactory(new JDaveSessionFactory())) + .build() + .awaitReady(); + } catch (InterruptedException e) { + Thread.currentThread().interrupt(); + return; + } + + guild = jda.getGuildById(config.guild()); + if (guild == null) { + LOG.error("{}: Bot {} ist nicht auf dem Discord-Server {}", room.name(), jda.getSelfUser().getName(), config.guild()); + return; + } + VoiceChannel channel = resolveChannel(guild); + channelId = channel.getIdLong(); + LOG.info("{}: Discord-Bot {} bereit, Channel #{}", room.name(), jda.getSelfUser().getName(), channel.getName()); + + String nickname = config.nickname().replace("%room%", room.name()); + if (!nickname.equals(guild.getSelfMember().getNickname())) { + guild.getSelfMember().modifyNickname(nickname).queue(null, + e -> LOG.debug("{}: Nickname nicht gesetzt: {}", room.name(), e.getMessage())); + } + } + + private VoiceChannel resolveChannel(Guild guild) { + String configured = room.config().discordChannel(); + if (!configured.isBlank()) { + VoiceChannel channel = guild.getVoiceChannelById(configured); + if (channel == null) throw new IllegalStateException("Voice-Channel " + configured + " gibt es nicht"); + return channel; + } + + Category category = config.category().isBlank() ? null : guild.getCategoryById(config.category()); + if (!config.category().isBlank() && category == null) { + throw new IllegalStateException("Kategorie " + config.category() + " gibt es nicht"); + } + for (VoiceChannel channel : category != null ? category.getVoiceChannels() : guild.getVoiceChannels()) { + if (channel.getName().equals(room.name()) && (category != null || channel.getParentCategory() == null)) { + return channel; + } + } + LOG.info("{}: lege Discord-Voice-Channel an", room.name()); + return category != null + ? category.createVoiceChannel(room.name()).complete() + : guild.createVoiceChannel(room.name()).complete(); + } + + /** Menschen im Raum-Channel (Bots zählen nicht). */ + public int humans() { + Guild guild = this.guild; + if (guild == null || channelId == 0) return 0; + VoiceChannel channel = guild.getVoiceChannelById(channelId); + if (channel == null) return 0; + int count = 0; + for (Member member : channel.getMembers()) if (!member.getUser().isBot()) count++; + return count; + } + + public void setConnected(boolean connected) { + Guild guild = this.guild; + if (guild == null || connected == joined) return; + joined = connected; + AudioManager audio = guild.getAudioManager(); + if (connected) { + VoiceChannel channel = guild.getVoiceChannelById(channelId); + if (channel == null) return; + audio.setSendingHandler(this); + audio.setReceivingHandler(this); + audio.setSelfDeafened(false); + audio.setSelfMuted(false); + audio.openAudioConnection(channel); + LOG.info("{}: Discord-Bot betritt #{}", room.name(), channel.getName()); + } else { + audio.closeAudioConnection(); + LOG.info("{}: Discord-Bot verlässt den Channel", room.name()); + } + } + + public void stop() { + JDA jda = this.jda; + if (jda != null) jda.shutdown(); + executor.shutdownNow(); + } + + // --- Senden: JDA fragt alle 20 ms --- + + @Override + public boolean canProvide() { + return room.toDiscord().ready(); + } + + @Override + public ByteBuffer provide20MsAudio() { + short[] frame = room.toDiscord().pull(); + if (frame == null) return null; + try { + return ByteBuffer.wrap(Opus.encodeStereo(encoder, frame)); + } catch (OpusException e) { + return null; + } + } + + @Override + public boolean isOpus() { + return true; + } + + // --- Empfangen: Opus pro User, bereits entschlüsselt --- + + @Override + public boolean canReceiveEncoded() { + return true; + } + + @Override + public void handleEncodedAudio(@NotNull OpusPacket packet) { + Guild guild = this.guild; + if (guild == null) return; + Member member = guild.getMemberById(packet.getUserId()); + if (member != null && member.getUser().isBot()) return; + room.fromDiscord(packet.getUserId(), packet.getOpusAudio()); + } +} diff --git a/bridge/src/main/java/eu/mhsl/voicebridge/bridge/teamspeak/TeamspeakRoomClient.java b/bridge/src/main/java/eu/mhsl/voicebridge/bridge/teamspeak/TeamspeakRoomClient.java new file mode 100644 index 0000000..83a4173 --- /dev/null +++ b/bridge/src/main/java/eu/mhsl/voicebridge/bridge/teamspeak/TeamspeakRoomClient.java @@ -0,0 +1,112 @@ +package eu.mhsl.voicebridge.bridge.teamspeak; + +import com.github.manevolent.ts3j.audio.Microphone; +import com.github.manevolent.ts3j.enums.CodecType; +import com.github.manevolent.ts3j.event.DisconnectedEvent; +import com.github.manevolent.ts3j.event.TS3Listener; +import com.github.manevolent.ts3j.identity.LocalIdentity; +import com.github.manevolent.ts3j.protocol.packet.PacketBody0Voice; +import com.github.manevolent.ts3j.protocol.socket.client.LocalTeamspeakClientSocket; +import eu.mhsl.voicebridge.bridge.BridgeConfig; +import eu.mhsl.voicebridge.bridge.Room; +import eu.mhsl.voicebridge.bridge.audio.Opus; +import io.github.jaredmdobson.concentus.OpusEncoder; +import io.github.jaredmdobson.concentus.OpusException; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.net.InetSocketAddress; +import java.util.function.Consumer; + +/** Ein TS-Client im Raum-Channel: spielt die Mischung aus Minecraft und Discord ab und hört zu. */ +final class TeamspeakRoomClient implements Microphone, TS3Listener { + private static final Logger LOG = LoggerFactory.getLogger(TeamspeakRoomClient.class); + + private final BridgeConfig.Teamspeak config; + private final Room room; + private final int channel; + private final LocalTeamspeakClientSocket socket; + private final Consumer onLost; + private final OpusEncoder encoder = Opus.encoder(1, 48000); + private volatile boolean closing; + + TeamspeakRoomClient(BridgeConfig.Teamspeak config, Room room, int channel, LocalIdentity identity, + Consumer onLost) { + this.config = config; + this.room = room; + this.channel = channel; + this.onLost = onLost; + this.socket = newSocket(config, identity, config.roomNickname().replace("%room%", room.name())); + socket.addListener(this); + socket.setVoiceHandler(this::onVoice); + socket.setWhisperHandler(packet -> {}); + socket.setMicrophone(this); + } + + static LocalTeamspeakClientSocket newSocket(BridgeConfig.Teamspeak config, LocalIdentity identity, String nickname) { + LocalTeamspeakClientSocket socket = new LocalTeamspeakClientSocket(); + socket.setIdentity(identity); + socket.setNickname(nickname); + BridgeConfig.ClientVersion version = config.clientVersion(); + if (version != null) socket.setClientVersion(version.platform(), version.version(), version.sign()); + socket.setExceptionHandler(e -> LOG.debug("ts3j: {}", e.toString())); + return socket; + } + + void connect() throws Exception { + socket.connect(new InetSocketAddress(config.host(), config.port()), + TeamspeakSide.emptyToNull(config.password()), 15000L); + socket.joinChannel(channel, null); + } + + int clientId() { + return socket.getClientId(); + } + + void disconnect() { + closing = true; + try { + socket.disconnect(); + } catch (Exception ignored) { + // Verbindung ist ohnehin weg + } + } + + private void onVoice(PacketBody0Voice packet) { + CodecType codec = packet.getCodecType(); + if (codec != CodecType.OPUS_VOICE && codec != CodecType.OPUS_MUSIC) return; + byte[] data = packet.getCodecData(); + if (data == null || data.length == 0) return; + room.fromTeamspeak(packet.getClientId(), data); + } + + @Override + public void onDisconnected(DisconnectedEvent e) { + if (closing) return; + LOG.warn("{}: TeamSpeak-Client vom Server getrennt", room.name()); + onLost.accept(this); + } + + // --- Microphone: ts3j fragt alle 20 ms --- + + @Override + public boolean isReady() { + return room.toTeamspeak().ready(); + } + + @Override + public CodecType getCodec() { + return CodecType.OPUS_VOICE; + } + + @Override + public byte[] provide() { + short[] frame = room.toTeamspeak().pull(); + if (frame == null) return new byte[0]; + try { + return Opus.encodeMono(encoder, frame); + } catch (OpusException e) { + return new byte[0]; + } + } +} diff --git a/bridge/src/main/java/eu/mhsl/voicebridge/bridge/teamspeak/TeamspeakSide.java b/bridge/src/main/java/eu/mhsl/voicebridge/bridge/teamspeak/TeamspeakSide.java new file mode 100644 index 0000000..d8c9126 --- /dev/null +++ b/bridge/src/main/java/eu/mhsl/voicebridge/bridge/teamspeak/TeamspeakSide.java @@ -0,0 +1,289 @@ +package eu.mhsl.voicebridge.bridge.teamspeak; + +import com.github.manevolent.ts3j.command.SingleCommand; +import com.github.manevolent.ts3j.command.parameter.CommandSingleParameter; +import com.github.manevolent.ts3j.event.ChannelCreateEvent; +import com.github.manevolent.ts3j.event.ChannelDeletedEvent; +import com.github.manevolent.ts3j.event.ChannelEditedEvent; +import com.github.manevolent.ts3j.event.ChannelListEvent; +import com.github.manevolent.ts3j.event.ChannelMovedEvent; +import com.github.manevolent.ts3j.event.ClientJoinEvent; +import com.github.manevolent.ts3j.event.ClientLeaveEvent; +import com.github.manevolent.ts3j.event.ClientMovedEvent; +import com.github.manevolent.ts3j.event.DisconnectedEvent; +import com.github.manevolent.ts3j.event.TS3Listener; +import com.github.manevolent.ts3j.identity.LocalIdentity; +import com.github.manevolent.ts3j.protocol.ProtocolRole; +import com.github.manevolent.ts3j.protocol.socket.client.LocalTeamspeakClientSocket; +import eu.mhsl.voicebridge.bridge.BridgeConfig; +import eu.mhsl.voicebridge.bridge.Room; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.io.IOException; +import java.net.InetSocketAddress; +import java.nio.file.Files; +import java.nio.file.Path; +import java.security.GeneralSecurityException; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.Executors; +import java.util.concurrent.ScheduledExecutorService; +import java.util.concurrent.TimeUnit; + +/** + * TeamSpeak-Anbindung. Ein Beobachter-Client bleibt dauerhaft verbunden, sieht so alle Clients und + * Channels und legt fehlende Raum-Channels an. Pro aktivem Raum verbindet sich zusätzlich ein + * {@link TeamspeakRoomClient}, der im Raum-Channel spricht und zuhört. + */ +public final class TeamspeakSide implements TS3Listener { + private static final Logger LOG = LoggerFactory.getLogger(TeamspeakSide.class); + private static final long RECONNECT_SECONDS = 30; + /** client_type 0 = normaler Client, 1 = ServerQuery. */ + private static final int CLIENT_TYPE_VOICE = 0; + + private record TsClient(int channel, int type) {} + private record TsChannel(int parent, String name) {} + + private final BridgeConfig.Teamspeak config; + private final Path dataDir; + private final List rooms; + private final ScheduledExecutorService executor = Executors.newSingleThreadScheduledExecutor( + Thread.ofPlatform().daemon().name("teamspeak").factory()); + + private final Map clients = new ConcurrentHashMap<>(); + private final Map channels = new ConcurrentHashMap<>(); + private final Map roomChannels = new ConcurrentHashMap<>(); + private final Map roomClients = new ConcurrentHashMap<>(); + + private volatile LocalTeamspeakClientSocket observer; + private volatile boolean ready; + + public TeamspeakSide(BridgeConfig.Teamspeak config, Path dataDir, List rooms) { + this.config = config; + this.dataDir = dataDir; + this.rooms = rooms; + } + + public void start() { + executor.execute(this::connectObserver); + } + + public boolean ready() { + return ready; + } + + /** Menschen im Raum-Channel, ohne unsere eigenen Clients und ohne ServerQuery. */ + public int humansIn(Room room) { + Integer channel = roomChannels.get(room.key()); + if (!ready || channel == null) return 0; + Set own = ownClientIds(); + int count = 0; + for (Map.Entry e : clients.entrySet()) { + TsClient client = e.getValue(); + if (client.channel() == channel && client.type() == CLIENT_TYPE_VOICE && !own.contains(e.getKey())) count++; + } + return count; + } + + /** Raum-Client verbinden oder trennen. Läuft asynchron, mehrfaches Aufrufen schadet nicht. */ + public void setRoomConnected(Room room, boolean connected) { + executor.execute(() -> { + TeamspeakRoomClient client = roomClients.get(room.key()); + if (connected && client == null && ready) { + Integer channel = roomChannels.get(room.key()); + if (channel == null) return; + try { + client = new TeamspeakRoomClient(config, room, channel, + loadIdentity("ts-" + room.key() + ".ini"), this::onRoomClientLost); + roomClients.put(room.key(), client); + client.connect(); + LOG.info("{}: TeamSpeak-Client im Channel {}", room.name(), channel); + } catch (Exception e) { + LOG.warn("{}: TeamSpeak-Client konnte nicht verbinden: {}", room.name(), e.toString()); + roomClients.remove(room.key()); + if (client != null) client.disconnect(); + } + } else if (!connected && client != null) { + roomClients.remove(room.key()); + client.disconnect(); + LOG.info("{}: TeamSpeak-Client getrennt", room.name()); + } + }); + } + + private void onRoomClientLost(TeamspeakRoomClient client) { + executor.execute(() -> roomClients.values().remove(client)); + } + + private Set ownClientIds() { + Set own = new HashSet<>(); + LocalTeamspeakClientSocket socket = observer; + if (socket != null) own.add(socket.getClientId()); + for (TeamspeakRoomClient client : roomClients.values()) own.add(client.clientId()); + return own; + } + + private void connectObserver() { + try { + LocalTeamspeakClientSocket socket = TeamspeakRoomClient.newSocket(config, loadIdentity("ts-observer.ini"), + config.nickname()); + socket.addListener(this); + observer = socket; + socket.connect(new InetSocketAddress(config.host(), config.port()), emptyToNull(config.password()), 15000L); + LOG.info("TeamSpeak verbunden mit {}:{} ({} Channels, {} Clients sichtbar)", + config.host(), config.port(), channels.size(), clients.size()); + resolveChannels(socket); + if (config.parentChannel() > 0) socket.joinChannel(config.parentChannel(), null); + ready = true; + } catch (Exception e) { + LOG.warn("TeamSpeak-Verbindung fehlgeschlagen ({}), neuer Versuch in {} s", e.toString(), RECONNECT_SECONDS); + disconnectObserver(); + executor.schedule(this::connectObserver, RECONNECT_SECONDS, TimeUnit.SECONDS); + } + } + + private void resolveChannels(LocalTeamspeakClientSocket socket) throws Exception { + for (Room room : rooms) { + int configured = room.config().teamspeakChannel(); + if (configured > 0) { + roomChannels.put(room.key(), configured); + continue; + } + Integer found = findChannel(room.name()); + if (found == null) { + socket.executeCommand(new SingleCommand("channelcreate", ProtocolRole.CLIENT, + new CommandSingleParameter("channel_name", room.name()), + new CommandSingleParameter("cpid", Integer.toString(config.parentChannel())), + new CommandSingleParameter("channel_flag_permanent", "1"), + new CommandSingleParameter("channel_codec", "4"))).get(); + // Die Antwort enthält die cid nicht, sie kommt per notifychannelcreated. + for (int i = 0; i < 50 && found == null; i++) { + Thread.sleep(100); + found = findChannel(room.name()); + } + if (found == null) throw new IOException("Channel " + room.name() + " wurde nicht angelegt"); + LOG.info("TeamSpeak-Channel angelegt: {} ({})", room.name(), found); + } + roomChannels.put(room.key(), found); + } + } + + private Integer findChannel(String name) { + for (Map.Entry e : channels.entrySet()) { + if (e.getValue().parent() == config.parentChannel() && e.getValue().name().equals(name)) return e.getKey(); + } + return null; + } + + private void disconnectObserver() { + ready = false; + LocalTeamspeakClientSocket socket = observer; + observer = null; + if (socket != null) { + try { + socket.disconnect(); + } catch (Exception ignored) { + // Verbindung ist ohnehin weg + } + } + for (TeamspeakRoomClient client : roomClients.values()) client.disconnect(); + roomClients.clear(); + clients.clear(); + channels.clear(); + } + + LocalIdentity loadIdentity(String file) throws IOException, GeneralSecurityException { + Path path = dataDir.resolve(file); + if (Files.exists(path)) return LocalIdentity.read(path.toFile()); + Files.createDirectories(dataDir); + LOG.info("Erzeuge TeamSpeak-Identität {} (Security-Level {})", file, config.securityLevel()); + LocalIdentity identity = LocalIdentity.generateNew(config.securityLevel()); + identity.save(path.toFile()); + return identity; + } + + static String emptyToNull(String value) { + return value == null || value.isEmpty() ? null : value; + } + + public void stop() { + executor.shutdownNow(); + disconnectObserver(); + } + + // --- Ereignisse des Beobachters --- + + @Override + public void onClientJoin(ClientJoinEvent e) { + clients.put(e.getClientId(), new TsClient(e.getClientTargetId(), e.getClientType())); + } + + @Override + public void onClientMoved(ClientMovedEvent e) { + clients.compute(e.getClientId(), (id, old) -> + new TsClient(e.getTargetChannelId(), old == null ? CLIENT_TYPE_VOICE : old.type())); + } + + @Override + public void onClientLeave(ClientLeaveEvent e) { + clients.remove(e.getClientId()); + } + + @Override + public void onChannelList(ChannelListEvent e) { + putChannel(e.getMap()); + } + + @Override + public void onChannelCreate(ChannelCreateEvent e) { + putChannel(e.getMap()); + } + + @Override + public void onChannelEdit(ChannelEditedEvent e) { + Map map = e.getMap(); + String name = map.get("channel_name"); + int cid = parse(map.get("cid"), -1); + if (name != null && cid >= 0) channels.computeIfPresent(cid, (id, old) -> new TsChannel(old.parent(), name)); + } + + @Override + public void onChannelMoved(ChannelMovedEvent e) { + Map map = e.getMap(); + int cid = parse(map.get("cid"), -1); + int parent = parse(map.get("cpid"), 0); + channels.computeIfPresent(cid, (id, old) -> new TsChannel(parent, old.name())); + } + + @Override + public void onChannelDeleted(ChannelDeletedEvent e) { + channels.remove(e.getChannelId()); + roomChannels.values().removeIf(cid -> cid == e.getChannelId()); + } + + @Override + public void onDisconnected(DisconnectedEvent e) { + LOG.warn("TeamSpeak-Beobachter getrennt, neuer Versuch in {} s", RECONNECT_SECONDS); + executor.execute(this::disconnectObserver); + executor.schedule(this::connectObserver, RECONNECT_SECONDS, TimeUnit.SECONDS); + } + + private void putChannel(Map map) { + int cid = parse(map.get("cid"), -1); + if (cid < 0) return; + channels.put(cid, new TsChannel(parse(map.get("cpid"), 0), map.getOrDefault("channel_name", ""))); + } + + private static int parse(String value, int def) { + if (value == null) return def; + try { + return Integer.parseInt(value.trim()); + } catch (NumberFormatException e) { + return def; + } + } +} diff --git a/bridge/src/test/java/eu/mhsl/voicebridge/bridge/audio/MixerTest.java b/bridge/src/test/java/eu/mhsl/voicebridge/bridge/audio/MixerTest.java new file mode 100644 index 0000000..bf287be --- /dev/null +++ b/bridge/src/test/java/eu/mhsl/voicebridge/bridge/audio/MixerTest.java @@ -0,0 +1,70 @@ +package eu.mhsl.voicebridge.bridge.audio; + +import org.junit.jupiter.api.Test; + +import java.util.Arrays; +import java.util.List; + +import static org.junit.jupiter.api.Assertions.*; + +class MixerTest { + + private static short[] frame(int value) { + short[] frame = new short[Opus.FRAME_SAMPLES]; + Arrays.fill(frame, (short) value); + return frame; + } + + @Test + void waitsForJitterBufferThenMixes() { + Mixer mixer = new Mixer(); + mixer.push("a", frame(100)); + assertFalse(mixer.ready()); + assertNull(mixer.pull()); + + mixer.push("a", frame(100)); + mixer.push("b", frame(50)); + mixer.push("b", frame(50)); + assertTrue(mixer.ready()); + assertEquals(150, mixer.pull()[0]); + assertEquals(150, mixer.pull()[0]); + assertNull(mixer.pull()); + } + + @Test + void clipsInsteadOfOverflowing() { + Mixer mixer = new Mixer(); + for (String source : List.of("a", "b")) { + mixer.push(source, frame(30000)); + mixer.push(source, frame(30000)); + } + assertEquals(Short.MAX_VALUE, mixer.pull()[0]); + } + + @Test + void dropsOldestFramesWhenBehind() { + Mixer mixer = new Mixer(); + for (int i = 0; i < Mixer.MAX + 5; i++) mixer.push("a", frame(i)); + assertEquals(5, mixer.pull()[0]); + } + + @Test + void splitterProducesExactFrames() { + FrameSplitter splitter = new FrameSplitter(); + assertEquals(0, splitter.push(new short[500]).size()); + assertEquals(1, splitter.push(new short[500]).size()); + assertEquals(2, splitter.push(new short[1920]).size()); + } + + @Test + void opusRoundTrip() throws Exception { + short[] tone = new short[Opus.FRAME_SAMPLES]; + for (int i = 0; i < tone.length; i++) tone[i] = (short) (8000 * Math.sin(i * 2 * Math.PI * 440 / Opus.SAMPLE_RATE)); + byte[] packet = Opus.encodeMono(Opus.encoder(1, 48000), tone); + assertTrue(packet.length > 0); + assertEquals(Opus.FRAME_SAMPLES, Opus.decode(Opus.decoder(), packet).length); + + byte[] stereo = Opus.encodeStereo(Opus.encoder(2, 64000), tone); + assertEquals(Opus.FRAME_SAMPLES, Opus.decode(Opus.decoder(), stereo).length); + } +} diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..7b408ef --- /dev/null +++ b/build.gradle @@ -0,0 +1,23 @@ +plugins { + id 'com.gradleup.shadow' version '9.6.1' apply false +} + +subprojects { + apply plugin: 'java-library' + + group = 'eu.mhsl.voicebridge' + version = '0.1.0' + + repositories { + mavenCentral() + } + + java { + toolchain.languageVersion = JavaLanguageVersion.of(25) + } + + tasks.withType(JavaCompile).configureEach { + options.encoding = 'UTF-8' + options.release.set(25) + } +} diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..d64cd4917707c1f8861d8cb53dd15194d4248596 GIT binary patch literal 43462 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 literal 0 HcmV?d00001 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..a351597 --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,7 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-9.6.1-bin.zip +networkTimeout=10000 +validateDistributionUrl=true +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100755 index 0000000..1aa94a4 --- /dev/null +++ b/gradlew @@ -0,0 +1,249 @@ +#!/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/HEAD/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 + +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit + +# 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 + if ! command -v java >/dev/null 2>&1 + then + 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 +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + 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 + + +# 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"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# 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..93e3f59 --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,92 @@ +@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=. +@rem This is normally unused +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% equ 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% equ 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! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/plugin/build.gradle b/plugin/build.gradle new file mode 100644 index 0000000..8d3e350 --- /dev/null +++ b/plugin/build.gradle @@ -0,0 +1,31 @@ +repositories { + maven { + name = 'papermc' + url = 'https://repo.papermc.io/repository/maven-public/' + } + maven { + name = 'henkelmax' + url = 'https://maven.maxhenkel.de/repository/public' + } +} + +dependencies { + // Paper 26.3 auf dem Server, gebaut gegen die 26.2-API wie die anderen Plugins + compileOnly 'io.papermc.paper:paper-api:26.2.build.129-stable' + // Simple Voice Chat 2.6.24 auf dem Server + compileOnly 'de.maxhenkel.voicechat:voicechat-api:2.6.0' + implementation project(':protocol') +} + +processResources { + inputs.property 'version', project.version + filesMatching('plugin.yml') { + expand version: project.version + } +} + +jar { + archiveFileName = 'voice-bridge.jar' + dependsOn ':protocol:jar' + from(project(':protocol').sourceSets.main.output) +} diff --git a/plugin/src/main/java/eu/mhsl/voicebridge/plugin/BridgeLink.java b/plugin/src/main/java/eu/mhsl/voicebridge/plugin/BridgeLink.java new file mode 100644 index 0000000..608a5e9 --- /dev/null +++ b/plugin/src/main/java/eu/mhsl/voicebridge/plugin/BridgeLink.java @@ -0,0 +1,91 @@ +package eu.mhsl.voicebridge.plugin; + +import eu.mhsl.voicebridge.protocol.Message; +import eu.mhsl.voicebridge.protocol.Protocol; + +import java.io.IOException; +import java.net.DatagramPacket; +import java.net.DatagramSocket; +import java.net.InetSocketAddress; +import java.net.SocketException; +import java.util.Map; +import java.util.UUID; +import java.util.function.Consumer; +import java.util.logging.Level; +import java.util.logging.Logger; + +/** UDP-Verbindung zum Bridge-Dienst. Das Plugin meldet sich jede Sekunde, die Bridge antwortet. */ +final class BridgeLink { + private static final long ALIVE_MILLIS = 5000; + + private final InetSocketAddress bridge; + private final Logger logger; + private final Consumer handler; + private final DatagramSocket socket; + private final Thread receiver; + + private volatile long lastReply; + private volatile boolean wasAlive; + + BridgeLink(InetSocketAddress bridge, Logger logger, Consumer handler) throws SocketException { + this.bridge = bridge; + this.logger = logger; + this.handler = handler; + this.socket = new DatagramSocket(); + this.receiver = Thread.ofPlatform().daemon().name("VoiceBridge-Link").unstarted(this::receiveLoop); + } + + void start() { + receiver.start(); + } + + boolean isBridgeAlive() { + return System.currentTimeMillis() - lastReply < ALIVE_MILLIS; + } + + void sendHello(Map members) { + boolean alive = isBridgeAlive(); + if (wasAlive && !alive) logger.warning("Bridge antwortet nicht mehr."); + wasAlive = alive; + send(new Message.Hello(Protocol.VERSION, members)); + } + + void sendAudio(String room, UUID player, byte[] opus) { + send(new Message.Audio(room, player, opus)); + } + + private void send(Message message) { + byte[] data = Protocol.encode(message); + try { + socket.send(new DatagramPacket(data, data.length, bridge)); + } catch (IOException e) { + if (!socket.isClosed()) logger.log(Level.FINE, "Senden an die Bridge fehlgeschlagen", e); + } + } + + private void receiveLoop() { + byte[] buffer = new byte[Protocol.MAX_DATAGRAM]; + DatagramPacket packet = new DatagramPacket(buffer, buffer.length); + while (!socket.isClosed()) { + try { + packet.setLength(buffer.length); + socket.receive(packet); + if (!packet.getAddress().equals(bridge.getAddress()) || packet.getPort() != bridge.getPort()) continue; + Message message = Protocol.decode(packet.getData(), packet.getOffset(), packet.getLength()); + if (message instanceof Message.Rooms) { + if (!isBridgeAlive()) logger.info("Bridge verbunden."); + lastReply = System.currentTimeMillis(); + } + handler.accept(message); + } catch (IOException e) { + if (!socket.isClosed()) logger.log(Level.WARNING, "Ungültiges Paket von der Bridge", e); + } catch (RuntimeException e) { + logger.log(Level.WARNING, "Fehler beim Verarbeiten eines Bridge-Pakets", e); + } + } + } + + void close() { + socket.close(); + } +} diff --git a/plugin/src/main/java/eu/mhsl/voicebridge/plugin/BridgeVoicechat.java b/plugin/src/main/java/eu/mhsl/voicebridge/plugin/BridgeVoicechat.java new file mode 100644 index 0000000..b92cd2f --- /dev/null +++ b/plugin/src/main/java/eu/mhsl/voicebridge/plugin/BridgeVoicechat.java @@ -0,0 +1,234 @@ +package eu.mhsl.voicebridge.plugin; + +import de.maxhenkel.voicechat.api.Group; +import de.maxhenkel.voicechat.api.VoicechatConnection; +import de.maxhenkel.voicechat.api.VoicechatPlugin; +import de.maxhenkel.voicechat.api.VoicechatServerApi; +import de.maxhenkel.voicechat.api.events.CreateGroupEvent; +import de.maxhenkel.voicechat.api.events.EventRegistration; +import de.maxhenkel.voicechat.api.events.JoinGroupEvent; +import de.maxhenkel.voicechat.api.events.MicrophonePacketEvent; +import de.maxhenkel.voicechat.api.events.VoicechatServerStartedEvent; +import de.maxhenkel.voicechat.api.events.VoicechatServerStoppedEvent; +import eu.mhsl.voicebridge.protocol.Message; +import net.kyori.adventure.text.Component; +import net.kyori.adventure.text.format.NamedTextColor; +import org.bukkit.Bukkit; +import org.bukkit.entity.Player; +import org.bukkit.scheduler.BukkitTask; + +import java.net.InetSocketAddress; +import java.net.SocketException; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.UUID; +import java.util.concurrent.ConcurrentHashMap; + +/** + * Hängt sich in Simple Voice Chat: legt die Crosstalk-Gruppen an, schickt das Mikrofon-Audio + * ihrer Mitglieder an die Bridge und spielt das Audio von Discord/TeamSpeak in der Gruppe ab. + */ +final class BridgeVoicechat implements VoicechatPlugin { + static final String CATEGORY = "voicebridge"; + + private final VoiceBridgePlugin plugin; + private final InetSocketAddress bridgeAddress; + + /** Räume nach Schlüssel und nach Gruppen-ID. Wird nur auf dem Main-Thread verändert. */ + private final Map rooms = new ConcurrentHashMap<>(); + private final Map roomsByGroup = new ConcurrentHashMap<>(); + + private volatile VoicechatServerApi api; + private volatile BridgeLink link; + private BukkitTask tickTask; + + BridgeVoicechat(VoiceBridgePlugin plugin, InetSocketAddress bridgeAddress) { + this.plugin = plugin; + this.bridgeAddress = bridgeAddress; + } + + @Override + public String getPluginId() { + return "voicebridge"; + } + + @Override + public void registerEvents(EventRegistration registration) { + registration.registerEvent(VoicechatServerStartedEvent.class, e -> start(e.getVoicechat())); + registration.registerEvent(VoicechatServerStoppedEvent.class, e -> stop()); + registration.registerEvent(MicrophonePacketEvent.class, this::onMicrophone); + registration.registerEvent(JoinGroupEvent.class, this::onJoinGroup); + registration.registerEvent(CreateGroupEvent.class, this::onCreateGroup); + } + + private void start(VoicechatServerApi api) { + this.api = api; + api.registerVolumeCategory(api.volumeCategoryBuilder() + .setId(CATEGORY) + .setName("Discord/TeamSpeak") + .setDescription("Lautstärke der Leute aus Discord und TeamSpeak in Crosstalk-Gruppen") + .build()); + try { + link = new BridgeLink(bridgeAddress, plugin.getLogger(), this::onBridgeMessage); + link.start(); + } catch (SocketException e) { + plugin.getLogger().severe("UDP-Socket zur Bridge ging nicht auf: " + e.getMessage()); + return; + } + Bukkit.getScheduler().runTask(plugin, () -> + tickTask = Bukkit.getScheduler().runTaskTimer(plugin, this::tick, 20L, 20L)); + plugin.getLogger().info("VoiceBridge spricht mit der Bridge auf " + bridgeAddress); + } + + void stop() { + if (tickTask != null) { + tickTask.cancel(); + tickTask = null; + } + if (link != null) { + link.close(); + link = null; + } + } + + /** Main-Thread, jede Sekunde: Mitglieder einsammeln, Herzschlag an die Bridge. */ + private void tick() { + VoicechatServerApi api = this.api; + BridgeLink link = this.link; + if (api == null || link == null) return; + + Map> byGroup = new HashMap<>(); + for (Player player : Bukkit.getOnlinePlayers()) { + VoicechatConnection connection = api.getConnectionOf(player.getUniqueId()); + if (connection == null || !connection.isConnected() || connection.isDisabled()) continue; + Group group = connection.getGroup(); + if (group == null || !roomsByGroup.containsKey(group.getId())) continue; + byGroup.computeIfAbsent(group.getId(), k -> new ArrayList<>()).add(connection); + } + + Map counts = new HashMap<>(); + for (CrosstalkRoom room : rooms.values()) { + List members = byGroup.getOrDefault(room.groupId(), List.of()); + room.setMembers(members); + room.dropIdleSpeakers(); + counts.put(room.key(), members.size()); + } + link.sendHello(counts); + } + + /** Netzwerk-Thread der Bridge-Verbindung. */ + private void onBridgeMessage(Message message) { + switch (message) { + case Message.Rooms update -> Bukkit.getScheduler().runTask(plugin, () -> syncRooms(update.rooms())); + case Message.Audio audio -> { + CrosstalkRoom room = rooms.get(audio.room()); + if (room != null) room.play(audio.source(), audio.opus()); + } + case Message.Hello ignored -> {} + } + } + + /** Main-Thread: Gruppen an die Räume der Bridge angleichen. */ + private void syncRooms(List infos) { + VoicechatServerApi api = this.api; + if (api == null) return; + + Map wanted = new HashMap<>(); + for (Message.RoomInfo info : infos) wanted.put(info.key(), info); + + for (CrosstalkRoom room : List.copyOf(rooms.values())) { + Message.RoomInfo info = wanted.get(room.key()); + if (info == null || !info.name().equals(room.name()) || !info.groupId().equals(room.groupId())) { + removeRoom(room); + } + } + + for (Message.RoomInfo info : infos) { + CrosstalkRoom room = rooms.get(info.key()); + if (room == null) { + // api.getGroup() liefert für unbekannte IDs eine leere Hülle statt null + Group group = api.getGroups().stream() + .filter(g -> g.getId().equals(info.groupId())) + .findFirst().orElse(null); + if (group == null || !group.getName().equals(info.name())) { + if (group != null) api.removeGroup(group.getId()); + group = api.groupBuilder() + .setId(info.groupId()) + .setName(info.name()) + .setPersistent(true) + .setType(Group.Type.NORMAL) + .build(); + } + room = new CrosstalkRoom(api, info.key(), info.name(), group.getId()); + rooms.put(room.key(), room); + roomsByGroup.put(room.groupId(), room); + plugin.getLogger().info("Crosstalk-Gruppe bereit: " + info.name()); + } + room.setInfo(info); + } + } + + private void removeRoom(CrosstalkRoom room) { + rooms.remove(room.key()); + roomsByGroup.remove(room.groupId()); + room.dropAllSpeakers(); + if (api != null) api.removeGroup(room.groupId()); + plugin.getLogger().info("Crosstalk-Gruppe entfernt: " + room.name()); + } + + /** Voicechat-Thread. */ + private void onMicrophone(MicrophonePacketEvent event) { + BridgeLink link = this.link; + VoicechatConnection sender = event.getSenderConnection(); + if (link == null || sender == null) return; + Group group = sender.getGroup(); + if (group == null) return; + CrosstalkRoom room = roomsByGroup.get(group.getId()); + if (room == null || !room.active() || !link.isBridgeAlive()) return; + link.sendAudio(room.key(), sender.getPlayer().getUuid(), event.getPacket().getOpusEncodedData()); + } + + private void onJoinGroup(JoinGroupEvent event) { + CrosstalkRoom room = roomsByGroup.get(event.getGroup().getId()); + if (room == null) return; + UUID playerId = event.getConnection().getPlayer().getUuid(); + BridgeLink link = this.link; + boolean alive = link != null && link.isBridgeAlive(); + + Bukkit.getScheduler().runTask(plugin, () -> { + Player player = Bukkit.getPlayer(playerId); + if (player == null) return; + player.sendMessage(Component.text(room.name() + " ist mit Discord und TeamSpeak verbunden. " + + "Was du hier sagst, hören auch alle im gleichnamigen Channel dort.", NamedTextColor.GOLD)); + Message.RoomInfo info = room.info(); + if (!alive) { + player.sendMessage(Component.text("Die Verbindung zur Bridge ist gerade getrennt.", NamedTextColor.RED)); + } else if (info != null) { + player.sendMessage(Component.text("Gerade dort: " + info.teamspeak() + " im TeamSpeak, " + + info.discord() + " im Discord.", NamedTextColor.GRAY)); + } + }); + } + + private void onCreateGroup(CreateGroupEvent event) { + VoicechatConnection connection = event.getConnection(); + Group group = event.getGroup(); + if (connection == null || group == null) return; + boolean reserved = rooms.values().stream() + .anyMatch(room -> room.name().equalsIgnoreCase(group.getName()) + && !Objects.equals(room.groupId(), group.getId())); + if (!reserved) return; + + event.cancel(); + UUID playerId = connection.getPlayer().getUuid(); + Bukkit.getScheduler().runTask(plugin, () -> { + Player player = Bukkit.getPlayer(playerId); + if (player != null) player.sendMessage(Component.text( + "Der Name ist für die Crosstalk-Gruppe reserviert. Tritt einfach der bestehenden bei.", + NamedTextColor.RED)); + }); + } +} diff --git a/plugin/src/main/java/eu/mhsl/voicebridge/plugin/CrosstalkRoom.java b/plugin/src/main/java/eu/mhsl/voicebridge/plugin/CrosstalkRoom.java new file mode 100644 index 0000000..68c84e2 --- /dev/null +++ b/plugin/src/main/java/eu/mhsl/voicebridge/plugin/CrosstalkRoom.java @@ -0,0 +1,97 @@ +package eu.mhsl.voicebridge.plugin; + +import de.maxhenkel.voicechat.api.VoicechatConnection; +import de.maxhenkel.voicechat.api.VoicechatServerApi; +import de.maxhenkel.voicechat.api.audiochannel.StaticAudioChannel; +import eu.mhsl.voicebridge.protocol.Message; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.UUID; + +/** + * Eine Crosstalk-Gruppe im Spiel. Jeder externe Sprecher (Discord-User, TS-Client) bekommt einen + * eigenen {@link StaticAudioChannel} an alle Gruppenmitglieder; gemischt wird im Client. + */ +final class CrosstalkRoom { + private static final long SPEAKER_IDLE_MILLIS = 1000; + + private final VoicechatServerApi api; + private final String key; + private final String name; + private final UUID groupId; + + private final Map speakers = new HashMap<>(); + private List members = List.of(); + private volatile Message.RoomInfo info; + + private record Speaker(StaticAudioChannel channel, long[] lastPacket) {} + + CrosstalkRoom(VoicechatServerApi api, String key, String name, UUID groupId) { + this.api = api; + this.key = key; + this.name = name; + this.groupId = groupId; + } + + String key() { return key; } + String name() { return name; } + UUID groupId() { return groupId; } + Message.RoomInfo info() { return info; } + void setInfo(Message.RoomInfo info) { this.info = info; } + + boolean active() { + Message.RoomInfo current = info; + return current != null && current.active(); + } + + synchronized void setMembers(List members) { + if (sameMembers(this.members, members)) return; + this.members = List.copyOf(members); + for (Speaker speaker : speakers.values()) applyTargets(speaker.channel()); + } + + synchronized void play(UUID source, byte[] opus) { + if (members.isEmpty()) return; + Speaker speaker = speakers.get(source); + if (speaker == null) { + StaticAudioChannel channel = api.createStaticAudioChannel(source); + if (channel == null) return; + channel.setCategory(BridgeVoicechat.CATEGORY); + applyTargets(channel); + speaker = new Speaker(channel, new long[1]); + speakers.put(source, speaker); + } + speaker.lastPacket()[0] = System.currentTimeMillis(); + speaker.channel().send(opus); + } + + synchronized void dropIdleSpeakers() { + long now = System.currentTimeMillis(); + speakers.values().removeIf(speaker -> { + if (now - speaker.lastPacket()[0] < SPEAKER_IDLE_MILLIS) return false; + speaker.channel().flush(); + return true; + }); + } + + synchronized void dropAllSpeakers() { + speakers.values().forEach(speaker -> speaker.channel().flush()); + speakers.clear(); + members = List.of(); + } + + private void applyTargets(StaticAudioChannel channel) { + channel.clearTargets(); + for (VoicechatConnection member : members) channel.addTarget(member); + } + + private static boolean sameMembers(List a, List b) { + if (a.size() != b.size()) return false; + for (int i = 0; i < a.size(); i++) { + if (!a.get(i).getPlayer().getUuid().equals(b.get(i).getPlayer().getUuid())) return false; + } + return true; + } +} diff --git a/plugin/src/main/java/eu/mhsl/voicebridge/plugin/VoiceBridgePlugin.java b/plugin/src/main/java/eu/mhsl/voicebridge/plugin/VoiceBridgePlugin.java new file mode 100644 index 0000000..373280f --- /dev/null +++ b/plugin/src/main/java/eu/mhsl/voicebridge/plugin/VoiceBridgePlugin.java @@ -0,0 +1,33 @@ +package eu.mhsl.voicebridge.plugin; + +import de.maxhenkel.voicechat.api.BukkitVoicechatService; +import org.bukkit.plugin.java.JavaPlugin; + +import java.net.InetSocketAddress; + +public final class VoiceBridgePlugin extends JavaPlugin { + private BridgeVoicechat voicechat; + + @Override + public void onEnable() { + saveDefaultConfig(); + + BukkitVoicechatService service = getServer().getServicesManager().load(BukkitVoicechatService.class); + if (service == null) { + getLogger().severe("Simple Voice Chat nicht gefunden, VoiceBridge bleibt aus."); + getServer().getPluginManager().disablePlugin(this); + return; + } + + InetSocketAddress bridge = new InetSocketAddress( + getConfig().getString("bridge.host", "127.0.0.1"), + getConfig().getInt("bridge.port", 24470)); + voicechat = new BridgeVoicechat(this, bridge); + service.registerPlugin(voicechat); + } + + @Override + public void onDisable() { + if (voicechat != null) voicechat.stop(); + } +} diff --git a/plugin/src/main/resources/config.yml b/plugin/src/main/resources/config.yml new file mode 100644 index 0000000..bd8de9d --- /dev/null +++ b/plugin/src/main/resources/config.yml @@ -0,0 +1,4 @@ +# Adresse des Bridge-Dienstes (UDP). Die Räume selbst stehen in der Config der Bridge. +bridge: + host: 127.0.0.1 + port: 24470 diff --git a/plugin/src/main/resources/plugin.yml b/plugin/src/main/resources/plugin.yml new file mode 100644 index 0000000..a9c39dd --- /dev/null +++ b/plugin/src/main/resources/plugin.yml @@ -0,0 +1,8 @@ +name: VoiceBridge +version: '${version}' +main: eu.mhsl.voicebridge.plugin.VoiceBridgePlugin +api-version: '1.21' +depend: [ voicechat ] +authors: [ MineTec ] +description: Verbindet Simple-Voice-Chat-Gruppen mit Discord und TeamSpeak +website: mhsl.eu diff --git a/protocol/build.gradle b/protocol/build.gradle new file mode 100644 index 0000000..d870310 --- /dev/null +++ b/protocol/build.gradle @@ -0,0 +1,9 @@ +dependencies { + testImplementation platform('org.junit:junit-bom:5.13.4') + testImplementation 'org.junit.jupiter:junit-jupiter' + testRuntimeOnly 'org.junit.platform:junit-platform-launcher' +} + +tasks.named('test') { + useJUnitPlatform() +} diff --git a/protocol/src/main/java/eu/mhsl/voicebridge/protocol/Message.java b/protocol/src/main/java/eu/mhsl/voicebridge/protocol/Message.java new file mode 100644 index 0000000..2e37add --- /dev/null +++ b/protocol/src/main/java/eu/mhsl/voicebridge/protocol/Message.java @@ -0,0 +1,25 @@ +package eu.mhsl.voicebridge.protocol; + +import java.util.List; +import java.util.Map; +import java.util.UUID; + +/** + * Nachrichten zwischen Paper-Plugin und Bridge-Dienst (UDP, ein Datagramm pro Nachricht). + */ +public sealed interface Message { + + /** Plugin → Bridge, jede Sekunde: Herzschlag und verbundene Spieler pro Raum. */ + record Hello(int version, Map members) implements Message {} + + /** Bridge → Plugin, Antwort auf jedes Hello: die Räume und wer auf den anderen Seiten ist. */ + record Rooms(List rooms) implements Message {} + + record RoomInfo(String key, String name, UUID groupId, int teamspeak, int discord, boolean active) {} + + /** + * Ein Opus-Frame (20 ms, 48 kHz mono) in beide Richtungen. {@code source} ist beim Plugin → Bridge + * die Spieler-UUID, beim Bridge → Plugin eine feste UUID pro externem Sprecher. + */ + record Audio(String room, UUID source, byte[] opus) implements Message {} +} diff --git a/protocol/src/main/java/eu/mhsl/voicebridge/protocol/Protocol.java b/protocol/src/main/java/eu/mhsl/voicebridge/protocol/Protocol.java new file mode 100644 index 0000000..2414ccf --- /dev/null +++ b/protocol/src/main/java/eu/mhsl/voicebridge/protocol/Protocol.java @@ -0,0 +1,98 @@ +package eu.mhsl.voicebridge.protocol; + +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.DataInputStream; +import java.io.DataOutputStream; +import java.io.IOException; +import java.io.UncheckedIOException; +import java.util.ArrayList; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import java.util.UUID; + +public final class Protocol { + /** Bei inkompatiblen Änderungen am Format hochzählen. */ + public static final int VERSION = 1; + public static final int DEFAULT_PORT = 24470; + public static final int MAX_DATAGRAM = 2048; + + private static final byte HELLO = 1; + private static final byte ROOMS = 2; + private static final byte AUDIO = 3; + + private Protocol() {} + + public static byte[] encode(Message message) { + ByteArrayOutputStream bytes = new ByteArrayOutputStream(256); + try (DataOutputStream out = new DataOutputStream(bytes)) { + switch (message) { + case Message.Hello hello -> { + out.writeByte(HELLO); + out.writeInt(hello.version()); + out.writeShort(hello.members().size()); + for (Map.Entry e : hello.members().entrySet()) { + out.writeUTF(e.getKey()); + out.writeShort(e.getValue()); + } + } + case Message.Rooms rooms -> { + out.writeByte(ROOMS); + out.writeShort(rooms.rooms().size()); + for (Message.RoomInfo room : rooms.rooms()) { + out.writeUTF(room.key()); + out.writeUTF(room.name()); + writeUuid(out, room.groupId()); + out.writeShort(room.teamspeak()); + out.writeShort(room.discord()); + out.writeBoolean(room.active()); + } + } + case Message.Audio audio -> { + out.writeByte(AUDIO); + out.writeUTF(audio.room()); + writeUuid(out, audio.source()); + out.write(audio.opus()); + } + } + } catch (IOException e) { + throw new UncheckedIOException(e); + } + return bytes.toByteArray(); + } + + public static Message decode(byte[] data, int offset, int length) throws IOException { + DataInputStream in = new DataInputStream(new ByteArrayInputStream(data, offset, length)); + byte type = in.readByte(); + return switch (type) { + case HELLO -> { + int version = in.readInt(); + int count = in.readUnsignedShort(); + Map members = new LinkedHashMap<>(); + for (int i = 0; i < count; i++) members.put(in.readUTF(), in.readUnsignedShort()); + yield new Message.Hello(version, members); + } + case ROOMS -> { + int count = in.readUnsignedShort(); + List rooms = new ArrayList<>(count); + for (int i = 0; i < count; i++) { + rooms.add(new Message.RoomInfo(in.readUTF(), in.readUTF(), readUuid(in), + in.readUnsignedShort(), in.readUnsignedShort(), in.readBoolean())); + } + yield new Message.Rooms(rooms); + } + case AUDIO -> new Message.Audio(in.readUTF(), readUuid(in), in.readAllBytes()); + default -> throw new IOException("Unbekannter Nachrichtentyp " + type); + }; + } + + private static void writeUuid(DataOutputStream out, UUID uuid) throws IOException { + out.writeLong(uuid.getMostSignificantBits()); + out.writeLong(uuid.getLeastSignificantBits()); + } + + private static UUID readUuid(DataInputStream in) throws IOException { + return new UUID(in.readLong(), in.readLong()); + } +} diff --git a/protocol/src/test/java/eu/mhsl/voicebridge/protocol/ProtocolTest.java b/protocol/src/test/java/eu/mhsl/voicebridge/protocol/ProtocolTest.java new file mode 100644 index 0000000..005a4ef --- /dev/null +++ b/protocol/src/test/java/eu/mhsl/voicebridge/protocol/ProtocolTest.java @@ -0,0 +1,46 @@ +package eu.mhsl.voicebridge.protocol; + +import org.junit.jupiter.api.Test; + +import java.io.IOException; +import java.util.List; +import java.util.Map; +import java.util.UUID; + +import static org.junit.jupiter.api.Assertions.*; + +class ProtocolTest { + + private static Message roundTrip(Message message) throws IOException { + byte[] data = Protocol.encode(message); + return Protocol.decode(data, 0, data.length); + } + + @Test + void hello() throws IOException { + Message.Hello hello = new Message.Hello(Protocol.VERSION, Map.of("crosstalk-1", 3)); + assertEquals(hello, roundTrip(hello)); + } + + @Test + void rooms() throws IOException { + Message.Rooms rooms = new Message.Rooms(List.of( + new Message.RoomInfo("crosstalk-1", "Crosstalk 1", UUID.randomUUID(), 2, 0, true))); + assertEquals(rooms, roundTrip(rooms)); + } + + @Test + void audio() throws IOException { + byte[] opus = {1, 2, 3, (byte) 0xF8, (byte) 0xFF}; + UUID source = UUID.randomUUID(); + Message.Audio audio = (Message.Audio) roundTrip(new Message.Audio("crosstalk-2", source, opus)); + assertEquals("crosstalk-2", audio.room()); + assertEquals(source, audio.source()); + assertArrayEquals(opus, audio.opus()); + } + + @Test + void unknownType() { + assertThrows(IOException.class, () -> Protocol.decode(new byte[]{42}, 0, 1)); + } +} diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 0000000..9b80aec --- /dev/null +++ b/settings.gradle @@ -0,0 +1,3 @@ +rootProject.name = 'voice-bridge' + +include 'protocol', 'plugin', 'bridge', 'ts3j' diff --git a/third_party/ts3j b/third_party/ts3j new file mode 160000 index 0000000..db57d60 --- /dev/null +++ b/third_party/ts3j @@ -0,0 +1 @@ +Subproject commit db57d60c989e399626aa16d921390f5033e6cdeb diff --git a/ts3j/build.gradle b/ts3j/build.gradle new file mode 100644 index 0000000..a670f2c --- /dev/null +++ b/ts3j/build.gradle @@ -0,0 +1,19 @@ +// ts3j (TeamSpeak-Client-Protokoll) aus dem Submodul third_party/ts3j bauen. +// JitPack hat keinen Build des aktuellen Stands (TS5/TS6-Lizenz-Fix vom 2025-07). + +sourceSets { + main { + java.srcDirs = ['../third_party/ts3j/src/main/java'] + } +} + +dependencies { + api 'org.bouncycastle:bcprov-jdk15on:1.67' + api 'commons-lang:commons-lang:2.6' + api 'dnsjava:dnsjava:2.1.8' + api 'org.ini4j:ini4j:0.5.1' +} + +tasks.withType(JavaCompile).configureEach { + options.compilerArgs += ['-nowarn', '-Xlint:none'] +}