chore: optimize

AgoraIO-Extensions · Aug 27, 2024 · 1de5fb6 · 1de5fb6
1 parent 37a811e
commit 1de5fb6
Show file tree

Hide file tree

Showing 5 changed files with 145 additions and 43 deletions.
diff --git a/packages/rtc/src/engine/IrisClient.ts b/packages/rtc/src/engine/IrisClient.ts
@@ -126,7 +126,7 @@ export class IrisClient {
     } else if (irisClientState.publishSecondaryCameraTrack == true) {
       videoSourceType =
         NATIVE_RTC.VIDEO_SOURCE_TYPE.VIDEO_SOURCE_CAMERA_SECONDARY;
-    } else if (irisClientState.publishScreenCaptureVideo == true) {
+    } else if (irisClientState.publishScreenTrack == true) {
       videoSourceType =
         NATIVE_RTC.VIDEO_SOURCE_TYPE.VIDEO_SOURCE_SCREEN_PRIMARY;
     }

diff --git a/packages/rtc/src/helper/ImplHelper.ts b/packages/rtc/src/helper/ImplHelper.ts
@@ -23,10 +23,10 @@ import { NotifyType } from '../engine/IrisClientObserver';
 
 import { IrisRtcEngine } from '../engine/IrisRtcEngine';
 import { IrisTrackEventHandler } from '../event_handler/IrisTrackEventHandler';
+import { IRtcEngineImpl } from '../impl/IAgoraRtcEngineImpl';
 
 import { IrisGlobalState } from '../state/IrisGlobalState';
-import { AgoraConsole } from '../util/AgoraConsole';
-import { AgoraTranslate } from '../util/AgoraTranslate';
+import { AgoraConsole, AgoraTranslate, isDefined } from '../util';
 
 export class ImplHelper {
   _engine: IrisRtcEngine;
@@ -354,47 +354,151 @@ export class ImplHelper {
     } else {
       irisClient = irisClientManager.getIrisClient();
     }
-
+    let irisClientState = irisClient.irisClientState;
     let agoraRTCClient = irisClient?.agoraRTCClient;
-    if (!agoraRTCClient) {
-      return this._engine.returnResult(
-        false,
-        -NATIVE_RTC.ERROR_CODE_TYPE.ERR_FAILED
-      );
-    }
-
-    let audioTrackPackages = irisClient.audioTrackPackages!;
-    let videoTrackPackage = irisClient.videoTrackPackage!;
     let irisClientObserver = irisClientManager.irisClientObserver;
-    await irisClientObserver.notifyLocal(NotifyType.UNPUBLISH_TRACK, [
-      ...audioTrackPackages,
-      videoTrackPackage,
-    ]);
 
-    let irisClientState = irisClient.irisClientState;
-    irisClientState.mergeChannelMediaOptions(options);
-    if (irisClientState.clientRoleType) {
-      await this._engine.clientHelper.setClientRole(
-        agoraRTCClient,
-        irisClientState.clientRoleType,
-        irisClientState.audienceLatencyLevel
-      );
+    //clientRole update
+    if (isDefined(options.clientRoleType)) {
+      if (
+        options.clientRoleType ===
+          NATIVE_RTC.CLIENT_ROLE_TYPE.CLIENT_ROLE_AUDIENCE &&
+        irisClientState.clientRoleType !== options.clientRoleType
+      ) {
+        (this._engine.getImplInstance(
+          'RtcEngine'
+        ) as IRtcEngineImpl).muteLocalAudioStream_5039d15(true);
+        (this._engine.getImplInstance(
+          'RtcEngine'
+        ) as IRtcEngineImpl).muteLocalVideoStream_5039d15(true);
+        this._engine.rtcEngineEventHandler.onClientRoleChanged_2acaf10(
+          irisClient.connection!,
+          irisClientState.clientRoleType!,
+          options.clientRoleType!,
+          options
+        );
+        await this._engine.clientHelper.setClientRole(
+          agoraRTCClient!,
+          options.clientRoleType!,
+          irisClientState.audienceLatencyLevel
+        );
+      }
+      irisClientState.clientRoleType = options.clientRoleType;
     }
-    if (irisClientState.token) {
+
+    //token update
+    if (isDefined(options.token)) {
       try {
-        await agoraRTCClient.renewToken(irisClientState.token);
+        await agoraRTCClient!.renewToken(options.token);
       } catch (e) {
         return this._engine.returnResult(false);
       }
     }
-    irisClientObserver.notifyLocal(
-      NotifyType.PUBLISH_TRACK,
-      [
-        ...irisClientManager.localAudioTrackPackages,
-        ...irisClientManager.localVideoTrackPackages,
-      ],
-      [irisClient]
-    );
+
+    let needPublishVideoTrackPackages: VideoTrackPackage[] = [];
+    let needUnPublishVideoTrackPackages: VideoTrackPackage[] = [];
+    let needPublishAudioTrackPackages: AudioTrackPackage[] = [];
+    let needUnPublishAudioTrackPackages: AudioTrackPackage[] = [];
+    if (
+      irisClientState.clientRoleType ===
+      NATIVE_RTC.CLIENT_ROLE_TYPE.CLIENT_ROLE_BROADCASTER
+    ) {
+      if (isDefined(options.publishCameraTrack)) {
+        if (irisClientState.publishCameraTrack) {
+          if (options.publishCameraTrack === false) {
+            needUnPublishVideoTrackPackages = [
+              ...needUnPublishVideoTrackPackages,
+              ...this._engine.irisClientManager.getLocalVideoTrackPackageBySourceType(
+                NATIVE_RTC.VIDEO_SOURCE_TYPE.VIDEO_SOURCE_CAMERA_PRIMARY
+              ),
+            ];
+          }
+        } else {
+          if (options.publishCameraTrack === true) {
+            needPublishVideoTrackPackages = [
+              ...needPublishVideoTrackPackages,
+              ...this._engine.irisClientManager.getLocalVideoTrackPackageBySourceType(
+                NATIVE_RTC.VIDEO_SOURCE_TYPE.VIDEO_SOURCE_CAMERA_PRIMARY
+              ),
+            ];
+          }
+        }
+      }
+
+      if (isDefined(options.publishMicrophoneTrack)) {
+        if (irisClientState.publishMicrophoneTrack) {
+          if (options.publishMicrophoneTrack === false) {
+            needUnPublishAudioTrackPackages = [
+              ...needUnPublishAudioTrackPackages,
+              ...this._engine.irisClientManager.getLocalAudioTrackPackageBySourceType(
+                IrisAudioSourceType.kAudioSourceTypeMicrophonePrimary
+              ),
+            ];
+          }
+        } else {
+          if (options.publishMicrophoneTrack === true) {
+            needPublishAudioTrackPackages = [
+              ...needPublishAudioTrackPackages,
+              ...this._engine.irisClientManager.getLocalAudioTrackPackageBySourceType(
+                IrisAudioSourceType.kAudioSourceTypeMicrophonePrimary
+              ),
+            ];
+          }
+        }
+      }
+
+      if (isDefined(options.publishScreenTrack)) {
+        if (irisClientState.publishScreenTrack) {
+          if (options.publishScreenTrack === false) {
+            needUnPublishAudioTrackPackages = [
+              ...needUnPublishAudioTrackPackages,
+              ...this._engine.irisClientManager.getLocalAudioTrackPackageBySourceType(
+                IrisAudioSourceType.kAudioSourceTypeScreenCapture
+              ),
+            ];
+            needUnPublishVideoTrackPackages = [
+              ...needUnPublishVideoTrackPackages,
+              ...this._engine.irisClientManager.getLocalVideoTrackPackageBySourceType(
+                NATIVE_RTC.VIDEO_SOURCE_TYPE.VIDEO_SOURCE_SCREEN_PRIMARY
+              ),
+            ];
+          }
+        } else {
+          if (options.publishScreenTrack === true) {
+            needPublishAudioTrackPackages = [
+              ...needPublishAudioTrackPackages,
+              ...this._engine.irisClientManager.getLocalAudioTrackPackageBySourceType(
+                IrisAudioSourceType.kAudioSourceTypeScreenCapture
+              ),
+            ];
+            needPublishVideoTrackPackages = [
+              ...needPublishVideoTrackPackages,
+              ...this._engine.irisClientManager.getLocalVideoTrackPackageBySourceType(
+                NATIVE_RTC.VIDEO_SOURCE_TYPE.VIDEO_SOURCE_SCREEN_PRIMARY
+              ),
+            ];
+          }
+        }
+      }
+
+      await irisClientObserver.notifyLocal(
+        NotifyType.UNPUBLISH_TRACK,
+        [
+          ...irisClientManager.localAudioTrackPackages,
+          ...needUnPublishVideoTrackPackages,
+        ],
+        [irisClient]
+      );
+
+      await irisClientObserver.notifyLocal(
+        NotifyType.PUBLISH_TRACK,
+        [
+          ...irisClientManager.localAudioTrackPackages,
+          ...irisClientManager.localVideoTrackPackages,
+        ],
+        [irisClient]
+      );
+    }
   }
 
   public async joinChannel(

diff --git a/packages/rtc/src/impl/IAgoraRtcEngineImpl.ts b/packages/rtc/src/impl/IAgoraRtcEngineImpl.ts
@@ -307,7 +307,7 @@ export class IRtcEngineImpl implements IRtcEngineExtensions {
   ): CallApiReturnType {
     let process = async (): Promise<CallIrisApiResult> => {
       if (this._engine.globalState.enabledVideo == false) {
-        AgoraConsole.error('call enableVideo(true) before startPreview');
+        AgoraConsole.warn('call enableVideo(true) before startPreview');
         return this._engine.returnResult();
       }
 

diff --git a/packages/rtc/test/impl/IAgoraRtcEngineImpl.test.ts b/packages/rtc/test/impl/IAgoraRtcEngineImpl.test.ts
@@ -292,10 +292,9 @@ describe('IAgoraRtcEngineImpl', () => {
     jest.spyOn(agoraRTCClient!, 'setClientRole');
     let param = {
       options: {
+        clientRoleType: NATIVE_RTC.CLIENT_ROLE_TYPE.CLIENT_ROLE_AUDIENCE,
         publishCameraTrack: true,
         publishMicrophoneTrack: true,
-        publishScreenCaptureVideo: true,
-        publishScreenCaptureAudio: true,
         publishScreenTrack: true,
         publishCustomVideoTrack: true,
         token: '123',
@@ -448,17 +447,17 @@ describe('IAgoraRtcEngineImpl', () => {
       irisRtcEngine.rtcEngineEventHandler,
       'onLocalVideoStateChanged_a44228a'
     );
-    jest.spyOn(AgoraConsole, 'error');
+    jest.spyOn(AgoraConsole, 'warn');
 
     await callIris(apiEnginePtr, 'RtcEngine_startPreview_4fd718e', param);
-    expect(AgoraConsole.error).toBeCalledWith(
+    expect(AgoraConsole.warn).toBeCalledWith(
       'call enableVideo(true) before startPreview'
     );
     jest.clearAllMocks();
     await callIris(apiEnginePtr, 'RtcEngine_startPreview_4fd718e', {
       sourceType: 100,
     });
-    expect(AgoraConsole.error).toBeCalledWith(
+    expect(AgoraConsole.warn).toBeCalledWith(
       'call enableVideo(true) before startPreview'
     );
     await callIris(apiEnginePtr, 'RtcEngine_enableVideo', null);

diff --git a/packages/rtc/test/impl/IAgoraRtcEngineImplEx.test.ts b/packages/rtc/test/impl/IAgoraRtcEngineImplEx.test.ts
@@ -160,10 +160,9 @@ describe('IAgoraRtcEngineImpl', () => {
     let param2 = {
       connection: param.connection,
       options: {
+        clientRoleType: NATIVE_RTC.CLIENT_ROLE_TYPE.CLIENT_ROLE_AUDIENCE,
         publishCameraTrack: true,
         publishMicrophoneTrack: true,
-        publishScreenCaptureVideo: true,
-        publishScreenCaptureAudio: true,
         publishScreenTrack: true,
         publishCustomVideoTrack: true,
         token: '123',