trtc-electron-sdk 13.0.709-alpha.0 → 13.0.709-beta.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;
@@ -159,7 +158,7 @@ class TRTCMediaMixingDesigner {
         (_a = this.eventEmitter) === null || _a === void 0 ? void 0 : _a.off(event, func);
     }
     destroy() {
-        var _a, _b, _c, _d, _e;
+        var _a, _b, _c, _d;
         if (this.resizeObserver) {
             if (this.container) {
                 this.resizeObserver.unobserve(this.container);
@@ -172,9 +171,9 @@ class TRTCMediaMixingDesigner {
         this.movableHandler = null;
         this.resizableHandler = null;
         (_c = this.container) === null || _c === void 0 ? void 0 : _c.removeEventListener('contextmenu', this.onRightButtonClicked, false);
-        (_d = this.container) === null || _d === void 0 ? void 0 : _d.removeEventListener("mousedown", this.onContainerMousedown, false);
+        document.removeEventListener("mousedown", this.onContainerMousedown, false);
         if (this.moveAndResizeOverlay) {
-            (_e = this.container) === null || _e === void 0 ? void 0 : _e.removeChild(this.moveAndResizeOverlay);
+            (_d = this.container) === null || _d === void 0 ? void 0 : _d.removeChild(this.moveAndResizeOverlay);
             this.moveAndResizeOverlay = null;
         }
         this.container = null;
@@ -205,7 +204,7 @@ class TRTCMediaMixingDesigner {
             this.onContainerMousedown = this.onContainerMousedown.bind(this);
             this.onContainerMousemove = this.onContainerMousemove.bind(this);
             this.onContainerMouseup = this.onContainerMouseup.bind(this);
-            this.container.addEventListener("mousedown", this.onContainerMousedown, false);
+            document.addEventListener("mousedown", this.onContainerMousedown, false);
             this.onRightButtonClicked = this.onRightButtonClicked.bind(this);
             this.container.addEventListener('contextmenu', this.onRightButtonClicked, false);
         }
@@ -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,40 +402,38 @@ 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 &&
-                    xInImage >= item.rect.left &&
-                    xInImage <= item.rect.right &&
-                    yInImage >= item.rect.top &&
-                    yInImage <= item.rect.bottom) {
-                    this.clickedMediaSources.push(item);
-                    if (this.mediaList[this.selectedMediaIndex]) {
-                        if (item.id === this.mediaList[this.selectedMediaIndex].id) {
-                            this.oldSelectedIndex = this.clickedMediaSources.length - 1;
+            if (this.container.contains(target)) {
+                // calc click point coordinates in mix video image
+                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;
+                for (let i = 0; i < this.mediaList.length; i++) {
+                    const item = this.mediaList[i];
+                    if (item.rect &&
+                        xInImage >= item.rect.left &&
+                        xInImage <= item.rect.right &&
+                        yInImage >= item.rect.top &&
+                        yInImage <= item.rect.bottom) {
+                        this.clickedMediaSources.push(item);
+                        if (this.mediaList[this.selectedMediaIndex]) {
+                            if (item.id === this.mediaList[this.selectedMediaIndex].id) {
+                                this.oldSelectedIndex = this.clickedMediaSources.length - 1;
+                            }
                         }
                     }
                 }
+                this.mousedownLeft = event.screenX;
+                this.mousedownTop = event.screenY;
             }
-            this.mousedownLeft = event.screenX;
-            this.mousedownTop = event.screenY;
             if (this.clickedMediaSources.length > 0) {
                 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 +445,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 +462,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 +484,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 +492,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 +502,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 +511,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 +522,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.d.ts

@@ -262,6 +262,7 @@ export declare class TRTCMediaMixingManager implements ITRTCMediaMixingManager {
     setCameraCaptureParam(cameraID: string, params: TRTCCameraCaptureParams): void;
     /**
      * 设置手机投屏参数
+     * @private
      * @param phoneMirrorSourceId {string} - 手机投屏媒体源 ID
      * @param param {TRTCPhoneMirrorParam} - 手机投屏参数
      */

package/liteav/extensions/MediaMixingManager/MediaMixingManager.js

@@ -73,6 +73,10 @@ const TRTCMediaSourceType_HACK_JSDOC = {
     kImage: 2,
     /** 手机投屏 */
     kPhoneMirror: 4,
+    /** 在线视频 */
+    kOnlineVideo: 5,
+    /** 本地视频文件 */
+    kVideoFile: 6,
 };
 /**
  * 手机投屏媒体源参数
@@ -494,7 +498,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);
             }
@@ -648,6 +652,7 @@ class TRTCMediaMixingManager {
     }
     /**
      * 设置手机投屏参数
+     * @private
      * @param phoneMirrorSourceId {string} - 手机投屏媒体源 ID
      * @param param {TRTCPhoneMirrorParam} - 手机投屏参数
      */

package/liteav/trtc.d.ts

@@ -1369,7 +1369,7 @@ declare class TRTCCloud extends EventEmitter {
      * @param {TRTCVideoResolutionMode} params.resMode - 分辨率模式（横屏分辨率 - 竖屏分辨率）
      * - TRTCVideoResolutionModeLandscape: 横屏分辨率
      * - TRTCVideoResolutionModePortrait : 竖屏分辨率
-     * @param {Number} params.videoFps     - 视频采集帧率
+     * @param {Number} params.videoFps     - 视频编码帧率
      * @param {Number} params.videoBitrate - 视频上行码率
      * @param {Number} params.minVideoBitrate - 视频最小码率
      * @param {Boolean} params.enableAdjustRes - 是否允许动态调整分辨率，默认值：关闭。

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"));
@@ -2542,7 +2543,7 @@ class TRTCCloud extends events_1.EventEmitter {
      * @param {TRTCVideoResolutionMode} params.resMode - 分辨率模式（横屏分辨率 - 竖屏分辨率）
      * - TRTCVideoResolutionModeLandscape: 横屏分辨率
      * - TRTCVideoResolutionModePortrait : 竖屏分辨率
-     * @param {Number} params.videoFps     - 视频采集帧率
+     * @param {Number} params.videoFps     - 视频编码帧率
      * @param {Number} params.videoBitrate - 视频上行码率
      * @param {Number} params.minVideoBitrate - 视频最小码率
      * @param {Boolean} params.enableAdjustRes - 是否允许动态调整分辨率，默认值：关闭。
@@ -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": "13.0.709-alpha.0",
+  "version": "13.0.709-beta.1",
   "description": "trtc electron sdk",
   "main": "./liteav/index.js",
   "types": "./liteav/index.d.ts",

package/scripts/copy-sdk.js

@@ -2,8 +2,6 @@ const path = require("path");
 const fs = require("fs");
 const { removeSync, copySync } = require("fs-extra");
 const signale = require('signale');
-const { arch } = process;
-const { exec } = require('child_process');
 
 // npm run copy:sdk
 const SDK_ROOT = path.resolve(__dirname, "../../");
@@ -66,16 +64,6 @@ if (process.platform === "win32") {
     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`)
   );
-
-  sourcePath = path.join(__dirname, `../../trtc-electron-sdk/build/mac-framework/${arch}/`);
-  targetPath = path.join(__dirname, '../../../samples/trtc-electron-test-demo/node_modules/electron/dist/Electron.app/Contents/Frameworks');
-  if (fs.existsSync(sourcePath) && fs.existsSync(targetPath)) {
-    const command = `rsync -a ${sourcePath} ${targetPath}`;
-    signale.log(command);
-    exec(command);
-  } else {
-    signale.warn('sourcePath or targetPath is not exist');
-  }
 } else {
   // linux
   let soPrefix = ""

package/scripts/postinstall.js

@@ -9,21 +9,13 @@ const maxRetryCount = 60;
 
 function rsync() {
   if (platform === 'darwin') {
+    const sourcePath = path.join(__dirname, `../../trtc-electron-sdk/build/mac-framework/${arch}/`);
+    const targetPath = path.join(__dirname, '../../electron/dist/Electron.app/Contents/Frameworks');
 
-    const currentPath = process.cwd();
-    const pathFlagValue = `packages${
-      process.platform === "win32" ? "\\" : "/"
-    }trtc-electron-sdk`;
-    const isLocal = currentPath.indexOf(pathFlagValue) !== -1;
-
-    let sourcePath = '';
-    let targetPath = '';
-    if(isLocal) {
-      sourcePath = path.join(__dirname, `../../trtc-electron-sdk/build/mac-framework/${arch}/`);
-      targetPath = path.join(__dirname, '../../../samples/trtc-electron-test-demo/node_modules/electron/dist/Electron.app/Contents/Frameworks');
-    } else {
-      sourcePath = path.join(__dirname, `../../trtc-electron-sdk/build/mac-framework/${arch}/`);
-      targetPath = path.join(__dirname, '../../electron/dist/Electron.app/Contents/Frameworks');
+    if (targetPath.indexOf("node_modules") === -1) {
+      // SDK 本身安装，不用同步动态库，直接退出
+      console.warn(`trtc-electron-sdk self install do not need 'rsync'`);
+      return;
     }
 
     retryCount++;