@defcomm/meetingsdk 0.1.1 → 0.1.3

package/dist/index.js

@@ -387,6 +387,9 @@ var SFUClient = class {
     this.videoSender = null;
     this.audioSender = null;
     this.screenSender = null;
+    this.audioTransceiver = null;
+    this.cameraTransceiver = null;
+    this.screenTransceiver = null;
     this.iceServers = [];
     this.requestId = 0;
     this.publisherRevision = 0;
@@ -418,6 +421,7 @@ var SFUClient = class {
     this.trackMetadata = /* @__PURE__ */ new Map();
     this.participants = /* @__PURE__ */ new Map();
     this.remoteStreams = /* @__PURE__ */ new Map();
+    this.remoteScreenStreams = /* @__PURE__ */ new Map();
     this.trackToParticipant = /* @__PURE__ */ new Map();
     this.trackToSource = /* @__PURE__ */ new Map();
     this.localTrackIds = /* @__PURE__ */ new Map();
@@ -900,16 +904,18 @@ var SFUClient = class {
       }
       case "screen_share_stopped": {
         const participantId = payload.participant_id;
-        const stream = participantId ? this.remoteStreams.get(participantId) : null;
+        const screenStream = participantId ? this.remoteScreenStreams.get(participantId) : null;
         const trackId = payload.track_id;
-        if (stream) {
-          for (const track of stream.getVideoTracks()) {
-            const source = this.trackToSource.get(this.normalizeRemoteTrackId(track.id));
-            if (!trackId || this.normalizeRemoteTrackId(track.id) === String(trackId) || source === "screen") {
-              stream.removeTrack(track);
+        if (screenStream) {
+          for (const track of screenStream.getVideoTracks()) {
+            if (!trackId || this.normalizeRemoteTrackId(track.id) === String(trackId)) {
+              screenStream.removeTrack(track);
               track.stop();
             }
           }
+          if (screenStream.getTracks().length === 0 && participantId) {
+            this.remoteScreenStreams.delete(participantId);
+          }
         }
         this.onScreenShareStopped(participantId, trackId);
         break;
@@ -978,6 +984,18 @@ var SFUClient = class {
     const config = { iceServers: this.iceServers };
     this.publisher = new RTCPeerConnection(config);
     this.subscriber = new RTCPeerConnection(config);
+    this.audioTransceiver = this.publisher.addTransceiver("audio", {
+      direction: "sendonly"
+    });
+    this.cameraTransceiver = this.publisher.addTransceiver("video", {
+      direction: "sendonly"
+    });
+    this.screenTransceiver = this.publisher.addTransceiver("video", {
+      direction: "inactive"
+    });
+    this.audioSender = this.audioTransceiver.sender;
+    this.videoSender = this.cameraTransceiver.sender;
+    this.screenSender = this.screenTransceiver.sender;
     this.publisher.onicecandidate = (event) => {
       if (event.candidate) this.sendCandidate("publisher", event.candidate);
     };
@@ -1017,25 +1035,61 @@ var SFUClient = class {
       return;
     }
     const participantId = metadata.participant_id;
+    const source = String(
+      metadata.source || this.trackToSource.get(metadata.track_id) || ""
+    ).trim().toLowerCase();
+    if (source === "screen" || source === "screen_share") {
+      let screenStream = this.remoteScreenStreams.get(participantId);
+      if (!screenStream) {
+        screenStream = new MediaStream();
+        this.remoteScreenStreams.set(participantId, screenStream);
+      }
+      for (const existing of screenStream.getVideoTracks()) {
+        if (existing.id !== event.track.id) {
+          screenStream.removeTrack(existing);
+          existing.stop();
+        }
+      }
+      if (!screenStream.getTracks().some((track) => track.id === event.track.id)) {
+        screenStream.addTrack(event.track);
+      }
+      event.track.onended = () => {
+        try {
+          screenStream?.removeTrack(event.track);
+        } catch {
+        }
+        if (screenStream?.getTracks().length === 0) {
+          this.remoteScreenStreams.delete(participantId);
+          this.onScreenShareStopped(
+            participantId,
+            metadata.track_id
+          );
+        }
+      };
+      this.onScreenShareStarted(participantId, metadata);
+      this.onRemoteTrack(event.track, screenStream, {
+        ...metadata,
+        source: "screen"
+      });
+      return;
+    }
+    if (event.track.kind === "video" && source !== "camera") {
+      this.onError(
+        new Error(
+          `Refusing to route unknown remote video source to camera: ${metadata.track_id}`
+        )
+      );
+      return;
+    }
     let remoteStream = this.remoteStreams.get(participantId);
     if (!remoteStream) {
       remoteStream = new MediaStream();
       this.remoteStreams.set(participantId, remoteStream);
     }
-    const source = metadata.source || this.trackToSource.get(metadata.track_id);
-    if (source === "screen") {
-      for (const existing of remoteStream.getVideoTracks()) {
-        if (existing.id !== event.track.id && this.trackToSource.get(existing.id) === "screen") {
-          remoteStream.removeTrack(existing);
-          existing.stop();
-        }
-      }
-    } else {
-      for (const existing of remoteStream.getTracks()) {
-        if (existing.kind === event.track.kind && existing.id !== event.track.id) {
-          remoteStream.removeTrack(existing);
-          existing.stop();
-        }
+    for (const existing of remoteStream.getTracks()) {
+      if (existing.kind === event.track.kind && existing.id !== event.track.id) {
+        remoteStream.removeTrack(existing);
+        existing.stop();
       }
     }
     if (!remoteStream.getTracks().some((track) => track.id === event.track.id)) {
@@ -1047,31 +1101,24 @@ var SFUClient = class {
       } catch {
       }
     };
-    if (source === "screen") {
-      this.onScreenShareStarted(participantId, metadata);
-    }
-    this.onRemoteTrack(event.track, remoteStream, metadata);
+    this.onRemoteTrack(event.track, remoteStream, {
+      ...metadata,
+      source: event.track.kind === "audio" ? "audio" : "camera"
+    });
   }
   normalizeRemoteTrackId(browserTrackId) {
     return browserTrackId?.startsWith("track-") ? browserTrackId.slice("track-".length) : browserTrackId;
   }
   resolveRemoteTrackMetadata(track, stream) {
-    const sfuTrackId = this.normalizeRemoteTrackId(track.id);
-    const exact = this.trackMetadata.get(sfuTrackId);
-    if (exact) return exact;
-    const byTrackId = this.trackMetadata.get(track.id);
-    if (byTrackId) return byTrackId;
-    const matching = [...this.trackMetadata.values()].find(
-      (entry) => entry.kind === track.kind
-    );
-    if (matching) return matching;
-    if (stream?.id) {
-      const participant = this.participants.get(stream.id);
-      if (participant) {
-        return [...this.trackMetadata.values()].find(
-          (entry) => entry.participant_id === participant.participant_id && entry.kind === track.kind
-        ) || null;
-      }
+    const candidates = [
+      this.normalizeRemoteTrackId(track.id),
+      track.id,
+      stream?.id ? this.normalizeRemoteTrackId(stream.id) : null,
+      stream?.id || null
+    ].filter(Boolean);
+    for (const id of candidates) {
+      const metadata = this.trackMetadata.get(id);
+      if (metadata) return metadata;
     }
     return null;
   }
@@ -1202,20 +1249,19 @@ var SFUClient = class {
   }
   async publishExistingTracks(audio = true, video = true) {
     if (!this.publisher || !this.localStream) return;
-    this.audioSender = null;
-    this.videoSender = null;
-    for (const track of this.localStream.getTracks()) {
-      if (track.kind === "audio" && !audio) continue;
-      if (track.kind === "video" && !video) continue;
-      const sender = this.publisher.addTrack(track, this.localStream);
-      if (track.kind === "audio") this.audioSender = sender;
-      if (track.kind === "video") this.videoSender = sender;
-    }
-    if (this.screenStream?.getVideoTracks()[0]) {
-      const screenTrack = this.screenStream.getVideoTracks()[0];
-      this.screenSender = this.publisher.addTrack(screenTrack, this.screenStream);
-    }
-    if (!this.publisher.getSenders().length) return;
+    if (!this.audioTransceiver || !this.cameraTransceiver || !this.screenTransceiver) {
+      throw new Error("Publisher transceivers are not initialized");
+    }
+    const audioTrack = this.localStream.getAudioTracks().find((track) => track.readyState === "live");
+    const cameraTrack = this.localStream.getVideoTracks().find((track) => track.readyState === "live");
+    const screenTrack = this.screenStream?.getVideoTracks().find((track) => track.readyState === "live");
+    await this.audioSender?.replaceTrack(audio && audioTrack ? audioTrack : null);
+    this.audioTransceiver.direction = audio && audioTrack ? "sendonly" : "inactive";
+    await this.videoSender?.replaceTrack(video && cameraTrack ? cameraTrack : null);
+    this.cameraTransceiver.direction = video && cameraTrack ? "sendonly" : "inactive";
+    await this.screenSender?.replaceTrack(screenTrack || null);
+    this.screenTransceiver.direction = screenTrack ? "sendonly" : "inactive";
+    if (!audioTrack && !cameraTrack && !screenTrack) return;
     const offer = await this.publisher.createOffer();
     await this.publisher.setLocalDescription(offer);
     this.send({
@@ -1225,44 +1271,86 @@ var SFUClient = class {
         sdp: offer.sdp
       }
     });
-    if (this.screenStream?.getVideoTracks()[0]) {
+    if (screenTrack) {
       this.send({ type: "start_screen_share" });
     }
   }
   async shareScreen() {
-    if (!this.publisher) throw new Error("Publisher PeerConnection is not initialized");
-    if (this.screenStream) return this.screenStream;
-    this.screenStream = await navigator.mediaDevices.getDisplayMedia({ video: true });
-    const screenTrack = this.screenStream.getVideoTracks()[0];
-    if (!screenTrack) throw new Error("Screen share returned no video track");
-    this.screenSender = this.publisher.addTrack(screenTrack, this.screenStream);
-    const offer = await this.publisher.createOffer();
-    await this.publisher.setLocalDescription(offer);
-    this.send({
-      type: "publish_offer",
-      payload: {
-        revision: ++this.publisherRevision,
-        sdp: offer.sdp
-      }
+    if (!this.publisher) {
+      throw new Error("Publisher PeerConnection is not initialized");
+    }
+    if (!this.screenTransceiver || !this.screenSender) {
+      throw new Error("Screen transceiver is not initialized");
+    }
+    if (this.screenStream) {
+      return this.screenStream;
+    }
+    const screenStream = await navigator.mediaDevices.getDisplayMedia({
+      video: true,
+      audio: false
     });
-    this.send({ type: "start_screen_share" });
-    screenTrack.onended = () => {
-      void this.stopScreenShare();
-    };
-    return this.screenStream;
-  }
-  async stopScreenShare() {
-    if (!this.screenStream) return;
-    const screenTrack = this.screenStream.getVideoTracks()[0];
-    if (screenTrack) screenTrack.onended = null;
-    if (this.screenSender && this.publisher) {
+    const screenTrack = screenStream.getVideoTracks()[0];
+    if (!screenTrack) {
+      screenStream.getTracks().forEach((track) => track.stop());
+      throw new Error("Screen share returned no video track");
+    }
+    this.screenStream = screenStream;
+    try {
+      if (!this.send({ type: "start_screen_share" })) {
+        throw new Error("Failed to signal start_screen_share");
+      }
+      await this.screenSender.replaceTrack(screenTrack);
+      this.screenTransceiver.direction = "sendonly";
+      const offer = await this.publisher.createOffer();
+      await this.publisher.setLocalDescription(offer);
+      this.send({
+        type: "publish_offer",
+        payload: {
+          revision: ++this.publisherRevision,
+          sdp: offer.sdp
+        }
+      });
+      screenTrack.onended = () => {
+        void this.stopScreenShare();
+      };
+      console.info("[publisher] Screen track attached", {
+        screenTrackId: screenTrack.id,
+        cameraTrackId: this.videoSender?.track?.id,
+        screenMid: this.screenTransceiver.mid,
+        cameraMid: this.cameraTransceiver?.mid
+      });
+      return this.screenStream;
+    } catch (error) {
       try {
-        this.publisher.removeTrack(this.screenSender);
+        await this.screenSender.replaceTrack(null);
       } catch {
       }
-      this.screenSender = null;
+      this.screenTransceiver.direction = "inactive";
+      screenStream.getTracks().forEach((track) => track.stop());
+      this.screenStream = null;
       try {
-        const offer = await this.publisher.createOffer();
+        this.send({ type: "stop_screen_share" });
+      } catch {
+      }
+      throw error;
+    }
+  }
+  async stopScreenShare() {
+    if (!this.screenStream && !this.screenSender?.track) return;
+    const screenTrack = this.screenSender?.track || null;
+    if (screenTrack) screenTrack.onended = null;
+    try {
+      await this.screenSender?.replaceTrack(null);
+    } catch (error) {
+      this.onError(error);
+    }
+    if (this.screenTransceiver) {
+      this.screenTransceiver.direction = "inactive";
+    }
+    this.send({ type: "stop_screen_share" });
+    try {
+      const offer = await this.publisher?.createOffer();
+      if (offer && this.publisher) {
         await this.publisher.setLocalDescription(offer);
         this.send({
           type: "publish_offer",
@@ -1271,13 +1359,15 @@ var SFUClient = class {
             sdp: offer.sdp
           }
         });
-        this.send({ type: "stop_screen_share" });
-      } catch (error) {
-        this.onError(error);
       }
+    } catch (error) {
+      this.onError(error);
     }
-    this.screenStream.getTracks().forEach((track) => track.stop());
+    this.screenStream?.getTracks().forEach((track) => track.stop());
     this.screenStream = null;
+    if (this.currentParticipantId) {
+      this.onScreenShareStopped(this.currentParticipantId);
+    }
   }
   muteAudio(muted) {
     this.localStream?.getAudioTracks().forEach((track) => {
@@ -1363,6 +1453,11 @@ var SFUClient = class {
       stream.getTracks().forEach((track) => track.stop());
       this.remoteStreams.delete(participantId);
     }
+    const screenStream = this.remoteScreenStreams.get(participantId);
+    if (screenStream) {
+      screenStream.getTracks().forEach((track) => track.stop());
+      this.remoteScreenStreams.delete(participantId);
+    }
     for (const [trackId, metadata] of this.trackMetadata) {
       if (metadata.participant_id === participantId) {
         this.trackMetadata.delete(trackId);
@@ -1438,6 +1533,9 @@ var SFUClient = class {
     this.videoSender = null;
     this.audioSender = null;
     this.screenSender = null;
+    this.audioTransceiver = null;
+    this.cameraTransceiver = null;
+    this.screenTransceiver = null;
     this.pendingIce = { publisher: [], subscriber: [] };
     this.offerQueue = [];
     this.subscriberNegotiating = false;
@@ -1460,6 +1558,10 @@ var SFUClient = class {
       stream.getTracks().forEach((track) => track.stop());
     }
     this.remoteStreams.clear();
+    for (const stream of this.remoteScreenStreams.values()) {
+      stream.getTracks().forEach((track) => track.stop());
+    }
+    this.remoteScreenStreams.clear();
     this.trackMetadata.clear();
     this.trackToParticipant.clear();
     this.trackToSource.clear();
@@ -1500,7 +1602,7 @@ var SFUClient = class {
 
 // src/core/VideoCore.ts
 var VideoSDKCore = class {
-  constructor(events = {}, apiBase = SDK_CONFIG.apiBase || "https://api.example.com/api", wsBase = SDK_CONFIG.wsBase || "wss://api.example.com/ws") {
+  constructor(events = {}, apiBase = SDK_CONFIG.apiBase, wsBase = SDK_CONFIG.wsBase) {
     this.events = events;
     this.apiBase = apiBase;
     this.wsBase = wsBase;
@@ -1516,6 +1618,8 @@ var VideoSDKCore = class {
     this.intentionalDisconnect = false;
     this.remoteStreams = /* @__PURE__ */ new Map();
     this.remoteScreenStreams = /* @__PURE__ */ new Map();
+    this.joinPromise = null;
+    this.disconnectPromise = null;
     this.state = new MeetingState();
     this.events = events;
     this.activeSpeakerDetector = new ActiveSpeakerDetector({
@@ -1549,7 +1653,7 @@ var VideoSDKCore = class {
     this.events.onError?.(err);
     console.error("[MeetingSDK Error]", err);
   }
-  // ============ LOCAL MEDIA ============
+  // LOCAL MEDIA
   async initLocal(video, name) {
     this.participantName = name;
     try {
@@ -1598,7 +1702,7 @@ var VideoSDKCore = class {
     });
     this.state.localStream = this.localStream;
   }
-  // ============ CONNECTION / SIGNALLING ============
+  // ROOM MANAGEMENT
   async createRoom(input) {
     const client = this.sfuClient ?? new SFUClient({
       apiBase: this.apiBase,
@@ -1623,6 +1727,7 @@ var VideoSDKCore = class {
     });
     return client.deleteRoom(roomCode);
   }
+  // JOIN
   async joinMeeting(config) {
     const {
       roomId,
@@ -1637,6 +1742,28 @@ var VideoSDKCore = class {
     if (userId) {
       this.myId = userId;
     }
+    if (this.sfuClient && this.room.id === roomId && this.sfuClient.getConnectionState() === "connected") {
+      console.info("[SDK] Already connected; duplicate join ignored", {
+        roomId,
+        userId: this.myId
+      });
+      return;
+    }
+    if (this.joinPromise) {
+      console.info(
+        "[SDK] Join already in progress; waiting for existing join",
+        {
+          roomId,
+          userId: this.myId
+        }
+      );
+      return this.joinPromise;
+    }
+    if (this.sfuClient && this.room.id && this.room.id !== roomId) {
+      throw new Error(
+        `Already connected to room ${this.room.id}. Leave the current meeting before joining another room.`
+      );
+    }
     this.intentionalDisconnect = false;
     this.participantName = name;
     this.room.id = roomId;
@@ -1658,19 +1785,43 @@ var VideoSDKCore = class {
       track.enabled = !videoMuted;
     });
     this.updateLocalMedia(audioMuted, videoMuted);
-    return this.connect(roomId, name);
+    const promise = this.connect(roomId, name);
+    this.joinPromise = promise;
+    try {
+      await promise;
+    } finally {
+      if (this.joinPromise === promise) {
+        this.joinPromise = null;
+      }
+    }
   }
+  // SFU CONNECTION
   async connect(roomId, name) {
     if (this.sfuClient) {
-      await this.sfuClient.leave();
-      this.sfuClient = null;
+      const state = this.sfuClient.getConnectionState();
+      if (this.room.id === roomId && (state === "connecting" || state === "connected" || state === "reconnecting")) {
+        console.info(
+          "[SDK] Existing SFU connection is active; connect ignored",
+          {
+            roomId,
+            state
+          }
+        );
+        return;
+      }
+      throw new Error(
+        `SFU client already exists in state "${state}". Disconnect explicitly before creating another connection.`
+      );
     }
     const client = new SFUClient({
       apiBase: this.apiBase,
       wsBase: this.wsBase,
       userId: this.myId,
       autoSubscribe: true,
-      onStateChange: (state) => this.handleSFUState(state),
+      // CONNECTION STATE
+      onStateChange: (state) => {
+        this.handleSFUState(state);
+      },
       onConnected: (payload, resumed) => {
         console.log(`[SFU] ${resumed ? "Resumed" : "Joined"} room`, payload);
         this.state.updateLocalParticipant({
@@ -1684,6 +1835,7 @@ var VideoSDKCore = class {
       onReconnecting: (attempt) => {
         console.warn(`[SFU] Reconnecting, attempt ${attempt}`);
       },
+      // ADMISSION CONTROL
       onJoinPending: (info) => {
         console.log("[SFU] Join request pending", info);
         this.events.onEntryRequested?.({
@@ -1696,7 +1848,10 @@ var VideoSDKCore = class {
         console.log("[SFU] Join approved", requestId);
         this.events.onJoinApproved?.(requestId);
         this.events.onEntryResponded?.(
-          { participantId: this.myId, decision: "approved" },
+          {
+            participantId: this.myId,
+            decision: "approved"
+          },
           "approved"
         );
       },
@@ -1704,13 +1859,19 @@ var VideoSDKCore = class {
         console.warn("[SFU] Join rejected", requestId, reason);
         this.events.onJoinRejected?.(requestId);
         this.events.onEntryResponded?.(
-          { participantId: this.myId, decision: "rejected" },
+          {
+            participantId: this.myId,
+            decision: "rejected"
+          },
           "rejected"
         );
         this.emitError(
           "JOIN_REJECTED",
           reason || "Your request to join was rejected",
-          { requestId, reason },
+          {
+            requestId,
+            reason
+          },
           false
         );
       },
@@ -1718,16 +1879,21 @@ var VideoSDKCore = class {
         const requestId = request?.request_id || request?.requestId;
         const userId = request?.user_id || request?.userId;
         const nameValue = request?.user_metadata?.name || request?.display_name || request?.name || "Participant";
-        if (!requestId || !userId) return;
+        if (!requestId || !userId) {
+          return;
+        }
         this.events.onEntryRequested?.({
           requestId,
           userId,
           name: nameValue
         });
       },
+      // PARTICIPANTS
       onParticipantJoined: (participant) => {
         const pid = participant.participant_id;
-        if (!pid || pid === this.myId) return;
+        if (!pid || pid === this.myId) {
+          return;
+        }
         const pname = participant.user_metadata?.name || participant.display_name || "Participant";
         this.state.addParticipant({
           id: pid,
@@ -1746,9 +1912,13 @@ var VideoSDKCore = class {
         });
       },
       onParticipantPresence: (participantId, presence) => {
-        if (participantId === this.myId) return;
+        if (participantId === this.myId) {
+          return;
+        }
         const current = this.state.getParticipant(participantId);
-        if (!current) return;
+        if (!current) {
+          return;
+        }
         const connectionState = presence === "reconnecting" ? "reconnecting" : presence === "connected" || presence === "online" ? "connected" : presence === "disconnected" ? "disconnected" : current.connectionState;
         this.state.updateParticipantMedia(participantId, {
           stream: current.media?.stream ?? null
@@ -1764,19 +1934,24 @@ var VideoSDKCore = class {
       },
       onParticipantLeft: (participant) => {
         const pid = typeof participant === "string" ? participant : participant.participant_id;
-        if (!pid) return;
+        if (!pid) {
+          return;
+        }
         console.log("[SFU] Participant permanently left", pid);
         this.cleanupRemoteParticipant(pid);
         this.state.removeParticipant(pid);
         this.events.onUserLeft?.(pid);
       },
+      // TRACKS
       onTrackPublished: (track) => {
         console.log("[SFU] Track published", track);
       },
       onTrackUnpublished: (track) => {
         console.log("[SFU] Track unpublished", track);
         const pid = track.participant_id;
-        if (!pid) return;
+        if (!pid) {
+          return;
+        }
         const current = this.state.getParticipant(pid);
         if (track.source === "screen") {
           const screen = this.remoteScreenStreams.get(pid);
@@ -1790,7 +1965,9 @@ var VideoSDKCore = class {
           this.events.onScreenShareStopped?.(pid);
           return;
         }
-        if (!current) return;
+        if (!current) {
+          return;
+        }
         this.state.updateParticipantMedia(pid, {
           stream: current.media?.stream ?? null,
           micEnabled: track.kind === "audio" ? false : current.media?.micEnabled ?? true,
@@ -1799,9 +1976,13 @@ var VideoSDKCore = class {
       },
       onTrackStateChanged: (track) => {
         const pid = track.participant_id;
-        if (!pid || pid === this.myId) return;
+        if (!pid || pid === this.myId) {
+          return;
+        }
         const current = this.state.getParticipant(pid);
-        if (!current) return;
+        if (!current) {
+          return;
+        }
         if (track.source === "audio") {
           this.state.updateParticipantMedia(pid, {
             stream: current.media?.stream ?? null,
@@ -1817,17 +1998,22 @@ var VideoSDKCore = class {
         }
         this.events.onTrackStateChanged?.(track);
       },
+      // RECORDING
       onRecordingStarted: (recording) => {
         this.events.onRecordingStarted?.(recording);
       },
       onRecordingStopped: (recording) => {
         this.events.onRecordingStopped?.(recording);
       },
+      // REMOTE MEDIA
       onRemoteTrack: (track, stream, metadata) => {
         this.handleRemoteTrack(track, stream, metadata);
       },
+      // SCREEN SHARE
       onScreenShareStarted: (participantId, track) => {
-        if (participantId === this.myId) return;
+        if (participantId === this.myId) {
+          return;
+        }
         console.log("[SFU] Screen share started", participantId, track);
         const current = this.state.getParticipant(participantId);
         if (current) {
@@ -1838,7 +2024,9 @@ var VideoSDKCore = class {
         }
       },
       onScreenShareStopped: (participantId) => {
-        if (participantId === this.myId) return;
+        if (participantId === this.myId) {
+          return;
+        }
         const screen = this.remoteScreenStreams.get(participantId);
         screen?.getTracks().forEach((track) => track.stop());
         this.remoteScreenStreams.delete(participantId);
@@ -1849,6 +2037,7 @@ var VideoSDKCore = class {
         });
         this.events.onScreenShareStopped?.(participantId);
       },
+      // ERROR
       onError: (error) => {
         console.error("[SFU] Error:", error);
         this.emitError(
@@ -1861,11 +2050,12 @@ var VideoSDKCore = class {
     });
     this.sfuClient = client;
     client.setLocalStream(this.localStream);
-    return client.getToken(roomId, {
+    await client.getToken(roomId, {
       displayName: name,
       userId: this.myId
     });
   }
+  // SFU STATE
   handleSFUState(state) {
     this.events.onConnectionStateChanged?.(state);
     if (state === "reconnecting") {
@@ -1884,9 +2074,12 @@ var VideoSDKCore = class {
       );
     }
   }
+  // REMOTE TRACKS
   handleRemoteTrack(track, stream, metadata) {
     const participantId = metadata?.participant_id;
-    if (!participantId || participantId === this.myId) return;
+    if (!participantId || participantId === this.myId) {
+      return;
+    }
     const source = metadata.source;
     if (source === "screen") {
       let screenStream = this.remoteScreenStreams.get(participantId);
@@ -1937,36 +2130,41 @@ var VideoSDKCore = class {
     this.events.onTrack?.(remoteStream, participantId);
     track.onended = () => {
       if (track.kind === "video") {
-        const participant2 = this.state.getParticipant(participantId);
         this.state.updateParticipantMedia(participantId, {
           camEnabled: false,
           stream: remoteStream
         });
         return;
       }
-      const participant = this.state.getParticipant(participantId);
       this.state.updateParticipantMedia(participantId, {
         micEnabled: false,
         stream: remoteStream
       });
     };
   }
+  // MEETING
   getMeeting() {
     return this.room;
   }
-  // ============ ADMISSION CONTROL ============
+  // ADMISSION CONTROL
   async approveJoinRequest(requestId) {
-    if (!this.sfuClient) throw new Error("SFU client is not connected");
+    if (!this.sfuClient) {
+      throw new Error("SFU client is not connected");
+    }
     return this.sfuClient.approveJoinRequest(requestId);
   }
   async rejectJoinRequest(requestId, reason) {
-    if (!this.sfuClient) throw new Error("SFU client is not connected");
+    if (!this.sfuClient) {
+      throw new Error("SFU client is not connected");
+    }
     return this.sfuClient.rejectJoinRequest(requestId, reason);
   }
-  // ============ MEDIA CONTROL ============
+  // MEDIA CONTROL
   toggleMic() {
     const mediaState = this.state.localParticipant?.media;
-    if (!mediaState || !this.localStream) return;
+    if (!mediaState || !this.localStream) {
+      return;
+    }
     const nextEnabled = !mediaState.micEnabled;
     this.localStream.getAudioTracks().forEach((track) => {
       track.enabled = nextEnabled;
@@ -1974,14 +2172,18 @@ var VideoSDKCore = class {
     this.state.updateLocalParticipant({
       id: this.myId,
       name: this.participantName,
-      media: { micEnabled: nextEnabled }
+      media: {
+        micEnabled: nextEnabled
+      }
     });
     this.sfuClient?.muteAudio(!nextEnabled);
     this.events.onMicToggled?.(this.myId, nextEnabled);
   }
   toggleCam() {
     const mediaState = this.state.localParticipant?.media;
-    if (!mediaState || !this.localStream) return;
+    if (!mediaState || !this.localStream) {
+      return;
+    }
     const nextEnabled = !mediaState.camEnabled;
     this.localStream.getVideoTracks().forEach((track) => {
       track.enabled = nextEnabled;
@@ -1989,12 +2191,14 @@ var VideoSDKCore = class {
     this.state.updateLocalParticipant({
       id: this.myId,
       name: this.participantName,
-      media: { camEnabled: nextEnabled }
+      media: {
+        camEnabled: nextEnabled
+      }
     });
     this.sfuClient?.muteVideo(!nextEnabled);
     this.events.onCamToggled?.(this.myId, nextEnabled);
   }
-  // ============ SCREEN SHARING ============
+  // SCREEN SHARING
   async startScreenShare() {
     try {
       if (!navigator.mediaDevices?.getDisplayMedia) {
@@ -2026,7 +2230,9 @@ var VideoSDKCore = class {
     }
   }
   stopScreenShare() {
-    if (!this.screenStream) return;
+    if (!this.screenStream) {
+      return;
+    }
     void this.sfuClient?.stopScreenShare();
     this.screenStream.getTracks().forEach((track) => track.stop());
     this.screenStream = null;
@@ -2039,7 +2245,7 @@ var VideoSDKCore = class {
       }
     });
   }
-  // ============ RECORDING ============
+  // RECORDING
   async startRecording() {
     if (!this.sfuClient) {
       throw new Error("SFU client is not connected");
@@ -2058,7 +2264,7 @@ var VideoSDKCore = class {
     }
     return this.sfuClient.getRecordingStatus();
   }
-  // ============ CHAT ============
+  // CHAT
   sendChatMessage(payload) {
     if (!this.sfuClient) {
       console.warn("SFU Client not connected");
@@ -2077,7 +2283,7 @@ var VideoSDKCore = class {
     this.state.addChatMessage(msg);
     this.events.onChatMessage?.(msg);
   }
-  // ============ CLEANUP ============
+  // CLEANUP
   cleanupRemoteParticipant(participantId) {
     this.activeSpeakerDetector.removeParticipant(participantId);
     const stream = this.remoteStreams.get(participantId);
@@ -2087,16 +2293,34 @@ var VideoSDKCore = class {
     screen?.getTracks().forEach((track) => track.stop());
     this.remoteScreenStreams.delete(participantId);
   }
+  // DISCONNECT
   async disconnect() {
+    if (this.disconnectPromise) {
+      return this.disconnectPromise;
+    }
+    this.disconnectPromise = this.performDisconnect();
+    try {
+      await this.disconnectPromise;
+    } finally {
+      this.disconnectPromise = null;
+    }
+  }
+  async performDisconnect() {
     this.intentionalDisconnect = true;
-    await this.sfuClient?.leave();
+    this.joinPromise = null;
+    const client = this.sfuClient;
     this.sfuClient = null;
+    if (client) {
+      await client.leave();
+    }
     if (this.localStream) {
       this.localStream.getTracks().forEach((track) => track.stop());
       this.localStream = null;
     }
-    this.screenStream?.getTracks().forEach((track) => track.stop());
-    this.screenStream = null;
+    if (this.screenStream) {
+      this.screenStream.getTracks().forEach((track) => track.stop());
+      this.screenStream = null;
+    }
     this.isScreenSharing = false;
     for (const stream of this.remoteStreams.values()) {
       stream.getTracks().forEach((track) => track.stop());