@defcomm/meetingsdk 0.2.9 → 0.3.1

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 | null>;
-    stopScreenShare(): void;
+    startScreenShare(): Promise<MediaStream>;
+    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 | null>;
+    shareScreen(): Promise<MediaStream>;
     stopScreenShare(): Promise<void>;
     muteAudio(muted: boolean): void;
     muteVideo(muted: boolean): 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 | null>;
-    stopScreenShare(): void;
+    startScreenShare(): Promise<MediaStream>;
+    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 | null>;
+    shareScreen(): Promise<MediaStream>;
     stopScreenShare(): Promise<void>;
     muteAudio(muted: boolean): void;
     muteVideo(muted: boolean): void;

package/dist/index.js

@@ -1461,20 +1461,15 @@ var SFUClient = class {
     }
   }
   async shareScreen() {
-    if (!this.publisher)
+    if (!this.publisher) {
       throw new Error("Publisher PeerConnection is not initialized");
-    if (!this.screenTransceiver || !this.screenSender)
+    }
+    if (!this.screenTransceiver || !this.screenSender) {
       throw new Error("Screen transceiver is not initialized");
-    const existing = this.screenStream;
-    const existingTrack = this.screenSender.track;
-    if (existing || existingTrack && existingTrack.readyState === "live") {
-      return existing;
     }
-    try {
-      await this.screenSender.replaceTrack(null);
-    } catch {
+    if (this.screenStream) {
+      return this.screenStream;
     }
-    this.screenTransceiver.direction = "inactive";
     const screenStream = await navigator.mediaDevices.getDisplayMedia({
       video: true,
       audio: false
@@ -1484,22 +1479,29 @@ 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);
       this.send({
         type: "publish_offer",
-        payload: { revision: ++this.publisherRevision, sdp: offer.sdp }
+        payload: {
+          revision: ++this.publisherRevision,
+          sdp: offer.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 {
@@ -1517,34 +1519,38 @@ var SFUClient = class {
     }
   }
   async stopScreenShare() {
-    const stream = this.screenStream;
-    const senderTrack = this.screenSender?.track || null;
-    if (!stream && !senderTrack) return;
-    ++this.screenShareGeneration;
-    if (senderTrack) senderTrack.onended = null;
+    if (!this.screenStream && !this.screenSender?.track) return;
+    const screenTrack = this.screenSender?.track || null;
+    if (screenTrack) screenTrack.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";
+    }
+    this.send({ type: "stop_screen_share" });
     try {
       const offer = await this.publisher?.createOffer();
       if (offer && this.publisher) {
         await this.publisher.setLocalDescription(offer);
         this.send({
           type: "publish_offer",
-          payload: { revision: ++this.publisherRevision, sdp: offer.sdp }
+          payload: {
+            revision: ++this.publisherRevision,
+            sdp: offer.sdp
+          }
         });
       }
     } catch (error) {
       this.onError(error);
     }
-    this.send({ type: "stop_screen_share" });
-    stream?.getTracks().forEach((track) => track.stop());
+    this.screenStream?.getTracks().forEach((track) => track.stop());
     this.screenStream = null;
-    if (this.currentParticipantId)
+    if (this.currentParticipantId) {
       this.onScreenShareStopped(this.currentParticipantId);
+    }
   }
   muteAudio(muted) {
     this.desiredAudioMuted = muted;
@@ -1651,7 +1657,7 @@ var SFUClient = class {
     this.send({
       type: "send_reaction",
       payload: {
-        reaction
+        emoji: reaction
       }
     });
   }
@@ -2369,7 +2375,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
@@ -2546,21 +2554,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() {