trtc-electron-sdk 13.3.801-alpha.2 → 13.3.801-alpha.3

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

@@ -128,6 +128,7 @@ export declare class TRTCMediaMixingManager implements ITRTCMediaMixingManager {
     private autoControlServer;
     private serverStatus;
     private serverMode;
+    private addMediaSourceTimers;
     private webRenderer;
     private pixelFormat;
     private pixelLength;
@@ -240,6 +241,14 @@ export declare class TRTCMediaMixingManager implements ITRTCMediaMixingManager {
      * @returns {Promise<void>}
      */
     addMediaSource(mediaSource: TRTCMediaSource): Promise<void>;
+    /**
+     * Returns the per-sourceType timeout (ms) used by addMediaSource. The
+     * defaults are intentionally larger than the cpp-layer timeout in
+     * SourceManagerProxy so that, in the normal case, the cpp side resolves the
+     * promise first. This JS timer is the last-resort safety net in case the
+     * cpp side itself fails to emit any callback (older builds, ipc lost, etc.).
+     */
+    private getAddMediaSourceTimeoutMs;
     /**
      * 删除本地混流媒体源
      * @param mediaSource {TRTCMediaSource} - 媒体源信息

package/liteav/extensions/MediaMixingManager/MediaMixingManager.js

@@ -304,6 +304,12 @@ class TRTCMediaMixingManager {
         this.streamLayoutManager = null;
         this.serverStatus = TRTCMediaMixingServerStatus.Idle;
         this.serverMode = TRTCMediaMixingServerMode.Independent;
+        // Per-source timeout handles for addMediaSource. Keyed by the same promise
+        // key used in promiseStore. Used to guard against the case where the native
+        // cpp layer never emits SM_OnSourceInserted (e.g. internal OnlineVideoSource
+        // state machine stuck after a previous failure), which would otherwise leave
+        // the returned Promise pending forever and the UI stuck on "loading".
+        this.addMediaSourceTimers = new Map();
         this.webRenderer = null;
         this.pixelFormat = trtc_define_1.TRTCVideoPixelFormat.TRTCVideoPixelFormat_BGRA32;
         this.pixelLength = 4;
@@ -386,6 +392,10 @@ class TRTCMediaMixingManager {
             this.nodeMediaMixingPlugin = null;
             this.eventEmitter = null;
             this.promiseStore.destroy();
+            // Cancel any pending addMediaSource timeout timers to avoid late-firing
+            // callbacks touching a destroyed instance.
+            this.addMediaSourceTimers.forEach(timer => clearTimeout(timer));
+            this.addMediaSourceTimers.clear();
             this.paramsStore = null;
             this.trtcParamsStore = null;
         });
@@ -536,6 +546,58 @@ class TRTCMediaMixingManager {
                 var _a;
                 const key = `${promiseKeys.addMediaSource}-${newMediaSource.sourceType}-${newMediaSource.sourceId}`;
                 this.promiseStore.addPromise(key, resolve, reject);
+                // Arm a timeout safety net. The underlying cpp layer should normally
+                // call back via SM_OnSourceInserted, but for OnlineVideo / VideoFile we
+                // have observed the native MediaPlayer state machine getting stuck on
+                // the 2nd attempt after a previous network failure, with no callback
+                // ever emitted. Without this timer the returned Promise stays pending
+                // forever, freezing upstream UI (e.g. the "child view" loading state).
+                const timeoutMs = this.getAddMediaSourceTimeoutMs(newMediaSource.sourceType);
+                const timer = setTimeout(() => {
+                    try {
+                        // Defensive guard: destroy() may have been invoked while this
+                        // macrotask was already scheduled but before the clearTimeout()
+                        // loop in destroy() ran. In that case promiseStore / sourceList
+                        // are no longer in a consistent state, and any further side-
+                        // effect (e.g. ms.control = {}) could throw on undefined.
+                        if (!this.nodeMediaMixingPlugin || !this.promiseStore) {
+                            return;
+                        }
+                        // If the promise was already settled by the real callback, this is
+                        // a no-op because PromiseStore.rejectPromise returns false on
+                        // missing key.
+                        const rejected = this.promiseStore.rejectPromise(key, {
+                            code: types_1.TRTCMediaMixingErrorCode.InsertTimeout,
+                            message: 'addMediaSource timeout',
+                        });
+                        if (rejected) {
+                            logger_1.default.warn(`${this.logPrefix}addMediaSource timeout for sourceType:${newMediaSource.sourceType} sourceId:${newMediaSource.sourceId} timeoutMs:${timeoutMs}`);
+                            // Mark the source as failed so subsequent removeMediaSource can
+                            // take the fast (sync) path without waiting for cpp callbacks
+                            // again.
+                            const idx = this.findMediaSourceIndex({
+                                sourceId: newMediaSource.sourceId,
+                                sourceType: newMediaSource.sourceType,
+                            });
+                            if (idx !== -1) {
+                                const ms = this.sourceList[idx];
+                                if (ms) {
+                                    if (!ms.control) {
+                                        ms.control = {};
+                                    }
+                                    ms.control.isAddFailed = true;
+                                }
+                            }
+                        }
+                    }
+                    finally {
+                        // Always clear our own timer slot, even if the rejection path
+                        // throws upstream. Without this, the Map would keep stale handles
+                        // alive until destroy().
+                        this.addMediaSourceTimers.delete(key);
+                    }
+                }, timeoutMs);
+                this.addMediaSourceTimers.set(key, timer);
                 this.nodeMediaMixingPlugin.addMediaSource(newMediaSource);
                 (_a = this.mediaMixingDesigner) === null || _a === void 0 ? void 0 : _a.addMedia({
                     id: `${newMediaSource.sourceType}__${newMediaSource.sourceId}`,
@@ -548,6 +610,23 @@ class TRTCMediaMixingManager {
             });
         });
     }
+    /**
+     * Returns the per-sourceType timeout (ms) used by addMediaSource. The
+     * defaults are intentionally larger than the cpp-layer timeout in
+     * SourceManagerProxy so that, in the normal case, the cpp side resolves the
+     * promise first. This JS timer is the last-resort safety net in case the
+     * cpp side itself fails to emit any callback (older builds, ipc lost, etc.).
+     */
+    getAddMediaSourceTimeoutMs(sourceType) {
+        switch (sourceType) {
+            case types_1.TRTCMediaSourceType.kOnlineVideo:
+                return 15000;
+            case types_1.TRTCMediaSourceType.kVideoFile:
+                return 10000;
+            default:
+                return 8000;
+        }
+    }
     /**
      * 删除本地混流媒体源
      * @param mediaSource {TRTCMediaSource} - 媒体源信息
@@ -1207,6 +1286,12 @@ class TRTCMediaMixingManager {
     onMediaSourceAdded(data) {
         var _a;
         const promiseKey = `${promiseKeys.addMediaSource}-${data.sourceType}-${data.sourceId}`;
+        // Real callback arrived: cancel the JS-side timeout safety net.
+        const timer = this.addMediaSourceTimers.get(promiseKey);
+        if (timer) {
+            clearTimeout(timer);
+            this.addMediaSourceTimers.delete(promiseKey);
+        }
         let flag = false;
         if (data.errCode === 0) {
             flag = this.promiseStore.resolvePromise(promiseKey, undefined);

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

@@ -13,7 +13,14 @@ export declare enum TRTCMediaMixingErrorCode {
     OnlineVideoConnectFailed = -10,
     OnlineVideoConnectionLost = -11,
     NoAvailableHevcDecoder = -12,
-    VideoFileNotExist = -13
+    VideoFileNotExist = -13,
+    /**
+     * SDK 兜底超时（addMediaSource 在 cpp / js 双层超时内未收到底层 onXxxStarted 回调）。
+     *
+     * 取一个远离 SDK 自然错误码区间（-1..-13）的值，便于上层稳定区分。
+     * 必须与 C++ 端 `kInsertTimeoutErrCode`（SourceManagerProxy）保持一致。
+     */
+    InsertTimeout = -9001
 }
 export declare enum TRTCMediaSourceType {
     kCamera = 0,

package/liteav/extensions/MediaMixingManager/types.js

@@ -17,6 +17,13 @@ var TRTCMediaMixingErrorCode;
     TRTCMediaMixingErrorCode[TRTCMediaMixingErrorCode["OnlineVideoConnectionLost"] = -11] = "OnlineVideoConnectionLost";
     TRTCMediaMixingErrorCode[TRTCMediaMixingErrorCode["NoAvailableHevcDecoder"] = -12] = "NoAvailableHevcDecoder";
     TRTCMediaMixingErrorCode[TRTCMediaMixingErrorCode["VideoFileNotExist"] = -13] = "VideoFileNotExist";
+    /**
+     * SDK 兜底超时（addMediaSource 在 cpp / js 双层超时内未收到底层 onXxxStarted 回调）。
+     *
+     * 取一个远离 SDK 自然错误码区间（-1..-13）的值，便于上层稳定区分。
+     * 必须与 C++ 端 `kInsertTimeoutErrCode`（SourceManagerProxy）保持一致。
+     */
+    TRTCMediaMixingErrorCode[TRTCMediaMixingErrorCode["InsertTimeout"] = -9001] = "InsertTimeout";
 })(TRTCMediaMixingErrorCode = exports.TRTCMediaMixingErrorCode || (exports.TRTCMediaMixingErrorCode = {}));
 var TRTCMediaSourceType;
 (function (TRTCMediaSourceType) {

package/package.json

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