remove empty callbacks

livekit · Oct 23, 2024 · c139217 · c139217
1 parent 865cdcf
commit c139217
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 68 deletions.
diff --git a/livekit-ffi/protocol/ffi.proto b/livekit-ffi/protocol/ffi.proto
@@ -190,10 +190,8 @@ message FfiEvent {
     PublishSipDtmfCallback publish_sip_dtmf = 21;
     SendChatMessageCallback chat_message = 22;
     PerformRpcCallback perform_rpc = 23;
-    RegisterRpcMethodCallback register_rpc_method = 24;
-    UnregisterRpcMethodCallback unregister_rpc_method = 25;
-    RpcMethodInvocationEvent rpc_method_invocation = 26;
-    RpcMethodInvocationResponseCallback rpc_method_invocation_response = 27;
+    RpcMethodInvocationEvent rpc_method_invocation = 24;
+    RpcMethodInvocationResponseCallback rpc_method_invocation_response = 25;
   }
 }
 

diff --git a/livekit-ffi/protocol/rpc.proto b/livekit-ffi/protocol/rpc.proto
@@ -73,14 +73,6 @@ message PerformRpcCallback {
   optional RpcError error = 3;
 }
 
-message RegisterRpcMethodCallback {
-  required uint64 async_id = 1;
-}
-
-message UnregisterRpcMethodCallback {
-  required uint64 async_id = 1;
-}
-
 message RpcMethodInvocationResponseCallback {
   required uint64 async_id = 1;
   optional string error = 2;

diff --git a/livekit-ffi/src/livekit.proto.rs b/livekit-ffi/src/livekit.proto.rs
@@ -3642,18 +3642,6 @@ pub struct PerformRpcCallback {
 }
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
-pub struct RegisterRpcMethodCallback {
-    #[prost(uint64, required, tag="1")]
-    pub async_id: u64,
-}
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct UnregisterRpcMethodCallback {
-    #[prost(uint64, required, tag="1")]
-    pub async_id: u64,
-}
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
 pub struct RpcMethodInvocationResponseCallback {
     #[prost(uint64, required, tag="1")]
     pub async_id: u64,
@@ -3908,7 +3896,7 @@ pub mod ffi_response {
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct FfiEvent {
-    #[prost(oneof="ffi_event::Message", tags="1, 2, 3, 4, 5, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27")]
+    #[prost(oneof="ffi_event::Message", tags="1, 2, 3, 4, 5, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25")]
     pub message: ::core::option::Option<ffi_event::Message>,
 }
 /// Nested message and enum types in `FfiEvent`.
@@ -3961,12 +3949,8 @@ pub mod ffi_event {
         #[prost(message, tag="23")]
         PerformRpc(super::PerformRpcCallback),
         #[prost(message, tag="24")]
-        RegisterRpcMethod(super::RegisterRpcMethodCallback),
-        #[prost(message, tag="25")]
-        UnregisterRpcMethod(super::UnregisterRpcMethodCallback),
-        #[prost(message, tag="26")]
         RpcMethodInvocation(super::RpcMethodInvocationEvent),
-        #[prost(message, tag="27")]
+        #[prost(message, tag="25")]
         RpcMethodInvocationResponse(super::RpcMethodInvocationResponseCallback),
     }
 }

diff --git a/livekit-ffi/src/server/participant.rs b/livekit-ffi/src/server/participant.rs
@@ -92,36 +92,28 @@ impl FfiParticipant {
 
         let local_participant_handle = self.handle.clone();
         let room: Arc<RoomInner> = self.room.clone();
-        let handle = server.async_runtime.spawn(async move {
-            local.register_rpc_method(
-                method.clone(),
-                move |request_id, caller_identity, payload, response_timeout| {
-                    Box::pin({
-                        let room = room.clone();
-                        let method = method.clone();
-                        async move {
-                            forward_rpc_method_invocation(
-                                server,
-                                room,
-                                local_participant_handle,
-                                method,
-                                request_id,
-                                caller_identity,
-                                payload,
-                                response_timeout,
-                            )
-                            .await
-                        }
-                    })
-                },
-            );
-
-            let callback = proto::RegisterRpcMethodCallback { async_id };
-
-            let _ = server.send_event(proto::ffi_event::Message::RegisterRpcMethod(callback));
-        });
-
-        server.watch_panic(handle);
+        local.register_rpc_method(
+            method.clone(),
+            move |request_id, caller_identity, payload, response_timeout| {
+                Box::pin({
+                    let room = room.clone();
+                    let method = method.clone();
+                    async move {
+                        forward_rpc_method_invocation(
+                            server,
+                            room,
+                            local_participant_handle,
+                            method,
+                            request_id,
+                            caller_identity,
+                            payload,
+                            response_timeout,
+                        )
+                        .await
+                    }
+                })
+            },
+        );
         Ok(proto::RegisterRpcMethodResponse { async_id })
     }
 
@@ -139,15 +131,8 @@ impl FfiParticipant {
             }
         };
 
-        let handle = server.async_runtime.spawn(async move {
-            local.unregister_rpc_method(request.method);
+        local.unregister_rpc_method(request.method);
 
-            let callback = proto::UnregisterRpcMethodCallback { async_id };
-
-            let _ = server.send_event(proto::ffi_event::Message::UnregisterRpcMethod(callback));
-        });
-
-        server.watch_panic(handle);
         Ok(proto::UnregisterRpcMethodResponse { async_id })
     }
 }