agora-appbuilder-core 4.0.7 → 4.0.8-beta-01

package/template/src/auth/IDPAuth.tsx

@@ -11,6 +11,7 @@ import {
   authAuthorizingApplicationText,
   authErrorOnLoginToastHeading,
 } from '../language/default-labels/commonLabels';
+import {LogSource, logger} from '../logger/AppBuilderLogger';
 
 export const IDPAuth = () => {
   const toastheading = useString(authErrorOnLoginToastHeading)();
@@ -45,9 +46,14 @@ export const IDPAuth = () => {
             history.push('/');
           }
         })
-        .catch(() => {
+        .catch(error => {
           setIsAuthenticated(false);
-          console.log('debugging error on IDP token setting');
+          logger.error(
+            LogSource.Internals,
+            'AUTH',
+            'error on IDP token setting',
+            error,
+          );
         });
     } else {
       setIsAuthenticated(false);

package/template/src/auth/openIDPURL.native.tsx

@@ -2,6 +2,7 @@ import {Linking, Platform} from 'react-native';
 import InAppBrowser from 'react-native-inappbrowser-reborn';
 import {getOriginURL, getPlatformId, AUTH_ENDPOINT_URL} from './config';
 import RNExitApp from 'react-native-exit-app';
+import {LogSource, logger} from '../logger/AppBuilderLogger';
 
 export const getDeepLinkURI = (path = '') => {
   const scheme = $config.PRODUCT_ID?.toLowerCase();
@@ -20,7 +21,7 @@ export const getIDPAuthLoginURL = () => {
   )}&platform_id=${getPlatformId()}`;
 };
 
-export const enableIDPAuth = async (openDeepLink) => {
+export const enableIDPAuth = async openDeepLink => {
   try {
     const URL = getIDPAuthLoginURL();
     if (await InAppBrowser.isAvailable()) {
@@ -38,7 +39,12 @@ export const enableIDPAuth = async (openDeepLink) => {
       Linking.openURL(URL);
     }
   } catch (error) {
-    console.log(error.message);
+    logger.error(
+      LogSource.Internals,
+      'AUTH',
+      'failed to open IDP URL native',
+      error?.message,
+    );
   }
 };
 
@@ -46,6 +52,11 @@ export const exitApp = () => {
   try {
     RNExitApp.exitApp();
   } catch (error) {
-    console.log('Error on closing the app', error);
+    logger.error(
+      LogSource.Internals,
+      'AUTH',
+      'Error on closing the app',
+      error,
+    );
   }
 };

package/template/src/auth/useTokenAuth.tsx

@@ -4,6 +4,7 @@ import StorageContext from '../components/StorageContext';
 import SdkEvents from '../utils/SdkEvents';
 import isSDK from '../utils/isSDK';
 import {getPlatformId} from './config';
+import {LogSource, logger} from '../logger/AppBuilderLogger';
 const REFRESH_TOKEN_DURATION_IN_SEC = 59;
 
 const useTokenAuth = () => {
@@ -96,7 +97,12 @@ const useTokenAuth = () => {
         try {
           timerRef.current && clearInterval(timerRef.current);
         } catch (error) {
-          console.log('debugging error on clearing interval');
+          logger.debug(
+            LogSource.Internals,
+            'AUTH',
+            'error on clearing interval',
+            error,
+          );
         }
       } else {
         const decoded = jwt_decode(store.token);

package/template/src/components/Controls.tsx

@@ -100,6 +100,7 @@ import {
   toolbarItemVirtualBackgroundText,
   toolbarItemWhiteboardText,
 } from '../language/default-labels/videoCallScreenLabels';
+import {LogSource, logger} from '../logger/AppBuilderLogger';
 import {useModal} from '../utils/useModal';
 import ViewRecordingsModal from './recordings/ViewRecordingsModal';
 
@@ -300,7 +301,7 @@ const MoreButton = () => {
   } = useRoomInfo();
   const {setShowInvitePopup, setShowStopRecordingPopup, setShowLayoutOption} =
     useVideoCall();
-  const {isScreenshareActive, startScreenshare, stopScreenshare} =
+  const {isScreenshareActive, startUserScreenshare, stopUserScreenShare} =
     useScreenshare();
   const {isRecordingActive, startRecording, inProgress} = useRecording();
   const {setChatType} = useChatUIControls();
@@ -571,7 +572,9 @@ const MoreButton = () => {
           title: screenShareButton(isScreenshareActive),
           callback: () => {
             setActionMenuVisible(false);
-            isScreenshareActive ? stopScreenshare() : startScreenshare();
+            isScreenshareActive
+              ? stopUserScreenShare()
+              : startUserScreenshare();
           },
         });
       }
@@ -696,7 +699,7 @@ const MoreButton = () => {
         await restart(language);
       }
     } catch (error) {
-      console.log('eror in starting stt', error);
+      logger.error(LogSource.Internals, 'STT', 'error in starting stt', error);
     }
   };
 

package/template/src/components/DeviceConfigure.tsx

@@ -41,6 +41,7 @@ import {
   deviceDetectionToastHeading,
   deviceDetectionToastSubHeading,
 } from '../language/default-labels/videoCallScreenLabels';
+import {LogSource, logger} from '../logger/AppBuilderLogger';
 
 const log = (...args: any[]) => {
   console.log('[DeviceConfigure] ', ...args);
@@ -161,7 +162,13 @@ const DeviceConfigure: React.FC<Props> = (props: any) => {
   const refreshDeviceList = useCallback(async (noEmitLog?: boolean) => {
     let updatedDeviceList: MediaDeviceInfo[];
     await RtcEngineUnsafe.getDevices(function (devices: deviceInfo[]) {
-      !noEmitLog && log('Fetching all devices: ', devices);
+      !noEmitLog &&
+        logger.debug(
+          LogSource.Internals,
+          'DEVICE_CONFIGURE',
+          'Fetching all devices: ',
+          devices,
+        );
       /**
        * Some browsers list the same microphone twice with different Id's,
        * their group Id's match as they are the same physical device.
@@ -183,7 +190,13 @@ const DeviceConfigure: React.FC<Props> = (props: any) => {
             device.kind == 'audiooutput'),
       );
 
-      !noEmitLog && log('Setting unique devices', updatedDeviceList);
+      !noEmitLog &&
+        logger.debug(
+          LogSource.Internals,
+          'DEVICE_CONFIGURE',
+          'Setting unique devices',
+          updatedDeviceList,
+        );
       if (updatedDeviceList.length > 0) {
         setDeviceList(updatedDeviceList);
       }
@@ -211,12 +224,20 @@ const DeviceConfigure: React.FC<Props> = (props: any) => {
             RtcEngineUnsafe.audioDeviceId
           : //@ts-ignore
             RtcEngineUnsafe.videoDeviceId;
-      log(`Agora ${type} Engine is using`, currentDevice);
+      logger.debug(
+        LogSource.Internals,
+        'DEVICE_CONFIGURE',
+        `Agora ${type} Engine is using ${currentDevice}`,
+      );
     } else {
       currentDevice = localStream[type]
         ?.getMediaStreamTrack()
         .getSettings().deviceId;
-      log(`Agora ${type} Track is using`, currentDevice);
+      logger.debug(
+        LogSource.Internals,
+        'DEVICE_CONFIGURE',
+        `Agora ${type} Track is using ${currentDevice}`,
+      );
     }
     return currentDevice ?? '';
   };
@@ -228,7 +249,12 @@ const DeviceConfigure: React.FC<Props> = (props: any) => {
    * truth.
    */
   const syncSelectedDeviceUi = (kind?: deviceKind) => {
-    log('Refreshing', kind ?? 'all');
+    logger.debug(
+      LogSource.Internals,
+      'DEVICE_CONFIGURE',
+      'Refreshing',
+      kind ?? 'all',
+    );
     switch (kind) {
       case 'audioinput':
         let micId = getAgoraTrackDeviceId('audio');
@@ -463,7 +489,11 @@ const DeviceConfigure: React.FC<Props> = (props: any) => {
           },
         }[kind];
 
-        log(logTag, deviceLogTag, 'Device list populated but none selected');
+        logger.debug(
+          LogSource.Internals,
+          'DEVICE_CONFIGURE',
+          `${logTag} ${deviceLogTag} Device list populated but none selected`,
+        );
 
         if (sdkDevice?.deviceId && currentDevice) {
           if (checkDeviceExists(sdkDevice.deviceId, deviceList)) {
@@ -477,13 +507,16 @@ const DeviceConfigure: React.FC<Props> = (props: any) => {
           currentDevice !== storedDevice &&
           checkDeviceExists(storedDevice, deviceList)
         ) {
-          log(logTag, deviceLogTag, 'Setting to active id', storedDevice);
+          logger.debug(
+            LogSource.Internals,
+            'DEVICE_CONFIGURE',
+            `${logTag} ${deviceLogTag} Setting to active id ${storedDevice}`,
+          );
           setDevice(storedDevice).catch((e: Error) => {
-            log(
-              logTag,
-              deviceLogTag,
-              'ERROR:Setting to active id',
-              storedDevice,
+            logger.error(
+              LogSource.Internals,
+              'DEVICE_CONFIGURE',
+              `ERROR: ${logTag} ${deviceLogTag} Setting to active id ${storedDevice}`,
               e.message,
             );
           });
@@ -503,7 +536,11 @@ const DeviceConfigure: React.FC<Props> = (props: any) => {
       deviceList.length === 0 ||
       deviceList.find((device: MediaDeviceInfo) => device.label === '')
     ) {
-      log(logTag, 'Empty device list');
+      logger.debug(
+        LogSource.Internals,
+        'DEVICE_CONFIGURE',
+        `${logTag} Empty device list`,
+      );
       refreshDeviceList();
     }
   }, [rtc, store, deviceList]);
@@ -533,8 +570,12 @@ const DeviceConfigure: React.FC<Props> = (props: any) => {
       },
     }[changedDevice.kind];
 
-    log(logTag, changedDeviceData);
-
+    logger.debug(
+      LogSource.Internals,
+      'DEVICE_CONFIGURE',
+      `${logTag}`,
+      changedDeviceData,
+    );
     if (currentDevice === 'default') {
       // const previousDefaultDevice = previousDeviceList.find(
       //   (device) => device.deviceId === 'default',
@@ -658,7 +699,11 @@ const DeviceConfigure: React.FC<Props> = (props: any) => {
       },
     }[kind];
 
-    log(logtag, kind, 'setting to', deviceId);
+    logger.debug(
+      LogSource.Internals,
+      'DEVICE_CONFIGURE',
+      `${logtag} ${kind} setting to ${deviceId}`,
+    );
 
     const handleQueue = () => {
       if (queueRef.current.length > 0) {
@@ -673,7 +718,12 @@ const DeviceConfigure: React.FC<Props> = (props: any) => {
     return new Promise<void>((res, rej) => {
       if (mutexRef.current) {
         const e = new Error(logtag + ' Change already in progress');
-        log('DeviceConfigure:', logtag, 'Error setting', kind, e.message);
+        logger.debug(
+          LogSource.Internals,
+          'DEVICE_CONFIGURE',
+          `${logtag} Error setting ${kind}`,
+          e.message,
+        );
         rej(e);
         return;
       }

package/template/src/components/EventsConfigure.tsx

@@ -222,7 +222,7 @@ const EventsConfigure: React.FC<Props> = props => {
   }, [waitingRoomApprovalRequiredSecondaryBtnTextTT]);
 
   //@ts-ignore
-  const {isScreenshareActive, ScreenshareStoppedCallback, stopScreenshare} =
+  const {isScreenshareActive, ScreenshareStoppedCallback, stopUserScreenShare} =
     useScreenshare();
   const isLiveStream = $config.EVENT_MODE;
   const {dispatch} = useContext(DispatchContext);
@@ -293,7 +293,7 @@ const EventsConfigure: React.FC<Props> = props => {
         isScreenshareActiveRef.current.isScreenshareActive
       ) {
         //@ts-ignore
-        stopScreenshare(false, true);
+        stopUserScreenShare(false, true);
       } else {
         isWebInternal()
           ? await RtcEngineUnsafe.muteLocalVideoStream(true)

package/template/src/components/Precall.tsx

@@ -58,6 +58,7 @@ import {
   precallYouAreJoiningAsHeading,
   settingsPanelHeading,
 } from '../language/default-labels/precallScreenLabels';
+import {LogSource, logger} from '../logger/AppBuilderLogger';
 
 const JoinRoomInputView = ({isDesktop}) => {
   const {rtcProps} = useContext(PropsContext);
@@ -322,6 +323,20 @@ const Precall = () => {
     }
   });
 
+  useEffect(() => {
+    logger.log(
+      LogSource.Internals,
+      'PRECALL_SCREEN',
+      `User has landed on precall room with role as ${
+        rtcProps.role === ClientRoleType.ClientRoleAudience
+          ? 'AUDIENCE'
+          : 'HOST'
+      } and the mode of this call as ${
+        $config.EVENT_MODE ? 'LIVE' : 'COMMUNICATION'
+      }`,
+    );
+  }, []);
+
   useEffect(() => {
     if (isJoinDataFetched) {
       new Promise(res =>
@@ -330,6 +345,12 @@ const Precall = () => {
           res(devices);
         }),
       ).then((devices: MediaDeviceInfo[]) => {
+        logger.log(
+          LogSource.Internals,
+          'PRECALL_SCREEN',
+          'fetching available devices',
+          devices,
+        );
         SDKEvents.emit('ready-to-join', meetingTitle, devices);
       });
     }