trtc-electron-sdk 12.2.701 → 12.2.702

package/liteav/LocalMediaTranscoder/index.d.ts

@@ -149,7 +149,7 @@ export declare type TRTCLocalMediaTranscodingParams = {
  *    TRTCVideoPixelFormat
  *   } from 'trtc-electron-sdk';
  *
- *   const trtcCloud = new TRTCCloud();
+ *   const trtcCloud = TRTCCloud.getTRTCShareInstance();
  *   const cameraList =trtcCloud.getCameraDevicesList();
  *
  *   // 获取本地合图转码推流对象

package/liteav/LocalMediaTranscoder/index.js

@@ -214,7 +214,7 @@ const TRTCLocalMediaTranscodingParams_HACK_JSDOC = null;
  *    TRTCVideoPixelFormat
  *   } from 'trtc-electron-sdk';
  *
- *   const trtcCloud = new TRTCCloud();
+ *   const trtcCloud = TRTCCloud.getTRTCShareInstance();
  *   const cameraList =trtcCloud.getCameraDevicesList();
  *
  *   // 获取本地合图转码推流对象

package/liteav/Render/util.d.ts

@@ -5,7 +5,7 @@
  * @example
  * // 使用示例代码：
  * const TRTCCloud = require('trtc-electron-sdk');
- * this.rtcCloud = new TRTCCloud();
+ * this.rtcCloud = TRTCCloud.getTRTCShareInstance();
  * this.rtcCloud.getConfigObject().setDebugMode(true);
  *
  */

package/liteav/Render/util.js

@@ -7,7 +7,7 @@ exports.generateUniqueId = exports.allocBuffer = exports.config = exports.calcVi
  * @example
  * // 使用示例代码：
  * const TRTCCloud = require('trtc-electron-sdk');
- * this.rtcCloud = new TRTCCloud();
+ * this.rtcCloud = TRTCCloud.getTRTCShareInstance();
  * this.rtcCloud.getConfigObject().setDebugMode(true);
  *
  */

package/liteav/Renderer/util.d.ts

@@ -4,7 +4,7 @@
  *
  * @example
  * import TRTCCloud from trtc-electron-sdk';
- * const rtcCloud = new TRTCCloud();
+ * const rtcCloud = TRTCCloud.getTRTCShareInstance();
  * rtcCloud.getConfigObject().setDebugMode(true);
  */
 export declare class TRTCConfig {

package/liteav/Renderer/util.js

@@ -6,7 +6,7 @@ exports.isSupportWebGL = exports.transferBGRA2RGBA = exports.generateUniqueId =
  *
  * @example
  * import TRTCCloud from trtc-electron-sdk';
- * const rtcCloud = new TRTCCloud();
+ * const rtcCloud = TRTCCloud.getTRTCShareInstance();
  * rtcCloud.getConfigObject().setDebugMode(true);
  */
 class TRTCConfig {

package/liteav/VideoRenderControl/VideoRenderFPSMonitor.js

@@ -90,8 +90,8 @@ class VideoRenderFPSMonitor {
         }
         else {
             logger_1.default.info(`${this.logPrefix} document show`);
-            this.videoRenderFPS = 5; // 慢启动
-            this.pageRefreshFPS = 5;
+            this.videoRenderFPS = 30;
+            this.pageRefreshFPS = 30;
         }
         this.lastVideoRenderFPS = this.videoRenderFPS;
         this.lastTimestamp = 0;

package/liteav/extensions/AudioEffectManager/index.d.ts

@@ -5,22 +5,14 @@ declare const NodeTRTCEngine: any;
  */
 export declare class TRTCAudioEffectManager {
     private logPrefix;
-    private static audioEffectManager;
-    private static isIPCMode;
+    private isIPCMode;
     private nodeAudioEffectManager;
     private promiseStore;
     constructor(options: {
         isIPCMode: boolean;
         nodeTRTCCloud: typeof NodeTRTCEngine.TRTCCloud | typeof NodeTRTCEngine.RemoteTRTCCloud;
     });
-    /**
-     * 获取音效管理器
-     * @returns {TRTCAudioEffectManager}
-     */
-    static getInstance(options: {
-        isIPCMode: boolean;
-        nodeTRTCCloud: typeof NodeTRTCEngine.TRTCCloud | typeof NodeTRTCEngine.RemoteTRTCCloud;
-    }): TRTCAudioEffectManager;
+    destroy(): void;
     /**
      * 开启耳返
      *

package/liteav/extensions/AudioEffectManager/index.js

@@ -1,41 +1,38 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TRTCAudioEffectManager = void 0;
+const logger_1 = __importDefault(require("../../logger"));
 const NodeTRTCEngine = require('../../../build/Release/trtc_electron_sdk.node');
-// To do: 待替换为 SDK JS 层 Logger
-const logger = console;
 /**
  * 音效管理器
  */
 class TRTCAudioEffectManager {
     constructor(options) {
         this.logPrefix = "[TRTCAudioEffectManager]";
-        if (!TRTCAudioEffectManager.audioEffectManager) {
-            this.promiseStore = new Map();
-            this.eventHandler = this.eventHandler.bind(this);
-            TRTCAudioEffectManager.isIPCMode = options.isIPCMode;
-            if (TRTCAudioEffectManager.isIPCMode) {
-                this.nodeAudioEffectManager = new NodeTRTCEngine.NodeRemoteAudioEffectManager();
-                this.nodeAudioEffectManager.setRemoteAudioEffectManagerCallback(this.eventHandler);
-            }
-            else {
-                this.nodeAudioEffectManager = options.nodeTRTCCloud;
-            }
-            TRTCAudioEffectManager.audioEffectManager = this;
+        this.promiseStore = new Map();
+        this.eventHandler = this.eventHandler.bind(this);
+        this.isIPCMode = options.isIPCMode;
+        if (this.isIPCMode) {
+            this.nodeAudioEffectManager = new NodeTRTCEngine.NodeRemoteAudioEffectManager();
+            this.nodeAudioEffectManager.setRemoteAudioEffectManagerCallback(this.eventHandler);
         }
         else {
-            return TRTCAudioEffectManager.audioEffectManager;
+            this.nodeAudioEffectManager = options.nodeTRTCCloud;
         }
     }
-    /**
-     * 获取音效管理器
-     * @returns {TRTCAudioEffectManager}
-     */
-    static getInstance(options) {
-        if (!TRTCAudioEffectManager.audioEffectManager) {
-            TRTCAudioEffectManager.audioEffectManager = new TRTCAudioEffectManager(options);
-        }
-        return TRTCAudioEffectManager.audioEffectManager;
+    destroy() {
+        var _a, _b;
+        this.nodeAudioEffectManager = null;
+        (_a = this.promiseStore) === null || _a === void 0 ? void 0 : _a.forEach((value) => {
+            value.forEach(({ reject }) => {
+                reject();
+            });
+        });
+        (_b = this.promiseStore) === null || _b === void 0 ? void 0 : _b.clear();
+        this.promiseStore = undefined;
     }
     /////////////////////////////////////////////////////////////////////////////////
     //
@@ -55,7 +52,7 @@ class TRTCAudioEffectManager {
      * @returns {Promise<void>}
      */
     enableVoiceEarMonitor(enable) {
-        logger.debug(`${this.logPrefix}enableVoiceEarMonitor:${enable}`);
+        logger_1.default.debug(`${this.logPrefix}enableVoiceEarMonitor:${enable}`);
         this.nodeAudioEffectManager.enableVoiceEarMonitor(enable);
         return Promise.resolve();
     }
@@ -69,7 +66,7 @@ class TRTCAudioEffectManager {
      * @returns {Promise<void>}
      */
     setVoiceEarMonitorVolume(volume) {
-        logger.debug(`${this.logPrefix}setVoiceEarMonitorVolume:${volume}`);
+        logger_1.default.debug(`${this.logPrefix}setVoiceEarMonitorVolume:${volume}`);
         this.nodeAudioEffectManager.setVoiceEarMonitorVolume(volume);
         return Promise.resolve();
     }
@@ -83,7 +80,7 @@ class TRTCAudioEffectManager {
      * @returns {Promise<void>}
      */
     setVoiceReverbType(type) {
-        logger.debug(`${this.logPrefix}setVoiceReverbType: ${type}`);
+        logger_1.default.debug(`${this.logPrefix}setVoiceReverbType: ${type}`);
         this.nodeAudioEffectManager.setVoiceReverbType(type);
         return Promise.resolve();
     }
@@ -97,7 +94,7 @@ class TRTCAudioEffectManager {
      * @returns {Promise<void>}
      */
     setVoiceChangerType(type) {
-        logger.debug(`${this.logPrefix}setVoiceChangerType: ${type}`);
+        logger_1.default.debug(`${this.logPrefix}setVoiceChangerType: ${type}`);
         this.nodeAudioEffectManager.setVoiceChangerType(type);
         return Promise.resolve();
     }
@@ -111,7 +108,7 @@ class TRTCAudioEffectManager {
      * @returns {Promise<void>}
      */
     setVoiceCaptureVolume(volume) {
-        logger.debug(`${this.logPrefix}setVoiceCaptureVolume: ${volume}`);
+        logger_1.default.debug(`${this.logPrefix}setVoiceCaptureVolume: ${volume}`);
         this.nodeAudioEffectManager.setVoiceCaptureVolume(volume);
         return Promise.resolve();
     }
@@ -123,7 +120,7 @@ class TRTCAudioEffectManager {
      * @returns {Promise<void>}
      */
     setVoicePitch(pitch) {
-        logger.debug(`${this.logPrefix}setVoicePitch: ${pitch}`);
+        logger_1.default.debug(`${this.logPrefix}setVoicePitch: ${pitch}`);
         this.nodeAudioEffectManager.setVoicePitch(pitch);
         return Promise.resolve();
     }
@@ -141,7 +138,7 @@ class TRTCAudioEffectManager {
      * @returns {Promise<void>}
      */
     setMusicObserver(observer) {
-        logger.debug(`${this.logPrefix}setMusicObserver:`, observer);
+        logger_1.default.debug(`${this.logPrefix}setMusicObserver:`, observer);
         this.nodeAudioEffectManager.setMusicObserver(observer.onStart, observer.onPlayProgress, observer.onComplete);
         return Promise.resolve();
     }
@@ -152,7 +149,7 @@ class TRTCAudioEffectManager {
      * @returns {Promise<void>}
      */
     startPlayMusic(param) {
-        logger.debug(`${this.logPrefix}startPlayMusic:`, param);
+        logger_1.default.debug(`${this.logPrefix}startPlayMusic:`, param);
         this.nodeAudioEffectManager.startPlayMusic(param);
         return Promise.resolve();
     }
@@ -163,7 +160,7 @@ class TRTCAudioEffectManager {
      * @returns {Promise<void>}
      */
     stopPlayMusic(id) {
-        logger.debug(`${this.logPrefix}stopPlayMusic:${id}`);
+        logger_1.default.debug(`${this.logPrefix}stopPlayMusic:${id}`);
         this.nodeAudioEffectManager.stopPlayMusic(id);
         return Promise.resolve();
     }
@@ -174,7 +171,7 @@ class TRTCAudioEffectManager {
      * @returns {Promise<void>}
      */
     pausePlayMusic(id) {
-        logger.debug(`${this.logPrefix}pausePlayMusic:${id}`);
+        logger_1.default.debug(`${this.logPrefix}pausePlayMusic:${id}`);
         this.nodeAudioEffectManager.pausePlayMusic(id);
         return Promise.resolve();
     }
@@ -185,7 +182,7 @@ class TRTCAudioEffectManager {
      * @returns {Promise<void>}
      */
     resumePlayMusic(id) {
-        logger.debug(`${this.logPrefix}resumePlayMusic:${id}`);
+        logger_1.default.debug(`${this.logPrefix}resumePlayMusic:${id}`);
         this.nodeAudioEffectManager.resumePlayMusic(id);
         return Promise.resolve();
     }
@@ -202,7 +199,7 @@ class TRTCAudioEffectManager {
      * @returns {Promise<void>}
      */
     setAllMusicVolume(volume) {
-        logger.debug(`${this.logPrefix}setAllMusicVolume:${volume}`);
+        logger_1.default.debug(`${this.logPrefix}setAllMusicVolume:${volume}`);
         this.nodeAudioEffectManager.setAllMusicVolume(volume);
         return Promise.resolve();
     }
@@ -216,7 +213,7 @@ class TRTCAudioEffectManager {
      * @returns {Promise<void>}
      */
     setMusicPublishVolume(id, volume) {
-        logger.debug(`${this.logPrefix}setMusicPublishVolume:${id} ${volume}`);
+        logger_1.default.debug(`${this.logPrefix}setMusicPublishVolume:${id} ${volume}`);
         this.nodeAudioEffectManager.setMusicPublishVolume(id, volume);
         return Promise.resolve();
     }
@@ -230,7 +227,7 @@ class TRTCAudioEffectManager {
      * @returns {Promise<void>}
      */
     setMusicPlayoutVolume(id, volume) {
-        logger.debug(`${this.logPrefix}setMusicPlayoutVolume:${id} ${volume}`);
+        logger_1.default.debug(`${this.logPrefix}setMusicPlayoutVolume:${id} ${volume}`);
         this.nodeAudioEffectManager.setMusicPlayoutVolume(id, volume);
         return Promise.resolve();
     }
@@ -242,7 +239,7 @@ class TRTCAudioEffectManager {
      * @returns {Promise<void>}
      */
     setMusicPitch(id, pitch) {
-        logger.debug(`${this.logPrefix}setMusicPitch:${id} ${pitch}`);
+        logger_1.default.debug(`${this.logPrefix}setMusicPitch:${id} ${pitch}`);
         this.nodeAudioEffectManager.setMusicPitch(id, pitch);
         return Promise.resolve();
     }
@@ -254,7 +251,7 @@ class TRTCAudioEffectManager {
      * @returns {Promise<void>}
      */
     setMusicSpeedRate(id, speedRate) {
-        logger.debug(`${this.logPrefix}setMusicSpeedRate:${id} ${speedRate}`);
+        logger_1.default.debug(`${this.logPrefix}setMusicSpeedRate:${id} ${speedRate}`);
         this.nodeAudioEffectManager.setMusicSpeedRate(id, speedRate);
         return Promise.resolve();
     }
@@ -265,8 +262,8 @@ class TRTCAudioEffectManager {
      * @return {Promise<Number>|Number} 成功返回当前播放时间，单位：毫秒，失败返回 -1。
      */
     getMusicCurrentPosInMS(id) {
-        logger.debug(`${this.logPrefix}getMusicCurrentPosInMS: ${id}`);
-        if (TRTCAudioEffectManager.isIPCMode) {
+        logger_1.default.debug(`${this.logPrefix}getMusicCurrentPosInMS: ${id}`);
+        if (this.isIPCMode) {
             return new Promise((resolve, reject) => {
                 const key = `onGetMusicCurrentPosInMS-${id}`;
                 this.addPromise(key, resolve, reject);
@@ -284,8 +281,8 @@ class TRTCAudioEffectManager {
      * @return {Promise<number>|Number} 成功返回时长，失败返回 -1。
      */
     getMusicDurationInMS(path) {
-        logger.debug(`${this.logPrefix}getMusicDurationInMS: ${path}`);
-        if (TRTCAudioEffectManager.isIPCMode) {
+        logger_1.default.debug(`${this.logPrefix}getMusicDurationInMS: ${path}`);
+        if (this.isIPCMode) {
             return new Promise((resolve, reject) => {
                 const key = `onGetMusicDurationInMS-${path}`;
                 this.addPromise(key, resolve, reject);
@@ -307,7 +304,7 @@ class TRTCAudioEffectManager {
      * @returns {Promise<void>}
      */
     seekMusicToPosInTime(id, pts) {
-        logger.debug(`${this.logPrefix}seekMusicToPosInTime:${id} ${pts}`);
+        logger_1.default.debug(`${this.logPrefix}seekMusicToPosInTime:${id} ${pts}`);
         this.nodeAudioEffectManager.seekMusicToPosInTime(id, pts);
         return Promise.resolve();
     }
@@ -320,7 +317,7 @@ class TRTCAudioEffectManager {
      * @returns {Promise<void>}
      */
     setMusicScratchSpeedRate(id, speedRate) {
-        logger.debug(`${this.logPrefix}seekMusicToPosInTime:${id} ${speedRate}`);
+        logger_1.default.debug(`${this.logPrefix}seekMusicToPosInTime:${id} ${speedRate}`);
         this.nodeAudioEffectManager.setMusicScratchSpeedRate(id, speedRate);
         return Promise.resolve();
     }
@@ -332,7 +329,7 @@ class TRTCAudioEffectManager {
      * @returns {Promise<void>}
      */
     setPreloadObserver(observer) {
-        logger.debug(`${this.logPrefix}setPreloadObserver:`, observer);
+        logger_1.default.debug(`${this.logPrefix}setPreloadObserver:`, observer);
         this.nodeAudioEffectManager.setPreloadObserver(observer.onLoadProgress, observer.onLoadError);
         return Promise.resolve();
     }
@@ -349,7 +346,7 @@ class TRTCAudioEffectManager {
      * @returns {Promise<void>}
      */
     preloadMusic(param) {
-        logger.debug(`${this.logPrefix}preloadMusic:`, param);
+        logger_1.default.debug(`${this.logPrefix}preloadMusic:`, param);
         this.nodeAudioEffectManager.preloadMusic(param);
         return Promise.resolve();
     }
@@ -360,8 +357,8 @@ class TRTCAudioEffectManager {
      * @returns {Promise<Number>|Number}
      */
     getMusicTrackCount(id) {
-        logger.debug(`${this.logPrefix}getMusicTrackCount: ${id}`);
-        if (TRTCAudioEffectManager.isIPCMode) {
+        logger_1.default.debug(`${this.logPrefix}getMusicTrackCount: ${id}`);
+        if (this.isIPCMode) {
             return new Promise((resolve, reject) => {
                 const key = `onGetMusicTrackCount-${id}`;
                 this.addPromise(key, resolve, reject);
@@ -382,15 +379,15 @@ class TRTCAudioEffectManager {
      * @returns {Promise<void>}
      */
     setMusicTrack(id, trackIndex) {
-        logger.debug(`${this.logPrefix}getMusicTrackCount:${id} ${trackIndex}`);
+        logger_1.default.debug(`${this.logPrefix}getMusicTrackCount:${id} ${trackIndex}`);
         this.nodeAudioEffectManager.setMusicTrack(id, trackIndex);
         return Promise.resolve();
     }
     eventHandler(args) {
-        logger.debug(`${this.logPrefix} event:`, args);
+        logger_1.default.debug(`${this.logPrefix} event:`, args);
         const key = args[0];
         const data = args[1];
-        logger.debug(`${this.logPrefix} event key: ${key} data:`, data);
+        logger_1.default.debug(`${this.logPrefix} event key: ${key} data:`, data);
         switch (key) {
             case "onGetMusicCurrentPosInMS":
                 this.removePromise(`${key}-${data.id}`, data.currentPos);
@@ -402,7 +399,7 @@ class TRTCAudioEffectManager {
                 this.removePromise(`${key}-${data.id}`, data.trackCount);
                 break;
             default:
-                logger.warn(`${this.logPrefix}eventHandler un-supported event:`, key);
+                logger_1.default.warn(`${this.logPrefix}eventHandler un-supported event:`, key);
         }
     }
     addPromise(key, resolve, reject) {

package/liteav/extensions/DeviceManager/index.d.ts

@@ -1,12 +1,11 @@
-declare const NodeTRTCEngine: any;
 import { TRTCCameraCaptureParams, TRTCDeviceInfo, TRTCDeviceType, Rect } from '../../trtc_define';
+declare const NodeTRTCEngine: any;
 /**
  * 设备管理器
  */
 export declare class TRTCDeviceManager {
     private logPrefix;
-    private static deviceNanager;
-    private static isIPCMode;
+    private isIPCMode;
     private nodeDeviceManager;
     private promiseStore;
     private eventEmitter;
@@ -14,14 +13,7 @@ export declare class TRTCDeviceManager {
         isIPCMode: boolean;
         nodeTRTCCloud: typeof NodeTRTCEngine.TRTCCloud | typeof NodeTRTCEngine.RemoteTRTCCloud;
     });
-    /**
-     * 获取设备管理器
-     * @returns {TRTCDeviceManager}
-     */
-    static getInstance(options: {
-        isIPCMode: boolean;
-        nodeTRTCCloud: typeof NodeTRTCEngine.TRTCCloud | typeof NodeTRTCEngine.RemoteTRTCCloud;
-    }): TRTCDeviceManager;
+    destroy(): void;
     /**
      * 获取设备列表
      *