Implement RPC (#578)

* Update protocol * fix build errors * Implement RPC * tests * spotless * comment fixes
livekit · Jan 9, 2025 · 3319733 · 3319733
1 parent 4f4432b
commit 3319733
Show file tree

Hide file tree

Showing 13 changed files with 1,006 additions and 21 deletions.
diff --git a/.changeset/good-snails-switch.md b/.changeset/good-snails-switch.md
@@ -0,0 +1,5 @@
+---
+"client-sdk-android": minor
+---
+
+Implement RPC
diff --git a/livekit-android-sdk/src/main/java/io/livekit/android/events/RoomEvent.kt b/livekit-android-sdk/src/main/java/io/livekit/android/events/RoomEvent.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023-2024 LiveKit, Inc.
+ * Copyright 2023-2025 LiveKit, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -273,6 +273,9 @@ enum class DisconnectReason {
     MIGRATION,
     SIGNAL_CLOSE,
     ROOM_CLOSED,
+    USER_UNAVAILABLE,
+    USER_REJECTED,
+    SIP_TRUNK_FAILURE,
 }
 
 /**
@@ -290,6 +293,9 @@ fun LivekitModels.DisconnectReason?.convert(): DisconnectReason {
         LivekitModels.DisconnectReason.MIGRATION -> DisconnectReason.MIGRATION
         LivekitModels.DisconnectReason.SIGNAL_CLOSE -> DisconnectReason.SIGNAL_CLOSE
         LivekitModels.DisconnectReason.ROOM_CLOSED -> DisconnectReason.ROOM_CLOSED
+        LivekitModels.DisconnectReason.USER_UNAVAILABLE -> DisconnectReason.USER_UNAVAILABLE
+        LivekitModels.DisconnectReason.USER_REJECTED -> DisconnectReason.USER_REJECTED
+        LivekitModels.DisconnectReason.SIP_TRUNK_FAILURE -> DisconnectReason.SIP_TRUNK_FAILURE
         LivekitModels.DisconnectReason.UNKNOWN_REASON,
         LivekitModels.DisconnectReason.UNRECOGNIZED,
         null,

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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023-2024 LiveKit, Inc.
+ * Copyright 2023-2025 LiveKit, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,6 +19,7 @@ package io.livekit.android.room
 import android.os.SystemClock
 import androidx.annotation.VisibleForTesting
 import com.google.protobuf.ByteString
+import com.vdurmont.semver4j.Semver
 import io.livekit.android.ConnectOptions
 import io.livekit.android.RoomOptions
 import io.livekit.android.dagger.InjectionNames
@@ -148,6 +149,9 @@ internal constructor(
     private var lastRoomOptions: RoomOptions? = null
     private var participantSid: String? = null
 
+    internal val serverVersion: Semver?
+        get() = client.serverVersion
+
     private val publisherObserver = PublisherTransportObserver(this, client)
     private val subscriberObserver = SubscriberTransportObserver(this, client)
 
@@ -777,6 +781,7 @@ internal constructor(
         fun onLocalTrackUnpublished(trackUnpublished: LivekitRtc.TrackUnpublishedResponse)
         fun onTranscriptionReceived(transcription: LivekitModels.Transcription)
         fun onLocalTrackSubscribed(trackSubscribed: LivekitRtc.TrackSubscribed)
+        fun onRpcPacketReceived(dp: LivekitModels.DataPacket)
     }
 
     companion object {
@@ -792,7 +797,7 @@ internal constructor(
          */
         @VisibleForTesting
         const val LOSSY_DATA_CHANNEL_LABEL = "_lossy"
-        internal const val MAX_DATA_PACKET_SIZE = 15000
+        internal const val MAX_DATA_PACKET_SIZE = 15360 // 15 KB
         private const val MAX_RECONNECT_RETRIES = 10
         private const val MAX_RECONNECT_TIMEOUT = 60 * 1000
         private const val MAX_ICE_CONNECT_TIMEOUT_MS = 20000
@@ -1040,13 +1045,21 @@ internal constructor(
             LivekitModels.DataPacket.ValueCase.RPC_ACK,
             LivekitModels.DataPacket.ValueCase.RPC_RESPONSE,
             -> {
-                // TODO
+                listener?.onRpcPacketReceived(dp)
             }
             LivekitModels.DataPacket.ValueCase.VALUE_NOT_SET,
             null,
             -> {
                 LKLog.v { "invalid value for data packet" }
             }
+
+            LivekitModels.DataPacket.ValueCase.STREAM_HEADER -> {
+                // TODO
+            }
+
+            LivekitModels.DataPacket.ValueCase.STREAM_CHUNK -> {
+                // TODO
+            }
         }
     }
 

diff --git a/livekit-android-sdk/src/main/java/io/livekit/android/room/Room.kt b/livekit-android-sdk/src/main/java/io/livekit/android/room/Room.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023-2024 LiveKit, Inc.
+ * Copyright 2023-2025 LiveKit, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -648,6 +648,8 @@ constructor(
 
         mutableRemoteParticipants = newParticipants
         eventBus.postEvent(RoomEvent.ParticipantDisconnected(this, removedParticipant), coroutineScope)
+
+        localParticipant.handleParticipantDisconnect(identity)
     }
 
     fun getParticipantBySid(sid: String): Participant? {
@@ -1195,6 +1197,10 @@ constructor(
         publication?.onTranscriptionReceived(event)
     }
 
+    override fun onRpcPacketReceived(dp: LivekitModels.DataPacket) {
+        localParticipant.handleDataPacket(dp)
+    }
+
     /**
      * @suppress
      */

diff --git a/livekit-android-sdk/src/main/java/io/livekit/android/room/SignalClient.kt b/livekit-android-sdk/src/main/java/io/livekit/android/room/SignalClient.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023-2024 LiveKit, Inc.
+ * Copyright 2023-2025 LiveKit, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -84,7 +84,7 @@ constructor(
     private var currentWs: WebSocket? = null
     private var isReconnecting: Boolean = false
     var listener: Listener? = null
-    private var serverVersion: Semver? = null
+    internal var serverVersion: Semver? = null
     private var lastUrl: String? = null
     private var lastOptions: ConnectOptions? = null
     private var lastRoomOptions: RoomOptions? = null
@@ -841,6 +841,7 @@ constructor(
         lastUrl = null
         lastOptions = null
         lastRoomOptions = null
+        serverVersion = null
     }
 
     interface Listener {