trtc-electron-sdk 12.2.115-beta.15 → 12.2.115-beta.17

package/liteav/base/PromiseStore.d.ts

@@ -3,8 +3,8 @@ declare class PromiseStore {
     private promiseStore;
     constructor();
     addPromise(key: string, resolve: (data: void | PromiseLike<void>) => void, reject: (reason?: any) => void): void;
-    resolvePromise(key: string, value: void | PromiseLike<void>): void;
-    rejectPromise(key: string, reason?: any): void;
+    resolvePromise(key: string, value: void | PromiseLike<void>): boolean;
+    rejectPromise(key: string, reason?: any): boolean;
     destroy(): void;
 }
 export default PromiseStore;

package/liteav/base/PromiseStore.js

@@ -1,9 +1,5 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-const logger_1 = __importDefault(require("../logger"));
 class PromiseStore {
     constructor() {
         this.logPrefix = '[PromiseStore]';
@@ -27,9 +23,10 @@ class PromiseStore {
                 resolve(value);
             });
             this.promiseStore.delete(key);
+            return true;
         }
         else {
-            logger_1.default.warn(`${this.logPrefix}resolvePromise '${key}' not existed`);
+            return false;
         }
     }
     rejectPromise(key, reason) {
@@ -40,9 +37,10 @@ class PromiseStore {
                 reject(reason);
             });
             this.promiseStore.delete(key);
+            return true;
         }
         else {
-            logger_1.default.warn(`${this.logPrefix}rejectPromise '${key}' not existed`);
+            return false;
         }
     }
     destroy() {

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

@@ -46,8 +46,9 @@ export declare enum TRTCMediaMixingEvent {
      * @description 错误事件
      *
      * @event TRTCMediaMixingEvent#onError
-     * @param {TRTCMediaMixingErrorCode} errCode 错误码
+     * @param {TRTCMediaMixingErrorCode} errorCode 错误码
      * @param {String} errorMessage 错误信息
+     * @param {TRTCMediaSource|undefined} 错误涉及的媒体源，可能为空
      *
      */
     onError = "onError",

package/liteav/extensions/MediaMixingManager/MediaMixingManager.js

@@ -189,8 +189,9 @@ var TRTCMediaMixingEvent;
      * @description 错误事件
      *
      * @event TRTCMediaMixingEvent#onError
-     * @param {TRTCMediaMixingErrorCode} errCode 错误码
+     * @param {TRTCMediaMixingErrorCode} errorCode 错误码
      * @param {String} errorMessage 错误信息
+     * @param {TRTCMediaSource|undefined} 错误涉及的媒体源，可能为空
      *
      */
     TRTCMediaMixingEvent["onError"] = "onError";
@@ -443,11 +444,16 @@ class TRTCMediaMixingManager {
         this.windowID = realWindowID;
         if (realWindowID !== 0 && viewOrRegion !== null) {
             if (viewOrRegion instanceof HTMLElement) {
-                this.destroyDesigner();
-                this.view = viewOrRegion;
-                this.setDisplayRect();
-                this.initResizeObserver();
-                this.createDesigner();
+                if (this.view !== viewOrRegion) {
+                    this.destroyDesigner();
+                    this.view = viewOrRegion;
+                    this.setDisplayRect();
+                    this.initResizeObserver();
+                    this.createDesigner();
+                }
+                else {
+                    this.setDisplayRect();
+                }
             }
             else {
                 // Rect
@@ -606,12 +612,16 @@ class TRTCMediaMixingManager {
      * @returns {Promise<void>}
      */
     updatePublishParams(params) {
-        var _a;
+        var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {
             logger_1.default.log(`${this.logPrefix}updatePublishParams:`, params);
             this.publishParams = params;
             this.updateMixingVideoSize(params.videoEncoderParams);
-            (_a = this.mediaMixingDesigner) === null || _a === void 0 ? void 0 : _a.updateOptions({
+            (_a = this.streamLayoutManager) === null || _a === void 0 ? void 0 : _a.updateOptions({
+                width: this.mixingVideoWidth,
+                height: this.mixingVideoHeight
+            });
+            (_b = this.mediaMixingDesigner) === null || _b === void 0 ? void 0 : _b.updateOptions({
                 width: this.mixingVideoWidth,
                 height: this.mixingVideoHeight
             });
@@ -891,6 +901,17 @@ class TRTCMediaMixingManager {
                 canExceedContainer: true,
             });
             this.listenDesignerEvent();
+            if (this.sourceList.length >= 1) {
+                this.sourceList.forEach((mediaSource => {
+                    var _a;
+                    (_a = this.mediaMixingDesigner) === null || _a === void 0 ? void 0 : _a.addMedia({
+                        id: `${mediaSource.sourceType}__${mediaSource.sourceId}`,
+                        rect: mediaSource.rect,
+                        isSelected: mediaSource.isSelected || false,
+                        origin: mediaSource
+                    });
+                }));
+            }
         }
     }
     destroyDesigner() {
@@ -1029,6 +1050,7 @@ class TRTCMediaMixingManager {
         }
     }
     onMediaSourceAddedOrRemoved(key, data) {
+        var _a;
         let promiseKey;
         if (key === "onMediaSourceAdded") {
             promiseKey = `${promiseKeys.addMediaSource}-${data.sourceType}-${data.sourceId}`;
@@ -1037,15 +1059,25 @@ class TRTCMediaMixingManager {
             // 'onMediaSourceRemoved'
             promiseKey = `${promiseKeys.removeMediaSource}-${data.sourceType}-${data.sourceId}`;
         }
+        let flag = false;
         if (data.errCode === 0) {
-            this.promiseStore.resolvePromise(promiseKey, undefined);
+            flag = this.promiseStore.resolvePromise(promiseKey, undefined);
         }
         else {
-            this.promiseStore.rejectPromise(promiseKey, {
+            flag = this.promiseStore.rejectPromise(promiseKey, {
                 code: data.errCode,
                 message: data.errMsg,
             });
         }
+        if (data.errCode !== 0 && !flag) {
+            // event triggered internally, not by method invoked by user
+            const index = this.findMediaSourceIndex(data);
+            let mediaSource = undefined;
+            if (index !== -1) {
+                mediaSource = Object.assign({}, this.sourceList[index]);
+            }
+            (_a = this.eventEmitter) === null || _a === void 0 ? void 0 : _a.emit(TRTCMediaMixingEvent.onError, data.errCode, data.errMsg, mediaSource);
+        }
     }
     onMediaSourceSizeChanged(data) {
         var _a;

package/liteav/extensions/MediaMixingManager/StreamLayout/BaseStreamLayoutManager.d.ts

@@ -18,6 +18,10 @@ declare class BaseStreamLayoutManager implements ITRTCStreamLayoutManager {
     constructor(nativeStreamLayoutManager: INativeStreamLayoutManager, context: TRTCStreamLayoutContext);
     setLayout(layout: TRTCStreamLayout): void;
     getLayoutMode(): TRTCStreamLayoutMode;
+    updateOptions(options: {
+        width: number;
+        height: number;
+    }): void;
     destroy(): void;
     protected refreshLayout(): void;
     private onResize;

package/liteav/extensions/MediaMixingManager/StreamLayout/BaseStreamLayoutManager.js

@@ -41,6 +41,13 @@ class BaseStreamLayoutManager {
     getLayoutMode() {
         return this.layout.layoutMode;
     }
+    updateOptions(options) {
+        if (this.context && (this.context.mixingVideoSize.width !== options.width || this.context.mixingVideoSize.height !== options.height)) {
+            this.context.mixingVideoSize.width = options.width;
+            this.context.mixingVideoSize.height = options.height;
+            this.refreshLayout();
+        }
+    }
     destroy() {
         this.layout = {
             layoutMode: types_1.TRTCStreamLayoutMode.None,

package/liteav/extensions/MediaMixingManager/StreamLayout/NoneStreamLayoutManager.js

@@ -17,10 +17,19 @@ class NoneStreamLayoutManager extends BaseStreamLayoutManager_1.default {
         this.refreshLayout();
     }
     refreshLayout() {
-        var _a;
+        var _a, _b;
         if (this.context && this.layout.userList) {
             this.centerLiveOwner();
-            (_a = this.nativeStreamLayoutManager) === null || _a === void 0 ? void 0 : _a.setStreamLayout(this.layout.userList);
+            if (this.layout.userList.length === 1 && this.layout.userList[0].rect && this.displayArea.width !== 0 && this.displayArea.height !== 0 && window.devicePixelRatio !== 0) {
+                const workingArea = this.layout.userList[0].rect;
+                (_a = this.context.mediaMixingDesigner) === null || _a === void 0 ? void 0 : _a.setWorkingArea({
+                    left: workingArea.left / this.displayArea.width / window.devicePixelRatio,
+                    top: workingArea.top / this.displayArea.height / window.devicePixelRatio,
+                    right: workingArea.right / this.displayArea.width / window.devicePixelRatio,
+                    bottom: workingArea.bottom / this.displayArea.height / window.devicePixelRatio,
+                }, this.layout.userList[0].fillMode);
+            }
+            (_b = this.nativeStreamLayoutManager) === null || _b === void 0 ? void 0 : _b.setStreamLayout(this.layout.userList);
         }
         else {
             logger_1.default.error(`${this.logPrefix}setLayout context is null or no user`);

package/liteav/extensions/MediaMixingManager/StreamLayout/types.d.ts

@@ -14,6 +14,10 @@ export interface TRTCStreamLayoutContext {
 export interface ITRTCStreamLayoutManager {
     setLayout(layout: TRTCStreamLayout): void;
     getLayoutMode(): TRTCStreamLayoutMode;
+    updateOptions(options: {
+        width: number;
+        height: number;
+    }): void;
     destroy(): void;
 }
 export interface ITRTCStreamLayoutEvent {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "trtc-electron-sdk",
-  "version": "12.2.115-beta.15",
+  "version": "12.2.115-beta.17",
   "description": "trtc electron sdk",
   "main": "./liteav/index.js",
   "types": "./liteav/index.d.ts",