@defcomm/meetingsdk 0.4.4 → 0.4.6

package/dist/index.d.mts

@@ -67,6 +67,26 @@ type PubSubMessage<T = unknown> = {
     timestamp: number;
     data: T;
 };
+type PubSubTopicConfig = {
+    SECURE_CHAT: {
+        publish: ChatInput;
+        message: ChatMessage;
+    };
+    REACTION: {
+        publish: {
+            emoji: string;
+        };
+        message: {
+            emoji: string;
+        };
+    };
+};
+type PubSubTopic = keyof PubSubTopicConfig;
+type PubSubHandle<TPublish = unknown, TMessage = TPublish> = {
+    messages: PubSubMessage<TMessage>[];
+    publish: (data: TPublish) => void;
+};
+type PubSubHandleForTopic<T extends PubSubTopic> = PubSubHandle<PubSubTopicConfig[T]["publish"], PubSubTopicConfig[T]["message"]>;
 type Participant = {
     id: string;
     name?: string;
@@ -103,12 +123,7 @@ type MeetingConfig = {
     name: string;
     audioMuted?: boolean;
     videoMuted?: boolean;
-    token?: string;
-};
-type PubSubTopic = "SECURE_CHAT" | "REACTION";
-type PubSubHandle<T = unknown> = {
-    messages: PubSubMessage<T>[];
-    publish: (data: T) => void;
+    token: string;
 };
 type RecordingInfo = {
     recording_id: string;
@@ -145,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;
@@ -234,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(): {
@@ -253,6 +270,15 @@ declare class VideoSDKCore {
     }>;
     sendChatMessage(payload: ChatInput): void;
     sendReaction(reaction: string): void;
+    /**
+     * 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<T extends PubSubTopic>(topic: T, data: PubSubTopicConfig[T]["publish"]): void;
     private cleanupRemoteParticipant;
     disconnect(): Promise<void>;
     private performDisconnect;
@@ -304,8 +330,8 @@ type MeetingContextValue = {
     presenterId: string | null;
     activeSpeakerIds: string[];
     recording: RecordingInfo | null;
-    usePubSub: <T = unknown>(topic: PubSubTopic) => PubSubHandle<T>;
-    onPubSubMessage: <T = unknown>(topic: PubSubTopic, cb: (message: PubSubMessage<T>) => void) => () => void;
+    usePubSub: <T extends PubSubTopic>(topic: T) => PubSubHandleForTopic<T>;
+    onPubSubMessage: <T extends PubSubTopic>(topic: T, cb: (message: PubSubMessage<PubSubTopicConfig[T]["message"]>) => void) => () => void;
     approveJoinRequest: (requestId: string) => void;
     rejectJoinRequest: (requestId: string) => void;
     startRecording: () => Promise<void>;
@@ -367,8 +393,8 @@ declare const useMeeting: (handlers?: {
     presenterId: string | null;
     activeSpeakerIds: string[];
     recording: RecordingInfo | null;
-    usePubSub: <T = unknown>(topic: PubSubTopic) => PubSubHandle<T>;
-    onPubSubMessage: <T = unknown>(topic: PubSubTopic, cb: (message: PubSubMessage<T>) => void) => () => void;
+    usePubSub: <T extends PubSubTopic>(topic: T) => PubSubHandleForTopic<T>;
+    onPubSubMessage: <T extends PubSubTopic>(topic: T, cb: (message: PubSubMessage<PubSubTopicConfig[T]["message"]>) => void) => () => void;
     approveJoinRequest: (requestId: string) => void;
     rejectJoinRequest: (requestId: string) => void;
     startRecording: () => Promise<void>;
@@ -463,8 +489,8 @@ declare class ActiveSpeakerDetector {
     destroy(): Promise<void>;
 }
 
-declare function usePubSub<T = unknown>(topic: PubSubTopic, options?: {
-    onMessageReceived?: (message: PubSubMessage<T>) => void;
-}): PubSubHandle<T>;
+declare function usePubSub<T extends PubSubTopic>(topic: T, options?: {
+    onMessageReceived?: (message: PubSubMessage<PubSubTopicConfig[T]["message"]>) => void;
+}): PubSubHandleForTopic<T>;
 
-export { ActiveSpeakerDetector, type ChatInput, type MeetingConfig, MeetingProvider, MeetingState, type Participant, type ParticipantInfo, type Reaction, type RecordingInfo, type SFUConnectionState, type TrackInfo, VideoSDKCore, useLocalParticipant, useMeeting, useMeetingContext, useMeetingPreview, useParticipants, usePubSub, useRemoteMedia };
+export { ActiveSpeakerDetector, type ChatInput, type MeetingConfig, MeetingProvider, MeetingState, type Participant, type ParticipantInfo, type PubSubHandle, type PubSubHandleForTopic, type PubSubMessage, type PubSubTopic, type PubSubTopicConfig, type Reaction, type RecordingInfo, type SFUConnectionState, type TrackInfo, VideoSDKCore, useLocalParticipant, useMeeting, useMeetingContext, useMeetingPreview, useParticipants, usePubSub, useRemoteMedia };

package/dist/index.d.ts

@@ -67,6 +67,26 @@ type PubSubMessage<T = unknown> = {
     timestamp: number;
     data: T;
 };
+type PubSubTopicConfig = {
+    SECURE_CHAT: {
+        publish: ChatInput;
+        message: ChatMessage;
+    };
+    REACTION: {
+        publish: {
+            emoji: string;
+        };
+        message: {
+            emoji: string;
+        };
+    };
+};
+type PubSubTopic = keyof PubSubTopicConfig;
+type PubSubHandle<TPublish = unknown, TMessage = TPublish> = {
+    messages: PubSubMessage<TMessage>[];
+    publish: (data: TPublish) => void;
+};
+type PubSubHandleForTopic<T extends PubSubTopic> = PubSubHandle<PubSubTopicConfig[T]["publish"], PubSubTopicConfig[T]["message"]>;
 type Participant = {
     id: string;
     name?: string;
@@ -103,12 +123,7 @@ type MeetingConfig = {
     name: string;
     audioMuted?: boolean;
     videoMuted?: boolean;
-    token?: string;
-};
-type PubSubTopic = "SECURE_CHAT" | "REACTION";
-type PubSubHandle<T = unknown> = {
-    messages: PubSubMessage<T>[];
-    publish: (data: T) => void;
+    token: string;
 };
 type RecordingInfo = {
     recording_id: string;
@@ -145,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;
@@ -234,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(): {
@@ -253,6 +270,15 @@ declare class VideoSDKCore {
     }>;
     sendChatMessage(payload: ChatInput): void;
     sendReaction(reaction: string): void;
+    /**
+     * 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<T extends PubSubTopic>(topic: T, data: PubSubTopicConfig[T]["publish"]): void;
     private cleanupRemoteParticipant;
     disconnect(): Promise<void>;
     private performDisconnect;
@@ -304,8 +330,8 @@ type MeetingContextValue = {
     presenterId: string | null;
     activeSpeakerIds: string[];
     recording: RecordingInfo | null;
-    usePubSub: <T = unknown>(topic: PubSubTopic) => PubSubHandle<T>;
-    onPubSubMessage: <T = unknown>(topic: PubSubTopic, cb: (message: PubSubMessage<T>) => void) => () => void;
+    usePubSub: <T extends PubSubTopic>(topic: T) => PubSubHandleForTopic<T>;
+    onPubSubMessage: <T extends PubSubTopic>(topic: T, cb: (message: PubSubMessage<PubSubTopicConfig[T]["message"]>) => void) => () => void;
     approveJoinRequest: (requestId: string) => void;
     rejectJoinRequest: (requestId: string) => void;
     startRecording: () => Promise<void>;
@@ -367,8 +393,8 @@ declare const useMeeting: (handlers?: {
     presenterId: string | null;
     activeSpeakerIds: string[];
     recording: RecordingInfo | null;
-    usePubSub: <T = unknown>(topic: PubSubTopic) => PubSubHandle<T>;
-    onPubSubMessage: <T = unknown>(topic: PubSubTopic, cb: (message: PubSubMessage<T>) => void) => () => void;
+    usePubSub: <T extends PubSubTopic>(topic: T) => PubSubHandleForTopic<T>;
+    onPubSubMessage: <T extends PubSubTopic>(topic: T, cb: (message: PubSubMessage<PubSubTopicConfig[T]["message"]>) => void) => () => void;
     approveJoinRequest: (requestId: string) => void;
     rejectJoinRequest: (requestId: string) => void;
     startRecording: () => Promise<void>;
@@ -463,8 +489,8 @@ declare class ActiveSpeakerDetector {
     destroy(): Promise<void>;
 }
 
-declare function usePubSub<T = unknown>(topic: PubSubTopic, options?: {
-    onMessageReceived?: (message: PubSubMessage<T>) => void;
-}): PubSubHandle<T>;
+declare function usePubSub<T extends PubSubTopic>(topic: T, options?: {
+    onMessageReceived?: (message: PubSubMessage<PubSubTopicConfig[T]["message"]>) => void;
+}): PubSubHandleForTopic<T>;
 
-export { ActiveSpeakerDetector, type ChatInput, type MeetingConfig, MeetingProvider, MeetingState, type Participant, type ParticipantInfo, type Reaction, type RecordingInfo, type SFUConnectionState, type TrackInfo, VideoSDKCore, useLocalParticipant, useMeeting, useMeetingContext, useMeetingPreview, useParticipants, usePubSub, useRemoteMedia };
+export { ActiveSpeakerDetector, type ChatInput, type MeetingConfig, MeetingProvider, MeetingState, type Participant, type ParticipantInfo, type PubSubHandle, type PubSubHandleForTopic, type PubSubMessage, type PubSubTopic, type PubSubTopicConfig, type Reaction, type RecordingInfo, type SFUConnectionState, type TrackInfo, VideoSDKCore, useLocalParticipant, useMeeting, useMeetingContext, useMeetingPreview, useParticipants, usePubSub, useRemoteMedia };

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) {
@@ -2739,6 +2733,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);
@@ -2764,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());
@@ -2829,6 +2843,7 @@ var MeetingProvider = ({
   const pubSubListeners = (0, import_react2.useRef)(
     /* @__PURE__ */ new Map()
   );
+  const [reactionPubSubMessages, setReactionPubSubMessages] = (0, import_react2.useState)([]);
   const activeSpeakerListeners = (0, import_react2.useRef)(
     /* @__PURE__ */ new Set()
   );
@@ -2838,7 +2853,8 @@ var MeetingProvider = ({
   if (!sdkRef.current) {
     sdkRef.current = new VideoSDKCore(
       {
-        participantId: config.participantId
+        participantId: config.participantId,
+        token: config.token
       },
       {
         onError: (err) => {
@@ -2862,21 +2878,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(
@@ -2939,32 +2977,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}"`);
@@ -3049,7 +3087,8 @@ var MeetingProvider = ({
     messages,
     presenterId,
     recording,
-    activeSpeakerIds
+    activeSpeakerIds,
+    reactionPubSubMessages
   ]);
   return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(MeetingContext.Provider, { value, children });
 };
@@ -3286,7 +3325,10 @@ function usePubSub(topic, options) {
   const ctx = useMeetingContext();
   (0, import_react8.useEffect)(() => {
     if (!options?.onMessageReceived) return;
-    return ctx.onPubSubMessage(topic, options.onMessageReceived);
+    return ctx.onPubSubMessage(
+      topic,
+      options.onMessageReceived
+    );
   }, [ctx, topic, options?.onMessageReceived]);
   return ctx.usePubSub(topic);
 }