🚚 bedrock: move all events to one file

Server/src/main/kotlin/obsidian/bedrock/Bedrock.kt

@@ -57,7 +57,7 @@ object Bedrock {
       "netty" -> ByteBufAllocator.DEFAULT
       "unpooled" -> UnpooledByteBufAllocator.DEFAULT
       else -> {
-        logger.warn("Invalid byte buf allocator \"$allocator\", defaulting to the 'pooled' byte buf allocator.")
+        logger.warn("Invalid byte buf allocator '$allocator', defaulting to the 'pooled' byte buf allocator.")
         PooledByteBufAllocator.DEFAULT
       }
     }

Server/src/main/kotlin/obsidian/bedrock/event/Event.kt → Server/src/main/kotlin/obsidian/bedrock/Event.kt

@@ -14,25 +14,53 @@
  * limitations under the License.
  */
 
-package obsidian.bedrock.event
+package obsidian.bedrock
 
-import obsidian.bedrock.BedrockClient
-import obsidian.bedrock.MediaConnection
+import io.ktor.util.network.*
+import obsidian.bedrock.gateway.event.ClientConnect
 
 interface Event {
   /**
-   * The client that emitted this event.
+   * Media connection
    */
-  val client: BedrockClient
+  val mediaConnection: MediaConnection
 
   /**
-   * Media connection
+   * Client that emitted this event
    */
-  val mediaConnection: MediaConnection
+  val client: BedrockClient
+    get() = mediaConnection.bedrockClient
 
   /**
    * ID of the guild
    */
   val guildId: Long
     get() = mediaConnection.id
-}
+}
+
+data class GatewayClosedEvent(
+  override val mediaConnection: MediaConnection,
+  val code: Short,
+  val reason: String?
+) : Event
+
+data class GatewayReadyEvent(
+  override val mediaConnection: MediaConnection,
+  val ssrc: Int,
+  val target: NetworkAddress
+) : Event
+
+data class HeartbeatSentEvent(
+  override val mediaConnection: MediaConnection,
+  val nonce: Long
+) : Event
+
+data class HeartbeatAcknowledgedEvent(
+  override val mediaConnection: MediaConnection,
+  val nonce: Long
+) : Event
+
+data class UserConnectedEvent(
+  override val mediaConnection: MediaConnection,
+  val event: ClientConnect
+) : Event

Server/src/main/kotlin/obsidian/bedrock/MediaConnection.kt

@@ -23,10 +23,10 @@ import kotlinx.coroutines.flow.*
 import obsidian.bedrock.codec.Codec
 import obsidian.bedrock.codec.OpusCodec
 import obsidian.bedrock.codec.framePoller.FramePoller
-import obsidian.bedrock.event.Event
 import obsidian.bedrock.gateway.MediaGatewayConnection
 import obsidian.bedrock.handler.ConnectionHandler
 import obsidian.bedrock.media.MediaFrameProvider
+import org.slf4j.Logger
 import org.slf4j.LoggerFactory
 import kotlin.coroutines.CoroutineContext
 
@@ -109,7 +109,10 @@ class MediaConnection(
     }
 
     if (connectionHandler != null) {
-      connectionHandler?.close()
+      withContext(Dispatchers.IO) {
+        connectionHandler?.close()
+      }
+
       connectionHandler = null
     }
   }
@@ -159,7 +162,7 @@ class MediaConnection(
   }
 
   companion object {
-    val logger = LoggerFactory.getLogger(MediaConnection::class.java)
+    val logger: Logger = LoggerFactory.getLogger(MediaConnection::class.java)
   }
 }
 
@@ -171,9 +174,16 @@ class MediaConnection(
  *
  * @return A [Job] that can be used to cancel any further processing of event [T]
  */
-inline fun <reified T> MediaConnection.on(scope: CoroutineScope = this, crossinline block: suspend T.() -> Unit): Job {
-  return events.buffer(Channel.UNLIMITED).filterIsInstance<T>().onEach { event ->
-    event.runCatching { block() }
-      .onFailure { MediaConnection.logger.error(it) }
-  }.launchIn(scope)
+inline fun <reified T : Event> MediaConnection.on(
+  scope: CoroutineScope = this,
+  crossinline block: suspend T.() -> Unit
+): Job {
+  return events.buffer(Channel.UNLIMITED)
+    .filterIsInstance<T>()
+    .onEach { event ->
+      event
+        .runCatching { block() }
+        .onFailure { MediaConnection.logger.error(it) }
+    }
+    .launchIn(scope)
 }

Server/src/main/kotlin/obsidian/bedrock/gateway/MediaGatewayV4Connection.kt

@@ -22,7 +22,7 @@ import obsidian.bedrock.MediaConnection
 import obsidian.bedrock.VoiceServerInfo
 import obsidian.bedrock.codec.OpusCodec
 import obsidian.bedrock.crypto.EncryptionMode
-import obsidian.bedrock.event.*
+import obsidian.bedrock.*
 import obsidian.bedrock.gateway.event.*
 import obsidian.bedrock.handler.DiscordUDPConnection
 import obsidian.bedrock.util.Interval

Server/src/main/kotlin/obsidian/bedrock/media/OpusAudioFrameProvider.kt

@@ -20,7 +20,7 @@ import io.netty.buffer.ByteBuf
 import obsidian.bedrock.MediaConnection
 import obsidian.bedrock.codec.Codec
 import obsidian.bedrock.codec.OpusCodec
-import obsidian.bedrock.event.UserConnectedEvent
+import obsidian.bedrock.UserConnectedEvent
 import obsidian.bedrock.gateway.SpeakingFlags
 import obsidian.bedrock.on
 

Server/src/main/kotlin/obsidian/server/io/MagmaClient.kt

@@ -26,10 +26,6 @@ import kotlinx.coroutines.channels.Channel
 import kotlinx.coroutines.flow.*
 import kotlinx.serialization.json.Json
 import obsidian.bedrock.*
-import obsidian.bedrock.event.GatewayClosedEvent
-import obsidian.bedrock.event.GatewayReadyEvent
-import obsidian.bedrock.event.HeartbeatAcknowledgedEvent
-import obsidian.bedrock.event.HeartbeatSentEvent
 import obsidian.bedrock.gateway.AbstractMediaGatewayConnection.Companion.asFlow
 import obsidian.server.io.Magma.Companion.magma
 import obsidian.server.player.Link