Force relay client configuration (livekit#155)

* Update protocol submodule * Force relay configuration * tests
wittech · Oct 24, 2022 · cec0b2b · cec0b2b
1 parent 57d4616
commit cec0b2b
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 4 deletions.
diff --git a/livekit-android-sdk/src/main/java/io/livekit/android/room/RTCEngine.kt b/livekit-android-sdk/src/main/java/io/livekit/android/room/RTCEngine.kt
@@ -201,6 +201,14 @@ internal constructor(
                     PeerConnection.ContinualGatheringPolicy.GATHER_CONTINUALLY
             }
 
+        if (joinResponse.hasClientConfiguration()) {
+            val clientConfig = joinResponse.clientConfiguration
+
+            if (clientConfig.forceRelay == LivekitModels.ClientConfigSetting.ENABLED) {
+                rtcConfig.iceTransportsType = PeerConnection.IceTransportsType.RELAY
+            }
+        }
+
         _publisher?.close()
         _publisher = pctFactory.create(
             rtcConfig,

diff --git a/livekit-android-sdk/src/test/java/io/livekit/android/mock/MockPeerConnection.kt b/livekit-android-sdk/src/test/java/io/livekit/android/mock/MockPeerConnection.kt
@@ -7,7 +7,8 @@ private class MockNativePeerConnectionFactory : NativePeerConnectionFactory {
 }
 
 class MockPeerConnection(
-    val observer: PeerConnection.Observer?
+    val rtcConfig: RTCConfiguration,
+    val observer: Observer?
 ) : PeerConnection(MockNativePeerConnectionFactory()) {
 
     private var closed = false

diff --git a/livekit-android-sdk/src/test/java/io/livekit/android/room/RTCEngineMockE2ETest.kt b/livekit-android-sdk/src/test/java/io/livekit/android/room/RTCEngineMockE2ETest.kt
@@ -5,8 +5,10 @@ import io.livekit.android.mock.MockPeerConnection
 import io.livekit.android.util.toOkioByteString
 import io.livekit.android.util.toPBByteString
 import kotlinx.coroutines.ExperimentalCoroutinesApi
+import livekit.LivekitModels
 import livekit.LivekitRtc
 import org.junit.Assert
+import org.junit.Assert.assertEquals
 import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -95,4 +97,21 @@ class RTCEngineMockE2ETest : MockE2ETest() {
         Assert.assertNotEquals(oldToken, newToken)
         Assert.assertEquals(SignalClientTest.REFRESH_TOKEN.refreshToken, newToken)
     }
+
+    @Test
+    fun relayConfiguration() = runTest {
+        connect(with(SignalClientTest.JOIN.toBuilder()) {
+            join = with(join.toBuilder()) {
+                clientConfiguration = with(LivekitModels.ClientConfiguration.newBuilder()) {
+                    forceRelay = LivekitModels.ClientConfigSetting.ENABLED
+                    build()
+                }
+                build()
+            }
+            build()
+        })
+
+        val pubPeerConnection = rtcEngine.subscriber.peerConnection as MockPeerConnection
+        assertEquals(PeerConnection.IceTransportsType.RELAY, pubPeerConnection.rtcConfig.iceTransportsType)
+    }
 }
diff --git a/livekit-android-sdk/src/test/java/org/webrtc/MockPeerConnectionFactory.kt b/livekit-android-sdk/src/test/java/org/webrtc/MockPeerConnectionFactory.kt
@@ -4,11 +4,11 @@ import io.livekit.android.mock.MockPeerConnection
 
 class MockPeerConnectionFactory : PeerConnectionFactory(1L) {
     override fun createPeerConnectionInternal(
-        rtcConfig: PeerConnection.RTCConfiguration?,
+        rtcConfig: PeerConnection.RTCConfiguration,
         constraints: MediaConstraints?,
         observer: PeerConnection.Observer?,
         sslCertificateVerifier: SSLCertificateVerifier?
     ): PeerConnection {
-        return MockPeerConnection(observer)
+        return MockPeerConnection(rtcConfig, observer)
     }
 }
diff --git a/protocol b/protocol
+202 −21		LICENSE
+4 −2		go.mod
+8 −4		go.sum
+14 −1		ingress/errors.go
+13 −10		ingress/rpc.go
+40 −0		ingress/validation.go
+84 −65		livekit/livekit_analytics.pb.go
+1 −1		livekit/livekit_analytics_grpc.pb.go
+541 −294		livekit/livekit_egress.pb.go
+131 −123		livekit/livekit_egress.twirp.go
+1 −1		livekit/livekit_ingress.pb.go
+303 −233		livekit/livekit_internal.pb.go
+285 −265		livekit/livekit_models.pb.go
+285 −180		livekit/livekit_room.pb.go
+60 −55		livekit/livekit_room.twirp.go
+143 −64		livekit/livekit_rpc_internal.pb.go
+284 −254		livekit/livekit_rtc.pb.go
+1 −1		livekit/livekit_webhook.pb.go
+3 −0		livekit_analytics.proto
+38 −16		livekit_egress.proto
+7 −1		livekit_internal.proto
+3 −0		livekit_models.proto
+10 −0		livekit_room.proto
+8 −2		livekit_rpc_internal.proto
+5 −0		livekit_rtc.proto
+16 −0		sdp/sdp.go
+77 −0		utils/cpu.go
+133 −0		utils/cpu_linux.go
+36 −0		utils/cpu_nonlinux.go
+2 −1		webhook/notifier.go