trtc-electron-sdk 13.4.802-beta.0 → 13.4.802-beta.1

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

@@ -1,4 +1,5 @@
 import { TRTCCameraCaptureParams, Rect, TRTCScreenCaptureProperty } from '../../trtc_define';
+import TRTCPluginManager from '../PluginManager';
 import { TRTCMediaSource, TRTCMediaMixingEncParam, ITRTCMediaMixingManager, TRTCPhoneMirrorParam, TRTCStreamLayout, TRTCOnlineVideoParam, TRTCVideoFileParam } from './types';
 import { TRTCDeviceManager } from '../DeviceManager';
 declare const NodeTRTCEngine: any;
@@ -140,6 +141,7 @@ export declare class TRTCMediaMixingManager implements ITRTCMediaMixingManager {
     private streamLayoutManager;
     private trtcParamsStore;
     private paramsStore;
+    private pluginManager;
     private autoControlServer;
     private serverStatus;
     private serverMode;
@@ -154,6 +156,7 @@ export declare class TRTCMediaMixingManager implements ITRTCMediaMixingManager {
         nodeTRTCCloud: typeof NodeTRTCEngine.NodeRemoteTRTCCloud;
         trtcParamsStore: Record<string, any>;
         autoControlServer: boolean;
+        pluginManager: TRTCPluginManager;
     });
     destroy(): Promise<void>;
     /**
@@ -535,6 +538,54 @@ export declare class TRTCMediaMixingManager implements ITRTCMediaMixingManager {
     private previewInNativeWindow;
     private previewInWebElement;
     private previewInNone;
+    /**
+     * @private
+     * Ensure the media server is running in the mode required by the current
+     * preview target, before doing any preview binding.
+     *
+     *   - Native-window preview  -> Independent server (out-of-process, comes
+     *     with onMediaServerState crash monitoring & auto-recovery).
+     *   - Web-element preview     -> Embedded server (in-process) that drives
+     *     the video-frame render callback.
+     *
+     * The decision is driven by `serverStatus` (the single source of truth),
+     * NOT by `serverMode`. `serverMode` only reflects the mode of a *running*
+     * server and becomes meaningless once the server is stopped (Idle), where
+     * it keeps its last value. Keying the switch on `serverStatus` avoids that
+     * stale-value trap:
+     *
+     *   - running (Started/Starting) in a different mode -> stop then restart in
+     *     the required mode (mode switch).
+     *   - running already in the required mode           -> no-op.
+     *   - Idle (e.g. after stopMediaMixingServer on logout) -> (re)start in the
+     *     required mode. Without this, a logout -> login cycle would leave no
+     *     monitored server, so a later crash of liteav_media_server.exe emits no
+     *     state=3 event and neither the SDK's built-in recovery nor the app-layer
+     *     recovery runs.
+     *
+     * `Lost` handling depends on autoControlServer, so the two recovery paths
+     * never overlap / race:
+     *
+     *   - autoControlServer = true  (getMediaMixingManager): the SDK owns crash
+     *     recovery via onMediaServerState(state=3) -> recoverMediaMixingServer,
+     *     which restarts the server AND re-binds the preview itself. We must NOT
+     *     also restart here, otherwise a concurrent app-driven bindPreviewArea
+     *     would double-start the server and race the built-in recovery. So when
+     *     autoControlServer is true, `Lost` is intentionally left untouched here.
+     *
+     *   - autoControlServer = false (getMediaMixingService): the SDK does NOT
+     *     auto-recover (onMediaMixingServerLost only clears local state); the app
+     *     is expected to drive recovery by calling bindPreviewArea again. In that
+     *     case a `Lost` server must be (re)started here, exactly like `Idle`,
+     *     otherwise the app's re-bind would silently do nothing and the preview
+     *     would never come back.
+     *
+     * Safe against the first-launch path: startMediaMixingServer sets
+     * serverStatus to Starting synchronously, and the constructor's embedded
+     * auto-start runs before any bindPreviewArea, so the first bind never
+     * observes Idle here.
+     */
+    private ensureMediaServerMode;
     private createWebRenderer;
     private destroyWebRenderer;
     private createWebRendererBuffer;

package/liteav/extensions/MediaMixingManager/MediaMixingManager.js

@@ -357,6 +357,7 @@ class TRTCMediaMixingManager {
         this.nodeTRTCCloud = options.nodeTRTCCloud;
         this.trtcParamsStore = options.trtcParamsStore;
         this.autoControlServer = options.autoControlServer;
+        this.pluginManager = options.pluginManager;
         this.paramsStore = {};
         this.previewRenderParams = {
             fillMode: trtc_define_1.TRTCVideoFillMode.TRTCVideoFillMode_Fit,
@@ -432,6 +433,8 @@ class TRTCMediaMixingManager {
             this.addMediaSourceTimers.clear();
             this.paramsStore = null;
             this.trtcParamsStore = null;
+            // 仅解除引用，pluginManager 生命周期由 TRTCCloud 统一管理
+            this.pluginManager = null;
         });
     }
     /**
@@ -1487,43 +1490,71 @@ class TRTCMediaMixingManager {
             else {
                 this.sourceList = [];
                 (_a = this.mediaMixingDesigner) === null || _a === void 0 ? void 0 : _a.removeAllMedia();
-                (_b = this.eventEmitter) === null || _b === void 0 ? void 0 : _b.emit(TRTCMediaMixingEvent.onMediaMixingServerLost);
             }
+            // Notify the application layer AFTER the internal recovery/cleanup finishes,
+            // regardless of autoControlServer mode. This lets the app perform extra
+            // recovery on top of the SDK's built-in one (e.g. re-applying beauty /
+            // xmagic effect plugins, which the SDK does not restore). Note
+            // recoverMediaMixingServer swallows its own errors, so this emit is always
+            // reached once server-lost handling completes.
+            (_b = this.eventEmitter) === null || _b === void 0 ? void 0 : _b.emit(TRTCMediaMixingEvent.onMediaMixingServerLost);
         });
     }
     onCallExperimentalAPIFinish(data) {
         logger_1.default.log(`${this.logPrefix}onCallExperimentalAPIFinish:`, data);
     }
     recoverMediaMixingServer() {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
         return __awaiter(this, void 0, void 0, function* () {
             if (!this.view) {
                 return;
             }
             try {
-                yield this.startMediaMixingServer();
+                // Restart the server in the SAME mode as the pre-crash preview target,
+                // derived from windowID the same way bindPreviewArea dispatches:
+                //   - windowID !== 0 -> native-window preview -> Independent
+                //   - windowID === 0 -> web-element  preview -> Embedded
+                // Using the matching mode here makes the subsequent bindPreviewArea ->
+                // ensureMediaServerMode a no-op (server already running in the right
+                // mode), avoiding an extra stop/start process bounce and a transient
+                // window running in the wrong mode. Previously this hardcoded the default
+                // (Independent), so recovering a web-element (Embedded) preview would
+                // start Independent and then immediately stop+restart as Embedded.
+                const recoverMode = this.windowID !== 0
+                    ? TRTCMediaMixingServerMode.Independent
+                    : TRTCMediaMixingServerMode.Embedded;
+                yield this.startMediaMixingServer('', recoverMode);
                 yield this.bindPreviewArea(this.windowID, this.view);
                 yield this.startPublish();
                 yield this.nodeMediaMixingPlugin.updatePublishParams(this.publishParams);
-                if ((_a = this.paramsStore) === null || _a === void 0 ? void 0 : _a.streamLayout) {
+                // 混流服务崩溃重启后，底层 NodeRemoteVideoPluginManager 为全新初始状态，
+                // 需要重放之前通过 setPluginParams 设置的插件参数。
+                const pluginManager = this.pluginManager;
+                const pluginParams = (_a = this.trtcParamsStore) === null || _a === void 0 ? void 0 : _a.pluginParams;
+                if (pluginManager && pluginParams) {
+                    Object.keys(pluginParams).forEach((typeKey) => {
+                        pluginManager.setPluginParams(Number(typeKey), pluginParams[typeKey]);
+                    });
+                }
+                if ((_b = this.paramsStore) === null || _b === void 0 ? void 0 : _b.streamLayout) {
                     this.setStreamLayout(this.paramsStore.streamLayout);
                 }
                 this.sourceList.forEach((item) => {
                     this._applyCameraParamsBeforeAdd(item);
                     this.nodeMediaMixingPlugin.addMediaSource(item);
                 });
-                if (((_b = this.trtcParamsStore) === null || _b === void 0 ? void 0 : _b.enterRoomParams) && ((_c = this.trtcParamsStore) === null || _c === void 0 ? void 0 : _c.enterRoomScene)) {
+                if (((_c = this.trtcParamsStore) === null || _c === void 0 ? void 0 : _c.enterRoomParams) && ((_d = this.trtcParamsStore) === null || _d === void 0 ? void 0 : _d.enterRoomScene)) {
                     this.nodeTRTCCloud.enterRoom(this.trtcParamsStore.enterRoomParams, this.trtcParamsStore.enterRoomScene);
                 }
-                if ((_d = this.trtcParamsStore) === null || _d === void 0 ? void 0 : _d.localAudioParams) {
-                    if ((_e = this.trtcParamsStore) === null || _e === void 0 ? void 0 : _e.localAudioParams.audioQuality) {
-                        this.nodeTRTCCloud.startLocalAudio((_f = this.trtcParamsStore) === null || _f === void 0 ? void 0 : _f.localAudioParams.audioQuality);
+                if ((_e = this.trtcParamsStore) === null || _e === void 0 ? void 0 : _e.localAudioParams) {
+                    if ((_f = this.trtcParamsStore) === null || _f === void 0 ? void 0 : _f.localAudioParams.audioQuality) {
+                        this.nodeTRTCCloud.startLocalAudio((_g = this.trtcParamsStore) === null || _g === void 0 ? void 0 : _g.localAudioParams.audioQuality);
                     }
-                    if (((_g = this.trtcParamsStore) === null || _g === void 0 ? void 0 : _g.localAudioParams.isMute) !== undefined) {
+                    if (((_h = this.trtcParamsStore) === null || _h === void 0 ? void 0 : _h.localAudioParams.isMute) !== undefined) {
                         this.nodeTRTCCloud.muteLocalAudio(this.trtcParamsStore.localAudioParams.isMute);
                     }
                 }
-                if ((_h = this.trtcParamsStore) === null || _h === void 0 ? void 0 : _h.systemAudioParams) {
+                if ((_j = this.trtcParamsStore) === null || _j === void 0 ? void 0 : _j.systemAudioParams) {
                     if (this.trtcParamsStore.systemAudioParams.isOpen) {
                         this.nodeTRTCCloud.startSystemAudioLoopback(this.trtcParamsStore.systemAudioParams.path || null);
                     }
@@ -1531,9 +1562,9 @@ class TRTCMediaMixingManager {
                         this.nodeTRTCCloud.setSystemAudioLoopbackVolume(this.trtcParamsStore.systemAudioParams.volume);
                     }
                 }
-                if (typeof ((_j = this.trtcParamsStore) === null || _j === void 0 ? void 0 : _j.audioVolumeEvaluationInterval) === 'number') {
-                    const isEnabled = ((_k = this.trtcParamsStore) === null || _k === void 0 ? void 0 : _k.audioVolumeEvaluationInterval) > 0;
-                    const interval = ((_l = this.trtcParamsStore) === null || _l === void 0 ? void 0 : _l.audioVolumeEvaluationInterval) > 0 ? (_m = this.trtcParamsStore) === null || _m === void 0 ? void 0 : _m.audioVolumeEvaluationInterval : 0;
+                if (typeof ((_k = this.trtcParamsStore) === null || _k === void 0 ? void 0 : _k.audioVolumeEvaluationInterval) === 'number') {
+                    const isEnabled = ((_l = this.trtcParamsStore) === null || _l === void 0 ? void 0 : _l.audioVolumeEvaluationInterval) > 0;
+                    const interval = ((_m = this.trtcParamsStore) === null || _m === void 0 ? void 0 : _m.audioVolumeEvaluationInterval) > 0 ? (_o = this.trtcParamsStore) === null || _o === void 0 ? void 0 : _o.audioVolumeEvaluationInterval : 0;
                     this.nodeTRTCCloud.enableAudioVolumeEvaluation(isEnabled, {
                         enableSpectrumCalculation: isEnabled,
                         enableVadDetection: true,
@@ -1654,15 +1685,12 @@ class TRTCMediaMixingManager {
     previewInNativeWindow(viewOrRegion) {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
-            if (this.serverMode === TRTCMediaMixingServerMode.Embedded && (this.serverStatus === TRTCMediaMixingServerStatus.Started || this.serverStatus === TRTCMediaMixingServerStatus.Starting)) {
-                try {
-                    yield this.stopMediaMixingServer();
-                    yield this.startMediaMixingServer('', TRTCMediaMixingServerMode.Independent);
-                }
-                catch (err) {
-                    logger_1.default.error(`${this.logPrefix}previewInNativeWindow startMediaMixingServer failed:`, err);
-                    throw err;
-                }
+            try {
+                yield this.ensureMediaServerMode(TRTCMediaMixingServerMode.Independent);
+            }
+            catch (err) {
+                logger_1.default.error(`${this.logPrefix}previewInNativeWindow ensureMediaServerMode failed:`, err);
+                throw err;
             }
             if (viewOrRegion instanceof HTMLElement) {
                 if (this.view !== viewOrRegion) {
@@ -1695,15 +1723,12 @@ class TRTCMediaMixingManager {
     previewInWebElement(viewOrRegion) {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
-            if (this.serverMode === TRTCMediaMixingServerMode.Independent && (this.serverStatus === TRTCMediaMixingServerStatus.Started || this.serverStatus === TRTCMediaMixingServerStatus.Starting)) {
-                try {
-                    yield this.stopMediaMixingServer();
-                    yield this.startMediaMixingServer('', TRTCMediaMixingServerMode.Embedded);
-                }
-                catch (err) {
-                    logger_1.default.error(`${this.logPrefix}previewInWebElement startMediaMixingServer failed:`, err);
-                    throw err;
-                }
+            try {
+                yield this.ensureMediaServerMode(TRTCMediaMixingServerMode.Embedded);
+            }
+            catch (err) {
+                logger_1.default.error(`${this.logPrefix}previewInWebElement ensureMediaServerMode failed:`, err);
+                throw err;
             }
             if (viewOrRegion instanceof HTMLElement) {
                 if (this.view !== viewOrRegion) {
@@ -1744,6 +1769,73 @@ class TRTCMediaMixingManager {
             this.paramsStore.streamLayout = null;
         }
     }
+    /**
+     * @private
+     * Ensure the media server is running in the mode required by the current
+     * preview target, before doing any preview binding.
+     *
+     *   - Native-window preview  -> Independent server (out-of-process, comes
+     *     with onMediaServerState crash monitoring & auto-recovery).
+     *   - Web-element preview     -> Embedded server (in-process) that drives
+     *     the video-frame render callback.
+     *
+     * The decision is driven by `serverStatus` (the single source of truth),
+     * NOT by `serverMode`. `serverMode` only reflects the mode of a *running*
+     * server and becomes meaningless once the server is stopped (Idle), where
+     * it keeps its last value. Keying the switch on `serverStatus` avoids that
+     * stale-value trap:
+     *
+     *   - running (Started/Starting) in a different mode -> stop then restart in
+     *     the required mode (mode switch).
+     *   - running already in the required mode           -> no-op.
+     *   - Idle (e.g. after stopMediaMixingServer on logout) -> (re)start in the
+     *     required mode. Without this, a logout -> login cycle would leave no
+     *     monitored server, so a later crash of liteav_media_server.exe emits no
+     *     state=3 event and neither the SDK's built-in recovery nor the app-layer
+     *     recovery runs.
+     *
+     * `Lost` handling depends on autoControlServer, so the two recovery paths
+     * never overlap / race:
+     *
+     *   - autoControlServer = true  (getMediaMixingManager): the SDK owns crash
+     *     recovery via onMediaServerState(state=3) -> recoverMediaMixingServer,
+     *     which restarts the server AND re-binds the preview itself. We must NOT
+     *     also restart here, otherwise a concurrent app-driven bindPreviewArea
+     *     would double-start the server and race the built-in recovery. So when
+     *     autoControlServer is true, `Lost` is intentionally left untouched here.
+     *
+     *   - autoControlServer = false (getMediaMixingService): the SDK does NOT
+     *     auto-recover (onMediaMixingServerLost only clears local state); the app
+     *     is expected to drive recovery by calling bindPreviewArea again. In that
+     *     case a `Lost` server must be (re)started here, exactly like `Idle`,
+     *     otherwise the app's re-bind would silently do nothing and the preview
+     *     would never come back.
+     *
+     * Safe against the first-launch path: startMediaMixingServer sets
+     * serverStatus to Starting synchronously, and the constructor's embedded
+     * auto-start runs before any bindPreviewArea, so the first bind never
+     * observes Idle here.
+     */
+    ensureMediaServerMode(targetMode) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const isRunning = this.serverStatus === TRTCMediaMixingServerStatus.Started
+                || this.serverStatus === TRTCMediaMixingServerStatus.Starting;
+            // `Lost` is treated as "needs (re)start" ONLY when the SDK's own auto
+            // recovery is disabled (autoControlServer=false); otherwise it is owned by
+            // recoverMediaMixingServer and must not be touched here (see doc above).
+            const needsStart = this.serverStatus === TRTCMediaMixingServerStatus.Idle
+                || (this.serverStatus === TRTCMediaMixingServerStatus.Lost && !this.autoControlServer);
+            if (isRunning) {
+                if (this.serverMode !== targetMode) {
+                    yield this.stopMediaMixingServer();
+                    yield this.startMediaMixingServer('', targetMode);
+                }
+            }
+            else if (needsStart) {
+                yield this.startMediaMixingServer('', targetMode);
+            }
+        });
+    }
     createWebRenderer(view) {
         if (this.view === view) {
             return;
@@ -1773,7 +1865,7 @@ class TRTCMediaMixingManager {
             });
             this.webRenderer.setContentMode(this.previewRenderParams.fillMode);
             this.createWebRendererBuffer();
-            this.nodeMediaMixingPlugin.setVideoFrameRenderCallback(this.webRendererCallback); // this.pixelFormat, 
+            this.nodeMediaMixingPlugin.setVideoFrameRenderCallback(this.webRendererCallback); // this.pixelFormat,
         }
     }
     destroyWebRenderer() {
@@ -1781,7 +1873,7 @@ class TRTCMediaMixingManager {
             this.webRenderer.destroy();
             this.webRenderer = null;
         }
-        this.nodeMediaMixingPlugin.setVideoFrameRenderCallback(null); // this.pixelFormat, 
+        this.nodeMediaMixingPlugin.setVideoFrameRenderCallback(null); // this.pixelFormat,
         this.destroyWebRendererBuffer();
     }
     createWebRendererBuffer() {

package/liteav/trtc.js

@@ -4939,6 +4939,9 @@ class TRTCCloud extends events_1.EventEmitter {
     setPluginParams(type, options) {
         this.logger.log(`setPluginParams params:`, type, options);
         this.pluginManager.setPluginParams(type, options);
+        // 记录插件参数，用于本地混流服务崩溃恢复时重放（合并写入，兼容分次只传 pixelFormat 或 enable 的调用）
+        this.paramsStore.pluginParams = this.paramsStore.pluginParams || {};
+        this.paramsStore.pluginParams[type] = Object.assign(Object.assign({}, (this.paramsStore.pluginParams[type] || {})), options);
     }
     /**
      * 添加插件
@@ -5568,6 +5571,7 @@ class TRTCCloud extends events_1.EventEmitter {
                     nodeTRTCCloud: this.rtcCloud,
                     trtcParamsStore: this.paramsStore,
                     autoControlServer: true,
+                    pluginManager: this.pluginManager,
                 });
             }
         }
@@ -5617,6 +5621,7 @@ class TRTCCloud extends events_1.EventEmitter {
                         nodeTRTCCloud: this.rtcCloud,
                         trtcParamsStore: this.paramsStore,
                         autoControlServer: false,
+                        pluginManager: this.pluginManager,
                     });
                     this.mediaMixingService = new MediaMixingManager_1.TRTCMediaMixingService(this.mediaMixingManager);
                 }

package/package.json

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

package/scripts/download.js

@@ -111,9 +111,17 @@ async function main(urlDomain) {
     await download(downloadUrl, outputDir, downloadOptions);
     signale.success(`Download finished - ${platform}`);
 
+    // Preserve symlinks when copying on macOS so that .framework bundles
+    // retain their canonical Versions/Current -> A symlink structure.
+    // Without { dereference: false }, fs-extra resolves symlinks to real
+    // files/directories, causing `codesign` to report:
+    //   "bundle format is ambiguous (could be app or framework)"
+    const macCopyOptions = { dereference: false };
+
     fs.copySync(
       path.join(outputDir, "./build/Release"),
-      path.join(buildDir, "Release")
+      path.join(buildDir, "Release"),
+      macCopyOptions
     );
     signale.success(`copy success! - ${platform}`);
 
@@ -125,11 +133,13 @@ async function main(urlDomain) {
       const arch = archType;
       fs.copySync(
         path.join(outputDir, "./build/Release/trtc_electron_sdk.node"),
-        path.join(buildDir, "Release", arch, "trtc_electron_sdk.node")
+        path.join(buildDir, "Release", arch, "trtc_electron_sdk.node"),
+        macCopyOptions
       );
       fs.copySync(
         path.join(outputDir, "./build/mac-framework", arch),
-        path.join(buildDir, "mac-framework", arch)
+        path.join(buildDir, "mac-framework", arch),
+        macCopyOptions
       );
       signale.success(`copy success! - mac ${arch}`, "\n");
 
@@ -163,7 +173,8 @@ async function main(urlDomain) {
           "Release",
           anotherArch,
           "trtc_electron_sdk.node"
-        )
+        ),
+        macCopyOptions
       );
       fs.copySync(
         path.join(
@@ -172,7 +183,8 @@ async function main(urlDomain) {
           "/build/mac-framework",
           anotherArch
         ),
-        path.join(buildDir, "mac-framework", anotherArch)
+        path.join(buildDir, "mac-framework", anotherArch),
+        macCopyOptions
       );
       signale.success(`copy success! - mac ${anotherArch}`);