agora-appbuilder-core 4.0.30-beta-2 → 4.0.30-beta-3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agora-appbuilder-core",
-  "version": "4.0.30-beta-2",
+  "version": "4.0.30-beta-3",
   "description": "React Native template for RTE app builder",
   "main": "index.js",
   "files": [

package/template/bridge/rtm/web/index.ts

@@ -37,7 +37,6 @@ export default class RtmEngine {
     ['channelMessageReceived', () => null],
     ['channelMemberJoined', () => null],
     ['channelMemberLeft', () => null],
-    ['channelAttributesUpdated', () => null],
   ]);
   public clientEventsMap = new Map<string, any>([
     ['connectionStateChanged', () => null],
@@ -67,8 +66,7 @@ export default class RtmEngine {
     if (
       event === 'channelMessageReceived' ||
       event === 'channelMemberJoined' ||
-      event === 'channelMemberLeft' ||
-      event === 'channelAttributesUpdated'
+      event === 'channelMemberLeft'
     ) {
       this.channelEventsMap.set(event, listener);
     } else if (
@@ -253,7 +251,7 @@ export default class RtmEngine {
           return acc;
         }, []);
 
-        this.channelEventsMap.get('channelAttributesUpdated')(
+        this.channelEventsMap.get('ChannelAttributesUpdated')(
           channelAttributes,
         );
       });
@@ -342,8 +340,21 @@ export default class RtmEngine {
     let response = {};
     await this.client
       .getChannelAttributes(channelId)
-      .then((attributes: string) => {
-        response = {attributes};
+      .then((attributes: RtmChannelAttribute) => {
+        /**
+         *  Here the attributes received are in the format {[valueOfKey]: valueOfValue} of type RtmChannelAttribute
+         *  We need to convert it into (array of objects [{key: 'valueOfKey', value: 'valueOfValue}])
+        /**
+         * 1. Loop through object
+         * 2. Create a object {key: "", value: ""} and push into array
+         * 3. Return the Array
+         */
+        const channelAttributes = Object.keys(attributes).reduce((acc, key) => {
+          const {value, lastUpdateTs, lastUpdateUserId} = attributes[key];
+          acc.push({key, value, lastUpdateTs, lastUpdateUserId});
+          return acc;
+        }, []);
+        response = channelAttributes;
       })
       .catch((e: any) => {
         Promise.reject(e);

package/template/defaultConfig.js

@@ -76,8 +76,8 @@ const DefaultConfig = {
   CHAT_ORG_NAME: '',
   CHAT_APP_NAME: '',
   CHAT_URL: '',
-  CLI_VERSION: '3.0.30-beta-2',
-  CORE_VERSION: '4.0.30-beta-2',
+  CLI_VERSION: '3.0.30-beta-3',
+  CORE_VERSION: '4.0.30-beta-3',
   DISABLE_LANDSCAPE_MODE: false,
   STT_AUTO_START: false,
   CLOUD_RECORDING_AUTO_START: false,

package/template/src/components/RTMConfigure.tsx

@@ -397,16 +397,16 @@ const RtmConfigure = (props: any) => {
       await engine.current
         .getChannelAttributes(rtcProps.channel)
         .then(async data => {
-          for (const [key, value] of Object.entries(data?.attributes)) {
-            const {lastUpdateTs, lastUpdateUserId, value: payloadValue} = value;
-            if (hasJsonStructure(payloadValue as string)) {
-              const data = {
+          for (const item of data) {
+            const {key, value, lastUpdateTs, lastUpdateUserId} = item;
+            if (hasJsonStructure(value as string)) {
+              const evtData = {
                 evt: key,
-                value: payloadValue,
+                value,
               };
               // TODOSUP: Add the data to queue, dont add same mulitple events, use set so as to not repeat events
               EventsQueue.enqueue({
-                data: data,
+                data: evtData,
                 uid: lastUpdateUserId,
                 ts: lastUpdateTs,
               });
@@ -534,6 +534,36 @@ const RtmConfigure = (props: any) => {
       });
     });
 
+    engine.current.addListener(
+      'ChannelAttributesUpdated',
+      (attributeList: RtmChannelAttribute[]) => {
+        try {
+          attributeList.map((attribute: RtmChannelAttribute) => {
+            const {key, value, lastUpdateTs, lastUpdateUserId} = attribute;
+            const timestamp = getMessageTime(lastUpdateTs);
+            const sender = Platform.OS
+              ? get32BitUid(lastUpdateUserId)
+              : parseInt(lastUpdateUserId);
+            eventDispatcher(
+              {
+                evt: key,
+                value,
+              },
+              sender,
+              timestamp,
+            );
+          });
+        } catch (error) {
+          logger.error(
+            LogSource.Events,
+            'CUSTOM_EVENTS',
+            'error while dispatching through eventDispatcher',
+            error,
+          );
+        }
+      },
+    );
+
     engine.current.on('messageReceived', (evt: any) => {
       logger.debug(LogSource.Events, 'CUSTOM_EVENTS', 'messageReceived', evt);
       const {peerId, ts, text} = evt;
@@ -620,36 +650,6 @@ const RtmConfigure = (props: any) => {
       }
     });
 
-    engine.current.on(
-      'channelAttributesUpdated',
-      (attributeList: RtmChannelAttribute[]) => {
-        console.log('channel attributes updated', attributeList);
-        try {
-          attributeList.map((attribute: RtmChannelAttribute) => {
-            const {key, value, lastUpdateTs, lastUpdateUserId} = attribute;
-            const timestamp = getMessageTime(lastUpdateTs);
-            const sender = Platform.OS
-              ? get32BitUid(lastUpdateUserId)
-              : parseInt(lastUpdateUserId);
-            eventDispatcher(
-              {
-                evt: key,
-                value,
-              },
-              sender,
-              timestamp,
-            );
-          });
-        } catch (error) {
-          logger.error(
-            LogSource.Events,
-            'CUSTOM_EVENTS',
-            'error while dispatching through eventDispatcher',
-            error,
-          );
-        }
-      },
-    );
     await doLoginAndSetupRTM();
   };
 

package/template/src/components/Share.tsx

@@ -131,9 +131,9 @@ export const CopyMeetingInfo = (props?: CopyMeetingInfoProps) => {
   };
   return (
     <>
-      {isSeparateHostLink ? (
+      {isHost ? (
         <>
-          <Text style={style.urlTitle}>{getAttendeeLabel()}</Text>
+          <Text style={style.urlTitle}>{getHostLabel()}</Text>
           <Spacer size={11} />
           <View style={style.container}>
             <View style={style.urlContainer}>
@@ -146,17 +146,17 @@ export const CopyMeetingInfo = (props?: CopyMeetingInfoProps) => {
                   //@ts-ignore
                   isWebCheck ? urlWeb : {opacity: 1},
                 ]}>
-                {getShareLink(SHARE_LINK_CONTENT_TYPE.ATTENDEE)}
+                {getShareLink(SHARE_LINK_CONTENT_TYPE.HOST)}
               </Text>
             </View>
-            {clipboardIconButton(SHARE_LINK_CONTENT_TYPE.ATTENDEE)}
+            {clipboardIconButton(SHARE_LINK_CONTENT_TYPE.HOST)}
           </View>
 
           {showSubLabel && (
             <>
               <Spacer size={14} />
               <Text style={style.helpText}>
-                {shareRoomAttendeeLinkSubTextLocal}
+                {shareRoomHostLinkSubTextLocal}
               </Text>
             </>
           )}
@@ -165,9 +165,9 @@ export const CopyMeetingInfo = (props?: CopyMeetingInfoProps) => {
       ) : (
         <></>
       )}
-      {isHost ? (
+      {isSeparateHostLink ? (
         <>
-          <Text style={style.urlTitle}>{getHostLabel()}</Text>
+          <Text style={style.urlTitle}>{getAttendeeLabel()}</Text>
           <Spacer size={11} />
           <View style={style.container}>
             <View style={style.urlContainer}>
@@ -180,17 +180,17 @@ export const CopyMeetingInfo = (props?: CopyMeetingInfoProps) => {
                   //@ts-ignore
                   isWebCheck ? urlWeb : {opacity: 1},
                 ]}>
-                {getShareLink(SHARE_LINK_CONTENT_TYPE.HOST)}
+                {getShareLink(SHARE_LINK_CONTENT_TYPE.ATTENDEE)}
               </Text>
             </View>
-            {clipboardIconButton(SHARE_LINK_CONTENT_TYPE.HOST)}
+            {clipboardIconButton(SHARE_LINK_CONTENT_TYPE.ATTENDEE)}
           </View>
 
           {showSubLabel && (
             <>
               <Spacer size={14} />
               <Text style={style.helpText}>
-                {shareRoomHostLinkSubTextLocal}
+                {shareRoomAttendeeLinkSubTextLocal}
               </Text>
             </>
           )}