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

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.`);
             })
@@ -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/package.json

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

package/scripts/copy-sdk.js

@@ -2,6 +2,8 @@ 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, "../../");
@@ -56,6 +58,24 @@ 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`)
+  );
+
+  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,13 +9,21 @@ 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');
 
-    if (targetPath.indexOf("node_modules") === -1) {
-      // SDK 本身安装，不用同步动态库，直接退出
-      console.warn(`trtc-electron-sdk self install do not need 'rsync'`);
-      return;
+    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');
     }
 
     retryCount++;