fixes

livekit-rtc/livekit/rtc/participant.py

@@ -366,7 +366,7 @@ async def _handle_rpc_method_invocation(
         handler = self._rpc_handlers.get(method)
 
         if not handler:
-            response_error = RpcError.built_in("UNSUPPORTED_METHOD")
+            response_error = RpcError._built_in(RpcError.ErrorCode.UNSUPPORTED_METHOD)
         else:
             try:
                 response_payload = await handler(
@@ -379,7 +379,7 @@ async def _handle_rpc_method_invocation(
                     f"Uncaught error returned by RPC handler for {method}. Returning UNCAUGHT_ERROR instead.",
                     error,
                 )
-                response_error = RpcError.built_in("APPLICATION_ERROR")
+                response_error = RpcError._built_in(RpcError.ErrorCode.APPLICATION_ERROR)
 
         req = proto_ffi.FfiRequest(
             rpc_method_invocation_response=RpcMethodInvocationResponseRequest(

livekit-rtc/livekit/rtc/room.py

@@ -26,6 +26,7 @@
 from ._proto import room_pb2 as proto_room
 from ._proto.room_pb2 import ConnectionState
 from ._proto.track_pb2 import TrackKind
+from ._proto.rpc_pb2 import RpcMethodInvocationEvent
 from ._utils import BroadcastQueue
 from .e2ee import E2EEManager, E2EEOptions
 from .participant import LocalParticipant, Participant, RemoteParticipant
@@ -438,12 +439,20 @@ async def _listen_task(self) -> None:
             self._room_queue.put_nowait(event)
             await self._room_queue.join()
 
-    def _on_rpc_method_invocation(self, rpc_invocation: proto_ffi.RpcMethodInvocation):
+    def _on_rpc_method_invocation(self, rpc_invocation: RpcMethodInvocationEvent):
+        if self._local_participant is None:
+            logging.warning("Received RPC invocation before local participant was initialized")
+            return
+
         if (
             rpc_invocation.local_participant_handle
             == self._local_participant._ffi_handle.handle
-        ):  # type: ignore
+        ):
             caller = self._remote_participants.get(rpc_invocation.caller_identity)
+            if caller is None:
+                logging.warning(f"Caller {rpc_invocation.caller_identity} not found")
+                return
+
             asyncio.create_task(
                 self._local_participant._handle_rpc_method_invocation(
                     rpc_invocation.invocation_id,

livekit-rtc/livekit/rtc/rpc.py

@@ -77,13 +77,11 @@ def to_proto(self) -> proto_rpc.RpcError:
         return proto_rpc.RpcError(code=self.code, message=self.message, data=self.data)
 
     @classmethod
-    def built_in(
+    def _built_in(
         cls, code: "RpcError.ErrorCode", data: Optional[str] = None
     ) -> "RpcError":
         """
         Creates an error object from the ErrorCode, with an auto-populated message.
-
-        @internal
         """
         message = cls.ErrorMessage[code]
         return cls(code, message, data)