let's break the entire fucking api and therefore bump version to 2.0.0

build.gradle

@@ -3,7 +3,7 @@ subprojects {
     apply plugin: 'java'
 
     group = 'moe.kyokobot'
-    version = '1.1.0-SNAPSHOT'
+    version = '2.0.0-SNAPSHOT'
 
     sourceCompatibility = 11
     targetCompatibility = 11

core/src/main/java/moe/kyokobot/koe/KoeClient.java

@@ -9,15 +9,15 @@
 
 public interface KoeClient extends Closeable {
     @NotNull
-    VoiceConnection createConnection(long guildId);
+    MediaConnection createConnection(long guildId);
 
     @Nullable
-    VoiceConnection getConnection(long guildId);
+    MediaConnection getConnection(long guildId);
 
     void destroyConnection(long guildId);
 
     @NotNull
-    Map<Long, VoiceConnection> getConnections();
+    Map<Long, MediaConnection> getConnections();
 
     @Override
     void close();

core/src/main/java/moe/kyokobot/koe/KoeEventAdapter.java

@@ -16,7 +16,7 @@ public void gatewayClosed(int code, String reason, boolean byRemote) {
     }
 
     @Override
-    public void userConnected(String id, int audioSSRC, int videoSSRC) {
+    public void userConnected(String id, int audioSSRC, int videoSSRC, int rtxSSRC) {
         //
     }
 

core/src/main/java/moe/kyokobot/koe/KoeEventListener.java

@@ -10,7 +10,7 @@ public interface KoeEventListener {
 
     void gatewayClosed(int code, @Nullable String reason, boolean byRemote);
 
-    void userConnected(String id, int audioSSRC, int videoSSRC);
+    void userConnected(String id, int audioSSRC, int videoSSRC, int rtxSSRC);
 
     void userDisconnected(String id);
 

core/src/main/java/moe/kyokobot/koe/VoiceConnection.java → core/src/main/java/moe/kyokobot/koe/MediaConnection.java

@@ -2,15 +2,15 @@
 
 import moe.kyokobot.koe.media.MediaFrameProvider;
 import moe.kyokobot.koe.codec.Codec;
-import moe.kyokobot.koe.gateway.VoiceGatewayConnection;
+import moe.kyokobot.koe.gateway.MediaGatewayConnection;
 import moe.kyokobot.koe.handler.ConnectionHandler;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import java.io.Closeable;
 import java.util.concurrent.CompletionStage;
 
-public interface VoiceConnection extends Closeable {
+public interface MediaConnection extends Closeable {
     /**
      * Connects to Discord voice server using specified info.
      * @param info Discord voice server connection information
@@ -31,12 +31,12 @@ public interface VoiceConnection extends Closeable {
     KoeOptions getOptions();
 
     @Nullable
-    MediaFrameProvider getSender();
+    MediaFrameProvider getAudioSender();
 
     long getGuildId();
 
     @Nullable
-    VoiceGatewayConnection getGatewayConnection();
+    MediaGatewayConnection getGatewayConnection();
 
     @Nullable
     VoiceServerInfo getVoiceServerInfo();
@@ -54,7 +54,7 @@ public interface VoiceConnection extends Closeable {
 
     /**
      * Stops polling media frames.
-     * @see VoiceConnection#startFramePolling()
+     * @see MediaConnection#startFramePolling()
      */
     void stopFramePolling();
 

core/src/main/java/moe/kyokobot/koe/codec/netty/NettyFramePollerFactory.java

@@ -1,6 +1,6 @@
 package moe.kyokobot.koe.codec.netty;
 
-import moe.kyokobot.koe.VoiceConnection;
+import moe.kyokobot.koe.MediaConnection;
 import moe.kyokobot.koe.codec.Codec;
 import moe.kyokobot.koe.codec.FramePoller;
 import moe.kyokobot.koe.codec.FramePollerFactory;
@@ -12,7 +12,7 @@
 import java.util.function.Function;
 
 public class NettyFramePollerFactory implements FramePollerFactory {
-    private Map<Codec, Function<VoiceConnection, FramePoller>> codecMap;
+    private Map<Codec, Function<MediaConnection, FramePoller>> codecMap;
 
     public NettyFramePollerFactory() {
         codecMap = new HashMap<>();
@@ -21,7 +21,7 @@ public NettyFramePollerFactory() {
 
     @Override
     @Nullable
-    public FramePoller createFramePoller(Codec codec, VoiceConnection connection) {
+    public FramePoller createFramePoller(Codec codec, MediaConnection connection) {
         var constructor = codecMap.get(codec);
         if (constructor != null) {
             return constructor.apply(connection);

core/src/main/java/moe/kyokobot/koe/codec/netty/NettyOpusFramePoller.java

@@ -1,6 +1,6 @@
 package moe.kyokobot.koe.codec.netty;
 
-import moe.kyokobot.koe.VoiceConnection;
+import moe.kyokobot.koe.MediaConnection;
 import moe.kyokobot.koe.codec.AbstractFramePoller;
 import moe.kyokobot.koe.codec.OpusCodec;
 import org.slf4j.Logger;
@@ -12,7 +12,7 @@
 public class NettyOpusFramePoller extends AbstractFramePoller {
     private static final Logger logger = LoggerFactory.getLogger(NettyOpusFramePoller.class);
 
-    public NettyOpusFramePoller(VoiceConnection connection) {
+    public NettyOpusFramePoller(MediaConnection connection) {
         super(connection);
         this.timestamp = new AtomicInteger();
     }
@@ -43,7 +43,7 @@ private void pollFrame() {
 
         try {
             var handler = connection.getConnectionHandler();
-            var sender = connection.getSender();
+            var sender = connection.getAudioSender();
             var codec = OpusCodec.INSTANCE;
 
             if (sender != null && handler != null && sender.canSendFrame(codec)) {

core/src/main/java/moe/kyokobot/koe/gateway/AbstractVoiceGatewayConnection.java → core/src/main/java/moe/kyokobot/koe/gateway/AbstractMediaGatewayConnection.java

@@ -17,7 +17,7 @@
 import io.netty.util.concurrent.EventExecutor;
 import moe.kyokobot.koe.VoiceServerInfo;
 import moe.kyokobot.koe.internal.NettyBootstrapFactory;
-import moe.kyokobot.koe.internal.VoiceConnectionImpl;
+import moe.kyokobot.koe.internal.MediaConnectionImpl;
 import moe.kyokobot.koe.internal.json.JsonObject;
 import moe.kyokobot.koe.internal.json.JsonParser;
 import moe.kyokobot.koe.internal.util.NettyFutureWrapper;
@@ -34,10 +34,10 @@
 import java.util.Objects;
 import java.util.concurrent.CompletableFuture;
 
-public abstract class AbstractVoiceGatewayConnection implements VoiceGatewayConnection {
-    private static final Logger logger = LoggerFactory.getLogger(AbstractVoiceGatewayConnection.class);
+public abstract class AbstractMediaGatewayConnection implements MediaGatewayConnection {
+    private static final Logger logger = LoggerFactory.getLogger(AbstractMediaGatewayConnection.class);
 
-    protected final VoiceConnectionImpl connection;
+    protected final MediaConnectionImpl connection;
     protected final VoiceServerInfo voiceServerInfo;
     protected final URI websocketURI;
     protected final Bootstrap bootstrap;
@@ -49,7 +49,7 @@ public abstract class AbstractVoiceGatewayConnection implements VoiceGatewayConn
     private volatile boolean open;
     private volatile boolean closed = false;
 
-    public AbstractVoiceGatewayConnection(@NotNull VoiceConnectionImpl connection,
+    public AbstractMediaGatewayConnection(@NotNull MediaConnectionImpl connection,
                                           @NotNull VoiceServerInfo voiceServerInfo,
                                           int version) {
         try {
@@ -156,7 +156,7 @@ protected void channelRead0(ChannelHandlerContext ctx, Object msg) throws Except
                 if (msg instanceof FullHttpResponse) {
                     try {
                         handshaker.finishHandshake(ch, (FullHttpResponse) msg);
-                        AbstractVoiceGatewayConnection.this.open = true;
+                        AbstractMediaGatewayConnection.this.open = true;
                         connectFuture.complete(null);
                     } catch (WebSocketHandshakeException e) {
                         connectFuture.completeExceptionally(e);
@@ -183,7 +183,7 @@ protected void channelRead0(ChannelHandlerContext ctx, Object msg) throws Except
                 if (logger.isDebugEnabled()) {
                     logger.debug("Websocket closed, code: {}, reason: {}", frame.statusCode(), frame.reasonText());
                 }
-                AbstractVoiceGatewayConnection.this.open = false;
+                AbstractMediaGatewayConnection.this.open = false;
                 onClose(frame.statusCode(), frame.reasonText(), true);
             }
         }

core/src/main/java/moe/kyokobot/koe/gateway/GatewayVersion.java

@@ -1,19 +1,19 @@
 package moe.kyokobot.koe.gateway;
 
 import moe.kyokobot.koe.VoiceServerInfo;
-import moe.kyokobot.koe.internal.VoiceConnectionImpl;
+import moe.kyokobot.koe.internal.MediaConnectionImpl;
 
 public enum GatewayVersion {
-    V4(VoiceGatewayV4Connection::new),
-    V5(VoiceGatewayV5Connection::new);
+    V4(MediaGatewayV4Connection::new),
+    V5(MediaGatewayV5Connection::new);
 
-    private final VoiceGatewayConnectionFactory factory;
+    private final MediaGatewayConnectionFactory factory;
 
-    public VoiceGatewayConnection createConnection(VoiceConnectionImpl connection, VoiceServerInfo voiceServerInfo) {
+    public MediaGatewayConnection createConnection(MediaConnectionImpl connection, VoiceServerInfo voiceServerInfo) {
         return factory.create(connection, voiceServerInfo);
     }
 
-    GatewayVersion(VoiceGatewayConnectionFactory factory) {
+    GatewayVersion(MediaGatewayConnectionFactory factory) {
         this.factory = factory;
     }
 }

core/src/main/java/moe/kyokobot/koe/gateway/VoiceGatewayConnection.java → core/src/main/java/moe/kyokobot/koe/gateway/MediaGatewayConnection.java

@@ -4,7 +4,7 @@
 
 import java.util.concurrent.CompletableFuture;
 
-public interface VoiceGatewayConnection {
+public interface MediaGatewayConnection {
     boolean isOpen();
 
     CompletableFuture<Void> start();

core/src/main/java/moe/kyokobot/koe/gateway/MediaGatewayConnectionFactory.java

@@ -0,0 +1,9 @@
+package moe.kyokobot.koe.gateway;
+
+import moe.kyokobot.koe.VoiceServerInfo;
+import moe.kyokobot.koe.internal.MediaConnectionImpl;
+
+@FunctionalInterface
+public interface MediaGatewayConnectionFactory {
+    MediaGatewayConnection create(MediaConnectionImpl connection, VoiceServerInfo voiceServerInfo);
+}

core/src/main/java/moe/kyokobot/koe/gateway/VoiceGatewayV4Connection.java → core/src/main/java/moe/kyokobot/koe/gateway/MediaGatewayV4Connection.java

@@ -1,8 +1,9 @@
 package moe.kyokobot.koe.gateway;
 
 import moe.kyokobot.koe.VoiceServerInfo;
+import moe.kyokobot.koe.codec.OpusCodec;
 import moe.kyokobot.koe.crypto.EncryptionMode;
-import moe.kyokobot.koe.internal.VoiceConnectionImpl;
+import moe.kyokobot.koe.internal.MediaConnectionImpl;
 import moe.kyokobot.koe.internal.handler.DiscordUDPConnection;
 import moe.kyokobot.koe.internal.json.JsonArray;
 import moe.kyokobot.koe.internal.json.JsonObject;
@@ -18,17 +19,13 @@
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 
-public class VoiceGatewayV4Connection extends AbstractVoiceGatewayConnection {
-    private static final Logger logger = LoggerFactory.getLogger(VoiceGatewayV4Connection.class);
+public class MediaGatewayV4Connection extends AbstractMediaGatewayConnection {
+    private static final Logger logger = LoggerFactory.getLogger(MediaGatewayV4Connection.class);
     private static final JsonArray SUPPORTED_CODECS;
 
     static {
         SUPPORTED_CODECS = new JsonArray();
-        SUPPORTED_CODECS.add(new JsonObject()
-                .add("name", "opus")
-                .add("type", "audio")
-                .add("priority", 1000)
-                .add("payload_type", 120));
+        SUPPORTED_CODECS.add(OpusCodec.INSTANCE.getJsonDescription());
     }
 
     private int ssrc;
@@ -37,7 +34,7 @@ public class VoiceGatewayV4Connection extends AbstractVoiceGatewayConnection {
     private UUID rtcConnectionId;
     private ScheduledFuture heartbeatFuture;
 
-    public VoiceGatewayV4Connection(VoiceConnectionImpl connection, VoiceServerInfo voiceServerInfo) {
+    public MediaGatewayV4Connection(MediaConnectionImpl connection, VoiceServerInfo voiceServerInfo) {
         super(connection, voiceServerInfo, 4);
     }
 
@@ -76,7 +73,7 @@ protected void handlePayload(JsonObject object) {
                 address = new InetSocketAddress(ip, port);
 
                 connection.getDispatcher().gatewayReady((InetSocketAddress) address, ssrc);
-                logger.debug("Voice READY, ssrc: {}", ssrc);
+                logger.debug("Got READY, ssrc: {}", ssrc);
                 selectProtocol("udp");
                 break;
             }
@@ -99,7 +96,8 @@ protected void handlePayload(JsonObject object) {
                 var user = data.getString("user_id");
                 var audioSsrc = data.getInt("audio_ssrc", 0);
                 var videoSsrc = data.getInt("video_ssrc", 0);
-                connection.getDispatcher().userConnected(user, audioSsrc, videoSsrc);
+                var rtxSsrc = data.getInt("rtx_ssrc", 0);
+                connection.getDispatcher().userConnected(user, audioSsrc, videoSsrc, rtxSsrc);
                 break;
             }
             case Op.CLIENT_DISCONNECT: {

core/src/main/java/moe/kyokobot/koe/gateway/VoiceGatewayV5Connection.java → core/src/main/java/moe/kyokobot/koe/gateway/MediaGatewayV5Connection.java

@@ -1,8 +1,10 @@
 package moe.kyokobot.koe.gateway;
 
 import moe.kyokobot.koe.VoiceServerInfo;
+import moe.kyokobot.koe.codec.Codec;
+import moe.kyokobot.koe.codec.DefaultCodecs;
 import moe.kyokobot.koe.crypto.EncryptionMode;
-import moe.kyokobot.koe.internal.VoiceConnectionImpl;
+import moe.kyokobot.koe.internal.MediaConnectionImpl;
 import moe.kyokobot.koe.internal.handler.DiscordUDPConnection;
 import moe.kyokobot.koe.internal.json.JsonArray;
 import moe.kyokobot.koe.internal.json.JsonObject;
@@ -17,27 +19,18 @@
 import java.util.concurrent.ScheduledFuture;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
-public class VoiceGatewayV5Connection extends AbstractVoiceGatewayConnection {
-    private static final Logger logger = LoggerFactory.getLogger(VoiceGatewayV5Connection.class);
-    private static final JsonArray SUPPORTED_CODECS;
-
-    static {
-        SUPPORTED_CODECS = new JsonArray();
-        SUPPORTED_CODECS.add(new JsonObject()
-                .add("name", "opus")
-                .add("type", "audio")
-                .add("priority", 1000)
-                .add("payload_type", 120));
-    }
+public class MediaGatewayV5Connection extends AbstractMediaGatewayConnection {
+    private static final Logger logger = LoggerFactory.getLogger(MediaGatewayV5Connection.class);
 
     private int ssrc;
     private SocketAddress address;
     private List<String> encryptionModes;
     private UUID rtcConnectionId;
     private ScheduledFuture heartbeatFuture;
 
-    public VoiceGatewayV5Connection(VoiceConnectionImpl connection, VoiceServerInfo voiceServerInfo) {
+    public MediaGatewayV5Connection(MediaConnectionImpl connection, VoiceServerInfo voiceServerInfo) {
         super(connection, voiceServerInfo, 5);
     }
 
@@ -100,7 +93,8 @@ protected void handlePayload(JsonObject object) {
                 var user = data.getString("user_id");
                 var audioSsrc = data.getInt("audio_ssrc", 0);
                 var videoSsrc = data.getInt("video_ssrc", 0);
-                connection.getDispatcher().userConnected(user, audioSsrc, videoSsrc);
+                var rtxSsrc = data.getInt("rtx_ssrc", 0);
+                connection.getDispatcher().userConnected(user, audioSsrc, videoSsrc, rtxSsrc);
                 break;
             }
             case Op.CLIENT_DISCONNECT: {
@@ -109,6 +103,9 @@ protected void handlePayload(JsonObject object) {
                 connection.getDispatcher().userDisconnected(user);
                 break;
             }
+            case Op.VIDEO_SINK_WANTS: {
+                break;
+            }
             default:
                 break;
         }
@@ -160,9 +157,14 @@ private void selectProtocol(String protocol) {
                         .add("port", ourAddress.getPort())
                         .add("mode", mode);
 
+                var codecs = new JsonArray();
+                Stream.concat(DefaultCodecs.audioCodecs.values().stream(), DefaultCodecs.videoCodecs.values().stream())
+                        .map(Codec::getJsonDescription)
+                        .forEach(codecs::add);
+
                 sendInternalPayload(Op.SELECT_PROTOCOL, new JsonObject()
                         .add("protocol", "udp")
-                        .add("codecs", SUPPORTED_CODECS)
+                        .add("codecs", codecs)
                         .add("rtc_connection_id", rtcConnectionId.toString())
                         .add("data", udpInfo)
                         .combine(udpInfo));