@defcomm/meetingsdk 0.3.1 → 0.3.3

package/dist/index.d.mts

@@ -219,7 +219,7 @@ declare class VideoSDKCore {
     rejectJoinRequest(requestId: string, reason?: string): Promise<void>;
     toggleMic(): void;
     toggleCam(): void;
-    startScreenShare(): Promise<MediaStream>;
+    startScreenShare(): Promise<MediaStream | null>;
     stopScreenShare(): Promise<void>;
     startRecording(): Promise<void>;
     stopRecording(): Promise<void>;
@@ -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;
@@ -436,7 +437,7 @@ declare class SFUClient {
         video?: boolean | undefined;
     }): Promise<MediaStream>;
     private publishExistingTracks;
-    shareScreen(): Promise<MediaStream>;
+    shareScreen(): Promise<MediaStream | null>;
     stopScreenShare(): Promise<void>;
     muteAudio(muted: boolean): void;
     muteVideo(muted: boolean): void;

package/dist/index.d.ts

@@ -219,7 +219,7 @@ declare class VideoSDKCore {
     rejectJoinRequest(requestId: string, reason?: string): Promise<void>;
     toggleMic(): void;
     toggleCam(): void;
-    startScreenShare(): Promise<MediaStream>;
+    startScreenShare(): Promise<MediaStream | null>;
     stopScreenShare(): Promise<void>;
     startRecording(): Promise<void>;
     stopRecording(): Promise<void>;
@@ -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;
@@ -436,7 +437,7 @@ declare class SFUClient {
         video?: boolean | undefined;
     }): Promise<MediaStream>;
     private publishExistingTracks;
-    shareScreen(): Promise<MediaStream>;
+    shareScreen(): Promise<MediaStream | null>;
     stopScreenShare(): Promise<void>;
     muteAudio(muted: boolean): void;
     muteVideo(muted: boolean): void;

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;
       }
@@ -1362,11 +1353,14 @@ var SFUClient = class {
             sdp: answer.sdp
           }
         });
-        const waiters = this.subscriptionWaiters.splice(0);
-        waiters.forEach((w) => w.resolve());
+        const waiter = this.subscriptionWaiters.shift();
+        waiter?.resolve();
       } catch (error) {
-        const waiters = this.subscriptionWaiters.splice(0);
-        waiters.forEach((w) => w.reject(error));
+        const waiter = this.subscriptionWaiters.shift();
+        if (waiter) {
+          waiter.trackIds.forEach((id) => this.subscribedTracks.delete(id));
+          waiter.reject(error);
+        }
         this.onError(
           new Error(`Failed to process subscriber offer: ${String(error)}`)
         );
@@ -1388,11 +1382,20 @@ var SFUClient = class {
     if (!uniqueIds.length || !this.isSocketOpen()) return;
     uniqueIds.forEach((id) => this.subscribedTracks.add(id));
     return new Promise((resolve, reject) => {
-      this.subscriptionWaiters.push({ resolve, reject });
-      this.send({
+      const sent = this.send({
         type: "subscribe",
         payload: { track_ids: uniqueIds }
       });
+      if (!sent) {
+        uniqueIds.forEach((id) => this.subscribedTracks.delete(id));
+        reject(new Error("Signaling socket is not open"));
+        return;
+      }
+      this.subscriptionWaiters.push({
+        trackIds: uniqueIds,
+        resolve,
+        reject
+      });
     });
   }
   async processSubscriptionQueue() {
@@ -1405,11 +1408,20 @@ var SFUClient = class {
           continue;
         }
         await new Promise((resolve, reject) => {
-          this.subscriptionWaiters.push({ resolve, reject });
-          this.send({
+          const sent = this.send({
             type: "subscribe",
             payload: { track_ids: [trackId] }
           });
+          if (!sent) {
+            this.subscribedTracks.delete(trackId);
+            reject(new Error("Signaling socket is not open"));
+            return;
+          }
+          this.subscriptionWaiters.push({
+            trackIds: [trackId],
+            resolve,
+            reject
+          });
         });
       }
     } finally {
@@ -1467,9 +1479,16 @@ var SFUClient = class {
     if (!this.screenTransceiver || !this.screenSender) {
       throw new Error("Screen transceiver is not initialized");
     }
-    if (this.screenStream) {
-      return this.screenStream;
+    const existing = this.screenStream;
+    const existingTrack = this.screenSender.track;
+    if (existing || existingTrack && existingTrack.readyState === "live") {
+      return existing;
     }
+    try {
+      await this.screenSender.replaceTrack(null);
+    } catch {
+    }
+    this.screenTransceiver.direction = "inactive";
     const screenStream = await navigator.mediaDevices.getDisplayMedia({
       video: true,
       audio: false
@@ -1479,29 +1498,33 @@ var SFUClient = class {
       screenStream.getTracks().forEach((track) => track.stop());
       throw new Error("Screen share returned no video track");
     }
+    const generation = ++this.screenShareGeneration;
     this.screenStream = screenStream;
     try {
       await this.screenSender.replaceTrack(screenTrack);
       this.screenTransceiver.direction = "sendonly";
+      this.send({
+        type: "start_screen_share"
+      });
       const offer = await this.publisher.createOffer();
       await this.publisher.setLocalDescription(offer);
+      const localDescription = this.publisher.localDescription;
+      if (!localDescription?.sdp) {
+        throw new Error("Publisher did not produce a valid screen-share SDP");
+      }
       this.send({
         type: "publish_offer",
         payload: {
           revision: ++this.publisherRevision,
-          sdp: offer.sdp
+          sdp: localDescription.sdp
         }
       });
-      this.send({ type: "start_screen_share" });
       screenTrack.onended = () => {
+        if (generation !== this.screenShareGeneration) {
+          return;
+        }
         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 {
@@ -1509,19 +1532,33 @@ var SFUClient = class {
       } catch {
       }
       this.screenTransceiver.direction = "inactive";
-      screenStream.getTracks().forEach((track) => track.stop());
+      screenTrack.onended = null;
+      screenStream.getTracks().forEach((track) => {
+        try {
+          track.stop();
+        } catch {
+        }
+      });
       this.screenStream = null;
       try {
-        this.send({ type: "stop_screen_share" });
+        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;
+    const stream = this.screenStream;
+    const senderTrack = this.screenSender?.track || null;
+    if (!stream && !senderTrack) {
+      return;
+    }
+    ++this.screenShareGeneration;
+    if (senderTrack) {
+      senderTrack.onended = null;
+    }
     try {
       await this.screenSender?.replaceTrack(null);
     } catch (error) {
@@ -1530,23 +1567,33 @@ var SFUClient = class {
     if (this.screenTransceiver) {
       this.screenTransceiver.direction = "inactive";
     }
-    this.send({ type: "stop_screen_share" });
     try {
-      const offer = await this.publisher?.createOffer();
-      if (offer && this.publisher) {
+      if (this.publisher) {
+        const offer = await this.publisher.createOffer();
         await this.publisher.setLocalDescription(offer);
-        this.send({
-          type: "publish_offer",
-          payload: {
-            revision: ++this.publisherRevision,
-            sdp: offer.sdp
-          }
-        });
+        const localDescription = this.publisher.localDescription;
+        if (localDescription?.sdp) {
+          this.send({
+            type: "publish_offer",
+            payload: {
+              revision: ++this.publisherRevision,
+              sdp: localDescription.sdp
+            }
+          });
+        }
       }
     } catch (error) {
       this.onError(error);
     }
-    this.screenStream?.getTracks().forEach((track) => track.stop());
+    this.send({
+      type: "stop_screen_share"
+    });
+    stream?.getTracks().forEach((track) => {
+      try {
+        track.stop();
+      } catch {
+      }
+    });
     this.screenStream = null;
     if (this.currentParticipantId) {
       this.onScreenShareStopped(this.currentParticipantId);
@@ -2310,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,
@@ -2324,11 +2371,25 @@ 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
           });
         }
       },
@@ -2346,13 +2407,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);
       },