@100mslive/react-native-room-kit 1.0.2 → 1.0.4-beta.0

package/src/hooks-util.ts

@@ -56,7 +56,11 @@ import {
   PeerListRefreshInterval,
   PipModes,
 } from './utils/types';
-import type { ChatBroadcastFilter, OnLeaveHandler, PeerTrackNode } from './utils/types';
+import type {
+  ChatBroadcastFilter,
+  OnLeaveHandler,
+  PeerTrackNode,
+} from './utils/types';
 import { createPeerTrackNode } from './utils/functions';
 import {
   batch,
@@ -1256,10 +1260,12 @@ export const useHMSReconnection = () => {
       if (mounted) {
         batch(() => {
           dispatch(setReconnecting(true));
-          dispatch(addNotification({
-            id: NotificationTypes.RECONNECTING,
-            type: NotificationTypes.RECONNECTING
-          }))
+          dispatch(
+            addNotification({
+              id: NotificationTypes.RECONNECTING,
+              type: NotificationTypes.RECONNECTING,
+            })
+          );
         });
       }
     });
@@ -1268,7 +1274,7 @@ export const useHMSReconnection = () => {
         batch(() => {
           dispatch(setReconnecting(false));
           dispatch(removeNotification(NotificationTypes.RECONNECTING));
-        })
+        });
       }
     });
 
@@ -1426,13 +1432,19 @@ export const useAutoPip = (oneToOneCall: boolean) => {
   );
   const [numerator, denominator] = usePipAspectRatio(oneToOneCall);
 
+  const remotePeersPresent = useSelector((state: RootState) => {
+    const room = state.hmsStates.room;
+    return room && room.peerCount !== null ? room.peerCount > 1 : false; // `peerCount` includes local peer
+  });
+
   useEffect(() => {
-    if (autoEnterPipMode) {
+    if (autoEnterPipMode && remotePeersPresent) {
       enableAutoPip({ aspectRatio: [numerator, denominator] });
 
       return disableAutoPip;
     }
   }, [
+    remotePeersPresent,
     numerator,
     denominator,
     autoEnterPipMode,
@@ -1471,10 +1483,16 @@ export const usePipAspectRatio = (oneToOneCall: boolean): [number, number] => {
     }
     // default aspect ratio
     return [16, 9];
-  }, [isHLSViewer, firstSSNodeId, oneToOneCall, ssResolution, hlsPlayerResolution]);
+  }, [
+    isHLSViewer,
+    firstSSNodeId,
+    oneToOneCall,
+    ssResolution,
+    hlsPlayerResolution,
+  ]);
 
   return aspectRatio;
-}
+};
 
 export const useHMSActiveSpeakerUpdates = (
   setPeerTrackNodes: React.Dispatch<React.SetStateAction<PeerTrackNode[]>>,
@@ -2008,57 +2026,60 @@ export const useLeaveMethods = () => {
   const dispatch = useDispatch();
   const reduxStore = useStore<RootState>();
 
-  const destroy = useCallback((reason: Parameters<OnLeaveHandler>[0]) => {
-    try {
-      const s = hmsInstance.destroy();
-      console.log('Destroy Success: ', s);
-      // TODOS:
-      // - If show `Meeting_Ended` is true, show Meeting screen by setting state to MEETING_ENDED
-      //    - Reset Redux States
-      //    - HMSInstance will not be available now
-      //    - When your presses "Re Join" Action button, restart process from root component
-      //    - When your presses "Done" Action button
-      //        - If we have callback fn, call it
-      //        - Otherwise try our best to navigate away from current screen
-      //
-      // - No screen to show
-      //    - No need to reset redux state?
-      //    - HMSInstance will be available till this point
-      //    - If we have callback fn, call it
-      //    - Otherwise try our best to navigate away from current screen
-      //    - When we are navigated away from screen, HMSInstance will be not available
-
-      // dispatch(clearMessageData());
-      // dispatch(clearPeerData());
-      // dispatch(clearHmsReference());
-
-      const onLeave = reduxStore.getState().user.onLeave;
-
-      if (typeof onLeave === 'function') {
-        onLeave(reason);
-        dispatch(clearStore());
-      } else if (
-        navigation &&
-        typeof navigation.canGoBack === 'function' &&
-        navigation.canGoBack()
-      ) {
-        navigation.goBack();
-        dispatch(clearStore());
-      } else {
-        // Otherwise default action is to show "Meeting Ended" screen
-        dispatch(clearStore()); // TODO: We need different clearStore for MeetingEnded
-        dispatch(changeMeetingState(MeetingState.MEETING_ENDED));
+  const destroy = useCallback(
+    (reason: Parameters<OnLeaveHandler>[0]) => {
+      try {
+        const s = hmsInstance.destroy();
+        console.log('Destroy Success: ', s);
+        // TODOS:
+        // - If show `Meeting_Ended` is true, show Meeting screen by setting state to MEETING_ENDED
+        //    - Reset Redux States
+        //    - HMSInstance will not be available now
+        //    - When your presses "Re Join" Action button, restart process from root component
+        //    - When your presses "Done" Action button
+        //        - If we have callback fn, call it
+        //        - Otherwise try our best to navigate away from current screen
+        //
+        // - No screen to show
+        //    - No need to reset redux state?
+        //    - HMSInstance will be available till this point
+        //    - If we have callback fn, call it
+        //    - Otherwise try our best to navigate away from current screen
+        //    - When we are navigated away from screen, HMSInstance will be not available
+
+        // dispatch(clearMessageData());
+        // dispatch(clearPeerData());
+        // dispatch(clearHmsReference());
+
+        const onLeave = reduxStore.getState().user.onLeave;
+
+        if (typeof onLeave === 'function') {
+          onLeave(reason);
+          dispatch(clearStore());
+        } else if (
+          navigation &&
+          typeof navigation.canGoBack === 'function' &&
+          navigation.canGoBack()
+        ) {
+          navigation.goBack();
+          dispatch(clearStore());
+        } else {
+          // Otherwise default action is to show "Meeting Ended" screen
+          dispatch(clearStore()); // TODO: We need different clearStore for MeetingEnded
+          dispatch(changeMeetingState(MeetingState.MEETING_ENDED));
+        }
+      } catch (e) {
+        console.log(`Destroy HMS instance Error: ${e}`);
+        Toast.showWithGravity(
+          `Destroy HMS instance Error: ${e}`,
+          Toast.LONG,
+          Toast.TOP
+        );
+        return Promise.reject(e);
       }
-    } catch (e) {
-      console.log(`Destroy HMS instance Error: ${e}`);
-      Toast.showWithGravity(
-        `Destroy HMS instance Error: ${e}`,
-        Toast.LONG,
-        Toast.TOP
-      );
-      return Promise.reject(e);
-    }
-  }, [hmsInstance]);
+    },
+    [hmsInstance]
+  );
 
   const leave = useCallback(
     async (reason: OnLeaveReason, shouldEndStream: boolean = false) => {
@@ -2093,15 +2114,18 @@ export const useLeaveMethods = () => {
     }
   }, [hmsInstance]);
 
-  const endRoom = useCallback(async (reason: OnLeaveReason) => {
-    try {
-      const d = await hmsInstance.endRoom('Host ended the room');
-      console.log('EndRoom Success: ', d);
-      await destroy(reason);
-    } catch (e) {
-      console.log('EndRoom Error: ', e);
-    }
-  }, [destroy, hmsInstance]);
+  const endRoom = useCallback(
+    async (reason: OnLeaveReason) => {
+      try {
+        const d = await hmsInstance.endRoom('Host ended the room');
+        console.log('EndRoom Success: ', d);
+        await destroy(reason);
+      } catch (e) {
+        console.log('EndRoom Error: ', e);
+      }
+    },
+    [destroy, hmsInstance]
+  );
 
   return { destroy, leave, endRoom, prebuiltCleanUp };
 };
@@ -2227,8 +2251,8 @@ export const useSendMessage = () => {
         'publishSettings' in sendingTo
           ? HMSMessageRecipientType.ROLES
           : 'peerID' in sendingTo
-          ? HMSMessageRecipientType.PEER
-          : HMSMessageRecipientType.BROADCAST,
+            ? HMSMessageRecipientType.PEER
+            : HMSMessageRecipientType.BROADCAST,
       recipientPeer: 'peerID' in sendingTo ? sendingTo : undefined,
       recipientRoles: 'publishSettings' in sendingTo ? [sendingTo] : undefined,
     });
@@ -2396,7 +2420,7 @@ export const useStartRecording = () => {
           addNotification({
             id: Math.random().toString(16).slice(2),
             type: NotificationTypes.ERROR,
-            message: error.message
+            message: error.message,
           })
         );
       });

package/src/utils/constants.ts

@@ -143,4 +143,8 @@ export const TestIds = {
   bluetooth_audio_device_btn: 'bluetooth-audio-device-button',
   bluetooth_audio_device_text: 'bluetooth-audio-device-text',
   bluetooth_audio_device_active: 'bluetooth-audio-device--active',
+
+  mute_audio_btn: 'mute-audio-button',
+  mute_audio_text: 'mute-audio-text',
+  mute_audio_active: 'mute-audio--active',
 } as const;

package/src/utils/functions.ts

@@ -15,13 +15,6 @@ import {
 } from '@100mslive/react-native-hms';
 
 import type { PeerTrackNode } from './types';
-import {
-  PERMISSIONS,
-  request,
-  requestMultiple,
-  RESULTS,
-} from 'react-native-permissions';
-import { getRoomLinkDetails } from './getRoomLinkDetails';
 
 export const getMeetingUrl = () =>
   'https://yogi.app.100ms.live/streaming/meeting/nih-bkn-vek';
@@ -102,57 +95,6 @@ export const requestExternalStoragePermission = async (): Promise<boolean> => {
   return false;
 };
 
-export const callService = async (
-  roomID: string,
-  success: Function,
-  failure: Function
-) => {
-  let roomCode;
-  let subdomain;
-  try {
-    if (validateUrl(roomID)) {
-      const { roomCode: code, roomDomain: domain } = getRoomLinkDetails(roomID);
-      roomCode = code;
-      subdomain = domain;
-
-      if (!code || !domain) {
-        failure('code, domain not found');
-        return;
-      }
-    } else {
-      failure('Invalid room join link');
-      return;
-    }
-
-    const permissions = await checkPermissions([
-      PERMISSIONS.ANDROID.CAMERA,
-      PERMISSIONS.ANDROID.RECORD_AUDIO,
-      PERMISSIONS.ANDROID.BLUETOOTH_CONNECT,
-    ]);
-
-    if (permissions) {
-      const userId = getRandomUserId(6);
-      const isQARoom = subdomain && subdomain.search('.qa-') >= 0;
-      success(
-        roomCode,
-        userId,
-        isQARoom
-          ? `https://auth-nonprod.100ms.live${Platform.OS === 'ios' ? '/' : ''}`
-          : undefined, // Auth Endpoint
-        isQARoom ? 'https://qa-init.100ms.live/init' : undefined // HMSConfig Endpoint
-      );
-      return;
-    } else {
-      failure('permission not granted');
-      return;
-    }
-  } catch (error) {
-    console.log(error);
-    failure('error in call service');
-    return;
-  }
-};
-
 /**
  * @param min minimum range value
  * @param max maximum range value
@@ -307,53 +249,6 @@ export const validateUrl = (url?: string): boolean => {
   return false;
 };
 
-export const checkPermissions = async (
-  permissions: Array<
-    (typeof PERMISSIONS.ANDROID)[keyof typeof PERMISSIONS.ANDROID]
-  >
-): Promise<boolean> => {
-  if (Platform.OS === 'ios') {
-    return true;
-  }
-
-  try {
-    const requiredPermissions = permissions.filter(
-      (permission) =>
-        permission.toString() !== PERMISSIONS.ANDROID.BLUETOOTH_CONNECT
-    );
-
-    const results = await requestMultiple(requiredPermissions);
-
-    let allPermissionsGranted = true;
-    requiredPermissions.forEach((permission) => {
-      if (!(results[permission] === RESULTS.GRANTED)) {
-        allPermissionsGranted = false;
-      }
-      console.log(permission, ':', results[permission]);
-    });
-
-    // Bluetooth Connect Permission handling
-    if (
-      permissions.findIndex(
-        (permission) =>
-          permission.toString() === PERMISSIONS.ANDROID.BLUETOOTH_CONNECT
-      ) >= 0
-    ) {
-      const bleConnectResult = await request(
-        PERMISSIONS.ANDROID.BLUETOOTH_CONNECT
-      );
-      console.log(
-        `${PERMISSIONS.ANDROID.BLUETOOTH_CONNECT} : ${bleConnectResult}`
-      );
-    }
-
-    return allPermissionsGranted;
-  } catch (error) {
-    console.log(error);
-    return false;
-  }
-};
-
 export const pairData = (
   unGroupedPeerTrackNodes: PeerTrackNode[],
   batch: number,
@@ -448,19 +343,19 @@ export const getDisplayTrackDimensions = (
       peersInPage === 1
         ? viewHeight / 1
         : peersInPage === 2
-        ? viewHeight / 2
-        : peersInPage === 3
-        ? viewHeight / 3
-        : viewHeight / 2;
+          ? viewHeight / 2
+          : peersInPage === 3
+            ? viewHeight / 3
+            : viewHeight / 2;
 
     width =
       peersInPage === 1
         ? '100%'
         : peersInPage === 2
-        ? '100%'
-        : peersInPage === 3
-        ? '100%'
-        : '50%';
+          ? '100%'
+          : peersInPage === 3
+            ? '100%'
+            : '50%';
   } else {
     height = viewHeight - (StatusBar.currentHeight || 0);
 

package/lib/commonjs/utils/getRoomLinkDetails.js

@@ -1,23 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.getRoomLinkDetails = void 0;
-const getRoomLinkDetails = roomLink => {
-  const codeObject = RegExp(/(?!\/)[a-zA-Z\-0-9]*$/g).exec(roomLink);
-  const domainObject = RegExp(/(https:\/\/)?(?:[a-zA-Z0-9.-])+(?!\\)/).exec(roomLink);
-  let roomCode = '';
-  let roomDomain = '';
-  if (codeObject && domainObject) {
-    roomCode = codeObject[0];
-    roomDomain = domainObject[0];
-    roomDomain = roomDomain.replace('https://', '');
-  }
-  return {
-    roomCode,
-    roomDomain
-  };
-};
-exports.getRoomLinkDetails = getRoomLinkDetails;
-//# sourceMappingURL=getRoomLinkDetails.js.map

package/lib/commonjs/utils/getRoomLinkDetails.js.map

@@ -1 +0,0 @@
-{"version":3,"names":["getRoomLinkDetails","roomLink","codeObject","RegExp","exec","domainObject","roomCode","roomDomain","replace","exports"],"sourceRoot":"../../../src","sources":["utils/getRoomLinkDetails.ts"],"mappings":";;;;;;AAAO,MAAMA,kBAAkB,GAC7BC,QAAgB,IAC6B;EAC7C,MAAMC,UAAU,GAAGC,MAAM,CAAC,wBAAwB,CAAC,CAACC,IAAI,CAACH,QAAQ,CAAC;EAElE,MAAMI,YAAY,GAAGF,MAAM,CAAC,uCAAuC,CAAC,CAACC,IAAI,CACvEH,QACF,CAAC;EAED,IAAIK,QAAQ,GAAG,EAAE;EACjB,IAAIC,UAAU,GAAG,EAAE;EAEnB,IAAIL,UAAU,IAAIG,YAAY,EAAE;IAC9BC,QAAQ,GAAGJ,UAAU,CAAC,CAAC,CAAC;IACxBK,UAAU,GAAGF,YAAY,CAAC,CAAC,CAAC;IAC5BE,UAAU,GAAGA,UAAU,CAACC,OAAO,CAAC,UAAU,EAAE,EAAE,CAAC;EACjD;EAEA,OAAO;IACLF,QAAQ;IACRC;EACF,CAAC;AACH,CAAC;AAACE,OAAA,CAAAT,kBAAA,GAAAA,kBAAA"}

package/lib/module/utils/getRoomLinkDetails.js

@@ -1,16 +0,0 @@
-export const getRoomLinkDetails = roomLink => {
-  const codeObject = RegExp(/(?!\/)[a-zA-Z\-0-9]*$/g).exec(roomLink);
-  const domainObject = RegExp(/(https:\/\/)?(?:[a-zA-Z0-9.-])+(?!\\)/).exec(roomLink);
-  let roomCode = '';
-  let roomDomain = '';
-  if (codeObject && domainObject) {
-    roomCode = codeObject[0];
-    roomDomain = domainObject[0];
-    roomDomain = roomDomain.replace('https://', '');
-  }
-  return {
-    roomCode,
-    roomDomain
-  };
-};
-//# sourceMappingURL=getRoomLinkDetails.js.map

package/lib/module/utils/getRoomLinkDetails.js.map

@@ -1 +0,0 @@
-{"version":3,"names":["getRoomLinkDetails","roomLink","codeObject","RegExp","exec","domainObject","roomCode","roomDomain","replace"],"sourceRoot":"../../../src","sources":["utils/getRoomLinkDetails.ts"],"mappings":"AAAA,OAAO,MAAMA,kBAAkB,GAC7BC,QAAgB,IAC6B;EAC7C,MAAMC,UAAU,GAAGC,MAAM,CAAC,wBAAwB,CAAC,CAACC,IAAI,CAACH,QAAQ,CAAC;EAElE,MAAMI,YAAY,GAAGF,MAAM,CAAC,uCAAuC,CAAC,CAACC,IAAI,CACvEH,QACF,CAAC;EAED,IAAIK,QAAQ,GAAG,EAAE;EACjB,IAAIC,UAAU,GAAG,EAAE;EAEnB,IAAIL,UAAU,IAAIG,YAAY,EAAE;IAC9BC,QAAQ,GAAGJ,UAAU,CAAC,CAAC,CAAC;IACxBK,UAAU,GAAGF,YAAY,CAAC,CAAC,CAAC;IAC5BE,UAAU,GAAGA,UAAU,CAACC,OAAO,CAAC,UAAU,EAAE,EAAE,CAAC;EACjD;EAEA,OAAO;IACLF,QAAQ;IACRC;EACF,CAAC;AACH,CAAC"}

package/lib/typescript/utils/getRoomLinkDetails.d.ts

@@ -1,5 +0,0 @@
-export declare const getRoomLinkDetails: (roomLink: string) => {
-    roomCode: string;
-    roomDomain: string;
-};
-//# sourceMappingURL=getRoomLinkDetails.d.ts.map

package/lib/typescript/utils/getRoomLinkDetails.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"getRoomLinkDetails.d.ts","sourceRoot":"","sources":["../../../src/utils/getRoomLinkDetails.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,kBAAkB,aACnB,MAAM;cACH,MAAM;gBAAc,MAAM;CAoBxC,CAAC"}

package/src/utils/getRoomLinkDetails.ts

@@ -1,23 +0,0 @@
-export const getRoomLinkDetails = (
-  roomLink: string
-): { roomCode: string; roomDomain: string } => {
-  const codeObject = RegExp(/(?!\/)[a-zA-Z\-0-9]*$/g).exec(roomLink);
-
-  const domainObject = RegExp(/(https:\/\/)?(?:[a-zA-Z0-9.-])+(?!\\)/).exec(
-    roomLink
-  );
-
-  let roomCode = '';
-  let roomDomain = '';
-
-  if (codeObject && domainObject) {
-    roomCode = codeObject[0];
-    roomDomain = domainObject[0];
-    roomDomain = roomDomain.replace('https://', '');
-  }
-
-  return {
-    roomCode,
-    roomDomain,
-  };
-};