feat: update ffi (#20)

Author: theomonnom

client-sdk-rust

@@ -22,7 +22,9 @@ def on_participant_disconnected(participant: livekit.RemoteParticipant):
                      participant.sid, participant.identity)
 
     @room.listens_to("local_track_published")
-    def on_local_track_published(publication: livekit.LocalTrackPublication, track: livekit.LocalAudioTrack | livekit.LocalVideoTrack):
+    def on_local_track_published(publication: livekit.LocalTrackPublication,
+                                 track: livekit.LocalAudioTrack
+                                 | livekit.LocalVideoTrack):
         logging.info("local track published: %s", publication.sid)
 
     @room.listens_to("active_speakers_changed")
@@ -34,20 +36,24 @@ def on_local_track_unpublished(publication: livekit.LocalTrackPublication):
         logging.info("local track unpublished: %s", publication.sid)
 
     @room.listens_to("track_published")
-    def on_track_published(publication: livekit.RemoteTrackPublication, participant: livekit.RemoteParticipant):
+    def on_track_published(publication: livekit.RemoteTrackPublication,
+                           participant: livekit.RemoteParticipant):
         logging.info("track published: %s from participant %s (%s)",
                      publication.sid, participant.sid, participant.identity)
 
     @room.listens_to("track_unpublished")
-    def on_track_unpublished(publication: livekit.RemoteTrackPublication, participant: livekit.RemoteParticipant):
+    def on_track_unpublished(publication: livekit.RemoteTrackPublication,
+                             participant: livekit.RemoteParticipant):
         logging.info("track unpublished: %s", publication.sid)
 
     # Keep a reference to the streams, otherwise they will be disposed
     audio_stream = None
     video_stream = None
 
     @room.listens_to("track_subscribed")
-    def on_track_subscribed(track: livekit.Track, publication: livekit.RemoteTrackPublication, participant: livekit.RemoteParticipant):
+    def on_track_subscribed(track: livekit.Track,
+                            publication: livekit.RemoteTrackPublication,
+                            participant: livekit.RemoteParticipant):
         logging.info("track subscribed: %s", publication.sid)
         if track.kind == livekit.TrackKind.KIND_VIDEO:
             nonlocal video_stream
@@ -68,19 +74,26 @@ def on_audio_frame(frame: livekit.AudioFrame):
                 pass
 
     @room.listens_to("track_unsubscribed")
-    def on_track_unsubscribed(track: livekit.Track, publication: livekit.RemoteTrackPublication, participant: livekit.RemoteParticipant):
+    def on_track_unsubscribed(track: livekit.Track,
+                              publication: livekit.RemoteTrackPublication,
+                              participant: livekit.RemoteParticipant):
         logging.info("track unsubscribed: %s", publication.sid)
 
     @room.listens_to("data_received")
-    def on_data_received(data: bytes, kind: livekit.DataPacketKind, participant: livekit.Participant):
+    def on_data_received(data: bytes,
+                         kind: livekit.DataPacketKind,
+                         participant: livekit.Participant):
         logging.info("received data from %s: %s", participant.identity, data)
 
     @room.listens_to("connection_quality_changed")
-    def on_connection_quality_changed(participant: livekit.Participant, quality: livekit.ConnectionQuality):
+    def on_connection_quality_changed(participant: livekit.Participant,
+                                      quality: livekit.ConnectionQuality):
         logging.info("connection quality changed for %s", participant.identity)
 
     @room.listens_to("track_subscription_failed")
-    def on_track_subscription_failed(participant: livekit.RemoteParticipant, track_sid: str, error: str):
+    def on_track_subscription_failed(participant: livekit.RemoteParticipant,
+                                     track_sid: str,
+                                     error: str):
         logging.info("track subscription failed: %s %s",
                      participant.identity, error)
 
@@ -111,6 +124,8 @@ def on_reconnected() -> None:
 
         await room.local_participant.publish_data("hello world")
 
+        logging.info("participants: %s", room.participants)
+
         await room.run()
     except livekit.ConnectError as e:
         logging.error("failed to connect to the room: %s", e)

examples/basic_room.py

@@ -39,16 +39,22 @@
 
 # C function types
 ffi_lib.livekit_ffi_request.argtypes = [
-    ctypes.POINTER(ctypes.c_ubyte), ctypes.c_size_t, ctypes.POINTER(ctypes.POINTER(ctypes.c_ubyte)), ctypes.POINTER(ctypes.c_size_t)]
+    ctypes.POINTER(ctypes.c_ubyte),
+    ctypes.c_size_t,
+    ctypes.POINTER(ctypes.POINTER(ctypes.c_ubyte)),
+    ctypes.POINTER(ctypes.c_size_t)
+]
 ffi_lib.livekit_ffi_request.restype = ctypes.c_size_t
 
 ffi_lib.livekit_ffi_drop_handle.argtypes = [ctypes.c_size_t]
 ffi_lib.livekit_ffi_drop_handle.restype = ctypes.c_bool
 
 INVALID_HANDLE = 0
 
+
 @ctypes.CFUNCTYPE(ctypes.c_void_p, ctypes.POINTER(ctypes.c_uint8), ctypes.c_size_t)
-def ffi_event_callback(data_ptr: ctypes.POINTER(ctypes.c_uint8), data_len: ctypes.c_size_t) -> None:  # type: ignore
+def ffi_event_callback(data_ptr: ctypes.POINTER(ctypes.c_uint8),  # type: ignore
+                       data_len: ctypes.c_size_t) -> None:
     event_data = bytes(data_ptr[:int(data_len)])
     event = proto_ffi.FfiEvent()
     event.ParseFromString(event_data)
@@ -71,7 +77,7 @@ def __init__(self) -> None:
 
         req = proto_ffi.FfiRequest()
         cb_callback = int(ctypes.cast(
-            ffi_event_callback, ctypes.c_void_p).value) # type: ignore
+            ffi_event_callback, ctypes.c_void_p).value)  # type: ignore
         req.initialize.event_callback_ptr = cb_callback
         self.request(req)
 
@@ -96,9 +102,8 @@ def request(self, req: proto_ffi.FfiRequest) -> proto_ffi.FfiResponse:
         FfiHandle(handle)
         return resp
 
-class FfiHandle:
-    handle = INVALID_HANDLE
 
+class FfiHandle:
     def __init__(self, handle: int) -> None:
         self.handle = handle
 
@@ -108,4 +113,5 @@ def __del__(self):
                 ctypes.c_size_t(self.handle))
 
 
-ffi_client = FfiClient()
+ffi_client = FfiClient()
+ffi_client.set_event_loop(asyncio.get_event_loop())