@defcomm/meetingsdk 0.3.2 → 0.3.4

package/dist/index.d.mts

@@ -392,6 +392,7 @@ declare class SFUClient {
     getResumeToken(): string | null;
     getLocalStream(): MediaStream | null;
     getScreenStream(): MediaStream | null;
+    getRemoteScreenStream(participantId: string): MediaStream | null;
     setLocalStream(stream: MediaStream | null): void;
     private nextRequestId;
     private request;

package/dist/index.d.ts

@@ -392,6 +392,7 @@ declare class SFUClient {
     getResumeToken(): string | null;
     getLocalStream(): MediaStream | null;
     getScreenStream(): MediaStream | null;
+    getRemoteScreenStream(participantId: string): MediaStream | null;
     setLocalStream(stream: MediaStream | null): void;
     private nextRequestId;
     private request;

package/dist/index.js

@@ -548,6 +548,9 @@ var SFUClient = class {
   getScreenStream() {
     return this.screenStream;
   }
+  getRemoteScreenStream(participantId) {
+    return this.remoteScreenStreams.get(participantId) || null;
+  }
   setLocalStream(stream) {
     this.localStream = stream;
   }
@@ -967,19 +970,7 @@ var SFUClient = class {
       }
       case "screen_share_stopped": {
         const participantId = payload.participant_id;
-        const screenStream = participantId ? this.remoteScreenStreams.get(participantId) : null;
         const trackId = payload.track_id;
-        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;
       }
@@ -2366,11 +2357,11 @@ 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) {
+          if (!this.screenStream) {
+            this.screenStream = this.sfuClient?.getScreenStream() ?? null;
+          }
+          this.state.setPresenterId(participantId);
           this.state.updateLocalParticipant({
             media: {
               isScreenSharing: true,
@@ -2380,11 +2371,28 @@ var VideoSDKCore = class {
           });
           return;
         }
+        this.state.setPresenterId(participantId);
+        const existingRemoteScreen = this.sfuClient?.getRemoteScreenStream(participantId) ?? this.remoteScreenStreams.get(participantId) ?? null;
+        if (existingRemoteScreen) {
+          this.remoteScreenStreams.set(participantId, existingRemoteScreen);
+          const screenTrack = existingRemoteScreen.getVideoTracks()[0];
+          this.state.updateParticipantMedia(participantId, {
+            isScreenSharing: true,
+            screenStream: existingRemoteScreen,
+            screenTrack
+          });
+          this.events.onScreenShareStarted?.(
+            participantId,
+            existingRemoteScreen
+          );
+          return;
+        }
         const current = this.state.getParticipant(participantId);
         if (current) {
           this.state.updateParticipantMedia(participantId, {
             isScreenSharing: true,
-            screenStream: current.media?.screenStream ?? null
+            screenStream: current.media?.screenStream ?? null,
+            screenTrack: current.media?.screenTrack
           });
         }
       },
@@ -2402,13 +2410,8 @@ var VideoSDKCore = class {
           });
           return;
         }
-        const screen = this.remoteScreenStreams.get(participantId);
-        screen?.getTracks().forEach((track) => track.stop());
-        this.remoteScreenStreams.delete(participantId);
         this.state.updateParticipantMedia(participantId, {
-          isScreenSharing: false,
-          screenStream: null,
-          screenTrack: void 0
+          isScreenSharing: false
         });
         this.events.onScreenShareStopped?.(participantId);
       },
@@ -2432,8 +2435,8 @@ var VideoSDKCore = class {
     await client.getToken(roomId, {
       displayName: name,
       participantId: this.myId,
-      audioMuted: this.state.localParticipant?.media?.micEnabled,
-      videoMuted: this.state.localParticipant?.media?.camEnabled
+      audioMuted: !(this.localStream?.getAudioTracks()[0]?.enabled ?? true),
+      videoMuted: !(this.localStream?.getVideoTracks()[0]?.enabled ?? true)
     });
   }
   // SFU STATE