@afosecure/meetingsdk 1.1.4 → 1.1.6

package/dist/index.d.mts

@@ -109,9 +109,10 @@ declare class VideoSDKCore {
     private peers;
     private initiators;
     private lastPong;
+    private iceServers;
     private intentionalDisconnect;
     private myId;
-    private roomId;
+    private room;
     private localStream;
     private screenStream;
     private isScreenSharing;
@@ -130,7 +131,10 @@ declare class VideoSDKCore {
     connect(roomId: string, name: string): Promise<void>;
     joinMeeting(config: MeetingConfig): Promise<void>;
     /** Expose the roomId without making it fully public */
-    getMeetingId(): string | null;
+    getMeeting(): {
+        id: string | null;
+        name: string | null;
+    };
     toggleMic(): void;
     toggleCam(): void;
     private scheduleReconnect;
@@ -140,6 +144,7 @@ declare class VideoSDKCore {
     private handle;
     private createPeer;
     private createOffer;
+    private shouldInitiate;
     private handleOffer;
     private closePeer;
     startScreenShare(): Promise<MediaStream>;
@@ -163,7 +168,10 @@ type MeetingContextValue = {
     startScreenShare: () => Promise<MediaStream>;
     stopScreenShare: () => void;
     sendMessage: (input: ChatInput) => void;
-    meetingId: string | null;
+    room: {
+        id: string | null;
+        name: string | null;
+    };
     localParticipant: Participant | null;
     participants: Map<string, Participant>;
     messages: ChatMessage[];
@@ -180,7 +188,6 @@ declare const useMeetingContext: () => MeetingContextValue;
 declare const useMeeting: (handlers?: {
     onError?: (err: any) => void;
 }) => {
-    sdk: VideoSDKCore;
     join: (config: MeetingConfig) => Promise<void>;
     leave: () => void;
     toggleMic: () => void;
@@ -188,7 +195,10 @@ declare const useMeeting: (handlers?: {
     startScreenShare: () => Promise<MediaStream>;
     stopScreenShare: () => void;
     sendMessage: (input: ChatInput) => void;
-    meetingId: string | null;
+    room: {
+        id: string | null;
+        name: string | null;
+    };
     localParticipant: Participant | null;
     participants: Map<string, Participant>;
     messages: ChatMessage[];

package/dist/index.d.ts

@@ -109,9 +109,10 @@ declare class VideoSDKCore {
     private peers;
     private initiators;
     private lastPong;
+    private iceServers;
     private intentionalDisconnect;
     private myId;
-    private roomId;
+    private room;
     private localStream;
     private screenStream;
     private isScreenSharing;
@@ -130,7 +131,10 @@ declare class VideoSDKCore {
     connect(roomId: string, name: string): Promise<void>;
     joinMeeting(config: MeetingConfig): Promise<void>;
     /** Expose the roomId without making it fully public */
-    getMeetingId(): string | null;
+    getMeeting(): {
+        id: string | null;
+        name: string | null;
+    };
     toggleMic(): void;
     toggleCam(): void;
     private scheduleReconnect;
@@ -140,6 +144,7 @@ declare class VideoSDKCore {
     private handle;
     private createPeer;
     private createOffer;
+    private shouldInitiate;
     private handleOffer;
     private closePeer;
     startScreenShare(): Promise<MediaStream>;
@@ -163,7 +168,10 @@ type MeetingContextValue = {
     startScreenShare: () => Promise<MediaStream>;
     stopScreenShare: () => void;
     sendMessage: (input: ChatInput) => void;
-    meetingId: string | null;
+    room: {
+        id: string | null;
+        name: string | null;
+    };
     localParticipant: Participant | null;
     participants: Map<string, Participant>;
     messages: ChatMessage[];
@@ -180,7 +188,6 @@ declare const useMeetingContext: () => MeetingContextValue;
 declare const useMeeting: (handlers?: {
     onError?: (err: any) => void;
 }) => {
-    sdk: VideoSDKCore;
     join: (config: MeetingConfig) => Promise<void>;
     leave: () => void;
     toggleMic: () => void;
@@ -188,7 +195,10 @@ declare const useMeeting: (handlers?: {
     startScreenShare: () => Promise<MediaStream>;
     stopScreenShare: () => void;
     sendMessage: (input: ChatInput) => void;
-    meetingId: string | null;
+    room: {
+        id: string | null;
+        name: string | null;
+    };
     localParticipant: Participant | null;
     participants: Map<string, Participant>;
     messages: ChatMessage[];

package/dist/index.js

@@ -39,7 +39,7 @@ var import_react2 = require("react");
 
 // src/config/ws.ts
 var SDK_CONFIG = {
-  wsUrl: "wss://rust-video-server-sfyf.onrender.com/ws"
+  wsUrl: "ws://localhost:8080/ws"
 };
 
 // src/core/MeetingState.ts
@@ -201,8 +201,12 @@ var VideoSDKCore = class {
     this.peers = {};
     this.initiators = /* @__PURE__ */ new Set();
     this.lastPong = Date.now();
+    this.iceServers = [];
     this.intentionalDisconnect = false;
-    this.roomId = null;
+    this.room = {
+      id: null,
+      name: null
+    };
     this.localStream = null;
     this.screenStream = null;
     this.isScreenSharing = false;
@@ -222,7 +226,7 @@ var VideoSDKCore = class {
       code,
       message,
       raw,
-      roomId: this.roomId,
+      roomId: this.room.id,
       userId: this.myId,
       recoverable
     };
@@ -234,28 +238,43 @@ var VideoSDKCore = class {
   // ---------------- STREAM ----------------
   async initLocal(video, name) {
     this.participantName = name;
-    if (!this.localStream) {
+    try {
       this.localStream = await navigator.mediaDevices.getUserMedia({
-        video: true,
-        audio: true
+        video: {
+          width: { ideal: 1280 },
+          height: { ideal: 720 }
+        },
+        audio: {
+          echoCancellation: true,
+          noiseSuppression: true,
+          autoGainControl: true
+        }
       });
-    }
-    video.srcObject = this.localStream;
-    this.state.updateLocalParticipant({
-      id: this.myId,
-      name: this.participantName,
-      media: {
-        stream: this.localStream,
-        micEnabled: true,
-        camEnabled: true,
-        isScreenSharing: false
+      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.state.localStream = this.localStream;
+      video.srcObject = this.localStream;
+      this.state.updateLocalParticipant({
+        id: this.myId,
+        name: this.participantName,
+        media: {
+          stream: this.localStream,
+          micEnabled: true,
+          camEnabled: true,
+          isScreenSharing: false
+        }
+      });
+      this.state.localStream = this.localStream;
+    } catch (err) {
+      this.emitError("GET_USER_MEDIA_FAILED", err?.message, err, false);
+      throw err;
+    }
   }
   // ---------------- CONNECT ----------------
   async connect(roomId, name) {
-    this.roomId = roomId;
+    this.room.id = roomId;
     this.reset();
     return new Promise((resolve, reject) => {
       this.joinResolver = resolve;
@@ -324,8 +343,8 @@ var VideoSDKCore = class {
     await this.connect(roomId, name);
   }
   /** Expose the roomId without making it fully public */
-  getMeetingId() {
-    return this.roomId;
+  getMeeting() {
+    return this.room;
   }
   toggleMic() {
     const mediaState = this.state.localParticipant?.media;
@@ -366,12 +385,12 @@ var VideoSDKCore = class {
     });
   }
   scheduleReconnect() {
-    if (!this.roomId) return;
+    if (!this.room.id) return;
     const delay = Math.min(1e3 * Math.pow(2, this.reconnectAttempts), 3e4);
     clearTimeout(this.reconnectTimer);
     this.reconnectTimer = window.setTimeout(async () => {
       try {
-        await this.connect(this.roomId, this.participantName);
+        await this.connect(this.room.id, this.participantName);
         this.reconnectAttempts = 0;
       } catch {
         this.reconnectAttempts++;
@@ -412,10 +431,18 @@ var VideoSDKCore = class {
         this.lastPong = Date.now();
         break;
       case "OFFER":
+        console.log("[Offer] Received from", msg.sender, {
+          sdp: msg.payload.substring(0, 200)
+        });
         await this.handleOffer(msg.payload, msg.sender);
         break;
       case "ANSWER": {
         const pc = this.peers[msg.sender];
+        console.log("[Answer] Received from", msg.sender, {
+          signalingState: pc?.signalingState,
+          iceConnectionState: pc?.iceConnectionState,
+          connectionState: pc?.connectionState
+        });
         if (!pc) return;
         if (pc.signalingState !== "have-local-offer") {
           console.warn(
@@ -469,10 +496,16 @@ var VideoSDKCore = class {
           if (!p?.id || p.id === this.myId) continue;
           this.state.addParticipant(p);
           this.events.onUserJoined?.(p);
-          await this.createOffer(p.id);
+          if (this.shouldInitiate(p.id)) {
+            await this.createOffer(p.id);
+          }
         }
         break;
       case "JOINED": {
+        if (msg.iceServers) {
+          this.iceServers = msg.iceServers;
+        }
+        this.room.name = msg.room_name;
         this.intentionalDisconnect = false;
         this.reconnectAttempts = 0;
         this.startHeartbeat();
@@ -486,7 +519,9 @@ var VideoSDKCore = class {
         if (!p?.id || p.id === this.myId) return;
         this.state.addParticipant(p);
         this.events.onUserJoined?.(p);
-        await this.createOffer(p.id);
+        if (this.shouldInitiate(p.id)) {
+          await this.createOffer(p.id);
+        }
         break;
       }
       case "USER_LEFT":
@@ -561,6 +596,11 @@ var VideoSDKCore = class {
   // ---------------- PEER ----------------
   createPeer(id) {
     if (!this.localStream) throw new Error("No local stream");
+    if (!this.iceServers || this.iceServers.length === 0) {
+      throw new Error(
+        "ICE Servers not configured. Backend must provide iceServers on JOIN."
+      );
+    }
     console.log(
       "Adding tracks",
       this.localStream.getTracks().map((t) => ({
@@ -570,28 +610,15 @@ var VideoSDKCore = class {
       }))
     );
     const pc = new RTCPeerConnection({
-      iceServers: [
-        {
-          urls: [
-            "stun:stun1.1.google.com:19302",
-            "stun:stun2.1.google.com:19302"
-          ]
-        }
-      ],
-      iceCandidatePoolSize: 3
+      iceServers: this.iceServers
     });
     pc.ontrack = (event) => {
-      console.log(`Track received: ${event.track.kind}`, {
-        trackId: event.track.id,
-        streamCount: event.streams.length,
-        streamTrackCount: event.streams[0]?.getTracks().length
-      });
       const incomingStream = event.streams?.[0] || new MediaStream([event.track]);
       const participant = this.state.getParticipant(id);
       const isScreenStream = incomingStream.id === participant?.media?.remoteScreenStreamId;
-      if (event.track.kind === "video") {
+      if (event.track.muted) {
         event.track.onunmute = () => {
-          console.log("Video track unmuted for", id);
+          console.log(`${event.track.kind} track unmuted for ${id}`);
         };
       }
       if (isScreenStream) {
@@ -648,18 +675,17 @@ var VideoSDKCore = class {
   }
   // ---------------- OFFER ----------------
   async createOffer(id, isRenegotiation = false) {
+    if (!isRenegotiation && !this.shouldInitiate(id)) {
+      console.debug(
+        `[Offer] ${id} should initiate (${id} > ${this.myId}), skipping`
+      );
+      return;
+    }
     if (!isRenegotiation && this.initiators.has(id)) {
       console.debug(
         `[Offer] Already initiating with ${id}, skipping duplicate`
       );
-    }
-    if (isRenegotiation && this.peers[id]) {
-      const pc2 = this.peers[id];
-      if (pc2.signalingState !== "stable") {
-        console.warn(
-          `[Offer] Cannot renegotiate: peer in state "${pc2.signalingState}"`
-        );
-      }
+      return;
     }
     if (!isRenegotiation) {
       this.initiators.add(id);
@@ -680,14 +706,11 @@ var VideoSDKCore = class {
       console.debug(`[Offer] Sent to ${id}`);
     } catch (err) {
       console.error(`[Offer] Failed for ${id}:`, err);
-      this.emitError(
-        "OFFER_FAILED",
-        `Failed to create offer for ${id}`,
-        err,
-        true
-      );
     }
   }
+  shouldInitiate(peerId) {
+    return this.myId < peerId;
+  }
   // ---------------- ANSWER ----------------
   async handleOffer(sdp, id) {
     if (!this.peers[id]) {
@@ -695,28 +718,44 @@ var VideoSDKCore = class {
     }
     const pc = this.peers[id];
     try {
-      if (pc.signalingState !== "stable" && pc.signalingState !== "have-local-offer") {
+      if (pc.signalingState === "have-local-offer") {
+        if (this.shouldInitiate(id)) {
+          console.warn(
+            `[Glare] Both sent OFFERs, we win (${this.myId} < ${id}), keeping our OFFER`
+          );
+          return;
+        } else {
+          console.warn(
+            `[Glare] Both sent OFFERs, they win (${id} < ${this.myId}), rolling back`
+          );
+          pc.close();
+          delete this.peers[id];
+          this.initiators.delete(id);
+          this.peers[id] = this.createPeer(id);
+        }
+      }
+      if (this.peers[id].signalingState !== "stable" && this.peers[id].signalingState !== "have-local-offer") {
         console.warn(
-          `[Signaling] Cannot accept OFFER in state "${pc.signalingState}"`
+          `[Signaling] Cannot accept OFFER in state "${this.peers[id].signalingState}"`
         );
         return;
       }
-      await pc.setRemoteDescription({
+      await this.peers[id].setRemoteDescription({
         type: "offer",
         sdp
       });
       const pending = this.pendingIceCandidates[id] || [];
       for (const candidate of pending) {
         try {
-          await pc.addIceCandidate(candidate);
+          await this.peers[id].addIceCandidate(candidate);
         } catch (err) {
           console.warn("[ICE] Failed to add candidate:", err);
         }
       }
       delete this.pendingIceCandidates[id];
-      const answer = await pc.createAnswer();
-      await pc.setLocalDescription(answer);
-      await this.flushIce(id, pc);
+      const answer = await this.peers[id].createAnswer();
+      await this.peers[id].setLocalDescription(answer);
+      await this.flushIce(id, this.peers[id]);
       this.send({
         type: "ANSWER",
         payload: answer.sdp,
@@ -781,7 +820,7 @@ var VideoSDKCore = class {
       this.send({
         type: "SCREEN_SHARE_START",
         sender: this.myId,
-        room_id: this.roomId,
+        room_id: this.room.id,
         stream_id: this.screenStream.id.replace(/[{}]/g, "")
       });
       return this.screenStream;
@@ -827,7 +866,7 @@ var VideoSDKCore = class {
     this.send({
       type: "SCREEN_SHARE_STOP",
       sender: this.myId,
-      room_id: this.roomId
+      room_id: this.room.id
     });
   }
   sendChatMessage(payload) {
@@ -835,7 +874,7 @@ var VideoSDKCore = class {
       console.warn("WS not connected");
       return;
     }
-    if (!this.roomId) {
+    if (!this.room.id) {
       console.warn("No roomId set");
       return;
     }
@@ -856,7 +895,7 @@ var VideoSDKCore = class {
       message: payload.message.trim(),
       user_id: this.myId,
       sender_name: senderName,
-      room_id: this.roomId,
+      room_id: this.room.id,
       target: isPrivate ? payload.target ?? null : null,
       reply_to: payload.reply_to ?? null,
       client_ts: Date.now()
@@ -877,7 +916,7 @@ var VideoSDKCore = class {
       this.localStream.getTracks().forEach((track) => track.stop());
       this.localStream = null;
     }
-    this.roomId = null;
+    this.room.id = null;
     this.state.localParticipant = null;
     this.state.notify("localParticipant");
     this.state.participants.clear();
@@ -972,7 +1011,7 @@ var MeetingProvider = ({
       startScreenShare: sdk.startScreenShare.bind(sdk),
       stopScreenShare: sdk.stopScreenShare.bind(sdk),
       sendMessage: sdk.sendChatMessage.bind(sdk),
-      meetingId: sdk.getMeetingId(),
+      room: sdk.getMeeting(),
       localParticipant,
       participants,
       messages,
@@ -1055,7 +1094,8 @@ var useMeeting = (handlers) => {
     const unsubscribe = ctx.onError(handlers.onError);
     return unsubscribe;
   }, [handlers?.onError]);
-  return ctx;
+  const { sdk: _, ...publicApi } = ctx;
+  return publicApi;
 };
 
 // src/react/useParticipants.ts