agora-appbuilder-core 2.3.0-beta.2 → 2.3.0-beta.22

package/template/src/components/RTMConfigure.tsx

@@ -11,7 +11,7 @@
 */
 // @ts-nocheck
 import React, {useState, useContext, useEffect, useRef} from 'react';
-import RtmEngine, {RtmAttribute} from 'agora-react-native-rtm';
+import RtmEngine from 'agora-react-native-rtm';
 import {PropsContext, useLocalUid} from '../../agora-rn-uikit';
 import ChatContext, {controlMessageEnum} from './ChatContext';
 import {RtcContext} from '../../agora-rn-uikit';
@@ -20,7 +20,6 @@ import {Platform} from 'react-native';
 import {backOff} from 'exponential-backoff';
 import {useString} from '../utils/useString';
 import {isAndroid, isWeb} from '../utils/common';
-import StorageContext from './StorageContext';
 import {useRenderContext} from 'fpe-api';
 import {
   safeJsonParse,
@@ -33,6 +32,7 @@ import {
 import {EventUtils, EventsQueue, eventMessageType} from '../rtm-events';
 import RTMEngine from '../rtm/RTMEngine';
 import {filterObject} from '../utils';
+import useLocalScreenShareUid from '../utils/useLocalShareScreenUid';
 
 export enum UserType {
   ScreenShare = 'screenshare',
@@ -56,6 +56,7 @@ const parsePayload = (data: string) => {
 
 const RtmConfigure = (props: any) => {
   const localUid = useLocalUid();
+  const screenShareUid = useLocalScreenShareUid();
   const {callActive} = props;
   const {rtcProps} = useContext(PropsContext);
   const {RtcEngine, dispatch} = useContext(RtcContext);
@@ -75,21 +76,6 @@ const RtmConfigure = (props: any) => {
     renderListRef.current.renderList = renderList;
   }, [renderList]);
 
-  const {store, setStore} = useContext(StorageContext);
-  const getInitialUsername = () =>
-    store?.displayName ? store.displayName : '';
-  const [displayName, setDisplayName] = useState(getInitialUsername());
-
-  //Update the store displayName value if the state is changed
-  useEffect(() => {
-    setStore((prevState) => {
-      return {
-        ...prevState,
-        displayName,
-      };
-    });
-  }, [displayName]);
-
   const [login, setLogin] = useState<boolean>(false);
 
   const [hasUserJoinedRTM, setHasUserJoinedRTM] = useState<boolean>(false);
@@ -145,13 +131,14 @@ const RtmConfigure = (props: any) => {
 
   const setAttribute = async () => {
     const rtmAttributes = [
-      {key: 'name', value: displayName || userText},
       {key: 'screenUid', value: String(rtcProps.screenShareUid)},
     ];
     try {
       await engine.current.setLocalUserAttributes(rtmAttributes);
       timerValueRef.current = 5;
-      joinChannel();
+      await joinChannel();
+      setHasUserJoinedRTM(true);
+      await runQueuedCustomEvents();
     } catch (error) {
       setTimeout(async () => {
         timerValueRef.current = timerValueRef.current + timerValueRef.current;
@@ -165,8 +152,6 @@ const RtmConfigure = (props: any) => {
       await engine.current.joinChannel(rtcProps.channel);
       timerValueRef.current = 5;
       await getMembers();
-      setHasUserJoinedRTM(true);
-      await runQueuedCustomEvents();
     } catch (error) {
       setTimeout(async () => {
         timerValueRef.current = timerValueRef.current + timerValueRef.current;
@@ -194,6 +179,9 @@ const RtmConfigure = (props: any) => {
                   const attr = await engine.current.getUserAttributesByUid(
                     member.uid,
                   );
+                  if (!attr || !attr.attributes) {
+                    throw attr;
+                  }
                   for (const key in attr.attributes) {
                     if (
                       attr.attributes.hasOwnProperty(key) &&
@@ -224,10 +212,6 @@ const RtmConfigure = (props: any) => {
                 const screenUid = parseInt(attr?.attributes?.screenUid);
                 //start - updating user data in rtc
                 const userData = {
-                  name:
-                    String(member.uid)[0] === '1'
-                      ? pstnUserLabel
-                      : attr?.attributes?.name || userText,
                   screenUid: screenUid,
                   //below thing for livestreaming
                   type: 'rtc',
@@ -237,7 +221,6 @@ const RtmConfigure = (props: any) => {
 
                 //start - updating screenshare data in rtc
                 const screenShareUser = {
-                  name: getScreenShareName(attr?.attributes?.name || userText),
                   type: UserType.ScreenShare,
                 };
                 updateRenderListState(screenUid, screenShareUser);
@@ -297,6 +280,9 @@ const RtmConfigure = (props: any) => {
       const backoffAttributes = backOff(
         async () => {
           const attr = await engine.current.getUserAttributesByUid(data.uid);
+          if (!attr || !attr.attributes) {
+            throw attr;
+          }
           for (const key in attr.attributes) {
             if (attr.attributes.hasOwnProperty(key) && attr.attributes[key]) {
               return attr;
@@ -323,10 +309,6 @@ const RtmConfigure = (props: any) => {
           const screenUid = parseInt(attr?.attributes?.screenUid);
           //start - updating user data in rtc
           const userData = {
-            name:
-              String(data.uid)[0] === '1'
-                ? pstnUserLabel
-                : attr?.attributes?.name || userText,
             screenUid: screenUid,
             //below thing for livestreaming
             type: 'rtc',
@@ -336,7 +318,6 @@ const RtmConfigure = (props: any) => {
 
           //start - updating screenshare data in rtc
           const screenShareUser = {
-            name: getScreenShareName(attr?.attributes?.name || userText),
             type: UserType.ScreenShare,
           };
           updateRenderListState(screenUid, screenShareUser);
@@ -462,22 +443,12 @@ const RtmConfigure = (props: any) => {
 
   const runQueuedCustomEvents = async () => {
     try {
-      const eventsInQueue = EventsQueue.printQueue();
-      if (eventsInQueue.length !== 0) {
-        for (const queuedEvents of eventsInQueue) {
-          await customEventDispatcher(
-            queuedEvents.data,
-            queuedEvents.uid,
-            queuedEvents.ts,
-          );
-          EventsQueue.dequeue();
-        }
+      while (!EventsQueue.isEmpty()) {
+        const currEvt = EventsQueue.dequeue();
+        await customEventDispatcher(currEvt.data, currEvt.uid, currEvt.ts);
       }
     } catch (error) {
-      throw Error(
-        'CUSTOM_EVENTS_API: error while running queued events ',
-        error,
-      );
+      console.log('CUSTOM_EVENT_API:  error while running queue events', error);
     }
   };
 
@@ -502,7 +473,7 @@ const RtmConfigure = (props: any) => {
     }
     // Step 2: Emit the event
     try {
-      console.log('CUSTOM_EVENT_API:  emiting event: ');
+      console.log('CUSTOM_EVENT_API:  emiting event..: ');
       EventUtils.emitEvent(evt, {payload, sender, ts});
     } catch (error) {
       console.log('CUSTOM_EVENT_API: error while emiting event: ', error);
@@ -570,8 +541,9 @@ const RtmConfigure = (props: any) => {
 
   const end = async () => {
     callActive
-      ? (await (engine.current as RtmEngine).logout(),
-        await (engine.current as RtmEngine).destroyClient(),
+      ? (RTMEngine.getInstance().destroy(),
+        EventUtils.clear(),
+        setHasUserJoinedRTM(false),
         // setLogin(false),
         console.log('RTM cleanup done'))
       : {};
@@ -596,8 +568,6 @@ const RtmConfigure = (props: any) => {
         engine: engine.current,
         localUid: localUid,
         onlineUsersCount,
-        setDisplayName,
-        displayName,
       }}>
       {login ? props.children : <></>}
     </ChatContext.Provider>