@defcomm/meetingsdk 0.2.5 → 0.2.7

package/dist/index.js

@@ -403,6 +403,8 @@ var SFUClient = class {
     this.intentionalClose = false;
     this.leaveAcknowledged = false;
     this.joiningWithResume = false;
+    this.desiredAudioMuted = false;
+    this.desiredVideoMuted = false;
     this.reconnectTimer = null;
     this.reconnectAttempt = 0;
     this.maxReconnectAttempts = 8;
@@ -428,7 +430,6 @@ var SFUClient = class {
     this.trackToSource = /* @__PURE__ */ new Map();
     this.localTrackIds = /* @__PURE__ */ new Map();
     this.subscriberStatsTimer = null;
-    this.lastRecordingId = null;
     this.heartbeatTimer = null;
     this.apiBase = options.apiBase || "https://api.example.com/api";
     this.wsBase = options.wsBase || "wss://api.example.com/ws";
@@ -441,8 +442,6 @@ var SFUClient = class {
     });
     this.onParticipantPresence = options.onParticipantPresence || (() => {
     });
-    this.onParticipantMediaState = options.onParticipantMediaState || (() => {
-    });
     this.onTrackPublished = options.onTrackPublished || (() => {
     });
     this.onTrackUnpublished = options.onTrackUnpublished || (() => {
@@ -474,6 +473,12 @@ var SFUClient = class {
     this.onRecordingStopped = options.onRecordingStopped || (() => {
     });
     this.onError = options.onError || console.error;
+    this.onChatMessage = options.onChatMessage || (() => {
+    });
+    this.onRoomUpdate = options.onRoomUpdate || (() => {
+    });
+    this.onParticipantMediaState = options.onParticipantMediaState || (() => {
+    });
     this.autoSubscribe = options.autoSubscribe !== false;
   }
   startHeartbeat() {
@@ -593,11 +598,11 @@ var SFUClient = class {
     this.room = nextRoom;
     this.joinOptions = {
       displayName: options.displayName,
-      avatarUrl: options.avatarUrl,
-      audioMuted: options.audioMuted,
-      videoMuted: options.videoMuted
+      avatarUrl: options.avatarUrl
     };
     if (options.participantId) this.participantId = options.participantId;
+    if (typeof options.audioMuted === "boolean") this.desiredAudioMuted = options.audioMuted;
+    if (typeof options.videoMuted === "boolean") this.desiredVideoMuted = options.videoMuted;
     if (!this.resumeToken) {
       this.resumeToken = this.loadResumeToken(this.room);
     }
@@ -665,8 +670,8 @@ var SFUClient = class {
         resume_token: this.resumeToken,
         display_name: options.displayName,
         avatar_url: options.avatarUrl,
-        audio_muted: options.audioMuted ?? this.joinOptions.audioMuted ?? false,
-        video_muted: options.videoMuted ?? this.joinOptions.videoMuted ?? false
+        audio_muted: this.desiredAudioMuted,
+        video_muted: this.desiredVideoMuted
       };
       if (this.pendingJoinRequestId) {
         this.send({
@@ -780,9 +785,7 @@ var SFUClient = class {
               room_code: this.room,
               resume_token: this.resumeToken,
               display_name: this.joinOptions.displayName,
-              avatar_url: this.joinOptions.avatarUrl,
-              audio_muted: this.joinOptions.audioMuted ?? false,
-              video_muted: this.joinOptions.videoMuted ?? false
+              avatar_url: this.joinOptions.avatarUrl
             }
           });
         }
@@ -843,6 +846,16 @@ var SFUClient = class {
         this.onParticipantLeft(participantId);
         break;
       }
+      case "participant_media_state": {
+        const participantId = payload.participant_id;
+        if (!participantId) break;
+        this.onParticipantMediaState(
+          participantId,
+          Boolean(payload.audio_muted),
+          Boolean(payload.video_muted)
+        );
+        break;
+      }
       case "participant_presence":
       case "participant_presence_changed": {
         const participantId = payload.participant_id;
@@ -923,7 +936,6 @@ var SFUClient = class {
         break;
       }
       case "recording_started": {
-        this.lastRecordingId = payload.recording_id || this.lastRecordingId;
         this.onRecordingStarted({
           recording_id: payload.recording_id,
           started_at: payload.started_at
@@ -931,7 +943,6 @@ var SFUClient = class {
         break;
       }
       case "recording_stopped": {
-        this.lastRecordingId = null;
         this.onRecordingStopped({
           recording_id: payload.recording_id,
           stopped_at: payload.stopped_at
@@ -968,26 +979,34 @@ var SFUClient = class {
         break;
       }
       case "room_state": {
-        await this.reconcileRoomState(payload);
-        break;
-      }
-      case "participant_media_state": {
-        const participantId = payload.participant_id;
-        if (participantId) {
-          const current = this.participants.get(participantId);
-          if (current) {
-            this.participants.set(participantId, {
-              ...current,
-              audio_muted: Boolean(payload.audio_muted),
-              video_muted: Boolean(payload.video_muted)
-            });
+        const participants = payload.participants || [];
+        this.onRoomStateReconciled(payload);
+        this.onRoomUpdate(payload);
+        for (const participant of participants) {
+          const pid = participant?.participant_id;
+          if (!pid) continue;
+          if (pid !== this.currentParticipantId) {
+            this.participants.set(pid, participant);
+            this.onParticipantPresence(pid, String(participant.presence || "connected"));
+            this.onParticipantMediaState(pid, Boolean(participant.audio_muted), Boolean(participant.video_muted));
           }
         }
-        this.onParticipantMediaState?.(
-          participantId,
-          Boolean(payload.audio_muted),
-          Boolean(payload.video_muted)
-        );
+        for (const [pid] of this.participants) {
+          if (!participants.some((p) => p?.participant_id === pid)) {
+            this.participants.delete(pid);
+            this.removeRemoteParticipant(pid);
+            this.onParticipantLeft(pid);
+          }
+        }
+        for (const track of payload.tracks || []) this.rememberTrack(track);
+        if (Array.isArray(payload.chat_history)) {
+          for (const message2 of payload.chat_history) this.onChatMessage(message2);
+        }
+        break;
+      }
+      case "chat_message": {
+        const msg = payload.message || payload;
+        if (msg?.id) this.onChatMessage(msg);
         break;
       }
       case "error": {
@@ -1012,88 +1031,12 @@ var SFUClient = class {
         console.debug("[SFU] Ignoring unknown server message", message);
     }
   }
-  async reconcileRoomState(payload) {
-    const nextParticipants = /* @__PURE__ */ new Map();
-    for (const participant of payload.participants || []) {
-      if (participant?.participant_id) {
-        nextParticipants.set(participant.participant_id, participant);
-      }
-    }
-    for (const participantId of this.participants.keys()) {
-      if (participantId !== this.currentParticipantId && !nextParticipants.has(participantId)) {
-        this.participants.delete(participantId);
-        this.onParticipantLeft(participantId);
-      }
-    }
-    for (const participant of nextParticipants.values()) {
-      if (participant.participant_id === this.currentParticipantId) continue;
-      const previous = this.participants.get(participant.participant_id);
-      const wasScreenSharing = Boolean(previous?.screen_sharing);
-      const isScreenSharing = Boolean(participant.screen_sharing);
-      this.participants.set(participant.participant_id, participant);
-      if (!previous) {
-        this.onParticipantJoined(participant);
-      }
-      if (participant.presence) {
-        this.onParticipantPresence(
-          participant.participant_id,
-          String(participant.presence).toLowerCase()
-        );
-      }
-      this.onParticipantMediaState(
-        participant.participant_id,
-        Boolean(participant.audio_muted),
-        Boolean(participant.video_muted)
-      );
-      if (!wasScreenSharing && isScreenSharing) {
-        this.onScreenShareStarted(participant.participant_id, void 0);
-      } else if (wasScreenSharing && !isScreenSharing) {
-        this.onScreenShareStopped(
-          participant.participant_id,
-          participant.screen_track_id || void 0
-        );
-      }
-    }
-    const nextTracks = /* @__PURE__ */ new Map();
-    for (const track of payload.tracks || []) {
-      if (track?.track_id) {
-        nextTracks.set(track.track_id, track);
-        this.rememberTrack(track);
-      }
-    }
-    for (const [trackId, oldTrack] of [...this.trackMetadata.entries()]) {
-      if (!nextTracks.has(trackId)) {
-        this.trackMetadata.delete(trackId);
-        this.trackToParticipant.delete(trackId);
-        this.trackToSource.delete(trackId);
-        this.subscribedTracks.delete(trackId);
-        if (oldTrack.participant_id !== this.currentParticipantId) {
-          this.onTrackUnpublished(oldTrack);
-        }
-      }
-    }
-    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 nextRecordingId = payload.recording?.recording_id || null;
-    if (payload.recording) {
-      if (this.lastRecordingId !== nextRecordingId) {
-        this.lastRecordingId = nextRecordingId;
-        this.onRecordingStarted({
-          recording_id: payload.recording.recording_id,
-          started_at: payload.recording.started_at
-        });
-      }
-    } else if (this.lastRecordingId) {
-      const recordingId = this.lastRecordingId;
-      this.lastRecordingId = null;
-      this.onRecordingStopped({
-        recording_id: recordingId,
-        stopped_at: (/* @__PURE__ */ new Date()).toISOString()
-      });
+  onRoomStateReconciled(payload) {
+    const participants = payload.participants || [];
+    const local = participants.find((p) => p?.participant_id === this.currentParticipantId);
+    if (local) {
+      this.desiredAudioMuted = Boolean(local.audio_muted);
+      this.desiredVideoMuted = Boolean(local.video_muted);
     }
   }
   rememberTrack(track) {
@@ -1131,8 +1074,21 @@ var SFUClient = class {
     for (const participant of this.participants.values()) {
       if (participant.participant_id !== this.currentParticipantId) {
         this.onParticipantJoined(participant);
+        this.onParticipantPresence(
+          participant.participant_id,
+          String(participant.presence || "connected")
+        );
+        this.onParticipantMediaState(
+          participant.participant_id,
+          Boolean(participant.audio_muted),
+          Boolean(participant.video_muted)
+        );
       }
     }
+    if (Array.isArray(payload.chat_history)) {
+      for (const message of payload.chat_history) this.onChatMessage(message);
+    }
+    this.onRoomUpdate(payload);
     if (this.localStream) {
       await this.publishExistingTracks();
     }
@@ -1505,9 +1461,6 @@ var SFUClient = class {
     }
     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();
@@ -1519,6 +1472,7 @@ var SFUClient = class {
           sdp: offer.sdp
         }
       });
+      this.send({ type: "start_screen_share" });
       screenTrack.onended = () => {
         void this.stopScreenShare();
       };
@@ -1579,26 +1533,52 @@ var SFUClient = class {
     }
   }
   muteAudio(muted) {
+    this.desiredAudioMuted = muted;
     this.localStream?.getAudioTracks().forEach((track) => {
       track.enabled = !muted;
     });
     this.send({
       type: "set_media_state",
-      payload: {
-        audio_muted: muted,
-        video_muted: !(this.localStream?.getVideoTracks()[0]?.enabled ?? true)
-      }
+      payload: { audio_muted: muted, video_muted: this.desiredVideoMuted }
     });
+    const trackId = this.localTrackIds.get("audio");
+    if (trackId) {
+      this.send({
+        type: "track_state",
+        payload: {
+          track_id: trackId,
+          muted
+        }
+      });
+    }
   }
   muteVideo(muted) {
+    this.desiredVideoMuted = muted;
     this.localStream?.getVideoTracks().forEach((track) => {
       track.enabled = !muted;
     });
     this.send({
       type: "set_media_state",
+      payload: { audio_muted: this.desiredAudioMuted, video_muted: muted }
+    });
+    const trackId = this.localTrackIds.get("camera");
+    if (trackId) {
+      this.send({
+        type: "track_state",
+        payload: {
+          track_id: trackId,
+          muted
+        }
+      });
+    }
+  }
+  sendChatMessage(input) {
+    return this.send({
+      type: "send_chat",
       payload: {
-        audio_muted: !(this.localStream?.getAudioTracks()[0]?.enabled ?? true),
-        video_muted: muted
+        message: input.message,
+        reply_to: input.reply_to ?? null,
+        target: input.target ?? null
       }
     });
   }
@@ -2059,11 +2039,7 @@ var VideoSDKCore = class {
         console.log(`[SFU] ${resumed ? "Resumed" : "Joined"} room`, payload);
         this.state.updateLocalParticipant({
           id: this.myId,
-          name: this.participantName,
-          media: {
-            micEnabled: this.localStream?.getAudioTracks()[0]?.enabled ?? true,
-            camEnabled: this.localStream?.getVideoTracks()[0]?.enabled ?? true
-          }
+          name: this.participantName
         });
       },
       onDisconnected: () => {
@@ -2073,13 +2049,43 @@ var VideoSDKCore = class {
         console.warn(`[SFU] Reconnecting, attempt ${attempt}`);
       },
       // ADMISSION CONTROL
+      onRoomUpdate: (payload) => {
+        const participants = payload?.participants || [];
+        const local = participants.find((p) => p?.participant_id === this.myId);
+        if (local) {
+          const media = this.state.localParticipant?.media;
+          this.state.updateLocalParticipant({
+            id: this.myId,
+            name: this.participantName,
+            media: {
+              micEnabled: !Boolean(local.audio_muted),
+              camEnabled: !Boolean(local.video_muted),
+              isScreenSharing: Boolean(local.screen_sharing),
+              screenStream: this.screenStream,
+              screenTrack: this.screenStream?.getVideoTracks()[0]
+            }
+          });
+          if (this.localStream) {
+            this.localStream.getAudioTracks().forEach((track) => {
+              track.enabled = !Boolean(local.audio_muted);
+            });
+            this.localStream.getVideoTracks().forEach((track) => {
+              track.enabled = !Boolean(local.video_muted);
+            });
+          }
+          if (local.screen_sharing) this.state.setPresenterId(this.myId);
+          else if (this.state.presenterId === this.myId) this.state.setPresenterId(null);
+        }
+        const presenter = participants.find((p) => p?.screen_sharing);
+        if (presenter) this.state.setPresenterId(presenter.participant_id);
+        else if (!local?.screen_sharing) this.state.setPresenterId(null);
+        for (const message of payload?.chat_history || []) {
+          this.state.addChatMessage(message);
+        }
+        this.events.onRoomUpdate?.(payload);
+      },
       onJoinPending: (info) => {
         console.log("[SFU] Join request pending", info);
-        this.events.onEntryRequested?.({
-          requestId: info.request_id,
-          participantId: this.myId,
-          name: this.participantName
-        });
       },
       onJoinApproved: (requestId) => {
         console.log("[SFU] Join approved", requestId);
@@ -2112,6 +2118,19 @@ var VideoSDKCore = class {
           false
         );
       },
+      onChatMessage: (message) => {
+        const msg = {
+          id: message.id,
+          text: message.text,
+          sender_id: message.sender_id,
+          sender_name: message.sender_name,
+          timestamp: Number(message.timestamp),
+          reply_to: message.reply_to ?? null,
+          target: message.target ?? null
+        };
+        this.state.addChatMessage(msg);
+        this.events.onChatMessage?.(msg);
+      },
       onJoinRequested: (request) => {
         const requestId = request?.request_id || request?.requestId;
         const participantId = request?.user_id || request?.participantId;
@@ -2132,44 +2151,22 @@ var VideoSDKCore = class {
           return;
         }
         const pname = participant.user_metadata?.name || participant.display_name || "Participant";
-        const participantMedia = participant.media || {};
-        const participantState = {
+        this.state.addParticipant({
           id: pid,
           name: pname,
-          connectionState: participant.presence === "reconnecting" ? "reconnecting" : "connected",
+          connectionState: "connected",
           media: {
-            micEnabled: !Boolean(participant.audio_muted),
-            camEnabled: !Boolean(participant.video_muted),
-            isScreenSharing: Boolean(participant.screen_sharing),
-            screenStream: participantMedia.screenStream ?? null,
+            micEnabled: true,
+            camEnabled: true,
+            isScreenSharing: false,
             stream: null
           }
-        };
-        if (!this.state.addParticipant(participantState)) {
-          this.state.updateParticipantMedia(pid, participantState.media);
-        }
+        });
         this.events.onUserJoined?.({
           id: pid,
           name: pname
         });
       },
-      onParticipantMediaState: (participantId, audioMuted, videoMuted) => {
-        if (participantId === this.myId) {
-          this.state.updateLocalParticipant({
-            media: {
-              micEnabled: !audioMuted,
-              camEnabled: !videoMuted
-            }
-          });
-          return;
-        }
-        this.state.updateParticipantMedia(participantId, {
-          micEnabled: !audioMuted,
-          camEnabled: !videoMuted
-        });
-        this.events.onMuteStateChanged?.(participantId, "audio", audioMuted);
-        this.events.onMuteStateChanged?.(participantId, "video", videoMuted);
-      },
       onParticipantPresence: (participantId, presence) => {
         if (participantId === this.myId) {
           return;
@@ -2202,6 +2199,17 @@ var VideoSDKCore = class {
         this.events.onUserLeft?.(pid);
       },
       // TRACKS
+      onParticipantMediaState: (participantId, audioMuted, videoMuted) => {
+        if (participantId === this.myId) return;
+        const participant = this.state.getParticipant(participantId);
+        if (!participant) return;
+        this.state.updateParticipantMedia(participantId, {
+          micEnabled: !audioMuted,
+          camEnabled: !videoMuted
+        });
+        this.events.onMuteStateChanged?.(participantId, "audio", audioMuted);
+        this.events.onMuteStateChanged?.(participantId, "video", videoMuted);
+      },
       onTrackPublished: (track) => {
         console.log("[SFU] Track published", track);
       },
@@ -2271,6 +2279,9 @@ var VideoSDKCore = class {
       // SCREEN SHARE
       onScreenShareStarted: (participantId, _track) => {
         console.log("[SFU] Screen share started", participantId);
+        if (participantId === this.myId && !this.screenStream) {
+          this.screenStream = this.sfuClient?.getScreenStream() ?? null;
+        }
         this.state.setPresenterId(participantId);
         if (participantId === this.myId) {
           this.state.updateLocalParticipant({
@@ -2333,9 +2344,7 @@ var VideoSDKCore = class {
     client.setLocalStream(this.localStream);
     await client.getToken(roomId, {
       displayName: name,
-      participantId: this.myId,
-      audioMuted: !this.localStream?.getAudioTracks()[0]?.enabled,
-      videoMuted: !this.localStream?.getVideoTracks()[0]?.enabled
+      participantId: this.myId
     });
   }
   // SFU STATE
@@ -2499,7 +2508,6 @@ var VideoSDKCore = class {
           screenTrack: this.screenStream.getVideoTracks()[0]
         }
       });
-      this.state.setPresenterId(this.myId);
       return this.screenStream;
     } catch (err) {
       this.emitError(
@@ -2521,9 +2529,6 @@ var VideoSDKCore = class {
     this.screenStream.getTracks().forEach((track) => track.stop());
     this.screenStream = null;
     this.isScreenSharing = false;
-    if (this.state.presenterId === this.myId) {
-      this.state.setPresenterId(null);
-    }
     this.state.updateLocalParticipant({
       media: {
         isScreenSharing: false,
@@ -2557,18 +2562,13 @@ var VideoSDKCore = class {
       console.warn("SFU Client not connected");
       return;
     }
-    const senderName = this.state.localParticipant?.name || "Anonymous";
-    const msg = {
-      id: crypto.randomUUID(),
-      sender_id: this.myId,
-      sender_name: senderName,
-      text: payload.message.trim(),
-      timestamp: Date.now(),
+    const message = payload.message.trim();
+    if (!message) return;
+    this.sfuClient.sendChatMessage({
+      message,
       reply_to: payload.reply_to ?? null,
       target: payload.target ?? null
-    };
-    this.state.addChatMessage(msg);
-    this.events.onChatMessage?.(msg);
+    });
   }
   // CLEANUP
   cleanupRemoteParticipant(participantId) {