@defcomm/meetingsdk 0.1.5 → 0.1.7

package/README.md

@@ -974,7 +974,7 @@ type SDKError = {
   code: string;
   message: string;
   roomId?: string | null;
-  userId?: string;
+  participantId?: string;
   raw?: any;
   recoverable?: boolean;
 };

package/dist/index.d.mts

@@ -83,7 +83,7 @@ type ChatInput = {
 };
 type MeetingConfig = {
     roomId: string;
-    userId?: string;
+    participantId: string;
     name: string;
     audioMuted?: boolean;
     videoMuted?: boolean;
@@ -101,14 +101,14 @@ type SDKError = {
     code: string;
     message: string;
     roomId?: string | null;
-    userId?: string;
+    participantId?: string;
     raw?: any;
     recoverable?: boolean;
 };
 type EntryDecision = "approved" | "rejected";
 type EntryRequest = {
     requestId: string;
-    userId: string;
+    participantId: string;
     name: string;
 };
 interface TrackDescriptor {
@@ -121,6 +121,16 @@ interface Recording {
     started_at?: string;
     recording_id?: string;
 }
+interface VideoSDKCoreOptions {
+    participantId: string;
+    onError?: (error: any) => void;
+    onEntryRequested?: (request: any) => void;
+    onEntryResponded?: (payload: any, decision?: any) => void;
+    onMeetingLeft?: () => void;
+    onTrackStateChanged?: (track: any) => void;
+    onRecordingStarted?: (recording: any) => void;
+    onRecordingStopped?: (recording: any) => void;
+}
 
 declare const useLocalParticipant: () => {
     participant: Participant | null;
@@ -175,7 +185,7 @@ declare class VideoSDKCore {
     private joinPromise;
     private disconnectPromise;
     private emitError;
-    constructor(events?: Events, apiBase?: string, wsBase?: string);
+    constructor(options: VideoSDKCoreOptions, events?: Events, apiBase?: string, wsBase?: string);
     initLocal(video: HTMLVideoElement, name: string): Promise<void>;
     private updateLocalMedia;
     createRoom(input: {
@@ -186,7 +196,7 @@ declare class VideoSDKCore {
     }): Promise<any>;
     getRoom(roomCode: string): Promise<any>;
     deleteRoom(roomCode: string): Promise<any>;
-    joinMeeting(config: MeetingConfig): Promise<void>;
+    joinMeeting(config: Omit<MeetingConfig, "participantId">): Promise<void>;
     private connect;
     private handleSFUState;
     private handleRemoteTrack;
@@ -244,7 +254,7 @@ interface JoinPendingInfo {
 interface SFUClientOptions {
     apiBase?: string;
     wsBase?: string;
-    userId?: string;
+    participantId?: string;
     onStateChange?: (state: SFUConnectionState) => void;
     onParticipantJoined?: (participant: ParticipantInfo) => void;
     onParticipantLeft?: (participant: string | ParticipantInfo) => void;
@@ -276,7 +286,7 @@ interface SFUClientOptions {
 declare class SFUClient {
     private apiBase;
     private wsBase;
-    private userId;
+    private participantId;
     private ws;
     private publisher;
     private subscriber;
@@ -368,7 +378,7 @@ declare class SFUClient {
     getToken(roomCode: string, options?: {
         displayName?: string;
         avatarUrl?: string;
-        userId?: string;
+        participantId?: string;
     }): Promise<void>;
     private refreshAccessToken;
     private connect;
@@ -419,7 +429,7 @@ type PubSubHandle = {
 };
 type MeetingContextValue = {
     sdk: VideoSDKCore;
-    join: (config?: MeetingConfig) => Promise<void>;
+    join: (config?: Omit<MeetingConfig, "participantId">) => Promise<void>;
     leave: () => void;
     createRoom: (input: {
         name: string;
@@ -474,7 +484,7 @@ declare const useMeeting: (handlers?: {
     onRecordingStopped?: (recording: any) => void;
     onActiveSpeakersChanged?: (participantIds: string[]) => void;
 }) => {
-    join: (config?: MeetingConfig) => Promise<void>;
+    join: (config?: Omit<MeetingConfig, "participantId">) => Promise<void>;
     leave: () => void;
     createRoom: (input: {
         name: string;
@@ -554,7 +564,7 @@ type LiveRoomState = {
  * Preview therefore uses the authoritative REST room endpoint and polls it.
  * Live participant/media state begins after JOIN over the SFU WebSocket.
  */
-declare function useMeetingPreview(roomId: string, userId: string): {
+declare function useMeetingPreview(roomId: string, participantId: string): {
     room: LiveRoomState | null;
     isConnected: boolean;
     isLoading: boolean;

package/dist/index.d.ts

@@ -83,7 +83,7 @@ type ChatInput = {
 };
 type MeetingConfig = {
     roomId: string;
-    userId?: string;
+    participantId: string;
     name: string;
     audioMuted?: boolean;
     videoMuted?: boolean;
@@ -101,14 +101,14 @@ type SDKError = {
     code: string;
     message: string;
     roomId?: string | null;
-    userId?: string;
+    participantId?: string;
     raw?: any;
     recoverable?: boolean;
 };
 type EntryDecision = "approved" | "rejected";
 type EntryRequest = {
     requestId: string;
-    userId: string;
+    participantId: string;
     name: string;
 };
 interface TrackDescriptor {
@@ -121,6 +121,16 @@ interface Recording {
     started_at?: string;
     recording_id?: string;
 }
+interface VideoSDKCoreOptions {
+    participantId: string;
+    onError?: (error: any) => void;
+    onEntryRequested?: (request: any) => void;
+    onEntryResponded?: (payload: any, decision?: any) => void;
+    onMeetingLeft?: () => void;
+    onTrackStateChanged?: (track: any) => void;
+    onRecordingStarted?: (recording: any) => void;
+    onRecordingStopped?: (recording: any) => void;
+}
 
 declare const useLocalParticipant: () => {
     participant: Participant | null;
@@ -175,7 +185,7 @@ declare class VideoSDKCore {
     private joinPromise;
     private disconnectPromise;
     private emitError;
-    constructor(events?: Events, apiBase?: string, wsBase?: string);
+    constructor(options: VideoSDKCoreOptions, events?: Events, apiBase?: string, wsBase?: string);
     initLocal(video: HTMLVideoElement, name: string): Promise<void>;
     private updateLocalMedia;
     createRoom(input: {
@@ -186,7 +196,7 @@ declare class VideoSDKCore {
     }): Promise<any>;
     getRoom(roomCode: string): Promise<any>;
     deleteRoom(roomCode: string): Promise<any>;
-    joinMeeting(config: MeetingConfig): Promise<void>;
+    joinMeeting(config: Omit<MeetingConfig, "participantId">): Promise<void>;
     private connect;
     private handleSFUState;
     private handleRemoteTrack;
@@ -244,7 +254,7 @@ interface JoinPendingInfo {
 interface SFUClientOptions {
     apiBase?: string;
     wsBase?: string;
-    userId?: string;
+    participantId?: string;
     onStateChange?: (state: SFUConnectionState) => void;
     onParticipantJoined?: (participant: ParticipantInfo) => void;
     onParticipantLeft?: (participant: string | ParticipantInfo) => void;
@@ -276,7 +286,7 @@ interface SFUClientOptions {
 declare class SFUClient {
     private apiBase;
     private wsBase;
-    private userId;
+    private participantId;
     private ws;
     private publisher;
     private subscriber;
@@ -368,7 +378,7 @@ declare class SFUClient {
     getToken(roomCode: string, options?: {
         displayName?: string;
         avatarUrl?: string;
-        userId?: string;
+        participantId?: string;
     }): Promise<void>;
     private refreshAccessToken;
     private connect;
@@ -419,7 +429,7 @@ type PubSubHandle = {
 };
 type MeetingContextValue = {
     sdk: VideoSDKCore;
-    join: (config?: MeetingConfig) => Promise<void>;
+    join: (config?: Omit<MeetingConfig, "participantId">) => Promise<void>;
     leave: () => void;
     createRoom: (input: {
         name: string;
@@ -474,7 +484,7 @@ declare const useMeeting: (handlers?: {
     onRecordingStopped?: (recording: any) => void;
     onActiveSpeakersChanged?: (participantIds: string[]) => void;
 }) => {
-    join: (config?: MeetingConfig) => Promise<void>;
+    join: (config?: Omit<MeetingConfig, "participantId">) => Promise<void>;
     leave: () => void;
     createRoom: (input: {
         name: string;
@@ -554,7 +564,7 @@ type LiveRoomState = {
  * Preview therefore uses the authoritative REST room endpoint and polls it.
  * Live participant/media state begins after JOIN over the SFU WebSocket.
  */
-declare function useMeetingPreview(roomId: string, userId: string): {
+declare function useMeetingPreview(roomId: string, participantId: string): {
     room: LiveRoomState | null;
     isConnected: boolean;
     isLoading: boolean;

package/dist/index.js

@@ -428,7 +428,7 @@ var SFUClient = class {
     this.subscriberStatsTimer = null;
     this.apiBase = options.apiBase || "https://api.example.com/api";
     this.wsBase = options.wsBase || "wss://api.example.com/ws";
-    this.userId = options.userId || this.createId();
+    this.participantId = options.participantId || this.createId();
     this.onStateChange = options.onStateChange || (() => {
     });
     this.onParticipantJoined = options.onParticipantJoined || (() => {
@@ -549,12 +549,17 @@ var SFUClient = class {
     });
   }
   async getRoom(roomCode) {
-    return this.request(`${this.apiBase}/rooms/${encodeURIComponent(roomCode)}`);
+    return this.request(
+      `${this.apiBase}/rooms/${encodeURIComponent(roomCode)}`
+    );
   }
   async deleteRoom(roomCode) {
-    return this.request(`${this.apiBase}/rooms/${encodeURIComponent(roomCode)}`, {
-      method: "DELETE"
-    });
+    return this.request(
+      `${this.apiBase}/rooms/${encodeURIComponent(roomCode)}`,
+      {
+        method: "DELETE"
+      }
+    );
   }
   async getToken(roomCode, options = {}) {
     const nextRoom = roomCode.trim();
@@ -566,7 +571,7 @@ var SFUClient = class {
       displayName: options.displayName,
       avatarUrl: options.avatarUrl
     };
-    if (options.userId) this.userId = options.userId;
+    if (options.participantId) this.participantId = options.participantId;
     if (!this.resumeToken) {
       this.resumeToken = this.loadResumeToken(this.room);
     }
@@ -574,7 +579,7 @@ var SFUClient = class {
       method: "POST",
       body: JSON.stringify({
         room_code: this.room,
-        user_id: this.userId,
+        user_id: this.participantId,
         display_name: options.displayName,
         avatar_url: options.avatarUrl
       })
@@ -589,7 +594,7 @@ var SFUClient = class {
       method: "POST",
       body: JSON.stringify({
         room_code: this.room,
-        user_id: this.userId,
+        user_id: this.participantId,
         display_name: this.joinOptions.displayName,
         avatar_url: this.joinOptions.avatarUrl
       })
@@ -792,7 +797,8 @@ var SFUClient = class {
       case "participant_joined": {
         const participant = payload.participant || payload;
         const participantId = participant?.participant_id || payload.participant_id;
-        if (!participantId || participantId === this.currentParticipantId) break;
+        if (!participantId || participantId === this.currentParticipantId)
+          break;
         if (participant) this.participants.set(participantId, participant);
         this.onParticipantJoined(participant);
         break;
@@ -822,14 +828,21 @@ var SFUClient = class {
           if (track.source === "audio") {
             this.localTrackIds.set("audio", track.track_id);
             const muted = !(this.localStream?.getAudioTracks()[0]?.enabled ?? true);
-            this.send({ type: "track_state", payload: { track_id: track.track_id, muted } });
+            this.send({
+              type: "track_state",
+              payload: { track_id: track.track_id, muted }
+            });
           }
           if (track.source === "camera") {
             this.localTrackIds.set("camera", track.track_id);
             const muted = !(this.localStream?.getVideoTracks()[0]?.enabled ?? true);
-            this.send({ type: "track_state", payload: { track_id: track.track_id, muted } });
+            this.send({
+              type: "track_state",
+              payload: { track_id: track.track_id, muted }
+            });
           }
-          if (track.source === "screen") this.localTrackIds.set("screen", track.track_id);
+          if (track.source === "screen")
+            this.localTrackIds.set("screen", track.track_id);
           break;
         }
         this.onTrackPublished(track);
@@ -1060,10 +1073,7 @@ var SFUClient = class {
         }
         if (screenStream?.getTracks().length === 0) {
           this.remoteScreenStreams.delete(participantId);
-          this.onScreenShareStopped(
-            participantId,
-            metadata.track_id
-          );
+          this.onScreenShareStopped(participantId, metadata.track_id);
         }
       };
       this.onScreenShareStarted(participantId, metadata);
@@ -1150,7 +1160,9 @@ var SFUClient = class {
     try {
       await pc.addIceCandidate(candidate);
     } catch (error) {
-      this.onError(new Error(`Failed to add ${peer} ICE candidate: ${String(error)}`));
+      this.onError(
+        new Error(`Failed to add ${peer} ICE candidate: ${String(error)}`)
+      );
     }
   }
   async flushPendingIce(peer) {
@@ -1162,7 +1174,11 @@ var SFUClient = class {
       try {
         await pc.addIceCandidate(candidate);
       } catch (error) {
-        this.onError(new Error(`Failed to add queued ${peer} ICE candidate: ${String(error)}`));
+        this.onError(
+          new Error(
+            `Failed to add queued ${peer} ICE candidate: ${String(error)}`
+          )
+        );
       }
     }
   }
@@ -1192,7 +1208,9 @@ var SFUClient = class {
       } catch (error) {
         const waiters = this.subscriptionWaiters.splice(0);
         waiters.forEach((w) => w.reject(error));
-        this.onError(new Error(`Failed to process subscriber offer: ${String(error)}`));
+        this.onError(
+          new Error(`Failed to process subscriber offer: ${String(error)}`)
+        );
       } finally {
         this.subscriberNegotiating = false;
       }
@@ -1240,9 +1258,13 @@ var SFUClient = class {
     }
   }
   async publish({ audio = true, video = true } = {}) {
-    if (!this.publisher) throw new Error("Publisher PeerConnection is not initialized");
+    if (!this.publisher)
+      throw new Error("Publisher PeerConnection is not initialized");
     if (!this.localStream) {
-      this.localStream = await navigator.mediaDevices.getUserMedia({ audio, video });
+      this.localStream = await navigator.mediaDevices.getUserMedia({
+        audio,
+        video
+      });
     }
     await this.publishExistingTracks(audio, video);
     return this.localStream;
@@ -1255,9 +1277,13 @@ var SFUClient = class {
     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);
+    await this.audioSender?.replaceTrack(
+      audio && audioTrack ? audioTrack : null
+    );
     this.audioTransceiver.direction = audio && audioTrack ? "sendonly" : "inactive";
-    await this.videoSender?.replaceTrack(video && cameraTrack ? cameraTrack : null);
+    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";
@@ -1430,7 +1456,10 @@ var SFUClient = class {
   }
   async rejectJoinRequest(requestId, reason) {
     if (!requestId) throw new Error("requestId is required");
-    if (!this.send({ type: "reject_join", payload: { request_id: requestId, reason } })) {
+    if (!this.send({
+      type: "reject_join",
+      payload: { request_id: requestId, reason }
+    })) {
       throw new Error("SFU signaling is not connected");
     }
   }
@@ -1499,10 +1528,14 @@ var SFUClient = class {
           }
           setTimeout(check, 25);
         };
-        ws.addEventListener("close", () => {
-          clearTimeout(timeout);
-          finish();
-        }, { once: true });
+        ws.addEventListener(
+          "close",
+          () => {
+            clearTimeout(timeout);
+            finish();
+          },
+          { once: true }
+        );
         this.send({ type: "leave" });
         check();
       });
@@ -1581,7 +1614,8 @@ var SFUClient = class {
     }
   }
   async logSubscriberVideoStats() {
-    if (!this.subscriber || this.subscriber.connectionState === "closed") return;
+    if (!this.subscriber || this.subscriber.connectionState === "closed")
+      return;
     try {
       const stats = await this.subscriber.getStats();
       stats.forEach((report) => {
@@ -1602,7 +1636,7 @@ var SFUClient = class {
 
 // src/core/VideoCore.ts
 var VideoSDKCore = class {
-  constructor(events = {}, apiBase = SDK_CONFIG.apiBase, wsBase = SDK_CONFIG.wsBase) {
+  constructor(options, events = {}, apiBase = SDK_CONFIG.apiBase, wsBase = SDK_CONFIG.wsBase) {
     this.events = events;
     this.apiBase = apiBase;
     this.wsBase = wsBase;
@@ -1628,18 +1662,7 @@ var VideoSDKCore = class {
         this.events.onActiveSpeakersChanged?.(participantIds);
       }
     });
-    let storedId = null;
-    try {
-      storedId = typeof localStorage !== "undefined" ? localStorage.getItem("defcomm:participant_id") : null;
-    } catch {
-    }
-    this.myId = storedId || (typeof crypto !== "undefined" && crypto.randomUUID ? crypto.randomUUID() : `user_${Date.now()}`);
-    try {
-      if (typeof localStorage !== "undefined") {
-        localStorage.setItem("defcomm:participant_id", this.myId);
-      }
-    } catch {
-    }
+    this.myId = options.participantId;
   }
   emitError(code, message, raw, recoverable = true) {
     const err = {
@@ -1647,7 +1670,7 @@ var VideoSDKCore = class {
       message,
       raw,
       roomId: this.room.id,
-      userId: this.myId,
+      participantId: this.myId,
       recoverable
     };
     this.events.onError?.(err);
@@ -1707,7 +1730,7 @@ var VideoSDKCore = class {
     const client = this.sfuClient ?? new SFUClient({
       apiBase: this.apiBase,
       wsBase: this.wsBase,
-      userId: this.myId
+      participantId: this.myId
     });
     return client.createRoom(input);
   }
@@ -1715,7 +1738,7 @@ var VideoSDKCore = class {
     const client = this.sfuClient ?? new SFUClient({
       apiBase: this.apiBase,
       wsBase: this.wsBase,
-      userId: this.myId
+      participantId: this.myId
     });
     return client.getRoom(roomCode);
   }
@@ -1723,29 +1746,23 @@ var VideoSDKCore = class {
     const client = this.sfuClient ?? new SFUClient({
       apiBase: this.apiBase,
       wsBase: this.wsBase,
-      userId: this.myId
+      participantId: this.myId
     });
     return client.deleteRoom(roomCode);
   }
   // JOIN
   async joinMeeting(config) {
-    const {
-      roomId,
-      name,
-      audioMuted = false,
-      videoMuted = false,
-      userId
-    } = config;
+    const { roomId, name, audioMuted = false, videoMuted = false } = config;
     if (!roomId || !name) {
       throw new Error("roomId and name are required to join meeting");
     }
-    if (userId) {
-      this.myId = userId;
+    if (!this.myId) {
+      throw new Error("participantId is required");
     }
     if (this.sfuClient && this.room.id === roomId && this.sfuClient.getConnectionState() === "connected") {
       console.info("[SDK] Already connected; duplicate join ignored", {
         roomId,
-        userId: this.myId
+        participantId: this.myId
       });
       return;
     }
@@ -1754,7 +1771,7 @@ var VideoSDKCore = class {
         "[SDK] Join already in progress; waiting for existing join",
         {
           roomId,
-          userId: this.myId
+          participantId: this.myId
         }
       );
       return this.joinPromise;
@@ -1816,7 +1833,7 @@ var VideoSDKCore = class {
     const client = new SFUClient({
       apiBase: this.apiBase,
       wsBase: this.wsBase,
-      userId: this.myId,
+      participantId: this.myId,
       autoSubscribe: true,
       // CONNECTION STATE
       onStateChange: (state) => {
@@ -1840,7 +1857,7 @@ var VideoSDKCore = class {
         console.log("[SFU] Join request pending", info);
         this.events.onEntryRequested?.({
           requestId: info.request_id,
-          userId: this.myId,
+          participantId: this.myId,
           name: this.participantName
         });
       },
@@ -1877,14 +1894,14 @@ var VideoSDKCore = class {
       },
       onJoinRequested: (request) => {
         const requestId = request?.request_id || request?.requestId;
-        const userId = request?.user_id || request?.userId;
+        const participantId = request?.user_id || request?.participantId;
         const nameValue = request?.user_metadata?.name || request?.display_name || request?.name || "Participant";
-        if (!requestId || !userId) {
+        if (!requestId || !participantId) {
           return;
         }
         this.events.onEntryRequested?.({
           requestId,
-          userId,
+          participantId,
           name: nameValue
         });
       },
@@ -2058,6 +2075,10 @@ var VideoSDKCore = class {
       // ERROR
       onError: (error) => {
         console.error("[SFU] Error:", error);
+        if (error?.code === "request_failed" || error?.code === "authorization") {
+          this.emitError("PERMISSION_DENIED", error.message, error, false);
+          return;
+        }
         this.emitError(
           "SFU_ERROR",
           error?.message || String(error),
@@ -2070,7 +2091,7 @@ var VideoSDKCore = class {
     client.setLocalStream(this.localStream);
     await client.getToken(roomId, {
       displayName: name,
-      userId: this.myId
+      participantId: this.myId
     });
   }
   // SFU STATE
@@ -2392,6 +2413,7 @@ var MeetingProvider = ({
   );
   if (!sdkRef.current) {
     sdkRef.current = new VideoSDKCore({
+      participantId: config.participantId,
       onError: (err) => errorListeners.current.forEach((fn) => fn(err)),
       onEntryRequested: (req) => entryRequestListeners.current.forEach((fn) => fn(req)),
       onEntryResponded: (p, d) => entryResponseListeners.current.forEach((fn) => fn(p, d)),
@@ -2428,13 +2450,6 @@ var MeetingProvider = ({
     (s) => s.getChatMessages()
   );
   const value = (0, import_react2.useMemo)(() => {
-    if (!sdkRef.current) {
-      sdkRef.current = new VideoSDKCore({
-        onError: (err) => {
-          errorListeners.current.forEach((fn) => fn(err));
-        }
-      });
-    }
     return {
       sdk,
       join: (joinConfig) => sdk.joinMeeting({
@@ -2666,7 +2681,7 @@ var useRemoteMedia = (participantId) => {
 
 // src/react/useMeetingPreview.ts
 var import_react7 = require("react");
-function useMeetingPreview(roomId, userId) {
+function useMeetingPreview(roomId, participantId) {
   const [room, setRoom] = (0, import_react7.useState)(null);
   const [error, setError] = (0, import_react7.useState)(null);
   const [isConnected, setIsConnected] = (0, import_react7.useState)(false);
@@ -2725,7 +2740,7 @@ function useMeetingPreview(roomId, userId) {
       stopped = true;
       if (timer) clearTimeout(timer);
     };
-  }, [roomId, userId]);
+  }, [roomId, participantId]);
   return {
     room,
     isConnected,