agora-electron-sdk 4.3.2 → 4.4.0-dev.1

package/ts/Private/impl/IAgoraRtcEngineExImpl.ts

@@ -4,6 +4,7 @@ import {
   DataStreamConfig,
   EncryptionConfig,
   LiveTranscoding,
+  SimulcastConfig,
   SimulcastStreamConfig,
   SimulcastStreamMode,
   SpatialAudioParams,
@@ -1363,6 +1364,35 @@ export class IRtcEngineExImpl extends IRtcEngineImpl implements IRtcEngineEx {
     return 'RtcEngineEx_setDualStreamModeEx_622d0f3';
   }
 
+  setSimulcastConfigEx(
+    simulcastConfig: SimulcastConfig,
+    connection: RtcConnection
+  ): number {
+    const apiType = this.getApiTypeFromSetSimulcastConfigEx(
+      simulcastConfig,
+      connection
+    );
+    const jsonParams = {
+      simulcastConfig: simulcastConfig,
+      connection: connection,
+      toJSON: () => {
+        return {
+          simulcastConfig: simulcastConfig,
+          connection: connection,
+        };
+      },
+    };
+    const jsonResults = callIrisApi.call(this, apiType, jsonParams);
+    return jsonResults.result;
+  }
+
+  protected getApiTypeFromSetSimulcastConfigEx(
+    simulcastConfig: SimulcastConfig,
+    connection: RtcConnection
+  ): string {
+    return 'RtcEngineEx_setSimulcastConfigEx_bd8d7d0';
+  }
+
   setHighPriorityUserListEx(
     uidList: number[],
     uidNum: number,

package/ts/Private/impl/IAgoraRtcEngineImpl.ts

@@ -20,6 +20,9 @@ import {
   EarMonitoringFilterType,
   EchoTestConfiguration,
   EncryptionConfig,
+  FaceShapeArea,
+  FaceShapeAreaOptions,
+  FaceShapeBeautyOptions,
   FocalLengthInfo,
   HeadphoneEqualizerPreset,
   IAudioEncodedFrameObserver,
@@ -35,6 +38,7 @@ import {
   ScreenScenarioType,
   SegmentationProperty,
   SenderOptions,
+  SimulcastConfig,
   SimulcastStreamConfig,
   SimulcastStreamMode,
   SpatialAudioParams,
@@ -51,6 +55,7 @@ import {
   VideoStreamType,
   VideoSubscriptionOptions,
   VirtualBackgroundSource,
+  VoiceAiTunerType,
   VoiceBeautifierPreset,
   VoiceConversionPreset,
   WatermarkOptions,
@@ -416,7 +421,7 @@ export function processIRtcEngineEventHandler(
 
     case 'onLocalVideoStats':
       if (handler.onLocalVideoStats !== undefined) {
-        handler.onLocalVideoStats(jsonParams.source, jsonParams.stats);
+        handler.onLocalVideoStats(jsonParams.connection, jsonParams.stats);
       }
       break;
 
@@ -910,34 +915,32 @@ export function processIRtcEngineEventHandler(
       }
       break;
 
-    case 'onExtensionEvent':
-      if (handler.onExtensionEvent !== undefined) {
-        handler.onExtensionEvent(
-          jsonParams.provider,
-          jsonParams.extension,
+    case 'onExtensionEventWithContext':
+      if (handler.onExtensionEventWithContext !== undefined) {
+        handler.onExtensionEventWithContext(
+          jsonParams.context,
           jsonParams.key,
           jsonParams.value
         );
       }
       break;
 
-    case 'onExtensionStarted':
-      if (handler.onExtensionStarted !== undefined) {
-        handler.onExtensionStarted(jsonParams.provider, jsonParams.extension);
+    case 'onExtensionStartedWithContext':
+      if (handler.onExtensionStartedWithContext !== undefined) {
+        handler.onExtensionStartedWithContext(jsonParams.context);
       }
       break;
 
-    case 'onExtensionStopped':
-      if (handler.onExtensionStopped !== undefined) {
-        handler.onExtensionStopped(jsonParams.provider, jsonParams.extension);
+    case 'onExtensionStoppedWithContext':
+      if (handler.onExtensionStoppedWithContext !== undefined) {
+        handler.onExtensionStoppedWithContext(jsonParams.context);
       }
       break;
 
-    case 'onExtensionError':
-      if (handler.onExtensionError !== undefined) {
-        handler.onExtensionError(
-          jsonParams.provider,
-          jsonParams.extension,
+    case 'onExtensionErrorWithContext':
+      if (handler.onExtensionErrorWithContext !== undefined) {
+        handler.onExtensionErrorWithContext(
+          jsonParams.context,
           jsonParams.error,
           jsonParams.message
         );
@@ -1619,6 +1622,116 @@ export class IRtcEngineImpl implements IRtcEngine {
     return 'RtcEngine_setBeautyEffectOptions_e7635d1';
   }
 
+  setFaceShapeBeautyOptions(
+    enabled: boolean,
+    options: FaceShapeBeautyOptions,
+    type: MediaSourceType = MediaSourceType.PrimaryCameraSource
+  ): number {
+    const apiType = this.getApiTypeFromSetFaceShapeBeautyOptions(
+      enabled,
+      options,
+      type
+    );
+    const jsonParams = {
+      enabled: enabled,
+      options: options,
+      type: type,
+      toJSON: () => {
+        return {
+          enabled: enabled,
+          options: options,
+          type: type,
+        };
+      },
+    };
+    const jsonResults = callIrisApi.call(this, apiType, jsonParams);
+    return jsonResults.result;
+  }
+
+  protected getApiTypeFromSetFaceShapeBeautyOptions(
+    enabled: boolean,
+    options: FaceShapeBeautyOptions,
+    type: MediaSourceType = MediaSourceType.PrimaryCameraSource
+  ): string {
+    return 'RtcEngine_setFaceShapeBeautyOptions_a862ce7';
+  }
+
+  setFaceShapeAreaOptions(
+    options: FaceShapeAreaOptions,
+    type: MediaSourceType = MediaSourceType.PrimaryCameraSource
+  ): number {
+    const apiType = this.getApiTypeFromSetFaceShapeAreaOptions(options, type);
+    const jsonParams = {
+      options: options,
+      type: type,
+      toJSON: () => {
+        return {
+          options: options,
+          type: type,
+        };
+      },
+    };
+    const jsonResults = callIrisApi.call(this, apiType, jsonParams);
+    return jsonResults.result;
+  }
+
+  protected getApiTypeFromSetFaceShapeAreaOptions(
+    options: FaceShapeAreaOptions,
+    type: MediaSourceType = MediaSourceType.PrimaryCameraSource
+  ): string {
+    return 'RtcEngine_setFaceShapeAreaOptions_2e242a3';
+  }
+
+  getFaceShapeBeautyOptions(
+    type: MediaSourceType = MediaSourceType.PrimaryCameraSource
+  ): FaceShapeBeautyOptions {
+    const apiType = this.getApiTypeFromGetFaceShapeBeautyOptions(type);
+    const jsonParams = {
+      type: type,
+      toJSON: () => {
+        return {
+          type: type,
+        };
+      },
+    };
+    const jsonResults = callIrisApi.call(this, apiType, jsonParams);
+    const options = jsonResults.options;
+    return options;
+  }
+
+  protected getApiTypeFromGetFaceShapeBeautyOptions(
+    type: MediaSourceType = MediaSourceType.PrimaryCameraSource
+  ): string {
+    return 'RtcEngine_getFaceShapeBeautyOptions_8382895';
+  }
+
+  getFaceShapeAreaOptions(
+    shapeArea: FaceShapeArea,
+    type: MediaSourceType = MediaSourceType.PrimaryCameraSource
+  ): FaceShapeAreaOptions {
+    const apiType = this.getApiTypeFromGetFaceShapeAreaOptions(shapeArea, type);
+    const jsonParams = {
+      shapeArea: shapeArea,
+      type: type,
+      toJSON: () => {
+        return {
+          shapeArea: shapeArea,
+          type: type,
+        };
+      },
+    };
+    const jsonResults = callIrisApi.call(this, apiType, jsonParams);
+    const options = jsonResults.options;
+    return options;
+  }
+
+  protected getApiTypeFromGetFaceShapeAreaOptions(
+    shapeArea: FaceShapeArea,
+    type: MediaSourceType = MediaSourceType.PrimaryCameraSource
+  ): string {
+    return 'RtcEngine_getFaceShapeAreaOptions_0783e2c';
+  }
+
   setLowlightEnhanceOptions(
     enabled: boolean,
     options: LowlightEnhanceOptions,
@@ -3488,6 +3601,29 @@ export class IRtcEngineImpl implements IRtcEngine {
     return 'RtcEngine_setHeadphoneEQParameters_4e92b3c';
   }
 
+  enableVoiceAITuner(enabled: boolean, type: VoiceAiTunerType): number {
+    const apiType = this.getApiTypeFromEnableVoiceAITuner(enabled, type);
+    const jsonParams = {
+      enabled: enabled,
+      type: type,
+      toJSON: () => {
+        return {
+          enabled: enabled,
+          type: type,
+        };
+      },
+    };
+    const jsonResults = callIrisApi.call(this, apiType, jsonParams);
+    return jsonResults.result;
+  }
+
+  protected getApiTypeFromEnableVoiceAITuner(
+    enabled: boolean,
+    type: VoiceAiTunerType
+  ): string {
+    return 'RtcEngine_enableVoiceAITuner_28f5d5b';
+  }
+
   setLogFile(filePath: string): number {
     const apiType = this.getApiTypeFromSetLogFile(filePath);
     const jsonParams = {
@@ -3730,6 +3866,26 @@ export class IRtcEngineImpl implements IRtcEngine {
     return 'RtcEngine_setDualStreamMode_b3a4f6c';
   }
 
+  setSimulcastConfig(simulcastConfig: SimulcastConfig): number {
+    const apiType = this.getApiTypeFromSetSimulcastConfig(simulcastConfig);
+    const jsonParams = {
+      simulcastConfig: simulcastConfig,
+      toJSON: () => {
+        return {
+          simulcastConfig: simulcastConfig,
+        };
+      },
+    };
+    const jsonResults = callIrisApi.call(this, apiType, jsonParams);
+    return jsonResults.result;
+  }
+
+  protected getApiTypeFromSetSimulcastConfig(
+    simulcastConfig: SimulcastConfig
+  ): string {
+    return 'RtcEngine_setSimulcastConfig_3dcdfd7';
+  }
+
   enableCustomAudioLocalPlayback(trackId: number, enabled: boolean): number {
     const apiType = this.getApiTypeFromEnableCustomAudioLocalPlayback(
       trackId,
@@ -5686,42 +5842,6 @@ export class IRtcEngineImpl implements IRtcEngine {
     return 'RtcEngine_setRemoteUserPriority_f34115b';
   }
 
-  setEncryptionMode(encryptionMode: string): number {
-    const apiType = this.getApiTypeFromSetEncryptionMode(encryptionMode);
-    const jsonParams = {
-      encryptionMode: encryptionMode,
-      toJSON: () => {
-        return {
-          encryptionMode: encryptionMode,
-        };
-      },
-    };
-    const jsonResults = callIrisApi.call(this, apiType, jsonParams);
-    return jsonResults.result;
-  }
-
-  protected getApiTypeFromSetEncryptionMode(encryptionMode: string): string {
-    return 'RtcEngine_setEncryptionMode_3a2037f';
-  }
-
-  setEncryptionSecret(secret: string): number {
-    const apiType = this.getApiTypeFromSetEncryptionSecret(secret);
-    const jsonParams = {
-      secret: secret,
-      toJSON: () => {
-        return {
-          secret: secret,
-        };
-      },
-    };
-    const jsonResults = callIrisApi.call(this, apiType, jsonParams);
-    return jsonResults.result;
-  }
-
-  protected getApiTypeFromSetEncryptionSecret(secret: string): string {
-    return 'RtcEngine_setEncryptionSecret_3a2037f';
-  }
-
   enableEncryption(enabled: boolean, config: EncryptionConfig): number {
     const apiType = this.getApiTypeFromEnableEncryption(enabled, config);
     const jsonParams = {
@@ -6884,7 +7004,7 @@ export class IRtcEngineImpl implements IRtcEngine {
   }
 
   protected getApiTypeFromGetAudioDeviceManager(): string {
-    return 'RtcEngine_queryInterface_257d192';
+    return 'RtcEngine_getAudioDeviceManager';
   }
 
   getVideoDeviceManager(): IVideoDeviceManager {
@@ -6895,7 +7015,7 @@ export class IRtcEngineImpl implements IRtcEngine {
   }
 
   protected getApiTypeFromGetVideoDeviceManager(): string {
-    return 'RtcEngine_queryInterface_257d192';
+    return 'RtcEngine_getVideoDeviceManager';
   }
 
   getMusicContentCenter(): IMusicContentCenter {
@@ -6906,7 +7026,7 @@ export class IRtcEngineImpl implements IRtcEngine {
   }
 
   protected getApiTypeFromGetMusicContentCenter(): string {
-    return 'RtcEngine_queryInterface_257d192';
+    return 'RtcEngine_getMusicContentCenter';
   }
 
   getMediaEngine(): IMediaEngine {
@@ -6917,7 +7037,7 @@ export class IRtcEngineImpl implements IRtcEngine {
   }
 
   protected getApiTypeFromGetMediaEngine(): string {
-    return 'RtcEngine_queryInterface_257d192';
+    return 'RtcEngine_getMediaEngine';
   }
 
   getLocalSpatialAudioEngine(): ILocalSpatialAudioEngine {
@@ -6928,7 +7048,7 @@ export class IRtcEngineImpl implements IRtcEngine {
   }
 
   protected getApiTypeFromGetLocalSpatialAudioEngine(): string {
-    return 'RtcEngine_queryInterface_257d192';
+    return 'RtcEngine_getLocalSpatialAudioEngine';
   }
 
   getH265Transcoder(): IH265Transcoder {
@@ -6939,7 +7059,7 @@ export class IRtcEngineImpl implements IRtcEngine {
   }
 
   protected getApiTypeFromGetH265Transcoder(): string {
-    return 'RtcEngine_queryInterface_257d192';
+    return 'RtcEngine_getH265Transcoder';
   }
 
   sendMetaData(metadata: Metadata, sourceType: VideoSourceType): number {
@@ -6997,7 +7117,7 @@ export class IRtcEngineImpl implements IRtcEngine {
   }
 
   protected getApiTypeFromDestroyRendererByView(view: any): string {
-    return 'RtcEngine_destroyRendererByView';
+    return 'RtcEngine_destroyRendererByView_a55f55f';
   }
 
   destroyRendererByConfig(
@@ -7030,7 +7150,7 @@ export class IRtcEngineImpl implements IRtcEngine {
     channelId?: string,
     uid: number = 0
   ): string {
-    return 'RtcEngine_destroyRendererByConfig';
+    return 'RtcEngine_destroyRendererByConfig_542c2ae';
   }
 
   unregisterAudioEncodedFrameObserver(

package/ts/Private/internal/IrisApiEngine.ts

@@ -1,5 +1,6 @@
 import EventEmitter from 'eventemitter3';
-import JSON from 'json-bigint';
+import JSONBigInt from 'json-bigint';
+const JSON = JSONBigInt({ storeAsString: true });
 
 import { AgoraEnv, logDebug, logError, logInfo, logWarn } from '../../Utils';
 import { IAudioEncodedFrameObserver } from '../AgoraBase';
@@ -339,12 +340,7 @@ export const EVENT_PROCESSORS: EventProcessors = {
           break;
       }
     },
-    handlers: (event: string, data: any) => {
-      if (event === 'onLocalVideoStats' && 'connection' in data) {
-        return undefined;
-      }
-      return RtcEngineExInternal._event_handlers;
-    },
+    handlers: (event: string, data: any) => RtcEngineExInternal._event_handlers,
   },
   IMusicContentCenterEventHandler: {
     suffix: 'MusicContentCenterEventHandler_',

package/ts/Private/internal/MediaEngineInternal.ts

@@ -109,7 +109,6 @@ export class MediaEngineInternal extends IMediaEngineImpl {
     MediaEngineInternal._video_encoded_frame_observers = [];
     MediaEngineInternal._face_info_observers = [];
     this.removeAllListeners();
-    super.release();
   }
 
   _addListenerPreCheck<EventType extends keyof IMediaEngineEvent>(

package/ts/Private/internal/RtcEngineExInternal.ts

@@ -1,6 +1,7 @@
 import { createCheckers } from 'ts-interface-checker';
 
-import { AgoraEnv, logError } from '../../Utils';
+import { RendererManager } from '../../Renderer/RendererManager';
+import { AgoraEnv, logError, parseIntPtr2Number } from '../../Utils';
 import {
   AudioEncodedFrameObserverConfig,
   ClientRoleOptions,
@@ -90,7 +91,6 @@ export class RtcEngineExInternal extends IRtcEngineExImpl {
       // @ts-ignore
       window.AgoraEnv = AgoraEnv;
       if (AgoraEnv.AgoraRendererManager === undefined) {
-        const { RendererManager } = require('../../Renderer/RendererManager');
         AgoraEnv.AgoraRendererManager = new RendererManager();
       }
     }
@@ -105,8 +105,6 @@ export class RtcEngineExInternal extends IRtcEngineExImpl {
     AgoraEnv.AgoraElectronBridge.ReleaseRenderer();
     AgoraEnv.AgoraRendererManager?.release();
     AgoraEnv.AgoraRendererManager = undefined;
-    this._audio_device_manager.release();
-    this._video_device_manager.release();
     this._media_engine.release();
     this._local_spatial_audio_engine.release();
     RtcEngineExInternal._event_handlers = [];
@@ -419,6 +417,11 @@ export class RtcEngineExInternal extends IRtcEngineExImpl {
     return this._h265_transcoder;
   }
 
+  override getNativeHandle(): number {
+    let result = super.getNativeHandle();
+    return parseIntPtr2Number(result);
+  }
+
   override registerAudioEncodedFrameObserver(
     config: AudioEncodedFrameObserverConfig,
     observer: IAudioEncodedFrameObserver
@@ -507,6 +510,7 @@ export class RtcEngineExInternal extends IRtcEngineExImpl {
             value.iconImage.length!
           );
         }
+        value.sourceDisplayId = parseIntPtr2Number(value.sourceDisplayId);
         return value;
       }
     );

package/ts/Private/ti/IAgoraRtcEngine-ti.ts

@@ -40,7 +40,7 @@ export const IRtcEngineEventHandler = t.iface([], {
   "onUserEnableLocalVideo": t.opt(t.func("void", t.param("connection", "RtcConnection"), t.param("remoteUid", "number"), t.param("enabled", "boolean"))),
   "onRemoteAudioStats": t.opt(t.func("void", t.param("connection", "RtcConnection"), t.param("stats", "RemoteAudioStats"))),
   "onLocalAudioStats": t.opt(t.func("void", t.param("connection", "RtcConnection"), t.param("stats", "LocalAudioStats"))),
-  "onLocalVideoStats": t.opt(t.func("void", t.param("source", "VideoSourceType"), t.param("stats", "LocalVideoStats"))),
+  "onLocalVideoStats": t.opt(t.func("void", t.param("connection", "RtcConnection"), t.param("stats", "LocalVideoStats"))),
   "onRemoteVideoStats": t.opt(t.func("void", t.param("connection", "RtcConnection"), t.param("stats", "RemoteVideoStats"))),
   "onCameraReady": t.opt(t.func("void")),
   "onCameraFocusAreaChanged": t.opt(t.func("void", t.param("x", "number"), t.param("y", "number"), t.param("width", "number"), t.param("height", "number"))),
@@ -95,10 +95,10 @@ export const IRtcEngineEventHandler = t.iface([], {
   "onVideoPublishStateChanged": t.opt(t.func("void", t.param("source", "VideoSourceType"), t.param("channel", "string"), t.param("oldState", "StreamPublishState"), t.param("newState", "StreamPublishState"), t.param("elapseSinceLastState", "number"))),
   "onTranscodedStreamLayoutInfo": t.opt(t.func("void", t.param("connection", "RtcConnection"), t.param("uid", "number"), t.param("width", "number"), t.param("height", "number"), t.param("layoutCount", "number"), t.param("layoutlist", t.array("VideoLayout")))),
   "onAudioMetadataReceived": t.opt(t.func("void", t.param("connection", "RtcConnection"), t.param("uid", "number"), t.param("metadata", "string"), t.param("length", "number"))),
-  "onExtensionEvent": t.opt(t.func("void", t.param("provider", "string"), t.param("extension", "string"), t.param("key", "string"), t.param("value", "string"))),
-  "onExtensionStarted": t.opt(t.func("void", t.param("provider", "string"), t.param("extension", "string"))),
-  "onExtensionStopped": t.opt(t.func("void", t.param("provider", "string"), t.param("extension", "string"))),
-  "onExtensionError": t.opt(t.func("void", t.param("provider", "string"), t.param("extension", "string"), t.param("error", "number"), t.param("message", "string"))),
+  "onExtensionEventWithContext": t.opt(t.func("void", t.param("context", "ExtensionContext"), t.param("key", "string"), t.param("value", "string"))),
+  "onExtensionStartedWithContext": t.opt(t.func("void", t.param("context", "ExtensionContext"))),
+  "onExtensionStoppedWithContext": t.opt(t.func("void", t.param("context", "ExtensionContext"))),
+  "onExtensionErrorWithContext": t.opt(t.func("void", t.param("context", "ExtensionContext"), t.param("error", "number"), t.param("message", "string"))),
   "onSetRtmFlagResult": t.opt(t.func("void", t.param("connection", "RtcConnection"), t.param("code", "number"))),
 });
 

package/ts/Renderer/IRenderer.ts

@@ -45,8 +45,7 @@ export abstract class IRenderer {
 
   public drawFrame(_videoFrame?: VideoFrame): void {
     if (!this.canvas) return;
-    //@ts-ignore
-    if (!this.canvas.checkVisibility()) {
+    if (this.canvas.style.display !== '') {
       this.canvas.style.display = '';
     }
   }

package/ts/Renderer/IRendererManager.ts

@@ -160,19 +160,28 @@ export abstract class IRendererManager {
     const checkedContext = this.precheckRendererContext(context);
 
     const rendererCache = this.getRendererCache(checkedContext);
-    if (!rendererCache) return;
-    if (checkedContext.view) {
-      const renderer = rendererCache.findRenderer(checkedContext.view);
-      if (!renderer) return;
-      rendererCache.removeRenderer(renderer);
+    if (rendererCache) {
+      if (checkedContext.view) {
+        const renderer = rendererCache.findRenderer(checkedContext.view);
+        if (!renderer) return;
+        rendererCache.removeRenderer(renderer);
+      } else {
+        rendererCache.removeRenderer();
+      }
+      if (rendererCache.renderers.length === 0) {
+        this._rendererCaches.splice(
+          this._rendererCaches.indexOf(rendererCache),
+          1
+        );
+      }
     } else {
-      rendererCache.removeRenderer();
-    }
-    if (rendererCache.renderers.length === 0) {
-      this._rendererCaches.splice(
-        this._rendererCaches.indexOf(rendererCache),
-        1
-      );
+      this._rendererCaches = this._rendererCaches.filter((_rendererCache) => {
+        const renderer = _rendererCache.findRenderer(checkedContext.view);
+        if (renderer) {
+          _rendererCache.removeRenderer(renderer);
+        }
+        return _rendererCache.renderers.length > 0;
+      });
     }
   }
 

package/ts/Utils.ts

@@ -9,6 +9,21 @@ export const TAG = '[Agora]: ';
  */
 export const DEBUG_TAG = '[Agora Debug]: ';
 
+/**
+ * @ignore
+ */
+export function parseIntPtr2Number(value: number | string): number {
+  try {
+    let bigIntVal = BigInt(value);
+    if (bigIntVal > 2n ** 63n - 1n) {
+      bigIntVal -= 2n ** 64n;
+    }
+    return Number(bigIntVal);
+  } catch (e) {
+    return value as number;
+  }
+}
+
 /**
  * @ignore
  */