agora-appbuilder-core 4.0.0-ms.5 → 4.0.0-spl.3

package/package.json

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

package/template/_package-lock.json

@@ -25,7 +25,6 @@
         "electron-updater": "4.3.9",
         "exponential-backoff": "3.1.0",
         "graphql": "15.5.0",
-        "jwt-decode": "3.1.2",
         "nanoevents": "7.0.1",
         "nanoid": "4.0.0",
         "nosleep.js": "0.12.0",
@@ -19420,11 +19419,6 @@
       "integrity": "sha512-qpcRocdkUmf+UTNBYx5w6dexX5J31AKK1OmPwH630a83DdVVUIngk55RSAiIGpQyoH0dlr872VHfPjnQnK1qDQ==",
       "dev": true
     },
-    "node_modules/jwt-decode": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/jwt-decode/-/jwt-decode-3.1.2.tgz",
-      "integrity": "sha512-UfpWE/VZn0iP50d8cz9NrZLM9lSWhcJ+0Gt/nm4by88UL+J1SiKN8/5dkjMmbEzwL2CAe+67GsegCbIKtbp75A=="
-    },
     "node_modules/keyv": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/keyv/-/keyv-3.1.0.tgz",
@@ -44622,11 +44616,6 @@
       "integrity": "sha512-qpcRocdkUmf+UTNBYx5w6dexX5J31AKK1OmPwH630a83DdVVUIngk55RSAiIGpQyoH0dlr872VHfPjnQnK1qDQ==",
       "dev": true
     },
-    "jwt-decode": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/jwt-decode/-/jwt-decode-3.1.2.tgz",
-      "integrity": "sha512-UfpWE/VZn0iP50d8cz9NrZLM9lSWhcJ+0Gt/nm4by88UL+J1SiKN8/5dkjMmbEzwL2CAe+67GsegCbIKtbp75A=="
-    },
     "keyv": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/keyv/-/keyv-3.1.0.tgz",

package/template/bridge/rtc/webNg/RtcEngine.ts

@@ -730,11 +730,11 @@ export default class RtcEngine {
 
   async changeSpeaker(speakerId, callback, error) {
     try {
-      this.speakerDeviceId = speakerId;
       // setting sepeaker for all remote stream (previously joined users)
       this.remoteStreams?.forEach((stream, uid, map) => {
         stream?.audio?.setPlaybackDevice(speakerId);
       });
+      this.speakerDeviceId = speakerId;
       callback(speakerId);
     } catch (e) {
       error(e);

package/template/global.d.ts

@@ -98,9 +98,6 @@ interface ConfigInterface {
   ICON_BG_COLOR: string;
   TOOLBAR_COLOR: string;
   ACTIVE_SPEAKER: boolean;
-  ENABLE_TOKEN_AUTH: boolean;
-  ENABLE_IDP_AUTH: boolean;
-  PROJECT_ID: string;
 }
 declare var $config: ConfigInterface;
 declare module 'customization' {

package/template/package.json

@@ -65,7 +65,6 @@
     "electron-updater": "4.3.9",
     "exponential-backoff": "3.1.0",
     "graphql": "15.5.0",
-    "jwt-decode": "3.1.2",
     "nanoevents": "7.0.1",
     "nanoid": "4.0.0",
     "nosleep.js": "0.12.0",

package/template/src/App.tsx

@@ -11,7 +11,18 @@
 */
 import React, {useState, useContext} from 'react';
 import {Platform} from 'react-native';
+import Join from './pages/Join';
+import VideoCall from './pages/VideoCall';
+import Create from './pages/Create';
+import {Route, Switch, Redirect} from './components/Router';
+import PrivateRoute from './components/PrivateRoute';
+import OAuth from './components/OAuth';
+import StoreToken from './components/StoreToken';
+import {shouldAuthenticate} from './utils/common';
 import KeyboardManager from 'react-native-keyboard-manager';
+// commented for v1 release
+//import {CustomRoutesInterface, CUSTOM_ROUTES_PREFIX} from 'customization-api';
+//import {useCustomization} from 'customization-implementation';
 import AppWrapper from './AppWrapper';
 import {
   MeetingInfoContextInterface,
@@ -20,9 +31,9 @@ import {
 } from './components/meeting-info/useMeetingInfo';
 import {SetMeetingInfoProvider} from './components/meeting-info/useSetMeetingInfo';
 import {ShareLinkProvider} from './components/useShareLink';
-import AppRoutes from './AppRoutes';
+import Endcall from './pages/Endcall';
 
-// hook can't be used in the outside react function calls. so directly checking the platform.
+//hook can't be used in the outside react function calls. so directly checking the platform.
 if (Platform.OS === 'ios') {
   KeyboardManager.setEnable(true);
   KeyboardManager.setEnableAutoToolbar(false);
@@ -45,6 +56,35 @@ declare module 'agora-rn-uikit' {
 }
 
 const App: React.FC = () => {
+  //commented for v1 release
+  //const CustomRoutes = useCustomization((data) => data?.customRoutes);
+  // const RenderCustomRoutes = () => {
+  //   try {
+  //     return (
+  //       CustomRoutes &&
+  //       Array.isArray(CustomRoutes) &&
+  //       CustomRoutes.length &&
+  //       CustomRoutes?.map((item: CustomRoutesInterface, i: number) => {
+  //         let RouteComponent = item?.isPrivateRoute ? PrivateRoute : Route;
+  //         return (
+  //           <RouteComponent
+  //             path={CUSTOM_ROUTES_PREFIX + item.path}
+  //             exact={item.exact}
+  //             key={i}
+  //             failureRedirectTo={
+  //               item.failureRedirectTo ? item.failureRedirectTo : '/'
+  //             }
+  //             {...item.routeProps}>
+  //             <item.component {...item.componentProps} />
+  //           </RouteComponent>
+  //         );
+  //       })
+  //     );
+  //   } catch (error) {
+  //     console.error('Error on rendering the custom routes');
+  //     return null;
+  //   }
+  // };
   const [meetingInfo, setMeetingInfo] = useState<MeetingInfoContextInterface>(
     MeetingInfoDefaultValue,
   );
@@ -54,7 +94,40 @@ const App: React.FC = () => {
       <SetMeetingInfoProvider value={{setMeetingInfo}}>
         <MeetingInfoProvider value={{...meetingInfo}}>
           <ShareLinkProvider>
-            <AppRoutes />
+            <Switch>
+              {/* commented for v1 release */}
+              {/* {RenderCustomRoutes()} */}
+              <Route exact path={'/'}>
+                <Redirect to={'/create'} />
+              </Route>
+              <Route exact path={'/authenticate'}>
+                {shouldAuthenticate ? <OAuth /> : <Redirect to={'/'} />}
+              </Route>
+              <Route path={'/auth-token/:token'}>
+                <StoreToken />
+              </Route>
+              <Route exact path={'/join'}>
+                <Join />
+              </Route>
+              {/* Will be used in the future
+              <Route exact path={'/leave'}>
+                <Endcall />
+              </Route> */}
+              {shouldAuthenticate ? (
+                <PrivateRoute
+                  path={'/create'}
+                  failureRedirectTo={'/authenticate'}>
+                  <Create />
+                </PrivateRoute>
+              ) : (
+                <Route path={'/create'}>
+                  <Create />
+                </Route>
+              )}
+              <Route path={'/:phrase'}>
+                <VideoCall />
+              </Route>
+            </Switch>
           </ShareLinkProvider>
         </MeetingInfoProvider>
       </SetMeetingInfoProvider>

package/template/src/AppWrapper.tsx

@@ -29,7 +29,6 @@ import Error from './components/common/Error';
 import {ErrorProvider} from './components/common';
 import {useCustomization} from 'customization-implementation';
 import {LanguageProvider} from './language/useLanguage';
-import {AuthProvider} from './auth/AuthProvider';
 import {PropsConsumer} from 'agora-rn-uikit';
 import ToastComponent from './components/ToastComponent';
 import {ToastContext, ToastProvider} from './components/useToast';
@@ -100,21 +99,19 @@ const AppWrapper = (props: AppWrapperProps) => {
                       ? `/${SdkJoinState.phrase}`
                       : '',
                   ]}>
-                  <AuthProvider>
-                    <SessionProvider>
-                      <ColorConfigure>
-                        <DimensionProvider>
-                          <LanguageProvider>
-                            <ErrorProvider>
-                              <Error />
-                              <Navigation />
-                              {props.children}
-                            </ErrorProvider>
-                          </LanguageProvider>
-                        </DimensionProvider>
-                      </ColorConfigure>
-                    </SessionProvider>
-                  </AuthProvider>
+                  <SessionProvider>
+                    <ColorConfigure>
+                      <DimensionProvider>
+                        <LanguageProvider>
+                          <ErrorProvider>
+                            <Error />
+                            <Navigation />
+                            {props.children}
+                          </ErrorProvider>
+                        </LanguageProvider>
+                      </DimensionProvider>
+                    </ColorConfigure>
+                  </SessionProvider>
                 </Router>
               </GraphQLProvider>
             </StorageProvider>

package/template/src/SDKAppWrapper.tsx

@@ -20,14 +20,18 @@ import {Unsubscribe} from 'nanoevents';
 //   p: Parameters<T>[0],
 // ) => ReturnType<T>;
 
+type deviceId = MediaDeviceInfo['deviceId'];
+
 export interface SdkMethodEvents {
   customize: (customization: CustomizationApiInterface) => void;
   join(
     roomid: string | Partial<MeetingInfoContextInterface['data']>,
     skipPrecall?: boolean,
   ): MeetingInfoContextInterface['data'];
-  'login':(token:string) => Promise<void>
-  'logout':() => Promise<void>
+  // mediaDevice: (deviceId: string, kind: MediaDeviceInfo['kind']) => void;
+  microphoneDevice: (deviceId: deviceId) => void;
+  speakerDevice: (deviceId: deviceId) => void;
+  cameraDevice: (deviceId: deviceId) => void;
 }
 
 // interface AppBuilderSdkApiInterface {
@@ -44,12 +48,6 @@ export interface SdkMethodEvents {
 // }
 
 export const AppBuilderSdkApi = {
-  login: async (token: string) => {
-    return await SDKMethodEventsManager.emit('login', token);
-  },
-  logout: async () => {
-    return await SDKMethodEventsManager.emit('logout');
-  },
   customize: async (customization: CustomizationApiInterface) => {
     return await SDKMethodEventsManager.emit('customize', customization);
   },
@@ -68,6 +66,22 @@ export const AppBuilderSdkApi = {
     const t = await SDKMethodEventsManager.emit('join', roomDetails);
     return t as unknown as [MeetingInfoContextInterface['data'], () => {}];
   },
+  // setMediaDevice: async (device: MediaDeviceInfo) => {
+  //   return await SDKMethodEventsManager.emit(
+  //     'mediaDevice',
+  //     device.deviceId,
+  //     device.kind,
+  //   );
+  // },
+  setMicrophone: async (deviceId: MediaDeviceInfo['deviceId']) => {
+    return await SDKMethodEventsManager.emit('microphoneDevice', deviceId);
+  },
+  setSpeaker: async (deviceId: MediaDeviceInfo['deviceId']) => {
+    return await SDKMethodEventsManager.emit('speakerDevice', deviceId);
+  },
+  setCamera: async (deviceId: MediaDeviceInfo['deviceId']) => {
+    return await SDKMethodEventsManager.emit('cameraDevice', deviceId);
+  },
   createCustomization: customize,
   on: <T extends keyof userEventsMapInterface>(
     userEventName: T,