trtc-electron-sdk 12.9.708-beta.0 → 13.0.709-alpha.1

package/liteav/MediaMixingDesigner/Resizable.js

@@ -227,7 +227,6 @@ class Resizable {
             this.originLeft = window.parseInt(resizeTargetStyle.left);
             this.originWidth = this.resizeTarget.offsetWidth;
             this.originHeight = this.resizeTarget.offsetHeight;
-            logger_1.default.debug("resize origin:", this.originTop, this.originLeft, this.originWidth, this.originHeight);
         }
         else {
             logger_1.default.error(`${this.logPrefix}mouseDown 'resizeTarget' is null`);

package/liteav/MediaMixingDesigner/index.js

@@ -63,7 +63,6 @@ class TRTCMediaMixingDesigner {
         }
     }
     setWorkingArea(relative, fillMode = trtc_define_1.TRTCVideoFillMode.TRTCVideoFillMode_Fit) {
-        logger_1.default.log(`${this.logPrefix}setWorkingArea:`, JSON.stringify(relative), `fillMode:${fillMode}`);
         if (relative) {
             this.relativeWorkingArea = Object.assign({}, relative);
             this.fillMode = fillMode;
@@ -221,7 +220,6 @@ class TRTCMediaMixingDesigner {
         }
     }
     onPreviewAreaResize(entries) {
-        logger_1.default.log(`${this.logPrefix}onPreviewAreaResize:`, entries);
         for (const entry of entries) {
             if (entry.target === this.container) {
                 this.updateWorkingArea();
@@ -242,7 +240,6 @@ class TRTCMediaMixingDesigner {
                 width: (this.relativeWorkingArea.right - this.relativeWorkingArea.left) * containerRect.width,
                 height: (this.relativeWorkingArea.bottom - this.relativeWorkingArea.top) * containerRect.height,
             };
-            logger_1.default.log(`${this.logPrefix}updateWorkingArea absolute working area:`, JSON.stringify(this.absoluteWorkingArea));
         }
         else {
             logger_1.default.error(`${this.logPrefix}updateWorkingArea no data:`, this.relativeWorkingArea, this.container);
@@ -269,7 +266,6 @@ class TRTCMediaMixingDesigner {
             this.previewHeight = this.mixingVideoHeight * this.previewScale;
             this.previewLeft = (workingAreaWidth - this.previewWidth) / 2;
             this.previewTop = (workingAreaHeight - this.previewHeight) / 2;
-            logger_1.default.debug(`${this.logPrefix}updatePreviewProperty: fillMode: ${this.fillMode} previewScale: ${this.previewScale}, previewWidth: ${this.previewWidth}, previewHeight: ${this.previewHeight}, previewLeft: ${this.previewLeft}, previewTop: ${this.previewTop}`);
         }
         else {
             logger_1.default.error(`${this.logPrefix}updatePreviewProperty failed, no HTML element to display`);
@@ -282,7 +278,6 @@ class TRTCMediaMixingDesigner {
             let width = 0;
             let height = 0;
             if (this.selectedMediaIndex >= 0) {
-                logger_1.default.debug(`${this.logPrefix}updateOverlay: selected media:`, this.mediaList[this.selectedMediaIndex].rect);
                 this.moveAndResizeOverlay.style.display = 'block';
                 const selectedPreviewRect = {
                     left: this.mediaList[this.selectedMediaIndex].rect.left * this.previewScale,
@@ -319,12 +314,10 @@ class TRTCMediaMixingDesigner {
                 this.moveAndResizeOverlay.style.transform = 'none';
                 this.moveAndResizeOverlay.style.transformOrigin = 'none';
             }
-            logger_1.default.debug(`${this.logPrefix}updateOverlay: ${left} ${top} ${width} ${height} ${renderScale}`);
         }
     }
     onMove(left, top) {
         var _a;
-        logger_1.default.log(`${this.logPrefix}onMove: ${left} ${top}`);
         const target = this.mediaList[this.selectedMediaIndex];
         if (target && this.moveAndResizeOverlay) {
             // calc new preview rect
@@ -342,8 +335,6 @@ class TRTCMediaMixingDesigner {
                 right: Math.round(newPreviewRect.right / this.previewScale),
                 bottom: Math.round(newPreviewRect.bottom / this.previewScale),
             };
-            logger_1.default.debug(`${this.logPrefix}onMove new preview rect: ${JSON.stringify(newPreviewRect)}`);
-            logger_1.default.debug(`${this.logPrefix}onMove new rect in mixing: ${JSON.stringify(newRectInMixing)}`);
             (_a = this.eventEmitter) === null || _a === void 0 ? void 0 : _a.emit('onSourceMoved', Object.assign({}, target), newRectInMixing);
         }
         else {
@@ -371,7 +362,6 @@ class TRTCMediaMixingDesigner {
     }
     onResize(left, top, width, height) {
         var _a;
-        logger_1.default.log(`${this.logPrefix}onResize: ${left} ${top} ${width} ${height}`);
         const target = this.mediaList[this.selectedMediaIndex];
         if (target) {
             // calc new preview rect
@@ -412,18 +402,15 @@ class TRTCMediaMixingDesigner {
         (_a = this.eventEmitter) === null || _a === void 0 ? void 0 : _a.emit('onSourceSelected', media ? Object.assign({}, media) : null);
     }
     onContainerMousedown(event) {
-        logger_1.default.log(`${this.logPrefix}onContainerMousedown event:`, event, event.target, event.currentTarget);
         const target = event.target;
         this.eventButton = event.button;
         if (target && this.container) {
             // calc click point coordinates in mix video image
-            logger_1.default.log(`${this.logPrefix}onContainerMousedown mix video image clicked`);
             const containerBounds = this.container.getBoundingClientRect();
             const xInPreviewImage = event.clientX - containerBounds.left - this.absoluteWorkingArea.left - this.previewLeft;
             const yInPreviewImage = event.clientY - containerBounds.top - this.absoluteWorkingArea.top - this.previewTop;
             const xInImage = xInPreviewImage / this.previewScale;
             const yInImage = yInPreviewImage / this.previewScale;
-            logger_1.default.log(`${this.logPrefix}onContainerMousedown click point coordinates in mix video:`, xInPreviewImage, yInPreviewImage, xInImage, yInImage);
             for (let i = 0; i < this.mediaList.length; i++) {
                 const item = this.mediaList[i];
                 if (item.rect &&
@@ -445,7 +432,6 @@ class TRTCMediaMixingDesigner {
                 if (this.eventButton === 2 && this.oldSelectedIndex === -1) {
                     // select first media source
                     this.newSelected = this.clickedMediaSources[0];
-                    logger_1.default.log(`${this.logPrefix}onContainerMousedown find clicked media source:`, this.newSelected);
                     // mediaSourcesStore.setSelectedMediaKey(newSelected);
                     this.emitOnSelect(this.newSelected);
                     this.clickedMediaSources.splice(0, this.clickedMediaSources.length);
@@ -457,7 +443,6 @@ class TRTCMediaMixingDesigner {
             }
             else {
                 this.newSelected = null;
-                logger_1.default.log(`${this.logPrefix}onContainerMousedown find clicked media source:`, this.newSelected);
                 this.emitOnSelect(null);
                 this.mousedownLeft = null;
                 this.mousedownTop = null;
@@ -475,14 +460,12 @@ class TRTCMediaMixingDesigner {
                 if (Math.abs(leftMovedDistance) >= MIN_MOVE_DISTANCE || Math.abs(topMovedDistance) >= MIN_MOVE_DISTANCE) {
                     if (this.oldSelectedIndex >= 0) {
                         // move or resize old selected media source
-                        logger_1.default.log(`${this.logPrefix}onContainerMousemove move or resize old selected media source, clear data:`, this.clickedMediaSources, this.oldSelectedIndex);
                         this.clickedMediaSources.splice(0, this.clickedMediaSources.length);
                         this.oldSelectedIndex = -1;
                     }
                     else if (this.clickedMediaSources.length > 0) {
                         // select first media source
                         this.newSelected = this.clickedMediaSources[0];
-                        logger_1.default.log(`${this.logPrefix}onContainerMousemove find clicked media source:`, this.newSelected);
                         this.emitOnSelect(this.newSelected);
                         this.clickedMediaSources.splice(0, this.clickedMediaSources.length);
                         // 支持 mousedown 选中媒体源和 mousemove 移动媒体源同时触发
@@ -499,7 +482,6 @@ class TRTCMediaMixingDesigner {
     onContainerMouseup(event) {
         document.removeEventListener("mousemove", this.onContainerMousemove, false);
         document.removeEventListener("mouseup", this.onContainerMouseup, false);
-        logger_1.default.log(`${this.logPrefix}onContainerMouseup data:`, this.clickedMediaSources, this.oldSelectedIndex);
         const target = event.target;
         if (target && this.container) {
             if (this.clickedMediaSources.length > 0) {
@@ -508,7 +490,6 @@ class TRTCMediaMixingDesigner {
                         // select next zOrder media source
                         const newSelectedIndex = (this.oldSelectedIndex + 1) % this.clickedMediaSources.length;
                         this.newSelected = this.clickedMediaSources[newSelectedIndex];
-                        logger_1.default.log(`${this.logPrefix}onContainerMouseup find clicked media source:`, this.newSelected);
                         this.emitOnSelect(this.newSelected);
                     }
                     else {
@@ -519,7 +500,6 @@ class TRTCMediaMixingDesigner {
                 else {
                     // select first media source
                     this.newSelected = this.clickedMediaSources[0];
-                    logger_1.default.log(`${this.logPrefix}onContainerMouseup find clicked media source:`, this.newSelected);
                     this.emitOnSelect(this.newSelected);
                 }
             }
@@ -529,7 +509,6 @@ class TRTCMediaMixingDesigner {
         }
         else {
             // un-select current media source
-            logger_1.default.log(`${this.logPrefix}onContainerMouseup click outside of mixing video image`);
             this.emitOnSelect(null);
         }
         this.mousedownLeft = null;
@@ -541,7 +520,6 @@ class TRTCMediaMixingDesigner {
     }
     onRightButtonClicked(event) {
         var _a;
-        logger_1.default.log(`${this.logPrefix}onRightButtonClicked:`, event.target, event.currentTarget, event.buttons);
         event.preventDefault();
         (_a = this.eventEmitter) === null || _a === void 0 ? void 0 : _a.emit('onRightButtonClicked', Object.assign({}, this.mediaList[this.selectedMediaIndex]), {
             windowX: event.clientX,

package/liteav/extensions/DeviceManager/index.js

@@ -7,6 +7,7 @@ exports.TRTCDeviceManager = void 0;
 const events_1 = require("events");
 const trtc_define_1 = require("../../trtc_define");
 const logger_1 = __importDefault(require("../../logger"));
+const utils_1 = require("../../utils");
 const NodeTRTCEngine = require('../../../build/Release/trtc_electron_sdk.node');
 /**
  * 设备管理器
@@ -456,6 +457,9 @@ class TRTCDeviceManager {
     // ******   这一部分接口暴露不合理，暂时通过 TRTCMediaMixingManager 暴露给用户   **************/
     startCameraDeviceTest(windowID, rect) {
         logger_1.default.debug(`${this.logPrefix}startCameraDeviceTest`, windowID, rect);
+        if (!(0, utils_1.isWindows)()) {
+            return Promise.resolve(0);
+        }
         let newWindowID = 0;
         if (windowID instanceof Uint8Array) {
             for (let i = windowID.length - 1; i >= 0; i--) {

package/liteav/extensions/MediaMixingManager/MediaMixingManager.js

@@ -320,7 +320,7 @@ class TRTCMediaMixingManager {
             mirrorType: trtc_define_1.TRTCVideoMirrorType.TRTCVideoMirrorType_Auto,
         };
         if (this.autoControlServer) {
-            this.startMediaMixingServer()
+            this.startMediaMixingServer('', TRTCMediaMixingServerMode.Embedded)
                 .then(() => {
                 logger_1.default.info(`${this.logPrefix}startMediaMixingServer success.`);
             })
@@ -494,7 +494,7 @@ class TRTCMediaMixingManager {
             else {
                 realWindowID = windowID;
             }
-            this.windowID = realWindowID;
+            this.windowID = (0, utils_1.isWindows)() ? realWindowID : 0;
             if (this.windowID !== 0 && viewOrRegion !== null) {
                 yield this.previewInNativeWindow(viewOrRegion);
             }
@@ -512,34 +512,36 @@ class TRTCMediaMixingManager {
      * @returns {Promise<void>}
      */
     addMediaSource(mediaSource) {
-        logger_1.default.log(`${this.logPrefix}addMediaSource:`, mediaSource);
-        const index = this.findMediaSourceIndex(mediaSource);
-        if (index !== -1) {
-            return Promise.reject({
-                code: types_1.TRTCMediaMixingErrorCode.InvalidParams,
-                message: "Media source already existed"
-            });
-        }
-        const newMediaSource = (0, utils_1.safelyParse)(JSON.stringify(mediaSource));
-        if (newMediaSource.isSelected) {
-            const oldSelectedIndex = this.findSelectedMediaSource();
-            if (oldSelectedIndex !== -1) {
-                this.unselectMediaSource(oldSelectedIndex);
+        return __awaiter(this, void 0, void 0, function* () {
+            logger_1.default.log(`${this.logPrefix}addMediaSource:`, mediaSource);
+            const index = this.findMediaSourceIndex(mediaSource);
+            if (index !== -1) {
+                return Promise.reject({
+                    code: types_1.TRTCMediaMixingErrorCode.InvalidParams,
+                    message: "Media source already existed"
+                });
             }
-        }
-        return new Promise((resolve, reject) => {
-            var _a;
-            const key = `${promiseKeys.addMediaSource}-${newMediaSource.sourceType}-${newMediaSource.sourceId}`;
-            this.promiseStore.addPromise(key, resolve, reject);
-            this.nodeMediaMixingPlugin.addMediaSource(newMediaSource);
-            (_a = this.mediaMixingDesigner) === null || _a === void 0 ? void 0 : _a.addMedia({
-                id: `${newMediaSource.sourceType}__${newMediaSource.sourceId}`,
-                rect: newMediaSource.rect,
-                isSelected: newMediaSource.isSelected || false,
-                zOrder: newMediaSource.zOrder,
-                origin: newMediaSource
+            const newMediaSource = (0, utils_1.safelyParse)(JSON.stringify(mediaSource));
+            if (newMediaSource.isSelected) {
+                const oldSelectedIndex = this.findSelectedMediaSource();
+                if (oldSelectedIndex !== -1) {
+                    yield this.unselectMediaSource(oldSelectedIndex);
+                }
+            }
+            return new Promise((resolve, reject) => {
+                var _a;
+                const key = `${promiseKeys.addMediaSource}-${newMediaSource.sourceType}-${newMediaSource.sourceId}`;
+                this.promiseStore.addPromise(key, resolve, reject);
+                this.nodeMediaMixingPlugin.addMediaSource(newMediaSource);
+                (_a = this.mediaMixingDesigner) === null || _a === void 0 ? void 0 : _a.addMedia({
+                    id: `${newMediaSource.sourceType}__${newMediaSource.sourceId}`,
+                    rect: newMediaSource.rect,
+                    isSelected: newMediaSource.isSelected || false,
+                    zOrder: newMediaSource.zOrder,
+                    origin: newMediaSource
+                });
+                this.sourceList.push(newMediaSource);
             });
-            this.sourceList.push(newMediaSource);
         });
     }
     /**
@@ -612,7 +614,7 @@ class TRTCMediaMixingManager {
             if (mediaSource.isSelected) {
                 const oldSelectedIndex = this.findSelectedMediaSource();
                 if (oldSelectedIndex !== -1 && oldSelectedIndex !== index) {
-                    this.unselectMediaSource(oldSelectedIndex);
+                    yield this.unselectMediaSource(oldSelectedIndex);
                 }
             }
             yield this.nodeMediaMixingPlugin.updateMediaSource(newMediaSource);
@@ -1468,7 +1470,6 @@ class TRTCMediaMixingManager {
             else {
                 // neither native window nor web element, stop preview
                 this.previewInNone();
-                this.destroyWebRenderer();
             }
         });
     }
@@ -1476,6 +1477,7 @@ class TRTCMediaMixingManager {
         this.destroyResizeObserver();
         this.destroyLayoutManager();
         this.destroyDesigner();
+        this.destroyWebRenderer();
         this.view = null;
         this.nodeMediaMixingPlugin.setDisplayParams(this.windowID, { left: 0, right: 0, top: 0, bottom: 0 });
     }
@@ -1531,11 +1533,13 @@ class TRTCMediaMixingManager {
         this.nodeMediaMixingPlugin.setVideoFrameRenderBuffer(this.videoRenderBuffer.userId, this.videoRenderBuffer.buffer, this.videoRenderBuffer.streamType, this.videoRenderBuffer.width, this.videoRenderBuffer.height, this.videoRenderBuffer.pixelFormat, this.videoRenderBuffer.id);
     }
     destroyWebRendererBuffer() {
-        this.videoRenderBuffer.width = 0;
-        this.videoRenderBuffer.height = 0;
-        this.nodeMediaMixingPlugin.setVideoFrameRenderBuffer(this.videoRenderBuffer.userId, this.videoRenderBuffer.buffer, this.videoRenderBuffer.streamType, this.videoRenderBuffer.width, this.videoRenderBuffer.height, this.videoRenderBuffer.pixelFormat, this.videoRenderBuffer.id);
-        this.videoRenderBuffer.buffer = null;
-        this.videoRenderBuffer.id = 0;
+        if (this.videoRenderBuffer.buffer !== null || this.videoRenderBuffer.id !== 0) {
+            this.videoRenderBuffer.width = 0;
+            this.videoRenderBuffer.height = 0;
+            this.nodeMediaMixingPlugin.setVideoFrameRenderBuffer(this.videoRenderBuffer.userId, this.videoRenderBuffer.buffer, this.videoRenderBuffer.streamType, this.videoRenderBuffer.width, this.videoRenderBuffer.height, this.videoRenderBuffer.pixelFormat, this.videoRenderBuffer.id);
+            this.videoRenderBuffer.buffer = null;
+            this.videoRenderBuffer.id = 0;
+        }
     }
     webRendererCallback(args) {
         const [id, type, width, height, timestamp, rotation, valid, bufferId] = args;

package/liteav/trtc.js

@@ -30,6 +30,7 @@ const yuv_buffer_1 = __importDefault(require("./Renderer/yuv-buffer"));
 const YCbCr_1 = __importDefault(require("yuv-canvas/src/YCbCr"));
 const LocalMediaTranscoder_1 = __importDefault(require("./LocalMediaTranscoder"));
 const trtc_define_1 = require("./trtc_define");
+const utils_1 = require("./utils");
 const validate_util_1 = require("./validate-util");
 const logger_1 = __importStar(require("./logger"));
 const LocalVideoRenderController_1 = __importDefault(require("./VideoRenderControl/LocalVideoRenderController"));
@@ -5276,7 +5277,7 @@ class TRTCCloud extends events_1.EventEmitter {
         return rgbaData;
     }
     _isMacPlatform() {
-        return process.platform == 'darwin';
+        return (0, utils_1.isMacOS)();
     }
     _setRemoteVideoBuffer(userId, streamType) {
         const videoBufferInfo = new trtc_define_1.VideoBufferInfo({

package/liteav/utils.d.ts

@@ -35,3 +35,7 @@ export declare function throttle<T extends (...args: any[]) => any>(func: T, wai
     leading?: boolean;
     trailing?: boolean;
 }): (...args: Parameters<T>) => void;
+export declare function getOS(): string;
+export declare function isMacOS(): boolean;
+export declare function isWindows(): boolean;
+export declare function isLinux(): boolean;

package/liteav/utils.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.throttle = exports.debounce = exports.convertUint8ArrayToNumber = exports.safelyParse = exports.isNullOrUndefined = exports.isUndefined = exports.isNull = void 0;
+exports.isLinux = exports.isWindows = exports.isMacOS = exports.getOS = exports.throttle = exports.debounce = exports.convertUint8ArrayToNumber = exports.safelyParse = exports.isNullOrUndefined = exports.isUndefined = exports.isNull = void 0;
 function isNull(val) {
     return val === null;
 }
@@ -131,3 +131,39 @@ function throttle(func, wait, options = {}) {
     };
 }
 exports.throttle = throttle;
+function getOS() {
+    var _a, _b;
+    let os = '';
+    if (process && process.platform) {
+        os = process.platform;
+    }
+    else {
+        // @ts-ignore
+        const platform = ((_b = (_a = window.navigator) === null || _a === void 0 ? void 0 : _a.userAgentData) === null || _b === void 0 ? void 0 : _b.platform) || window.navigator.platform;
+        const macosPlatforms = ['Macintosh', 'MacIntel', 'MacPPC', 'Mac68K', 'macOS'];
+        const windowsPlatforms = ['Win32', 'Win64', 'Windows', 'WinCE'];
+        if (macosPlatforms.indexOf(platform) !== -1) {
+            os = 'darwin';
+        }
+        else if (windowsPlatforms.indexOf(platform) !== -1) {
+            os = 'win32';
+        }
+        else if (/Linux/.test(platform)) {
+            os = 'linux';
+        }
+    }
+    return os;
+}
+exports.getOS = getOS;
+function isMacOS() {
+    return getOS() === 'darwin';
+}
+exports.isMacOS = isMacOS;
+function isWindows() {
+    return getOS() === 'win32';
+}
+exports.isWindows = isWindows;
+function isLinux() {
+    return getOS() === 'linux';
+}
+exports.isLinux = isLinux;

package/package.json

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

package/scripts/copy-sdk.js

@@ -56,6 +56,14 @@ if (process.platform === "win32") {
     path.resolve(SDK_CPP_PATH, `src/remote-liteav/sdk/mac/Frameworks/${process.arch}/TXSoundTouch.framework`),
     path.resolve(SDK_JS_PATH, `build/mac-framework/${process.arch}/TXSoundTouch.framework`)
   );
+  copySync(
+    path.resolve(SDK_CPP_PATH, `src/remote-liteav/sdk/mac/Frameworks/${process.arch}/TXLiteAVSDK_TRTC_Mac.framework`),
+    path.resolve(SDK_JS_PATH, `build/mac-framework/${process.arch}/TXLiteAVSDK_TRTC_Mac.framework`)
+  );
+  copySync(
+    path.resolve(SDK_CPP_PATH, `src/remote-liteav/out/Release-macos/${process.arch}/liblive_kit_engine.dylib`),
+    path.resolve(SDK_JS_PATH, `build/mac-framework/${process.arch}/liblive_kit_engine.dylib`)
+  );
 } else {
   // linux
   let soPrefix = ""