@defcomm/meetingsdk 0.4.5 → 0.4.7

package/dist/index.d.mts

@@ -123,7 +123,7 @@ type MeetingConfig = {
     name: string;
     audioMuted?: boolean;
     videoMuted?: boolean;
-    token?: string;
+    token: string;
 };
 type RecordingInfo = {
     recording_id: string;
@@ -160,6 +160,7 @@ interface Recording {
 }
 interface VideoSDKCoreOptions {
     participantId: string;
+    token: string;
     onError?: (error: any) => void;
     onEntryRequested?: (request: any) => void;
     onEntryResponded?: (payload: any, decision?: any) => void;
@@ -249,6 +250,7 @@ declare class VideoSDKCore {
     deleteRoom(roomCode: string): Promise<any>;
     joinMeeting(config: Omit<MeetingConfig, "participantId">): Promise<void>;
     private connect;
+    private createSFUClient;
     private handleSFUState;
     private handleRemoteTrack;
     getMeeting(): {
@@ -301,7 +303,7 @@ interface ParticipantInfo {
 
 type MeetingContextValue = {
     sdk: VideoSDKCore;
-    join: (config?: Omit<MeetingConfig, "participantId">) => Promise<void>;
+    join: (config?: Omit<MeetingConfig, "participantId" | "token">) => Promise<void>;
     getJoinState: (roomCode: string) => Promise<JoinState>;
     leave: () => void;
     createRoom: (input: {
@@ -364,7 +366,7 @@ declare const useMeeting: (handlers?: {
     onActiveSpeakersChanged?: (participantIds: string[]) => void;
     onConnectionStateChanged?: (state: SFUConnectionState) => void;
 }) => {
-    join: (config?: Omit<MeetingConfig, "participantId">) => Promise<void>;
+    join: (config?: Omit<MeetingConfig, "participantId" | "token">) => Promise<void>;
     getJoinState: (roomCode: string) => Promise<JoinState>;
     leave: () => void;
     createRoom: (input: {

package/dist/index.d.ts

@@ -123,7 +123,7 @@ type MeetingConfig = {
     name: string;
     audioMuted?: boolean;
     videoMuted?: boolean;
-    token?: string;
+    token: string;
 };
 type RecordingInfo = {
     recording_id: string;
@@ -160,6 +160,7 @@ interface Recording {
 }
 interface VideoSDKCoreOptions {
     participantId: string;
+    token: string;
     onError?: (error: any) => void;
     onEntryRequested?: (request: any) => void;
     onEntryResponded?: (payload: any, decision?: any) => void;
@@ -249,6 +250,7 @@ declare class VideoSDKCore {
     deleteRoom(roomCode: string): Promise<any>;
     joinMeeting(config: Omit<MeetingConfig, "participantId">): Promise<void>;
     private connect;
+    private createSFUClient;
     private handleSFUState;
     private handleRemoteTrack;
     getMeeting(): {
@@ -301,7 +303,7 @@ interface ParticipantInfo {
 
 type MeetingContextValue = {
     sdk: VideoSDKCore;
-    join: (config?: Omit<MeetingConfig, "participantId">) => Promise<void>;
+    join: (config?: Omit<MeetingConfig, "participantId" | "token">) => Promise<void>;
     getJoinState: (roomCode: string) => Promise<JoinState>;
     leave: () => void;
     createRoom: (input: {
@@ -364,7 +366,7 @@ declare const useMeeting: (handlers?: {
     onActiveSpeakersChanged?: (participantIds: string[]) => void;
     onConnectionStateChanged?: (state: SFUConnectionState) => void;
 }) => {
-    join: (config?: Omit<MeetingConfig, "participantId">) => Promise<void>;
+    join: (config?: Omit<MeetingConfig, "participantId" | "token">) => Promise<void>;
     getJoinState: (roomCode: string) => Promise<JoinState>;
     leave: () => void;
     createRoom: (input: {

package/dist/index.js

@@ -404,6 +404,9 @@ var SFUClient = class {
     this.publisherRevision = 0;
     this.screenShareGeneration = 0;
     this.currentParticipantId = null;
+    // Provider/application token used for authenticated REST calls.
+    this.authToken = null;
+    // Room/SFU token returned by /token and used for the WebSocket.
     this.token = null;
     this.room = null;
     this.resumeToken = null;
@@ -444,6 +447,7 @@ var SFUClient = class {
     this.apiBase = options.apiBase || "https://api.example.com/api";
     this.wsBase = options.wsBase || "wss://api.example.com/ws";
     this.participantId = options.participantId || this.createId();
+    this.authToken = options.token ?? null;
     this.onStateChange = options.onStateChange || (() => {
     });
     this.onParticipantJoined = options.onParticipantJoined || (() => {
@@ -567,9 +571,14 @@ var SFUClient = class {
     return (++this.requestId).toString();
   }
   async request(url, options = {}) {
+    const headers = new Headers(options.headers);
+    headers.set("Content-Type", "application/json");
+    if (this.authToken) {
+      headers.set("Authorization", `Bearer ${this.authToken}`);
+    }
     const res = await fetch(url, {
-      headers: { "Content-Type": "application/json" },
-      ...options
+      ...options,
+      headers
     });
     if (!res.ok) {
       let body = {};
@@ -577,7 +586,9 @@ var SFUClient = class {
         body = await res.json();
       } catch {
       }
-      throw new Error(body.message || res.statusText);
+      throw new Error(
+        body.message || `Request failed: ${res.status} ${res.statusText}`
+      );
     }
     return res.json();
   }
@@ -1981,6 +1992,7 @@ var VideoSDKCore = class {
       }
     });
     this.myId = options.participantId;
+    this.sfuClient = this.createSFUClient(options.token);
   }
   emitError(code, message, raw, recoverable = true) {
     const err = {
@@ -2045,36 +2057,16 @@ var VideoSDKCore = class {
   }
   // ROOM MANAGEMENT
   async createRoom(input) {
-    const client = this.sfuClient ?? new SFUClient({
-      apiBase: this.apiBase,
-      wsBase: this.wsBase,
-      participantId: this.myId
-    });
-    return client.createRoom(input);
+    return this.sfuClient.createRoom(input);
   }
   async getRoom(roomCode) {
-    const client = this.sfuClient ?? new SFUClient({
-      apiBase: this.apiBase,
-      wsBase: this.wsBase,
-      participantId: this.myId
-    });
-    return client.getRoom(roomCode);
+    return this.sfuClient.getRoom(roomCode);
   }
   async getJoinState(roomCode) {
-    const client = this.sfuClient ?? new SFUClient({
-      apiBase: this.apiBase,
-      wsBase: this.wsBase,
-      participantId: this.myId
-    });
-    return client.getJoinState(roomCode);
+    return this.sfuClient.getJoinState(roomCode);
   }
   async deleteRoom(roomCode) {
-    const client = this.sfuClient ?? new SFUClient({
-      apiBase: this.apiBase,
-      wsBase: this.wsBase,
-      participantId: this.myId
-    });
-    return client.deleteRoom(roomCode);
+    return this.sfuClient.deleteRoom(roomCode);
   }
   // JOIN
   async joinMeeting(config) {
@@ -2140,26 +2132,36 @@ var VideoSDKCore = class {
   }
   // SFU CONNECTION
   async connect(roomId, name) {
-    if (this.sfuClient) {
-      const state = this.sfuClient.getConnectionState();
-      if (this.room.id === roomId && (state === "connecting" || state === "connected" || state === "reconnecting")) {
-        console.info(
-          "[SDK] Existing SFU connection is active; connect ignored",
-          {
-            roomId,
-            state
-          }
-        );
-        return;
-      }
+    if (!this.sfuClient) {
+      throw new Error("SFU client is not initialized");
+    }
+    const state = this.sfuClient.getConnectionState();
+    if (this.room.id === roomId && (state === "connecting" || state === "joining" || state === "waiting_approval" || state === "connected" || state === "reconnecting")) {
+      console.info("[SDK] Existing SFU connection is active; connect ignored", {
+        roomId,
+        state
+      });
+      return;
+    }
+    if (state !== "idle" && state !== "disconnected") {
       throw new Error(
-        `SFU client already exists in state "${state}". Disconnect explicitly before creating another connection.`
+        `SFU client is already active in state "${state}". Leave the current meeting before joining another room.`
       );
     }
-    const client = new SFUClient({
+    this.sfuClient.setLocalStream(this.localStream);
+    await this.sfuClient.getToken(roomId, {
+      displayName: name,
+      participantId: this.myId,
+      audioMuted: !(this.localStream?.getAudioTracks()[0]?.enabled ?? true),
+      videoMuted: !(this.localStream?.getVideoTracks()[0]?.enabled ?? true)
+    });
+  }
+  createSFUClient(token) {
+    return new SFUClient({
       apiBase: this.apiBase,
       wsBase: this.wsBase,
       participantId: this.myId,
+      token,
       autoSubscribe: true,
       // CONNECTION STATE
       onStateChange: (state) => {
@@ -2498,14 +2500,6 @@ var VideoSDKCore = class {
         );
       }
     });
-    this.sfuClient = client;
-    client.setLocalStream(this.localStream);
-    await client.getToken(roomId, {
-      displayName: name,
-      participantId: this.myId,
-      audioMuted: !(this.localStream?.getAudioTracks()[0]?.enabled ?? true),
-      videoMuted: !(this.localStream?.getVideoTracks()[0]?.enabled ?? true)
-    });
   }
   // SFU STATE
   handleSFUState(state) {
@@ -2786,10 +2780,8 @@ var VideoSDKCore = class {
   async performDisconnect() {
     this.intentionalDisconnect = true;
     this.joinPromise = null;
-    const client = this.sfuClient;
-    this.sfuClient = null;
-    if (client) {
-      await client.leave();
+    if (this.sfuClient) {
+      await this.sfuClient.leave();
     }
     if (this.localStream) {
       this.localStream.getTracks().forEach((track) => track.stop());
@@ -2861,7 +2853,8 @@ var MeetingProvider = ({
   if (!sdkRef.current) {
     sdkRef.current = new VideoSDKCore(
       {
-        participantId: config.participantId
+        participantId: config.participantId,
+        token: config.token
       },
       {
         onError: (err) => {
@@ -2985,14 +2978,16 @@ var MeetingProvider = ({
       recording,
       usePubSub: (topic) => {
         if (topic === "SECURE_CHAT") {
-          const chatMessages = messages.map((message) => ({
-            id: message.id,
-            topic: "SECURE_CHAT",
-            sender_id: message.sender_id,
-            sender_name: message.sender_name,
-            timestamp: message.timestamp,
-            data: message
-          }));
+          const chatMessages = messages.map(
+            (message) => ({
+              id: message.id,
+              topic: "SECURE_CHAT",
+              sender_id: message.sender_id,
+              sender_name: message.sender_name,
+              timestamp: message.timestamp,
+              data: message
+            })
+          );
           return {
             messages: chatMessages,
             publish: ((data) => {