@afosecure/meetingsdk 1.4.5 → 1.4.7

package/dist/index.d.mts

@@ -127,6 +127,9 @@ declare class VideoSDKCore {
     private ws;
     private pubPC;
     private subPC;
+    private pendingTracks;
+    private subscriberNegotiating;
+    private subscriberOfferQueue;
     private iceServers;
     private lastPong;
     private intentionalDisconnect;
@@ -147,17 +150,19 @@ declare class VideoSDKCore {
     private pendingRequestId;
     private iceTransportPolicy;
     constructor(events?: Events, url?: string);
+    private acquireLocalMedia;
     initLocal(video: HTMLVideoElement, name: string): Promise<void>;
     joinMeeting(config: MeetingConfig): Promise<void>;
     private setupPublisherPC;
     private setupSubscriberPC;
     connect(roomId: string, name: string): Promise<void>;
     private handle;
+    private handleSubscriberOffer;
     private createPublisherOffer;
     toggleMic(): void;
     toggleCam(): void;
     startScreenShare(): Promise<MediaStream>;
-    stopScreenShare(): void;
+    stopScreenShare(): Promise<void>;
     sendChatMessage(payload: ChatInput): void;
     private scheduleReconnect;
     private startHeartbeat;

package/dist/index.d.ts

@@ -127,6 +127,9 @@ declare class VideoSDKCore {
     private ws;
     private pubPC;
     private subPC;
+    private pendingTracks;
+    private subscriberNegotiating;
+    private subscriberOfferQueue;
     private iceServers;
     private lastPong;
     private intentionalDisconnect;
@@ -147,17 +150,19 @@ declare class VideoSDKCore {
     private pendingRequestId;
     private iceTransportPolicy;
     constructor(events?: Events, url?: string);
+    private acquireLocalMedia;
     initLocal(video: HTMLVideoElement, name: string): Promise<void>;
     joinMeeting(config: MeetingConfig): Promise<void>;
     private setupPublisherPC;
     private setupSubscriberPC;
     connect(roomId: string, name: string): Promise<void>;
     private handle;
+    private handleSubscriberOffer;
     private createPublisherOffer;
     toggleMic(): void;
     toggleCam(): void;
     startScreenShare(): Promise<MediaStream>;
-    stopScreenShare(): void;
+    stopScreenShare(): Promise<void>;
     sendChatMessage(payload: ChatInput): void;
     private scheduleReconnect;
     private startHeartbeat;

package/dist/index.js

@@ -40,8 +40,8 @@ var import_react2 = require("react");
 
 // src/config/ws.ts
 var SDK_CONFIG = {
-  wsUrl: "wss://rust-video-server-sfyf.onrender.com/ws",
-  baseUrl: "https://rust-video-server-sfyf.onrender.com"
+  wsUrl: "wss://sfuserver-production.up.railway.app/ws",
+  baseUrl: "https://sfuserver-production.up.railway.app"
 };
 
 // src/core/MeetingState.ts
@@ -200,6 +200,9 @@ var VideoSDKCore = class {
     this.ws = null;
     this.pubPC = null;
     this.subPC = null;
+    this.pendingTracks = /* @__PURE__ */ new Map();
+    this.subscriberNegotiating = false;
+    this.subscriberOfferQueue = [];
     this.iceServers = [];
     this.lastPong = Date.now();
     this.intentionalDisconnect = false;
@@ -223,31 +226,84 @@ var VideoSDKCore = class {
     this.myId = localStorage.getItem("vsdk_id") || crypto.randomUUID();
     localStorage.setItem("vsdk_id", this.myId);
   }
+  async acquireLocalMedia(options) {
+    const { videoConstraints = true, audioConstraints = true } = options;
+    try {
+      const stream = await navigator.mediaDevices.getUserMedia({
+        video: videoConstraints,
+        audio: audioConstraints
+      });
+      const hasVideo = stream.getVideoTracks().some((t) => t.readyState === "live");
+      const hasAudio = stream.getAudioTracks().some((t) => t.readyState === "live");
+      return { stream, camEnabled: hasVideo, micEnabled: hasAudio };
+    } catch (err) {
+      console.warn(
+        "[VideoSDKCore] Primary getUserMedia failed:",
+        err?.name || err?.message
+      );
+      const isDeviceLocked = err?.name === "NotReadableError" || err?.name === "TrackStartError" || err?.message?.toLowerCase().includes("allocate videosource") || err?.message?.toLowerCase().includes("could not start video source");
+      if (isDeviceLocked) {
+        console.warn(
+          "[VideoSDKCore] Camera is locked by another browser/app. Falling back to Audio-Only."
+        );
+        try {
+          const audioOnlyStream = await navigator.mediaDevices.getUserMedia({
+            video: false,
+            audio: audioConstraints
+          });
+          return {
+            stream: audioOnlyStream,
+            camEnabled: false,
+            micEnabled: audioOnlyStream.getAudioTracks().some((t) => t.readyState === "live")
+          };
+        } catch (audioErr) {
+          console.warn(
+            "[VideoSDKCore] Audio acquisition also failed. Falling back to View-Only stream."
+          );
+        }
+      }
+      return {
+        stream: new MediaStream(),
+        camEnabled: false,
+        micEnabled: false
+      };
+    }
+  }
   // ---------------- MEDIA SETUP ----------------
   async initLocal(video, name) {
     this.participantName = name;
     try {
-      this.localStream = await navigator.mediaDevices.getUserMedia({
-        video: { width: { ideal: 1280 }, height: { ideal: 720 } },
-        audio: {
+      const { stream, camEnabled, micEnabled } = await this.acquireLocalMedia({
+        videoConstraints: { width: { ideal: 1280 }, height: { ideal: 720 } },
+        audioConstraints: {
           echoCancellation: true,
           noiseSuppression: true,
           autoGainControl: true
         }
       });
-      const hasVideo = this.localStream.getVideoTracks().some((t) => t.readyState === "live");
-      const hasAudio = this.localStream.getAudioTracks().some((t) => t.readyState === "live");
-      if (!hasVideo || !hasAudio) {
-        throw new Error(`Missing tracks: video=${hasVideo}, audio=${hasAudio}`);
+      this.localStream = stream;
+      console.log(
+        "[LOCAL MEDIA]",
+        this.localStream.getTracks().map((t) => ({
+          kind: t.kind,
+          enabled: t.enabled,
+          ready: t.readyState
+        }))
+      );
+      if (video && this.localStream.getVideoTracks().length > 0) {
+        video.srcObject = this.localStream;
       }
-      video.srcObject = this.localStream;
+      const cameraTrack = this.localStream.getVideoTracks()[0] || void 0;
+      const audioTrack = this.localStream.getAudioTracks()[0] || void 0;
       this.state.updateLocalParticipant({
         id: this.myId,
         name: this.participantName,
         media: {
           stream: this.localStream,
-          micEnabled: true,
-          camEnabled: true,
+          cameraTrack,
+          audioTrack,
+          micEnabled,
+          camEnabled,
           isScreenSharing: false
         }
       });
@@ -263,21 +319,38 @@ var VideoSDKCore = class {
       throw new Error("roomId and name are required to join meeting");
     }
     this.participantName = name;
+    let camEnabled = !videoMuted;
+    let micEnabled = !audioMuted;
     if (!this.localStream) {
-      this.localStream = await navigator.mediaDevices.getUserMedia({
-        video: true,
-        audio: true
+      const acquired = await this.acquireLocalMedia({
+        videoConstraints: !videoMuted,
+        audioConstraints: !audioMuted
       });
+      this.localStream = acquired.stream;
+      console.log(
+        "[LOCAL MEDIA]",
+        this.localStream.getTracks().map((t) => ({
+          kind: t.kind,
+          enabled: t.enabled,
+          ready: t.readyState
+        }))
+      );
+      camEnabled = acquired.camEnabled && !videoMuted;
+      micEnabled = acquired.micEnabled && !audioMuted;
     }
-    this.localStream.getAudioTracks().forEach((t) => t.enabled = !audioMuted);
-    this.localStream.getVideoTracks().forEach((t) => t.enabled = !videoMuted);
+    this.localStream.getAudioTracks().forEach((t) => t.enabled = micEnabled);
+    this.localStream.getVideoTracks().forEach((t) => t.enabled = camEnabled);
+    const cameraTrack = this.localStream.getVideoTracks()[0] || void 0;
+    const audioTrack = this.localStream.getAudioTracks()[0] || void 0;
     this.state.updateLocalParticipant({
       id: this.myId,
       name: this.participantName,
       media: {
         stream: this.localStream,
-        micEnabled: !audioMuted,
-        camEnabled: !videoMuted,
+        cameraTrack,
+        audioTrack,
+        micEnabled,
+        camEnabled,
         isScreenSharing: false
       }
     });
@@ -291,9 +364,39 @@ var VideoSDKCore = class {
       iceServers: this.iceServers,
       iceTransportPolicy: this.iceTransportPolicy
     });
+    const tracksByKind = /* @__PURE__ */ new Map();
     this.localStream.getTracks().forEach((track) => {
-      this.pubPC?.addTrack(track, this.localStream);
+      tracksByKind.set(track.kind, track);
     });
+    const audioTrack = this.localStream.getAudioTracks()[0];
+    if (audioTrack) {
+      console.log("[Publisher] Adding audio track:", {
+        kind: audioTrack.kind,
+        id: audioTrack.id,
+        enabled: audioTrack.enabled,
+        state: audioTrack.readyState
+      });
+      try {
+        this.pubPC?.addTrack(audioTrack, this.localStream);
+      } catch (e) {
+        console.error("[Publisher] Failed to add audio track:", e);
+      }
+    }
+    const videoTrack = this.localStream.getVideoTracks()[0];
+    if (videoTrack) {
+      console.log("[Publisher] Adding video track:", {
+        kind: videoTrack.kind,
+        id: videoTrack.id,
+        enabled: videoTrack.enabled,
+        // Can be false, that's OK
+        state: videoTrack.readyState
+      });
+      try {
+        this.pubPC?.addTrack(videoTrack, this.localStream);
+      } catch (e) {
+        console.error("[Publisher] Failed to add video track:", e);
+      }
+    }
     this.pubPC.onicecandidate = (e) => {
       if (e.candidate) {
         this.send({
@@ -304,8 +407,13 @@ var VideoSDKCore = class {
       }
     };
     this.pubPC.onconnectionstatechange = () => {
-      console.log(`[SFU Publisher PC State]`, this.pubPC?.connectionState);
+      console.log("[Publisher PC State]", {
+        connection: this.pubPC?.connectionState,
+        ice: this.pubPC?.iceConnectionState,
+        signaling: this.pubPC?.signalingState
+      });
       if (this.pubPC?.connectionState === "failed") {
+        console.warn("[Publisher] Connection failed, restarting ICE");
         this.restartPublisherIce();
       }
     };
@@ -325,44 +433,70 @@ var VideoSDKCore = class {
       }
     };
     this.subPC.ontrack = (event) => {
-      const incomingStream = event.streams[0] || new MediaStream([event.track]);
-      const streamId = incomingStream.id.replace(/[{}]/g, "");
-      let matchedParticipant;
-      for (const p of this.state.participants.values()) {
-        if (p.media?.cameraStreamId === streamId || p.media?.remoteScreenStreamId === streamId) {
-          matchedParticipant = p;
-          break;
-        }
+      console.log("[SFU ontrack Event]", {
+        kind: event.track.kind,
+        id: event.track.id,
+        mid: event.transceiver.mid,
+        streams: event.streams.length
+      });
+      const stream = event.streams[0] || new MediaStream([event.track]);
+      const mid = event.transceiver.mid;
+      if (!mid) {
+        console.warn("[Subscriber] Track received without MID", event.track);
+        return;
       }
-      if (!matchedParticipant) {
-        console.warn(
-          `[SFU ontrack] Dynamic track received for stream ${streamId}`
-        );
+      console.log("[Subscriber] Looking for descriptor with MID:", mid, {
+        available: [...this.pendingTracks.keys()]
+      });
+      const descriptor = this.pendingTracks.get(mid);
+      if (!descriptor) {
+        console.warn("[Subscriber] No descriptor found for MID:", mid);
+        console.log("[Subscriber] Pending tracks:", [
+          ...this.pendingTracks.entries()
+        ]);
         return;
       }
-      const pId = matchedParticipant.id;
-      const isScreen = streamId === matchedParticipant.media?.remoteScreenStreamId;
-      if (isScreen) {
-        this.state.updateParticipantMedia(pId, {
-          screenStream: incomingStream,
-          screenTrack: event.track,
-          isScreenSharing: true
-        });
-        if (!this.state.presenterId) {
-          this.state.setPresenterId(pId);
-        }
-        this.events.onScreenShareStarted?.(pId, incomingStream);
-      } else {
-        this.state.updateParticipantMedia(pId, {
-          stream: incomingStream,
-          cameraTrack: incomingStream.getVideoTracks()[0],
-          audioTrack: incomingStream.getAudioTracks()[0]
-        });
-        this.events.onTrack?.(incomingStream, pId);
+      console.log("[Subscriber] Found descriptor:", descriptor);
+      this.pendingTracks.delete(mid);
+      switch (descriptor.source) {
+        case "camera":
+          console.log(
+            "[Subscriber] Updating camera for:",
+            descriptor.publisher_id
+          );
+          this.state.updateParticipantMedia(descriptor.publisher_id, {
+            stream,
+            cameraTrack: event.track
+          });
+          break;
+        case "audio":
+          console.log(
+            "[Subscriber] Updating audio for:",
+            descriptor.publisher_id
+          );
+          this.state.updateParticipantMedia(descriptor.publisher_id, {
+            stream,
+            audioTrack: event.track
+          });
+          break;
+        case "screen":
+          console.log(
+            "[Subscriber] Updating screen for:",
+            descriptor.publisher_id
+          );
+          this.state.updateParticipantMedia(descriptor.publisher_id, {
+            screenStream: stream,
+            screenTrack: event.track,
+            isScreenSharing: true
+          });
+          break;
       }
     };
     this.subPC.onconnectionstatechange = () => {
-      console.log(`[SFU Subscriber PC State]`, this.subPC?.connectionState);
+      console.log("[SFU Subscriber PC State]", this.subPC?.connectionState);
+      if (this.subPC?.connectionState === "failed") {
+        console.warn("Subscriber connection failed");
+      }
     };
   }
   // ---------------- WEBSOCKET CONNECTION & SIGNALING ----------------
@@ -425,13 +559,26 @@ var VideoSDKCore = class {
         this.setupPublisherPC();
         this.setupSubscriberPC();
         await this.createPublisherOffer();
+        const media = this.state.localParticipant?.media;
+        if (media) {
+          this.send({
+            type: "MEDIA_STATE",
+            kind: "audio",
+            enabled: !!media.micEnabled
+          });
+          this.send({
+            type: "MEDIA_STATE",
+            kind: "video",
+            enabled: !!media.camEnabled
+          });
+        }
         this.startHeartbeat();
         this.joinResolver?.();
         this.joinResolver = void 0;
         this.joinRejecter = void 0;
         break;
       }
-      case "SFU_PUB_ANSWER": {
+      case "PUB_ANSWER": {
         if (this.pubPC) {
           await this.pubPC.setRemoteDescription({
             type: "answer",
@@ -440,20 +587,27 @@ var VideoSDKCore = class {
         }
         break;
       }
-      case "SFU_SUB_OFFER": {
-        if (this.subPC) {
-          await this.subPC.setRemoteDescription({
-            type: "offer",
-            sdp: msg.payload
-          });
-          const answer = await this.subPC.createAnswer();
-          await this.subPC.setLocalDescription(answer);
-          this.send({
-            type: "SUB_ANSWER",
-            payload: answer.sdp,
-            user_id: this.myId
-          });
+      case "SUB_OFFER": {
+        if (!this.subPC) {
+          console.warn("Subscriber PC not ready");
+          return;
+        }
+        const descriptor = msg.track;
+        const mid = descriptor.mid;
+        console.log(
+          "[Signaling] Received SUB_OFFER with descriptor:",
+          descriptor
+        );
+        if (mid) {
+          this.pendingTracks.set(mid, descriptor);
+          console.log("[Signaling] Stored pending track for MID:", mid);
+        }
+        if (this.subscriberNegotiating) {
+          console.warn("Subscriber negotiating, queueing offer");
+          this.subscriberOfferQueue.push(msg);
+          return;
         }
+        await this.handleSubscriberOffer(msg);
         break;
       }
       case "PUB_ICE": {
@@ -600,6 +754,31 @@ var VideoSDKCore = class {
       }
     }
   }
+  async handleSubscriberOffer(msg) {
+    if (!this.subPC) return;
+    try {
+      this.subscriberNegotiating = true;
+      await this.subPC.setRemoteDescription({
+        type: "offer",
+        sdp: msg.payload
+      });
+      const answer = await this.subPC.createAnswer();
+      await this.subPC.setLocalDescription(answer);
+      this.send({
+        type: "SUB_ANSWER",
+        payload: answer.sdp,
+        user_id: this.myId
+      });
+    } catch (err) {
+      console.error("[SUB OFFER ERROR]", err);
+    } finally {
+      this.subscriberNegotiating = false;
+      const next = this.subscriberOfferQueue.shift();
+      if (next) {
+        await this.handleSubscriberOffer(next);
+      }
+    }
+  }
   // ---------------- PUBLISHER RENEGOTIATION ----------------
   async createPublisherOffer() {
     if (!this.pubPC) return;
@@ -652,6 +831,9 @@ var VideoSDKCore = class {
       });
       this.isScreenSharing = true;
       const screenTrack = this.screenStream.getVideoTracks()[0];
+      Object.defineProperty(screenTrack, "contentHint", {
+        value: "detail"
+      });
       if (this.pubPC) {
         this.screenSender = this.pubPC.addTrack(screenTrack, this.screenStream);
         await this.createPublisherOffer();
@@ -671,7 +853,6 @@ var VideoSDKCore = class {
         type: "SCREEN_SHARE_START",
         sender: this.myId,
         room_id: this.room.id,
-        camera_id: this.localStream?.id.replace(/[{}]/g, ""),
         stream_id: this.screenStream.id.replace(/[{}]/g, "")
       });
       return this.screenStream;
@@ -687,17 +868,13 @@ var VideoSDKCore = class {
       throw err;
     }
   }
-  stopScreenShare() {
+  async stopScreenShare() {
     if (!this.screenStream) return;
     this.screenStream.getTracks().forEach((t) => t.stop());
     if (this.pubPC && this.screenSender) {
-      try {
-        this.pubPC.removeTrack(this.screenSender);
-        this.createPublisherOffer();
-      } catch (e) {
-        console.warn("Failed removing screen sender", e);
-      }
+      this.pubPC.removeTrack(this.screenSender);
       this.screenSender = null;
+      await this.createPublisherOffer();
     }
     this.screenStream = null;
     this.isScreenSharing = false;