@defcomm/meetingsdk 0.3.0 → 0.3.1

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 | null>;
+    startScreenShare(): Promise<MediaStream>;
     stopScreenShare(): Promise<void>;
     startRecording(): Promise<void>;
     stopRecording(): Promise<void>;
@@ -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,7 +219,7 @@ declare class VideoSDKCore {
     rejectJoinRequest(requestId: string, reason?: string): Promise<void>;
     toggleMic(): void;
     toggleCam(): void;
-    startScreenShare(): Promise<MediaStream | null>;
+    startScreenShare(): Promise<MediaStream>;
     stopScreenShare(): Promise<void>;
     startRecording(): Promise<void>;
     stopRecording(): Promise<void>;
@@ -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

@@ -1467,16 +1467,9 @@ 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 (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
@@ -1486,33 +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);
-      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: localDescription.sdp
+          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 {
@@ -1520,33 +1509,19 @@ var SFUClient = class {
       } catch {
       }
       this.screenTransceiver.direction = "inactive";
-      screenTrack.onended = null;
-      screenStream.getTracks().forEach((track) => {
-        try {
-          track.stop();
-        } catch {
-        }
-      });
+      screenStream.getTracks().forEach((track) => track.stop());
       this.screenStream = null;
       try {
-        this.send({
-          type: "stop_screen_share"
-        });
+        this.send({ type: "stop_screen_share" });
       } catch {
       }
       throw error;
     }
   }
   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) {
@@ -1555,33 +1530,23 @@ var SFUClient = class {
     if (this.screenTransceiver) {
       this.screenTransceiver.direction = "inactive";
     }
+    this.send({ type: "stop_screen_share" });
     try {
-      if (this.publisher) {
-        const offer = await this.publisher.createOffer();
+      const offer = await this.publisher?.createOffer();
+      if (offer && this.publisher) {
         await this.publisher.setLocalDescription(offer);
-        const localDescription = this.publisher.localDescription;
-        if (localDescription?.sdp) {
-          this.send({
-            type: "publish_offer",
-            payload: {
-              revision: ++this.publisherRevision,
-              sdp: localDescription.sdp
-            }
-          });
-        }
+        this.send({
+          type: "publish_offer",
+          payload: {
+            revision: ++this.publisherRevision,
+            sdp: offer.sdp
+          }
+        });
       }
     } catch (error) {
       this.onError(error);
     }
-    this.send({
-      type: "stop_screen_share"
-    });
-    stream?.getTracks().forEach((track) => {
-      try {
-        track.stop();
-      } catch {
-      }
-    });
+    this.screenStream?.getTracks().forEach((track) => track.stop());
     this.screenStream = null;
     if (this.currentParticipantId) {
       this.onScreenShareStopped(this.currentParticipantId);
@@ -2410,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