Add voice support on native

build.gradle.kts

@@ -4,6 +4,8 @@ plugins {
 
 allprojects {
     repositories {
+        // TODO: Remove wants https://github.com/ktorio/ktor/pull/3950 lands
+        mavenLocal()
         mavenCentral()
         maven("https://oss.sonatype.org/content/repositories/snapshots/")
     }

buildSrc/src/main/kotlin/Compiler.kt

@@ -25,7 +25,7 @@ object Jvm {
 }
 
 fun KotlinCommonCompilerOptions.applyKordCompilerOptions() {
-    allWarningsAsErrors = true
+//    allWarningsAsErrors = true
     progressiveMode = true
     freeCompilerArgs.add("-Xexpect-actual-classes")
 }

buildSrc/src/main/kotlin/kord-multiplatform-module.gradle.kts

@@ -43,8 +43,11 @@ kotlin {
     explicitApi()
 
     jvm()
-    js {
-        nodejs()
+
+    if (name != "voice" && name != "core-voice") {
+        js {
+            nodejs()
+        }
     }
     jvmToolchain(Jvm.target)
 

buildSrc/src/main/kotlin/kord-native-module.gradle.kts

@@ -7,14 +7,16 @@ plugins {
 kotlin {
     // There are issues with compiling the linux variant on linux
     // Please use WSL if you need to work on the linux port
-    if(!Os.isFamily(Os.FAMILY_WINDOWS)) {
+    if (!Os.isFamily(Os.FAMILY_WINDOWS)) {
         linuxX64()
         // Waiting for Ktor
         // https://youtrack.jetbrains.com/issue/KTOR-6173
         //linuxArm64()
     }
 
-    mingwX64()
+    if (name != "voice" && name != "core-voice") {
+        mingwX64()
+    }
 
     macosArm64()
     macosX64()
@@ -23,7 +25,6 @@ kotlin {
     iosX64()
     iosSimulatorArm64()
 
-    watchosX64()
     watchosArm64()
     watchosSimulatorArm64()
 

core-voice/build.gradle.kts

@@ -1,9 +1,16 @@
 plugins {
-    `kord-module`
+    `kord-native-module`
+    `kord-multiplatform-module`
     `kord-publishing`
 }
 
-dependencies {
-    api(projects.core)
-    api(projects.voice)
+kotlin {
+    sourceSets {
+        commonMain {
+            dependencies {
+                api(projects.core)
+                api(projects.voice)
+            }
+        }
+    }
 }

core-voice/src/main/kotlin/BaseVoiceChannelBehaviorExtensions.kt → core-voice/src/commonMain/kotlin/BaseVoiceChannelBehaviorExtensions.kt

@@ -7,6 +7,7 @@ import dev.kord.core.entity.channel.VoiceChannel
 import dev.kord.core.exception.GatewayNotFoundException
 import dev.kord.voice.VoiceConnection
 import dev.kord.voice.VoiceConnectionBuilder
+import kotlin.jvm.JvmName
 
 /**
  * Connect to this [VoiceChannel] and create a [VoiceConnection] for this voice session.

core/build.gradle.kts

@@ -28,9 +28,6 @@ kotlin {
                 api(libs.kord.cache.map)
 
                 implementation(libs.kotlin.logging)
-
-                // TODO remove when kordLogger is removed
-                implementation(libs.kotlin.logging.old)
             }
         }
         nonJvmMain {

core/src/commonMain/kotlin/builder/kord/KordBuilder.kt

@@ -49,7 +49,8 @@ public abstract class BaseKordBuilder internal constructor(public val token: Str
             val rateLimiter = IdentifyRateLimiter(resources.maxConcurrency, defaultDispatcher)
             shards.map {
                 DefaultGateway {
-                    client = resources.httpClient
+                    // Workaround for: https://github.com/ktorio/ktor/pull/3950#issuecomment-1909088751
+                    // client = resources.httpClient
                     identifyRateLimiter = rateLimiter
                 }
             }

gateway/src/commonMain/kotlin/DefaultGatewayBuilder.kt

@@ -8,9 +8,7 @@ import dev.kord.gateway.ratelimit.IdentifyRateLimiter
 import dev.kord.gateway.retry.LinearRetry
 import dev.kord.gateway.retry.Retry
 import io.ktor.client.*
-import io.ktor.client.plugins.contentnegotiation.*
 import io.ktor.client.plugins.websocket.*
-import io.ktor.serialization.kotlinx.json.*
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.MutableSharedFlow
@@ -29,9 +27,6 @@ public class DefaultGatewayBuilder {
     public fun build(): DefaultGateway {
         val client = client ?: HttpClient(httpEngine()) {
             install(WebSockets)
-            install(ContentNegotiation) {
-                json()
-            }
         }
         val retry = reconnectRetry ?: LinearRetry(2.seconds, 20.seconds, 10)
         val sendRateLimiter = sendRateLimiter ?: IntervalRateLimiter(limit = 120, interval = 60.seconds)

gradle/libs.versions.toml

@@ -2,7 +2,7 @@
 
 # api dependencies
 kotlin = "1.9.21" # https://github.com/JetBrains/kotlin
-ktor = "2.3.7" # https://github.com/ktorio/ktor
+ktor = "3.0.0-beta-1" # https://github.com/ktorio/ktor
 kotlinx-coroutines = "1.7.3" # https://github.com/Kotlin/kotlinx.coroutines
 kotlinx-serialization = "1.6.2" # https://github.com/Kotlin/kotlinx.serialization
 kotlinx-datetime = "0.5.0" # https://github.com/Kotlin/kotlinx-datetime
@@ -16,6 +16,7 @@ kotlin-node = "18.16.12-pre.619" # https://github.com/JetBrains/kotlin-wrappers
 bignum = "0.3.8" # https://github.com/ionspin/kotlin-multiplatform-bignum
 stately = "2.0.6" # https://github.com/touchlab/Stately
 fastZlib = "2.0.1" # https://github.com/timotejroiko/fast-zlib
+sodium = "0.9.0" # https://github.com/ionspin/kotlin-multiplatform-libsodium
 
 # code generation
 ksp = "1.9.21-1.0.16" # https://github.com/google/ksp
@@ -24,7 +25,7 @@ kotlinpoet = "1.15.3" # https://github.com/square/kotlinpoet
 # tests
 junit5 = "5.10.1" # https://github.com/junit-team/junit5
 mockk = "1.13.8" # https://github.com/mockk/mockk
-slf4j = "2.0.9" # https://www.slf4j.org
+slf4j = "2.0.11" # https://www.slf4j.org
 kotlinx-io = "0.3.0" # https://github.com/Kotlin/kotlinx-io/
 
 # plugins
@@ -69,6 +70,7 @@ kotlin-node = { module = "org.jetbrains.kotlin-wrappers:kotlin-node", version.re
 # JDK replacements
 bignum = { module = "com.ionspin.kotlin:bignum", version.ref = "bignum" }
 stately-collections = { module = "co.touchlab:stately-concurrent-collections", version.ref = "stately" }
+libsodium = { module = "com.ionspin.kotlin:multiplatform-crypto-libsodium-bindings", version.ref = "sodium" }
 
 # code generation
 ksp-api = { module = "com.google.devtools.ksp:symbol-processing-api", version.ref = "ksp" }

samples/build.gradle.kts

@@ -1,22 +1,54 @@
+import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
+import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTarget
+
 plugins {
     `kord-internal-multiplatform-module`
+    `kord-native-module`
 }
 
+@OptIn(ExperimentalKotlinGradlePluginApi::class)
 kotlin {
+    applyDefaultHierarchyTemplate {
+        common {
+            group("voice") {
+                withLinux()
+                withMacos()
+                withJvm()
+            }
+        }
+    }
     js {
         binaries.executable()
     }
 
+    targets.withType<KotlinNativeTarget> {
+        binaries.executable {
+            entryPoint = "dev.kord.voice.test.main"
+        }
+    }
+
     sourceSets {
         commonMain {
             dependencies {
                 implementation(projects.core)
+                implementation(libs.kotlin.logging)
             }
         }
         jvmMain {
             dependencies {
                 runtimeOnly(libs.slf4j.simple)
             }
         }
+        linuxMain {
+            dependencies {
+                implementation(libs.ktor.client.curl)
+            }
+        }
+
+        named("voiceMain") {
+            dependencies {
+                implementation(projects.coreVoice)
+            }
+        }
     }
 }

samples/src/jvmMain/resources/simplelogger.properties

@@ -0,0 +1 @@
+org.slf4j.simpleLogger.defaultLogLevel=trace

samples/src/voiceMain/kotlin/VoiceBot.kt

@@ -0,0 +1,52 @@
+@file:OptIn(KordVoice::class)
+
+package dev.kord.voice.test
+
+import dev.kord.common.annotation.KordVoice
+import dev.kord.core.Kord
+import dev.kord.core.behavior.channel.BaseVoiceChannelBehavior
+import dev.kord.core.behavior.channel.connect
+import dev.kord.core.behavior.interaction.respondPublic
+import dev.kord.core.event.interaction.GuildChatInputCommandInteractionCreateEvent
+import dev.kord.core.on
+import dev.kord.voice.AudioFrame
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.runBlocking
+
+fun main(args: Array<String>) = runBlocking {
+    val kord = Kord(args.firstOrNull() ?: error("Missing token"))
+
+    kord.createGlobalApplicationCommands {
+        input("join", "Test command") {
+            dmPermission = false
+        }
+    }
+
+    kord.on<GuildChatInputCommandInteractionCreateEvent> {
+        val channel = interaction.user.asMember(interaction.guildId).getVoiceState().getChannelOrNull()
+        if (channel == null) {
+            interaction.respondPublic { content = "not in channel" }
+            return@on
+        }
+        interaction.respondPublic { content = "success" }
+        channel.connectEcho()
+    }
+
+    kord.login()
+}
+
+private suspend fun BaseVoiceChannelBehavior.connectEcho() {
+    val buffer = ArrayList(listOf(AudioFrame.SILENCE, AudioFrame.SILENCE, AudioFrame.SILENCE, AudioFrame.SILENCE))
+    val connection = connect {
+        receiveVoice = true
+        audioProvider {
+            buffer.removeLastOrNull() ?: AudioFrame.SILENCE
+        }
+    }
+    connection.scope.launch {
+        connection.streams.incomingAudioFrames.collect { (userId, frame) ->
+            println("Received frame from:${userId}")
+            buffer.add(frame)
+        }
+    }
+}

voice/build.gradle.kts

@@ -1,21 +1,31 @@
 plugins {
-    java // for TweetNaclFast
-    `kord-module`
-    `kord-sampled-module`
+    `kord-native-module`
+    `kord-multiplatform-module`
     `kord-publishing`
 }
 
-dependencies {
-    api(projects.common)
-    api(projects.gateway)
+kotlin {
+    jvm {
+       withJava()
+    }
 
-    implementation(libs.kotlin.logging)
-    implementation(libs.slf4j.api)
+    sourceSets {
+        commonMain {
+            dependencies {
+                api(projects.common)
+                api(projects.gateway)
 
-    // TODO remove when voiceGatewayOnLogger is removed
-    implementation(libs.kotlin.logging.old)
+                api(libs.ktor.network)
+                implementation(libs.kotlin.logging)
 
-    compileOnly(projects.kspAnnotations)
+                compileOnly(projects.kspAnnotations)
+            }
+        }
 
-    api(libs.ktor.network)
+        nonJvmMain {
+            dependencies {
+                implementation(libs.libsodium)
+            }
+        }
+    }
 }

voice/src/main/kotlin/AudioFrame.kt → voice/src/commonMain/kotlin/AudioFrame.kt

@@ -1,6 +1,7 @@
 package dev.kord.voice
 
 import dev.kord.common.annotation.KordVoice
+import kotlin.jvm.JvmInline
 
 /**
  * A frame of 20ms Opus-encoded 48k stereo audio data.

voice/src/main/kotlin/gateway/DefaultVoiceGateway.kt → voice/src/commonMain/kotlin/gateway/DefaultVoiceGateway.kt

@@ -9,6 +9,7 @@ import io.github.oshai.kotlinlogging.KotlinLogging
 import io.ktor.client.*
 import io.ktor.client.plugins.websocket.*
 import io.ktor.client.request.*
+import io.ktor.util.network.*
 import io.ktor.websocket.*
 import kotlinx.atomicfu.AtomicRef
 import kotlinx.atomicfu.atomic
@@ -88,7 +89,7 @@ public class DefaultVoiceGateway(
                 if (exception is CancellationException) break
 
                 defaultVoiceGatewayLogger.error(exception) { "" }
-                if (exception is java.nio.channels.UnresolvedAddressException) {
+                if (exception is UnresolvedAddressException) {
                     data.eventFlow.emit(Close.Timeout)
                 }
 
@@ -139,7 +140,7 @@ public class DefaultVoiceGateway(
     }
 
     private suspend fun read(frame: Frame) {
-        val json = String(frame.data, Charsets.UTF_8)
+        val json = frame.data.decodeToString()
 
         try {
             val event = jsonParser.decodeFromString(VoiceEvent.DeserializationStrategy, json)

voice/src/main/kotlin/gateway/DefaultVoiceGatewayBuilder.kt → voice/src/commonMain/kotlin/gateway/DefaultVoiceGatewayBuilder.kt

@@ -2,13 +2,11 @@ package dev.kord.voice.gateway
 
 import dev.kord.common.annotation.KordVoice
 import dev.kord.common.entity.Snowflake
+import dev.kord.common.http.httpEngine
 import dev.kord.gateway.retry.LinearRetry
 import dev.kord.gateway.retry.Retry
 import io.ktor.client.*
-import io.ktor.client.engine.cio.*
-import io.ktor.client.plugins.contentnegotiation.*
 import io.ktor.client.plugins.websocket.*
-import io.ktor.serialization.kotlinx.json.*
 import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlin.time.Duration.Companion.seconds
 
@@ -23,11 +21,8 @@ public class DefaultVoiceGatewayBuilder(
     public var eventFlow: MutableSharedFlow<VoiceEvent> = MutableSharedFlow(extraBufferCapacity = Int.MAX_VALUE)
 
     public fun build(): DefaultVoiceGateway {
-        val client = client ?: HttpClient(CIO) {
+        val client = client ?: HttpClient(httpEngine()) {
             install(WebSockets)
-            install(ContentNegotiation) {
-                json()
-            }
         }
         val retry = reconnectRetry ?: LinearRetry(2.seconds, 20.seconds, 10)
 

voice/src/main/kotlin/gateway/VoiceGateway.kt → voice/src/commonMain/kotlin/gateway/VoiceGateway.kt

@@ -86,11 +86,6 @@ public interface VoiceGateway {
 }
 
 
-@Suppress("unused")
-@Deprecated("Binary compatibility, remove after deprecation cycle.", level = DeprecationLevel.ERROR)
-@PublishedApi
-internal val voiceGatewayOnLogger: mu.KLogger = mu.KotlinLogging.logger("Gateway.on")
-
 /**
  * Logger used to report [Throwable]s caught in [VoiceGateway.on].
  */