agora-appbuilder-core 4.0.0-spl.10 → 4.0.0-spl.12

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agora-appbuilder-core",
-  "version": "4.0.0-spl.10",
+  "version": "4.0.0-spl.12",
   "description": "React Native template for RTE app builder",
   "main": "index.js",
   "files": [

package/template/_package-lock.json

@@ -18,12 +18,13 @@
         "@sentry/tracing": "6.2.1",
         "@supersami/rn-foreground-service": "^1.1.1",
         "agora-react-native-rtm": "1.5.1",
-        "agora-rtc-sdk-ng": "4.14.0",
-        "agora-rtm-sdk": "1.4.3-203",
+        "agora-rtc-sdk-ng": "4.16.1",
+        "agora-rtm-sdk": "1.5.1",
         "electron-log": "4.3.5",
         "electron-squirrel-startup": "1.0.0",
         "electron-updater": "4.3.9",
         "exponential-backoff": "3.1.0",
+        "fetch-retry": "^5.0.6",
         "graphql": "15.5.0",
         "nanoevents": "7.0.1",
         "nanoid": "4.0.0",
@@ -6967,11 +6968,11 @@
       }
     },
     "node_modules/agora-rtc-sdk-ng": {
-      "version": "4.14.0",
-      "resolved": "https://registry.npmjs.org/agora-rtc-sdk-ng/-/agora-rtc-sdk-ng-4.14.0.tgz",
-      "integrity": "sha512-87WZEz+Lkhs39/K9iqBeQYUl6HIWoiyicez/DxspQ37N9NRWRRmoLVS1yUfG6FPWWxZiY+VEJbzPLPhuAihrpQ==",
+      "version": "4.16.1",
+      "resolved": "https://registry.npmjs.org/agora-rtc-sdk-ng/-/agora-rtc-sdk-ng-4.16.1.tgz",
+      "integrity": "sha512-9ccs22X/BEAGe5tIGx2OqWkGpdvuGoB7xq72BouuR5HhP0WVBIBimixOvXXftlY9SwDWsBfKhBV23EtA7jtrTA==",
       "dependencies": {
-        "agora-rte-extension": "^1.0.22"
+        "agora-rte-extension": "^1.2.3"
       }
     },
     "node_modules/agora-rte-extension": {
@@ -6980,9 +6981,9 @@
       "integrity": "sha512-k3yNrYVyzJRoQJjaJUktKUI1XRtf8J1XsW8OzYKFqGlS8WQRMsES1+Phj2rfuEriiLObfuyuCimG6KHQCt5tiw=="
     },
     "node_modules/agora-rtm-sdk": {
-      "version": "1.4.3-203",
-      "resolved": "https://registry.npmjs.org/agora-rtm-sdk/-/agora-rtm-sdk-1.4.3-203.tgz",
-      "integrity": "sha512-uQh9zqRtELAblxt7nXSv20pH7oQfTDj7gC2NI2cDIe9dcKBlQpEVf2wBM68so6sZ767ZLcW+z/FCd5QVCt9RvA=="
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/agora-rtm-sdk/-/agora-rtm-sdk-1.5.1.tgz",
+      "integrity": "sha512-4zMZVijEOTimIaY4VUS6kJxg7t+nTV3Frtt01Ffs6dvkOrPmpeuCu/1MX88QgAOE04IBiLo0l89ysc+woVn2FA=="
     },
     "node_modules/ajv": {
       "version": "6.12.6",
@@ -12070,6 +12071,15 @@
         "node": ">=8"
       }
     },
+    "node_modules/eslint/node_modules/type-fest": {
+      "version": "0.8.1",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
+      "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/eslint/node_modules/which": {
       "version": "1.3.1",
       "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
@@ -12870,6 +12880,11 @@
         "pend": "~1.2.0"
       }
     },
+    "node_modules/fetch-retry": {
+      "version": "5.0.6",
+      "resolved": "https://registry.npmjs.org/fetch-retry/-/fetch-retry-5.0.6.tgz",
+      "integrity": "sha512-3yurQZ2hD9VISAhJJP9bpYFNQrHHBXE2JxxjY5aLEcDi46RmAzJE2OC9FAde0yis5ElW0jTTzs0zfg/Cca4XqQ=="
+    },
     "node_modules/figures": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/figures/-/figures-2.0.0.tgz",
@@ -24374,6 +24389,15 @@
         "node": ">=8"
       }
     },
+    "node_modules/read-pkg-up/node_modules/type-fest": {
+      "version": "0.8.1",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
+      "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/read-pkg/node_modules/parse-json": {
       "version": "5.2.0",
       "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz",
@@ -27867,12 +27891,17 @@
       }
     },
     "node_modules/type-fest": {
-      "version": "0.8.1",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
-      "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==",
+      "version": "2.19.0",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-2.19.0.tgz",
+      "integrity": "sha512-RAH822pAdBgcNMAfWnCBU3CFZcfZ/i1eZjwFU/dsLKumyuuP3niueg2UAukXYF0E2AAoc82ZSSf9J0WQBinzHA==",
       "dev": true,
+      "optional": true,
+      "peer": true,
       "engines": {
-        "node": ">=8"
+        "node": ">=12.20"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/type-is": {
@@ -34838,11 +34867,11 @@
       "requires": {}
     },
     "agora-rtc-sdk-ng": {
-      "version": "4.14.0",
-      "resolved": "https://registry.npmjs.org/agora-rtc-sdk-ng/-/agora-rtc-sdk-ng-4.14.0.tgz",
-      "integrity": "sha512-87WZEz+Lkhs39/K9iqBeQYUl6HIWoiyicez/DxspQ37N9NRWRRmoLVS1yUfG6FPWWxZiY+VEJbzPLPhuAihrpQ==",
+      "version": "4.16.1",
+      "resolved": "https://registry.npmjs.org/agora-rtc-sdk-ng/-/agora-rtc-sdk-ng-4.16.1.tgz",
+      "integrity": "sha512-9ccs22X/BEAGe5tIGx2OqWkGpdvuGoB7xq72BouuR5HhP0WVBIBimixOvXXftlY9SwDWsBfKhBV23EtA7jtrTA==",
       "requires": {
-        "agora-rte-extension": "^1.0.22"
+        "agora-rte-extension": "^1.2.3"
       }
     },
     "agora-rte-extension": {
@@ -34851,9 +34880,9 @@
       "integrity": "sha512-k3yNrYVyzJRoQJjaJUktKUI1XRtf8J1XsW8OzYKFqGlS8WQRMsES1+Phj2rfuEriiLObfuyuCimG6KHQCt5tiw=="
     },
     "agora-rtm-sdk": {
-      "version": "1.4.3-203",
-      "resolved": "https://registry.npmjs.org/agora-rtm-sdk/-/agora-rtm-sdk-1.4.3-203.tgz",
-      "integrity": "sha512-uQh9zqRtELAblxt7nXSv20pH7oQfTDj7gC2NI2cDIe9dcKBlQpEVf2wBM68so6sZ767ZLcW+z/FCd5QVCt9RvA=="
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/agora-rtm-sdk/-/agora-rtm-sdk-1.5.1.tgz",
+      "integrity": "sha512-4zMZVijEOTimIaY4VUS6kJxg7t+nTV3Frtt01Ffs6dvkOrPmpeuCu/1MX88QgAOE04IBiLo0l89ysc+woVn2FA=="
     },
     "ajv": {
       "version": "6.12.6",
@@ -38689,6 +38718,12 @@
             "has-flag": "^4.0.0"
           }
         },
+        "type-fest": {
+          "version": "0.8.1",
+          "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
+          "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==",
+          "dev": true
+        },
         "which": {
           "version": "1.3.1",
           "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
@@ -39478,6 +39513,11 @@
         "pend": "~1.2.0"
       }
     },
+    "fetch-retry": {
+      "version": "5.0.6",
+      "resolved": "https://registry.npmjs.org/fetch-retry/-/fetch-retry-5.0.6.tgz",
+      "integrity": "sha512-3yurQZ2hD9VISAhJJP9bpYFNQrHHBXE2JxxjY5aLEcDi46RmAzJE2OC9FAde0yis5ElW0jTTzs0zfg/Cca4XqQ=="
+    },
     "figures": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/figures/-/figures-2.0.0.tgz",
@@ -48577,6 +48617,12 @@
           "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
           "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
           "dev": true
+        },
+        "type-fest": {
+          "version": "0.8.1",
+          "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
+          "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==",
+          "dev": true
         }
       }
     },
@@ -51300,10 +51346,12 @@
       "dev": true
     },
     "type-fest": {
-      "version": "0.8.1",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
-      "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==",
-      "dev": true
+      "version": "2.19.0",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-2.19.0.tgz",
+      "integrity": "sha512-RAH822pAdBgcNMAfWnCBU3CFZcfZ/i1eZjwFU/dsLKumyuuP3niueg2UAukXYF0E2AAoc82ZSSf9J0WQBinzHA==",
+      "dev": true,
+      "optional": true,
+      "peer": true
     },
     "type-is": {
       "version": "1.6.18",

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

@@ -20,8 +20,7 @@ import {RtmClientEvents} from 'agora-react-native-rtm/lib/typescript/src/RtmEngi
 import AgoraRTM, {VERSION} from 'agora-rtm-sdk';
 // export {RtmAttribute}
 //
-interface RtmAttributePlaceholder {
-};
+interface RtmAttributePlaceholder {}
 export {RtmAttributePlaceholder as RtmAttribute};
 
 type callbackType = (args?: any) => void;
@@ -99,6 +98,8 @@ export default class RtmEngine {
     this.appId = APP_ID;
     this.client = AgoraRTM.createInstance(this.appId);
 
+    window.rtmClient = this.client;
+
     this.client.on('ConnectionStateChanged', (state, reason) => {
       this.clientEventsMap.get('connectionStateChanged')({state, reason});
     });

package/template/package.json

@@ -58,12 +58,13 @@
     "@sentry/tracing": "6.2.1",
     "@supersami/rn-foreground-service": "^1.1.1",
     "agora-react-native-rtm": "1.5.1",
-    "agora-rtc-sdk-ng": "4.14.0",
-    "agora-rtm-sdk": "1.4.3-203",
+    "agora-rtc-sdk-ng": "4.16.1",
+    "agora-rtm-sdk": "1.5.1",
     "electron-log": "4.3.5",
     "electron-squirrel-startup": "1.0.0",
     "electron-updater": "4.3.9",
     "exponential-backoff": "3.1.0",
+    "fetch-retry": "^5.0.6",
     "graphql": "15.5.0",
     "nanoevents": "7.0.1",
     "nanoid": "4.0.0",

package/template/src/AppWrapper.tsx

@@ -34,6 +34,9 @@ import ToastComponent from './components/ToastComponent';
 import {ToastContext, ToastProvider} from './components/useToast';
 import {SdkApiContext} from './components/SdkApiContext';
 import isSDK from './utils/isSDK';
+import {setupLogger} from './utils/axiomLogger';
+
+setupLogger();
 
 interface AppWrapperProps {
   children: React.ReactNode;

package/template/src/components/DeviceConfigure.tsx

@@ -136,10 +136,10 @@ const DeviceConfigure: React.FC<Props> = (props: any) => {
   const {RtcEngine} = rtc as unknown as {RtcEngine: WebRtcEngineInstance};
   const {localStream} = RtcEngine;
 
-  const refreshDeviceList = useCallback(async () => {
+  const refreshDeviceList = useCallback(async (noEmitLog?: boolean) => {
     let updatedDeviceList: MediaDeviceInfo[];
     await RtcEngine.getDevices(function (devices: deviceInfo[]) {
-      log('Fetching all devices: ', devices);
+      !noEmitLog && log('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.
@@ -161,7 +161,7 @@ const DeviceConfigure: React.FC<Props> = (props: any) => {
             device.kind == 'audiooutput'),
       );
 
-      log('Setting unique devices', updatedDeviceList);
+      !noEmitLog && log('Setting unique devices', updatedDeviceList);
       if (updatedDeviceList.length > 0) {
         setDeviceList(updatedDeviceList);
       }
@@ -327,8 +327,11 @@ const DeviceConfigure: React.FC<Props> = (props: any) => {
   };
 
   useEffect(() => {
+    // Notify updated state every 20s
+    let count = 0;
     const interval = setInterval(() => {
-      navigator.mediaDevices.enumerateDevices();
+      count = count + 1;
+      refreshDeviceList(count % 10 !== 0);
     }, 2000);
     return () => {
       clearInterval(interval);
@@ -437,7 +440,15 @@ const DeviceConfigure: React.FC<Props> = (props: any) => {
           checkDeviceExists(storedDevice, deviceList)
         ) {
           log(logTag, deviceLogTag, 'Setting to active id', storedDevice);
-          setDevice(storedDevice);
+          setDevice(storedDevice).catch((e:Error) => {
+            log(
+              logTag,
+              deviceLogTag,
+              'ERROR:Setting to active id',
+              storedDevice,
+              e.message,
+            );
+          });
         } else {
           eventEmitter(currentDevice);
           setDeviceUi(currentDevice);
@@ -542,7 +553,6 @@ const DeviceConfigure: React.FC<Props> = (props: any) => {
   // Port this to useEffectEvent(https://beta.reactjs.org/reference/react/useEffectEvent) when
   // released
   useEffect(() => {
-    log('previous devicelist updated', deviceList);
     AgoraRTC.onMicrophoneChanged = commonOnChangedEvent;
     return () => {
       AgoraRTC.onMicrophoneChanged = null;
@@ -622,7 +632,7 @@ 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);
+        log('DeviceConfigure:', logtag, 'Error setting', kind, e.message);
         rej(e);
         return;
       }

package/template/src/components/RTMConfigure.tsx

@@ -33,6 +33,7 @@ import RTMEngine from '../rtm/RTMEngine';
 import {filterObject} from '../utils';
 import SDKEvents from '../utils/SdkEvents';
 import isSDK from '../utils/isSDK';
+import {useAsyncEffect} from '../utils/useAsyncEffect';
 
 export enum UserType {
   ScreenShare = 'screenshare',
@@ -120,7 +121,7 @@ const RtmConfigure = (props: any) => {
       });
       RTMEngine.getInstance().setLocalUID(localUid.toString());
       timerValueRef.current = 5;
-      setAttribute();
+      await setAttribute();
     } catch (error) {
       setTimeout(async () => {
         timerValueRef.current = timerValueRef.current + timerValueRef.current;
@@ -392,7 +393,7 @@ const RtmConfigure = (props: any) => {
         }
       }
     });
-    doLoginAndSetupRTM();
+    await doLoginAndSetupRTM();
   };
 
   const runQueuedEvents = async () => {
@@ -443,23 +444,24 @@ const RtmConfigure = (props: any) => {
   };
 
   const end = async () => {
-    callActive
-      ? (RTMEngine.getInstance().destroy(),
-        EventUtils.clear(),
-        setHasUserJoinedRTM(false),
-        // setLogin(false),
-        console.log('RTM cleanup done'))
-      : {};
+    if (!callActive) {
+      return;
+    }
+    await RTMEngine.getInstance().destroy();
+    setHasUserJoinedRTM(false);
+    // setLogin(false),
+    console.log('RTM cleanup done');
   };
 
-  useEffect(() => {
-    if (!mountState.current) {
-      mountState.current = true;
-      return () => {};
+  useAsyncEffect(async () => {
+    if (!callActive) {
+      console.log('waiting to init RTM');
+      setLogin(true);
+    } else {
+      await init();
     }
-    callActive ? init() : (console.log('waiting to init RTM'), setLogin(true));
-    return () => {
-      end();
+    return async () => {
+      await end();
     };
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [rtcProps.channel, rtcProps.appId, callActive]);