@100mslive/react-native-room-kit 1.1.3 → 1.1.5

package/src/redux/actions/index.ts

@@ -3,6 +3,7 @@ import type {
   HMSLocalAudioStats,
   HMSLocalVideoStats,
   HMSMessage,
+  HMSNoiseCancellationPlugin,
   HMSPeer,
   HMSPoll,
   HMSPollQuestion,
@@ -63,7 +64,8 @@ import { MeetingState } from '../../types';
 import type { ChatState, Notification, PinnedMessage } from '../../types';
 
 export const setPrebuiltData = (data: {
-  roomCode: string;
+  roomCode?: string;
+  token?: string;
   options?: {
     userName?: string;
     userId?: string;
@@ -164,9 +166,6 @@ export const clearPeerData = () => ({
 });
 
 export const saveUserData = (data: {
-  userName?: String;
-  roomID?: String;
-  roomCode?: String;
   hmsInstance?: HMSSDK;
   hmsSessionStore?: HMSSessionStore;
   spotlightTrackId?: string | null;
@@ -433,6 +432,13 @@ export const setReconnecting = (reconnecting: boolean) => ({
   reconnecting,
 });
 
+export const setNoiseCancellationPlugin = (
+  noiseCancellationPlugin: HMSNoiseCancellationPlugin
+) => ({
+  type: HmsStateActionTypes.SET_NOISE_CANCELLATION_PLUGIN,
+  noiseCancellationPlugin,
+});
+
 export const setHandleBackButton = (handleBackButton?: boolean) => ({
   type: actionTypes.SET_HANDLE_BACK_BUTTON,
   payload: { handleBackButton },

package/src/redux/reducers/hmsStates.ts

@@ -1,5 +1,6 @@
 import type {
   HMSLocalPeer,
+  HMSNoiseCancellationPlugin,
   HMSPeer,
   HMSRole,
   HMSRoleChangeRequest,
@@ -29,7 +30,8 @@ type ActionType =
   | AddUpdateParticipant
   | ReplaceParticipantsList
   | SetActiveSpeakers
-  | SetReconnecting;
+  | SetReconnecting
+  | SetNoiseCancellationPlugin;
 
 type SetRoomAction = {
   type: HmsStateActionTypes.SET_ROOM_STATE;
@@ -131,6 +133,11 @@ type SetReconnecting = {
   reconnecting: boolean;
 };
 
+type SetNoiseCancellationPlugin = {
+  type: HmsStateActionTypes.SET_NOISE_CANCELLATION_PLUGIN;
+  noiseCancellationPlugin: HMSNoiseCancellationPlugin;
+};
+
 type IntialStateType = {
   isLocalAudioMuted: boolean | undefined;
   isLocalVideoMuted: boolean | undefined;
@@ -145,6 +152,7 @@ type IntialStateType = {
   previewPeersList: HMSPeer[];
   layoutConfig: Layout[] | null;
   roleChangeRequest: HMSRoleChangeRequest | null;
+  noiseCancellationPlugin: HMSNoiseCancellationPlugin | null;
 };
 
 const INITIAL_STATE: IntialStateType = {
@@ -161,6 +169,7 @@ const INITIAL_STATE: IntialStateType = {
   previewPeersList: [],
   layoutConfig: null,
   roleChangeRequest: null,
+  noiseCancellationPlugin: null,
 };
 
 const hmsStatesReducer = (
@@ -557,6 +566,11 @@ const hmsStatesReducer = (
         ...state,
         reconnecting: action.reconnecting,
       };
+    case HmsStateActionTypes.SET_NOISE_CANCELLATION_PLUGIN:
+      return {
+        ...state,
+        noiseCancellationPlugin: action.noiseCancellationPlugin,
+      };
     case HmsStateActionTypes.CLEAR_STATES:
       return INITIAL_STATE;
     default:

package/src/redux/reducers/userState.ts

@@ -3,9 +3,11 @@ import type {
   HMSSDK,
   HMSSessionStore,
 } from '@100mslive/react-native-hms';
-import { getMeetingCode, getMeetingUrl } from '../../utils/functions';
 import ActionTypes, { HmsStateActionTypes } from '../actionTypes';
-import type { HMSIOSScreenShareConfig, OnLeaveHandler } from '../../utils/types';
+import type {
+  HMSIOSScreenShareConfig,
+  OnLeaveHandler,
+} from '../../utils/types';
 
 type ActionType = {
   payload: any;
@@ -15,13 +17,14 @@ type ActionType = {
 type IntialStateType = {
   userName: string;
   userId: string | undefined;
-  endPoints: { init: string; token: string; layout: string; } | undefined;
+  endPoints: { init: string; token: string; layout: string } | undefined;
   debugMode: boolean;
-  roomID: string;
+  roomID: string | undefined;
   hmsInstance?: HMSSDK;
   hmsSessionStore?: HMSSessionStore | null;
   spotlightTrackId?: string | null;
-  roomCode: string;
+  roomCode: string | undefined;
+  token: string | undefined;
   isHLSFlow: boolean;
   roles: HMSRole[];
   iosBuildConfig: HMSIOSScreenShareConfig | null;
@@ -34,8 +37,9 @@ const INITIAL_STATE: IntialStateType = {
   endPoints: undefined,
   debugMode: false,
   hmsInstance: undefined,
-  roomID: getMeetingUrl(),
-  roomCode: getMeetingCode(),
+  roomID: undefined,
+  roomCode: undefined,
+  token: undefined,
   isHLSFlow: true,
   roles: [],
   hmsSessionStore: null,
@@ -73,11 +77,12 @@ const userReducer = (
       };
     case HmsStateActionTypes.SET_PREBUILT_DATA:
       state.roomCode = action.payload.roomCode;
-      state.userName = action.payload.options.userName ?? '';
-      state.userId = action.payload.options.userId;
-      state.endPoints = action.payload.options.endPoints;
-      state.debugMode = action.payload.options.debugMode ?? false;
-      state.iosBuildConfig = action.payload.options.ios ?? null;
+      state.token = action.payload.token;
+      state.userName = action.payload.options?.userName ?? '';
+      state.userId = action.payload.options?.userId;
+      state.endPoints = action.payload.options?.endPoints;
+      state.debugMode = action.payload.options?.debugMode ?? false;
+      state.iosBuildConfig = action.payload.options?.ios ?? null;
 
       return state;
     case HmsStateActionTypes.SET_ON_LEAVE_HANDLER:

package/src/types.ts

@@ -9,8 +9,7 @@ export enum MeetingState {
   MEETING_ENDED,
   ERROR,
 }
-export interface HMSPrebuiltProps {
-  roomCode: string;
+export interface HMSPrebuiltCommonProps {
   options?: {
     userName?: string;
     userId?: string;
@@ -63,6 +62,19 @@ export interface HMSPrebuiltProps {
   autoEnterPipMode?: boolean;
 }
 
+export type HMSPrebuiltConditionalProps =
+  | {
+      roomCode: string;
+      token?: never;
+    }
+  | {
+      roomCode?: never;
+      token: string;
+    };
+
+export type HMSPrebuiltProps = HMSPrebuiltCommonProps &
+  HMSPrebuiltConditionalProps;
+
 export enum NotificationTypes {
   INFO = 'info',
   ROLE_CHANGE_DECLINED = 'role_change_declined',

package/src/utils/functions.ts

@@ -445,6 +445,7 @@ export function groupIntoPairs(totalNumber: number) {
 
 /**
  * @param list array of items
+ * @param fill boolean to fill the last triplet with `undefined` if it has less than 3 items
  * @returns list of triplets
  *
  * Example: If list is `[a, b, c, d]`, then output will be `[ [a, b, c], [d] ]`

package/src/utils/hooks.ts

@@ -111,9 +111,16 @@ export const useFetchLeaderboardResponse = (
   const dispatch = useDispatch();
   const hmsInstance = useHMSInstance();
 
-  const hasPollWritePermission = useSelector((state: RootState) => {
-    const permissions = state.hmsStates.localPeer?.role?.permissions;
-    return permissions?.pollWrite;
+  const localPeerPollInitiator = useSelector((state: RootState) => {
+    if (!pollId) return null;
+    const localPeerUserId = state.hmsStates.localPeer?.customerUserID;
+    const pollInitiatorUserID =
+      state.polls.polls[pollId]?.createdBy?.customerUserID;
+    return (
+      localPeerUserId &&
+      pollInitiatorUserID &&
+      localPeerUserId === pollInitiatorUserID
+    );
   });
 
   const leaderboardData = useSelector((state: RootState) => {
@@ -134,7 +141,7 @@ export const useFetchLeaderboardResponse = (
           pollId,
           5,
           1, // Indexing starts from 1
-          !hasPollWritePermission // fetchCurrentUser only if user has only pollRead permission
+          !localPeerPollInitiator // fetchCurrentUser only if user is voter, and not poll initiator
         );
         if (mounted) {
           dispatch(addLeaderboard(pollId, response));
@@ -146,7 +153,7 @@ export const useFetchLeaderboardResponse = (
     return () => {
       mounted = false;
     };
-  }, [pollId, leaderboardDataExist, hasPollWritePermission]);
+  }, [pollId, leaderboardDataExist, localPeerPollInitiator]);
 
   return leaderboardData;
 };
@@ -167,10 +174,6 @@ export const useLeaderboardSummaryData = (
       localPeerUserId === pollInitiatorUserID
     );
   });
-  const canCreateOrEndPoll = useSelector((state: RootState) => {
-    const permissions = state.hmsStates.localPeer?.role?.permissions;
-    return permissions?.pollWrite;
-  });
 
   const leaderboardData = useSelector((state: RootState) => {
     if (!pollId) return null;
@@ -237,9 +240,6 @@ export const useLeaderboardSummaryData = (
       : null;
 
   const voterSummaryData = useMemo(() => {
-    if (!localLeaderboardEntry || canCreateOrEndPoll) {
-      return null;
-    }
     return [
       [
         {