agora-electron-sdk 4.1.1-rc.1 → 4.2.0-dev.13

package/ts/Private/internal/MediaRecorderInternal.ts

@@ -2,7 +2,6 @@ import { createCheckers } from 'ts-interface-checker';
 
 import { ErrorCodeType } from '../AgoraBase';
 import { IMediaRecorderObserver } from '../AgoraMediaBase';
-import { RtcConnection } from '../IAgoraRtcEngineEx';
 
 import { IMediaRecorderEvent } from '../extension/IAgoraMediaRecorderExtension';
 
@@ -13,13 +12,14 @@ import AgoraMediaBaseTI from '../ti/AgoraMediaBase-ti';
 const checkers = createCheckers(AgoraMediaBaseTI);
 
 import { DeviceEventEmitter, EVENT_TYPE } from './IrisApiEngine';
-import { EmitterSubscription } from './emitter/EventEmitter';
+import type { EmitterSubscription } from './emitter/EventEmitter';
 
 export class MediaRecorderInternal extends IMediaRecorderImpl {
   static _observers: Map<string, IMediaRecorderObserver> = new Map<
     string,
     IMediaRecorderObserver
   >();
+  private readonly _nativeHandle: string;
   private _events: Map<
     any,
     {
@@ -34,22 +34,27 @@ export class MediaRecorderInternal extends IMediaRecorderImpl {
     }
   >();
 
-  setMediaRecorderObserver(
-    connection: RtcConnection,
-    callback: IMediaRecorderObserver
-  ): number {
-    const key = (connection.channelId ?? '') + connection.localUid;
-    if (MediaRecorderInternal._observers.has(key)) {
-      return ErrorCodeType.ErrOk;
-    }
-    MediaRecorderInternal._observers.set(key, callback);
-    return super.setMediaRecorderObserver(connection, callback);
+  constructor(nativeHandle: string) {
+    super();
+    this._nativeHandle = nativeHandle;
   }
 
   release() {
-    MediaRecorderInternal._observers.clear();
+    MediaRecorderInternal._observers.delete(this._nativeHandle);
     this.removeAllListeners();
-    super.release();
+  }
+
+  get nativeHandle(): string {
+    return this._nativeHandle;
+  }
+
+  override setMediaRecorderObserver(callback: IMediaRecorderObserver): number {
+    const key = this._nativeHandle;
+    if (MediaRecorderInternal._observers.has(key)) {
+      return ErrorCodeType.ErrOk;
+    }
+    MediaRecorderInternal._observers.set(key, callback);
+    return super.setMediaRecorderObserver(callback);
   }
 
   _addListenerPreCheck<EventType extends keyof IMediaRecorderEvent>(
@@ -60,11 +65,10 @@ export class MediaRecorderInternal extends IMediaRecorderImpl {
         [eventType]: undefined,
       })
     ) {
-      if (MediaRecorderInternal._observers.size === 0) {
-        console.error(
-          'Please call `setMediaRecorderObserver` before you want to receive event by `addListener`'
-        );
-        return false;
+      if (
+        MediaRecorderInternal._observers.get(this._nativeHandle) === undefined
+      ) {
+        this.setMediaRecorderObserver({});
       }
     }
     return true;
@@ -95,9 +99,7 @@ export class MediaRecorderInternal extends IMediaRecorderImpl {
     listener: IMediaRecorderEvent[EventType]
   ) {
     if (!this._events.has(listener)) return;
-    DeviceEventEmitter.removeSubscription(
-      this._events.get(listener)!.subscription
-    );
+    this._events.get(listener)!.subscription.remove();
     this._events.delete(listener);
   }
 

package/ts/Private/internal/MusicContentCenterInternal.ts

@@ -5,7 +5,6 @@ import {
   IMusicPlayer,
   Music,
 } from '../IAgoraMusicContentCenter';
-
 import { IMusicContentCenterEvent } from '../extension/IAgoraMusicContentCenterExtension';
 
 import {
@@ -18,10 +17,9 @@ import {
 import IAgoraMusicContentCenterTI from '../ti/IAgoraMusicContentCenter-ti';
 const checkers = createCheckers(IAgoraMusicContentCenterTI);
 
-import { MediaPlayerInternal } from './MediaPlayerInternal';
-
-import { EmitterSubscription } from './emitter/EventEmitter';
 import { DeviceEventEmitter, EVENT_TYPE } from './IrisApiEngine';
+import { MediaPlayerInternal } from './MediaPlayerInternal';
+import type { EmitterSubscription } from './emitter/EventEmitter';
 
 export class MusicContentCenterInternal extends IMusicContentCenterImpl {
   static _event_handlers: IMusicContentCenterEventHandler[] = [];
@@ -79,9 +77,7 @@ export class MusicContentCenterInternal extends IMusicContentCenterImpl {
     listener: IMusicContentCenterEvent[EventType]
   ) {
     if (!this._events.has(listener)) return;
-    DeviceEventEmitter.removeSubscription(
-      this._events.get(listener)!.subscription
-    );
+    this._events.get(listener)!.subscription.remove();
     this._events.delete(listener);
   }
 
@@ -103,7 +99,9 @@ export class MusicContentCenterInternal extends IMusicContentCenterImpl {
     }
   }
 
-  registerEventHandler(eventHandler: IMusicContentCenterEventHandler): number {
+  override registerEventHandler(
+    eventHandler: IMusicContentCenterEventHandler
+  ): number {
     if (
       !MusicContentCenterInternal._event_handlers.find(
         (value) => value === eventHandler
@@ -114,17 +112,17 @@ export class MusicContentCenterInternal extends IMusicContentCenterImpl {
     return super.registerEventHandler(eventHandler);
   }
 
-  unregisterEventHandler(): number {
+  override unregisterEventHandler(): number {
     MusicContentCenterInternal._event_handlers = [];
     return super.unregisterEventHandler();
   }
 
-  release() {
+  override release() {
     MusicContentCenterInternal._event_handlers = [];
     super.release();
   }
 
-  createMusicPlayer(): IMusicPlayer {
+  override createMusicPlayer(): IMusicPlayer {
     // @ts-ignore
     const mediaPlayerId = super.createMusicPlayer() as number;
     return new MusicPlayerInternal(mediaPlayerId);
@@ -139,11 +137,11 @@ class _MusicPlayerInternal extends IMusicPlayerImpl {
     this._mediaPlayerId = mediaPlayerId;
   }
 
-  getMediaPlayerId(): number {
+  override getMediaPlayerId(): number {
     return this._mediaPlayerId;
   }
 
-  protected getApiTypeFromOpenWithSongCode(
+  protected override getApiTypeFromOpenWithSongCode(
     songCode: number,
     startPos = 0
   ): string {
@@ -184,23 +182,23 @@ export class MusicCollectionInternal extends MusicCollectionImpl {
     this._musicCollection = musicCollection;
   }
 
-  getCount(): number {
+  override getCount(): number {
     return this._musicCollection.count;
   }
 
-  getMusic(index: number): Music {
+  override getMusic(index: number): Music {
     return this._musicCollection.music[index] ?? {};
   }
 
-  getPage(): number {
+  override getPage(): number {
     return this._musicCollection.page;
   }
 
-  getPageSize(): number {
+  override getPageSize(): number {
     return this._musicCollection.pageSize;
   }
 
-  getTotal(): number {
+  override getTotal(): number {
     return this._musicCollection.total;
   }
 }