agora-appbuilder-core 4.0.22-beta-7 → 4.0.22-beta-9

package/package.json

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

package/template/src/components/whiteboard/WhiteboardConfigure.tsx

@@ -331,9 +331,7 @@ const WhiteboardConfigure: React.FC<WhiteboardPropsInterface> = props => {
     try {
       const index = randomIntFromInterval(0, 9);
       setWhiteboardRoomState(RoomPhase.Connecting);
-      logger.log(LogSource.Internals, 'WHITEBOARD', 'Trying to join room', {
-        data: {},
-      });
+      logger.log(LogSource.Internals, 'WHITEBOARD', 'Trying to join room');
       whiteWebSdkClient.current
         .joinRoom({
           cursorAdapter: cursorAdapter,
@@ -349,14 +347,7 @@ const WhiteboardConfigure: React.FC<WhiteboardPropsInterface> = props => {
           },
         })
         .then(room => {
-          logger.log(
-            LogSource.Internals,
-            'WHITEBOARD',
-            'Join room successful',
-            {
-              data: {},
-            },
-          );
+          logger.log(LogSource.Internals, 'WHITEBOARD', 'Join room successful');
           whiteboardRoom.current = room;
           cursorAdapter.setRoom(room);
           whiteboardRoom.current?.setViewMode(ViewMode.Freedom);

package/template/src/logger/AppBuilderLogger.tsx

@@ -136,9 +136,13 @@ export default class AppBuilderLogger implements Logger {
       ? pkg.dependencies['agora-rtc-sdk-ng']
       : pkg.dependencies['react-native-agora'];
     let roomInfo = {
-      meetingTitle: null,
-      phrase: null,
-      roomId: null,
+      meeting_title: '',
+      phrase: '',
+      channel_id: '',
+      room_id: {
+        host_id: '',
+        attendee_id: '',
+      },
     };
     const logger =
       (status: StatusType) =>
@@ -151,7 +155,6 @@ export default class AppBuilderLogger implements Logger {
         if (!$config.LOG_ENABLED) {
           return;
         }
-
         if (type === 'SET_MEETING_DETAILS') {
           roomInfo = {...data[0]};
         }
@@ -170,7 +173,13 @@ export default class AppBuilderLogger implements Logger {
               rtm: rtmPkg,
               rtc: rtcPkg,
             },
-            ...roomInfo,
+            meeting_title: roomInfo?.meeting_title,
+            phrase: roomInfo?.phrase,
+            channel_id: roomInfo?.channel_id,
+            room_id: {
+              host_id: roomInfo?.room_id?.host_id,
+              attendee_id: roomInfo?.room_id?.attendee_id,
+            },
           },
         };
 

package/template/src/logger/transports/customer-transport.ts

@@ -3,29 +3,39 @@ import {isWeb} from '../../utils/common';
 
 /* https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Errors/Cyclic_object_value#examples */
 export function getCircularReplacer() {
-  const ancestors = [];
-  return function (key, value) {
-    if (typeof value !== 'object' || value === null) {
-      return value;
-    }
-    // `this` is the object that value is contained in,
-    // i.e., its direct parent.
-    while (ancestors.length > 0 && ancestors[ancestors.length - 1] !== this) {
-      ancestors.pop();
-    }
-    if (ancestors.includes(value)) {
-      return '[Circular]';
+  const seen = new WeakSet();
+  return (key, value) => {
+    if (typeof value === 'object' && value !== null) {
+      if (seen.has(value)) {
+        return;
+      }
+      seen.add(value);
     }
-    ancestors.push(value);
     return value;
   };
+  // const ancestors = [];
+  // return function (key, value) {
+  //   if (typeof value !== 'object' || value === null) {
+  //     return value;
+  //   }
+  //   // `this` is the object that value is contained in,
+  //   // i.e., its direct parent.
+  //   while (ancestors.length > 0 && ancestors[ancestors.length - 1] !== this) {
+  //     ancestors.pop();
+  //   }
+  //   if (ancestors.includes(value)) {
+  //     return '[Circular]';
+  //   }
+  //   ancestors.push(value);
+  //   return value;
+  // };
 }
 const getSafeBody = (p: any[]) => {
   try {
     return JSON.stringify(p, getCircularReplacer());
   } catch (error) {
-    console.error('there was an error converting this object');
-    return '';
+    console.error('there was an error converting this object', p);
+    return [' object convertion error'];
   }
 };
 
@@ -43,19 +53,23 @@ const fetchRetry = createRetryFetch(fetch, {
 });
 
 const sendLogs = (p: any[]) => {
-  fetchRetry(
-    'https://axiom-queue.appbuilder.workers.dev?dataset=app-builder-core-frontend-customer',
-    // "&strategy=queue", // to send logs to a specific dataset [default: queue]
-    {
-      method: 'POST',
-      headers: new Headers({
-        'Content-Type': 'application/json',
-      }),
-      body: getSafeBody(p),
-    },
-  ).catch(err => {
-    console.log('error ocuured while replacing circular reference', p, err);
-  });
+  if (p && p?.length) {
+    fetchRetry(
+      'https://axiom-queue.appbuilder.workers.dev?dataset=app-builder-core-frontend-customer',
+      // "&strategy=queue", // to send logs to a specific dataset [default: queue]
+      {
+        method: 'POST',
+        headers: new Headers({
+          'Content-Type': 'application/json',
+        }),
+        body: getSafeBody(p),
+      },
+    ).catch(err => {
+      console.log('error ocuured while replacing circular reference', p, err);
+    });
+  } else {
+    console.log('queue is empty, no logs available to send');
+  }
 };
 
 export const createAxiomLogger = () => {

package/template/src/pages/VideoCall.tsx

@@ -220,9 +220,13 @@ const VideoCall: React.FC = () => {
       return;
     }
     logger.log(LogSource.Internals, 'SET_MEETING_DETAILS', 'Room details', {
-      meetingTitle: data?.meetingTitle || '',
+      meeting_title: data?.meetingTitle || '',
       phrase: phrase,
-      roomId: data?.roomId,
+      channel_id: data?.channel,
+      room_id: {
+        host_id: data?.roomId?.host || '',
+        attendee_id: data?.roomId?.attendee || '',
+      },
     });
   }, [isJoinDataFetched, data, phrase]);
 

package/template/src/utils/axiomLogger.ts

@@ -36,17 +36,21 @@ const fetchRetry = createRetryFetch(fetch, {
 });
 
 const sendLogs = (p: any[]) => {
-  fetchRetry(
-    'https://axiom-queue.appbuilder.workers.dev?dataset=app-builder-core',
-    // "&strategy=queue", // to send logs to a specific dataset [default: queue]
-    {
-      method: 'POST',
-      headers: new Headers({
-        'Content-Type': 'application/json',
-      }),
-      body: JSON.stringify(p, getCircularReplacer()),
-    },
-  );
+  if (p && p?.length) {
+    fetchRetry(
+      'https://axiom-queue.appbuilder.workers.dev?dataset=app-builder-core',
+      // "&strategy=queue", // to send logs to a specific dataset [default: queue]
+      {
+        method: 'POST',
+        headers: new Headers({
+          'Content-Type': 'application/json',
+        }),
+        body: JSON.stringify(p, getCircularReplacer()),
+      },
+    );
+  } else {
+    console.log('queue is empty, no logs available to send');
+  }
 };
 
 export const createAxiomLogger = () => {