@defcomm/meetingsdk 0.6.9 → 0.7.2

package/dist/index.mjs

@@ -386,7 +386,7 @@ var MeetingState = class {
     const nextMedia = {
       stream: patch.media?.stream ?? prevMedia.stream,
       screenStream: patch.media?.screenStream ?? prevMedia.screenStream,
-      cameraTrack: patch.media?.cameraTrack ?? prevMedia.cameraTrack,
+      cameraTrack: patch.media && Object.prototype.hasOwnProperty.call(patch.media, "cameraTrack") ? patch.media.cameraTrack ?? void 0 : prevMedia.cameraTrack,
       screenTrack: patch.media?.screenTrack ?? prevMedia.screenTrack,
       audioTrack: patch.media?.audioTrack ?? prevMedia.audioTrack,
       micEnabled: patch.media?.micEnabled ?? prevMedia.micEnabled,
@@ -473,9 +473,9 @@ var SFUClient = class {
     this.publisherRevision = 0;
     this.screenShareGeneration = 0;
     this.currentParticipantId = null;
-    // Provider/application token used for authenticated REST calls.
+    // Token supplied by the application for REST and SFU authentication.
     this.authToken = null;
-    // Room/SFU token returned by /token and used for the WebSocket.
+    // Token used for the current WebSocket session.
     this.token = null;
     this.room = null;
     this.resumeToken = null;
@@ -647,6 +647,71 @@ var SFUClient = class {
   setLocalStream(stream) {
     this.localStream = stream;
   }
+  /**
+   * Attach or detach the local camera track without replacing the publisher
+   * PeerConnection. Detaching with replaceTrack(null) stops media transmission;
+   * VideoSDKCore separately calls MediaStreamTrack.stop() to release hardware.
+   */
+  async setCameraTrack(track) {
+    if (!this.localStream) this.localStream = new MediaStream();
+    const currentTrack = this.localStream.getVideoTracks().find((item) => item !== track);
+    if (currentTrack) this.localStream.removeTrack(currentTrack);
+    if (track && !this.localStream.getTracks().includes(track)) {
+      this.localStream.addTrack(track);
+    }
+    if (!this.videoSender || !this.publisher || !this.cameraTransceiver) {
+      return;
+    }
+    const needsCameraNegotiation = Boolean(
+      track && this.cameraTransceiver.direction === "inactive"
+    );
+    if (needsCameraNegotiation && this.ws?.readyState !== WebSocket.OPEN) {
+      throw new Error("Cannot enable the camera while signaling is disconnected");
+    }
+    await this.videoSender.replaceTrack(track);
+    if (needsCameraNegotiation) {
+      await this.waitForPublisherStable();
+      this.cameraTransceiver.direction = "sendonly";
+      await this.sendPublisherOffer();
+    }
+  }
+  async waitForPublisherStable(timeoutMs = 5e3) {
+    const publisher = this.publisher;
+    if (!publisher) throw new Error("Publisher PeerConnection is not initialized");
+    const startedAt = Date.now();
+    while (publisher.signalingState !== "stable") {
+      if (publisher.signalingState === "closed") {
+        throw new Error("Publisher PeerConnection is closed");
+      }
+      if (Date.now() - startedAt >= timeoutMs) {
+        throw new Error("Publisher negotiation did not become stable in time");
+      }
+      await new Promise((resolve) => setTimeout(resolve, 25));
+    }
+  }
+  async sendPublisherOffer() {
+    if (!this.publisher) throw new Error("Publisher PeerConnection is not initialized");
+    const offer = await this.publisher.createOffer();
+    await this.publisher.setLocalDescription(offer);
+    const sent = this.send({
+      type: "publish_offer",
+      payload: {
+        revision: ++this.publisherRevision,
+        sdp: offer.sdp
+      }
+    });
+    if (!sent) {
+      try {
+        await this.publisher.setLocalDescription({ type: "rollback" });
+      } catch {
+      }
+      if (this.cameraTransceiver) {
+        this.cameraTransceiver.direction = "inactive";
+      }
+      await this.videoSender?.replaceTrack(null);
+      throw new Error("Unable to negotiate camera publishing: signaling is disconnected");
+    }
+  }
   nextRequestId() {
     return (++this.requestId).toString();
   }
@@ -701,7 +766,8 @@ var SFUClient = class {
       }
     );
   }
-  async getToken(roomCode, options = {}) {
+  async join(roomCode, options = {}) {
+    if (!this.authToken) throw new Error("Authentication token is required");
     const nextRoom = roomCode.trim();
     if (this.room && this.room !== nextRoom) {
       this.resumeToken = null;
@@ -719,33 +785,7 @@ var SFUClient = class {
     if (!this.resumeToken) {
       this.resumeToken = this.loadResumeToken(this.room);
     }
-    const data = await this.request(`${this.apiBase}/token`, {
-      method: "POST",
-      body: JSON.stringify({
-        room_code: this.room,
-        user_id: this.participantId,
-        display_name: options.displayName,
-        avatar_url: options.avatarUrl
-      })
-    });
-    this.token = data?.token;
-    if (!this.token) throw new Error("Token endpoint returned no token");
-    return this.connect(this.token, this.joinOptions);
-  }
-  async refreshAccessToken() {
-    if (!this.room) throw new Error("Cannot refresh token without a room");
-    const data = await this.request(`${this.apiBase}/token`, {
-      method: "POST",
-      body: JSON.stringify({
-        room_code: this.room,
-        user_id: this.participantId,
-        display_name: this.joinOptions.displayName,
-        avatar_url: this.joinOptions.avatarUrl
-      })
-    });
-    if (!data?.token) throw new Error("Token refresh returned no token");
-    this.token = data.token;
-    return this.token;
+    return this.connect(this.authToken, this.joinOptions);
   }
   connect(token, options = {}) {
     this.token = token;
@@ -835,15 +875,9 @@ var SFUClient = class {
       this.reconnectBaseMs * Math.pow(2, this.reconnectAttempt - 1)
     );
     this.onReconnecting(this.reconnectAttempt);
-    this.reconnectTimer = setTimeout(async () => {
+    this.reconnectTimer = setTimeout(() => {
       this.reconnectTimer = null;
-      try {
-        await this.refreshAccessToken();
-        this.openWebSocket(this.joinOptions);
-      } catch (error) {
-        this.onError(error);
-        this.scheduleReconnect();
-      }
+      this.openWebSocket(this.joinOptions);
     }, delay);
   }
   failJoin(error) {
@@ -2324,6 +2358,8 @@ var VideoSDKCore = class {
     this.screenStream = null;
     this.isScreenSharing = false;
     this.participantName = "";
+    this.cameraEnabled = false;
+    this.cameraToggleInProgress = false;
     this.intentionalDisconnect = false;
     this.remoteStreams = /* @__PURE__ */ new Map();
     this.remoteScreenStreams = /* @__PURE__ */ new Map();
@@ -2357,6 +2393,7 @@ var VideoSDKCore = class {
     this.participantName = name;
     try {
       this.localStream = await this.acquireOptionalLocalMedia();
+      this.cameraEnabled = this.hasLiveCameraTrack();
       const localAudioTrack = this.localStream.getAudioTracks()[0];
       if (localAudioTrack) {
         this.activeSpeakerDetector.addTrack(this.myId, localAudioTrack);
@@ -2368,17 +2405,47 @@ var VideoSDKCore = class {
       throw err;
     }
   }
-  updateLocalMedia(audioMuted = false, videoMuted = false) {
+  hasLiveCameraTrack() {
+    return Boolean(
+      this.localStream?.getVideoTracks().some((track) => track.readyState === "live")
+    );
+  }
+  getLiveCameraTrack() {
+    return this.localStream?.getVideoTracks().find((track) => track.readyState === "live") ?? null;
+  }
+  /**
+   * Stop every locally captured camera track and remove it from the stream.
+   * Track.enabled=false only emits black frames; stop() releases camera capture.
+   */
+  stopCameraCapture() {
+    if (!this.localStream) {
+      this.cameraEnabled = false;
+      return;
+    }
+    for (const track of this.localStream.getVideoTracks()) {
+      this.localStream.removeTrack(track);
+      try {
+        track.stop();
+      } catch {
+      }
+    }
+    this.cameraEnabled = false;
+  }
+  updateLocalMedia() {
     if (!this.localStream) return;
+    const cameraTrack = this.getLiveCameraTrack();
+    const audioTrack = this.localStream.getAudioTracks().find((track) => track.readyState === "live");
+    this.cameraEnabled = Boolean(cameraTrack && cameraTrack.enabled);
     this.state.updateLocalParticipant({
       id: this.myId,
       name: this.participantName,
       media: {
         stream: this.localStream,
-        cameraTrack: this.localStream.getVideoTracks()[0],
-        audioTrack: this.localStream.getAudioTracks()[0],
-        micEnabled: this.localStream.getAudioTracks()[0]?.enabled ?? false,
-        camEnabled: this.localStream.getVideoTracks()[0]?.enabled ?? false,
+        // Explicit null clears a previously published track from React state.
+        cameraTrack,
+        audioTrack: audioTrack ?? void 0,
+        micEnabled: audioTrack?.enabled ?? false,
+        camEnabled: this.cameraEnabled,
         isScreenSharing: this.isScreenSharing,
         screenStream: this.screenStream,
         screenTrack: this.screenStream?.getVideoTracks()[0]
@@ -2405,7 +2472,7 @@ var VideoSDKCore = class {
   async getMeetingSummary(roomCode, sessionId) {
     return this.sfuClient.getMeetingSummary(roomCode, sessionId);
   }
-  async acquireOptionalLocalMedia(cameraDeviceId, microphoneDeviceId) {
+  async acquireOptionalLocalMedia(cameraDeviceId, microphoneDeviceId, includeVideo = true) {
     const combined = new MediaStream();
     if (!navigator.mediaDevices?.getUserMedia) {
       console.warn(
@@ -2413,13 +2480,13 @@ var VideoSDKCore = class {
       );
       return combined;
     }
-    const cameraPromise = navigator.mediaDevices.getUserMedia({
+    const cameraPromise = includeVideo ? navigator.mediaDevices.getUserMedia({
       video: cameraDeviceId ? { deviceId: { exact: cameraDeviceId } } : {
         width: { ideal: 1280 },
         height: { ideal: 720 }
       },
       audio: false
-    });
+    }) : Promise.resolve(null);
     const microphonePromise = navigator.mediaDevices.getUserMedia({
       video: false,
       audio: microphoneDeviceId ? {
@@ -2437,11 +2504,11 @@ var VideoSDKCore = class {
       cameraPromise,
       microphonePromise
     ]);
-    if (cameraResult.status === "fulfilled") {
+    if (cameraResult.status === "fulfilled" && cameraResult.value) {
       for (const track of cameraResult.value.getVideoTracks()) {
         combined.addTrack(track);
       }
-    } else {
+    } else if (cameraResult.status === "rejected") {
       console.warn("[SDK] Camera unavailable; continuing without video.", {
         name: cameraResult.reason?.name,
         message: cameraResult.reason?.message
@@ -2462,6 +2529,25 @@ var VideoSDKCore = class {
     }
     return combined;
   }
+  async acquireCameraTrack() {
+    if (!navigator.mediaDevices?.getUserMedia) {
+      throw new Error("Camera access is not supported on this device");
+    }
+    const stream = await navigator.mediaDevices.getUserMedia({
+      video: this.cameraDeviceId ? { deviceId: { exact: this.cameraDeviceId } } : {
+        width: { ideal: 1280 },
+        height: { ideal: 720 }
+      },
+      audio: false
+    });
+    const track = stream.getVideoTracks()[0];
+    if (!track) {
+      stream.getTracks().forEach((item) => item.stop());
+      throw new Error("The selected camera did not provide a video track");
+    }
+    this.cameraDeviceId = track.getSettings().deviceId || this.cameraDeviceId;
+    return track;
+  }
   /**
    * Wakes the active-speaker Web Audio pipeline. Call this from a user gesture
    * whenever possible (Join, first click inside the meeting, etc.).
@@ -2511,10 +2597,12 @@ var VideoSDKCore = class {
     this.participantName = name;
     this.room.id = roomId;
     this.room.name = name;
+    this.cameraDeviceId = cameraDeviceId ?? this.cameraDeviceId;
     if (!this.localStream) {
       this.localStream = await this.acquireOptionalLocalMedia(
-        cameraDeviceId,
-        microphoneDeviceId
+        this.cameraDeviceId,
+        microphoneDeviceId,
+        !videoMuted
       );
       const localAudioTrack = this.localStream.getAudioTracks()[0];
       if (localAudioTrack) {
@@ -2524,10 +2612,17 @@ var VideoSDKCore = class {
     this.localStream.getAudioTracks().forEach((track) => {
       track.enabled = !audioMuted;
     });
-    this.localStream.getVideoTracks().forEach((track) => {
-      track.enabled = !videoMuted;
-    });
-    this.updateLocalMedia(audioMuted, videoMuted);
+    if (videoMuted) {
+      this.stopCameraCapture();
+    } else {
+      const initialCameraTrack = this.getLiveCameraTrack();
+      this.cameraEnabled = Boolean(initialCameraTrack);
+      if (initialCameraTrack) {
+        this.cameraDeviceId = initialCameraTrack.getSettings().deviceId || this.cameraDeviceId;
+        initialCameraTrack.enabled = true;
+      }
+    }
+    this.updateLocalMedia();
     const promise = this.connect(roomId, name);
     this.joinPromise = promise;
     try {
@@ -2557,7 +2652,7 @@ var VideoSDKCore = class {
       );
     }
     this.sfuClient.setLocalStream(this.localStream);
-    await this.sfuClient.getToken(roomId, {
+    await this.sfuClient.join(roomId, {
       displayName: name,
       participantId: this.myId,
       audioMuted: !(this.localStream?.getAudioTracks()[0]?.enabled ?? false),
@@ -3154,7 +3249,12 @@ var VideoSDKCore = class {
     if (!this.sfuClient) {
       throw new Error("SFU client is not initialized");
     }
+    if (!this.cameraEnabled) {
+      throw new Error("Your camera is off. Turn it on before switching devices.");
+    }
     const track = await this.sfuClient.selectCamera(deviceId);
+    this.cameraDeviceId = deviceId;
+    this.cameraEnabled = true;
     if (this.localStream) {
       this.state.localStream = this.localStream;
       this.updateLocalMedia();
@@ -3196,24 +3296,52 @@ var VideoSDKCore = class {
     this.sfuClient?.muteAudio(!nextEnabled);
     this.events.onMicToggled?.(this.myId, nextEnabled);
   }
-  toggleCam() {
-    const mediaState = this.state.localParticipant?.media;
-    if (!mediaState || !this.localStream) {
-      return;
-    }
-    const nextEnabled = !mediaState.camEnabled;
-    this.localStream.getVideoTracks().forEach((track) => {
-      track.enabled = nextEnabled;
-    });
-    this.state.updateLocalParticipant({
-      id: this.myId,
-      name: this.participantName,
-      media: {
-        camEnabled: nextEnabled
+  async toggleCam() {
+    if (!this.state.localParticipant?.media || !this.localStream) return;
+    if (this.cameraToggleInProgress) return;
+    this.cameraToggleInProgress = true;
+    const nextEnabled = !this.cameraEnabled;
+    try {
+      if (!nextEnabled) {
+        this.sfuClient?.muteVideo(true);
+        this.stopCameraCapture();
+        await this.sfuClient?.setCameraTrack(null);
+        this.updateLocalMedia();
+        this.events.onCamToggled?.(this.myId, false);
+        return;
       }
-    });
-    this.sfuClient?.muteVideo(!nextEnabled);
-    this.events.onCamToggled?.(this.myId, nextEnabled);
+      const track = await this.acquireCameraTrack();
+      if (!this.localStream) this.localStream = new MediaStream();
+      this.localStream.addTrack(track);
+      try {
+        await this.sfuClient?.setCameraTrack(track);
+        this.cameraEnabled = true;
+        this.sfuClient?.muteVideo(false);
+        this.updateLocalMedia();
+        this.events.onCamToggled?.(this.myId, true);
+      } catch (error) {
+        this.localStream.removeTrack(track);
+        try {
+          track.stop();
+        } catch {
+        }
+        this.cameraEnabled = false;
+        this.updateLocalMedia();
+        throw error;
+      }
+    } catch (error) {
+      this.cameraEnabled = false;
+      this.updateLocalMedia();
+      this.emitError(
+        "CAMERA_TOGGLE_FAILED",
+        error?.message || "Unable to change camera state",
+        error,
+        true
+      );
+      throw error;
+    } finally {
+      this.cameraToggleInProgress = false;
+    }
   }
   // SCREEN SHARING
   async startScreenShare() {
@@ -3371,6 +3499,8 @@ var VideoSDKCore = class {
       this.localStream.getTracks().forEach((track) => track.stop());
       this.localStream = null;
     }
+    this.cameraEnabled = false;
+    this.cameraToggleInProgress = false;
     if (this.screenStream) {
       this.screenStream.getTracks().forEach((track) => track.stop());
       this.screenStream = null;