@livekit/rtc-node 0.13.19 → 0.13.21

package/dist/room.js

@@ -1,10 +1,11 @@
+import { Mutex } from "@livekit/mutex";
 import EventEmitter from "events";
 import { ByteStreamReader, TextStreamReader } from "./data_streams/stream_reader.js";
 import { E2EEManager, defaultE2EEOptions } from "./e2ee.js";
 import { FfiClient, FfiClientEvent, FfiHandle } from "./ffi_client.js";
 import { log } from "./log.js";
 import { LocalParticipant, RemoteParticipant } from "./participant.js";
-import { EncryptionState } from "./proto/e2ee_pb.js";
+import { EncryptionState, EncryptionType } from "./proto/e2ee_pb.js";
 import {
   ConnectRequest,
   ConnectionState,
@@ -25,6 +26,7 @@ const defaultRoomOptions = new FfiRoomOptions({
   autoSubscribe: true,
   dynacast: false,
   e2ee: void 0,
+  encryption: void 0,
   rtcConfig: void 0,
   adaptiveStream: false,
   joinRetries: 1
@@ -32,6 +34,12 @@ const defaultRoomOptions = new FfiRoomOptions({
 class Room extends EventEmitter {
   constructor() {
     super();
+    /**
+     * used to ensure events are processed sequentially and allow for
+     * the local participant to acquire the lock while doing state updates related to FFI events
+     * before processing the next events
+     */
+    this.roomEventLock = new Mutex();
     this.byteStreamControllers = /* @__PURE__ */ new Map();
     this.textStreamControllers = /* @__PURE__ */ new Map();
     this.byteStreamHandlers = /* @__PURE__ */ new Map();
@@ -39,226 +47,305 @@ class Room extends EventEmitter {
     this.preConnectEvents = [];
     this.connectionState = ConnectionState.CONN_DISCONNECTED;
     this.remoteParticipants = /* @__PURE__ */ new Map();
-    this.onFfiEvent = (ffiEvent) => {
+    this.onFfiEvent = async (ffiEvent) => {
       if (!this.localParticipant || !this.ffiHandle || !this.info) {
         this.preConnectEvents.push(ffiEvent);
         return;
       }
       for (const ev of this.preConnectEvents) {
-        this.processFfiEvent(ev);
+        await this.processFfiEvent(ev);
       }
       this.preConnectEvents = [];
-      this.processFfiEvent(ffiEvent);
+      await this.processFfiEvent(ffiEvent);
     };
-    this.processFfiEvent = (ffiEvent) => {
+    this.processFfiEvent = async (ffiEvent) => {
       if (!this.localParticipant || !this.ffiHandle || !this.info) {
         throw new Error("processFfiEvent called before connect");
       }
-      if (ffiEvent.message.case == "rpcMethodInvocation") {
-        if (ffiEvent.message.value.localParticipantHandle == this.localParticipant.ffi_handle.handle) {
-          this.localParticipant.handleRpcMethodInvocation(
-            ffiEvent.message.value.invocationId,
-            ffiEvent.message.value.method,
-            ffiEvent.message.value.requestId,
-            ffiEvent.message.value.callerIdentity,
-            ffiEvent.message.value.payload,
-            ffiEvent.message.value.responseTimeoutMs
-          );
-        }
-        return;
-      } else if (ffiEvent.message.case != "roomEvent" || ffiEvent.message.value.roomHandle != this.ffiHandle.handle) {
-        return;
-      }
-      const ev = ffiEvent.message.value.message;
-      if (process.env.LIVEKIT_DEBUG_LOG_ROOM_EVENTS) {
-        console.log("Room event:", ev);
-      }
-      if (ev.case == "participantConnected") {
-        const participant = this.createRemoteParticipant(ev.value.info);
-        this.remoteParticipants.set(participant.identity, participant);
-        this.emit("participantConnected" /* ParticipantConnected */, participant);
-      } else if (ev.case == "participantDisconnected") {
-        const participant = this.remoteParticipants.get(ev.value.participantIdentity);
-        this.remoteParticipants.delete(participant.identity);
-        participant.info.disconnectReason = ev.value.disconnectReason;
-        this.emit("participantDisconnected" /* ParticipantDisconnected */, participant);
-      } else if (ev.case == "localTrackPublished") {
-        const publication = this.localParticipant.trackPublications.get(ev.value.trackSid);
-        this.emit("localTrackPublished" /* LocalTrackPublished */, publication, this.localParticipant);
-      } else if (ev.case == "localTrackUnpublished") {
-        const publication = this.localParticipant.trackPublications.get(ev.value.publicationSid);
-        this.localParticipant.trackPublications.delete(ev.value.publicationSid);
-        this.emit("localTrackUnpublished" /* LocalTrackUnpublished */, publication, this.localParticipant);
-      } else if (ev.case == "localTrackSubscribed") {
-        const publication = this.localParticipant.trackPublications.get(ev.value.trackSid);
-        publication.resolveFirstSubscription();
-        this.emit("localTrackSubscribed" /* LocalTrackSubscribed */, publication.track);
-      } else if (ev.case == "trackPublished") {
-        const participant = this.remoteParticipants.get(ev.value.participantIdentity);
-        const publication = new RemoteTrackPublication(ev.value.publication);
-        participant.trackPublications.set(publication.sid, publication);
-        this.emit("trackPublished" /* TrackPublished */, publication, participant);
-      } else if (ev.case == "trackUnpublished") {
-        const participant = this.requireRemoteParticipant(ev.value.participantIdentity);
-        const publication = participant.trackPublications.get(ev.value.publicationSid);
-        participant.trackPublications.delete(ev.value.publicationSid);
-        if (publication) {
-          this.emit("trackUnpublished" /* TrackUnpublished */, publication, participant);
-        }
-      } else if (ev.case == "trackSubscribed") {
-        const ownedTrack = ev.value.track;
-        const trackInfo = ownedTrack.info;
-        const { participant, publication } = this.requirePublicationOfRemoteParticipant(
-          ev.value.participantIdentity,
-          trackInfo.sid
-        );
-        publication.subscribed = true;
-        if (trackInfo.kind == TrackKind.KIND_VIDEO) {
-          publication.track = new RemoteVideoTrack(ownedTrack);
-        } else if (trackInfo.kind == TrackKind.KIND_AUDIO) {
-          publication.track = new RemoteAudioTrack(ownedTrack);
-        }
-        this.emit("trackSubscribed" /* TrackSubscribed */, publication.track, publication, participant);
-      } else if (ev.case == "trackUnsubscribed") {
-        const { participant, publication } = this.requirePublicationOfRemoteParticipant(
-          ev.value.participantIdentity,
-          ev.value.trackSid
-        );
-        const track = publication.track;
-        publication.track = void 0;
-        publication.subscribed = false;
-        this.emit("trackUnsubscribed" /* TrackUnsubscribed */, track, publication, participant);
-      } else if (ev.case == "trackSubscriptionFailed") {
-        const participant = this.requireRemoteParticipant(ev.value.participantIdentity);
-        this.emit("trackSubscriptionFailed" /* TrackSubscriptionFailed */, ev.value.trackSid, participant, ev.value.error);
-      } else if (ev.case == "trackMuted") {
-        const { participant, publication } = this.requirePublicationOfParticipant(
-          ev.value.participantIdentity,
-          ev.value.trackSid
-        );
-        publication.info.muted = true;
-        if (publication.track) {
-          publication.track.info.muted = true;
-        }
-        this.emit("trackMuted" /* TrackMuted */, publication, participant);
-      } else if (ev.case == "trackUnmuted") {
-        const { participant, publication } = this.requirePublicationOfParticipant(
-          ev.value.participantIdentity,
-          ev.value.trackSid
-        );
-        publication.info.muted = false;
-        if (publication.track) {
-          publication.track.info.muted = false;
+      const unlock = await this.roomEventLock.lock();
+      try {
+        if (ffiEvent.message.case == "rpcMethodInvocation") {
+          if (ffiEvent.message.value.localParticipantHandle == this.localParticipant.ffi_handle.handle) {
+            this.localParticipant.handleRpcMethodInvocation(
+              ffiEvent.message.value.invocationId,
+              ffiEvent.message.value.method,
+              ffiEvent.message.value.requestId,
+              ffiEvent.message.value.callerIdentity,
+              ffiEvent.message.value.payload,
+              ffiEvent.message.value.responseTimeoutMs
+            );
+          }
+          return;
+        } else if (ffiEvent.message.case != "roomEvent" || ffiEvent.message.value.roomHandle != this.ffiHandle.handle) {
+          return;
         }
-        this.emit("trackUnmuted" /* TrackUnmuted */, publication, participant);
-      } else if (ev.case == "activeSpeakersChanged") {
-        const activeSpeakers = ev.value.participantIdentities.map(
-          (identity) => this.requireParticipantByIdentity(identity)
-        );
-        this.emit("activeSpeakersChanged" /* ActiveSpeakersChanged */, activeSpeakers);
-      } else if (ev.case == "roomMetadataChanged") {
-        this.info.metadata = ev.value.metadata;
-        this.emit("roomMetadataChanged" /* RoomMetadataChanged */, this.info.metadata);
-      } else if (ev.case == "participantMetadataChanged") {
-        const participant = this.requireParticipantByIdentity(ev.value.participantIdentity);
-        participant.info.metadata = ev.value.metadata;
-        this.emit("participantMetadataChanged" /* ParticipantMetadataChanged */, participant.metadata, participant);
-      } else if (ev.case == "participantNameChanged") {
-        const participant = this.requireParticipantByIdentity(ev.value.participantIdentity);
-        participant.info.name = ev.value.name;
-        this.emit("participantNameChanged" /* ParticipantNameChanged */, participant.name, participant);
-      } else if (ev.case == "participantAttributesChanged") {
-        const participant = this.requireParticipantByIdentity(ev.value.participantIdentity);
-        participant.info.attributes = ev.value.attributes.reduce(
-          (acc, value) => {
-            acc[value.key] = value.value;
-            return acc;
-          },
-          {}
-        );
-        if (Object.keys(ev.value.changedAttributes).length > 0) {
-          const changedAttributes = ev.value.changedAttributes.reduce(
-            (acc, value) => {
-              acc[value.key] = value.value;
-              return acc;
-            },
-            {}
-          );
-          this.emit("participantAttributesChanged" /* ParticipantAttributesChanged */, changedAttributes, participant);
+        const ev = ffiEvent.message.value.message;
+        if (process.env.LIVEKIT_DEBUG_LOG_ROOM_EVENTS) {
+          console.log("Room event:", ev);
         }
-      } else if (ev.case == "connectionQualityChanged") {
-        const participant = this.requireParticipantByIdentity(ev.value.participantIdentity);
-        this.emit("connectionQualityChanged" /* ConnectionQualityChanged */, ev.value.quality, participant);
-      } else if (ev.case == "chatMessage") {
-        const participant = this.retrieveParticipantByIdentity(ev.value.participantIdentity);
-        const { id, message: messageText, timestamp, editTimestamp, generated } = ev.value.message;
-        const message = {
-          id,
-          message: messageText,
-          timestamp: Number(timestamp),
-          editTimestamp: Number(editTimestamp),
-          generated
-        };
-        this.emit("chatMessage" /* ChatMessage */, message, participant);
-      } else if (ev.case == "dataPacketReceived") {
-        const participant = this.remoteParticipants.get(ev.value.participantIdentity);
-        const dataPacket = ev.value.value;
-        switch (dataPacket.case) {
-          case "user":
-            const buffer = FfiClient.instance.copyBuffer(
-              dataPacket.value.data.data.dataPtr,
-              Number(dataPacket.value.data.data.dataLen)
+        if (ev.case == "participantConnected") {
+          const participant = this.createRemoteParticipant(ev.value.info);
+          this.remoteParticipants.set(participant.identity, participant);
+          this.emit("participantConnected" /* ParticipantConnected */, participant);
+        } else if (ev.case == "participantDisconnected") {
+          const participant = this.remoteParticipants.get(ev.value.participantIdentity);
+          if (participant) {
+            this.remoteParticipants.delete(participant.identity);
+            participant.info.disconnectReason = ev.value.disconnectReason;
+            this.emit("participantDisconnected" /* ParticipantDisconnected */, participant);
+          } else {
+            console.log(`RoomEvent.ParticipantDisconnected: Could not find participant`);
+          }
+        } else if (ev.case == "localTrackPublished") {
+          const publication = this.localParticipant.trackPublications.get(ev.value.trackSid);
+          this.emit("localTrackPublished" /* LocalTrackPublished */, publication, this.localParticipant);
+        } else if (ev.case == "localTrackUnpublished") {
+          const publication = this.localParticipant.trackPublications.get(ev.value.publicationSid);
+          this.localParticipant.trackPublications.delete(ev.value.publicationSid);
+          this.emit("localTrackUnpublished" /* LocalTrackUnpublished */, publication, this.localParticipant);
+        } else if (ev.case == "localTrackSubscribed") {
+          const publication = this.localParticipant.trackPublications.get(ev.value.trackSid);
+          if (publication) {
+            publication.resolveFirstSubscription();
+            this.emit("localTrackSubscribed" /* LocalTrackSubscribed */, publication.track);
+          } else {
+            console.warn(
+              `RoomEvent.LocalTrackSubscribed: Publication not found: ${ev.value.trackSid}`
+            );
+          }
+        } else if (ev.case == "trackPublished") {
+          const participant = this.remoteParticipants.get(ev.value.participantIdentity);
+          const publication = new RemoteTrackPublication(ev.value.publication);
+          if (participant) {
+            participant.trackPublications.set(publication.sid, publication);
+          } else {
+            console.warn(
+              `RoomEvent.TrackPublished: Could not find participant: ${ev.value.participantIdentity}`
+            );
+          }
+          this.emit("trackPublished" /* TrackPublished */, publication, participant);
+        } else if (ev.case == "trackUnpublished") {
+          const participant = this.requireRemoteParticipant(ev.value.participantIdentity);
+          const publication = participant.trackPublications.get(ev.value.publicationSid);
+          participant.trackPublications.delete(ev.value.publicationSid);
+          if (publication) {
+            this.emit("trackUnpublished" /* TrackUnpublished */, publication, participant);
+          } else {
+            console.warn(`RoomEvent.TrackUnpublished: Could not find publication`);
+          }
+        } else if (ev.case == "trackSubscribed") {
+          const ownedTrack = ev.value.track;
+          const trackInfo = ownedTrack.info;
+          try {
+            const { participant, publication } = this.requirePublicationOfRemoteParticipant(
+              ev.value.participantIdentity,
+              trackInfo.sid
+            );
+            publication.subscribed = true;
+            if (trackInfo.kind == TrackKind.KIND_VIDEO) {
+              publication.track = new RemoteVideoTrack(ownedTrack);
+            } else if (trackInfo.kind == TrackKind.KIND_AUDIO) {
+              publication.track = new RemoteAudioTrack(ownedTrack);
+            }
+            this.emit("trackSubscribed" /* TrackSubscribed */, publication.track, publication, participant);
+          } catch (e) {
+            console.warn(`RoomEvent.TrackSubscribed: ${e.message}`);
+          }
+        } else if (ev.case == "trackUnsubscribed") {
+          try {
+            const { participant, publication } = this.requirePublicationOfRemoteParticipant(
+              ev.value.participantIdentity,
+              ev.value.trackSid
             );
-            new FfiHandle(dataPacket.value.data.handle.id).dispose();
+            const track = publication.track;
+            publication.track = void 0;
+            publication.subscribed = false;
+            this.emit("trackUnsubscribed" /* TrackUnsubscribed */, track, publication, participant);
+          } catch (e) {
+            console.warn(`RoomEvent.TrackUnsubscribed: ${e.message}`);
+          }
+        } else if (ev.case == "trackSubscriptionFailed") {
+          try {
+            const participant = this.requireRemoteParticipant(ev.value.participantIdentity);
             this.emit(
-              "dataReceived" /* DataReceived */,
-              buffer,
+              "trackSubscriptionFailed" /* TrackSubscriptionFailed */,
+              ev.value.trackSid,
               participant,
-              ev.value.kind,
-              dataPacket.value.topic
+              ev.value.error
             );
-            break;
-          case "sipDtmf":
-            const { code, digit } = dataPacket.value;
-            this.emit("dtmfReceived" /* DtmfReceived */, code, digit, participant);
-            break;
-          default:
-            break;
-        }
-      } else if (ev.case == "e2eeStateChanged") {
-        if (ev.value.state == EncryptionState.INTERNAL_ERROR) {
-          this.emit("encryptionError" /* EncryptionError */, new Error("internal server error"));
-        }
-      } else if (ev.case == "connectionStateChanged") {
-        this.connectionState = ev.value.state;
-        this.emit("connectionStateChanged" /* ConnectionStateChanged */, this.connectionState);
-      } else if (ev.case == "disconnected") {
-        this.emit("disconnected" /* Disconnected */, ev.value.reason);
-      } else if (ev.case == "reconnecting") {
-        this.emit("reconnecting" /* Reconnecting */);
-      } else if (ev.case == "reconnected") {
-        this.emit("reconnected" /* Reconnected */);
-      } else if (ev.case == "roomSidChanged") {
-        this.emit("roomSidChanged" /* RoomSidChanged */, ev.value.sid);
-      } else if (ev.case === "streamHeaderReceived" && ev.value.header) {
-        this.handleStreamHeader(ev.value.header, ev.value.participantIdentity);
-      } else if (ev.case === "streamChunkReceived" && ev.value.chunk) {
-        this.handleStreamChunk(ev.value.chunk);
-      } else if (ev.case === "streamTrailerReceived" && ev.value.trailer) {
-        this.handleStreamTrailer(ev.value.trailer);
-      } else if (ev.case === "roomUpdated") {
-        this.info = ev.value;
-        this.emit("roomUpdated" /* RoomUpdated */);
-      } else if (ev.case === "moved") {
-        this.info = ev.value;
-        this.emit("moved" /* Moved */);
-      } else if (ev.case === "participantsUpdated") {
-        for (const info of ev.value.participants) {
-          const participant = this.retrieveParticipantByIdentity(info.identity);
-          if (participant) {
-            participant.info = info;
+          } catch (e) {
+            console.warn(`RoomEvent.TrackSubscriptionFailed: ${e.message}`);
+          }
+        } else if (ev.case == "trackMuted") {
+          try {
+            const { participant, publication } = this.requirePublicationOfParticipant(
+              ev.value.participantIdentity,
+              ev.value.trackSid
+            );
+            publication.info.muted = true;
+            if (publication.track) {
+              publication.track.info.muted = true;
+            }
+            this.emit("trackMuted" /* TrackMuted */, publication, participant);
+          } catch (e) {
+            console.warn(`RoomEvent.TrackMuted: ${e.message}`);
+          }
+        } else if (ev.case == "trackUnmuted") {
+          try {
+            const { participant, publication } = this.requirePublicationOfParticipant(
+              ev.value.participantIdentity,
+              ev.value.trackSid
+            );
+            publication.info.muted = false;
+            if (publication.track) {
+              publication.track.info.muted = false;
+            }
+            this.emit("trackUnmuted" /* TrackUnmuted */, publication, participant);
+          } catch (e) {
+            console.warn(`RoomEvent.TrackUnmuted: ${e.message}`);
+          }
+        } else if (ev.case == "activeSpeakersChanged") {
+          try {
+            const activeSpeakers = ev.value.participantIdentities.map(
+              (identity) => this.requireParticipantByIdentity(identity)
+            );
+            this.emit("activeSpeakersChanged" /* ActiveSpeakersChanged */, activeSpeakers);
+          } catch (e) {
+            console.warn(`RoomEvent.ActiveSpeakersChanged: ${e.message}`);
+          }
+        } else if (ev.case == "roomMetadataChanged") {
+          this.info.metadata = ev.value.metadata ?? "";
+          this.emit("roomMetadataChanged" /* RoomMetadataChanged */, this.info.metadata);
+        } else if (ev.case == "participantMetadataChanged") {
+          try {
+            const participant = this.requireParticipantByIdentity(ev.value.participantIdentity);
+            participant.info.metadata = ev.value.metadata;
+            this.emit("participantMetadataChanged" /* ParticipantMetadataChanged */, participant.metadata, participant);
+          } catch (e) {
+            console.warn(`RoomEvent.ParticipantMetadataChanged: ${e.message}`);
+          }
+        } else if (ev.case == "participantNameChanged") {
+          try {
+            const participant = this.requireParticipantByIdentity(ev.value.participantIdentity);
+            participant.info.name = ev.value.name;
+            this.emit("participantNameChanged" /* ParticipantNameChanged */, participant.name, participant);
+          } catch (e) {
+            console.warn(`RoomEvent.ParticipantNameChanged: ${e.message}`);
+          }
+        } else if (ev.case == "participantAttributesChanged") {
+          try {
+            const participant = this.requireParticipantByIdentity(ev.value.participantIdentity);
+            participant.info.attributes = ev.value.attributes.reduce(
+              (acc, value) => {
+                acc[value.key] = value.value;
+                return acc;
+              },
+              {}
+            );
+            if (Object.keys(ev.value.changedAttributes).length > 0) {
+              const changedAttributes = ev.value.changedAttributes.reduce(
+                (acc, value) => {
+                  acc[value.key] = value.value;
+                  return acc;
+                },
+                {}
+              );
+              this.emit("participantAttributesChanged" /* ParticipantAttributesChanged */, changedAttributes, participant);
+            }
+          } catch (e) {
+            console.warn(`RoomEvent.ParticipantAttributesChanged: ${e.message}`);
+          }
+        } else if (ev.case == "connectionQualityChanged") {
+          try {
+            const participant = this.requireParticipantByIdentity(ev.value.participantIdentity);
+            this.emit("connectionQualityChanged" /* ConnectionQualityChanged */, ev.value.quality, participant);
+          } catch (e) {
+            console.warn(`RoomEvent.ConnectionQualityChanged: ${e.message}`);
+          }
+        } else if (ev.case == "chatMessage") {
+          const participant = this.retrieveParticipantByIdentity(ev.value.participantIdentity);
+          const { id, message: messageText, timestamp, editTimestamp, generated } = ev.value.message;
+          const message = {
+            id,
+            message: messageText,
+            timestamp: Number(timestamp),
+            editTimestamp: Number(editTimestamp),
+            generated
+          };
+          this.emit("chatMessage" /* ChatMessage */, message, participant);
+        } else if (ev.case == "dataPacketReceived") {
+          const participant = this.remoteParticipants.get(ev.value.participantIdentity);
+          const dataPacket = ev.value.value;
+          switch (dataPacket.case) {
+            case "user":
+              const buffer = FfiClient.instance.copyBuffer(
+                dataPacket.value.data.data.dataPtr,
+                Number(dataPacket.value.data.data.dataLen)
+              );
+              new FfiHandle(dataPacket.value.data.handle.id).dispose();
+              this.emit(
+                "dataReceived" /* DataReceived */,
+                buffer,
+                participant,
+                ev.value.kind,
+                dataPacket.value.topic
+              );
+              break;
+            case "sipDtmf":
+              const { code, digit } = dataPacket.value;
+              this.emit("dtmfReceived" /* DtmfReceived */, code, digit, participant);
+              break;
+            default:
+              break;
+          }
+        } else if (ev.case == "e2eeStateChanged") {
+          if (ev.value.state == EncryptionState.INTERNAL_ERROR) {
+            this.emit("encryptionError" /* EncryptionError */, new Error("internal server error"));
+          }
+        } else if (ev.case == "connectionStateChanged") {
+          this.connectionState = ev.value.state;
+          this.emit("connectionStateChanged" /* ConnectionStateChanged */, this.connectionState);
+        } else if (ev.case == "disconnected") {
+          this.emit("disconnected" /* Disconnected */, ev.value.reason);
+        } else if (ev.case == "reconnecting") {
+          this.emit("reconnecting" /* Reconnecting */);
+        } else if (ev.case == "reconnected") {
+          this.emit("reconnected" /* Reconnected */);
+        } else if (ev.case == "roomSidChanged") {
+          this.emit("roomSidChanged" /* RoomSidChanged */, ev.value.sid);
+        } else if (ev.case === "streamHeaderReceived" && ev.value.header) {
+          this.handleStreamHeader(ev.value.header, ev.value.participantIdentity);
+        } else if (ev.case === "streamChunkReceived" && ev.value.chunk) {
+          this.handleStreamChunk(ev.value.chunk);
+        } else if (ev.case === "streamTrailerReceived" && ev.value.trailer) {
+          this.handleStreamTrailer(ev.value.trailer);
+        } else if (ev.case === "roomUpdated") {
+          this.info = ev.value;
+          this.emit("roomUpdated" /* RoomUpdated */);
+        } else if (ev.case === "moved") {
+          this.info = ev.value;
+          this.emit("moved" /* Moved */);
+        } else if (ev.case === "participantsUpdated") {
+          for (const info of ev.value.participants) {
+            const participant = this.retrieveParticipantByIdentity(info.identity);
+            if (participant) {
+              participant.info = info;
+            }
+          }
+        } else if (ev.case === "participantEncryptionStatusChanged") {
+          try {
+            const participant = this.requireParticipantByIdentity(ev.value.participantIdentity);
+            this.emit(
+              "participantEncryptionStatusChanged" /* ParticipantEncryptionStatusChanged */,
+              !!ev.value.isEncrypted,
+              participant
+            );
+          } catch (e) {
+            console.warn(`RoomEvent.ParticipantEncryptionStatusChanged: ${e.message}`);
           }
         }
+      } finally {
+        unlock();
       }
     };
   }
@@ -341,7 +428,8 @@ class Room extends EventEmitter {
    */
   async connect(url, token, opts) {
     const options = { ...defaultRoomOptions, ...opts };
-    const e2eeOptions = { ...defaultE2EEOptions, ...options.e2ee };
+    const e2eeEnabled = options.encryption || options.e2ee;
+    const e2eeOptions = options.encryption ? { ...defaultE2EEOptions, ...options.encryption } : { ...defaultE2EEOptions, ...options.e2ee };
     const req = new ConnectRequest({
       url,
       token,
@@ -361,10 +449,13 @@ class Room extends EventEmitter {
     switch (cb.message.case) {
       case "result":
         this.ffiHandle = new FfiHandle(cb.message.value.room.handle.id);
-        this.e2eeManager = options.e2ee && new E2EEManager(this.ffiHandle.handle, e2eeOptions);
+        this.e2eeManager = e2eeEnabled && new E2EEManager(this.ffiHandle.handle, e2eeOptions);
         this.info = cb.message.value.room.info;
         this.connectionState = ConnectionState.CONN_CONNECTED;
-        this.localParticipant = new LocalParticipant(cb.message.value.localParticipant);
+        this.localParticipant = new LocalParticipant(
+          cb.message.value.localParticipant,
+          this.roomEventLock
+        );
         for (const pt of cb.message.value.participants) {
           const rp = this.createRemoteParticipant(pt.participant);
           for (const pub of pt.publications) {
@@ -387,7 +478,7 @@ class Room extends EventEmitter {
     if (!this.isConnected) {
       return;
     }
-    FfiClient.instance.request({
+    const res = FfiClient.instance.request({
       message: {
         case: "disconnect",
         value: {
@@ -395,6 +486,9 @@ class Room extends EventEmitter {
         }
       }
     });
+    await FfiClient.instance.waitFor((ev) => {
+      return ev.message.case == "connect" && ev.message.value.asyncId == res.asyncId;
+    });
     FfiClient.instance.removeListener(FfiClientEvent.FfiEvent, this.onFfiEvent);
     this.removeAllListeners();
   }
@@ -599,6 +693,7 @@ var RoomEvent = /* @__PURE__ */ ((RoomEvent2) => {
   RoomEvent2["ParticipantMetadataChanged"] = "participantMetadataChanged";
   RoomEvent2["ParticipantNameChanged"] = "participantNameChanged";
   RoomEvent2["ParticipantAttributesChanged"] = "participantAttributesChanged";
+  RoomEvent2["ParticipantEncryptionStatusChanged"] = "participantEncryptionStatusChanged";
   RoomEvent2["ConnectionQualityChanged"] = "connectionQualityChanged";
   RoomEvent2["DataReceived"] = "dataReceived";
   RoomEvent2["ChatMessage"] = "chatMessage";