@defcomm/meetingsdk 0.2.3 → 0.2.4

package/dist/index.d.mts

@@ -272,6 +272,7 @@ interface SFUClientOptions {
     onScreenShareStarted?: (participantId: string, track?: TrackInfo) => void;
     onScreenShareStopped?: (participantId: string, trackId?: string) => void;
     onTrackStateChanged?: (track: TrackInfo) => void;
+    onParticipantMediaState?: (participantId: string, audioMuted: boolean, videoMuted: boolean) => void;
     onRecordingStarted?: (recording: {
         recording_id: string;
         started_at: string;
@@ -295,6 +296,9 @@ declare class SFUClient {
     private localStream;
     private screenStream;
     private videoSender;
+    private audioMuted;
+    private videoMuted;
+    private activeRecording;
     private audioSender;
     private screenSender;
     private audioTransceiver;
@@ -354,6 +358,7 @@ declare class SFUClient {
     private onScreenShareStarted;
     private onScreenShareStopped;
     private onTrackStateChanged;
+    private onParticipantMediaState;
     private onRecordingStarted;
     private onRecordingStopped;
     private onRoomState;
@@ -392,6 +397,8 @@ declare class SFUClient {
         displayName?: string;
         avatarUrl?: string;
         participantId?: string;
+        audioMuted?: boolean;
+        videoMuted?: boolean;
     }): Promise<void>;
     private refreshAccessToken;
     private connect;

package/dist/index.d.ts

@@ -272,6 +272,7 @@ interface SFUClientOptions {
     onScreenShareStarted?: (participantId: string, track?: TrackInfo) => void;
     onScreenShareStopped?: (participantId: string, trackId?: string) => void;
     onTrackStateChanged?: (track: TrackInfo) => void;
+    onParticipantMediaState?: (participantId: string, audioMuted: boolean, videoMuted: boolean) => void;
     onRecordingStarted?: (recording: {
         recording_id: string;
         started_at: string;
@@ -295,6 +296,9 @@ declare class SFUClient {
     private localStream;
     private screenStream;
     private videoSender;
+    private audioMuted;
+    private videoMuted;
+    private activeRecording;
     private audioSender;
     private screenSender;
     private audioTransceiver;
@@ -354,6 +358,7 @@ declare class SFUClient {
     private onScreenShareStarted;
     private onScreenShareStopped;
     private onTrackStateChanged;
+    private onParticipantMediaState;
     private onRecordingStarted;
     private onRecordingStopped;
     private onRoomState;
@@ -392,6 +397,8 @@ declare class SFUClient {
         displayName?: string;
         avatarUrl?: string;
         participantId?: string;
+        audioMuted?: boolean;
+        videoMuted?: boolean;
     }): Promise<void>;
     private refreshAccessToken;
     private connect;

package/dist/index.js

@@ -385,6 +385,9 @@ var SFUClient = class {
     this.localStream = null;
     this.screenStream = null;
     this.videoSender = null;
+    this.audioMuted = false;
+    this.videoMuted = false;
+    this.activeRecording = null;
     this.audioSender = null;
     this.screenSender = null;
     this.audioTransceiver = null;
@@ -405,7 +408,7 @@ var SFUClient = class {
     this.joiningWithResume = false;
     this.reconnectTimer = null;
     this.reconnectAttempt = 0;
-    this.maxReconnectAttempts = 8;
+    this.maxReconnectAttempts = 6;
     this.reconnectBaseMs = 750;
     this.joinWaiter = null;
     this.transportRecoveryInProgress = false;
@@ -468,6 +471,8 @@ var SFUClient = class {
     });
     this.onTrackStateChanged = options.onTrackStateChanged || (() => {
     });
+    this.onParticipantMediaState = options.onParticipantMediaState || (() => {
+    });
     this.onRecordingStarted = options.onRecordingStarted || (() => {
     });
     this.onRecordingStopped = options.onRecordingStopped || (() => {
@@ -615,9 +620,13 @@ var SFUClient = class {
       this.resumeToken = null;
     }
     this.room = nextRoom;
+    this.audioMuted = Boolean(options.audioMuted);
+    this.videoMuted = Boolean(options.videoMuted);
     this.joinOptions = {
       displayName: options.displayName,
-      avatarUrl: options.avatarUrl
+      avatarUrl: options.avatarUrl,
+      audioMuted: this.audioMuted,
+      videoMuted: this.videoMuted
     };
     if (options.participantId) this.participantId = options.participantId;
     if (!this.resumeToken) {
@@ -686,7 +695,9 @@ var SFUClient = class {
         room_code: this.room,
         resume_token: this.resumeToken,
         display_name: options.displayName,
-        avatar_url: options.avatarUrl
+        avatar_url: options.avatarUrl,
+        audio_muted: this.audioMuted,
+        video_muted: this.videoMuted
       };
       if (this.pendingJoinRequestId) {
         this.send({
@@ -727,8 +738,20 @@ var SFUClient = class {
   scheduleReconnect() {
     if (this.reconnectTimer || this.intentionalClose) return;
     if (this.reconnectAttempt >= this.maxReconnectAttempts) {
+      const error = new Error("SFU reconnect attempts exhausted");
+      console.error("[SFU] Reconnect attempts exhausted; leaving meeting", error);
+      this.intentionalClose = true;
+      this.stopHeartbeat();
+      this.stopRoomStateSync();
+      this.cleanupAll();
       this.setState("disconnected");
-      this.failJoin(new Error("SFU reconnect attempts exhausted"));
+      this.onError({
+        code: "RECONNECT_TIMEOUT",
+        message: error.message,
+        recoverable: false
+      });
+      this.onDisconnected();
+      this.failJoin(error);
       return;
     }
     this.reconnectAttempt += 1;
@@ -800,7 +823,9 @@ var SFUClient = class {
               room_code: this.room,
               resume_token: this.resumeToken,
               display_name: this.joinOptions.displayName,
-              avatar_url: this.joinOptions.avatarUrl
+              avatar_url: this.joinOptions.avatarUrl,
+              audio_muted: this.audioMuted,
+              video_muted: this.videoMuted
             }
           });
         }
@@ -875,22 +900,8 @@ var SFUClient = class {
         if (!track?.track_id) break;
         this.rememberTrack(track);
         if (track.participant_id === this.currentParticipantId) {
-          if (track.source === "audio") {
-            this.localTrackIds.set("audio", track.track_id);
-            const muted = !(this.localStream?.getAudioTracks()[0]?.enabled ?? true);
-            this.send({
-              type: "track_state",
-              payload: { track_id: track.track_id, muted }
-            });
-          }
-          if (track.source === "camera") {
-            this.localTrackIds.set("camera", track.track_id);
-            const muted = !(this.localStream?.getVideoTracks()[0]?.enabled ?? true);
-            this.send({
-              type: "track_state",
-              payload: { track_id: track.track_id, muted }
-            });
-          }
+          if (track.source === "audio") this.localTrackIds.set("audio", track.track_id);
+          if (track.source === "camera") this.localTrackIds.set("camera", track.track_id);
           if (track.source === "screen")
             this.localTrackIds.set("screen", track.track_id);
           break;
@@ -919,6 +930,27 @@ var SFUClient = class {
         this.onTrackUnpublished(track);
         break;
       }
+      case "participant_media_state": {
+        const participantId = payload.participant_id;
+        if (!participantId) break;
+        const participant = this.participants.get(participantId);
+        if (participant) {
+          participant.audio_muted = Boolean(payload.audio_muted);
+          participant.video_muted = Boolean(payload.video_muted);
+          this.participants.set(participantId, participant);
+        }
+        for (const track of this.trackMetadata.values()) {
+          if (track.participant_id !== participantId) continue;
+          if (track.source === "audio") track.muted = Boolean(payload.audio_muted);
+          if (track.source === "camera") track.muted = Boolean(payload.video_muted);
+        }
+        this.onParticipantMediaState(
+          participantId,
+          Boolean(payload.audio_muted),
+          Boolean(payload.video_muted)
+        );
+        break;
+      }
       case "track_state_changed": {
         const trackId = payload.track_id || payload.track?.track_id;
         if (!trackId) break;
@@ -945,13 +977,15 @@ var SFUClient = class {
         break;
       }
       case "recording_started": {
-        this.onRecordingStarted({
+        this.activeRecording = {
           recording_id: payload.recording_id,
           started_at: payload.started_at
-        });
+        };
+        this.onRecordingStarted(this.activeRecording);
         break;
       }
       case "recording_stopped": {
+        this.activeRecording = null;
         this.onRecordingStopped({
           recording_id: payload.recording_id,
           stopped_at: payload.stopped_at
@@ -1010,68 +1044,63 @@ var SFUClient = class {
     }
   }
   async applyRoomState(payload) {
-    const nextParticipants = /* @__PURE__ */ new Map();
-    for (const participant of payload.participants || []) {
-      const id = participant?.participant_id;
-      if (!id) continue;
-      nextParticipants.set(id, participant);
+    const authoritative = /* @__PURE__ */ new Map();
+    for (const participant of payload?.participants || []) {
+      if (participant?.participant_id) authoritative.set(participant.participant_id, participant);
     }
-    for (const [id] of this.participants) {
-      if (id === this.currentParticipantId) continue;
-      if (!nextParticipants.has(id)) {
+    for (const id of [...this.participants.keys()]) {
+      if (!authoritative.has(id) && id !== this.currentParticipantId) {
         this.participants.delete(id);
         this.removeRemoteParticipant(id);
         this.onParticipantLeft(id);
       }
     }
-    for (const [id, participant] of nextParticipants) {
+    for (const [id, participant] of authoritative) {
       if (id === this.currentParticipantId) continue;
-      const existed = this.participants.has(id);
-      this.participants.set(id, participant);
-      if (!existed) {
-        this.onParticipantJoined(participant);
-      }
-      const sharing = Boolean(participant.screen_sharing);
-      const screenTrackId = participant.screen_track_id ? String(participant.screen_track_id) : void 0;
-      if (sharing) {
-        const track = screenTrackId ? (payload.tracks || []).find(
-          (candidate) => String(candidate.track_id) === screenTrackId
-        ) : void 0;
-        this.onScreenShareStarted(id, track);
-      } else if (this.remoteScreenStreams.has(id)) {
-        this.remoteScreenStreams.get(id)?.getTracks().forEach((track) => track.stop());
-        this.remoteScreenStreams.delete(id);
-        this.onScreenShareStopped(id, screenTrackId);
-      }
+      const previous = this.participants.get(id);
+      this.participants.set(id, {
+        ...previous,
+        ...participant,
+        audio_muted: Boolean(participant.audio_muted),
+        video_muted: Boolean(participant.video_muted)
+      });
+      if (!previous) this.onParticipantJoined(participant);
+      if (participant.presence) this.onParticipantPresence(id, String(participant.presence));
     }
     const nextTracks = /* @__PURE__ */ new Map();
-    for (const track of payload.tracks || []) {
-      if (track?.track_id) nextTracks.set(String(track.track_id), track);
+    for (const track of payload?.tracks || []) {
+      if (!track?.track_id) continue;
+      nextTracks.set(track.track_id, track);
+      this.rememberTrack(track);
     }
-    for (const [trackId, existing] of this.trackMetadata) {
-      if (!nextTracks.has(trackId)) {
-        this.trackMetadata.delete(trackId);
-        this.trackToParticipant.delete(trackId);
-        this.trackToSource.delete(trackId);
-        this.subscribedTracks.delete(trackId);
-        for (const [source, localId] of this.localTrackIds) {
-          if (localId === trackId) this.localTrackIds.delete(source);
-        }
-        if (existing.participant_id !== this.currentParticipantId) {
-          this.onTrackUnpublished(existing);
-        }
+    for (const id of [...this.trackMetadata.keys()]) {
+      if (!nextTracks.has(id)) {
+        this.trackMetadata.delete(id);
+        this.subscribedTracks.delete(id);
+        this.trackToParticipant.delete(id);
+        this.trackToSource.delete(id);
       }
     }
-    for (const track of nextTracks.values()) {
-      this.rememberTrack(track);
+    if (payload?.recording) {
+      const current = {
+        recording_id: payload.recording.recording_id,
+        started_at: payload.recording.started_at
+      };
+      if (!this.activeRecording || this.activeRecording.recording_id !== current.recording_id) {
+        this.activeRecording = current;
+        this.onRecordingStarted(current);
+      }
+    } else if (this.activeRecording) {
+      const previous = this.activeRecording;
+      this.activeRecording = null;
+      this.onRecordingStopped({
+        recording_id: previous.recording_id,
+        stopped_at: (/* @__PURE__ */ new Date()).toISOString()
+      });
     }
     if (this.autoSubscribe) {
-      const missing = [...nextTracks.values()].filter(
-        (track) => track.participant_id !== this.currentParticipantId && !this.subscribedTracks.has(track.track_id)
-      ).map((track) => track.track_id);
-      if (missing.length) {
-        await this.subscribeMultiple(missing);
-      }
+      const missing = [...nextTracks.values()].filter((t) => t.participant_id !== this.currentParticipantId && !this.subscribedTracks.has(t.track_id)).map((t) => t.track_id);
+      if (missing.length) await this.subscribeMultiple(missing);
     }
     this.onRoomState(payload);
   }
@@ -1105,9 +1134,17 @@ var SFUClient = class {
       if (track?.track_id) this.rememberTrack(track);
     }
     if (payload.recording) {
-      this.onRecordingStarted({
+      this.activeRecording = {
         recording_id: payload.recording.recording_id,
         started_at: payload.recording.started_at
+      };
+      this.onRecordingStarted(this.activeRecording);
+    } else if (this.activeRecording) {
+      const previous = this.activeRecording;
+      this.activeRecording = null;
+      this.onRecordingStopped({
+        recording_id: previous.recording_id,
+        stopped_at: (/* @__PURE__ */ new Date()).toISOString()
       });
     }
     await this.initializePeerConnections();
@@ -2035,9 +2072,13 @@ var VideoSDKCore = class {
         );
         return;
       }
-      throw new Error(
-        `SFU client already exists in state "${state}". Disconnect explicitly before creating another connection.`
-      );
+      if (state === "disconnected" || state === "idle") {
+        this.sfuClient = null;
+      } else {
+        throw new Error(
+          `SFU client already exists in state "${state}". Disconnect explicitly before creating another connection.`
+        );
+      }
     }
     const client = new SFUClient({
       apiBase: this.apiBase,
@@ -2056,12 +2097,26 @@ var VideoSDKCore = class {
         });
       },
       onRoomState: (roomState) => {
+        for (const participant of roomState?.participants || []) {
+          const pid = participant?.participant_id;
+          if (!pid || pid === this.myId) continue;
+          const current = this.state.getParticipant(pid);
+          if (!current) continue;
+          this.state.updateParticipantMedia(pid, {
+            stream: current.media?.stream ?? null,
+            micEnabled: !Boolean(participant.audio_muted),
+            camEnabled: !Boolean(participant.video_muted),
+            isScreenSharing: Boolean(participant.screen_sharing)
+          });
+        }
+        const presenters = /* @__PURE__ */ new Set();
         for (const participant of roomState?.participants || []) {
           const pid = participant?.participant_id;
           if (!pid || pid === this.myId) continue;
           const current = this.state.getParticipant(pid);
           if (!current) continue;
           if (participant.screen_sharing) {
+            presenters.add(pid);
             this.state.updateParticipantMedia(pid, {
               isScreenSharing: true,
               screenStream: current.media?.screenStream ?? null
@@ -2077,6 +2132,10 @@ var VideoSDKCore = class {
             });
           }
         }
+        const presenter = [...presenters][0] ?? null;
+        if (this.state.presenterId !== presenter) {
+          this.state.setPresenterId(presenter);
+        }
         this.events.onRoomUpdate?.(roomState);
       },
       onDisconnected: () => {
@@ -2150,8 +2209,8 @@ var VideoSDKCore = class {
           name: pname,
           connectionState: "connected",
           media: {
-            micEnabled: true,
-            camEnabled: true,
+            micEnabled: !Boolean(participant.audio_muted),
+            camEnabled: !Boolean(participant.video_muted),
             isScreenSharing: false,
             stream: null
           }
@@ -2224,6 +2283,18 @@ var VideoSDKCore = class {
           camEnabled: track.kind === "video" ? false : current.media?.camEnabled ?? true
         });
       },
+      onParticipantMediaState: (participantId, audioMuted, videoMuted) => {
+        if (participantId === this.myId) return;
+        const current = this.state.getParticipant(participantId);
+        if (!current) return;
+        this.state.updateParticipantMedia(participantId, {
+          stream: current.media?.stream ?? null,
+          micEnabled: !audioMuted,
+          camEnabled: !videoMuted
+        });
+        this.events.onMuteStateChanged?.(participantId, "audio", audioMuted);
+        this.events.onMuteStateChanged?.(participantId, "video", videoMuted);
+      },
       onTrackStateChanged: (track) => {
         const pid = track.participant_id;
         if (!pid || pid === this.myId) {
@@ -2324,7 +2395,9 @@ var VideoSDKCore = class {
     client.setLocalStream(this.localStream);
     await client.getToken(roomId, {
       displayName: name,
-      participantId: this.myId
+      participantId: this.myId,
+      audioMuted: this.state.localParticipant?.media?.micEnabled,
+      videoMuted: this.state.localParticipant?.media?.camEnabled
     });
   }
   // SFU STATE