Skip to content

fix(rtc): create the FfiClient singleton under a lock #918

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
longcw merged 1 commit into from
Nov 5, 2026
+13 −3
Merged

fix(rtc): create the FfiClient singleton under a lock #918

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/ffi-client-singleton-lock.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"livekit-rtc": patch
---

Create the shared `FfiClient` under a lock, so rooms connected from several threads at once no longer lose their connect callback and panic the process.
11 changes: 8 additions & 3 deletions livekit-rtc/livekit/rtc/_ffi_client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,12 +231,17 @@ def to_python_level(level: proto_ffi.LogLevel.ValueType) -> Optional[int]:
class FfiClient:
_instance: Optional["FfiClient"] = None
_ffi_disposed: bool = False
_instance_lock = threading.Lock()

@classproperty
def instance(cls) -> "FfiClient":
if cls._instance is None:
cls._instance = FfiClient()
return cls._instance
if cls._instance is not None:
return cls._instance
# threads that race here would each get their own client and lose events sent to the other
with cls._instance_lock:
if cls._instance is None:
cls._instance = FfiClient()
return cls._instance

def __init__(self) -> None:
FfiClient._ffi_disposed = False
Expand Down
Loading