@defcomm/meetingsdk 0.1.2 → 0.1.3

package/dist/index.d.mts

@@ -285,6 +285,9 @@ declare class SFUClient {
     private videoSender;
     private audioSender;
     private screenSender;
+    private audioTransceiver;
+    private cameraTransceiver;
+    private screenTransceiver;
     private iceServers;
     private requestId;
     private publisherRevision;
@@ -313,6 +316,7 @@ declare class SFUClient {
     private trackMetadata;
     private participants;
     private remoteStreams;
+    private remoteScreenStreams;
     private trackToParticipant;
     private trackToSource;
     private localTrackIds;

package/dist/index.d.ts

@@ -285,6 +285,9 @@ declare class SFUClient {
     private videoSender;
     private audioSender;
     private screenSender;
+    private audioTransceiver;
+    private cameraTransceiver;
+    private screenTransceiver;
     private iceServers;
     private requestId;
     private publisherRevision;
@@ -313,6 +316,7 @@ declare class SFUClient {
     private trackMetadata;
     private participants;
     private remoteStreams;
+    private remoteScreenStreams;
     private trackToParticipant;
     private trackToSource;
     private localTrackIds;

package/dist/index.js

@@ -387,6 +387,9 @@ var SFUClient = class {
     this.videoSender = null;
     this.audioSender = null;
     this.screenSender = null;
+    this.audioTransceiver = null;
+    this.cameraTransceiver = null;
+    this.screenTransceiver = null;
     this.iceServers = [];
     this.requestId = 0;
     this.publisherRevision = 0;
@@ -418,6 +421,7 @@ var SFUClient = class {
     this.trackMetadata = /* @__PURE__ */ new Map();
     this.participants = /* @__PURE__ */ new Map();
     this.remoteStreams = /* @__PURE__ */ new Map();
+    this.remoteScreenStreams = /* @__PURE__ */ new Map();
     this.trackToParticipant = /* @__PURE__ */ new Map();
     this.trackToSource = /* @__PURE__ */ new Map();
     this.localTrackIds = /* @__PURE__ */ new Map();
@@ -900,16 +904,18 @@ var SFUClient = class {
       }
       case "screen_share_stopped": {
         const participantId = payload.participant_id;
-        const stream = participantId ? this.remoteStreams.get(participantId) : null;
+        const screenStream = participantId ? this.remoteScreenStreams.get(participantId) : null;
         const trackId = payload.track_id;
-        if (stream) {
-          for (const track of stream.getVideoTracks()) {
-            const source = this.trackToSource.get(this.normalizeRemoteTrackId(track.id));
-            if (!trackId || this.normalizeRemoteTrackId(track.id) === String(trackId) || source === "screen") {
-              stream.removeTrack(track);
+        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;
@@ -978,6 +984,18 @@ var SFUClient = class {
     const config = { iceServers: this.iceServers };
     this.publisher = new RTCPeerConnection(config);
     this.subscriber = new RTCPeerConnection(config);
+    this.audioTransceiver = this.publisher.addTransceiver("audio", {
+      direction: "sendonly"
+    });
+    this.cameraTransceiver = this.publisher.addTransceiver("video", {
+      direction: "sendonly"
+    });
+    this.screenTransceiver = this.publisher.addTransceiver("video", {
+      direction: "inactive"
+    });
+    this.audioSender = this.audioTransceiver.sender;
+    this.videoSender = this.cameraTransceiver.sender;
+    this.screenSender = this.screenTransceiver.sender;
     this.publisher.onicecandidate = (event) => {
       if (event.candidate) this.sendCandidate("publisher", event.candidate);
     };
@@ -1017,25 +1035,61 @@ var SFUClient = class {
       return;
     }
     const participantId = metadata.participant_id;
+    const source = String(
+      metadata.source || this.trackToSource.get(metadata.track_id) || ""
+    ).trim().toLowerCase();
+    if (source === "screen" || source === "screen_share") {
+      let screenStream = this.remoteScreenStreams.get(participantId);
+      if (!screenStream) {
+        screenStream = new MediaStream();
+        this.remoteScreenStreams.set(participantId, screenStream);
+      }
+      for (const existing of screenStream.getVideoTracks()) {
+        if (existing.id !== event.track.id) {
+          screenStream.removeTrack(existing);
+          existing.stop();
+        }
+      }
+      if (!screenStream.getTracks().some((track) => track.id === event.track.id)) {
+        screenStream.addTrack(event.track);
+      }
+      event.track.onended = () => {
+        try {
+          screenStream?.removeTrack(event.track);
+        } catch {
+        }
+        if (screenStream?.getTracks().length === 0) {
+          this.remoteScreenStreams.delete(participantId);
+          this.onScreenShareStopped(
+            participantId,
+            metadata.track_id
+          );
+        }
+      };
+      this.onScreenShareStarted(participantId, metadata);
+      this.onRemoteTrack(event.track, screenStream, {
+        ...metadata,
+        source: "screen"
+      });
+      return;
+    }
+    if (event.track.kind === "video" && source !== "camera") {
+      this.onError(
+        new Error(
+          `Refusing to route unknown remote video source to camera: ${metadata.track_id}`
+        )
+      );
+      return;
+    }
     let remoteStream = this.remoteStreams.get(participantId);
     if (!remoteStream) {
       remoteStream = new MediaStream();
       this.remoteStreams.set(participantId, remoteStream);
     }
-    const source = metadata.source || this.trackToSource.get(metadata.track_id);
-    if (source === "screen") {
-      for (const existing of remoteStream.getVideoTracks()) {
-        if (existing.id !== event.track.id && this.trackToSource.get(existing.id) === "screen") {
-          remoteStream.removeTrack(existing);
-          existing.stop();
-        }
-      }
-    } else {
-      for (const existing of remoteStream.getTracks()) {
-        if (existing.kind === event.track.kind && existing.id !== event.track.id) {
-          remoteStream.removeTrack(existing);
-          existing.stop();
-        }
+    for (const existing of remoteStream.getTracks()) {
+      if (existing.kind === event.track.kind && existing.id !== event.track.id) {
+        remoteStream.removeTrack(existing);
+        existing.stop();
       }
     }
     if (!remoteStream.getTracks().some((track) => track.id === event.track.id)) {
@@ -1047,31 +1101,24 @@ var SFUClient = class {
       } catch {
       }
     };
-    if (source === "screen") {
-      this.onScreenShareStarted(participantId, metadata);
-    }
-    this.onRemoteTrack(event.track, remoteStream, metadata);
+    this.onRemoteTrack(event.track, remoteStream, {
+      ...metadata,
+      source: event.track.kind === "audio" ? "audio" : "camera"
+    });
   }
   normalizeRemoteTrackId(browserTrackId) {
     return browserTrackId?.startsWith("track-") ? browserTrackId.slice("track-".length) : browserTrackId;
   }
   resolveRemoteTrackMetadata(track, stream) {
-    const sfuTrackId = this.normalizeRemoteTrackId(track.id);
-    const exact = this.trackMetadata.get(sfuTrackId);
-    if (exact) return exact;
-    const byTrackId = this.trackMetadata.get(track.id);
-    if (byTrackId) return byTrackId;
-    const matching = [...this.trackMetadata.values()].find(
-      (entry) => entry.kind === track.kind
-    );
-    if (matching) return matching;
-    if (stream?.id) {
-      const participant = this.participants.get(stream.id);
-      if (participant) {
-        return [...this.trackMetadata.values()].find(
-          (entry) => entry.participant_id === participant.participant_id && entry.kind === track.kind
-        ) || null;
-      }
+    const candidates = [
+      this.normalizeRemoteTrackId(track.id),
+      track.id,
+      stream?.id ? this.normalizeRemoteTrackId(stream.id) : null,
+      stream?.id || null
+    ].filter(Boolean);
+    for (const id of candidates) {
+      const metadata = this.trackMetadata.get(id);
+      if (metadata) return metadata;
     }
     return null;
   }
@@ -1202,20 +1249,19 @@ var SFUClient = class {
   }
   async publishExistingTracks(audio = true, video = true) {
     if (!this.publisher || !this.localStream) return;
-    this.audioSender = null;
-    this.videoSender = null;
-    for (const track of this.localStream.getTracks()) {
-      if (track.kind === "audio" && !audio) continue;
-      if (track.kind === "video" && !video) continue;
-      const sender = this.publisher.addTrack(track, this.localStream);
-      if (track.kind === "audio") this.audioSender = sender;
-      if (track.kind === "video") this.videoSender = sender;
-    }
-    if (this.screenStream?.getVideoTracks()[0]) {
-      const screenTrack = this.screenStream.getVideoTracks()[0];
-      this.screenSender = this.publisher.addTrack(screenTrack, this.screenStream);
-    }
-    if (!this.publisher.getSenders().length) return;
+    if (!this.audioTransceiver || !this.cameraTransceiver || !this.screenTransceiver) {
+      throw new Error("Publisher transceivers are not initialized");
+    }
+    const audioTrack = this.localStream.getAudioTracks().find((track) => track.readyState === "live");
+    const cameraTrack = this.localStream.getVideoTracks().find((track) => track.readyState === "live");
+    const screenTrack = this.screenStream?.getVideoTracks().find((track) => track.readyState === "live");
+    await this.audioSender?.replaceTrack(audio && audioTrack ? audioTrack : null);
+    this.audioTransceiver.direction = audio && audioTrack ? "sendonly" : "inactive";
+    await this.videoSender?.replaceTrack(video && cameraTrack ? cameraTrack : null);
+    this.cameraTransceiver.direction = video && cameraTrack ? "sendonly" : "inactive";
+    await this.screenSender?.replaceTrack(screenTrack || null);
+    this.screenTransceiver.direction = screenTrack ? "sendonly" : "inactive";
+    if (!audioTrack && !cameraTrack && !screenTrack) return;
     const offer = await this.publisher.createOffer();
     await this.publisher.setLocalDescription(offer);
     this.send({
@@ -1225,44 +1271,86 @@ var SFUClient = class {
         sdp: offer.sdp
       }
     });
-    if (this.screenStream?.getVideoTracks()[0]) {
+    if (screenTrack) {
       this.send({ type: "start_screen_share" });
     }
   }
   async shareScreen() {
-    if (!this.publisher) throw new Error("Publisher PeerConnection is not initialized");
-    if (this.screenStream) return this.screenStream;
-    this.screenStream = await navigator.mediaDevices.getDisplayMedia({ video: true });
-    const screenTrack = this.screenStream.getVideoTracks()[0];
-    if (!screenTrack) throw new Error("Screen share returned no video track");
-    this.screenSender = this.publisher.addTrack(screenTrack, this.screenStream);
-    const offer = await this.publisher.createOffer();
-    await this.publisher.setLocalDescription(offer);
-    this.send({
-      type: "publish_offer",
-      payload: {
-        revision: ++this.publisherRevision,
-        sdp: offer.sdp
-      }
+    if (!this.publisher) {
+      throw new Error("Publisher PeerConnection is not initialized");
+    }
+    if (!this.screenTransceiver || !this.screenSender) {
+      throw new Error("Screen transceiver is not initialized");
+    }
+    if (this.screenStream) {
+      return this.screenStream;
+    }
+    const screenStream = await navigator.mediaDevices.getDisplayMedia({
+      video: true,
+      audio: false
     });
-    this.send({ type: "start_screen_share" });
-    screenTrack.onended = () => {
-      void this.stopScreenShare();
-    };
-    return this.screenStream;
-  }
-  async stopScreenShare() {
-    if (!this.screenStream) return;
-    const screenTrack = this.screenStream.getVideoTracks()[0];
-    if (screenTrack) screenTrack.onended = null;
-    if (this.screenSender && this.publisher) {
+    const screenTrack = screenStream.getVideoTracks()[0];
+    if (!screenTrack) {
+      screenStream.getTracks().forEach((track) => track.stop());
+      throw new Error("Screen share returned no video track");
+    }
+    this.screenStream = screenStream;
+    try {
+      if (!this.send({ type: "start_screen_share" })) {
+        throw new Error("Failed to signal start_screen_share");
+      }
+      await this.screenSender.replaceTrack(screenTrack);
+      this.screenTransceiver.direction = "sendonly";
+      const offer = await this.publisher.createOffer();
+      await this.publisher.setLocalDescription(offer);
+      this.send({
+        type: "publish_offer",
+        payload: {
+          revision: ++this.publisherRevision,
+          sdp: offer.sdp
+        }
+      });
+      screenTrack.onended = () => {
+        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 {
-        this.publisher.removeTrack(this.screenSender);
+        await this.screenSender.replaceTrack(null);
       } catch {
       }
-      this.screenSender = null;
+      this.screenTransceiver.direction = "inactive";
+      screenStream.getTracks().forEach((track) => track.stop());
+      this.screenStream = null;
       try {
-        const offer = await this.publisher.createOffer();
+        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;
+    try {
+      await this.screenSender?.replaceTrack(null);
+    } catch (error) {
+      this.onError(error);
+    }
+    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",
@@ -1271,13 +1359,15 @@ var SFUClient = class {
             sdp: offer.sdp
           }
         });
-        this.send({ type: "stop_screen_share" });
-      } catch (error) {
-        this.onError(error);
       }
+    } catch (error) {
+      this.onError(error);
     }
-    this.screenStream.getTracks().forEach((track) => track.stop());
+    this.screenStream?.getTracks().forEach((track) => track.stop());
     this.screenStream = null;
+    if (this.currentParticipantId) {
+      this.onScreenShareStopped(this.currentParticipantId);
+    }
   }
   muteAudio(muted) {
     this.localStream?.getAudioTracks().forEach((track) => {
@@ -1363,6 +1453,11 @@ var SFUClient = class {
       stream.getTracks().forEach((track) => track.stop());
       this.remoteStreams.delete(participantId);
     }
+    const screenStream = this.remoteScreenStreams.get(participantId);
+    if (screenStream) {
+      screenStream.getTracks().forEach((track) => track.stop());
+      this.remoteScreenStreams.delete(participantId);
+    }
     for (const [trackId, metadata] of this.trackMetadata) {
       if (metadata.participant_id === participantId) {
         this.trackMetadata.delete(trackId);
@@ -1438,6 +1533,9 @@ var SFUClient = class {
     this.videoSender = null;
     this.audioSender = null;
     this.screenSender = null;
+    this.audioTransceiver = null;
+    this.cameraTransceiver = null;
+    this.screenTransceiver = null;
     this.pendingIce = { publisher: [], subscriber: [] };
     this.offerQueue = [];
     this.subscriberNegotiating = false;
@@ -1460,6 +1558,10 @@ var SFUClient = class {
       stream.getTracks().forEach((track) => track.stop());
     }
     this.remoteStreams.clear();
+    for (const stream of this.remoteScreenStreams.values()) {
+      stream.getTracks().forEach((track) => track.stop());
+    }
+    this.remoteScreenStreams.clear();
     this.trackMetadata.clear();
     this.trackToParticipant.clear();
     this.trackToSource.clear();