trtc-electron-sdk 12.7.706-beta.1 → 12.7.706-beta.3

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

@@ -234,6 +234,7 @@ export declare class TRTCMediaMixingManager implements ITRTCMediaMixingManager {
      * @returns {Promise<void>}
      */
     removeMediaSource(mediaSource: TRTCMediaSource): Promise<void>;
+    private syncRemoveMediaSource;
     /**
      * 更新本地混流媒体源
      * @param mediaSource {TRTCMediaSource} - 媒体源信息
@@ -388,7 +389,8 @@ export declare class TRTCMediaMixingManager implements ITRTCMediaMixingManager {
      * @param func {Function} - 事件回调函数
      */
     off(event: TRTCMediaMixingEvent, func: (...args: any[]) => void): void;
-    private initResizeObserver;
+    private createResizeObserver;
+    private destroyResizeObserver;
     private onPreviewAreaResize;
     private onVisibilityChange;
     private setDisplayRect;

package/liteav/extensions/MediaMixingManager/MediaMixingManager.js

@@ -316,10 +316,8 @@ class TRTCMediaMixingManager {
         return __awaiter(this, void 0, void 0, function* () {
             DevicePixelRatioObserver_1.default.off('change', this.onDevicePixelRatioChange);
             document.removeEventListener('visibilitychange', this.onVisibilityChange);
-            if (this.resizeObserver && this.view) {
-                this.resizeObserver.unobserve(this.view);
-                this.resizeObserver.disconnect();
-            }
+            this.destroyResizeObserver();
+            this.destroyLayoutManager();
             this.view = null;
             this.windowID = 0;
             this.destroyDesigner();
@@ -453,7 +451,7 @@ class TRTCMediaMixingManager {
                     this.destroyDesigner();
                     this.view = viewOrRegion;
                     this.setDisplayRect();
-                    this.initResizeObserver();
+                    this.createResizeObserver();
                     this.createDesigner();
                 }
                 else {
@@ -471,8 +469,10 @@ class TRTCMediaMixingManager {
             }
         }
         else {
+            this.destroyResizeObserver();
             this.destroyLayoutManager();
             this.destroyDesigner();
+            this.view = null;
             this.nodeMediaMixingPlugin.setDisplayParams(realWindowID, { left: 0, right: 0, top: 0, bottom: 0 });
         }
     }
@@ -518,6 +518,7 @@ class TRTCMediaMixingManager {
      * @returns {Promise<void>}
      */
     removeMediaSource(mediaSource) {
+        var _a;
         logger_1.default.log(`${this.logPrefix}removeMediaSource:`, mediaSource);
         const index = this.findMediaSourceIndex(mediaSource);
         if (index === -1) {
@@ -526,11 +527,37 @@ class TRTCMediaMixingManager {
                 message: "Not existing media source to remove"
             });
         }
-        return new Promise((resolve, reject) => {
-            const key = `${promiseKeys.removeMediaSource}-${mediaSource.sourceType}-${mediaSource.sourceId}`;
-            this.promiseStore.addPromise(key, resolve, reject);
+        else {
+            const mediaSourceToDelete = this.sourceList[index];
+            if ((_a = mediaSourceToDelete === null || mediaSourceToDelete === void 0 ? void 0 : mediaSourceToDelete.control) === null || _a === void 0 ? void 0 : _a.isAddFailed) {
+                this.syncRemoveMediaSource(mediaSource, index);
+                return Promise.resolve();
+            }
+            else {
+                return new Promise((resolve, reject) => {
+                    const key = `${promiseKeys.removeMediaSource}-${mediaSource.sourceType}-${mediaSource.sourceId}`;
+                    this.promiseStore.addPromise(key, resolve, reject);
+                    this.syncRemoveMediaSource(mediaSource, index);
+                });
+            }
+        }
+    }
+    syncRemoveMediaSource(mediaSource, index) {
+        var _a;
+        try {
             this.nodeMediaMixingPlugin.removeMediaSource(mediaSource);
-        });
+            (_a = this.mediaMixingDesigner) === null || _a === void 0 ? void 0 : _a.removeMedia({
+                id: `${mediaSource.sourceType}__${mediaSource.sourceId}`,
+                rect: mediaSource.rect,
+                isSelected: mediaSource.isSelected || false,
+                zOrder: mediaSource.zOrder,
+                origin: (0, utils_1.safelyParse)(JSON.stringify(mediaSource))
+            });
+            this.sourceList.splice(index, 1);
+        }
+        catch (error) {
+            logger_1.default.warn(`${this.logPrefix}removeMediaSource exception:`, error);
+        }
     }
     /**
      * 更新本地混流媒体源
@@ -744,7 +771,7 @@ class TRTCMediaMixingManager {
      */
     setStreamLayout(layout) {
         var _a, _b, _c;
-        logger_1.default.log(`${this.logPrefix}setStreamLayout:`, layout);
+        logger_1.default.debug(`${this.logPrefix}setStreamLayout:`, JSON.stringify(layout));
         if (this.paramsStore) {
             try {
                 this.paramsStore.streamLayout = JSON.parse(JSON.stringify(layout));
@@ -753,8 +780,8 @@ class TRTCMediaMixingManager {
                 this.paramsStore.streamLayout = undefined;
             }
         }
-        this.createOrUpdateLayoutManager(layout);
         if (this.view) {
+            this.createOrUpdateLayoutManager(layout);
             const viewRect = this.view.getBoundingClientRect();
             if ((_a = layout.userList) === null || _a === void 0 ? void 0 : _a.length) {
                 const localUser = layout.userList.filter(user => user.userId === constant_1.LOCAL_USER_ID)[0];
@@ -767,7 +794,6 @@ class TRTCMediaMixingManager {
                         bottom: workingArea.bottom / viewRect.height,
                     }, localUser.fillMode);
                 }
-                logger_1.default.log(`${this.logPrefix}setStreamLayout transfer layout to pixel unit:`, JSON.stringify(layout));
             }
         }
         else {
@@ -860,12 +886,20 @@ class TRTCMediaMixingManager {
         var _a;
         (_a = this.eventEmitter) === null || _a === void 0 ? void 0 : _a.off(event, func);
     }
-    initResizeObserver() {
+    createResizeObserver() {
         if (this.view) {
             this.resizeObserver = new ResizeObserver(this.onPreviewAreaResize);
             this.resizeObserver.observe(this.view);
         }
     }
+    destroyResizeObserver() {
+        if (this.resizeObserver) {
+            if (this.view) {
+                this.resizeObserver.unobserve(this.view);
+            }
+            this.resizeObserver.disconnect();
+        }
+    }
     onPreviewAreaResize(entries) {
         logger_1.default.log(`${this.logPrefix}onPreviewAreaResize:`, entries);
         for (const entry of entries) {
@@ -893,6 +927,7 @@ class TRTCMediaMixingManager {
                 top: clientRect.top * window.devicePixelRatio,
                 bottom: clientRect.bottom * window.devicePixelRatio,
             };
+            logger_1.default.debug(`${this.logPrefix}setDisplayRect:`, this.windowID, rect);
             this.nodeMediaMixingPlugin.setDisplayParams(this.windowID, rect);
         }
     }
@@ -1082,7 +1117,7 @@ class TRTCMediaMixingManager {
         }
     }
     onMediaSourceAdded(data) {
-        var _a, _b;
+        var _a;
         const promiseKey = `${promiseKeys.addMediaSource}-${data.sourceType}-${data.sourceId}`;
         let flag = false;
         if (data.errCode === 0) {
@@ -1095,14 +1130,10 @@ class TRTCMediaMixingManager {
             });
             if (newSourceIndex !== -1) {
                 const newMediaSource = this.sourceList[newSourceIndex];
-                (_a = this.mediaMixingDesigner) === null || _a === void 0 ? void 0 : _a.removeMedia({
-                    id: `${newMediaSource.sourceType}__${newMediaSource.sourceId}`,
-                    rect: newMediaSource.rect,
-                    isSelected: newMediaSource.isSelected || false,
-                    zOrder: newMediaSource.zOrder,
-                    origin: newMediaSource
-                });
-                this.sourceList.splice(newSourceIndex, 1);
+                if (!newMediaSource.control) {
+                    newMediaSource.control = {};
+                }
+                newMediaSource.control.isAddFailed = true;
             }
             flag = this.promiseStore.rejectPromise(promiseKey, {
                 code: data.errCode,
@@ -1116,29 +1147,14 @@ class TRTCMediaMixingManager {
             if (index !== -1) {
                 mediaSource = Object.assign({}, this.sourceList[index]);
             }
-            (_b = this.eventEmitter) === null || _b === void 0 ? void 0 : _b.emit(TRTCMediaMixingEvent.onError, data.errCode, data.errMsg, mediaSource);
+            (_a = this.eventEmitter) === null || _a === void 0 ? void 0 : _a.emit(TRTCMediaMixingEvent.onError, data.errCode, data.errMsg, mediaSource);
         }
     }
     onMediaSourceRemoved(data) {
-        var _a, _b;
+        var _a;
         const promiseKey = `${promiseKeys.removeMediaSource}-${data.sourceType}-${data.sourceId}`;
         let flag = false;
         if (data.errCode === 0) {
-            const sourceIndex = this.findMediaSourceIndex({
-                sourceId: data.sourceId,
-                sourceType: data.sourceType
-            });
-            if (sourceIndex !== -1) {
-                const mediaSource = this.sourceList[sourceIndex];
-                (_a = this.mediaMixingDesigner) === null || _a === void 0 ? void 0 : _a.removeMedia({
-                    id: `${mediaSource.sourceType}__${mediaSource.sourceId}`,
-                    rect: mediaSource.rect,
-                    isSelected: mediaSource.isSelected || false,
-                    zOrder: mediaSource.zOrder,
-                    origin: (0, utils_1.safelyParse)(JSON.stringify(mediaSource))
-                });
-                this.sourceList.splice(sourceIndex, 1);
-            }
             flag = this.promiseStore.resolvePromise(promiseKey, undefined);
         }
         else {
@@ -1154,7 +1170,7 @@ class TRTCMediaMixingManager {
             if (index !== -1) {
                 mediaSource = Object.assign({}, this.sourceList[index]);
             }
-            (_b = this.eventEmitter) === null || _b === void 0 ? void 0 : _b.emit(TRTCMediaMixingEvent.onError, data.errCode, data.errMsg, mediaSource);
+            (_a = this.eventEmitter) === null || _a === void 0 ? void 0 : _a.emit(TRTCMediaMixingEvent.onError, data.errCode, data.errMsg, mediaSource);
         }
     }
     onMediaSourceSizeChanged(data) {

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

@@ -28,10 +28,10 @@ class CustomStreamLayoutManager extends BaseStreamLayoutManager_1.default {
                 transferredUserList = this.layout.userList.map((user) => {
                     if (user.rect) {
                         return Object.assign(Object.assign({}, user), { rect: {
-                                left: user.rect.left * window.devicePixelRatio,
-                                right: user.rect.right * window.devicePixelRatio,
-                                top: user.rect.top * window.devicePixelRatio,
-                                bottom: user.rect.bottom * window.devicePixelRatio,
+                                left: Math.round(user.rect.left * window.devicePixelRatio),
+                                right: Math.round(user.rect.right * window.devicePixelRatio),
+                                top: Math.round(user.rect.top * window.devicePixelRatio),
+                                bottom: Math.round(user.rect.bottom * window.devicePixelRatio),
                             } });
                     }
                     else {
@@ -39,6 +39,7 @@ class CustomStreamLayoutManager extends BaseStreamLayoutManager_1.default {
                     }
                 });
             }
+            logger_1.default.debug(`${this.logPrefix}refreshLayout:`, JSON.stringify(transferredUserList));
             this.nativeStreamLayoutManager.setStreamLayout(transferredUserList);
         }
         else if (this.layout.size && this.layout.streams) {

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

@@ -29,6 +29,7 @@ class NoneStreamLayoutManager extends BaseStreamLayoutManager_1.default {
                     bottom: workingArea.bottom / this.displayArea.height / window.devicePixelRatio,
                 }, this.layout.userList[0].fillMode);
             }
+            logger_1.default.debug(`${this.logPrefix}refreshLayout:`, JSON.stringify(this.layout.userList));
             (_b = this.nativeStreamLayoutManager) === null || _b === void 0 ? void 0 : _b.setStreamLayout(this.layout.userList);
         }
         else {
@@ -59,12 +60,12 @@ class NoneStreamLayoutManager extends BaseStreamLayoutManager_1.default {
             this.layout.userList = [{
                     userId: '',
                     rect: {
-                        left: previewLeft,
-                        top: previewTop,
-                        right: previewRight,
-                        bottom: previewBottom,
+                        left: Math.round(previewLeft),
+                        top: Math.round(previewTop),
+                        right: Math.round(previewRight),
+                        bottom: Math.round(previewBottom),
                     },
-                    fillMode: trtc_define_1.TRTCVideoFillMode.TRTCVideoFillMode_Fit,
+                    fillMode: trtc_define_1.TRTCVideoFillMode.TRTCVideoFillMode_Fill,
                     zOrder: 0
                 }];
         }

package/package.json

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