@defcomm/meetingsdk 0.2.8 → 0.3.0

package/dist/index.d.mts

@@ -219,8 +219,8 @@ declare class VideoSDKCore {
     rejectJoinRequest(requestId: string, reason?: string): Promise<void>;
     toggleMic(): void;
     toggleCam(): void;
-    startScreenShare(): Promise<MediaStream>;
-    stopScreenShare(): void;
+    startScreenShare(): Promise<MediaStream | null>;
+    stopScreenShare(): Promise<void>;
     startRecording(): Promise<void>;
     stopRecording(): Promise<void>;
     getRecordingStatus(): Promise<{
@@ -436,7 +436,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;
@@ -479,7 +479,7 @@ type MeetingContextValue = {
     deleteRoom: (roomCode: string) => Promise<any>;
     toggleMic: () => void;
     toggleCam: () => void;
-    startScreenShare: () => Promise<MediaStream>;
+    startScreenShare: () => Promise<MediaStream | null>;
     stopScreenShare: () => void;
     sendMessage: (input: ChatInput) => void;
     sendReaction: (emoji: string) => void;
@@ -537,7 +537,7 @@ declare const useMeeting: (handlers?: {
     deleteRoom: (roomCode: string) => Promise<any>;
     toggleMic: () => void;
     toggleCam: () => void;
-    startScreenShare: () => Promise<MediaStream>;
+    startScreenShare: () => Promise<MediaStream | null>;
     stopScreenShare: () => void;
     sendMessage: (input: ChatInput) => void;
     sendReaction: (emoji: string) => void;

package/dist/index.d.ts

@@ -219,8 +219,8 @@ declare class VideoSDKCore {
     rejectJoinRequest(requestId: string, reason?: string): Promise<void>;
     toggleMic(): void;
     toggleCam(): void;
-    startScreenShare(): Promise<MediaStream>;
-    stopScreenShare(): void;
+    startScreenShare(): Promise<MediaStream | null>;
+    stopScreenShare(): Promise<void>;
     startRecording(): Promise<void>;
     stopRecording(): Promise<void>;
     getRecordingStatus(): Promise<{
@@ -436,7 +436,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;
@@ -479,7 +479,7 @@ type MeetingContextValue = {
     deleteRoom: (roomCode: string) => Promise<any>;
     toggleMic: () => void;
     toggleCam: () => void;
-    startScreenShare: () => Promise<MediaStream>;
+    startScreenShare: () => Promise<MediaStream | null>;
     stopScreenShare: () => void;
     sendMessage: (input: ChatInput) => void;
     sendReaction: (emoji: string) => void;
@@ -537,7 +537,7 @@ declare const useMeeting: (handlers?: {
     deleteRoom: (roomCode: string) => Promise<any>;
     toggleMic: () => void;
     toggleCam: () => void;
-    startScreenShare: () => Promise<MediaStream>;
+    startScreenShare: () => Promise<MediaStream | null>;
     stopScreenShare: () => void;
     sendMessage: (input: ChatInput) => void;
     sendReaction: (emoji: string) => void;

package/dist/index.js

@@ -1467,26 +1467,15 @@ var SFUClient = class {
     if (!this.screenTransceiver || !this.screenSender) {
       throw new Error("Screen transceiver is not initialized");
     }
+    const existing = this.screenStream;
     const existingTrack = this.screenSender.track;
-    if (this.screenStream && existingTrack && existingTrack.readyState === "live") {
-      return this.screenStream;
+    if (existing || existingTrack && existingTrack.readyState === "live") {
+      return existing;
     }
-    const generation = ++this.screenShareGeneration;
     try {
       await this.screenSender.replaceTrack(null);
-    } catch (err) {
-      console.warn("[SFU] Failed to clear previous screen track", err);
-    }
-    if (this.screenStream) {
-      for (const track of this.screenStream.getTracks()) {
-        try {
-          track.onended = null;
-          track.stop();
-        } catch {
-        }
-      }
+    } catch {
     }
-    this.screenStream = null;
     this.screenTransceiver.direction = "inactive";
     const screenStream = await navigator.mediaDevices.getDisplayMedia({
       video: true,
@@ -1497,6 +1486,7 @@ 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);
@@ -1504,20 +1494,16 @@ var SFUClient = class {
       this.send({
         type: "start_screen_share"
       });
-      await new Promise((resolve) => {
-        queueMicrotask(resolve);
-      });
       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");
       }
-      const revision = ++this.publisherRevision;
       this.send({
         type: "publish_offer",
         payload: {
-          revision,
+          revision: ++this.publisherRevision,
           sdp: localDescription.sdp
         }
       });
@@ -1527,28 +1513,26 @@ var SFUClient = class {
         }
         void this.stopScreenShare();
       };
-      return screenStream;
+      return this.screenStream;
     } catch (error) {
-      if (generation === this.screenShareGeneration) {
+      try {
+        await this.screenSender.replaceTrack(null);
+      } catch {
+      }
+      this.screenTransceiver.direction = "inactive";
+      screenTrack.onended = null;
+      screenStream.getTracks().forEach((track) => {
         try {
-          await this.screenSender.replaceTrack(null);
+          track.stop();
         } catch {
         }
-        this.screenTransceiver.direction = "inactive";
-        screenTrack.onended = null;
-        screenStream.getTracks().forEach((track) => {
-          try {
-            track.stop();
-          } catch {
-          }
+      });
+      this.screenStream = null;
+      try {
+        this.send({
+          type: "stop_screen_share"
         });
-        this.screenStream = null;
-        try {
-          this.send({
-            type: "stop_screen_share"
-          });
-        } catch {
-        }
+      } catch {
       }
       throw error;
     }
@@ -1556,32 +1540,52 @@ var SFUClient = class {
   async stopScreenShare() {
     const stream = this.screenStream;
     const senderTrack = this.screenSender?.track || null;
-    if (!stream && !senderTrack) return;
+    if (!stream && !senderTrack) {
+      return;
+    }
     ++this.screenShareGeneration;
-    if (senderTrack) senderTrack.onended = null;
+    if (senderTrack) {
+      senderTrack.onended = null;
+    }
     try {
       await this.screenSender?.replaceTrack(null);
     } catch (error) {
       this.onError(error);
     }
-    if (this.screenTransceiver) this.screenTransceiver.direction = "inactive";
+    if (this.screenTransceiver) {
+      this.screenTransceiver.direction = "inactive";
+    }
     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.send({ type: "stop_screen_share" });
-    stream?.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)
+    if (this.currentParticipantId) {
       this.onScreenShareStopped(this.currentParticipantId);
+    }
   }
   muteAudio(muted) {
     this.desiredAudioMuted = muted;
@@ -1687,7 +1691,9 @@ var SFUClient = class {
   sendReaction(reaction) {
     this.send({
       type: "send_reaction",
-      reaction
+      payload: {
+        emoji: reaction
+      }
     });
   }
   removeRemoteParticipant(participantId) {
@@ -2581,21 +2587,23 @@ var VideoSDKCore = class {
       throw err;
     }
   }
-  stopScreenShare() {
-    if (!this.screenStream) {
+  async stopScreenShare() {
+    if (!this.sfuClient) {
       return;
     }
-    void this.sfuClient?.stopScreenShare();
-    this.screenStream.getTracks().forEach((track) => track.stop());
-    this.screenStream = null;
-    this.isScreenSharing = false;
-    this.state.updateLocalParticipant({
-      media: {
-        isScreenSharing: false,
-        screenStream: null,
-        screenTrack: void 0
-      }
-    });
+    try {
+      await this.sfuClient.stopScreenShare();
+    } finally {
+      this.screenStream = null;
+      this.isScreenSharing = false;
+      this.state.updateLocalParticipant({
+        media: {
+          isScreenSharing: false,
+          screenStream: null,
+          screenTrack: void 0
+        }
+      });
+    }
   }
   // RECORDING
   async startRecording() {