@defcomm/meetingsdk 0.4.4 → 0.4.6

package/dist/index.mjs

@@ -1,8 +1,8 @@
 // src/react/useLocalParticipant.tsx
-import { useCallback, useEffect as useEffect2, useRef as useRef2, useState as useState2 } from "react";
+import { useCallback, useEffect as useEffect2, useRef as useRef2, useState as useState3 } from "react";
 
 // src/react/MeetingProvider.tsx
-import { createContext, useContext, useMemo, useRef } from "react";
+import { createContext, useContext, useMemo, useRef, useState as useState2 } from "react";
 
 // src/config/ws.ts
 var SDK_CONFIG = {
@@ -368,6 +368,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;
@@ -408,6 +411,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 || (() => {
@@ -531,9 +535,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 = {};
@@ -541,7 +550,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();
   }
@@ -1945,6 +1956,7 @@ var VideoSDKCore = class {
       }
     });
     this.myId = options.participantId;
+    this.sfuClient = this.createSFUClient(options.token);
   }
   emitError(code, message, raw, recoverable = true) {
     const err = {
@@ -2009,36 +2021,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) {
@@ -2104,26 +2096,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) => {
@@ -2462,14 +2464,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) {
@@ -2703,6 +2697,28 @@ var VideoSDKCore = class {
     }
     this.sfuClient.sendReaction(reaction);
   }
+  /**
+   * Generic PubSub publishing entry point.
+   *
+   * The public SDK exposes one PubSub API for all topics. The current SFU
+   * protocol still has dedicated wire messages for chat and reactions, so
+   * this method is the compatibility bridge. The application does not need
+   * to know about those wire-level message types.
+   */
+  publishPubSub(topic, data) {
+    switch (topic) {
+      case "SECURE_CHAT":
+        this.sendChatMessage(data);
+        return;
+      case "REACTION":
+        this.sendReaction(data.emoji);
+        return;
+      default: {
+        const exhaustive = topic;
+        throw new Error(`Unsupported PubSub topic: ${exhaustive}`);
+      }
+    }
+  }
   // CLEANUP
   cleanupRemoteParticipant(participantId) {
     this.activeSpeakerDetector.removeParticipant(participantId);
@@ -2728,10 +2744,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());
@@ -2793,6 +2807,7 @@ var MeetingProvider = ({
   const pubSubListeners = useRef(
     /* @__PURE__ */ new Map()
   );
+  const [reactionPubSubMessages, setReactionPubSubMessages] = useState2([]);
   const activeSpeakerListeners = useRef(
     /* @__PURE__ */ new Set()
   );
@@ -2802,7 +2817,8 @@ var MeetingProvider = ({
   if (!sdkRef.current) {
     sdkRef.current = new VideoSDKCore(
       {
-        participantId: config.participantId
+        participantId: config.participantId,
+        token: config.token
       },
       {
         onError: (err) => {
@@ -2826,21 +2842,43 @@ var MeetingProvider = ({
         onRecordingStopped: (recording2) => {
           recordingStoppedListeners.current.forEach((fn) => fn(recording2));
         },
+        onChatMessage: (message) => {
+          const msg = {
+            id: message.id,
+            text: message.text,
+            sender_id: message.sender_id,
+            sender_name: message.sender_name,
+            timestamp: Number(message.timestamp),
+            reply_to: message.reply_to ?? null,
+            target: message.target ?? null
+          };
+          const pubSubMessage = {
+            id: msg.id,
+            topic: "SECURE_CHAT",
+            sender_id: msg.sender_id,
+            sender_name: msg.sender_name,
+            timestamp: msg.timestamp,
+            data: msg
+          };
+          pubSubListeners.current.get("SECURE_CHAT")?.forEach((fn) => fn(pubSubMessage));
+        },
         onReaction: (reaction) => {
           reactionListeners.current.forEach((fn) => fn(reaction));
-          const listeners = pubSubListeners.current.get("REACTION");
-          if (!listeners) return;
+          const timestamp = typeof reaction.timestamp === "number" ? reaction.timestamp : Date.parse(reaction.timestamp);
           const message = {
             id: reaction.id,
             topic: "REACTION",
             sender_id: reaction.participant_id,
             sender_name: reaction.sender_name,
-            timestamp: typeof reaction.timestamp === "number" ? reaction.timestamp : Date.parse(reaction.timestamp),
+            timestamp,
             data: {
               emoji: reaction.emoji
             }
           };
-          listeners.forEach((fn) => fn(message));
+          setReactionPubSubMessages(
+            (previous) => [...previous, message].slice(-50)
+          );
+          pubSubListeners.current.get("REACTION")?.forEach((fn) => fn(message));
         },
         onConnectionStateChanged: (state) => {
           connectionStateListeners.current.forEach(
@@ -2903,32 +2941,32 @@ var MeetingProvider = ({
       activeSpeakerIds,
       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
+          }));
+          return {
+            messages: chatMessages,
+            publish: ((data) => {
+              sdk.publishPubSub("SECURE_CHAT", data);
+            })
+          };
+        }
         if (topic === "REACTION") {
           return {
-            messages: [],
-            publish: (data) => {
-              const reaction = data;
-              if (!reaction?.emoji) {
+            messages: reactionPubSubMessages,
+            publish: ((data) => {
+              if (!data?.emoji) {
                 console.warn("[PubSub] REACTION requires an emoji");
                 return;
               }
-              sdk.sendReaction(reaction.emoji);
-            }
-          };
-        }
-        if (topic === "SECURE_CHAT") {
-          return {
-            messages: sdk.state.getChatMessages().map((message) => ({
-              id: message.id,
-              topic: "SECURE_CHAT",
-              sender_id: message.sender_id,
-              sender_name: message.sender_name,
-              timestamp: message.timestamp,
-              data: message
-            })),
-            publish: (data) => {
-              sdk.sendChatMessage(data);
-            }
+              sdk.publishPubSub("REACTION", data);
+            })
           };
         }
         throw new Error(`Unsupported PubSub topic: "${topic}"`);
@@ -3013,7 +3051,8 @@ var MeetingProvider = ({
     messages,
     presenterId,
     recording,
-    activeSpeakerIds
+    activeSpeakerIds,
+    reactionPubSubMessages
   ]);
   return /* @__PURE__ */ jsx(MeetingContext.Provider, { value, children });
 };
@@ -3027,7 +3066,7 @@ var useMeetingContext = () => {
 // src/react/useLocalParticipant.tsx
 var useLocalParticipant = () => {
   const { sdk } = useMeetingContext();
-  const [localParticipant, setLocalParticipant] = useState2(
+  const [localParticipant, setLocalParticipant] = useState3(
     () => {
       const current = sdk.state.localParticipant;
       return current && current.id ? current : null;
@@ -3116,10 +3155,10 @@ var useMeeting = (handlers) => {
 };
 
 // src/react/useParticipants.ts
-import { useEffect as useEffect4, useState as useState3 } from "react";
+import { useEffect as useEffect4, useState as useState4 } from "react";
 var useParticipants = () => {
   const { sdk } = useMeetingContext();
-  const [participants, setParticipants] = useState3(
+  const [participants, setParticipants] = useState4(
     () => sdk.state.getParticipants()
   );
   useEffect4(() => {
@@ -3134,12 +3173,12 @@ var useParticipants = () => {
 };
 
 // src/react/useRemoteMedia.ts
-import { useEffect as useEffect5, useRef as useRef3, useState as useState4 } from "react";
+import { useEffect as useEffect5, useRef as useRef3, useState as useState5 } from "react";
 var useRemoteMedia = (participantId) => {
   const { sdk } = useMeetingContext();
   const videoRef = useRef3(null);
   const audioRef = useRef3(null);
-  const [participant, setParticipant] = useState4(
+  const [participant, setParticipant] = useState5(
     () => sdk.state.getParticipant(participantId) || null
   );
   useEffect5(() => {
@@ -3175,12 +3214,12 @@ var useRemoteMedia = (participantId) => {
 };
 
 // src/react/useMeetingPreview.ts
-import { useEffect as useEffect6, useState as useState5 } from "react";
+import { useEffect as useEffect6, useState as useState6 } from "react";
 function useMeetingPreview(roomId, participantId) {
-  const [room, setRoom] = useState5(null);
-  const [error, setError] = useState5(null);
-  const [isConnected, setIsConnected] = useState5(false);
-  const [isLoading, setIsLoading] = useState5(true);
+  const [room, setRoom] = useState6(null);
+  const [error, setError] = useState6(null);
+  const [isConnected, setIsConnected] = useState6(false);
+  const [isLoading, setIsLoading] = useState6(true);
   useEffect6(() => {
     if (!roomId) {
       setIsLoading(false);
@@ -3250,7 +3289,10 @@ function usePubSub(topic, options) {
   const ctx = useMeetingContext();
   useEffect7(() => {
     if (!options?.onMessageReceived) return;
-    return ctx.onPubSubMessage(topic, options.onMessageReceived);
+    return ctx.onPubSubMessage(
+      topic,
+      options.onMessageReceived
+    );
   }, [ctx, topic, options?.onMessageReceived]);
   return ctx.usePubSub(topic);
 }