trtc-electron-sdk 12.2.701 → 12.2.702

package/liteav/extensions/DeviceManager/index.js

@@ -1,43 +1,42 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TRTCDeviceManager = void 0;
 const events_1 = require("events");
-const NodeTRTCEngine = require('../../../build/Release/trtc_electron_sdk.node');
 const trtc_define_1 = require("../../trtc_define");
-const logger = console;
+const logger_1 = __importDefault(require("../../logger"));
+const NodeTRTCEngine = require('../../../build/Release/trtc_electron_sdk.node');
 /**
  * 设备管理器
  */
 class TRTCDeviceManager {
     constructor(options) {
         this.logPrefix = '[TRTCDeviceManager]';
-        if (!TRTCDeviceManager.deviceNanager) {
-            this.promiseStore = new Map();
-            this.eventEmitter = new events_1.EventEmitter();
-            this.eventHandler = this.eventHandler.bind(this);
-            TRTCDeviceManager.isIPCMode = options.isIPCMode;
-            if (TRTCDeviceManager.isIPCMode) {
-                this.nodeDeviceManager = new NodeTRTCEngine.NodeRemoteDeviceManager();
-                this.nodeDeviceManager.setRemoteDeviceManagerCallback(this.eventHandler);
-            }
-            else {
-                this.nodeDeviceManager = options.nodeTRTCCloud;
-            }
-            TRTCDeviceManager.deviceNanager = this;
+        this.promiseStore = new Map();
+        this.eventEmitter = new events_1.EventEmitter();
+        this.eventHandler = this.eventHandler.bind(this);
+        this.isIPCMode = options.isIPCMode;
+        if (this.isIPCMode) {
+            this.nodeDeviceManager = new NodeTRTCEngine.NodeRemoteDeviceManager();
+            this.nodeDeviceManager.setRemoteDeviceManagerCallback(this.eventHandler);
         }
         else {
-            return TRTCDeviceManager.deviceNanager;
+            this.nodeDeviceManager = options.nodeTRTCCloud;
         }
     }
-    /**
-     * 获取设备管理器
-     * @returns {TRTCDeviceManager}
-     */
-    static getInstance(options) {
-        if (!TRTCDeviceManager.deviceNanager) {
-            TRTCDeviceManager.deviceNanager = new TRTCDeviceManager(options);
-        }
-        return TRTCDeviceManager.deviceNanager;
+    destroy() {
+        var _a, _b;
+        this.nodeDeviceManager = 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;
+        this.eventEmitter = undefined;
     }
     /**
      * 获取设备列表
@@ -46,7 +45,7 @@ class TRTCDeviceManager {
      * @returns {Array<TRTCDeviceInfo>}
      */
     getDevicesList(type) {
-        logger.debug(`${this.logPrefix}getDevicesList`, type);
+        logger_1.default.debug(`${this.logPrefix}getDevicesList`, type);
         const deviceInfos = this.nodeDeviceManager.getDevicesList(type);
         if (type === trtc_define_1.TRTCDeviceType.TRTCDeviceTypeCamera) {
             deviceInfos === null || deviceInfos === void 0 ? void 0 : deviceInfos.forEach((item) => {
@@ -61,7 +60,7 @@ class TRTCDeviceManager {
                     }
                 }
                 catch (e) {
-                    logger.warn(`${this.logPrefix}camera device properties parse error.`, JSON.stringify(item));
+                    logger_1.default.warn(`${this.logPrefix}camera device properties parse error.`, JSON.stringify(item));
                     item.deviceProperties = {};
                 }
             });
@@ -69,8 +68,8 @@ class TRTCDeviceManager {
         return deviceInfos;
     }
     setCurrentDevice(type, deviceId) {
-        logger.debug(`${this.logPrefix}setCurrentDevice`, type, deviceId);
-        if (TRTCDeviceManager.isIPCMode) {
+        logger_1.default.debug(`${this.logPrefix}setCurrentDevice`, type, deviceId);
+        if (this.isIPCMode) {
             return new Promise((resolve, reject) => {
                 const key = `setCurrentDevice-${type}`;
                 this.addPromise(key, resolve, reject);
@@ -82,8 +81,8 @@ class TRTCDeviceManager {
         }
     }
     getCurrentDevice(type) {
-        logger.debug(`${this.logPrefix}getCurrentDevice`, type);
-        if (TRTCDeviceManager.isIPCMode) {
+        logger_1.default.debug(`${this.logPrefix}getCurrentDevice`, type);
+        if (this.isIPCMode) {
             return new Promise((resolve, reject) => {
                 const key = `getCurrentDevice-${type}`;
                 this.addPromise(key, resolve, reject);
@@ -95,8 +94,8 @@ class TRTCDeviceManager {
         }
     }
     setCurrentDeviceVolume(type, volume) {
-        logger.debug(`${this.logPrefix}setCurrentDeviceVolume`, type, volume);
-        if (TRTCDeviceManager.isIPCMode) {
+        logger_1.default.debug(`${this.logPrefix}setCurrentDeviceVolume`, type, volume);
+        if (this.isIPCMode) {
             return new Promise((resolve, reject) => {
                 const key = `setCurrentDeviceVolume-${type}`;
                 this.addPromise(key, resolve, reject);
@@ -108,8 +107,8 @@ class TRTCDeviceManager {
         }
     }
     getCurrentDeviceVolume(type) {
-        logger.debug(`${this.logPrefix}getCurrentDeviceVolume`, type);
-        if (TRTCDeviceManager.isIPCMode) {
+        logger_1.default.debug(`${this.logPrefix}getCurrentDeviceVolume`, type);
+        if (this.isIPCMode) {
             return new Promise((resolve, reject) => {
                 const key = `getCurrentDeviceVolume-${type}`;
                 this.addPromise(key, resolve, reject);
@@ -121,8 +120,8 @@ class TRTCDeviceManager {
         }
     }
     setCurrentDeviceMute(type, mute) {
-        logger.debug(`${this.logPrefix}setCurrentDeviceMute`, type, mute);
-        if (TRTCDeviceManager.isIPCMode) {
+        logger_1.default.debug(`${this.logPrefix}setCurrentDeviceMute`, type, mute);
+        if (this.isIPCMode) {
             return new Promise((resolve, reject) => {
                 const key = `setCurrentDeviceMute-${type}`;
                 this.addPromise(key, resolve, reject);
@@ -134,8 +133,8 @@ class TRTCDeviceManager {
         }
     }
     getCurrentDeviceMute(type) {
-        logger.debug(`${this.logPrefix}getCurrentDeviceMute`);
-        if (TRTCDeviceManager.isIPCMode) {
+        logger_1.default.debug(`${this.logPrefix}getCurrentDeviceMute`);
+        if (this.isIPCMode) {
             return new Promise((resolve, reject) => {
                 const key = `getCurrentDeviceMute-${type}`;
                 this.addPromise(key, resolve, reject);
@@ -147,8 +146,8 @@ class TRTCDeviceManager {
         }
     }
     enableFollowingDefaultAudioDevice(type, enable) {
-        logger.debug(`${this.logPrefix}enableFollowingDefaultAudioDevice`, type, enable);
-        if (TRTCDeviceManager.isIPCMode) {
+        logger_1.default.debug(`${this.logPrefix}enableFollowingDefaultAudioDevice`, type, enable);
+        if (this.isIPCMode) {
             return new Promise((resolve, reject) => {
                 const key = `enableFollowingDefaultAudioDevice-${type}`;
                 this.addPromise(key, resolve, reject);
@@ -160,8 +159,8 @@ class TRTCDeviceManager {
         }
     }
     startMicDeviceTest(interval, playback = false) {
-        logger.debug(`${this.logPrefix}startMicDeviceTest`, interval, playback);
-        if (TRTCDeviceManager.isIPCMode) {
+        logger_1.default.debug(`${this.logPrefix}startMicDeviceTest`, interval, playback);
+        if (this.isIPCMode) {
             return new Promise((resolve, reject) => {
                 const key = `startMicDeviceTest`;
                 this.addPromise(key, resolve, reject);
@@ -173,8 +172,8 @@ class TRTCDeviceManager {
         }
     }
     stopMicDeviceTest() {
-        logger.debug(`${this.logPrefix}stopMicDeviceTest`);
-        if (TRTCDeviceManager.isIPCMode) {
+        logger_1.default.debug(`${this.logPrefix}stopMicDeviceTest`);
+        if (this.isIPCMode) {
             return new Promise((resolve, reject) => {
                 const key = `stopMicDeviceTest`;
                 this.addPromise(key, resolve, reject);
@@ -186,8 +185,8 @@ class TRTCDeviceManager {
         }
     }
     startSpeakerDeviceTest(filePath) {
-        logger.debug(`${this.logPrefix}startSpeakerDeviceTest`, filePath);
-        if (TRTCDeviceManager.isIPCMode) {
+        logger_1.default.debug(`${this.logPrefix}startSpeakerDeviceTest`, filePath);
+        if (this.isIPCMode) {
             return new Promise((resolve, reject) => {
                 const key = `startSpeakerDeviceTest`;
                 this.addPromise(key, resolve, reject);
@@ -199,8 +198,8 @@ class TRTCDeviceManager {
         }
     }
     stopSpeakerDeviceTest() {
-        logger.debug(`${this.logPrefix}stopSpeakerDeviceTest`);
-        if (TRTCDeviceManager.isIPCMode) {
+        logger_1.default.debug(`${this.logPrefix}stopSpeakerDeviceTest`);
+        if (this.isIPCMode) {
             return new Promise((resolve, reject) => {
                 const key = `stopSpeakerDeviceTest`;
                 this.addPromise(key, resolve, reject);
@@ -212,8 +211,8 @@ class TRTCDeviceManager {
         }
     }
     setApplicationPlayVolume(volume) {
-        logger.debug(`${this.logPrefix}setApplicationPlayVolume`, volume);
-        if (TRTCDeviceManager.isIPCMode) {
+        logger_1.default.debug(`${this.logPrefix}setApplicationPlayVolume`, volume);
+        if (this.isIPCMode) {
             return new Promise((resolve, reject) => {
                 const key = `setApplicationPlayVolume`;
                 this.addPromise(key, resolve, reject);
@@ -225,8 +224,8 @@ class TRTCDeviceManager {
         }
     }
     getApplicationPlayVolume() {
-        logger.debug(`${this.logPrefix}getApplicationPlayVolume`);
-        if (TRTCDeviceManager.isIPCMode) {
+        logger_1.default.debug(`${this.logPrefix}getApplicationPlayVolume`);
+        if (this.isIPCMode) {
             return new Promise((resolve, reject) => {
                 const key = `getApplicationPlayVolume`;
                 this.addPromise(key, resolve, reject);
@@ -238,8 +237,8 @@ class TRTCDeviceManager {
         }
     }
     setApplicationMuteState(mute) {
-        logger.debug(`${this.logPrefix}setApplicationMuteState`, mute);
-        if (TRTCDeviceManager.isIPCMode) {
+        logger_1.default.debug(`${this.logPrefix}setApplicationMuteState`, mute);
+        if (this.isIPCMode) {
             return new Promise((resolve, reject) => {
                 const key = `setApplicationMuteState`;
                 this.addPromise(key, resolve, reject);
@@ -251,8 +250,8 @@ class TRTCDeviceManager {
         }
     }
     getApplicationMuteState() {
-        logger.debug(`${this.logPrefix}getApplicationMuteState`);
-        if (TRTCDeviceManager.isIPCMode) {
+        logger_1.default.debug(`${this.logPrefix}getApplicationMuteState`);
+        if (this.isIPCMode) {
             return new Promise((resolve, reject) => {
                 const key = `setApplicationMuteState`;
                 this.addPromise(key, resolve, reject);
@@ -264,8 +263,8 @@ class TRTCDeviceManager {
         }
     }
     setCameraCaptureParam(params) {
-        logger.debug(`${this.logPrefix}setCameraCaptureParam:`, params);
-        if (TRTCDeviceManager.isIPCMode) {
+        logger_1.default.debug(`${this.logPrefix}setCameraCaptureParam:`, params);
+        if (this.isIPCMode) {
             return this.nodeDeviceManager.setCameraCapturerParam(params);
         }
         else {
@@ -314,7 +313,7 @@ class TRTCDeviceManager {
         }
     }
     eventHandler(args) {
-        logger.debug('TRTCDeviceManager event:', args);
+        logger_1.default.debug('TRTCDeviceManager event:', args);
         const key = args[0];
         const data = args[1];
         switch (key) {
@@ -377,13 +376,13 @@ class TRTCDeviceManager {
                 this.onGetApplicationMuteStateFinished(data.muted);
                 break;
             default:
-                logger.warn("TRTCDeviceManager unsupported event type:", key);
+                logger_1.default.warn("TRTCDeviceManager unsupported event type:", key);
                 break;
         }
     }
     onDeviceChange(deviceId, type, state) {
         var _a;
-        logger.debug(`${this.logPrefix}onDeviceChange`, deviceId, type, state);
+        logger_1.default.debug(`${this.logPrefix}onDeviceChange`, deviceId, type, state);
         (_a = this.eventEmitter) === null || _a === void 0 ? void 0 : _a.emit('onDeviceChange', deviceId, type, state);
     }
     onSetCurrentDeviceFinished(type, result) {
@@ -456,7 +455,7 @@ class TRTCDeviceManager {
     }
     // ******   这一部分接口暴露不合理，暂时通过 TRTCMediaMixingManager 暴露给用户   **************/
     startCameraDeviceTest(windowID, rect) {
-        logger.debug(`${this.logPrefix}startCameraDeviceTest`, windowID, rect);
+        logger_1.default.debug(`${this.logPrefix}startCameraDeviceTest`, windowID, rect);
         let newWindowID = 0;
         if (windowID instanceof Uint8Array) {
             for (let i = windowID.length - 1; i >= 0; i--) {
@@ -473,7 +472,7 @@ class TRTCDeviceManager {
         });
     }
     stopCameraDeviceTest() {
-        logger.debug(`${this.logPrefix}stopCameraDeviceTest`);
+        logger_1.default.debug(`${this.logPrefix}stopCameraDeviceTest`);
         return new Promise((resolve, reject) => {
             const key = `stopCameraDeviceTest`;
             this.addPromise(key, resolve, reject);
@@ -481,23 +480,23 @@ class TRTCDeviceManager {
         });
     }
     setCameraTestRenderMirror(mirror) {
-        logger.debug(`${this.logPrefix}setCameraTestRenderMirror`, mirror);
+        logger_1.default.debug(`${this.logPrefix}setCameraTestRenderMirror`, mirror);
         this.nodeDeviceManager.setCameraTestRenderMirror(mirror);
     }
     setCameraTestDeviceId(cameraId) {
-        logger.debug(`${this.logPrefix}setCameraTestDeviceId`, cameraId);
+        logger_1.default.debug(`${this.logPrefix}setCameraTestDeviceId`, cameraId);
         this.nodeDeviceManager.setCameraTestDeviceId(cameraId);
     }
     setCameraTestResolution(width, height) {
-        logger.debug(`${this.logPrefix}setCameraTestResolution`, width, height);
+        logger_1.default.debug(`${this.logPrefix}setCameraTestResolution`, width, height);
         this.nodeDeviceManager.setCameraTestResolution(width, height);
     }
     setCameraTestVideoPluginPath(path) {
-        logger.debug(`${this.logPrefix}setCameraTestVideoPluginPath`, path);
+        logger_1.default.debug(`${this.logPrefix}setCameraTestVideoPluginPath`, path);
         this.nodeDeviceManager.setCameraTestVideoPluginPath(path);
     }
     setCameraTestVideoPluginParameter(params) {
-        logger.debug(`${this.logPrefix}setCameraTestVideoPluginParameter`, params);
+        logger_1.default.debug(`${this.logPrefix}setCameraTestVideoPluginParameter`, params);
         this.nodeDeviceManager.setCameraTestVideoPluginParameter(params);
     }
 }

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

@@ -30,21 +30,13 @@ export declare type TRTCMediaMixingEncParam = {
  */
 export declare class TRTCMediaMixingManager {
     private logPrefix;
-    private static mediaMixingManager;
     private nodeMediaMixingPlugin;
     private deviceManager;
     private eventEmitter;
     constructor(options: {
         deviceManager: TRTCDeviceManager;
     });
-    /**
-     * 获取混流管理器
-     *
-     * @returns {TRTCMediaMixingManager}
-     */
-    static getInstance(options: {
-        deviceManager: TRTCDeviceManager;
-    }): TRTCMediaMixingManager;
+    destroy(): void;
     private eventHandler;
     /**
      * 设置混流视频预览参数
@@ -102,7 +94,7 @@ export declare class TRTCMediaMixingManager {
    *
    * 如果用户应用有特殊配置，默认路径可能找不到服务进程程序，需要自行传入路径。
    *
-   * @param path {string} - 设置服务进程程序路径
+   * @param path {string} - 服务进程程序路径
    *
    * @returns {Promise<void>}
    */

package/liteav/extensions/MediaMixingManager/index.js

@@ -8,9 +8,13 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TRTCMediaMixingManager = exports.TRTCMediaSourceType = exports.TRTCMediaMixingEvent = void 0;
 const events_1 = require("events");
+const logger_1 = __importDefault(require("../../logger"));
 const NodeTRTCEngine = require('../../../build/Release/trtc_electron_sdk.node');
 var TRTCMediaMixingEvent;
 (function (TRTCMediaMixingEvent) {
@@ -24,39 +28,26 @@ var TRTCMediaSourceType;
     TRTCMediaSourceType[TRTCMediaSourceType["kImage"] = 2] = "kImage";
     TRTCMediaSourceType[TRTCMediaSourceType["kRemoteVideo"] = 3] = "kRemoteVideo";
 })(TRTCMediaSourceType = exports.TRTCMediaSourceType || (exports.TRTCMediaSourceType = {}));
-const logger = console;
 /**
  * 本地混流管理器
  */
 class TRTCMediaMixingManager {
     constructor(options) {
         this.logPrefix = '[TRTCMediaMixingManager]';
-        if (!TRTCMediaMixingManager.mediaMixingManager) {
-            this.eventEmitter = new events_1.EventEmitter();
-            this.eventHandler = this.eventHandler.bind(this);
-            this.nodeMediaMixingPlugin = new NodeTRTCEngine.NodeRemoteMultiSourcePlugin();
-            this.nodeMediaMixingPlugin.setRemoteMultiSourcePluginCallback(this.eventHandler);
-            this.deviceManager = options.deviceManager;
-            TRTCMediaMixingManager.mediaMixingManager = this;
-            this.setMediaServerPath('');
-        }
-        else {
-            return TRTCMediaMixingManager.mediaMixingManager;
-        }
-    }
-    /**
-     * 获取混流管理器
-     *
-     * @returns {TRTCMediaMixingManager}
-     */
-    static getInstance(options) {
-        if (!TRTCMediaMixingManager.mediaMixingManager) {
-            TRTCMediaMixingManager.mediaMixingManager = new TRTCMediaMixingManager(options);
-        }
-        return TRTCMediaMixingManager.mediaMixingManager;
+        this.eventEmitter = new events_1.EventEmitter();
+        this.eventHandler = this.eventHandler.bind(this);
+        this.nodeMediaMixingPlugin = new NodeTRTCEngine.NodeRemoteMultiSourcePlugin();
+        this.nodeMediaMixingPlugin.setRemoteMultiSourcePluginCallback(this.eventHandler);
+        this.deviceManager = options.deviceManager;
+        this.setMediaServerPath('');
+    }
+    destroy() {
+        this.deviceManager = null;
+        this.nodeMediaMixingPlugin = null;
+        this.eventEmitter = null;
     }
     eventHandler(args) {
-        logger.log(`${this.logPrefix} event:`, args);
+        logger_1.default.log(`${this.logPrefix} event:`, args);
         // const key = args[0] as string;
         // const data = args[1] as { [key: string]: never };
         // To do: 待完善
@@ -154,7 +145,7 @@ class TRTCMediaMixingManager {
    *
    * 如果用户应用有特殊配置，默认路径可能找不到服务进程程序，需要自行传入路径。
    *
-   * @param path {string} - 设置服务进程程序路径
+   * @param path {string} - 服务进程程序路径
    *
    * @returns {Promise<void>}
    */
@@ -173,7 +164,7 @@ class TRTCMediaMixingManager {
                     serverPath = `${resourcesPath}\\liteav_media_server.exe`;
                 }
             }
-            logger.log(`${this.logPrefix} server path:${serverPath}`);
+            logger_1.default.log(`${this.logPrefix} server path:${serverPath}`);
             return yield this.nodeMediaMixingPlugin.setMediaServerPath(serverPath);
         });
     }
@@ -199,25 +190,32 @@ class TRTCMediaMixingManager {
     }
     // ******   这一部分接口暴露不合理，暂时不对暴露在 API 文档上   **************/
     startCameraDeviceTest(windowID, rect) {
-        return this.deviceManager.startCameraDeviceTest(windowID, rect);
+        var _a;
+        return ((_a = this.deviceManager) === null || _a === void 0 ? void 0 : _a.startCameraDeviceTest(windowID, rect)) || Promise.reject();
     }
     stopCameraDeviceTest() {
-        return this.deviceManager.stopCameraDeviceTest();
+        var _a;
+        return ((_a = this.deviceManager) === null || _a === void 0 ? void 0 : _a.stopCameraDeviceTest()) || Promise.reject();
     }
     setCameraTestRenderMirror(mirror) {
-        this.deviceManager.setCameraTestRenderMirror(mirror);
+        var _a;
+        (_a = this.deviceManager) === null || _a === void 0 ? void 0 : _a.setCameraTestRenderMirror(mirror);
     }
     setCameraTestDeviceId(cameraId) {
-        this.deviceManager.setCameraTestDeviceId(cameraId);
+        var _a;
+        (_a = this.deviceManager) === null || _a === void 0 ? void 0 : _a.setCameraTestDeviceId(cameraId);
     }
     setCameraTestResolution(width, height) {
-        this.deviceManager.setCameraTestResolution(width, height);
+        var _a;
+        (_a = this.deviceManager) === null || _a === void 0 ? void 0 : _a.setCameraTestResolution(width, height);
     }
     setCameraTestVideoPluginPath(path) {
-        this.deviceManager.setCameraTestVideoPluginPath(path);
+        var _a;
+        (_a = this.deviceManager) === null || _a === void 0 ? void 0 : _a.setCameraTestVideoPluginPath(path);
     }
     setCameraTestVideoPluginParameter(params) {
-        this.deviceManager.setCameraTestVideoPluginParameter(params);
+        var _a;
+        (_a = this.deviceManager) === null || _a === void 0 ? void 0 : _a.setCameraTestVideoPluginParameter(params);
     }
 }
 exports.TRTCMediaMixingManager = TRTCMediaMixingManager;

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

@@ -23,8 +23,7 @@ export declare class TRTCPlugin {
  */
 export declare class TRTCPluginManager {
     private logPrefix;
-    private static pluginManager;
-    private static isIPCMode;
+    private isIPCMode;
     private nodePluginManager;
     private videoProcessBufferType;
     private videoProcessPixelFormat;
@@ -32,15 +31,7 @@ export declare class TRTCPluginManager {
         isIPCMode: boolean;
         nodeTRTCCloud: typeof NodeTRTCEngine.TRTCCloud | typeof NodeTRTCEngine.RemoteTRTCCloud;
     });
-    /**
-     * 获取插件管理器
-     *
-     * @returns {TRTCPluginManager}
-     */
-    static getInstance(options: {
-        isIPCMode: boolean;
-        nodeTRTCCloud: typeof NodeTRTCEngine.TRTCCloud | typeof NodeTRTCEngine.RemoteTRTCCloud;
-    }): TRTCPluginManager;
+    destroy(): void;
     setPluginParams(type: TRTCPluginType, options: TRTCVideoProcessPluginOptions | TRTCMediaEncryptDecryptPluginOptions | TRTCAudioProcessPluginOptions): void;
     private _setVideoProcessPluginParams;
     private _setMediaEncryptDecryptPluginParams;

package/liteav/extensions/PluginManager/index.js

@@ -1,9 +1,12 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TRTCPluginManager = exports.TRTCPlugin = void 0;
 const trtc_define_1 = require("../../trtc_define");
+const logger_1 = __importDefault(require("../../logger"));
 const NodeTRTCEngine = require('../../../build/Release/trtc_electron_sdk.node');
-const logger = console;
 /**
  * TRTC 插件
  */
@@ -21,7 +24,7 @@ class TRTCPlugin {
         return this.pluginId;
     }
     enable(flag = true) {
-        logger.log(`${this.logPrefix}enable:${flag} ${this.pluginId}`);
+        logger_1.default.log(`${this.logPrefix}enable:${flag} ${this.pluginId}`);
         this.nativeVideoEffectPlugin.enable(flag);
     }
     /**
@@ -31,7 +34,7 @@ class TRTCPlugin {
         this.enable(false);
     }
     setParameter(param) {
-        logger.log(`${this.logPrefix}setParameter:${this.pluginId}`);
+        logger_1.default.log(`${this.logPrefix}setParameter:${this.pluginId}`);
         this.nativeVideoEffectPlugin.setParameter(param);
     }
 }
@@ -44,42 +47,28 @@ class TRTCPluginManager {
         this.logPrefix = '[TRTCPluginManager]';
         this.videoProcessBufferType = trtc_define_1.TRTCVideoBufferType.TRTCVideoBufferType_Buffer;
         this.videoProcessPixelFormat = trtc_define_1.TRTCVideoPixelFormat.TRTCVideoPixelFormat_I420;
-        if (!TRTCPluginManager.pluginManager) {
-            TRTCPluginManager.isIPCMode = options.isIPCMode;
-            if (TRTCPluginManager.isIPCMode) {
-                this.nodePluginManager = new NodeTRTCEngine.NodeRemoteVideoPluginManager();
-            }
-            else {
-                this.videoProcessBufferType = trtc_define_1.TRTCVideoBufferType.TRTCVideoBufferType_Buffer;
-                this.videoProcessPixelFormat = trtc_define_1.TRTCVideoPixelFormat.TRTCVideoPixelFormat_I420;
-                this.nodePluginManager = options.nodeTRTCCloud;
-            }
-            TRTCPluginManager.pluginManager = this;
+        this.isIPCMode = options.isIPCMode;
+        if (this.isIPCMode) {
+            this.nodePluginManager = new NodeTRTCEngine.NodeRemoteVideoPluginManager();
         }
         else {
-            return TRTCPluginManager.pluginManager;
+            this.videoProcessBufferType = trtc_define_1.TRTCVideoBufferType.TRTCVideoBufferType_Buffer;
+            this.videoProcessPixelFormat = trtc_define_1.TRTCVideoPixelFormat.TRTCVideoPixelFormat_I420;
+            this.nodePluginManager = options.nodeTRTCCloud;
         }
     }
     ;
-    /**
-     * 获取插件管理器
-     *
-     * @returns {TRTCPluginManager}
-     */
-    static getInstance(options) {
-        if (!TRTCPluginManager.pluginManager) {
-            TRTCPluginManager.pluginManager = new TRTCPluginManager(options);
-        }
-        return TRTCPluginManager.pluginManager;
+    destroy() {
+        this.nodePluginManager = null;
     }
     setPluginParams(type, options) {
-        logger.log(`${this.logPrefix}setPluginParams params:`, type, options);
-        if (TRTCPluginManager.isIPCMode) {
+        logger_1.default.log(`${this.logPrefix}setPluginParams params:`, type, options);
+        if (this.isIPCMode) {
             if (type === trtc_define_1.TRTCPluginType.TRTCPluginTypeVideoProcess) {
                 this.nodePluginManager.setVideoPluginFormat(trtc_define_1.TRTCVideoBufferType.TRTCVideoBufferType_Buffer, options.pixelFormat);
             }
             else {
-                logger.log(`${this.logPrefix}setPluginParams not supported params:`, type, options);
+                logger_1.default.log(`${this.logPrefix}setPluginParams not supported params:`, type, options);
             }
         }
         else {
@@ -94,7 +83,7 @@ class TRTCPluginManager {
                     this._setAudioProcessPluginParams(options);
                     break;
                 default:
-                    logger.log(`setPluginParams invalid type:${type}`);
+                    logger_1.default.log(`setPluginParams invalid type:${type}`);
                     break;
             }
         }
@@ -111,7 +100,7 @@ class TRTCPluginManager {
                     this.videoProcessBufferType = trtc_define_1.TRTCVideoBufferType.TRTCVideoBufferType_Texture;
                     break;
                 default:
-                    logger.error(`${this.logPrefix}setPluginParams() unspported pixelFormat: ${options.pixelFormat}`);
+                    logger_1.default.error(`${this.logPrefix}setPluginParams() unspported pixelFormat: ${options.pixelFormat}`);
                     return;
             }
             this.videoProcessPixelFormat = options.pixelFormat;
@@ -131,8 +120,8 @@ class TRTCPluginManager {
         }
     }
     addPlugin(options) {
-        logger.log(`${this.logPrefix}addPlugin options:`, options);
-        if (TRTCPluginManager.isIPCMode) {
+        logger_1.default.log(`${this.logPrefix}addPlugin options:`, options);
+        if (this.isIPCMode) {
             const nativeVideoEffectPlugin = this.nodePluginManager.addVideoPlugin(options.deviceId, options.id, options.path);
             return new TRTCPlugin(options.id, options.deviceId || '', nativeVideoEffectPlugin);
         }
@@ -159,8 +148,8 @@ class TRTCPluginManager {
         };
     }
     removePlugin(pluginId, deviceId) {
-        logger.log(`${this.logPrefix}removePlugin pluginId:${pluginId} deviceId:${deviceId}`);
-        if (TRTCPluginManager.isIPCMode) {
+        logger_1.default.log(`${this.logPrefix}removePlugin pluginId:${pluginId} deviceId:${deviceId}`);
+        if (this.isIPCMode) {
             this.nodePluginManager.removeVideoPlugin(deviceId, pluginId);
         }
         else {
@@ -168,7 +157,7 @@ class TRTCPluginManager {
         }
     }
     setCallback(callback) {
-        if (TRTCPluginManager.isIPCMode) {
+        if (this.isIPCMode) {
             this.nodePluginManager.setCallback(callback);
         }
         else {
@@ -179,9 +168,9 @@ class TRTCPluginManager {
      * @deprecated
      */
     getPluginList() {
-        logger.log(`${this.logPrefix}getPluginList`);
-        if (TRTCPluginManager.isIPCMode) {
-            logger.warn(`${this.logPrefix}getPluginList not supported`);
+        logger_1.default.log(`${this.logPrefix}getPluginList`);
+        if (this.isIPCMode) {
+            logger_1.default.warn(`${this.logPrefix}getPluginList not supported`);
             return null;
         }
         else {