agora-appbuilder-core 4.1.9 → 4.1.11-beta.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agora-appbuilder-core",
-  "version": "4.1.9",
+  "version": "4.1.11-beta.2",
   "description": "React Native template for RTE app builder",
   "main": "index.js",
   "files": [
@@ -9,7 +9,7 @@
   ],
   "scripts": {
     "vercel-build": "npm run dev-setup && cd template && npm run web:build && cd .. && npm run copy-vercel",
-    "uikit": "rm -rf template/agora-rn-uikit && git clone https://github.com/AgoraIO-Community/appbuilder-ui-kit.git template/agora-rn-uikit && cd template/agora-rn-uikit && git checkout appbuilder-uikit-3.1.8",
+    "uikit": "rm -rf template/agora-rn-uikit && git clone https://github.com/AgoraIO-Community/appbuilder-ui-kit.git template/agora-rn-uikit && cd template/agora-rn-uikit && git checkout appbuilder-uikit-3.1.11",
     "deps": "cd template && npm i --force",
     "dev-setup": "npm run uikit && npm run deps && node devSetup.js",
     "web-build": "cd template && npm run web:build && cd .. && npm run copy-vercel",

package/template/agora-rn-uikit/src/Contexts/PropsContext.tsx

@@ -142,7 +142,7 @@ export interface RtcPropsInterface {
   callActive?: boolean;
   encryption?: {
     key: string;
-    mode: EncryptionMode.Aes128Xts | EncryptionMode.Aes256Gcm2;
+    mode: EncryptionMode.Aes128Gcm2 | EncryptionMode.Aes256Gcm2;
     salt: number[];
   };
   // commented for v1 release
@@ -185,10 +185,8 @@ export interface CallbacksInterface {
   AddCustomContent(uid: UidType, data: any): void;
   RemoveCustomContent(uid: UidType): void;
   UserPin(Uid: UidType): void;
-  Spotlight(Uid: UidType): void;
   UserSecondaryPin(Uid: UidType): void;
   ActiveSpeaker(Uid: UidType): void;
-  UserBanned(isBanned: boolean): void;
 }
 
 export type CustomCallbacksInterface = CallbacksInterface;

package/template/agora-rn-uikit/src/Contexts/RtcContext.tsx

@@ -33,8 +33,6 @@ export interface ContentStateInterface {
   pinnedUid?: UidType;
   secondaryPinnedUid?: UidType;
   lastJoinedUid?: UidType;
-  spotlightUid?: UidType;
-  isUserBaned?: boolean;
 }
 
 export interface ActionInterface<T extends keyof CallbacksInterface> {
@@ -47,6 +45,7 @@ export type ActionType<T extends keyof CallbacksInterface> = ActionInterface<T>;
 export interface RtcContextInterface {
   RtcEngineUnsafe: IRtcEngine;
   setDualStreamMode: React.Dispatch<React.SetStateAction<DualStreamMode>>;
+  rtcTracksReady: boolean;
 }
 
 const RtcContext = React.createContext<RtcContextInterface>(

package/template/agora-rn-uikit/src/Reducer/index.ts

@@ -11,5 +11,3 @@ export {default as RemoteVideoStateChanged} from './RemoteVideoStateChanged';
 export {default as UserPin} from './UserPin';
 export {default as UserSecondaryPin} from './UserSecondaryPin';
 export {default as ActiveSpeaker} from './ActiveSpeaker';
-export {default as Spotlight} from './Spotlight';
-export {default as UserBanned} from './UserBanned';

package/template/agora-rn-uikit/src/Rtc/Join.tsx

@@ -51,27 +51,18 @@ const Join: React.FC<{
     const videoState = defaultContent[maxUid]?.video;
     async function join() {
       if (
-      //  rtcProps?.encryption &&
-     //   rtcProps?.encryption.key &&
-        rtcProps?.encryption?.mode
-     //   rtcProps.encryption.salt
+        rtcProps?.encryption &&
+        rtcProps?.encryption.key &&
+        rtcProps.encryption.mode &&
+        rtcProps.encryption.salt
       ) {
         try {
-          console.log(
-            'ui kit setting encryption mode to ',
-            rtcProps?.encryption?.mode,
-          );
-          const encryptionConfig = {
-            encryptionKey: rtcProps?.encryption?.key,
-            encryptionMode: rtcProps?.encryption?.mode,
+          await engine.enableEncryption(true, {
+            encryptionKey: rtcProps?.encryption.key,
+            encryptionMode: rtcProps?.encryption.mode,
+            encryptionKdfSalt: rtcProps?.encryption.salt,
             datastreamEncryptionEnabled: true,
-            ...(rtcProps?.encryption?.mode == 1
-              ? {}
-              : {
-                  encryptionKdfSalt: rtcProps?.encryption?.salt,
-                }),
-          };
-          await engine.enableEncryption(true, encryptionConfig);
+          });
         } catch (error) {
           console.warn('encryption error', error);
         }
@@ -106,13 +97,8 @@ const Join: React.FC<{
           rtcProps?.uid || 0,
           {},
         );
-      } catch (error: any) {
-        console.error('RTC joinChannel error ', error);
-        if (
-          error?.code === 'UID_BANNED' ||
-          error?.message?.includes('UID_BANNED')
-        )
-          dispatch({type: 'UserBanned', value: [true]});
+      } catch (error) {
+        console.error('RTC joinChannel error', error);
       }
       if (
         !audioRoom &&

package/template/agora-rn-uikit/src/RtcConfigure.tsx

@@ -32,8 +32,6 @@ import {
   UserPin,
   UserSecondaryPin,
   ActiveSpeaker,
-  Spotlight,
-  UserBanned,
 } from './Reducer';
 import Create from './Rtc/Create';
 import Join from './Rtc/Join';
@@ -262,16 +260,6 @@ const RtcConfigure = (outerProps: {children: React.ReactNode}) => {
           stateUpdate = ActiveSpeaker(state, action);
         }
         break;
-      case 'Spotlight':
-        if (actionTypeGuard(action, action.type)) {
-          stateUpdate = Spotlight(state, action);
-        }
-        break;
-      case 'UserBanned':
-        if (actionTypeGuard(action, action.type)) {
-          stateUpdate = UserBanned(state, action);
-        }
-        break;
     }
 
     // TODO: remove Handle event listeners
@@ -437,6 +425,7 @@ const RtcConfigure = (outerProps: {children: React.ReactNode}) => {
               value={{
                 RtcEngineUnsafe: engineRef.current,
                 setDualStreamMode,
+                rtcTracksReady: tracksReady,
               }}>
               <ContentProvider
                 value={{
@@ -471,8 +460,6 @@ const RtcConfigure = (outerProps: {children: React.ReactNode}) => {
                       ? uidState.secondaryPinnedUid
                       : undefined,
                   lastJoinedUid: uidState.lastJoinedUid,
-                  spotlightUid: uidState.spotlightUid,
-                  isUserBaned: uidState.isUserBaned,
                 }}>
                 {outerProps.children}
               </ContentProvider>

package/template/agora-rn-uikit/src/Utils/isBotUser.ts

@@ -1,6 +1,6 @@
 export function isBotUser(args: [uid: number, elapsed: number]): boolean {
   // STT bot
-  if (args[0] === 111111) {
+  if (args[0] === 111111 || args[0] > 900000000) {
     return true;
   }
   // Web Recording bot (userUid)

package/template/android/app/build.gradle

@@ -101,13 +101,6 @@ android {
             proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro"
         }
     }
-    
-    packagingOptions {
-        pickFirst '**/lib/arm64-v8a/libaosl.so'
-        pickFirst '**/lib/armeabi-v7a/libaosl.so'
-        pickFirst '**/lib/x86/libaosl.so'
-        pickFirst '**/lib/x86_64/libaosl.so'
-    }
 }
 
 dependencies {

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

@@ -1,5 +1,3 @@
-import {ChannelType as WebChannelType} from 'agora-rtm-sdk';
-
 export interface AttributesMap {
   [key: string]: string;
 }
@@ -13,184 +11,3 @@ export interface ChannelAttributeOptions {
    */
   enableNotificationToChannelMembers?: undefined | false | true;
 }
-
-// LINK STATE
-export const nativeLinkStateMapping = {
-  IDLE: 0,
-  CONNECTING: 1,
-  CONNECTED: 2,
-  DISCONNECTED: 3,
-  SUSPENDED: 4,
-  FAILED: 5,
-};
-
-// Create reverse mapping: number -> string
-export const webLinkStateMapping = Object.fromEntries(
-  Object.entries(nativeLinkStateMapping).map(([key, value]) => [value, key]),
-);
-
-export const linkStatusReasonCodeMapping: {[key: string]: number} = {
-  UNKNOWN: 0,
-  LOGIN: 1,
-  LOGIN_SUCCESS: 2,
-  LOGIN_TIMEOUT: 3,
-  LOGIN_NOT_AUTHORIZED: 4,
-  LOGIN_REJECTED: 5,
-  RELOGIN: 6,
-  LOGOUT: 7,
-  AUTO_RECONNECT: 8,
-  RECONNECT_TIMEOUT: 9,
-  RECONNECT_SUCCESS: 10,
-  JOIN: 11,
-  JOIN_SUCCESS: 12,
-  JOIN_FAILED: 13,
-  REJOIN: 14,
-  LEAVE: 15,
-  INVALID_TOKEN: 16,
-  TOKEN_EXPIRED: 17,
-  INCONSISTENT_APP_ID: 18,
-  INVALID_CHANNEL_NAME: 19,
-  INVALID_USER_ID: 20,
-  NOT_INITIALIZED: 21,
-  RTM_SERVICE_NOT_CONNECTED: 22,
-  CHANNEL_INSTANCE_EXCEED_LIMITATION: 23,
-  OPERATION_RATE_EXCEED_LIMITATION: 24,
-  CHANNEL_IN_ERROR_STATE: 25,
-  PRESENCE_NOT_CONNECTED: 26,
-  SAME_UID_LOGIN: 27,
-  KICKED_OUT_BY_SERVER: 28,
-  KEEP_ALIVE_TIMEOUT: 29,
-  CONNECTION_ERROR: 30,
-  PRESENCE_NOT_READY: 31,
-  NETWORK_CHANGE: 32,
-  SERVICE_NOT_SUPPORTED: 33,
-  STREAM_CHANNEL_NOT_AVAILABLE: 34,
-  STORAGE_NOT_AVAILABLE: 35,
-  LOCK_NOT_AVAILABLE: 36,
-  LOGIN_TOO_FREQUENT: 37,
-};
-
-// CHANNEL TYPE
-// string -> number
-export const nativeChannelTypeMapping = {
-  NONE: 0,
-  MESSAGE: 1,
-  STREAM: 2,
-  USER: 3,
-};
-// number -> string
-export const webChannelTypeMapping = Object.fromEntries(
-  Object.entries(nativeChannelTypeMapping).map(([key, value]) => [value, key]),
-);
-
-// STORAGE TYPE
-// string -> number
-export const nativeStorageTypeMapping = {
-  NONE: 0,
-  /**
-   * 1: The user storage event.
-   */
-  USER: 1,
-  /**
-   * 2: The channel storage event.
-   */
-  CHANNEL: 2,
-};
-// number -> string
-export const webStorageTypeMapping = Object.fromEntries(
-  Object.entries(nativeStorageTypeMapping).map(([key, value]) => [value, key]),
-);
-
-// STORAGE EVENT TYPE
-export const nativeStorageEventTypeMapping = {
-  /**
-   * 0: Unknown event type.
-   */
-  NONE: 0,
-  /**
-   * 1: Triggered when user subscribe user metadata state or join channel with options.withMetadata = true
-   */
-  SNAPSHOT: 1,
-  /**
-   * 2: Triggered when a remote user set metadata
-   */
-  SET: 2,
-  /**
-   * 3: Triggered when a remote user update metadata
-   */
-  UPDATE: 3,
-  /**
-   * 4: Triggered when a remote user remove metadata
-   */
-  REMOVE: 4,
-};
-// number -> string
-export const webStorageEventTypeMapping = Object.fromEntries(
-  Object.entries(nativeStorageEventTypeMapping).map(([key, value]) => [
-    value,
-    key,
-  ]),
-);
-
-// PRESENCE EVENT TYPE
-export const nativePresenceEventTypeMapping = {
-  /**
-   * 0: Unknown event type
-   */
-  NONE: 0,
-  /**
-   * 1: The presence snapshot of this channel
-   */
-  SNAPSHOT: 1,
-  /**
-   * 2: The presence event triggered in interval mode
-   */
-  INTERVAL: 2,
-  /**
-   * 3: Triggered when remote user join channel
-   */
-  REMOTE_JOIN: 3,
-  /**
-   * 4: Triggered when remote user leave channel
-   */
-  REMOTE_LEAVE: 4,
-  /**
-   * 5: Triggered when remote user's connection timeout
-   */
-  REMOTE_TIMEOUT: 5,
-  /**
-   * 6: Triggered when user changed state
-   */
-  REMOTE_STATE_CHANGED: 6,
-  /**
-   * 7: Triggered when user joined channel without presence service
-   */
-  ERROR_OUT_OF_SERVICE: 7,
-};
-// number -> string
-export const webPresenceEventTypeMapping = Object.fromEntries(
-  Object.entries(nativePresenceEventTypeMapping).map(([key, value]) => [
-    value,
-    key,
-  ]),
-);
-
-// MESSAGE EVENT TYPE
-// string -> number
-export const nativeMessageEventTypeMapping = {
-  /**
-   * 0: The binary message.
-   */
-  BINARY: 0,
-  /**
-   * 1: The ascii message.
-   */
-  STRING: 1,
-};
-// number -> string
-export const webMessageEventTypeMapping = Object.fromEntries(
-  Object.entries(nativePresenceEventTypeMapping).map(([key, value]) => [
-    value,
-    key,
-  ]),
-);